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)

diff --git a/configure.in b/configure.in
index cbf3489673d2b4c6090b000317703dc2637844c1..89e354d53479fab72a6fccf4db40c109d0344c0e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -154,7 +154,7 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
        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 @@ AC_ARG_ENABLE(thread-safety,
     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)

diff --git a/ext/apache/Makefile.am b/ext/apache/Makefile.am
index 9a7d7ab1b356bf5d3885ab733b45bd2c98bab8cc..32b246cf004374e9f931477317897776346d9c93 100644 (file)
--- a/ext/apache/Makefile.am
+++ b/ext/apache/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_apache.la
 libphpext_apache_la_SOURCES=apache.c
 

diff --git a/ext/aspell/Makefile.am b/ext/aspell/Makefile.am
index f352b50b58540107b872e0189a9e9772147b4ec1..355308958b775f4c8274621f14bfd6315e63d690 100644 (file)
--- a/ext/aspell/Makefile.am
+++ b/ext/aspell/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_aspell.la
 libphpext_aspell_la_SOURCES=aspell.c
 

diff --git a/ext/bcmath/Makefile.am b/ext/bcmath/Makefile.am
index e73bafce78ed7dfe09a97c665f03b73a629ce4b7..e529f579aef9262c6ee643e09b3dd265bb73783d 100644 (file)
--- a/ext/bcmath/Makefile.am
+++ b/ext/bcmath/Makefile.am
@@ -1,5 +1,4 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_bcmath.la
 libphpext_bcmath_la_SOURCES=bcmath.c number.c

diff --git a/ext/dav/Makefile.am b/ext/dav/Makefile.am
index 3b9e629ceafdc61f6a38cb23dce0e5246a7ac0bc..63d0510a9789ab53fe48040df6943e3e2bb278ce 100644 (file)
--- a/ext/dav/Makefile.am
+++ b/ext/dav/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_dav.la
 libphpext_dav_la_SOURCES=dav.c
 

diff --git a/ext/db/Makefile.am b/ext/db/Makefile.am
index 71d2ea180b9919aeb859354142558a73e655e577..7dc6e32d07d728085f7bed0dc9e795f13affcb98 100644 (file)
--- a/ext/db/Makefile.am
+++ b/ext/db/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_db.la
 libphpext_db_la_SOURCES=db.c
 

diff --git a/ext/dba/Makefile.am b/ext/dba/Makefile.am
index 2c36702cd155956a7d7e6b8282027e3497e3d7de..431642383455015cdb8b8ab0c2e0cc4c4ab137ff 100644 (file)
--- a/ext/dba/Makefile.am
+++ b/ext/dba/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-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

diff --git a/ext/dbase/Makefile.am b/ext/dbase/Makefile.am
index d9ce4aa738fe793ceda967cc2b918ac7459a6929..0805cabe7486227218f7aa08b908a2ba113866b7 100644 (file)
--- a/ext/dbase/Makefile.am
+++ b/ext/dbase/Makefile.am
@@ -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
 

diff --git a/ext/fdf/Makefile.am b/ext/fdf/Makefile.am
index 2dd7234f8144dc36586b0c96fa467879846bbcc0..482b35fc87734f8bdbf0a692a2c66c478fd01f84 100644 (file)
--- a/ext/fdf/Makefile.am
+++ b/ext/fdf/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_fdf.la
 libphpext_fdf_la_SOURCES=fdf.c
 

diff --git a/ext/filepro/Makefile.am b/ext/filepro/Makefile.am
index 78e397fa29f8a454a086905891513e623a50e604..4a97e91f971a285bba22127169282a8bd6b2a912 100644 (file)
--- a/ext/filepro/Makefile.am
+++ b/ext/filepro/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_filepro.la
 libphpext_filepro_la_SOURCES=filepro.c
 

diff --git a/ext/ftp/Makefile.am b/ext/ftp/Makefile.am
index 11f1ce57429fe7fedd7bd13cc73f0df698bcbad1..8ba82c10d1c4fda75c20a18f6732165e91f837a1 100644 (file)
--- a/ext/ftp/Makefile.am
+++ b/ext/ftp/Makefile.am
@@ -1,5 +1,4 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_ftp.la
 libphpext_ftp_la_SOURCES=php_ftp.c ftp.c

