[PHP4BETA] CVS update: php4

Date: Friday April 16, 1999 @ 22:01 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv17963 Modified Files: Makefile.in configure.in.in libphp3.module.in Log Message: Apache module compiles again Index: php4/Makefile.in diff -u php4/Makefile.in:1.4 php4/Makefile.in:1.5 --- php4/Makefile.in:1.4 Fri Apr 16 20:37:05 1999 +++ php4/Makefile.in Fri Apr 16 22:01:18 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.4 1999/04/17 00:37:05 ssb Exp $ +# $Id: Makefile.in,v 1.5 1999/04/17 02:01:18 ssb Exp $ # prefix = @prefix@ @@ -40,7 +40,10 @@ AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ -INCLUDE = -I$(srcdir) -I. -I$(ZEND_DIR) +EXTRA_LIBS = @EXTRA_LIBS@ +EXT_LIBS = @EXT_LIBS@ +INCLUDES = @INCLUDES@ +INCLUDE = -I$(srcdir) -I. -I$(ZEND_DIR) $(INCLUDES) PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ @@ -81,7 +84,7 @@ FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext -LIBS = $(PHPLIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ +LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) @@ -97,22 +100,15 @@ php: all-recursive $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS) -# Apache 1.2 module -libphp3.a: all-recursive $(OBJS) $(FUNCTIONS) @DBASE_LIB@ - $(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_LIB@ +# Apache modules +libphp3.a libmodphp3.a libmodphp3-so.a: all-recursive $(OBJS) $(FUNCTIONS) + $(AR) $@.tmp $(OBJS) $(FUNCTIONS) @DBASE_LIB@ + scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a + @rm -f $@.tmp $(RANLIB) $(BINNAME) -# Apache 1.3 static module -libmodphp3.a: all-recursive $(OBJS) $(FUNCTIONS) @DBASE_LIB@ - $(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_LIB@ - $(RANLIB) $(BINNAME) - # Apache 1.3 shared module -libmodphp3-so.a: all-recursive $(OBJS) $(FUNCTIONS) @DBASE_LIB@ - $(AR) libmodphp3-so.a $(OBJS) $(FUNCTIONS) @DBASE_LIB@ - $(RANLIB) libmodphp3-so.a - -libphp3.so: mod_php3.c libmodphp3-so.a +libphp3.so: $(srcdir)/mod_php3.c libmodphp3-so.a $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a regex/libregex.a: Index: php4/configure.in.in diff -u php4/configure.in.in:1.1 php4/configure.in.in:1.2 --- php4/configure.in.in:1.1 Fri Apr 16 20:37:05 1999 +++ php4/configure.in.in Fri Apr 16 22:01:19 1999 @@ -1,10 +1,12 @@ -dnl $Id: configure.in.in,v 1.1 1999/04/17 00:37:05 ssb Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.2 1999/04/17 02:01:19 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) recurse=yes for arg in $@; do case $arg in + ## This is to prevent "./config.status --recheck" from + ## running configure in libzend again. --no-recursion) recurse=no;; *) ;; esac @@ -332,7 +334,7 @@ ]) -APACHE_INSTALL_FILES="$srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $srcdir/libzend/libzend.a" +APACHE_INSTALL_FILES="$srcdir/mod_php3.* $srcdir/php_version.h libphp3.module" AC_MSG_CHECKING(for Apache module support via DSO through APACI) @@ -380,7 +382,7 @@ fi fi INCLUDES="$INCLUDES $APACHE_INCLUDE" -dnl## AC_SUBST(APACHE_INCLUDE) + AC_SUBST(APACHE_INCLUDE) AC_SUBST(APACHE_TARGET) AC_SUBST(INSTALL_IT) AC_SUBST(BINNAME) @@ -840,6 +842,8 @@ divert(3) + +AC_SUBST(EXTRA_LIBS) # reading config stubs esyscmd(./scripts/config-stubs) Index: php4/libphp3.module.in diff -u php4/libphp3.module.in:1.1.1.1 php4/libphp3.module.in:1.2 --- php4/libphp3.module.in:1.1.1.1 Wed Apr 7 17:02:10 1999 +++ php4/libphp3.module.in Fri Apr 16 22:01:19 1999 @@ -1,7 +1,7 @@ Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LIBS="@PHP_LIBS@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @LIBS@ @RDYNAMIC_LFLAGS@ $LIBS" + LIBS="@PHP_LIBS@ @EXTRA_LIBS@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @LIBS@ @RDYNAMIC_LFLAGS@ $LIBS" RULE_HIDE=yes ConfigEnd -- PHP 4 Beta