diff options
Diffstat (limited to 'ext')
119 files changed, 634 insertions, 389 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am deleted file mode 100644 index 6bad8560f8..0000000000 --- a/ext/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -SUBDIRS = @EXT_SUBDIRS@ - diff --git a/ext/Makefile.in b/ext/Makefile.in new file mode 100644 index 0000000000..9ec7373d60 --- /dev/null +++ b/ext/Makefile.in @@ -0,0 +1,21 @@ + +DEPTH = .. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +SUBDIRS = $(EXT_STATIC) $(EXT_SHARED) + +all: + @list='$(EXT_STATIC)'; for i in $$list; do \ + echo "Making all in $$i"; \ + (cd $$i && $(MAKE) all); \ + done + @list='$(EXT_SHARED)'; for i in $$list; do \ + echo "Making shared in $$i"; \ + (cd $$i && $(MAKE) shared); \ + done + +NO_RECURSION = all + +include $(topsrcdir)/build/rules.mk diff --git a/ext/apache/Makefile.am b/ext/apache/Makefile.am deleted file mode 100644 index 32b246cf00..0000000000 --- a/ext/apache/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_apache.la -libphpext_apache_la_SOURCES=apache.c - diff --git a/ext/apache/Makefile.in b/ext/apache/Makefile.in new file mode 100644 index 0000000000..8a27bb166c --- /dev/null +++ b/ext/apache/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libapache.la +LTLIBRARY_SOURCES = apache.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/aspell/Makefile.am b/ext/aspell/Makefile.am deleted file mode 100644 index 355308958b..0000000000 --- a/ext/aspell/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_aspell.la -libphpext_aspell_la_SOURCES=aspell.c - diff --git a/ext/aspell/Makefile.in b/ext/aspell/Makefile.in new file mode 100644 index 0000000000..1c5ad51822 --- /dev/null +++ b/ext/aspell/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libaspell.la +LTLIBRARY_SOURCES = aspell.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/bcmath/Makefile.am b/ext/bcmath/Makefile.am deleted file mode 100644 index 762104ad75..0000000000 --- a/ext/bcmath/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/Zend -noinst_LTLIBRARIES=libphpext_bcmath.la -libphpext_bcmath_la_SOURCES=bcmath.c number.c diff --git a/ext/bcmath/Makefile.in b/ext/bcmath/Makefile.in new file mode 100644 index 0000000000..63953d35e0 --- /dev/null +++ b/ext/bcmath/Makefile.in @@ -0,0 +1,11 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libbcmath.la +LTLIBRARY_SOURCES = bcmath.c number.c + +include $(topsrcdir)/build/ltlib.mk + diff --git a/ext/cpdf/Makefile.am b/ext/cpdf/Makefile.am deleted file mode 100644 index 5118f95250..0000000000 --- a/ext/cpdf/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_cpdf.la -libphpext_cpdf_la_SOURCES=cpdf.c - diff --git a/ext/cpdf/Makefile.in b/ext/cpdf/Makefile.in new file mode 100644 index 0000000000..11961fe66e --- /dev/null +++ b/ext/cpdf/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libcpdf.la +LTLIBRARY_SOURCES = cpdf.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/cybercash/Makefile.am b/ext/cybercash/Makefile.am deleted file mode 100644 index 486524e47c..0000000000 --- a/ext/cybercash/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -noinst_LTLIBRARIES=libphpext_cybercash.la -libphpext_cybercash_la_SOURCES=cybercash.c diff --git a/ext/cybercash/Makefile.in b/ext/cybercash/Makefile.in new file mode 100644 index 0000000000..fc24880d42 --- /dev/null +++ b/ext/cybercash/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libcybercash.la +LTLIBRARY_SOURCES = cybercash.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/dav/Makefile.am b/ext/dav/Makefile.am deleted file mode 100644 index 63d0510a97..0000000000 --- a/ext/dav/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_dav.la -libphpext_dav_la_SOURCES=dav.c - diff --git a/ext/dav/Makefile.in b/ext/dav/Makefile.in new file mode 100644 index 0000000000..c3522068b4 --- /dev/null +++ b/ext/dav/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libdav.la +LTLIBRARY_SOURCES = dav.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/db/Makefile.am b/ext/db/Makefile.am deleted file mode 100644 index 7dc6e32d07..0000000000 --- a/ext/db/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_db.la -libphpext_db_la_SOURCES=db.c - diff --git a/ext/db/Makefile.in b/ext/db/Makefile.in new file mode 100644 index 0000000000..a2856cdfc3 --- /dev/null +++ b/ext/db/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libdb.la +LTLIBRARY_SOURCES = db.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/db/config.m4 b/ext/db/config.m4 index 319174dd51..a7042d141b 100644 --- a/ext/db/config.m4 +++ b/ext/db/config.m4 @@ -2,7 +2,7 @@ dnl $Id$ dnl config.m4 for extension db dnl don't forget to call PHP_EXTENSION(db) -divert(1) +divert(2)dnl AC_CHECK_HEADERS(db1/ndbm.h) @@ -21,13 +21,13 @@ AC_DEFUN(AC_PREFERRED_DB_LIB,[ else AC_MSG_RESULT($DBM_TYPE chosen) fi - AC_SUBST(DBM_LIB) - AC_SUBST(DBM_TYPE) + PHP_SUBST(DBM_LIB) + PHP_SUBST(DBM_TYPE) ]) AC_PREFERRED_DB_LIB -divert(3) +divert(4)dnl if test "$DBM_LIB" = "-lgdbm"; then AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ diff --git a/ext/dba/Makefile.am b/ext/dba/Makefile.am deleted file mode 100644 index 2ab929391e..0000000000 --- a/ext/dba/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -# $Id$ - -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 dba_db3.c - diff --git a/ext/dba/Makefile.in b/ext/dba/Makefile.in new file mode 100644 index 0000000000..1e45ed519f --- /dev/null +++ b/ext/dba/Makefile.in @@ -0,0 +1,11 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libdba.la +LTLIBRARY_SOURCES = dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c \ + dba_ndbm.c dba_db3.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/dbase/Makefile.am b/ext/dbase/Makefile.am deleted file mode 100644 index ddce0d08db..0000000000 --- a/ext/dbase/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -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/dbase/Makefile.in b/ext/dbase/Makefile.in new file mode 100644 index 0000000000..b3b93f3ee8 --- /dev/null +++ b/ext/dbase/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libdbase.la +LTLIBRARY_SOURCES = dbf_head.c dbf_rec.c dbf_misc.c dbf_ndx.c dbase.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/dbase/config.m4 b/ext/dbase/config.m4 index 29f54923bf..1241888987 100644 --- a/ext/dbase/config.m4 +++ b/ext/dbase/config.m4 @@ -11,11 +11,8 @@ AC_ARG_WITH(dbase, else AC_MSG_RESULT(no) AC_DEFINE(DBASE,0) - DBASE_LIB= fi ],[ AC_MSG_RESULT(no) AC_DEFINE(DBASE,0) - DBASE_LIB= ]) -AC_SUBST(DBASE_LIB) diff --git a/ext/domxml/Makefile.am b/ext/domxml/Makefile.am deleted file mode 100644 index 36775910d3..0000000000 --- a/ext/domxml/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_domxml.la -libphpext_domxml_la_SOURCES=domxml.c - diff --git a/ext/domxml/Makefile.in b/ext/domxml/Makefile.in new file mode 100644 index 0000000000..76745b9644 --- /dev/null +++ b/ext/domxml/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libdomxml.la +LTLIBRARY_SOURCES = domxml.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/ereg/regex/Makefile.am b/ext/ereg/regex/Makefile.am deleted file mode 100644 index 993db56b1a..0000000000 --- a/ext/ereg/regex/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000000..f3215ab42f --- /dev/null +++ b/ext/ereg/regex/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = .. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libregex.la +LTLIBRARY_SOURCES = regcomp.c regexec.c regerror.c regfree.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/ext_skel b/ext/ext_skel index a1b0406e6b..eadab951b9 100755 --- a/ext/ext_skel +++ b/ext/ext_skel @@ -46,13 +46,19 @@ PHP_EXTENSION($extname) eof -$ECHO_N " Makefile.am$ECHO_C" -cat >Makefile.am <<eof +$ECHO_N " Makefile.in$ECHO_C" +cat >Makefile.in <<eof # \$Id\$ -noinst_LTLIBRARIES=libphpext_$extname.la -libphpext_${extname}_la_SOURCES=$extname.c +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ +LTLIBRARY_NAME = lib$extname.la +LTLIBRARY_SOURCES = $extname.c + +include \$(topsrcdir)/build/ltlib.mk eof diff --git a/ext/fdf/Makefile.am b/ext/fdf/Makefile.am deleted file mode 100644 index 482b35fc87..0000000000 --- a/ext/fdf/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_fdf.la -libphpext_fdf_la_SOURCES=fdf.c - diff --git a/ext/fdf/Makefile.in b/ext/fdf/Makefile.in new file mode 100644 index 0000000000..1f75e3b34e --- /dev/null +++ b/ext/fdf/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libfdf.la +LTLIBRARY_SOURCES = fdf.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/filepro/Makefile.am b/ext/filepro/Makefile.am deleted file mode 100644 index 4a97e91f97..0000000000 --- a/ext/filepro/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_filepro.la -libphpext_filepro_la_SOURCES=filepro.c - diff --git a/ext/filepro/Makefile.in b/ext/filepro/Makefile.in new file mode 100644 index 0000000000..584c77f2d4 --- /dev/null +++ b/ext/filepro/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libfilepro.la +LTLIBRARY_SOURCES = filepro.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/ftp/Makefile.am b/ext/ftp/Makefile.am deleted file mode 100644 index 8ba82c10d1..0000000000 --- a/ext/ftp/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_ftp.la -libphpext_ftp_la_SOURCES=php_ftp.c ftp.c diff --git a/ext/ftp/Makefile.in b/ext/ftp/Makefile.in new file mode 100644 index 0000000000..84f6da8b63 --- /dev/null +++ b/ext/ftp/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libftp.la +LTLIBRARY_SOURCES = php_ftp.c ftp.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/gd/Makefile.am b/ext/gd/Makefile.am deleted file mode 100644 index 2d0c72800b..0000000000 --- a/ext/gd/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -SRC=gd.c gdcache.c gdttf.c -noinst_LTLIBRARIES=@GD_STATIC@ -EXTRA_LTLIBRARIES=libphpext_gd.la gd.la -libphpext_gd_la_SOURCES=$(SRC) - -phplib_LTLIBRARIES=@GD_SHARED@ -gd_la_SOURCES=$(SRC) -gd_la_LIBADD=@GD_LFLAGS@ @GD_LIBS@ -gd_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= - diff --git a/ext/gd/Makefile.in b/ext/gd/Makefile.in new file mode 100644 index 0000000000..1c24c64eda --- /dev/null +++ b/ext/gd/Makefile.in @@ -0,0 +1,13 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libgd.la +LTLIBRARY_SOURCES = gd.c gdcache.c gdttf.c +LTLIBRARY_SHARED_NAME = gd.la +LTLIBRARY_SHARED_LIBADD = $(GD_LFLAGS) $(GD_LIBS) + +include $(topsrcdir)/build/ltlib.mk + diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 192b7e7acd..504bac78b2 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -187,7 +187,5 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then fi fi -AC_SUBST(GD_LFLAGS) -AC_SUBST(GD_LIBS) -AC_SUBST(GD_STATIC) -AC_SUBST(GD_SHARED) +PHP_SUBST(GD_LFLAGS) +PHP_SUBST(GD_LIBS) diff --git a/ext/gettext/Makefile.am b/ext/gettext/Makefile.am deleted file mode 100644 index d6ef557cce..0000000000 --- a/ext/gettext/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_gettext.la -libphpext_gettext_la_SOURCES=gettext.c - diff --git a/ext/gettext/Makefile.in b/ext/gettext/Makefile.in new file mode 100644 index 0000000000..40597fa92d --- /dev/null +++ b/ext/gettext/Makefile.in @@ -0,0 +1,11 @@ + + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libgettext.la +LTLIBRARY_SOURCES = gettext.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/hyperwave/Makefile.am b/ext/hyperwave/Makefile.am deleted file mode 100644 index 17277ee0f2..0000000000 --- a/ext/hyperwave/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_hyperwave.la -libphpext_hyperwave_la_SOURCES=hw.c hg_comm.c - diff --git a/ext/hyperwave/Makefile.in b/ext/hyperwave/Makefile.in new file mode 100644 index 0000000000..84ac693ac7 --- /dev/null +++ b/ext/hyperwave/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libhyperwave.la +LTLIBRARY_SOURCES = hw.c hg_comm.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/icap/Makefile.am b/ext/icap/Makefile.am deleted file mode 100644 index cd5e8976f7..0000000000 --- a/ext/icap/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_icap.la -libphpext_icap_la_SOURCES=php_icap.c - diff --git a/ext/icap/Makefile.in b/ext/icap/Makefile.in new file mode 100644 index 0000000000..2cdd776f3d --- /dev/null +++ b/ext/icap/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libicap.la +LTLIBRARY_SOURCES = php_icap.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/imap/Makefile.am b/ext/imap/Makefile.am deleted file mode 100644 index 75e6998ebe..0000000000 --- a/ext/imap/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_imap.la -libphpext_imap_la_SOURCES=imap.c - diff --git a/ext/imap/Makefile.in b/ext/imap/Makefile.in new file mode 100644 index 0000000000..a1ab0f78ba --- /dev/null +++ b/ext/imap/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libimap.la +LTLIBRARY_SOURCES = imap.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/informix/Makefile.am b/ext/informix/Makefile.am deleted file mode 100644 index ff6e09366c..0000000000 --- a/ext/informix/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_informix.la -libphpext_informix_la_SOURCES=ifx.c -libphpext_informix_la_LIBADD=@IFX_LIBS@ - -CLEANFILES = ifx.c - -ifx.c: $(srcdir)/ifx.ec - (if test -d @INFORMIXDIR@; then \ - esql -e @IFX_ESQL_FLAGS@ $(srcdir)/ifx.ec; \ - else \ - touch ifx.c; \ - fi) - diff --git a/ext/informix/Makefile.in b/ext/informix/Makefile.in new file mode 100644 index 0000000000..468a0d5b8f --- /dev/null +++ b/ext/informix/Makefile.in @@ -0,0 +1,21 @@ +# $Id$ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libinformix.la +LTLIBRARY_SOURCES = ifx.c +LTLIBRARY_LIBADD = $(IFX_LIBS) +CLEANFILES = ifx.c + +include $(topsrcdir)/build/ltlib.mk + +ifx.c: $(srcdir)/ifx.ec + (if test -d $(INFORMIXDIR); then \ + esql -e $(IFX_ESQL_FLAGS) $(srcdir)/ifx.ec; \ + else \ + touch ifx.c; \ + fi) + diff --git a/ext/informix/config.m4 b/ext/informix/config.m4 index 3769e49b4d..ef48c852c3 100644 --- a/ext/informix/config.m4 +++ b/ext/informix/config.m4 @@ -1,7 +1,5 @@ dnl $Id$ -divert(3) - PHPIFXLIB=ext/informix/libphp_ifx.a AC_MSG_CHECKING(for Informix support) @@ -68,7 +66,7 @@ WARNING: You specified Informix base install directory that is different else IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS" fi - AC_SUBST(IFX_ESQL_FLAGS) + PHP_SUBST(IFX_ESQL_FLAGS) AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION) AC_MSG_RESULT(yes) PHP_EXTENSION(informix) @@ -99,10 +97,10 @@ WARNING: You specified Informix base install directory that is different ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(INFORMIXDIR) -AC_SUBST(IFX_LIBS) +PHP_SUBST(INFORMIXDIR) +PHP_SUBST(IFX_LIBS) -divert(5) +divert(6)dnl dnl Warn if Informix support was requested but environment is not set up correctly. if test "$INFORMIX_WARNING" != ""; then diff --git a/ext/interbase/Makefile.am b/ext/interbase/Makefile.am deleted file mode 100644 index 5d2d598a16..0000000000 --- a/ext/interbase/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_interbase.la -libphpext_interbase_la_SOURCES=interbase.c - diff --git a/ext/interbase/Makefile.in b/ext/interbase/Makefile.in new file mode 100644 index 0000000000..fe6ec789b2 --- /dev/null +++ b/ext/interbase/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libinterbase.la +LTLIBRARY_SOURCES = interbase.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/java/Makefile.am b/ext/java/Makefile.in index 14fd3a1965..9f8488e1b1 100644 --- a/ext/java/Makefile.am +++ b/ext/java/Makefile.in @@ -1,15 +1,17 @@ -# $Id$ -SRC=java.c +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ -CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -EXTRA_LTLIBRARIES=libphp_java.la -phplib_LTLIBRARIES=@JAVA_SHARED@ -libphp_java_la_SOURCES=$(SRC) -libphp_java_la_LIBADD=@JAVA_LFLAGS@ -libphp_java_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= +LTLIBRARY_NAME = libjava.la +LTLIBRARY_SOURCES = java.c +LTLIBRARY_LIBADD = $(JAVA_LFLAGS) + +EXTRA_CFLAGS = $(JAVA_CFLAGS) +EXTRA_INCLUDES = $(JAVA_INCLUDE) + +include $(topsrcdir)/build/ltlib.mk phplib_DATA=php_java.jar php_java.jar : reflect.java diff --git a/ext/java/config.m4 b/ext/java/config.m4 index 93f2315d18..1cb6f634ba 100644 --- a/ext/java/config.m4 +++ b/ext/java/config.m4 @@ -50,7 +50,7 @@ AC_ARG_WITH(java, fi AC_DEFINE(HAVE_JAVA) - PHP_EXTENSION(java, "shared") + PHP_EXTENSION(java, shared) PHP_BUILD_SHARED AC_MSG_RESULT(yes) else @@ -60,9 +60,9 @@ AC_ARG_WITH(java, AC_MSG_RESULT(no) ]) -AC_SUBST(JAVA_CFLAGS) -AC_SUBST(JAVA_CLASSPATH) -AC_SUBST(JAVA_INCLUDE) -AC_SUBST(JAVA_SHARED) -AC_SUBST(JAVA_LFLAGS) +PHP_SUBST(JAVA_CFLAGS) +PHP_SUBST(JAVA_CLASSPATH) +PHP_SUBST(JAVA_INCLUDE) +PHP_SUBST(JAVA_SHARED) +PHP_SUBST(JAVA_LFLAGS) diff --git a/ext/ldap/Makefile.am b/ext/ldap/Makefile.am deleted file mode 100644 index c173425b04..0000000000 --- a/ext/ldap/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_ldap.la -libphpext_ldap_la_SOURCES=ldap.c - diff --git a/ext/ldap/Makefile.in b/ext/ldap/Makefile.in new file mode 100644 index 0000000000..9f3f231417 --- /dev/null +++ b/ext/ldap/Makefile.in @@ -0,0 +1,11 @@ + + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libldap.la +LTLIBRARY_SOURCES = ldap.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/mcal/Makefile.am b/ext/mcal/Makefile.am deleted file mode 100644 index e5a63a329b..0000000000 --- a/ext/mcal/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_mcal.la -libphpext_mcal_la_SOURCES=php_mcal.c - diff --git a/ext/mcal/Makefile.in b/ext/mcal/Makefile.in new file mode 100644 index 0000000000..13b9c5669b --- /dev/null +++ b/ext/mcal/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libmcal.la +LTLIBRARY_SOURCES = php_mcal.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/mcrypt/Makefile.am b/ext/mcrypt/Makefile.am deleted file mode 100644 index 8969670a26..0000000000 --- a/ext/mcrypt/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_mcrypt.la -libphpext_mcrypt_la_SOURCES=mcrypt.c - diff --git a/ext/mcrypt/Makefile.in b/ext/mcrypt/Makefile.in new file mode 100644 index 0000000000..9236b7bf22 --- /dev/null +++ b/ext/mcrypt/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libmcrypt.la +LTLIBRARY_SOURCES = mcrypt.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/mhash/Makefile.am b/ext/mhash/Makefile.am deleted file mode 100644 index 9747f65887..0000000000 --- a/ext/mhash/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_mhash.la -libphpext_mhash_la_SOURCES=mhash.c - diff --git a/ext/mhash/Makefile.in b/ext/mhash/Makefile.in new file mode 100644 index 0000000000..175e1699cc --- /dev/null +++ b/ext/mhash/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libmhash.la +LTLIBRARY_SOURCES = mhash.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/msql/Makefile.am b/ext/msql/Makefile.am deleted file mode 100644 index b7c5afbfee..0000000000 --- a/ext/msql/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_msql.la -libphpext_msql_la_SOURCES=php_msql.c - diff --git a/ext/msql/Makefile.in b/ext/msql/Makefile.in new file mode 100644 index 0000000000..e6e4989e22 --- /dev/null +++ b/ext/msql/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libmsql.la +LTLIBRARY_SOURCES = php_msql.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/mysql/Makefile.am b/ext/mysql/Makefile.am deleted file mode 100644 index 952963ea97..0000000000 --- a/ext/mysql/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# $Id$ - -SRC=php_mysql.c -INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -noinst_LTLIBRARIES=@MYSQL_STATIC@ -EXTRA_LTLIBRARIES=libphpext_mysql.la mysql.la -libphpext_mysql_la_SOURCES=$(SRC) - -phplib_LTLIBRARIES=@MYSQL_SHARED@ -mysql_la_SOURCES=$(SRC) -mysql_la_LIBADD=@MYSQL_LFLAGS@ -lmysqlclient -mysql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= diff --git a/ext/mysql/Makefile.in b/ext/mysql/Makefile.in new file mode 100644 index 0000000000..06c631acee --- /dev/null +++ b/ext/mysql/Makefile.in @@ -0,0 +1,12 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libmysql.la +LTLIBRARY_SOURCES = php_mysql.c +LTLIBRARY_SHARED_NAME = mysql.la +LTLIBRARY_SHARED_LIBADD = $(MYSQL_LFLAGS) -lmysqlclient + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/mysql/config.h.stub b/ext/mysql/config.h.stub deleted file mode 100644 index bc14e05beb..0000000000 --- a/ext/mysql/config.h.stub +++ /dev/null @@ -1,3 +0,0 @@ -#ifndef HAVE_MYSQL -#define HAVE_MYSQL 0 -#endif diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index e900835359..71fa33d502 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -48,7 +48,7 @@ AC_ARG_WITH(mysql, fi MYSQL_INCLUDE=-I$MYSQL_INCDIR - AC_DEFINE(HAVE_MYSQL) + AC_DEFINE(HAVE_MYSQL,1,[Whether you want MySQL]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) MYSQL_LFLAGS="-L$MYSQL_LIBDIR" @@ -56,9 +56,9 @@ AC_ARG_WITH(mysql, else AC_MSG_RESULT(yes (static)) AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) - AC_ADD_INCLUDE($MYSQL_INCDIR) MYSQL_STATIC="libphpext_mysql.la" fi + AC_ADD_INCLUDE($MYSQL_INCDIR) PHP_EXTENSION(mysql, $shared) dnl check for errmsg.h, which isn't installed by some versions of 3.21 @@ -68,12 +68,9 @@ AC_ARG_WITH(mysql, CPPFLAGS="$old_CPPFLAGS" else AC_MSG_RESULT(no) - AC_DEFINE(HAVE_MYSQL, 0) + AC_DEFINE(HAVE_MYSQL, 0,[Whether you want MySQL]) fi ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(MYSQL_STATIC) -AC_SUBST(MYSQL_SHARED) -AC_SUBST(MYSQL_INCLUDE) -AC_SUBST(MYSQL_LFLAGS) +PHP_SUBST(MYSQL_LFLAGS) diff --git a/ext/oci8/Makefile.am b/ext/oci8/Makefile.am deleted file mode 100644 index be5e7e03c2..0000000000 --- a/ext/oci8/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_oci8.la -libphpext_oci8_la_SOURCES=oci8.c - diff --git a/ext/oci8/Makefile.in b/ext/oci8/Makefile.in new file mode 100644 index 0000000000..60f8c8ce09 --- /dev/null +++ b/ext/oci8/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = liboci8.la +LTLIBRARY_SOURCES = oci8.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 1b37a6373f..eff3028f64 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -170,5 +170,5 @@ AC_ARG_WITH(oci8, #EXTRA_LIBS="$EXTRA_LIBS $ORACLE_SHLIBS $ORACLE_STLIBS $ORACLE_LIBS $ORACLE_LFLAGS" EXTRA_LIBS="$EXTRA_LIBS $ORACLE_LFLAGS $ORACLE_LIBS" INCLUDES="$INCLUDES $ORACLE_INCLUDE" -AC_SUBST(ORACLE_HOME) -AC_SUBST(ORACLE_VERSION) +PHP_SUBST(ORACLE_HOME) +PHP_SUBST(ORACLE_VERSION) diff --git a/ext/odbc/Makefile.am b/ext/odbc/Makefile.am deleted file mode 100644 index 62a04c8fa2..0000000000 --- a/ext/odbc/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -noinst_LTLIBRARIES=libphpext_odbc.la -libphpext_odbc_la_SOURCES=php_odbc.c velocis.c diff --git a/ext/odbc/Makefile.in b/ext/odbc/Makefile.in new file mode 100644 index 0000000000..a9e219c15f --- /dev/null +++ b/ext/odbc/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libodbc.la +LTLIBRARY_SOURCES = php_odbc.c velocis.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index d17e72da04..fa0cbd7fc9 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -84,7 +84,7 @@ AC_ARG_WITH(adabas, AC_ADD_INCLUDE($withval/incl) AC_ADD_LIBPATH($withval/lib) ODBC_OBJS="${ODBC_LIBDIR}/odbclib.a" - AC_SUBST(ODBC_OBJS) + PHP_SUBST(ODBC_OBJS) AC_ADD_LIBRARY_WITH_PATH(php_odbc, $abs_builddir/ext/odbc) AC_ADD_LIBRARY(sqlrte) AC_ADD_LIBRARY(sqlptc) @@ -391,11 +391,11 @@ if test -n "$ODBC_TYPE" && test -n "$ODBC_INCLUDE"; then INCLUDES="$INCLUDES $ODBC_INCLUDE" EXTRA_LIBS="$EXTRA_LIBS $ODBC_LFLAGS $ODBC_LIBS" AC_DEFINE(HAVE_UODBC) - AC_SUBST(ODBC_INCDIR) - AC_SUBST(ODBC_INCLUDE) - AC_SUBST(ODBC_LIBDIR) - AC_SUBST(ODBC_LIBS) - AC_SUBST(ODBC_LFLAGS) - AC_SUBST(ODBC_TYPE) + PHP_SUBST(ODBC_INCDIR) + PHP_SUBST(ODBC_INCLUDE) + PHP_SUBST(ODBC_LIBDIR) + PHP_SUBST(ODBC_LIBS) + PHP_SUBST(ODBC_LFLAGS) + PHP_SUBST(ODBC_TYPE) PHP_EXTENSION(odbc) fi diff --git a/ext/oracle/Makefile.am b/ext/oracle/Makefile.am deleted file mode 100644 index ec234949e3..0000000000 --- a/ext/oracle/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_oracle.la -libphpext_oracle_la_SOURCES=oracle.c diff --git a/ext/oracle/Makefile.in b/ext/oracle/Makefile.in new file mode 100644 index 0000000000..c73f1fb06e --- /dev/null +++ b/ext/oracle/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = liboracle.la +LTLIBRARY_SOURCES = oracle.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4 index 9f5ac95e76..ffe50db702 100644 --- a/ext/oracle/config.m4 +++ b/ext/oracle/config.m4 @@ -168,5 +168,5 @@ AC_ARG_WITH(oracle, #EXTRA_LIBS="$EXTRA_LIBS $ORACLE_SHLIBS $ORACLE_STLIBS $ORACLE_LIBS $ORACLE_LFLAGS" EXTRA_LIBS="$EXTRA_LIBS $ORACLE_LFLAGS $ORACLE_LIBS" INCLUDES="$INCLUDES $ORACLE_INCLUDE" -AC_SUBST(ORACLE_HOME) -AC_SUBST(ORACLE_VERSION) +PHP_SUBST(ORACLE_HOME) +PHP_SUBST(ORACLE_VERSION) diff --git a/ext/pcre/Makefile.am b/ext/pcre/Makefile.am deleted file mode 100644 index 4f4473bb82..0000000000 --- a/ext/pcre/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# $Id$ - -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/Makefile.in b/ext/pcre/Makefile.in new file mode 100644 index 0000000000..92aaa699a5 --- /dev/null +++ b/ext/pcre/Makefile.in @@ -0,0 +1,13 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libpcre.la +LTLIBRARY_SOURCES = php_pcre.c +LTLIBRARY_LIBADD = $(PCRE_LIBADD) + +SUBDIRS = $(PCRE_SUBDIRS) + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4 index 729e99e52d..5105fe4bfe 100644 --- a/ext/pcre/config.m4 +++ b/ext/pcre/config.m4 @@ -21,7 +21,7 @@ AC_ARG_WITH(pcre-regex, AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) - PHP_OUTPUT(ext/pcre/pcrelib/Makefile) + PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) ;; *) if test -f $withval/pcre.h ; then @@ -56,9 +56,9 @@ AC_ARG_WITH(pcre-regex, AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) - PHP_OUTPUT(ext/pcre/pcrelib/Makefile) + PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) ]) -AC_SUBST(PCRE_LIBADD) -AC_SUBST(PCRE_SUBDIRS) +PHP_SUBST(PCRE_LIBADD) +PHP_SUBST(PCRE_SUBDIRS) AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)]) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 729e99e52d..5105fe4bfe 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -21,7 +21,7 @@ AC_ARG_WITH(pcre-regex, AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) - PHP_OUTPUT(ext/pcre/pcrelib/Makefile) + PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) ;; *) if test -f $withval/pcre.h ; then @@ -56,9 +56,9 @@ AC_ARG_WITH(pcre-regex, AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) - PHP_OUTPUT(ext/pcre/pcrelib/Makefile) + PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) ]) -AC_SUBST(PCRE_LIBADD) -AC_SUBST(PCRE_SUBDIRS) +PHP_SUBST(PCRE_LIBADD) +PHP_SUBST(PCRE_SUBDIRS) AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)]) diff --git a/ext/pcre/pcrelib/Makefile.am b/ext/pcre/pcrelib/Makefile.am deleted file mode 100644 index 81825f9bc1..0000000000 --- a/ext/pcre/pcrelib/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -noinst_LTLIBRARIES = libpcre.la -libpcre_la_SOURCES = maketables.c get.c study.c pcre.c diff --git a/ext/pcre/pcrelib/Makefile.in b/ext/pcre/pcrelib/Makefile.in new file mode 100644 index 0000000000..3d435c758b --- /dev/null +++ b/ext/pcre/pcrelib/Makefile.in @@ -0,0 +1,11 @@ + +DEPTH = ../../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libpcre.la +LTLIBRARY_SOURCES = maketables.c get.c study.c pcre.c + +include $(topsrcdir)/build/ltlib.mk + diff --git a/ext/pdf/Makefile.am b/ext/pdf/Makefile.am deleted file mode 100644 index a483bf3af9..0000000000 --- a/ext/pdf/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_pdf.la -libphpext_pdf_la_SOURCES=pdf.c - diff --git a/ext/pdf/Makefile.in b/ext/pdf/Makefile.in new file mode 100644 index 0000000000..704fa3c4c7 --- /dev/null +++ b/ext/pdf/Makefile.in @@ -0,0 +1,11 @@ +# $Id$ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libpdf.la +LTLIBRARY_SOURCES = pdf.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/pgsql/Makefile.am b/ext/pgsql/Makefile.am deleted file mode 100644 index 6d6306cb27..0000000000 --- a/ext/pgsql/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# $Id$ - -SRC=pgsql.c -INCLUDES=@INCLUDES@ @PGSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -noinst_LTLIBRARIES=@PGSQL_STATIC@ -EXTRA_LTLIBRARIES=libphpext_pgsql.la pgsql.la -libphpext_pgsql_la_SOURCES=$(SRC) -phplib_LTLIBRARIES=@PGSQL_SHARED@ -pgsql_la_SOURCES=$(SRC) -pgsql_la_LIBADD=@PGSQL_LFLAGS@ @PGSQL_LIBS@ -pgsql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= - diff --git a/ext/pgsql/Makefile.in b/ext/pgsql/Makefile.in new file mode 100644 index 0000000000..48527b2cda --- /dev/null +++ b/ext/pgsql/Makefile.in @@ -0,0 +1,14 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libpgsql.la +LTLIBRARY_SOURCES = pgsql.c +LTLIBRARY_SHARED_NAME = pgsql.la +LTLIBRARY_SHARED_LIBADD = $(PGSQL_LFLAGS) $(PGSQL_LIBS) + +EXTRA_INCLUDES = $(PGSQL_INCLUDE) + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index 2cc65420c6..4e9aafbf35 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -56,8 +56,6 @@ AC_ARG_WITH(pgsql, ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(PGSQL_LIBS) -AC_SUBST(PGSQL_LFLAGS) -AC_SUBST(PGSQL_INCLUDE) -AC_SUBST(PGSQL_STATIC) -AC_SUBST(PGSQL_SHARED) +PHP_SUBST(PGSQL_LIBS) +PHP_SUBST(PGSQL_LFLAGS) +PHP_SUBST(PGSQL_INCLUDE) diff --git a/ext/posix/Makefile.am b/ext/posix/Makefile.am deleted file mode 100644 index 17c9b018c2..0000000000 --- a/ext/posix/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_posix.la -libphpext_posix_la_SOURCES=posix.c - diff --git a/ext/posix/Makefile.in b/ext/posix/Makefile.in new file mode 100644 index 0000000000..34ca248281 --- /dev/null +++ b/ext/posix/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libposix.la +LTLIBRARY_SOURCES = posix.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/readline/Makefile.am b/ext/readline/Makefile.am deleted file mode 100644 index ead3f7bc47..0000000000 --- a/ext/readline/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_readline.la -libphpext_readline_la_SOURCES=readline.c - diff --git a/ext/readline/Makefile.in b/ext/readline/Makefile.in new file mode 100644 index 0000000000..5124a8c67a --- /dev/null +++ b/ext/readline/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libreadline.la +LTLIBRARY_SOURCES = readline.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index 0cb936a7bf..c34d8df521 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -18,7 +18,7 @@ AC_ARG_WITH(readline, AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h) fi AC_ADD_INCLUDE($READLINE_DIR/include) - AC_ADD_LIBRARY(termcap) + AC_ADD_LIBRARY(ncurses) AC_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib) AC_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib) diff --git a/ext/rpc/java/Makefile.am b/ext/rpc/Makefile.in index 14fd3a1965..9f8488e1b1 100644 --- a/ext/rpc/java/Makefile.am +++ b/ext/rpc/Makefile.in @@ -1,15 +1,17 @@ -# $Id$ -SRC=java.c +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ -CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -EXTRA_LTLIBRARIES=libphp_java.la -phplib_LTLIBRARIES=@JAVA_SHARED@ -libphp_java_la_SOURCES=$(SRC) -libphp_java_la_LIBADD=@JAVA_LFLAGS@ -libphp_java_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= +LTLIBRARY_NAME = libjava.la +LTLIBRARY_SOURCES = java.c +LTLIBRARY_LIBADD = $(JAVA_LFLAGS) + +EXTRA_CFLAGS = $(JAVA_CFLAGS) +EXTRA_INCLUDES = $(JAVA_INCLUDE) + +include $(topsrcdir)/build/ltlib.mk phplib_DATA=php_java.jar php_java.jar : reflect.java diff --git a/ext/rpc/Makefile.am b/ext/rpc/java/Makefile.in index 14fd3a1965..9f8488e1b1 100644 --- a/ext/rpc/Makefile.am +++ b/ext/rpc/java/Makefile.in @@ -1,15 +1,17 @@ -# $Id$ -SRC=java.c +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ -CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -EXTRA_LTLIBRARIES=libphp_java.la -phplib_LTLIBRARIES=@JAVA_SHARED@ -libphp_java_la_SOURCES=$(SRC) -libphp_java_la_LIBADD=@JAVA_LFLAGS@ -libphp_java_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= +LTLIBRARY_NAME = libjava.la +LTLIBRARY_SOURCES = java.c +LTLIBRARY_LIBADD = $(JAVA_LFLAGS) + +EXTRA_CFLAGS = $(JAVA_CFLAGS) +EXTRA_INCLUDES = $(JAVA_INCLUDE) + +include $(topsrcdir)/build/ltlib.mk phplib_DATA=php_java.jar php_java.jar : reflect.java diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4 index 93f2315d18..1cb6f634ba 100644 --- a/ext/rpc/java/config.m4 +++ b/ext/rpc/java/config.m4 @@ -50,7 +50,7 @@ AC_ARG_WITH(java, fi AC_DEFINE(HAVE_JAVA) - PHP_EXTENSION(java, "shared") + PHP_EXTENSION(java, shared) PHP_BUILD_SHARED AC_MSG_RESULT(yes) else @@ -60,9 +60,9 @@ AC_ARG_WITH(java, AC_MSG_RESULT(no) ]) -AC_SUBST(JAVA_CFLAGS) -AC_SUBST(JAVA_CLASSPATH) -AC_SUBST(JAVA_INCLUDE) -AC_SUBST(JAVA_SHARED) -AC_SUBST(JAVA_LFLAGS) +PHP_SUBST(JAVA_CFLAGS) +PHP_SUBST(JAVA_CLASSPATH) +PHP_SUBST(JAVA_INCLUDE) +PHP_SUBST(JAVA_SHARED) +PHP_SUBST(JAVA_LFLAGS) diff --git a/ext/session/Makefile.am b/ext/session/Makefile.am deleted file mode 100644 index 79193f1dcb..0000000000 --- a/ext/session/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_session.la -libphpext_session_la_SOURCES=session.c mod_files.c mod_mm.c mod_user.c - diff --git a/ext/session/Makefile.in b/ext/session/Makefile.in new file mode 100644 index 0000000000..eab4a692c4 --- /dev/null +++ b/ext/session/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libsession.la +LTLIBRARY_SOURCES = session.c mod_files.c mod_mm.c mod_user.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/session/config.h.stub b/ext/session/config.h.stub deleted file mode 100644 index 24abf8b280..0000000000 --- a/ext/session/config.h.stub +++ /dev/null @@ -1,4 +0,0 @@ -/* define if you want to use the session extension */ - -#undef TRANS_SID -#undef HAVE_LIBMM diff --git a/ext/session/config.m4 b/ext/session/config.m4 index 8db20b3324..4ce652e693 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -20,7 +20,7 @@ AC_ARG_WITH(mm, AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib) AC_ADD_INCLUDE($MM_DIR/include) - AC_DEFINE(HAVE_LIBMM, 1) + AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) RESULT=yes PHP_EXTENSION(ps_mm) fi @@ -33,7 +33,7 @@ AC_ARG_ENABLE(trans-sid, [ --enable-trans-sid Enable transparent session id propagation], [ if test "$enableval" = "yes" ; then - AC_DEFINE(TRANS_SID, 1) + AC_DEFINE(TRANS_SID, 1, [Whether you want transparent session id propagation]) RESULT=yes fi ]) diff --git a/ext/snmp/Makefile.am b/ext/snmp/Makefile.am deleted file mode 100644 index 5f7da80286..0000000000 --- a/ext/snmp/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# $Id$ - -SRC=snmp.c -INCLUDES=@INCLUDES@ @SNMP_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -noinst_LTLIBRARIES=@SNMP_STATIC@ -EXTRA_LTLIBRARIES=libphpext_snmp.la snmp.la -libphpext_snmp_la_SOURCES=$(SRC) -phplib_LTLIBRARIES=@SNMP_SHARED@ -snmp_la_SOURCES=$(SRC) -snmp_la_LIBADD=@SNMP_LIBDIR@ -lsnmp @KSTAT_LIBS@ -snmp_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= diff --git a/ext/snmp/Makefile.in b/ext/snmp/Makefile.in new file mode 100644 index 0000000000..ae21bdf7fe --- /dev/null +++ b/ext/snmp/Makefile.in @@ -0,0 +1,13 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libsnmp.la +LTLIBRARY_SOURCES = snmp.c +LTLIBRARY_SHARED_LIBADD = $(SNMP_LIBDIR) -lsnmp $(KSTAT_LIBS) + +include $(topsrcdir)/build/ltlib.mk + +INCLUDES += $(SNMP_INCLUDE) diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index bcfdee7cb7..ef4f3a5a2a 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -65,11 +65,9 @@ AC_ARG_WITH(snmp, ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(SNMP_LIBDIR) -AC_SUBST(SNMP_INCLUDE) -AC_SUBST(SNMP_SHARED) -AC_SUBST(SNMP_STATIC) -AC_SUBST(KSTAT_LIBS) +PHP_SUBST(SNMP_LIBDIR) +PHP_SUBST(SNMP_INCLUDE) +PHP_SUBST(KSTAT_LIBS) AC_MSG_CHECKING(whether to enable UCD SNMP hack) AC_ARG_ENABLE(ucd-snmp-hack, diff --git a/ext/standard/Makefile.am b/ext/standard/Makefile.in index aa1bb5162b..46c6c3ddf5 100644 --- a/ext/standard/Makefile.am +++ b/ext/standard/Makefile.in @@ -1,14 +1,21 @@ -noinst_LTLIBRARIES=libphpext_standard.la -libphpext_standard_la_SOURCES=\ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libstandard.la +LTLIBRARY_SOURCES=\ array.c 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 \ + parsedate.c 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 output.c assert.c +include $(topsrcdir)/build/ltlib.mk + +parsedate.c: parsedate.y + $(srcdir)/url_scanner.c: $(srcdir)/url_scanner.re -re2c $< > $@.new && mv $@.new $@ - -#number.o: number.c -# $(CC) $(CFLAGS) -w@WARNING_LEVEL@ -c $< -o $@ diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index a637f2789d..8225bb7ec1 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -1,6 +1,6 @@ dnl $Id$ -*- sh -*- -divert(1) +divert(2)dnl dnl dnl Check for crypt() capabilities @@ -129,7 +129,7 @@ AC_CHECK_LIB(crypt, crypt, [ AC_CHECK_FUNCS(getcwd) AC_CHECK_FUNCS(getwd) -divert(3) +divert(4)dnl AC_ARG_WITH(regex, [ --with-regex=TYPE regex library type: system, apache, php], diff --git a/ext/sybase/Makefile.am b/ext/sybase/Makefile.am deleted file mode 100644 index 00c2c0d592..0000000000 --- a/ext/sybase/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_sybase.la -libphpext_sybase_la_SOURCES=sybase.c - diff --git a/ext/sybase/Makefile.in b/ext/sybase/Makefile.in new file mode 100644 index 0000000000..864711f164 --- /dev/null +++ b/ext/sybase/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libsybase.la +LTLIBRARY_SOURCES = sybase.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/sybase_ct/Makefile.am b/ext/sybase_ct/Makefile.am deleted file mode 100644 index aac8cf7bce..0000000000 --- a/ext/sybase_ct/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_sybase_ct.la -libphpext_sybase_ct_la_SOURCES=php_sybase_ct.c - diff --git a/ext/sybase_ct/Makefile.in b/ext/sybase_ct/Makefile.in new file mode 100644 index 0000000000..af189f2be9 --- /dev/null +++ b/ext/sybase_ct/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libsybase_ct.la +LTLIBRARY_SOURCES = php_sybase_ct.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/sysvsem/Makefile.am b/ext/sysvsem/Makefile.am deleted file mode 100644 index c6cceb0f54..0000000000 --- a/ext/sysvsem/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_sysvsem.la -libphpext_sysvsem_la_SOURCES=sysvsem.c - diff --git a/ext/sysvsem/Makefile.in b/ext/sysvsem/Makefile.in new file mode 100644 index 0000000000..6988e43b3a --- /dev/null +++ b/ext/sysvsem/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libsysvsem.la +LTLIBRARY_SOURCES = sysvsem.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/sysvshm/Makefile.am b/ext/sysvshm/Makefile.am deleted file mode 100644 index e539b09545..0000000000 --- a/ext/sysvshm/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_sysvshm.la -libphpext_sysvshm_la_SOURCES=sysvshm.c - diff --git a/ext/sysvshm/Makefile.in b/ext/sysvshm/Makefile.in new file mode 100644 index 0000000000..263ec993e7 --- /dev/null +++ b/ext/sysvshm/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libsysvshm.la +LTLIBRARY_SOURCES = sysvshm.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/wddx/Makefile.am b/ext/wddx/Makefile.am deleted file mode 100644 index c9bdf3bf71..0000000000 --- a/ext/wddx/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_wddx.la -libphpext_wddx_la_SOURCES=wddx.c - diff --git a/ext/wddx/Makefile.in b/ext/wddx/Makefile.in new file mode 100644 index 0000000000..f437cb248f --- /dev/null +++ b/ext/wddx/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libwddx.la +LTLIBRARY_SOURCES = wddx.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am deleted file mode 100644 index 504e4c6d9b..0000000000 --- a/ext/xml/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# $Id$ - -SRC=xml.c -INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -noinst_LTLIBRARIES=@XML_STATIC@ -EXTRA_LTLIBRARIES=libphpext_xml.la xml.la -libphpext_xml_la_SOURCES=$(SRC) -phplib_LTLIBRARIES=@XML_SHARED@ -xml_la_SOURCES=$(SRC) -xml_la_LIBADD=@XML_LIBS@ -xml_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= diff --git a/ext/xml/Makefile.in b/ext/xml/Makefile.in new file mode 100644 index 0000000000..634eede7aa --- /dev/null +++ b/ext/xml/Makefile.in @@ -0,0 +1,14 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libxml.la +LTLIBRARY_SOURCES = xml.c +LTLIBRARY_SHARED_NAME = xml.la +LTLIBRARY_SHARED_LIBADD = $(XML_LIBS) + +EXTRA_INCLUDES = $(XML_INCLUDE) + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 8c55e8eac3..64e7f70732 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -52,7 +52,5 @@ AC_ARG_WITH(xml, ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(XML_LIBS) -AC_SUBST(XML_INCLUDE) -AC_SUBST(XML_STATIC) -AC_SUBST(XML_SHARED) +PHP_SUBST(XML_LIBS) +PHP_SUBST(XML_INCLUDE) diff --git a/ext/yp/Makefile.am b/ext/yp/Makefile.am deleted file mode 100644 index 46da2fbd73..0000000000 --- a/ext/yp/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_yp.la -libphpext_yp_la_SOURCES=yp.c - diff --git a/ext/yp/Makefile.in b/ext/yp/Makefile.in new file mode 100644 index 0000000000..bb3b8f46f1 --- /dev/null +++ b/ext/yp/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libyp.la +LTLIBRARY_SOURCES = yp.c + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/zlib/Makefile.am b/ext/zlib/Makefile.am deleted file mode 100644 index 830739ede3..0000000000 --- a/ext/zlib/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# $Id$ - -noinst_LTLIBRARIES=libphpext_zlib.la -libphpext_zlib_la_SOURCES=zlib.c - diff --git a/ext/zlib/Makefile.in b/ext/zlib/Makefile.in new file mode 100644 index 0000000000..b860cbce8a --- /dev/null +++ b/ext/zlib/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libzlib.la +LTLIBRARY_SOURCES = zlib.c + +include $(topsrcdir)/build/ltlib.mk |