diff --git a/ext/gd/Makefile.am b/ext/gd/Makefile.am
index 4c6825eac34c45db5bce01b509211e0a8836925a..fca3e4c513e698b9a99f7d5cc8ff2a2514042f11 100644 (file)
--- a/ext/gd/Makefile.am
+++ b/ext/gd/Makefile.am
@@ -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)

diff --git a/ext/gettext/Makefile.am b/ext/gettext/Makefile.am
index a5b29b6cd55562072f81ad96599f1eae59682f1b..d6ef557cce2418fa8ae872bf415b1b34fedacd75 100644 (file)
--- a/ext/gettext/Makefile.am
+++ b/ext/gettext/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_gettext.la
 libphpext_gettext_la_SOURCES=gettext.c
 

diff --git a/ext/hyperwave/Makefile.am b/ext/hyperwave/Makefile.am
index 3b92146327aee12ab4974978b98ffdbdde9ce8e0..17277ee0f2025ab136f6a8c86e0b28cc4dc94313 100644 (file)
--- a/ext/hyperwave/Makefile.am
+++ b/ext/hyperwave/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_hyperwave.la
 libphpext_hyperwave_la_SOURCES=hw.c hg_comm.c
 

diff --git a/ext/icap/Makefile.am b/ext/icap/Makefile.am
index 964fd7de0a59e6c3fd077f95c461f23d7ff81327..414a17b64b06cf4ea8f268c8bfec9896d5ed5691 100644 (file)
--- a/ext/icap/Makefile.am
+++ b/ext/icap/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_icap.la
 libphpext_icap_la_SOURCES=php3_icap.c
 

diff --git a/ext/imap/Makefile.am b/ext/imap/Makefile.am
index 5ab4011b34fde54c5bc2aa0b3c60940f4773d6ea..75e6998ebe5adf1eaba674e5ec3d7b64121e2281 100644 (file)
--- a/ext/imap/Makefile.am
+++ b/ext/imap/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_imap.la
 libphpext_imap_la_SOURCES=imap.c
 

diff --git a/ext/informix/Makefile.am b/ext/informix/Makefile.am
index 89e65f2d30b279ed0ba6e4f95368e95d0bc7d0b2..587f25a2d6dadc51fe0200c3cb97e1d07359b2bb 100644 (file)
--- a/ext/informix/Makefile.am
+++ b/ext/informix/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_informix.la
 noinst_LIBRARIES=libifx.a
 libifx_a_SOURCES=stub.c

diff --git a/ext/interbase/Makefile.am b/ext/interbase/Makefile.am
index fd0e7fdfdf2b6b2c0aa2647c8d82949ba7dd75f0..5d2d598a16052ff1840901ae6671377f60e940de 100644 (file)
--- a/ext/interbase/Makefile.am
+++ b/ext/interbase/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_interbase.la
 libphpext_interbase_la_SOURCES=interbase.c
 

diff --git a/ext/ldap/Makefile.am b/ext/ldap/Makefile.am
index cf5d5d241b86b3480f6a7d93cd362aee0c6e5da4..c173425b042fb970a8c4e6621f47381a66b02de4 100644 (file)
--- a/ext/ldap/Makefile.am
+++ b/ext/ldap/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_ldap.la
 libphpext_ldap_la_SOURCES=ldap.c
 

diff --git a/ext/mcal/Makefile.am b/ext/mcal/Makefile.am
index ce59b52e196c885529847be39c25b7d2ce608fe3..0b19bbebe2229c3cce0ed8db753cc83813462a22 100644 (file)
--- a/ext/mcal/Makefile.am
+++ b/ext/mcal/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_mcal.la
 libphpext_mcal_la_SOURCES=php3_mcal.c
 

