[PHP4BETA] CVS update: php4
| From: | sas | Date: | Sat, 29 May 1999 16:15:22 +0000 |
| Subject: | [PHP4BETA] CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1183@lists.php.net to get a copy of this message | ||
Date: Saturday May 29, 1999 @ 12:15
Author: sas
Update of /repository/php4
In directory php:/tmp/cvs-serv5729
Modified Files:
Makefile.in configure.in.in
Log Message:
- fix APXS VPATH build
- libzend/TSRM build in their own directories
- ext/Makefile was generated twice
****NOTE******
If you use any kind of VPATH, you need to do a "make distclean" in your
libzend/TSRM directory, before running configure again.
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.34 php4/Makefile.in:1.35
--- php4/Makefile.in:1.34 Sat May 29 11:10:05 1999
+++ php4/Makefile.in Sat May 29 12:15:21 1999
@@ -24,7 +24,7 @@
# +----------------------------------------------------------------------+
#
-# $Id: Makefile.in,v 1.34 1999/05/29 15:10:05 zeev Exp $
+# $Id: Makefile.in,v 1.35 1999/05/29 16:15:21 sas Exp $
#
prefix = @prefix@
@@ -33,9 +33,12 @@
VPATH = @srcdir@
bindir = @bindir@
+top_builddir = .
+
ZEND_DIR = $(srcdir)/libzend
-SUBDIRS=$(srcdir)/libzend ext @TSRM_DIR@
+SUBDIRS=libzend ext @TSRM_DIR@
+LN_S = @LN_S@
CC = @CC@
AR = ar rc
BINNAME = @BINNAME@
@@ -68,7 +71,7 @@
safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \
php_ini.o SAPI.o cgi_main.o rfc1867.o
-PHPLIBS = -L@top_srcdir@/libzend -lzend -Lext -lphpext
+PHPLIBS = -Llibzend -lzend -Lext -lphpext
LIBS = $(PHPLIBS) $(EXTRA_LIBS) @LIBS@
all: $(BINNAME)
@@ -94,15 +97,16 @@
$(RANLIB) $(BINNAME)
# Apache modules
-libmodphp4-so.a: all-recursive $(OBJS)
+libmodphp4-so.a: all-recursive $(OBJS) @REGEX_LIB@
$(AR) $@.tmp $(OBJS)
$(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a @TSRM_LIB@
@rm -f $@.tmp
$(RANLIB) libmodphp4-so.a
# Apache 1.3 shared module
-libphp4.so: $(srcdir)/mod_php4.c libmodphp4-so.a
- $(APXS) -I$(srcdir)/libzend -c -o libphp4.so $(APXS_LDFLAGS) $(srcdir)/mod_php4.c libmodphp4-so.a
+libphp4.so: $(srcdir)/mod_php4.c libmodphp4-so.a @REGEX_LIB@
+ -@$(LN_S) $(srcdir)/mod_php4.c mod_php4.c
+ $(APXS) $(INCLUDE) -c -o libphp4.so $(APXS_LDFLAGS) mod_php4.c libmodphp4-so.a
regex/libregex.a:
(cd regex; $(MAKE) lib)
Index: php4/configure.in.in
diff -u php4/configure.in.in:1.33 php4/configure.in.in:1.34
--- php4/configure.in.in:1.33 Fri May 28 18:41:48 1999
+++ php4/configure.in.in Sat May 29 12:15:21 1999
@@ -1,4 +1,4 @@
-dnl $Id: configure.in.in,v 1.33 1999/05/28 22:41:48 zeev Exp $ -*- sh -*-
+dnl $Id: configure.in.in,v 1.34 1999/05/29 16:15:21 sas Exp $ -*- sh -*-
dnl Process this file with autoconf to produce a configure script.
@@ -18,9 +18,9 @@
if test "$recurse" = "yes"; then
cwd=
pwd
- (set -x; cd $srcdir/libzend; ./configure --cache-file=$cwd/config.cache $@)
+ (set -x; mkdir -p libzend ; cd libzend; $cwd/$srcdir/libzend/configure
--cache-file=$cwd/config.cache $@)
if test "$threadsafe" = "yes"; then
- (set -x; cd $srcdir/TSRM; ./configure --cache-file=$cwd/config.cache $@)
+ (set -x; mkdir -p TSRM; cd TSRM; $cwd/$srcdir/TSRM/configure --cache-file=$cwd/config.cache $@)
fi
fi
@@ -83,6 +83,7 @@
AC_PROG_RANLIB
AC_PROG_CC_C_O
+AC_PROG_LN_S
AC_PATH_PROG(PERL_PATH, perl)
dnl Ugly hack to get around a problem with gcc on AIX.
@@ -155,7 +156,7 @@
LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
fi
-INCLUDES=""
+INCLUDES="-I\$(top_builddir)/libzend -I\$(top_builddir)/TSRM"
AC_SUBST(INCLUDES)
AC_CHECK_LIB(nsl, gethostname, [
@@ -874,7 +875,7 @@
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS")
AC_OUTPUT(Makefile libphp4.module
- scripts/mkextlib regex/Makefile ext/Makefile
+ scripts/mkextlib regex/Makefile
@@EXT_MAKEFILES@@ build-defs.h, [
], [
--
PHP 4 Beta