diff options
41 files changed, 3 insertions, 41 deletions
diff --git a/configure.in b/configure.in index cbf3489673..89e354d534 100644 --- 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 9a7d7ab1b3..32b246cf00 100644 --- 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 f352b50b58..355308958b 100644 --- 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 e73bafce78..e529f579ae 100644 --- 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 3b9e629cea..63d0510a97 100644 --- 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 71d2ea180b..7dc6e32d07 100644 --- 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 2c36702cd1..4316423834 100644 --- 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 d9ce4aa738..0805cabe74 100644 --- 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 2dd7234f81..482b35fc87 100644 --- 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 78e397fa29..4a97e91f97 100644 --- 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 11f1ce5742..8ba82c10d1 100644 --- 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 4c6825eac3..fca3e4c513 100644 --- 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 a5b29b6cd5..d6ef557cce 100644 --- 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 3b92146327..17277ee0f2 100644 --- 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 964fd7de0a..414a17b64b 100644 --- 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 5ab4011b34..75e6998ebe 100644 --- 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 89e65f2d30..587f25a2d6 100644 --- 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 fd0e7fdfdf..5d2d598a16 100644 --- 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 cf5d5d241b..c173425b04 100644 --- 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 ce59b52e19..0b19bbebe2 100644 --- 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 aaaee46d69..8969670a26 100644 --- 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 792f7be6e0..9747f65887 100644 --- 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 66d7bf7b18..b7c5afbfee 100644 --- 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 30ad74dabc..be5e7e03c2 100644 --- 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 c43878c88a..588eaac94e 100644 --- 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 f5becaea9a..ec234949e3 100644 --- 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 c9c39d9362..4f4473bb82 100644 --- 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 bbae6167ff..a483bf3af9 100644 --- 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 75de323d35..ead3f7bc47 100644 --- 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 a059151bea..79193f1dcb 100644 --- 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 743c88aa58..f49676154b 100644 --- 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 ce5758b3e3..00c2c0d592 100644 --- 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 0187dba26e..aac8cf7bce 100644 --- 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 c74bf56b60..c6cceb0f54 100644 --- 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 0d13164046..e539b09545 100644 --- 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 83187b2fdb..c9bdf3bf71 100644 --- 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 6ba4b6b3cb..46da2fbd73 100644 --- 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 c879e8caf9..830739ede3 100644 --- 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 69c9b7326c..db29f279e8 100644 --- 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 4310bb66a8..b4255563e5 100644 --- 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 682eebc468..f4083bc7f2 100644 --- 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 |