diff --git a/ext/mcrypt/Makefile.am b/ext/mcrypt/Makefile.am
index aaaee46d69682fcfdf0a744e107083362d646e91..8969670a26d852993eddfb537b55fdf056fcc3f4 100644 (file)
--- a/ext/mcrypt/Makefile.am
+++ b/ext/mcrypt/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_mcrypt.la
 libphpext_mcrypt_la_SOURCES=mcrypt.c
 

diff --git a/ext/mhash/Makefile.am b/ext/mhash/Makefile.am
index 792f7be6e01c7eee19661a06ff526c2f323580d7..9747f65887a26d9b736132924e3a3ae2528b842f 100644 (file)
--- a/ext/mhash/Makefile.am
+++ b/ext/mhash/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_mhash.la
 libphpext_mhash_la_SOURCES=mhash.c
 

diff --git a/ext/msql/Makefile.am b/ext/msql/Makefile.am
index 66d7bf7b18656f747c984fc9d30f9290b678cacc..b7c5afbfee99b39c9f3b4795a186efe1cdd79714 100644 (file)
--- a/ext/msql/Makefile.am
+++ b/ext/msql/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_msql.la
 libphpext_msql_la_SOURCES=php_msql.c
 

diff --git a/ext/oci8/Makefile.am b/ext/oci8/Makefile.am
index 30ad74dabcfea51c5800183951aef17ca3d9e844..be5e7e03c25140a3c204c13bfe3f77b43c80a3fb 100644 (file)
--- a/ext/oci8/Makefile.am
+++ b/ext/oci8/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_oci8.la
 libphpext_oci8_la_SOURCES=oci8.c
 

diff --git a/ext/odbc/Makefile.am b/ext/odbc/Makefile.am
index c43878c88ab78175e0c9f535cf2a9ffc41c4b416..588eaac94ebf29c04dab422e700a7ae06f2328f1 100644 (file)
--- a/ext/odbc/Makefile.am
+++ b/ext/odbc/Makefile.am
@@ -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

diff --git a/ext/oracle/Makefile.am b/ext/oracle/Makefile.am
index f5becaea9a859dffb1485efda3f5ca910f22a34e..ec234949e337efb4b12eb41a534fb824d3a0e856 100644 (file)
--- a/ext/oracle/Makefile.am
+++ b/ext/oracle/Makefile.am
@@ -1,5 +1,4 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_oracle.la
 libphpext_oracle_la_SOURCES=oracle.c

diff --git a/ext/pcre/Makefile.am b/ext/pcre/Makefile.am
index c9c39d936241cbc83c755bc3892ea3fc6e47fc1f..4f4473bb82cd2d4c3dace90ab4cbbbe130f7d1e0 100644 (file)
--- a/ext/pcre/Makefile.am
+++ b/ext/pcre/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-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@

diff --git a/ext/pdf/Makefile.am b/ext/pdf/Makefile.am
index bbae6167ff978699628da966a1fae9ce45495fa3..a483bf3af97ea1919e847f39cbf1683bb4bed463 100644 (file)
--- a/ext/pdf/Makefile.am
+++ b/ext/pdf/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_pdf.la
 libphpext_pdf_la_SOURCES=pdf.c
 

diff --git a/ext/readline/Makefile.am b/ext/readline/Makefile.am
index 75de323d3548c3c31aa67f570ba18a10b5e1cebc..ead3f7bc47afd5ec76e24f13a410727a4f6c3603 100644 (file)
--- a/ext/readline/Makefile.am
+++ b/ext/readline/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_readline.la
 libphpext_readline_la_SOURCES=readline.c
 

diff --git a/ext/session/Makefile.am b/ext/session/Makefile.am
index a059151bea76eecd5526d3e64041c09ac60d9ae8..79193f1dcbc620a4d9431c30ef0a638409d7bbf4 100644 (file)
--- a/ext/session/Makefile.am
+++ b/ext/session/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-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
 

diff --git a/ext/standard/Makefile.am b/ext/standard/Makefile.am
index 743c88aa58b36bb4f8a40efff96706fefa30f2cb..f49676154bbb550cf14550940930fa671ee4fe84 100644 (file)
--- a/ext/standard/Makefile.am
+++ b/ext/standard/Makefile.am
@@ -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 \

