Merged revisions 309808 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r309808 | tilghman | 2011-03-06 18:54:42 -0600 (Sun, 06 Mar 2011) | 14 lines
  
  Merged revisions 309251 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r309251 | tilghman | 2011-03-01 19:06:02 -0600 (Tue, 01 Mar 2011) | 7 lines
    
    Revert previous 2 commits, and instead conditionally redefine the same macro used in flex 2.5.35 that clashed with our workaround.
    
    Not surprisingly, the workaround was exactly the same code as was provided by
    the Flex maintainers, albeit in two different places, in different macros.
    
    This should fix the FreeBSD builds, which have an older version of Flex.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309809 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 1 insertions, 52 deletions

diff --git a/configure b/configure
index 167cd4409..691bbbff8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 306396 .
+# From configure.ac Revision: 309036 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk trunk.
 #
@@ -7400,57 +7400,6 @@ __EOL__
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_BISON2" >&5
 $as_echo "$ac_cv_path_BISON2" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flex that ignores fwrite return value" >&5
-$as_echo_n "checking for flex that ignores fwrite return value... " >&6; }
-if test "${ac_cv_FLEX_WORKAROUND+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	if test "x$FLEX" != "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.fl <<__EOL__
-%{
-#include <unistd.h>
-#include <stdio.h>
-static void yyunput (int c,char *buf_ptr  ) __attribute__((unused));
-static int input(void) __attribute__((unused));
-%}
-
-%%
-username    printf( "%s", getlogin() );
-__EOL__
-		${FLEX} -o ${tmp}/test.c ${tmp}/test.fl
-		${CC} -o ${tmp}/test.o -c ${tmp}/test.c -Wall -Werror >/dev/null 2>&1
-		if test -e "${tmp}/test.o"; then
-			ac_cv_FLEX_WORKAROUND=no
-		else
-			ac_cv_FLEX_WORKAROUND=yes
-		fi
-		rm -rf ${tmp}
-	fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_FLEX_WORKAROUND" >&5
-$as_echo "$ac_cv_FLEX_WORKAROUND" >&6; }
-
-if test "x${ac_cv_FLEX_WORKAROUND}" = "xyes"; then
-
-$as_echo "#define NEED_FLEX_FWRITE_WORKAROUND 1" >>confdefs.h
-
-fi
-
 if test "x${ac_cv_path_BISON2}" = "x" ; then
 	BISON=:
 	PBX_BISON=0