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.0@242885 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 42 insertions, 1 deletions

diff --git a/configure b/configure
index d7f4af2a6..a6cab434d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 241939 .
+# From configure.ac Revision: 242524 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -7465,6 +7465,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