diff --git a/ext/sybase/Makefile.am b/ext/sybase/Makefile.am
index ce5758b3e3f6406cb7d60396f00509f47a906b28..00c2c0d592c267659ab80633ebad9cafd4d86d59 100644 (file)
--- a/ext/sybase/Makefile.am
+++ b/ext/sybase/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_sybase.la
 libphpext_sybase_la_SOURCES=sybase.c
 

diff --git a/ext/sybase_ct/Makefile.am b/ext/sybase_ct/Makefile.am
index 0187dba26e2df3744441ff07c0d5cfbee34571d9..aac8cf7bcecc53d376f443cc63be17c6719468e9 100644 (file)
--- a/ext/sybase_ct/Makefile.am
+++ b/ext/sybase_ct/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_sybase_ct.la
 libphpext_sybase_ct_la_SOURCES=php_sybase_ct.c
 

diff --git a/ext/sysvsem/Makefile.am b/ext/sysvsem/Makefile.am
index c74bf56b603d77ed65dd1731001d92b8600d647c..c6cceb0f549cfbbc08499520ca4eddc9b4f71a74 100644 (file)
--- a/ext/sysvsem/Makefile.am
+++ b/ext/sysvsem/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_sysvsem.la
 libphpext_sysvsem_la_SOURCES=sysvsem.c
 

diff --git a/ext/sysvshm/Makefile.am b/ext/sysvshm/Makefile.am
index 0d13164046ce1699192d500196d32b494fff4cec..e539b095451ec614fb0ded15d0700a318db4fad0 100644 (file)
--- a/ext/sysvshm/Makefile.am
+++ b/ext/sysvshm/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_sysvshm.la
 libphpext_sysvshm_la_SOURCES=sysvshm.c
 

diff --git a/ext/wddx/Makefile.am b/ext/wddx/Makefile.am
index 83187b2fdb406e6e237459b1e3b008739867bd5a..c9bdf3bf718217f5b237994c8a626d8c2fe6841d 100644 (file)
--- a/ext/wddx/Makefile.am
+++ b/ext/wddx/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_wddx.la
 libphpext_wddx_la_SOURCES=wddx.c
 

diff --git a/ext/yp/Makefile.am b/ext/yp/Makefile.am
index 6ba4b6b3cb75f0192669fcc034297aeaa7d1ae21..46da2fbd736ca28fe9a3abbcc5bf5cbfc352ce7d 100644 (file)
--- a/ext/yp/Makefile.am
+++ b/ext/yp/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_yp.la
 libphpext_yp_la_SOURCES=yp.c
 

diff --git a/ext/zlib/Makefile.am b/ext/zlib/Makefile.am
index c879e8caf9ec2fd293b2b9d856a279566923a3ed..830739ede3750fa8855618a52e655e88c6367d79 100644 (file)
--- a/ext/zlib/Makefile.am
+++ b/ext/zlib/Makefile.am
@@ -1,6 +1,5 @@
 # $Id$
 
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_zlib.la
 libphpext_zlib_la_SOURCES=zlib.c
 

diff --git a/sapi/aolserver/Makefile.am b/sapi/aolserver/Makefile.am
index 69c9b7326c02381a706312cdcd1fd7649a422743..db29f279e8e05e0a74d2f6270fa3b1451400f3d9 100644 (file)
--- a/sapi/aolserver/Makefile.am
+++ b/sapi/aolserver/Makefile.am
@@ -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

diff --git a/sapi/cgi/Makefile.am b/sapi/cgi/Makefile.am
index 4310bb66a89ffa9513b9d6ae61939b17b09fb0df..b4255563e5df0bea5530ece223eaff7f4839e95b 100644 (file)
--- a/sapi/cgi/Makefile.am
+++ b/sapi/cgi/Makefile.am
@@ -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

diff --git a/sapi/isapi/Makefile.am b/sapi/isapi/Makefile.am
index 682eebc468e630695d27c794d999be998be0456f..f4083bc7f2e282fc9806038907b4eeede5a65674 100644 (file)
--- a/sapi/isapi/Makefile.am
+++ b/sapi/isapi/Makefile.am
@@ -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