diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 20:15:45 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 20:15:45 +0000 |
commit | 0e0abf9d1c97e272b9f72d6b96eb69eb62eba1b4 (patch) | |
tree | f118368712e9d2ee5f8b0649e2019231d2f42042 | |
parent | 6b4b10cc88b2d459ae002d08922666f07124963d (diff) |
Restore FreeBSD to able-to-compile-ish-mode
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@242852 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | configure | 43 | ||||
-rw-r--r-- | configure.ac | 33 | ||||
-rw-r--r-- | main/Makefile | 4 | ||||
-rw-r--r-- | pbx/Makefile | 4 |
4 files changed, 79 insertions, 5 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 241932 . +# From configure.ac Revision: 242520 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -7304,6 +7304,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 aa1ddb0be..4a87657c6 100644 --- a/configure.ac +++ b/configure.ac @@ -162,6 +162,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 dd90f7f3d..71f898a63 100644 --- a/main/Makefile +++ b/main/Makefile @@ -95,7 +95,7 @@ editline/libedit.a: db1-ast/libdb1.a: _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: @@ -103,7 +103,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/pbx/Makefile b/pbx/Makefile index a494de382..27c44b189 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -44,7 +44,7 @@ ael/ael.tab.o ael/ael_lex.o: _ASTCFLAGS+=$(MENUSELECT_OPTS_pbx_ael:%=-D%) $(fore $(if $(filter pbx_ael,$(EMBEDDED_MODS)),modules.link,pbx_ael.so): ael/ael.tab.o ael/ael_lex.o -ifneq ($(FLEX),:) +ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) ael/ael_lex.c: ael/ael.flex else ael/ael_lex.c: @@ -53,7 +53,7 @@ endif $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" 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: |