CVS update: php3
| From: | rasmus | Date: | Fri, 25 Jun 1999 21:22:52 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-7555@lists.php.net to get a copy of this message | ||
Date: Friday June 25, 1999 @ 17:22
Author: rasmus
Update of /repository/php3
In directory php:/tmp/cvs-serv12630
Modified Files:
Makefile.in configure.in
Log Message:
Fix APXS build on AIX
Index: php3/Makefile.in
diff -u php3/Makefile.in:1.325 php3/Makefile.in:1.326
--- php3/Makefile.in:1.325 Thu Jun 24 09:18:51 1999
+++ php3/Makefile.in Fri Jun 25 17:22:52 1999
@@ -24,7 +24,7 @@
# +----------------------------------------------------------------------+
#
-# $Id: Makefile.in,v 1.325 1999/06/24 13:18:51 sas Exp $
+# $Id: Makefile.in,v 1.326 1999/06/25 21:22:52 rasmus Exp $
#
prefix = @prefix@
@@ -52,6 +52,7 @@
MAINT = @MAINT@
APXS = @APXS@
APXS_LDFLAGS = @PHP_LIBS@ @APXS_LDFLAGS@ @LIBS@
+APXS_EXP = @APXS_EXP@
WARNING_LEVEL = @WARNING_LEVEL@
DBF_OBJS=dbase/dbf_head.o dbase/dbf_rec.o dbase/dbf_misc.o dbase/dbf_ndx.o
@@ -123,7 +124,7 @@
libphp3.so: mod_php3.c libmodphp3-so.a @DBASE_LIB@ @PCRE_LIB@
-@test -f mod_php3.c || test -L mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c mod_php3.c
- $(APXS) -c -o libphp3.so -I$(srcdir) -I. mod_php3.c libmodphp3-so.a $(APXS_LDFLAGS) @PCRE_LIBS@
+ $(APXS) -c -o libphp3.so -I$(srcdir) -I. mod_php3.c libmodphp3-so.a $(APXS_LDFLAGS) @APXS_EXP@
@PCRE_LIBS@
pcrelib/libpcre.a:
(cd pcrelib; $(MAKE))
Index: php3/configure.in
diff -u php3/configure.in:1.405 php3/configure.in:1.406
--- php3/configure.in:1.405 Thu Jun 24 09:18:51 1999
+++ php3/configure.in Fri Jun 25 17:22:52 1999
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.405 1999/06/24 13:18:51 sas Exp $
+dnl $Id: configure.in,v 1.406 1999/06/25 21:22:52 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -36,6 +36,11 @@
"
uname -sv" = "AIX 4"; then
CFLAGS=echo $CFLAGS | sed -e 's/-g//'
fi
+
+if test "uname -sv" = "AIX 4" -a "$GCC" !=
"yes"; then
+ APXS_EXP="-bE:mod_php3.exp"
+fi
+AC_SUBST(APXS_EXP)
dnl check for -R, etc. switch
AC_MSG_CHECKING(if compiler supports -R)