CVS update: php4

Date: Sunday June 27, 1999 @ 17:18 Author: sas Update of /repository/php4 In directory php:/tmp/cvs-serv27342 Modified Files: Makefile.in configure.in.in Log Message: lex optimizations Index: php4/Makefile.in diff -u php4/Makefile.in:1.40 php4/Makefile.in:1.41 --- php4/Makefile.in:1.40 Sun Jun 27 17:14:00 1999 +++ php4/Makefile.in Sun Jun 27 17:18:43 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.40 1999/06/27 21:14:00 sas Exp $ +# $Id: Makefile.in,v 1.41 1999/06/27 21:18:43 sas Exp $ # prefix = @prefix@ @@ -61,6 +61,7 @@ APXS = @APXS@ APXS_LDFLAGS = $(EXTRA_LIBS) $(LIBS) WARNING_LEVEL = @WARNING_LEVEL@ +LEX_CFLAGS = -w$(WARNING_LEVEL) @LEX_CFLAGS@ SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.c configuration-scanner.c request_info.c \ @@ -115,7 +116,7 @@ bison -p cfg -v -d $(srcdir)/configuration-parser.y -o configuration-parser.c configuration-scanner.o: configuration-scanner.c - $(CC) $(CFLAGS) -w$(WARNING_LEVEL) -c configuration-scanner.c + $(CC) $(CFLAGS) $(LEX_CFLAGS) -c configuration-scanner.c configuration-scanner.c: $(srcdir)/configuration-scanner.l flex -Pcfg -oconfiguration-scanner.c -i $(srcdir)/configuration-scanner.l Index: php4/configure.in.in diff -u php4/configure.in.in:1.41 php4/configure.in.in:1.42 --- php4/configure.in.in:1.41 Sun Jun 27 17:14:00 1999 +++ php4/configure.in.in Sun Jun 27 17:18:43 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.41 1999/06/27 21:14:00 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.42 1999/06/27 21:18:43 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -85,6 +85,16 @@ AC_PROG_CC_C_O AC_PROG_LN_S AC_PATH_PROG(PERL_PATH, perl) + + +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 +dnl "limit-to-ANSI-standard" mode, not in "ANSI-compatible" mode +AC_C_CONST +if test "$ac_cv_c_const" = "yes" ; then + LEX_CFLAGS="-DYY_USE_CONST" +fi +AC_SUBST(LEX_CFLAGS) dnl Ugly hack to get around a problem with gcc on AIX. if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \