CVS update: php4

Date: Sunday June 27, 1999 @ 17:14 Author: sas Update of /repository/php4 In directory php:/tmp/cvs-serv26598 Modified Files: Makefile.in acinclude.m4 configure.in.in Log Message: port over autoconf fixes from php3 Index: php4/Makefile.in diff -u php4/Makefile.in:1.39 php4/Makefile.in:1.40 --- php4/Makefile.in:1.39 Fri Jun 25 19:40:26 1999 +++ php4/Makefile.in Sun Jun 27 17:14:00 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.39 1999/06/25 23:40:26 sas Exp $ +# $Id: Makefile.in,v 1.40 1999/06/27 21:14:00 sas Exp $ # prefix = @prefix@ @@ -59,7 +59,7 @@ YACC = @YACC@ MAINT = @MAINT@ APXS = @APXS@ -APXS_LDFLAGS = @RPATHS@ $(EXTRA_LIBS) $(LIBS) +APXS_LDFLAGS = $(EXTRA_LIBS) $(LIBS) WARNING_LEVEL = @WARNING_LEVEL@ SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ @@ -106,7 +106,7 @@ # Apache 1.3 shared module libphp4.so: $(srcdir)/mod_php4.c libmodphp4-so.a @REGEX_LIB@ -@test -f mod_php4.c || test -L mod_php4.c || $(LN_S) $(srcdir)/mod_php4.c mod_php4.c - $(APXS) $(INCLUDE) -c -o libphp4.so mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) + $(APXS) $(INCLUDE) -c -o libphp4.so @RPATHS@ mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) regex/libregex.a: (cd regex; $(MAKE) lib) Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.13 php4/acinclude.m4:1.14 --- php4/acinclude.m4:1.13 Sun Jun 20 14:54:08 1999 +++ php4/acinclude.m4 Sun Jun 27 17:14:00 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.13 1999/06/20 18:54:08 sas Exp $ +dnl $Id: acinclude.m4,v 1.14 1999/06/27 21:14:00 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -22,10 +22,10 @@ dnl expands path to an absolute path and assigns it to variable dnl AC_DEFUN(AC_EXPAND_PATH,[ - if echo "$1" | grep -v '^/' >/dev/null ; then - $2="pwd/$1" - else + if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then $2="$1" + else + $2="pwd/$1" fi ]) Index: php4/configure.in.in diff -u php4/configure.in.in:1.40 php4/configure.in.in:1.41 --- php4/configure.in.in:1.40 Fri Jun 25 20:34:36 1999 +++ php4/configure.in.in Sun Jun 27 17:14:00 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.40 1999/06/26 00:34:36 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.41 1999/06/27 21:14:00 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -309,18 +309,42 @@ AC_ARG_WITH(system-regex, [ --with-system-regex Do not use the bundled regex library], [ - REGEX_LIB= - HSREGEX=no - AC_MSG_RESULT(no) - AC_DEFINE(REGEX,0) + if test -n "$APXS"; then + if test -z "$APXS -q CFLAGS | grep USE_HSREGEX"; then + HSREGEX=yes + else + HSREGEX=no + fi + else + if test "$withval" = "no"; then + HSREGEX=yes + else + HSREGEX=no + fi + fi ],[ - REGEX_LIB=regex/libregex.a - EXTRA_LIBS="-L$abs_builddir/regex -lregex $EXTRA_LIBS" - HSREGEX=yes - AC_MSG_RESULT(yes) - AC_DEFINE(HSREGEX) - AC_DEFINE(REGEX,1) + if test -n "$APXS"; then + if test -z "$APXS -q CFLAGS | grep USE_HSREGEX"; then + HSREGEX=yes + else + HSREGEX=no + fi + else + HSREGEX=yes + fi ]) +AC_MSG_RESULT($HSREGEX) + +if test "$HSREGEX" = "yes"; then + REGEX_LIB=regex/libregex.a + EXTRA_LIBS="-L$abs_builddir/regex -lregex $EXTRA_LIBS" + AC_DEFINE(HSREGEX) + AC_DEFINE(REGEX,1) +else + REGEX_LIB= + AC_DEFINE(REGEX,0) +fi + AC_SUBST(REGEX_LIB) AC_SUBST(HSREGEX)