aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 20:24:19 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 20:24:19 +0000
commitc90c70837f3d54839e05644f50619a3709d800d1 (patch)
treea64c827265e2294e221441e612409fe570637f14
parent388bd3f44dee8bced500158ce4ef39d717371432 (diff)
Merged revisions 242857 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r242857 | tilghman | 2010-01-25 14:18:15 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242852 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242852 | tilghman | 2010-01-25 14:15:45 -0600 (Mon, 25 Jan 2010) | 2 lines Restore FreeBSD to able-to-compile-ish-mode ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@242887 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xconfigure43
-rw-r--r--configure.ac33
-rw-r--r--main/Makefile4
-rw-r--r--res/Makefile4
4 files changed, 79 insertions, 5 deletions
diff --git a/configure b/configure
index b4b4eea23..2c671ece5 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 241940 .
+# From configure.ac Revision: 242523 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -7463,6 +7463,47 @@ fi
fi
+{ echo "$as_me:$LINENO: checking for bison that supports parse-param" >&5
+echo $ECHO_N "checking for bison that supports parse-param... $ECHO_C" >&6; }
+if test "${ac_cv_path_BISON2+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ if test "x$BISON" != "x:" ; then
+ # Create a temporary directory $tmp in $TMPDIR (default /tmp).
+ # Use mktemp if possible; otherwise fall back on mkdir,
+ # with $RANDOM to make collisions less likely.
+ : ${TMPDIR=/tmp}
+ {
+ tmp=`
+ (umask 077 && mktemp -d "$TMPDIR/fooXXXXXX") 2>/dev/null
+ ` &&
+ test -n "$tmp" && test -d "$tmp"
+ } || {
+ tmp=$TMPDIR/foo$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+ } || exit $?
+ cat >$tmp/test.y <<__EOL__
+%parse-param {struct parse_io *parseio}
+%%
+file : { \$\$ = parseio->pval = 1; }
+ ;
+%%
+__EOL__
+ ${BISON} -o ${tmp}/test.tab.c ${tmp}/test.y >/dev/null 2>&1
+ if test -e "${tmp}/test.tab.c"; then
+ ac_cv_path_BISON2=${BISON}
+ fi
+ rm -rf ${tmp}
+ fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_BISON2" >&5
+echo "${ECHO_T}$ac_cv_path_BISON2" >&6; }
+if test "x${ac_cv_path_BISON2}" = "x" ; then
+ BISON=:
+fi
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}soxmix", so it can be a program name with args.
set dummy ${ac_tool_prefix}soxmix; ac_word=$2
diff --git a/configure.ac b/configure.ac
index f763908d4..2a4f20c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,39 @@ else
fi
AC_SUBST(DOWNLOAD)
+AC_CACHE_CHECK([for bison that supports parse-param], [ac_cv_path_BISON2], [
+ if test "x$BISON" != "x:" ; then
+ # Create a temporary directory $tmp in $TMPDIR (default /tmp).
+ # Use mktemp if possible; otherwise fall back on mkdir,
+ # with $RANDOM to make collisions less likely.
+ : ${TMPDIR=/tmp}
+ {
+ tmp=`
+ (umask 077 && mktemp -d "$TMPDIR/fooXXXXXX") 2>/dev/null
+ ` &&
+ test -n "$tmp" && test -d "$tmp"
+ } || {
+ tmp=$TMPDIR/foo$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+ } || exit $?
+ cat >$tmp/test.y <<__EOL__
+%parse-param {struct parse_io *parseio}
+%%
+file : { \$\$ = parseio->pval = 1; }
+ ;
+%%
+__EOL__
+ ${BISON} -o ${tmp}/test.tab.c ${tmp}/test.y >/dev/null 2>&1
+ if test -e "${tmp}/test.tab.c"; then
+ ac_cv_path_BISON2=${BISON}
+ fi
+ rm -rf ${tmp}
+ fi
+ ])
+if test "x${ac_cv_path_BISON2}" = "x" ; then
+ BISON=:
+fi
+
AC_CHECK_TOOL([SOXMIX], [soxmix], [:])
if test "${SOXMIX}" != ":" ; then
AC_DEFINE([HAVE_SOXMIX], 1, [Define to 1 if your system has soxmix application.])
diff --git a/main/Makefile b/main/Makefile
index c83edd63a..71eaacc2c 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -110,7 +110,7 @@ editline/libedit.a: CHECK_SUBDIR
db1-ast/libdb1.a: CHECK_SUBDIR
_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
-ifneq ($(BISON),:)
+ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
ast_expr2.c ast_expr2.h: ast_expr2.y
else
ast_expr2.c ast_expr2.h:
@@ -118,7 +118,7 @@ endif
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
$(CMD_PREFIX) $(BISON) -o $@ -d --name-prefix=ast_yy ast_expr2.y
-ifneq ($(FLEX),:)
+ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
ast_expr2f.c: ast_expr2.fl
else
ast_expr2f.c:
diff --git a/res/Makefile b/res/Makefile
index 77730758e..7e3d55a62 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -43,7 +43,7 @@ $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o
$(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o
-ifneq ($(FLEX),:)
+ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
ael/ael_lex.c: ael/ael.flex
else
ael/ael_lex.c:
@@ -52,7 +52,7 @@ endif
$(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c)
$(CMD_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c)
-ifneq ($(BISON),:)
+ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
ael/ael.tab.c ael/ael.tab.h: ael/ael.y
else
ael/ael.tab.c ael/ael.tab.h: