CVS update: php3

Date: Monday May 31, 1999 @ 13:00 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv30891 Modified Files: configure.in Makefile.in Log Message: APXS did not like the old order Index: php3/configure.in diff -u php3/configure.in:1.382 php3/configure.in:1.383 --- php3/configure.in:1.382 Mon May 31 12:19:11 1999 +++ php3/configure.in Mon May 31 13:00:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.382 1999/05/31 16:19:11 sas Exp $ +dnl $Id: configure.in,v 1.383 1999/05/31 17:00:41 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -267,7 +267,7 @@ withval=apxs fi APXS="$withval" - APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @PCRE_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@ @EXTRA_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so @@ -2609,6 +2609,7 @@ [ --with-pcre-regex[=DIR] Include Perl Compatible Regular Expressions support],[ if test "$withval" = "yes"; then PCRE_LIB="pcrelib/libpcre.a" + PCRE_LIBS="-Lpcrelib -lpcre" AC_DEFINE(HAVE_PCRE, 1) AC_MSG_RESULT(yes) else @@ -2616,10 +2617,12 @@ fi ],[ PCRE_LIB="pcrelib/libpcre.a" + PCRE_LIBS="-Lpcrelib -lpcre" AC_DEFINE(HAVE_PCRE, 1) AC_MSG_RESULT(yes) ]) AC_SUBST(PCRE_LIB) +AC_SUBST(PCRE_LIBS) dnl If we're using gcc and the user hasn't specified CFLAGS, add -O2. test -n "$auto_cflags" && test -n "$GCC" && CFLAGS="$CFLAGS -O2" Index: php3/Makefile.in diff -u php3/Makefile.in:1.314 php3/Makefile.in:1.315 --- php3/Makefile.in:1.314 Mon May 31 12:36:47 1999 +++ php3/Makefile.in Mon May 31 13:00:41 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.314 1999/05/31 16:36:47 sas Exp $ +# $Id: Makefile.in,v 1.315 1999/05/31 17:00:41 sas Exp $ # prefix = @prefix@ @@ -120,7 +120,7 @@ $(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 + $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a @PCRE_LIBS@ docs: cd doc; $(MAKE) -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net