cvs: /php3 Makefile.in configure.in /php3/pcrelib Makefile.in /php3/regex Makefile.in

sas Wed Mar 29 20:14:23 2000 EDT Modified files: /php3 Makefile.in configure.in /php3/pcrelib Makefile.in /php3/regex Makefile.in Log: * Fix dupe pcre symbols in apxs mode * Propagate shlib flags properly Index: php3/Makefile.in diff -u php3/Makefile.in:1.359 php3/Makefile.in:1.360 --- php3/Makefile.in:1.359 Fri Jan 7 02:36:28 2000 +++ php3/Makefile.in Wed Mar 29 20:14:21 2000 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.359 2000/01/07 10:36:28 sas Exp $ +# $Id: Makefile.in,v 1.360 2000/03/30 04:14:21 sas Exp $ # prefix = @prefix@ @@ -124,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 -@test -f ./mod_php3.c || test -h ./mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c ./mod_php3.c - $(APXS) -c -o libphp3.so @VERSION_SCRIPT@ -I$(srcdir) -I. @RPATHS@ ./mod_php3.c libmodphp3-so.a $(APXS_LDFLAGS) @APXS_EXP@ @PCRE_LIBS@ + $(APXS) -c -o libphp3.so @VERSION_SCRIPT@ -I$(srcdir) -I. @RPATHS@ ./mod_php3.c libmodphp3-so.a $(APXS_LDFLAGS) @APXS_EXP@ pcrelib/libpcre.a: (cd pcrelib; $(MAKE)) Index: php3/configure.in diff -u php3/configure.in:1.499 php3/configure.in:1.500 --- php3/configure.in:1.499 Wed Mar 29 09:49:14 2000 +++ php3/configure.in Wed Mar 29 20:14:21 2000 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.499 2000/03/29 17:49:14 sas Exp $ +dnl $Id: configure.in,v 1.500 2000/03/30 04:14:21 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -294,7 +294,7 @@ withval=apxs fi APXS="$withval" - APXS_LDFLAGS="@EXTRA_LIBS@ @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@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @DBM_LIB@ @DBASE_LIBS@ @PCRE_LIB@" + APXS_LDFLAGS="@EXTRA_LIBS@ @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@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @DBM_LIB@ @DBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so Index: php3/pcrelib/Makefile.in diff -u php3/pcrelib/Makefile.in:1.2 php3/pcrelib/Makefile.in:1.3 --- php3/pcrelib/Makefile.in:1.2 Wed Jun 2 04:28:01 1999 +++ php3/pcrelib/Makefile.in Wed Mar 29 20:14:21 2000 @@ -2,7 +2,7 @@ AR = ar cq CC = @CC@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @CFLAGS_SHLIB@ RANLIB = @RANLIB@ VPATH = @srcdir@ Index: php3/regex/Makefile.in diff -u php3/regex/Makefile.in:1.5 php3/regex/Makefile.in:1.6 --- php3/regex/Makefile.in:1.5 Tue Nov 30 13:27:32 1999 +++ php3/regex/Makefile.in Wed Mar 29 20:14:22 2000 @@ -12,7 +12,7 @@ # Put -Dconst= in for a pre-ANSI compiler. # Do not take -DPOSIX_MISTAKE out. # REGCFLAGS isn't important to you (it's for my use in some special contexts). -CFLAGS=-I$(srcdir) -DPOSIX_MISTAKE @CFLAGS@ +CFLAGS=-I$(srcdir) -DPOSIX_MISTAKE @CFLAGS@ @CFLAGS_SHLIB@ # If you have a pre-ANSI compiler, put -o into MKHFLAGS. If you want # the Berkeley __P macro, put -b in.