From 34cb5dff6824c6c817c38ff5aec086fe19390030 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Tue, 6 Mar 2001 16:51:53 +0000 Subject: [PATCH] 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. --- build/build2.mk | 5 ++--- configure.in | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/build2.mk b/build/build2.mk index 689c01be5d..c1d968a14b 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -54,14 +54,13 @@ $(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_f 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 diff --git a/configure.in b/configure.in index 9e30ddcdf6..9e150efcd4 100644 --- a/configure.in +++ b/configure.in @@ -116,7 +116,10 @@ AC_PROG_RANLIB 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 -- 2.40.0