CVS update: php3

Date: Tuesday June 1, 1999 @ 20:17 Author: jim Update of /repository/php3 In directory php:/tmp/cvs-serv25624 Modified Files: Makefile.in configure.in Log Message: Get dependencies right so libpcre.a gets built when --with-apache. Index: php3/Makefile.in diff -u php3/Makefile.in:1.315 php3/Makefile.in:1.316 --- php3/Makefile.in:1.315 Mon May 31 13:00:41 1999 +++ php3/Makefile.in Tue Jun 1 20:17:45 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.315 1999/05/31 17:00:41 sas Exp $ +# $Id: Makefile.in,v 1.316 1999/06/02 00:17:45 jim Exp $ # prefix = @prefix@ @@ -107,20 +107,20 @@ php: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS) -libphp3.a: $(OBJS) $(FUNCTIONS) @DBASE_OBJS@ +libphp3.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_OBJS@ $(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_OBJS@ $(RANLIB) $(BINNAME) -libmodphp3.a: $(OBJS) $(FUNCTIONS) @DBASE_OBJS@ +libmodphp3.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_OBJS@ $(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_OBJS@ $(RANLIB) $(BINNAME) -libmodphp3-so.a: $(OBJS) $(FUNCTIONS) @DBASE_OBJS@ +libmodphp3-so.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_OBJS@ $(AR) libmodphp3-so.a $(OBJS) $(FUNCTIONS) @DBASE_OBJS@ $(RANLIB) libmodphp3-so.a libphp3.so: mod_php3.c libmodphp3-so.a @DBASE_LIB@ @PCRE_LIB@ - $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a @PCRE_LIBS@ + $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a @PCRE_LIB@ docs: cd doc; $(MAKE) Index: php3/configure.in diff -u php3/configure.in:1.387 php3/configure.in:1.388 --- php3/configure.in:1.387 Tue Jun 1 19:55:24 1999 +++ php3/configure.in Tue Jun 1 20:17:45 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.387 1999/06/01 23:55:24 jim Exp $ +dnl $Id: configure.in,v 1.388 1999/06/02 00:17:45 jim Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -274,7 +274,7 @@ withval=apxs fi APXS="$withval" - APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_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@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@ @DBA_LFLAGS@ @DBA_LIBS@ @EXTRA_LIBS@" + APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_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@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@ @DBA_LFLAGS@ @DBA_LIBS@ @PCRE_LIB@ @EXTRA_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so