cvs: /php4 configure.in /php4/ext/apache Makefile.am /php4/ext/aspell Makefile.am /php4/ext/bcmath Makefile.am /php4/ext/dav Makefile.am /php4/ext/db
Makefile.am /php4/ext/dba Makefile.am /php4/ext/dbase Makefile.am /php4/ext/fdf Makefile.am /php4/ext/filepro Makefile.am /php4/ext/ftp Makefile.am
/php4/ext/gd Makefile.am /php4/ext/gettext Makefile.am /php4/ext/hyperwave Makefile.am /php4/ext/icap Makefile.am /php4/ext/imap Makefile.am
/php4/ext/informix Makefile.am /php4/ext/interbase Makefile.am /php4/ext/ldap Makefile.am /php4/ext/mcal Makefile.am /php4/ext/mcrypt Makefile.am
/php4/ext/mhash Makefile.am /php4/ext/msql Makefile.am /php4/ext/oci8 Makefile.am /php4/ext/odbc Makefile.am /php4/ext/oracle Makefile.am
/php4/ext/pcre Makefile.am /php4/ext/pdf Makefile.am /php4/ext/readline Makefile.am /php4/ext/session Makefile.am /php4/ext/standard Makefile.am
/php4/ext/sybase Makefile.am /php4/ext/sybase_ct Makefile.am /php4/ext/sysvsem Makefile.am /php4/ext/sysvshm Makefile.am /php4/ext/wddx Makefile.am
/php4/ext/yp Makefile.am /php4/ext/zlib Makefile.am /php4/sapi/aolserver Makefile.am /php4/sapi/cgi Makefile.am /php4/sapi/isapi Makefile.am
| From: | Sascha Schumann | Date: | Sat, 13 Nov 1999 12:40:52 +0000 |
| Subject: | cvs: /php4 configure.in /php4/ext/apache Makefile.am /php4/ext/aspell Makefile.am /php4/ext/bcmath Makefile.am /php4/ext/dav Makefile.am /php4/ext/db Makefile.am /php4/ext/dba Makefile.am /php4/ext/dbase Makefile.am /php4/ext/fdf Makefile.am /php4/ext/filepro Makefile.am /php4/ext/ftp Makefile.am /php4/ext/gd Makefile.am /php4/ext/gettext Makefile.am /php4/ext/hyperwave Makefile.am /php4/ext/icap Makefile.am /php4/ext/imap Makefile.am /php4/ext/informix Makefile.am /php4/ext/interbase Makefile.am /php4/ext/ldap Makefile.am /php4/ext/mcal Makefile.am /php4/ext/mcrypt Makefile.am /php4/ext/mhash Makefile.am /php4/ext/msql Makefile.am /php4/ext/oci8 Makefile.am /php4/ext/odbc Makefile.am /php4/ext/oracle Makefile.am /php4/ext/pcre Makefile.am /php4/ext/pdf Makefile.am /php4/ext/readline Makefile.am /php4/ext/session Makefile.am /php4/ext/standard Makefile.am /php4/ext/sybase Makefile.am /php4/ext/sybase_ct Makefile.am /php4/ext/sysvsem Makefile.am /php4/ext/sysvshm Makefile.am /php4/ext/wddx Makefile.am /php4/ext/yp Makefile.am /php4/ext/zlib Makefile.am /php4/sapi/aolserver Makefile.am /php4/sapi/cgi Makefile.am /php4/sapi/isapi Makefile.am |
||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-6169@lists.php.net to get a copy of this message | ||
sas Sat Nov 13 07:40:52 1999 EDT
Modified files:
/php4 configure.in
/php4/ext/apache Makefile.am
/php4/ext/aspell Makefile.am
/php4/ext/bcmath Makefile.am
/php4/ext/dav Makefile.am
/php4/ext/db Makefile.am
/php4/ext/dba Makefile.am
/php4/ext/dbase Makefile.am
/php4/ext/fdf Makefile.am
/php4/ext/filepro Makefile.am
/php4/ext/ftp Makefile.am
/php4/ext/gd Makefile.am
/php4/ext/gettext Makefile.am
/php4/ext/hyperwave Makefile.am
/php4/ext/icap Makefile.am
/php4/ext/imap Makefile.am
/php4/ext/informix Makefile.am
/php4/ext/interbase Makefile.am
/php4/ext/ldap Makefile.am
/php4/ext/mcal Makefile.am
/php4/ext/mcrypt Makefile.am
/php4/ext/mhash Makefile.am
/php4/ext/msql Makefile.am
/php4/ext/oci8 Makefile.am
/php4/ext/odbc Makefile.am
/php4/ext/oracle Makefile.am
/php4/ext/pcre Makefile.am
/php4/ext/pdf Makefile.am
/php4/ext/readline Makefile.am
/php4/ext/session Makefile.am
/php4/ext/standard Makefile.am
/php4/ext/sybase Makefile.am
/php4/ext/sybase_ct Makefile.am
/php4/ext/sysvsem Makefile.am
/php4/ext/sysvshm Makefile.am
/php4/ext/wddx Makefile.am
/php4/ext/yp Makefile.am
/php4/ext/zlib Makefile.am
/php4/sapi/aolserver Makefile.am
/php4/sapi/cgi Makefile.am
/php4/sapi/isapi Makefile.am
Log:
Remove the extra INCLUDES line from most automake Mafiles. This is not
necessary, because we can change the value of INCLUDES globally in one
place (configure.in).
Also add two defines in thread-safe mode
(_REENTRANT and POSIX_PTHREAD_SEMANTICS)
Index: php4/configure.in
diff -u php4/configure.in:1.26 php4/configure.in:1.27
--- php4/configure.in:1.26 Fri Nov 12 15:56:29 1999
+++ php4/configure.in Sat Nov 13 07:40:27 1999
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.26 1999/11/12 20:56:29 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.27 1999/11/13 12:40:27 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(0)
@@ -154,7 +154,7 @@
LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
fi
-INCLUDES="-I\$(top_builddir)/libzend -I\$(top_builddir)/TSRM"
+INCLUDES="-I\$(top_builddir)/libzend -I\$(top_srcdir) -I\$(top_srcdir)/libzend"
AC_SUBST(INCLUDES)
AC_CHECK_LIB(nsl, gethostname, [
@@ -641,6 +641,8 @@
TSRM_LIB='TSRM/libtsrm.la'
TSRM_DIR=TSRM
AC_DEFINE(ZTS)
+ INCLUDES="$INCLUDES -I$\(top_builddir)/TSRM"
+ CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
Index: php4/ext/apache/Makefile.am
diff -u php4/ext/apache/Makefile.am:1.2 php4/ext/apache/Makefile.am:1.3
--- php4/ext/apache/Makefile.am:1.2 Mon Oct 4 11:18:03 1999
+++ php4/ext/apache/Makefile.am Sat Nov 13 07:40:28 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:03 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:28 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_apache.la
libphpext_apache_la_SOURCES=apache.c
Index: php4/ext/aspell/Makefile.am
diff -u php4/ext/aspell/Makefile.am:1.2 php4/ext/aspell/Makefile.am:1.3
--- php4/ext/aspell/Makefile.am:1.2 Mon Oct 4 11:18:03 1999
+++ php4/ext/aspell/Makefile.am Sat Nov 13 07:40:28 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:03 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:28 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_aspell.la
libphpext_aspell_la_SOURCES=aspell.c
Index: php4/ext/bcmath/Makefile.am
diff -u php4/ext/bcmath/Makefile.am:1.2 php4/ext/bcmath/Makefile.am:1.3
--- php4/ext/bcmath/Makefile.am:1.2 Mon Oct 4 11:18:04 1999
+++ php4/ext/bcmath/Makefile.am Sat Nov 13 07:40:29 1999
@@ -1,5 +1,4 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:04 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:29 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_bcmath.la
libphpext_bcmath_la_SOURCES=bcmath.c number.c
Index: php4/ext/dav/Makefile.am
diff -u php4/ext/dav/Makefile.am:1.2 php4/ext/dav/Makefile.am:1.3
--- php4/ext/dav/Makefile.am:1.2 Mon Oct 4 11:18:04 1999
+++ php4/ext/dav/Makefile.am Sat Nov 13 07:40:29 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:04 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:29 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_dav.la
libphpext_dav_la_SOURCES=dav.c
Index: php4/ext/db/Makefile.am
diff -u php4/ext/db/Makefile.am:1.2 php4/ext/db/Makefile.am:1.3
--- php4/ext/db/Makefile.am:1.2 Mon Oct 4 11:18:05 1999
+++ php4/ext/db/Makefile.am Sat Nov 13 07:40:30 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:05 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:30 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_db.la
libphpext_db_la_SOURCES=db.c
Index: php4/ext/dba/Makefile.am
diff -u php4/ext/dba/Makefile.am:1.2 php4/ext/dba/Makefile.am:1.3
--- php4/ext/dba/Makefile.am:1.2 Mon Oct 4 11:18:05 1999
+++ php4/ext/dba/Makefile.am Sat Nov 13 07:40:30 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:05 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:30 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_dba.la
libphpext_dba_la_SOURCES=dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c \
dba_ndbm.c
Index: php4/ext/dbase/Makefile.am
diff -u php4/ext/dbase/Makefile.am:1.2 php4/ext/dbase/Makefile.am:1.3
--- php4/ext/dbase/Makefile.am:1.2 Mon Oct 4 11:18:06 1999
+++ php4/ext/dbase/Makefile.am Sat Nov 13 07:40:31 1999
@@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in -*- makefile -*-
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_dbase.la
libphpext_dbase_la_SOURCES=dbf_head.c dbf_rec.c dbf_misc.c dbf_ndx.c dbase.c
Index: php4/ext/fdf/Makefile.am
diff -u php4/ext/fdf/Makefile.am:1.2 php4/ext/fdf/Makefile.am:1.3
--- php4/ext/fdf/Makefile.am:1.2 Mon Oct 4 11:18:06 1999
+++ php4/ext/fdf/Makefile.am Sat Nov 13 07:40:31 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:06 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:31 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_fdf.la
libphpext_fdf_la_SOURCES=fdf.c
Index: php4/ext/filepro/Makefile.am
diff -u php4/ext/filepro/Makefile.am:1.2 php4/ext/filepro/Makefile.am:1.3
--- php4/ext/filepro/Makefile.am:1.2 Mon Oct 4 11:18:07 1999
+++ php4/ext/filepro/Makefile.am Sat Nov 13 07:40:32 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:07 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:32 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_filepro.la
libphpext_filepro_la_SOURCES=filepro.c
Index: php4/ext/ftp/Makefile.am
diff -u php4/ext/ftp/Makefile.am:1.3 php4/ext/ftp/Makefile.am:1.4
--- php4/ext/ftp/Makefile.am:1.3 Mon Oct 4 11:18:07 1999
+++ php4/ext/ftp/Makefile.am Sat Nov 13 07:40:32 1999
@@ -1,5 +1,4 @@
-# $Id: Makefile.am,v 1.3 1999/10/04 15:18:07 sas Exp $
+# $Id: Makefile.am,v 1.4 1999/11/13 12:40:32 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_ftp.la
libphpext_ftp_la_SOURCES=php_ftp.c ftp.c
Index: php4/ext/gd/Makefile.am
diff -u php4/ext/gd/Makefile.am:1.5 php4/ext/gd/Makefile.am:1.6
--- php4/ext/gd/Makefile.am:1.5 Sun Oct 17 10:57:49 1999
+++ php4/ext/gd/Makefile.am Sat Nov 13 07:40:34 1999
@@ -1,7 +1,6 @@
## Process this file with automake to produce Makefile.in
SRC=gd.c gdcache.c gdttf.c
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=@GD_STATIC@
EXTRA_LTLIBRARIES=libphpext_gd.la gd.la
libphpext_gd_la_SOURCES=$(SRC)
Index: php4/ext/gettext/Makefile.am
diff -u php4/ext/gettext/Makefile.am:1.2 php4/ext/gettext/Makefile.am:1.3
--- php4/ext/gettext/Makefile.am:1.2 Mon Oct 4 11:18:08 1999
+++ php4/ext/gettext/Makefile.am Sat Nov 13 07:40:35 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:08 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:35 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_gettext.la
libphpext_gettext_la_SOURCES=gettext.c
Index: php4/ext/hyperwave/Makefile.am
diff -u php4/ext/hyperwave/Makefile.am:1.2 php4/ext/hyperwave/Makefile.am:1.3
--- php4/ext/hyperwave/Makefile.am:1.2 Mon Oct 4 11:18:09 1999
+++ php4/ext/hyperwave/Makefile.am Sat Nov 13 07:40:36 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:09 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:36 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_hyperwave.la
libphpext_hyperwave_la_SOURCES=hw.c hg_comm.c
Index: php4/ext/icap/Makefile.am
diff -u php4/ext/icap/Makefile.am:1.3 php4/ext/icap/Makefile.am:1.4
--- php4/ext/icap/Makefile.am:1.3 Mon Oct 4 11:18:09 1999
+++ php4/ext/icap/Makefile.am Sat Nov 13 07:40:36 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.3 1999/10/04 15:18:09 sas Exp $
+# $Id: Makefile.am,v 1.4 1999/11/13 12:40:36 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_icap.la
libphpext_icap_la_SOURCES=php3_icap.c
Index: php4/ext/imap/Makefile.am
diff -u php4/ext/imap/Makefile.am:1.2 php4/ext/imap/Makefile.am:1.3
--- php4/ext/imap/Makefile.am:1.2 Mon Oct 4 11:18:10 1999
+++ php4/ext/imap/Makefile.am Sat Nov 13 07:40:37 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:10 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:37 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_imap.la
libphpext_imap_la_SOURCES=imap.c
Index: php4/ext/informix/Makefile.am
diff -u php4/ext/informix/Makefile.am:1.6 php4/ext/informix/Makefile.am:1.7
--- php4/ext/informix/Makefile.am:1.6 Sun Oct 10 13:12:22 1999
+++ php4/ext/informix/Makefile.am Sat Nov 13 07:40:37 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.6 1999/10/10 17:12:22 sas Exp $
+# $Id: Makefile.am,v 1.7 1999/11/13 12:40:37 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_informix.la
noinst_LIBRARIES=libifx.a
libifx_a_SOURCES=stub.c
Index: php4/ext/interbase/Makefile.am
diff -u php4/ext/interbase/Makefile.am:1.2 php4/ext/interbase/Makefile.am:1.3
--- php4/ext/interbase/Makefile.am:1.2 Mon Oct 4 11:18:11 1999
+++ php4/ext/interbase/Makefile.am Sat Nov 13 07:40:38 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:11 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:38 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_interbase.la
libphpext_interbase_la_SOURCES=interbase.c
Index: php4/ext/ldap/Makefile.am
diff -u php4/ext/ldap/Makefile.am:1.2 php4/ext/ldap/Makefile.am:1.3
--- php4/ext/ldap/Makefile.am:1.2 Mon Oct 4 11:18:11 1999
+++ php4/ext/ldap/Makefile.am Sat Nov 13 07:40:38 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:11 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:38 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_ldap.la
libphpext_ldap_la_SOURCES=ldap.c
Index: php4/ext/mcal/Makefile.am
diff -u php4/ext/mcal/Makefile.am:1.2 php4/ext/mcal/Makefile.am:1.3
--- php4/ext/mcal/Makefile.am:1.2 Mon Oct 4 11:18:12 1999
+++ php4/ext/mcal/Makefile.am Sat Nov 13 07:40:39 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:12 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:39 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_mcal.la
libphpext_mcal_la_SOURCES=php3_mcal.c
Index: php4/ext/mcrypt/Makefile.am
diff -u php4/ext/mcrypt/Makefile.am:1.2 php4/ext/mcrypt/Makefile.am:1.3
--- php4/ext/mcrypt/Makefile.am:1.2 Mon Oct 4 11:18:12 1999
+++ php4/ext/mcrypt/Makefile.am Sat Nov 13 07:40:39 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:12 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:39 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_mcrypt.la
libphpext_mcrypt_la_SOURCES=mcrypt.c
Index: php4/ext/mhash/Makefile.am
diff -u php4/ext/mhash/Makefile.am:1.2 php4/ext/mhash/Makefile.am:1.3
--- php4/ext/mhash/Makefile.am:1.2 Mon Oct 4 11:18:13 1999
+++ php4/ext/mhash/Makefile.am Sat Nov 13 07:40:40 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:13 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:40 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_mhash.la
libphpext_mhash_la_SOURCES=mhash.c
Index: php4/ext/msql/Makefile.am
diff -u php4/ext/msql/Makefile.am:1.3 php4/ext/msql/Makefile.am:1.4
--- php4/ext/msql/Makefile.am:1.3 Tue Oct 5 07:48:04 1999
+++ php4/ext/msql/Makefile.am Sat Nov 13 07:40:41 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.3 1999/10/05 11:48:04 sas Exp $
+# $Id: Makefile.am,v 1.4 1999/11/13 12:40:41 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_msql.la
libphpext_msql_la_SOURCES=php_msql.c
Index: php4/ext/oci8/Makefile.am
diff -u php4/ext/oci8/Makefile.am:1.2 php4/ext/oci8/Makefile.am:1.3
--- php4/ext/oci8/Makefile.am:1.2 Mon Oct 4 11:18:14 1999
+++ php4/ext/oci8/Makefile.am Sat Nov 13 07:40:42 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:14 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:42 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_oci8.la
libphpext_oci8_la_SOURCES=oci8.c
Index: php4/ext/odbc/Makefile.am
diff -u php4/ext/odbc/Makefile.am:1.3 php4/ext/odbc/Makefile.am:1.4
--- php4/ext/odbc/Makefile.am:1.3 Mon Oct 4 11:18:14 1999
+++ php4/ext/odbc/Makefile.am Sat Nov 13 07:40:42 1999
@@ -1,4 +1,3 @@
## Process this file with automake to produce Makefile.in
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_odbc.la
libphpext_odbc_la_SOURCES=php_odbc.c velocis.c
Index: php4/ext/oracle/Makefile.am
diff -u php4/ext/oracle/Makefile.am:1.3 php4/ext/oracle/Makefile.am:1.4
--- php4/ext/oracle/Makefile.am:1.3 Mon Oct 4 11:18:15 1999
+++ php4/ext/oracle/Makefile.am Sat Nov 13 07:40:43 1999
@@ -1,5 +1,4 @@
-# $Id: Makefile.am,v 1.3 1999/10/04 15:18:15 sas Exp $
+# $Id: Makefile.am,v 1.4 1999/11/13 12:40:43 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_oracle.la
libphpext_oracle_la_SOURCES=oracle.c
Index: php4/ext/pcre/Makefile.am
diff -u php4/ext/pcre/Makefile.am:1.5 php4/ext/pcre/Makefile.am:1.6
--- php4/ext/pcre/Makefile.am:1.5 Mon Oct 4 11:18:15 1999
+++ php4/ext/pcre/Makefile.am Sat Nov 13 07:40:43 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.5 1999/10/04 15:18:15 sas Exp $
+# $Id: Makefile.am,v 1.6 1999/11/13 12:40:43 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_pcre.la
libphpext_pcre_la_SOURCES=php_pcre.c
libphpext_pcre_la_LIBADD = @PCRE_LIBADD@
Index: php4/ext/pdf/Makefile.am
diff -u php4/ext/pdf/Makefile.am:1.2 php4/ext/pdf/Makefile.am:1.3
--- php4/ext/pdf/Makefile.am:1.2 Mon Oct 4 11:18:17 1999
+++ php4/ext/pdf/Makefile.am Sat Nov 13 07:40:44 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:17 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:44 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_pdf.la
libphpext_pdf_la_SOURCES=pdf.c
Index: php4/ext/readline/Makefile.am
diff -u php4/ext/readline/Makefile.am:1.1 php4/ext/readline/Makefile.am:1.2
--- php4/ext/readline/Makefile.am:1.1 Thu Oct 14 11:20:40 1999
+++ php4/ext/readline/Makefile.am Sat Nov 13 07:40:44 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.1 1999/10/14 15:20:40 thies Exp $
+# $Id: Makefile.am,v 1.2 1999/11/13 12:40:44 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_readline.la
libphpext_readline_la_SOURCES=readline.c
Index: php4/ext/session/Makefile.am
diff -u php4/ext/session/Makefile.am:1.4 php4/ext/session/Makefile.am:1.5
--- php4/ext/session/Makefile.am:1.4 Mon Oct 4 11:18:18 1999
+++ php4/ext/session/Makefile.am Sat Nov 13 07:40:45 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.4 1999/10/04 15:18:18 sas Exp $
+# $Id: Makefile.am,v 1.5 1999/11/13 12:40:45 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_session.la
libphpext_session_la_SOURCES=session.c mod_files.c mod_mm.c mod_user.c
Index: php4/ext/standard/Makefile.am
diff -u php4/ext/standard/Makefile.am:1.16 php4/ext/standard/Makefile.am:1.17
--- php4/ext/standard/Makefile.am:1.16 Wed Oct 27 14:30:40 1999
+++ php4/ext/standard/Makefile.am Sat Nov 13 07:40:45 1999
@@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_standard.la
libphpext_standard_la_SOURCES=\
base64.c basic_functions.c browscap.c crypt.c cyr_convert.c datetime.c \
Index: php4/ext/sybase/Makefile.am
diff -u php4/ext/sybase/Makefile.am:1.3 php4/ext/sybase/Makefile.am:1.4
--- php4/ext/sybase/Makefile.am:1.3 Mon Oct 4 11:18:19 1999
+++ php4/ext/sybase/Makefile.am Sat Nov 13 07:40:47 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.3 1999/10/04 15:18:19 sas Exp $
+# $Id: Makefile.am,v 1.4 1999/11/13 12:40:47 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_sybase.la
libphpext_sybase_la_SOURCES=sybase.c
Index: php4/ext/sybase_ct/Makefile.am
diff -u php4/ext/sybase_ct/Makefile.am:1.2 php4/ext/sybase_ct/Makefile.am:1.3
--- php4/ext/sybase_ct/Makefile.am:1.2 Mon Oct 4 11:18:20 1999
+++ php4/ext/sybase_ct/Makefile.am Sat Nov 13 07:40:47 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:20 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:47 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_sybase_ct.la
libphpext_sybase_ct_la_SOURCES=php_sybase_ct.c
Index: php4/ext/sysvsem/Makefile.am
diff -u php4/ext/sysvsem/Makefile.am:1.2 php4/ext/sysvsem/Makefile.am:1.3
--- php4/ext/sysvsem/Makefile.am:1.2 Mon Oct 4 11:18:20 1999
+++ php4/ext/sysvsem/Makefile.am Sat Nov 13 07:40:48 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:20 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:48 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_sysvsem.la
libphpext_sysvsem_la_SOURCES=sysvsem.c
Index: php4/ext/sysvshm/Makefile.am
diff -u php4/ext/sysvshm/Makefile.am:1.2 php4/ext/sysvshm/Makefile.am:1.3
--- php4/ext/sysvshm/Makefile.am:1.2 Mon Oct 4 11:18:21 1999
+++ php4/ext/sysvshm/Makefile.am Sat Nov 13 07:40:48 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:21 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:48 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_sysvshm.la
libphpext_sysvshm_la_SOURCES=sysvshm.c
Index: php4/ext/wddx/Makefile.am
diff -u php4/ext/wddx/Makefile.am:1.2 php4/ext/wddx/Makefile.am:1.3
--- php4/ext/wddx/Makefile.am:1.2 Mon Oct 4 11:18:21 1999
+++ php4/ext/wddx/Makefile.am Sat Nov 13 07:40:49 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:21 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:49 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_wddx.la
libphpext_wddx_la_SOURCES=wddx.c
Index: php4/ext/yp/Makefile.am
diff -u php4/ext/yp/Makefile.am:1.2 php4/ext/yp/Makefile.am:1.3
--- php4/ext/yp/Makefile.am:1.2 Mon Oct 4 11:18:22 1999
+++ php4/ext/yp/Makefile.am Sat Nov 13 07:40:49 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:22 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:49 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_yp.la
libphpext_yp_la_SOURCES=yp.c
Index: php4/ext/zlib/Makefile.am
diff -u php4/ext/zlib/Makefile.am:1.2 php4/ext/zlib/Makefile.am:1.3
--- php4/ext/zlib/Makefile.am:1.2 Mon Oct 4 11:18:23 1999
+++ php4/ext/zlib/Makefile.am Sat Nov 13 07:40:50 1999
@@ -1,6 +1,5 @@
-# $Id: Makefile.am,v 1.2 1999/10/04 15:18:23 sas Exp $
+# $Id: Makefile.am,v 1.3 1999/11/13 12:40:50 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpext_zlib.la
libphpext_zlib_la_SOURCES=zlib.c
Index: php4/sapi/aolserver/Makefile.am
diff -u php4/sapi/aolserver/Makefile.am:1.3 php4/sapi/aolserver/Makefile.am:1.4
--- php4/sapi/aolserver/Makefile.am:1.3 Thu Oct 7 14:46:40 1999
+++ php4/sapi/aolserver/Makefile.am Sat Nov 13 07:40:50 1999
@@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpsapi_aolserver.la
libphpsapi_aolserver_la_SOURCES=aolserver.c
Index: php4/sapi/cgi/Makefile.am
diff -u php4/sapi/cgi/Makefile.am:1.2 php4/sapi/cgi/Makefile.am:1.3
--- php4/sapi/cgi/Makefile.am:1.2 Mon Oct 4 11:18:25 1999
+++ php4/sapi/cgi/Makefile.am Sat Nov 13 07:40:51 1999
@@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LTLIBRARIES=libphpsapi_cgi.la
libphpsapi_cgi_la_SOURCES=cgi_main.c
Index: php4/sapi/isapi/Makefile.am
diff -u php4/sapi/isapi/Makefile.am:1.1 php4/sapi/isapi/Makefile.am:1.2
--- php4/sapi/isapi/Makefile.am:1.1 Mon Sep 27 12:34:28 1999
+++ php4/sapi/isapi/Makefile.am Sat Nov 13 07:40:51 1999
@@ -1,5 +1,4 @@
## Process this file with automake to produce Makefile.in
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
noinst_LIBRARIES=libphpsapi_isapi.a
libphpsapi_isapi_a_SOURCES=php4isapi.c