cvs: php4 / configure.in /build build2.mk

sas Tue Mar 6 08:51:53 2001 EDT Modified files: /php4 configure.in /php4/build build2.mk Log: Replace AM_PROG_LEX with a separated call to AC_PROG_LEX and AC_DECL_YYTEXT. The latter is only called, if lex was found, so that PHP configures now on setups without (f)lex. Index: php4/configure.in diff -u php4/configure.in:1.219 php4/configure.in:1.220 --- php4/configure.in:1.219 Mon Feb 26 10:14:27 2001 +++ php4/configure.in Tue Mar 6 08:51:53 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.219 2001/02/26 18:14:27 andi Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.220 2001/03/06 16:51:53 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -116,7 +116,10 @@ AC_PROG_CC_C_O AC_PROG_LN_S -AM_PROG_LEX +AC_PROG_LEX +if test -n "$LEX"; then + AC_DECL_YYTEXT +fi dnl ## Make flex scanners use const if they can, even if __STDC__ is not dnl ## true, for compilers like Sun's that only set __STDC__ true in Index: php4/build/build2.mk diff -u php4/build/build2.mk:1.17 php4/build/build2.mk:1.18 --- php4/build/build2.mk:1.17 Wed Feb 7 16:49:24 2001 +++ php4/build/build2.mk Tue Mar 6 08:51:53 2001 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build2.mk,v 1.17 2001/02/08 00:49:24 sas Exp $ +# $Id: build2.mk,v 1.18 2001/03/06 16:51:53 sas Exp $ # include generated_lists @@ -54,14 +54,13 @@ fi; \ done @test -f want_dependencies || flag=-i; \ - automake -a $$flag $(AMFLAGS) $(makefile_files) \ - || true >&2 + automake -a $$flag $(AMFLAGS) $(makefile_files) 2>&1 | $(SUPPRESS_WARNINGS) @for i in $(LT_TARGETS); do mv $$i.bak $$i; done aclocal.m4: configure.in acinclude.m4 dynlib.m4 aclocal -SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX)'||true) +SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*)'||true) $(config_h_in): configure acconfig.h # explicitly remove target since autoheader does not seem to work