CVS update: php4

Date: Sunday June 27, 1999 @ 17:36 Author: sas Update of /repository/php4 In directory php:/tmp/cvs-serv31898 Modified Files: Makefile.in configure.in.in Added Files: mod_php4.exp Log Message: port Rasmus' APXS changes for AIX Index: php4/Makefile.in diff -u php4/Makefile.in:1.41 php4/Makefile.in:1.42 --- php4/Makefile.in:1.41 Sun Jun 27 17:18:43 1999 +++ php4/Makefile.in Sun Jun 27 17:36:00 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.41 1999/06/27 21:18:43 sas Exp $ +# $Id: Makefile.in,v 1.42 1999/06/27 21:36:00 sas Exp $ # prefix = @prefix@ @@ -60,6 +60,7 @@ MAINT = @MAINT@ APXS = @APXS@ APXS_LDFLAGS = $(EXTRA_LIBS) $(LIBS) +APXS_EXP = @APXS_EXP@ WARNING_LEVEL = @WARNING_LEVEL@ LEX_CFLAGS = -w$(WARNING_LEVEL) @LEX_CFLAGS@ @@ -107,7 +108,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 @RPATHS@ mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) + $(APXS) $(INCLUDE) -c -o libphp4.so @RPATHS@ mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) $(APXS_EXP) regex/libregex.a: (cd regex; $(MAKE) lib) Index: php4/configure.in.in diff -u php4/configure.in.in:1.42 php4/configure.in.in:1.43 --- php4/configure.in.in:1.42 Sun Jun 27 17:18:43 1999 +++ php4/configure.in.in Sun Jun 27 17:36:00 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.42 1999/06/27 21:18:43 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.43 1999/06/27 21:36:00 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -96,6 +96,11 @@ fi AC_SUBST(LEX_CFLAGS) +if test "uname -sv" = "AIX 4" -a "$GCC" != "yes"; then + APXS_EXP="-bE:mod_php4.exp" +fi +AC_SUBST(APXS_EXP) + dnl Ugly hack to get around a problem with gcc on AIX. if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \ "uname -sv" = "AIX 4"; then