diff options
| author | Sascha Schumann <sas@php.net> | 1999-10-04 15:18:26 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-10-04 15:18:26 +0000 |
| commit | 232afa4816c60a20d3db48c304ac59312d46ec46 (patch) | |
| tree | dd8df9145c12f6b14fe751f6cc862aa8c0768e06 /ext | |
| parent | ec01d01400c67fd6d1bf2ae0e170771260e1ecc0 (diff) | |
| download | php-git-232afa4816c60a20d3db48c304ac59312d46ec46.tar.gz | |
* archive-based convenience libraries completely replaced
with libtool components
* SAPI targets can enable thread-safe mode and define
shared/static/program build target
* all configure scripts use the same config.cache
* phplibdir is $(top_builddir)/modules to avoid
permission problems
* sapi/*/Makefile.inc are gone
* runpath handling cleaned up
* top-level Makefile.in obsoleted through Makefile.am
* --enable-versioning uses libtool's cleaner and more
portable -export-symbols feature
Diffstat (limited to 'ext')
55 files changed, 114 insertions, 283 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index 8833023226..49372bc0d3 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,10 +1,4 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = @EXT_SUBDIRS@ -EXT_STATIC = @EXT_STATIC@ -noinst_LIBRARIES=libphpext.a - -libphpext.a: @EXT_LIBS@ - top_srcdir=$(top_srcdir) $(top_builddir)/scripts/mkextlib $@ $(EXT_STATIC) - @test "`uname -s`" = "Rhapsody" && $(RANLIB) $@ || exit 0 diff --git a/ext/apache/Makefile.am b/ext/apache/Makefile.am index c9006e13bb..9a7d7ab1b3 100644 --- a/ext/apache/Makefile.am +++ b/ext/apache/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_apache.a -libphpext_apache_a_SOURCES=apache.c +noinst_LTLIBRARIES=libphpext_apache.la +libphpext_apache_la_SOURCES=apache.c diff --git a/ext/apache/config.m4 b/ext/apache/config.m4 index e878cdbb8b..88575c9e98 100644 --- a/ext/apache/config.m4 +++ b/ext/apache/config.m4 @@ -1,5 +1,2 @@ dnl $Id$ -if test -n "$APACHE_INCLUDE"; then - PHP_EXTENSION(apache) -fi diff --git a/ext/aspell/Makefile.am b/ext/aspell/Makefile.am index 2d739171f7..f352b50b58 100644 --- a/ext/aspell/Makefile.am +++ b/ext/aspell/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_aspell.a -libphpext_aspell_a_SOURCES=aspell.c +noinst_LTLIBRARIES=libphpext_aspell.la +libphpext_aspell_la_SOURCES=aspell.c diff --git a/ext/bcmath/Makefile.am b/ext/bcmath/Makefile.am index b5f9acdee0..e73bafce78 100644 --- a/ext/bcmath/Makefile.am +++ b/ext/bcmath/Makefile.am @@ -1,5 +1,5 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_bcmath.a -libphpext_bcmath_a_SOURCES=bcmath.c number.c +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 58f9fe1009..3b9e629cea 100644 --- a/ext/dav/Makefile.am +++ b/ext/dav/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_dav.a -libphpext_dav_a_SOURCES=dav.c +noinst_LTLIBRARIES=libphpext_dav.la +libphpext_dav_la_SOURCES=dav.c diff --git a/ext/db/Makefile.am b/ext/db/Makefile.am index c9dbfa4872..71d2ea180b 100644 --- a/ext/db/Makefile.am +++ b/ext/db/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_db.a -libphpext_db_a_SOURCES=db.c +noinst_LTLIBRARIES=libphpext_db.la +libphpext_db_la_SOURCES=db.c diff --git a/ext/dba/Makefile.am b/ext/dba/Makefile.am index b609be3bf3..2c36702cd1 100644 --- a/ext/dba/Makefile.am +++ b/ext/dba/Makefile.am @@ -1,7 +1,7 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_dba.a -libphpext_dba_a_SOURCES=dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c \ +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 c04a5ccb86..d9ce4aa738 100644 --- a/ext/dbase/Makefile.am +++ b/ext/dbase/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_dbase.a -libphpext_dbase_a_SOURCES=dbf_head.c dbf_rec.c dbf_misc.c dbf_ndx.c dbase.c +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/ereg/regex/Makefile.am b/ext/ereg/regex/Makefile.am new file mode 100644 index 0000000000..993db56b1a --- /dev/null +++ b/ext/ereg/regex/Makefile.am @@ -0,0 +1,3 @@ +noinst_LTLIBRARIES = libregex.la + +libregex_la_SOURCES = regcomp.c regexec.c regerror.c regfree.c diff --git a/ext/ereg/regex/Makefile.in b/ext/ereg/regex/Makefile.in deleted file mode 100644 index 4561974b06..0000000000 --- a/ext/ereg/regex/Makefile.in +++ /dev/null @@ -1,145 +0,0 @@ -SHELL = /bin/sh - -srcdir=@srcdir@ -VPATH=@srcdir@ - -CC=@CC@ -RANLIB=@RANLIB@ - -# You probably want to take -DREDEBUG out of CFLAGS, and put something like -# -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of -# internal assertion checking and some debugging facilities). -# 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=@CFLAGS@ -COMPILE=$(CC) $(CFLAGS) -I$(srcdir) -I. -DPOSIX_MISTAKE - -# If you have a pre-ANSI compiler, put -o into MKHFLAGS. If you want -# the Berkeley __P macro, put -b in. -MKHFLAGS= - -# Flags for linking but not compiling, if any. -LDFLAGS=@LDFLAGS@ - -# Extra libraries for linking, if any. -LIBS= - -# Internal stuff, should not need changing. -OBJPRODN=regcomp.o regexec.o regerror.o regfree.o -OBJS=$(OBJPRODN) split.o debug.o main.o -H=cclass.h cname.h regex2.h utils.h -REGSRC=regcomp.c regerror.c regexec.c regfree.c -ALLSRC=$(REGSRC) engine.c debug.c main.c split.c - -# Stuff that matters only if you're trying to lint the package. -LINTFLAGS=-I. -Dstatic= -Dconst= -DREDEBUG -LINTC=regcomp.c regexec.c regerror.c regfree.c debug.c main.c -JUNKLINT=possible pointer alignment|null effect - -# arrangements to build forward-reference header files -.SUFFIXES: .ih .h -.c.ih: - sh $(srcdir)/mkh $(MKHFLAGS) -p $< >$@ - -.c.o: - $(COMPILE) -c $< - -all lib: libregex.a - -libregex.a: $(OBJPRODN) - rm -f libregex.a - ar cr libregex.a $(OBJPRODN) - $(RANLIB) libregex.a - -default: r - -purge: - rm -f *.o - -# stuff to build regex.h -REGEXH=regex.h -REGEXHSRC=regex2.h $(REGSRC) -$(REGEXH): $(REGEXHSRC) mkh - sh $(srcdir)/./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.h - #cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h - #rm -f regex.tmp - -# dependencies -$(OBJPRODN) debug.o: utils.h regex.h regex2.h -regcomp.o: cclass.h cname.h regcomp.ih -regexec.o: engine.c engine.ih -regerror.o: regerror.ih -debug.o: debug.ih -main.o: main.ih - -# tester -re: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ - -# regression test -r: re tests - ./re <tests - ./re -el <tests - ./re -er <tests - -# 57 variants, and other stuff, for development use -- not useful to you -ra: ./re tests - -./re <tests - -./re -el <tests - -./re -er <tests - -rx: ./re tests - ./re -x <tests - ./re -x -el <tests - ./re -x -er <tests - -t: ./re tests - -time ./re <tests - -time ./re -cs <tests - -time ./re -el <tests - -time ./re -cs -el <tests - -l: $(LINTC) - lint $(LINTFLAGS) -h $(LINTC) 2>&1 | egrep -v '$(JUNKLINT)' | tee lint - -fullprint: - ti README WHATSNEW notes todo | list - ti *.h | list - list *.c - list regex.3 regex.7 - -print: - ti README WHATSNEW notes todo | list - ti *.h | list - list reg*.c engine.c - - -mf.tmp: Makefile - sed '/^REGEXH=/s/=.*/=regex.h/' Makefile | sed '/#DEL$$/d' >$@ - -DTRH=cclass.h cname.h regex2.h utils.h -PRE=COPYRIGHT README WHATSNEW -POST=mkh regex.3 regex.7 tests $(DTRH) $(ALLSRC) fake/*.[ch] -FILES=$(PRE) Makefile $(POST) -DTR=$(PRE) Makefile=mf.tmp $(POST) -dtr: $(FILES) mf.tmp - makedtr $(DTR) >$@ - rm mf.tmp - -cio: $(FILES) - cio $(FILES) - -rdf: $(FILES) - rcsdiff -c $(FILES) 2>&1 | p - -# various forms of cleanup -tidy: - rm -f junk* core core.* *.core dtr *.tmp lint - -clean: tidy - rm -f *.o *.s re libregex.a - -# don't do this one unless you know what you're doing -spotless: clean - rm -f mkh regex.h diff --git a/ext/ext_skel b/ext/ext_skel index 85f61a077b..3b077c1eab 100755 --- a/ext/ext_skel +++ b/ext/ext_skel @@ -47,8 +47,8 @@ cat >Makefile.am <<eof # \$Id\$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_$extname.a -libphpext_${extname}_a_SOURCES=$extname.c +noinst_LTLIBRARIES=libphpext_$extname.la +libphpext_${extname}_la_SOURCES=$extname.c eof diff --git a/ext/fdf/Makefile.am b/ext/fdf/Makefile.am index 91e9efef83..2dd7234f81 100644 --- a/ext/fdf/Makefile.am +++ b/ext/fdf/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_fdf.a -libphpext_fdf_a_SOURCES=fdf.c +noinst_LTLIBRARIES=libphpext_fdf.la +libphpext_fdf_la_SOURCES=fdf.c diff --git a/ext/filepro/Makefile.am b/ext/filepro/Makefile.am index ff539050be..78e397fa29 100644 --- a/ext/filepro/Makefile.am +++ b/ext/filepro/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_filepro.a -libphpext_filepro_a_SOURCES=filepro.c +noinst_LTLIBRARIES=libphpext_filepro.la +libphpext_filepro_la_SOURCES=filepro.c diff --git a/ext/ftp/Makefile.am b/ext/ftp/Makefile.am index ea032672b0..11f1ce5742 100644 --- a/ext/ftp/Makefile.am +++ b/ext/ftp/Makefile.am @@ -1,5 +1,5 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_ftp.a -libphpext_ftp_a_SOURCES=php_ftp.c ftp.c +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 6483056bfa..d767120564 100644 --- a/ext/gd/Makefile.am +++ b/ext/gd/Makefile.am @@ -1,15 +1,12 @@ ## Process this file with automake to produce Makefile.in -phplibdir=$(libdir)/php - SRC=gd.c gdcache.c gdttf.c INCLUDES=@INCLUDES@ @GD_INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=@GD_STATIC@ -EXTRA_LIBRARIES=libphpext_gd.a -libphpext_gd_a_SOURCES=$(SRC) +noinst_LTLIBRARIES=@GD_STATIC@ +EXTRA_LTLIBRARIES=libphpext_gd.la gd.la +libphpext_gd_la_SOURCES=$(SRC) phplib_LTLIBRARIES=@GD_SHARED@ -EXTRA_LTLIBRARIES=gd.la gd_la_SOURCES=$(SRC) gd_la_LIBADD=@GD_LFLAGS@ @GD_LIBS@ gd_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 50fdafc4d9..60ff629311 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -139,7 +139,7 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then PHP_EXTENSION(gd, $shared) if test "$shared" != "yes"; then AC_ADD_INCLUDE($GD_INCLUDE) - GD_STATIC="libphpext_gd.a" + GD_STATIC="libphpext_gd.la" else AC_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE) if test -n "$GD_INCLUDE"; then diff --git a/ext/gettext/Makefile.am b/ext/gettext/Makefile.am index 295ca2c889..a5b29b6cd5 100644 --- a/ext/gettext/Makefile.am +++ b/ext/gettext/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_gettext.a -libphpext_gettext_a_SOURCES=gettext.c +noinst_LTLIBRARIES=libphpext_gettext.la +libphpext_gettext_la_SOURCES=gettext.c diff --git a/ext/hyperwave/Makefile.am b/ext/hyperwave/Makefile.am index c5be33e128..3b92146327 100644 --- a/ext/hyperwave/Makefile.am +++ b/ext/hyperwave/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_hyperwave.a -libphpext_hyperwave_a_SOURCES=hw.c hg_comm.c +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 3322c1ccf8..964fd7de0a 100644 --- a/ext/icap/Makefile.am +++ b/ext/icap/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_icap.a -libphpext_icap_a_SOURCES=php3_icap.c +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 51e2641464..5ab4011b34 100644 --- a/ext/imap/Makefile.am +++ b/ext/imap/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_imap.a -libphpext_imap_a_SOURCES=imap.c +noinst_LTLIBRARIES=libphpext_imap.la +libphpext_imap_la_SOURCES=imap.c diff --git a/ext/informix/Makefile.am b/ext/informix/Makefile.am index 18b8a4fd08..2cafd8c3c2 100644 --- a/ext/informix/Makefile.am +++ b/ext/informix/Makefile.am @@ -1,8 +1,8 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_informix.a -libphpext_informix_a_SOURCES=ifx.c +noinst_LTLIBRARIES=libphpext_informix.la +libphpext_informix_la_SOURCES=ifx.c ifx.c: ifx.ec (if test -d @INFORMIXDIR@; then \ diff --git a/ext/interbase/Makefile.am b/ext/interbase/Makefile.am index 494e3b9ef9..fd0e7fdfdf 100644 --- a/ext/interbase/Makefile.am +++ b/ext/interbase/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_interbase.a -libphpext_interbase_a_SOURCES=interbase.c +noinst_LTLIBRARIES=libphpext_interbase.la +libphpext_interbase_la_SOURCES=interbase.c diff --git a/ext/ldap/Makefile.am b/ext/ldap/Makefile.am index ca39511757..cf5d5d241b 100644 --- a/ext/ldap/Makefile.am +++ b/ext/ldap/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_ldap.a -libphpext_ldap_a_SOURCES=ldap.c +noinst_LTLIBRARIES=libphpext_ldap.la +libphpext_ldap_la_SOURCES=ldap.c diff --git a/ext/mcal/Makefile.am b/ext/mcal/Makefile.am index 3ee9cdd58f..ce59b52e19 100644 --- a/ext/mcal/Makefile.am +++ b/ext/mcal/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_mcal.a -libphpext_mcal_a_SOURCES=php3_mcal.c +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 01baf80148..aaaee46d69 100644 --- a/ext/mcrypt/Makefile.am +++ b/ext/mcrypt/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_mcrypt.a -libphpext_mcrypt_a_SOURCES=mcrypt.c +noinst_LTLIBRARIES=libphpext_mcrypt.la +libphpext_mcrypt_la_SOURCES=mcrypt.c diff --git a/ext/mhash/Makefile.am b/ext/mhash/Makefile.am index 18be9497da..792f7be6e0 100644 --- a/ext/mhash/Makefile.am +++ b/ext/mhash/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_mhash.a -libphpext_mhash_a_SOURCES=mhash.c +noinst_LTLIBRARIES=libphpext_mhash.la +libphpext_mhash_la_SOURCES=mhash.c diff --git a/ext/mysql/Makefile.am b/ext/mysql/Makefile.am index f035f76af9..0bf2a7ddeb 100644 --- a/ext/mysql/Makefile.am +++ b/ext/mysql/Makefile.am @@ -1,14 +1,12 @@ # $Id$ -phplibdir=$(libdir)/php - SRC=php_mysql.c INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=@MYSQL_STATIC@ -EXTRA_LIBRARIES=libphpext_mysql.a -libphpext_mysql_a_SOURCES=$(SRC) +noinst_LTLIBRARIES=@MYSQL_STATIC@ +EXTRA_LTLIBRARIES=libphpext_mysql.la mysql.la +libphpext_mysql_la_SOURCES=$(SRC) + phplib_LTLIBRARIES=@MYSQL_SHARED@ -EXTRA_LTLIBRARIES=mysql.la mysql_la_SOURCES=$(SRC) mysql_la_LIBADD=@MYSQL_LFLAGS@ -lmysqlclient mysql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index ceda6acf4b..e900835359 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -57,7 +57,7 @@ AC_ARG_WITH(mysql, AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) AC_ADD_INCLUDE($MYSQL_INCDIR) - MYSQL_STATIC="libphpext_mysql.a" + MYSQL_STATIC="libphpext_mysql.la" fi PHP_EXTENSION(mysql, $shared) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 0a686149d8..7302599067 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -24,10 +24,6 @@ * ? Safe mode implementation */ -#ifdef PIC -# define COMPILE_DL 1 -#endif - #if COMPILE_DL #include "dl/phpdl.h" #endif diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h index 0dc55a4076..80bd0d6793 100644 --- a/ext/mysql/php_mysql.h +++ b/ext/mysql/php_mysql.h @@ -38,7 +38,7 @@ #define DLEXPORT #endif -#ifdef ZTS +#ifdef __ZTS #include "TSRM.h" #endif diff --git a/ext/oci8/Makefile.am b/ext/oci8/Makefile.am index 8693894388..30ad74dabc 100644 --- a/ext/oci8/Makefile.am +++ b/ext/oci8/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_oci8.a -libphpext_oci8_a_SOURCES=oci8.c +noinst_LTLIBRARIES=libphpext_oci8.la +libphpext_oci8_la_SOURCES=oci8.c diff --git a/ext/odbc/Makefile.am b/ext/odbc/Makefile.am index 3daf4a20ec..c43878c88a 100644 --- a/ext/odbc/Makefile.am +++ b/ext/odbc/Makefile.am @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_odbc.a -libphpext_odbc_a_SOURCES=php_odbc.c velocis.c +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 503d31a8de..f5becaea9a 100644 --- a/ext/oracle/Makefile.am +++ b/ext/oracle/Makefile.am @@ -1,5 +1,5 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_oracle.a -libphpext_oracle_a_SOURCES=oracle.c +noinst_LTLIBRARIES=libphpext_oracle.la +libphpext_oracle_la_SOURCES=oracle.c diff --git a/ext/pcre/Makefile.am b/ext/pcre/Makefile.am index b6c926519f..c9c39d9362 100644 --- a/ext/pcre/Makefile.am +++ b/ext/pcre/Makefile.am @@ -1,6 +1,8 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_pcre.a -libphpext_pcre_a_SOURCES=php_pcre.c -SUBDIRS=@PCRE_SUBDIR@ +noinst_LTLIBRARIES=libphpext_pcre.la +libphpext_pcre_la_SOURCES=php_pcre.c +libphpext_pcre_la_LIBADD = @PCRE_LIBADD@ + +SUBDIRS = @PCRE_SUBDIRS@ diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4 index 2480ff7e6a..09a6a6a91d 100644 --- a/ext/pcre/config.m4 +++ b/ext/pcre/config.m4 @@ -51,11 +51,12 @@ AC_ARG_WITH(pcre-regex, ;; esac ],[ - EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" - PCRE_SUBDIR="pcrelib" + PCRE_LIBADD=pcrelib/libpcre.la + PCRE_SUBDIRS=pcrelib AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) PHP_OUTPUT(ext/pcre/pcrelib/Makefile) ]) -AC_SUBST(PCRE_SUBDIR) +AC_SUBST(PCRE_LIBADD) +AC_SUBST(PCRE_SUBDIRS) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 2480ff7e6a..09a6a6a91d 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -51,11 +51,12 @@ AC_ARG_WITH(pcre-regex, ;; esac ],[ - EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" - PCRE_SUBDIR="pcrelib" + PCRE_LIBADD=pcrelib/libpcre.la + PCRE_SUBDIRS=pcrelib AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) PHP_OUTPUT(ext/pcre/pcrelib/Makefile) ]) -AC_SUBST(PCRE_SUBDIR) +AC_SUBST(PCRE_LIBADD) +AC_SUBST(PCRE_SUBDIRS) diff --git a/ext/pcre/pcrelib/Makefile.am b/ext/pcre/pcrelib/Makefile.am index 8f7cad1372..81825f9bc1 100644 --- a/ext/pcre/pcrelib/Makefile.am +++ b/ext/pcre/pcrelib/Makefile.am @@ -1,2 +1,2 @@ -noinst_LIBRARIES = libpcre.a -libpcre_a_SOURCES = maketables.c get.c study.c pcre.c +noinst_LTLIBRARIES = libpcre.la +libpcre_la_SOURCES = maketables.c get.c study.c pcre.c diff --git a/ext/pdf/Makefile.am b/ext/pdf/Makefile.am index 6b4304d337..bbae6167ff 100644 --- a/ext/pdf/Makefile.am +++ b/ext/pdf/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_pdf.a -libphpext_pdf_a_SOURCES=pdf.c +noinst_LTLIBRARIES=libphpext_pdf.la +libphpext_pdf_la_SOURCES=pdf.c diff --git a/ext/pgsql/Makefile.am b/ext/pgsql/Makefile.am index 5a4a3e8605..1fe55e8517 100644 --- a/ext/pgsql/Makefile.am +++ b/ext/pgsql/Makefile.am @@ -1,14 +1,11 @@ # $Id$ -phplibdir=$(libdir)/php - SRC=pgsql.c INCLUDES=@INCLUDES@ @PGSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=@PGSQL_STATIC@ -EXTRA_LIBRARIES=libphpext_pgsql.a -libphpext_pgsql_a_SOURCES=$(SRC) +noinst_LTLIBRARIES=@PGSQL_STATIC@ +EXTRA_LTLIBRARIES=libphpext_pgsql.la pgsql.la +libphpext_pgsql_la_SOURCES=$(SRC) phplib_LTLIBRARIES=@PGSQL_SHARED@ -EXTRA_LTLIBRARIES=pgsql.la pgsql_la_SOURCES=$(SRC) pgsql_la_LIBADD=@PGSQL_LFLAGS@ @PGSQL_LIBS@ pgsql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index a64dc47824..d78136bc5c 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -47,7 +47,7 @@ AC_ARG_WITH(pgsql, AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR) AC_ADD_INCLUDE($PGSQL_INCDIR) - PGSQL_STATIC="libphpext_pgsql.a" + PGSQL_STATIC="libphpext_pgsql.la" fi AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES)) CFLAGS=$old_CFLAGS; LDFLAGS=$old_LDFLAGS; LIBS=$old_LIBS diff --git a/ext/session/Makefile.am b/ext/session/Makefile.am index b9fd66bd67..a059151bea 100644 --- a/ext/session/Makefile.am +++ b/ext/session/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_session.a -libphpext_session_a_SOURCES=session.c mod_files.c mod_mm.c mod_user.c +noinst_LTLIBRARIES=libphpext_session.la +libphpext_session_la_SOURCES=session.c mod_files.c mod_mm.c mod_user.c diff --git a/ext/snmp/Makefile.am b/ext/snmp/Makefile.am index badfe55541..63afdb9a92 100644 --- a/ext/snmp/Makefile.am +++ b/ext/snmp/Makefile.am @@ -1,14 +1,11 @@ # $Id$ -phplibdir=$(libdir)/php - SRC=snmp.c INCLUDES=@INCLUDES@ @SNMP_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=@SNMP_STATIC@ -EXTRA_LIBRARIES=libphpext_snmp.a -libphpext_snmp_a_SOURCES=$(SRC) +noinst_LTLIBRARIES=@SNMP_STATIC@ +EXTRA_LTLIBRARIES=libphpext_snmp.la snmp.la +libphpext_snmp_la_SOURCES=$(SRC) phplib_LTLIBRARIES=@SNMP_SHARED@ -EXTRA_LTLIBRARIES=snmp.la snmp_la_SOURCES=$(SRC) snmp_la_LIBADD=@SNMP_LIBDIR@ -lsnmp @KSTAT_LIBS@ snmp_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) diff --git a/ext/standard/Makefile.am b/ext/standard/Makefile.am index 2d04b692a4..e3a4d8cc59 100644 --- a/ext/standard/Makefile.am +++ b/ext/standard/Makefile.am @@ -1,14 +1,13 @@ ## Process this file with automake to produce Makefile.in INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_standard.a -libphpext_standard_a_SOURCES=\ - base64.c basic_functions.c browscap.c datetime.c dir.c \ - dns.c exec.c file.c filestat.c formatted_print.c fsock.c \ - html.c image.c info.c link.c mail.c math.c md5.c microtime.c \ - pack.c pageinfo.c rand.c reg.c soundex.c string.c \ - syslog.c type.c uniqid.c url.c iptc.c var.c quot_print.c \ - cyr_convert.c flock_compat.c crypt.c dl.c head.c post.c \ - parsedate.y lcg.c url_scanner.c metaphone.c +noinst_LTLIBRARIES=libphpext_standard.la +libphpext_standard_la_SOURCES=\ + base64.c basic_functions.c browscap.c crypt.c cyr_convert.c datetime.c \ + dir.c dl.c dns.c exec.c file.c filestat.c flock_compat.c \ + formatted_print.c fsock.c head.c html.c image.c info.c iptc.c lcg.c \ + link.c mail.c math.c md5.c metaphone.c microtime.c pack.c pageinfo.c \ + parsedate.y post.c quot_print.c rand.c reg.c soundex.c string.c \ + syslog.c type.c uniqid.c url.c url_scanner.c var.c $(srcdir)/url_scanner.c: $(srcdir)/url_scanner.re -re2c $< > $@.new && mv $@.new $@ diff --git a/ext/standard/info.c b/ext/standard/info.c index 5eca918d4a..4e1bc84729 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -303,7 +303,7 @@ void php_print_credits(int flag) php_info_print_table_header(2, "Contribution", "Authors"); CREDIT_LINE("Zend Scripting Language Engine", "Andi Gutmans, Zeev Suraski"); CREDIT_LINE("Extension Module API", "Andi Gutmans, Zeev Suraski"); - CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken"); + CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken, Sascha Schumann"); CREDIT_LINE("Win32 Port", "Shane Caraveo, Zeev Suraski"); CREDIT_LINE("Server API (SAPI) Abstraction Layer", "Andi Gutmans, Shane Caraveo, Zeev Suraski"); CREDIT_LINE("Apache SAPI Module", "Rasmus Lerdorf, Zeev Suraski"); diff --git a/ext/sybase/Makefile.am b/ext/sybase/Makefile.am index 1f75a648f2..ce5758b3e3 100644 --- a/ext/sybase/Makefile.am +++ b/ext/sybase/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_sybase.a -libphpext_sybase_a_SOURCES=sybase.c +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 7b32991c10..0187dba26e 100644 --- a/ext/sybase_ct/Makefile.am +++ b/ext/sybase_ct/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_sybase_ct.a -libphpext_sybase_ct_a_SOURCES=php_sybase_ct.c +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 7ed09a0337..c74bf56b60 100644 --- a/ext/sysvsem/Makefile.am +++ b/ext/sysvsem/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_sysvsem.a -libphpext_sysvsem_a_SOURCES=sysvsem.c +noinst_LTLIBRARIES=libphpext_sysvsem.la +libphpext_sysvsem_la_SOURCES=sysvsem.c diff --git a/ext/sysvshm/Makefile.am b/ext/sysvshm/Makefile.am index 9c759a02bb..0d13164046 100644 --- a/ext/sysvshm/Makefile.am +++ b/ext/sysvshm/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_sysvshm.a -libphpext_sysvshm_a_SOURCES=sysvshm.c +noinst_LTLIBRARIES=libphpext_sysvshm.la +libphpext_sysvshm_la_SOURCES=sysvshm.c diff --git a/ext/wddx/Makefile.am b/ext/wddx/Makefile.am index 435d1604b1..83187b2fdb 100644 --- a/ext/wddx/Makefile.am +++ b/ext/wddx/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_wddx.a -libphpext_wddx_a_SOURCES=wddx.c +noinst_LTLIBRARIES=libphpext_wddx.la +libphpext_wddx_la_SOURCES=wddx.c diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am index 17d3f47864..2299ba2ce0 100644 --- a/ext/xml/Makefile.am +++ b/ext/xml/Makefile.am @@ -2,11 +2,10 @@ SRC=xml.c INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=@XML_STATIC@ -EXTRA_LIBRARIES=libphpext_xml.a -libphpext_xml_a_SOURCES=$(SRC) +noinst_LTLIBRARIES=@XML_STATIC@ +EXTRA_LTLIBRARIES=libphpext_xml.la xml.la +libphpext_xml_la_SOURCES=$(SRC) phplib_LTLIBRARIES=@XML_SHARED@ -EXTRA_LTLIBRARIES=xml.la xml_la_SOURCES=$(SRC) xml_la_LIBADD=@XML_LIBS@ xml_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 7a597e7916..8c55e8eac3 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -41,7 +41,7 @@ AC_ARG_WITH(xml, EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS" AC_ADD_INCLUDE($XML_INCLUDE) XML_INCLUDE="" - XML_STATIC="libphpext_xml.a" + XML_STATIC="libphpext_xml.la" else XML_INCLUDE="-I$XML_INCLUDE" XML_SHARED="xml.la" diff --git a/ext/xml/xml.c b/ext/xml/xml.c index f66d6415cf..b8f1bf4bc4 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -20,11 +20,6 @@ /* $Id$ */ #define IS_EXT_MODULE -/* boldly assume that if PIC is defined, we are being compiled dynamically */ -#ifdef PIC -# define COMPILE_DL 1 -#endif - #if COMPILE_DL # include "dl/phpdl.h" #endif diff --git a/ext/yp/Makefile.am b/ext/yp/Makefile.am index c3701cf6ba..6ba4b6b3cb 100644 --- a/ext/yp/Makefile.am +++ b/ext/yp/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_yp.a -libphpext_yp_a_SOURCES=yp.c +noinst_LTLIBRARIES=libphpext_yp.la +libphpext_yp_la_SOURCES=yp.c diff --git a/ext/zlib/Makefile.am b/ext/zlib/Makefile.am index ef7d3ea49c..c879e8caf9 100644 --- a/ext/zlib/Makefile.am +++ b/ext/zlib/Makefile.am @@ -1,6 +1,6 @@ # $Id$ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_zlib.a -libphpext_zlib_a_SOURCES=zlib.c +noinst_LTLIBRARIES=libphpext_zlib.la +libphpext_zlib_la_SOURCES=zlib.c |