 |
 |
 |
 |
|
|
Date: 03/29/00
- Next message: Bug Database: "[PHP-DEV] Bug #2574 Updated: DSO module fails link (dupe symbols _pcre*)"
- Previous message: seth <email protected>: "[PHP-DEV] PHP 4.0 Bug #3974: Object properties produce unexpected results upon registering them to a session"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
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 = <email protected>@
@@ -124,7 +124,7 @@
libphp3.so: mod_php3.c libmodphp3-so.a <email protected>@ <email protected>@
- <email protected> -f ./mod_php3.c || test -L ./mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c ./mod_php3.c
- <email protected> -f ./mod_php3.c || test -h ./mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c ./mod_php3.c
- $(APXS) -c -o libphp3.so <email protected>@ -I$(srcdir) -I. <email protected>@ ./mod_php3.c libmodphp3-so.a $(APXS_LDFLAGS) <email protected>@ <email protected>@
+ $(APXS) -c -o libphp3.so <email protected>@ -I$(srcdir) -I. <email protected>@ ./mod_php3.c libmodphp3-so.a $(APXS_LDFLAGS) <email protected>@
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=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@"
+ APXS_LDFLAGS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@"
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 = <email protected>@
-CFLAGS = <email protected>@
+CFLAGS = <email protected>@ <email protected>@
RANLIB = <email protected>@
VPATH = <email protected>@
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 <email protected>@
+CFLAGS=-I$(srcdir) -DPOSIX_MISTAKE <email protected>@ <email protected>@
# If you have a pre-ANSI compiler, put -o into MKHFLAGS. If you want
# the Berkeley __P macro, put -b in.
-- PHP Development Mailing List <http://www.php.net/> To unsubscribe, e-mail: php-dev-unsubscribe <email protected> For additional commands, e-mail: php-dev-help <email protected> To contact the list administrators, e-mail: php-list-admin <email protected>
- Next message: Bug Database: "[PHP-DEV] Bug #2574 Updated: DSO module fails link (dupe symbols _pcre*)"
- Previous message: seth <email protected>: "[PHP-DEV] PHP 4.0 Bug #3974: Object properties produce unexpected results upon registering them to a session"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]