cvs: /php4 Makefile.am php.sym stub.c /php4/regex Makefile.am /php4/sapi/apache sapi_apache.c /php4 Makefile.in install-sh php.map /php4/regex
Makefile.in /php4/sapi/apache Makefile.inc apache.c /php4/sapi/cgi Makefile.inc /php4/sapi/isapi Makefile.inc /php4/sapi/nsapi Makefile.inc /php4
.cvsignore acinclude.m4 buildconf configure.in /php4/ext Makefile.am ext_skel /php4/ext/apache Makefile.am config.m4 /php4/ext/aspell Makefile.am
/php4/ext/bcmath Makefile.am /php4/ext/dav Makefile.am /php4/ext/db Makefile.am /php4/ext/dba Makefile.am /php4/ext/dbase Makefile.am /php4/ext/fdf
Makefile.am /php4/ext/filepro Makefile.am /php4/ext/ftp Makefile.am /php4/ext/gd Makefile.am config.m4 /php4/ext/gettext Makefile.am
/php4/ext/hyperwave Makefile.am /php4/ext/icap Makefile.am /php4/ext/imap Makefile.am /php4/ext/informix Makefile.am /php4/ext/interbase Makefile.am
/php4/ext/ldap Makefile.am /php4/ext/mcal Makefile.am /php4/ext/mcrypt Makefile.am /php4/ext/mhash Makefile.am /php4/ext/mysql Makefile.am config.m4
php_mysql.c php_mysql.h /php4/ext/oci8 Makefile.am /php4/ext/odbc Makefile.am /php4/ext/oracle Makefile.am /php4/ext/pcre Makefile.am config.m4
/php4/ext/pcre/pcrelib Makefile.am /php4/ext/pdf Makefile.am /php4/ext/pgsql Makefile.am config.m4 /php4/ext/session Makefile.am /php4/ext/snmp
Makefile.am /php4/ext/standard Makefile.am info.c /php4/ext/sybase Makefile.am /php4/ext/sybase_ct Makefile.am /php4/ext/sysvsem Makefile.am
/php4/ext/sysvshm Makefile.am /php4/ext/wddx Makefile.am /php4/ext/xml Makefile.am config.m4 xml.c /php4/ext/yp Makefile.am /php4/ext/zlib Makefile.am
/php4/sapi Makefile.am README /php4/sapi/apache Makefile.am config.m4 libphp4.module.in mod_php4.c /php4/sapi/cgi Makefile.am /php4/sapi/nsapi
Makefile.am config.m4

sas Mon Oct 4 11:18:57 1999 EDT Added files: /php4 Makefile.am php.sym stub.c /php4/regex Makefile.am /php4/sapi/apache sapi_apache.c Removed files: /php4 Makefile.in install-sh php.map /php4/regex Makefile.in /php4/sapi/apache Makefile.inc apache.c /php4/sapi/cgi Makefile.inc /php4/sapi/isapi Makefile.inc /php4/sapi/nsapi Makefile.inc Modified files: /php4 .cvsignore acinclude.m4 buildconf configure.in /php4/ext Makefile.am ext_skel /php4/ext/apache Makefile.am config.m4 /php4/ext/aspell Makefile.am /php4/ext/bcmath Makefile.am /php4/ext/dav Makefile.am /php4/ext/db Makefile.am /php4/ext/dba Makefile.am /php4/ext/dbase Makefile.am /php4/ext/fdf Makefile.am /php4/ext/filepro Makefile.am /php4/ext/ftp Makefile.am /php4/ext/gd Makefile.am config.m4 /php4/ext/gettext Makefile.am /php4/ext/hyperwave Makefile.am /php4/ext/icap Makefile.am /php4/ext/imap Makefile.am /php4/ext/informix Makefile.am /php4/ext/interbase Makefile.am /php4/ext/ldap Makefile.am /php4/ext/mcal Makefile.am /php4/ext/mcrypt Makefile.am /php4/ext/mhash Makefile.am /php4/ext/mysql Makefile.am config.m4 php_mysql.c php_mysql.h /php4/ext/oci8 Makefile.am /php4/ext/odbc Makefile.am /php4/ext/oracle Makefile.am /php4/ext/pcre Makefile.am config.m4 /php4/ext/pcre/pcrelib Makefile.am /php4/ext/pdf Makefile.am /php4/ext/pgsql Makefile.am config.m4 /php4/ext/session Makefile.am /php4/ext/snmp Makefile.am /php4/ext/standard Makefile.am info.c /php4/ext/sybase Makefile.am /php4/ext/sybase_ct Makefile.am /php4/ext/sysvsem Makefile.am /php4/ext/sysvshm Makefile.am /php4/ext/wddx Makefile.am /php4/ext/xml Makefile.am config.m4 xml.c /php4/ext/yp Makefile.am /php4/ext/zlib Makefile.am /php4/sapi Makefile.am README /php4/sapi/apache Makefile.am config.m4 libphp4.module.in mod_php4.c /php4/sapi/cgi Makefile.am /php4/sapi/nsapi Makefile.am config.m4 Log: * 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 Index: php4/.cvsignore diff -u php4/.cvsignore:1.13 php4/.cvsignore:1.14 --- php4/.cvsignore:1.13 Wed Sep 29 11:16:59 1999 +++ php4/.cvsignore Mon Oct 4 11:17:59 1999 @@ -1,21 +1,28 @@ +Makefile +acconfig.h +aclocal.m4 +build-defs.h buildconf.stamp -configure -config.log -php_config.h -php_config.h.in config.cache +config.guess +config.log config.status -Makefile -build-defs.h -stamp-h -configuration-parser.output +config.sub configuration-parser.c configuration-parser.h +configuration-parser.output configuration-scanner.c -php -test.php3 -aclocal.m4 -acconfig.h +configure +install-sh internal_functions.c libtool +ltconfig +ltmain.sh +missing +mkinstalldirs +php php4.spec +php_config.h +php_config.h.in +stamp-h +test.php3 Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.34 php4/acinclude.m4:1.35 --- php4/acinclude.m4:1.34 Mon Oct 4 05:51:46 1999 +++ php4/acinclude.m4 Mon Oct 4 11:18:01 1999 @@ -1,8 +1,29 @@ -dnl $Id: acinclude.m4,v 1.34 1999/10/04 09:51:46 sas Exp $ +dnl $Id: acinclude.m4,v 1.35 1999/10/04 15:18:01 sas Exp $ dnl dnl This file contains local autoconf functions. dnl +dnl PHP_BUILD_SHARED +dnl +AC_DEFUN(PHP_BUILD_SHARED,[ + php_build_target=shared +]) + +dnl +dnl PHP_BUILD_STATIC +dnl +AC_DEFUN(PHP_BUILD_STATIC,[ + php_build_target=static +]) + +dnl +dnl PHP_BUILD_PROGRAM +dnl +AC_DEFUN(PHP_BUILD_PROGRAM,[ + php_build_target=program +]) + +dnl dnl AC_PHP_ONCE(namespace, variable, code) dnl dnl execute code, if variable is not set in namespace @@ -51,15 +72,12 @@ dnl AC_DEFUN(AC_BUILD_RPATH,[ if test "$enable_rpath" = "yes" && test -n "$PHP_RPATHS"; then - if test -n "$APXS"; then - for i in $PHP_RPATHS; do - RPATHS="$RPATHS ${apxs_runpath_switch}$i'" - done - else - for i in $PHP_RPATHS; do - RPATHS="$RPATHS ${ld_runpath_switch}$i" - done - fi + OLD_RPATHS="$PHP_RPATHS" + PHP_RPATHS="" + for i in $OLD_RPATHS; do + PHP_RPATHS="$PHP_RPATHS -R $i" + NATIVE_RPATHS="$NATIVE_RPATHS ${ld_runpath_switch}$i" + done fi ]) @@ -172,7 +190,8 @@ EXT_SUBDIRS="$EXT_SUBDIRS $1" if test "$2" != "shared" -a "$2" != "yes"; then _extlib="libphpext_$1.a" - EXT_LIBS="$EXT_LIBS $1/$_extlib" + EXT_LTLIBS="$EXT_LTLIBS ext/$1/libphpext_$1.la" + EXT_LIBS="$EXT_LIBS $1/$_extlib" EXT_STATIC="$EXT_STATIC $1" else EXT_SHARED="$EXT_SHARED $1" @@ -185,6 +204,7 @@ AC_SUBST(EXT_STATIC) AC_SUBST(EXT_SHARED) AC_SUBST(EXT_LIBS) +AC_SUBST(EXT_LTLIBS) dnl dnl Solaris requires main code to be position independent in order Index: php4/buildconf diff -u php4/buildconf:1.33 php4/buildconf:1.34 --- php4/buildconf:1.33 Wed Sep 29 17:49:32 1999 +++ php4/buildconf Mon Oct 4 11:18:01 1999 @@ -150,6 +150,6 @@ fi if test "$supplied_flag" != "--local"; then - (cd libzend; ./buildconf libzend/) - (cd TSRM; ./buildconf TSRM/) + (cd libzend; ./buildconf $automake_flags libzend/) + (cd TSRM; ./buildconf $automake_flags TSRM/) fi Index: php4/configure.in diff -u php4/configure.in:1.11 php4/configure.in:1.12 --- php4/configure.in:1.11 Sun Oct 3 11:07:41 1999 +++ php4/configure.in Mon Oct 4 11:18:01 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.11 1999/10/03 15:07:41 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.12 1999/10/04 15:18:01 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -12,14 +12,8 @@ exit 1 fi -if test "$no_recursion" != "yes"; then - cwd=pwd - (set -x; test -d libzend || mkdir libzend; cd libzend; $cwd/$srcdir/libzend/configure --cache-file=$cache_file $@) || exit 1 - if test "$enable_thread_safety" = "yes"; then - (set -x; test -d TSRM || mkdir TSRM; cd TSRM && $cwd/$srcdir/TSRM/configure --cache-file=$cache_file $@) || exit 1 - fi - (set -x; cd $srcdir; sh ltconfig --disable-static --enable-dlopen --cache-file=$cache_file ltmain.sh) -fi +cwd=pwd +passthru="$@" dnl ## Diversion 1 is the initial checking of OS features, programs, dnl ## libraries and so on. @@ -69,8 +63,6 @@ dnl fi dnl Checks for programs. -AM_PROG_LIBTOOL -AM_SET_LIBTOOL_VARIABLE([--silent]) AC_PROG_YACC if test "$YACC" != "bison -y"; then AC_MSG_WARN(You will need bison if you want to regenerate the PHP parsers.) @@ -97,6 +89,7 @@ AC_PROG_LN_S AC_PATH_PROG(PERL_PATH, perl) +AM_PROG_LEX dnl Make flex scanners use const if they can, even if __STDC__ is not dnl true, for compilers like Sun's that only set __STDC__ true in @@ -129,7 +122,6 @@ AC_MSG_RESULT($php_cv_cc_dashr) if test $php_cv_cc_dashr = "yes"; then ld_runpath_switch="-R" - apxs_runpath_switch="-Wl,-R'" else AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ @@ -140,42 +132,12 @@ AC_MSG_RESULT($php_cv_cc_rpath) if test $php_cv_cc_rpath = "yes"; then ld_runpath_switch="-Wl,-rpath," - apxs_runpath_switch="-Wl,'-rpath " else dnl something innocuous ld_runpath_switch="-L" - apxs_runpath_switch="-L'" fi fi -AC_MSG_CHECKING([if compiler supports -Wl,--version-script]) -AC_CACHE_VAL(php_cv_cc_vscript,[ - SLIBS=$LIBS - LIBS="-Wl,--version-script=$srcdir/php.map $LIBS" - AC_TRY_LINK([],[],php_cv_cc_vscript=yes,php_cv_cc_vscript=no) - LIBS=$SLIBS ]) -AC_MSG_RESULT($php_cv_cc_vscript) - - -dnl Check compiler support for -rdynamic -AC_MSG_CHECKING(if compiler supports -rdynamic) -AC_CACHE_VAL(php_cc_rdynamic,[ - SAVE_LIBS="${LIBS}" - LIBS="-rdynamic ${LIBS}" - AC_TRY_LINK([], [], php_cc_rdynamic=yes, php_cc_rdynamic=no) - LIBS="${SAVE_LIBS}"]) -AC_MSG_RESULT($php_cc_rdynamic) -if test $php_cc_rdynamic = "yes"; then - AC_CHECK_CC_OPTION(rdynamic) -fi -if test $php_cc_rdynamic = "yes"; then - LDFLAGS="${LDFLAGS} -rdynamic" - RDYNAMIC_LFLAGS="-rdynamic" -else - RDYNAMIC_LFLAGS="" -fi -AC_SUBST(RDYNAMIC_LFLAGS) - dnl AC_PROG_INSTALL AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/lib/sendmail, $PATH /usr/bin /usr/sbin /usr/etc /etc /usr/ucblib) if test -n "$PROG_SENDMAIL"; then @@ -192,7 +154,6 @@ fi INCLUDES="-I\$(top_builddir)/libzend -I\$(top_builddir)/TSRM" -EXTRA_LIBS="$EXTRA_LIBS \$cwd/libzend/zend_config --libs\" AC_SUBST(INCLUDES) AC_CHECK_LIB(nsl, gethostname, [ @@ -410,30 +371,18 @@ AC_SUBST(abs_srcdir) AC_SUBST(abs_builddir) -versioning="no" +RESULT=no AC_MSG_CHECKING(whether to enable versioning) AC_ARG_ENABLE(versioning, [ --enable-versioning Take advantage of versioning and scoping. See INSTALL for more information], [ if test "$enableval" = "yes" ; then - case "uname -sr" in - "SunOS 5"*) - VERSION_SCRIPT="-Wl,'-M $abs_srcdir/php.map'" - ;; - *) - if test "$php_cv_cc_vscript" = "yes" ; then - VERSION_SCRIPT="-Wl,--version-script=$abs_srcdir/php.map" - else - AC_MSG_ERROR(versioning is not supported on your OS) - fi - ;; - esac - versioning="yes" + EXTRA_LDFLAGS="-export-symbols \$(srcdir)/php.sym" + RESULT="yes" fi ]) -AC_MSG_RESULT($versioning) -AC_SUBST(VERSION_SCRIPT) +AC_MSG_RESULT($RESULT) AC_MSG_CHECKING(whether to use bundled regex library) AC_ARG_WITH(system-regex, @@ -466,8 +415,7 @@ AC_MSG_RESULT($HSREGEX) if test "$HSREGEX" = "yes"; then - REGEX_LIB=regex/libregex.a - EXTRA_LIBS="-L$abs_builddir/regex -lregex $EXTRA_LIBS" + REGEX_LIB=regex/libregex.la AC_DEFINE(HSREGEX) AC_DEFINE(REGEX,1) else @@ -610,26 +558,6 @@ ]) -AC_MSG_CHECKING(whether to build PHP thread-safe) -AC_ARG_ENABLE(thread-safety, -[ --enable-thread-safety Whether to build PHP thread-safe.],[ - if test "$enableval" = "yes"; then - TSRM_LIB='TSRM/libtsrm.a' - TSRM_DIR=TSRM - EXTRA_LIBS="$EXTRA_LIBS \$(TSRM_DIR)/libtsrm.a \\$(TSRM_DIR)/tsrm_config --libs\" - AC_DEFINE(ZTS) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi -],[ - TSRM_DIR="" - TSRM_LIB="" - AC_MSG_RESULT(no) -]) -AC_SUBST(TSRM_DIR) -AC_SUBST(TSRM_LIB) - AC_MSG_CHECKING(whether to enable runpaths) AC_ARG_ENABLE(rpath, [ --disable-rpath Disable passing additional runtime library @@ -696,12 +624,14 @@ dnl ## This is the default server API. PHP_SAPI=cgi SAPI_TARGET=php +PHP_BUILD_PROGRAM esyscmd(./scripts/config-stubs sapi) divert(3) AC_SUBST(EXTRA_LIBS) +AC_SUBST(EXTRA_LDFLAGS) # reading config stubs esyscmd(./scripts/config-stubs ext) @@ -710,9 +640,54 @@ divert(4) +enable_shared=yes +enable_static=yes + +case "$php_build_target" in +program) + enable_static=no + PHP_PROGRAM=php + passthru="$passthru --disable-static" +;; +shared) + enable_static=no + passthru="$passthru --disable-static" +;; +static) + enable_shared=no + passthru="$passthru --disable-shared" +;; +esac + + + +AM_PROG_LIBTOOL +if test "$enable_debug" != "yes"; then + AM_SET_LIBTOOL_VARIABLE([--silent]) +fi + dnl If we are using gcc and the user has not specified CFLAGS, add -O2. test -n "$auto_cflags" && test -n "$GCC" && CFLAGS="$CFLAGS -O2" +AC_MSG_CHECKING(whether to build PHP thread-safe) +AC_ARG_ENABLE(thread-safety, +[ --enable-thread-safety Whether to build PHP thread-safe.],[ + if test "$enableval" = "yes"; then + TSRM_LIB='TSRM/libtsrm.la' + TSRM_DIR=TSRM + AC_DEFINE(ZTS) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +],[ + TSRM_DIR="" + TSRM_LIB="" + AC_MSG_RESULT(no) +]) +AC_SUBST(TSRM_DIR) +AC_SUBST(TSRM_LIB) + dnl *** Commented out - generates slow code and consumes a lot of dnl *** resources during compilation - we need to figure out how dnl *** to supply it only when absolutely necessary @@ -720,16 +695,23 @@ dnl test -n "$GCC" && CFLAGS="$CFLAGS -fpic" dnl add -fPIC option on Solaris if we are building dynamic extensions -PHP_SOLARIS_PIC_WEIRDNESS +dnl PHP_SOLARIS_PIC_WEIRDNESS AC_BUILD_RPATH +phplibdir="pwd/modules" +phptempdir="pwd/libs" +AC_SUBST(phplibdir) +AC_SUBST(phptempdir) +LDFLAGS="$LDFLAGS -module" +EXTRA_LIBS="$LIBS $EXTRA_LIBS" +LIBS="" + AC_SUBST(CFLAGS) AC_SUBST(PROG_SENDMAIL) -AC_SUBST(CFLAGS_SHLIB) -AC_SUBST(LDFLAGS_SHLIB) -AC_SUBST(LDFLAGS_SHLIB_EXPORT) -AC_SUBST(RPATHS) +AC_SUBST(PHP_RPATHS) +AC_SUBST(NATIVE_RPATHS) +AC_SUBST(PHP_PROGRAM) PHP_BUILD_DATE=date '+%Y-%m-%d' AC_SUBST(PHP_BUILD_DATE) @@ -741,7 +723,9 @@ AC_SUBST(PHP_LIBS) AC_SUBST(PHP_SAPI) -AC_SUBST(SAPI_TARGET) +AC_SUBST(INSTALL_IT) + +PHP_OUTPUT_FILES=echo $PHP_OUTPUT_FILES | sort #libphp4.module AC_OUTPUT([Makefile php4.spec ext/Makefile sapi/Makefile $PHP_OUTPUT_FILES @@ -752,6 +736,14 @@ echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c echo "creating number.h" echo "/* Dummy File */" > $srcdir/ext/bcmath/number.h +fi + +if test "$no_recursion" != "yes"; then + (set -x; test -d libzend || mkdir libzend; cd libzend; $cwd/$srcdir/libzend/configure --cache-file=../$cache_file $passthru) || exit 1 + if test "$enable_thread_safety" = "yes"; then + (set -x; test -d TSRM || mkdir TSRM; cd TSRM && $cwd/$srcdir/TSRM/configure --cache-file=../$cache_file $passthru) || exit 1 + fi +dnl (set -x; cd $srcdir; sh ltconfig --disable-static --enable-dlopen --cache-file=$cache_file ltmain.sh) fi # run this only when generating all the files? Index: php4/ext/Makefile.am diff -u php4/ext/Makefile.am:1.6 php4/ext/Makefile.am:1.7 --- php4/ext/Makefile.am:1.6 Mon Aug 23 19:02:09 1999 +++ php4/ext/Makefile.am Mon Oct 4 11:18:02 1999 @@ -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 Index: php4/ext/ext_skel diff -u php4/ext/ext_skel:1.7 php4/ext/ext_skel:1.8 --- php4/ext/ext_skel:1.7 Mon Sep 27 10:15:15 1999 +++ php4/ext/ext_skel Mon Oct 4 11:18:02 1999 @@ -47,8 +47,8 @@ # \$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 Index: php4/ext/apache/Makefile.am diff -u php4/ext/apache/Makefile.am:1.1 php4/ext/apache/Makefile.am:1.2 --- php4/ext/apache/Makefile.am:1.1 Wed Apr 21 19:11:19 1999 +++ php4/ext/apache/Makefile.am Mon Oct 4 11:18:03 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/21 23:11:19 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:03 sas Exp $ 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 Index: php4/ext/apache/config.m4 diff -u php4/ext/apache/config.m4:1.1 php4/ext/apache/config.m4:1.2 --- php4/ext/apache/config.m4:1.1 Wed Apr 21 19:11:19 1999 +++ php4/ext/apache/config.m4 Mon Oct 4 11:18:03 1999 @@ -1,5 +1,2 @@ -dnl $Id: config.m4,v 1.1 1999/04/21 23:11:19 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/10/04 15:18:03 sas Exp $ -if test -n "$APACHE_INCLUDE"; then - PHP_EXTENSION(apache) -fi Index: php4/ext/aspell/Makefile.am diff -u php4/ext/aspell/Makefile.am:1.1 php4/ext/aspell/Makefile.am:1.2 --- php4/ext/aspell/Makefile.am:1.1 Fri Jul 9 10:56:33 1999 +++ php4/ext/aspell/Makefile.am Mon Oct 4 11:18:03 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/07/09 14:56:33 rasmus Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:03 sas Exp $ 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 Index: php4/ext/bcmath/Makefile.am diff -u php4/ext/bcmath/Makefile.am:1.1 php4/ext/bcmath/Makefile.am:1.2 --- php4/ext/bcmath/Makefile.am:1.1 Wed Apr 21 19:28:00 1999 +++ php4/ext/bcmath/Makefile.am Mon Oct 4 11:18:04 1999 @@ -1,5 +1,5 @@ -# $Id: Makefile.am,v 1.1 1999/04/21 23:28:00 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:04 sas Exp $ 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 Index: php4/ext/dav/Makefile.am diff -u php4/ext/dav/Makefile.am:1.1 php4/ext/dav/Makefile.am:1.2 --- php4/ext/dav/Makefile.am:1.1 Wed Apr 21 18:49:15 1999 +++ php4/ext/dav/Makefile.am Mon Oct 4 11:18:04 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/21 22:49:15 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:04 sas Exp $ 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 Index: php4/ext/db/Makefile.am diff -u php4/ext/db/Makefile.am:1.1 php4/ext/db/Makefile.am:1.2 --- php4/ext/db/Makefile.am:1.1 Wed Apr 21 19:37:46 1999 +++ php4/ext/db/Makefile.am Mon Oct 4 11:18:05 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/21 23:37:46 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:05 sas Exp $ 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 Index: php4/ext/dba/Makefile.am diff -u php4/ext/dba/Makefile.am:1.1 php4/ext/dba/Makefile.am:1.2 --- php4/ext/dba/Makefile.am:1.1 Wed Jul 21 11:12:31 1999 +++ php4/ext/dba/Makefile.am Mon Oct 4 11:18:05 1999 @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.1 1999/07/21 15:12:31 sas Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:05 sas Exp $ 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 Index: php4/ext/dbase/Makefile.am diff -u php4/ext/dbase/Makefile.am:1.1 php4/ext/dbase/Makefile.am:1.2 --- php4/ext/dbase/Makefile.am:1.1 Mon Apr 19 09:56:50 1999 +++ php4/ext/dbase/Makefile.am Mon Oct 4 11:18:06 1999 @@ -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 Index: php4/ext/fdf/Makefile.am diff -u php4/ext/fdf/Makefile.am:1.1 php4/ext/fdf/Makefile.am:1.2 --- php4/ext/fdf/Makefile.am:1.1 Wed Apr 21 20:25:52 1999 +++ php4/ext/fdf/Makefile.am Mon Oct 4 11:18:06 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 00:25:52 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:06 sas Exp $ 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 Index: php4/ext/filepro/Makefile.am diff -u php4/ext/filepro/Makefile.am:1.1 php4/ext/filepro/Makefile.am:1.2 --- php4/ext/filepro/Makefile.am:1.1 Wed Apr 21 18:02:45 1999 +++ php4/ext/filepro/Makefile.am Mon Oct 4 11:18:07 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/21 22:02:45 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:07 sas Exp $ 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 Index: php4/ext/ftp/Makefile.am diff -u php4/ext/ftp/Makefile.am:1.2 php4/ext/ftp/Makefile.am:1.3 --- php4/ext/ftp/Makefile.am:1.2 Mon Sep 20 10:10:25 1999 +++ php4/ext/ftp/Makefile.am Mon Oct 4 11:18:07 1999 @@ -1,5 +1,5 @@ -# $Id: Makefile.am,v 1.2 1999/09/20 14:10:25 askalski Exp $ +# $Id: Makefile.am,v 1.3 1999/10/04 15:18:07 sas Exp $ 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 Index: php4/ext/gd/Makefile.am diff -u php4/ext/gd/Makefile.am:1.3 php4/ext/gd/Makefile.am:1.4 --- php4/ext/gd/Makefile.am:1.3 Fri Sep 10 12:27:13 1999 +++ php4/ext/gd/Makefile.am Mon Oct 4 11:18:08 1999 @@ -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) Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.12 php4/ext/gd/config.m4:1.13 --- php4/ext/gd/config.m4:1.12 Thu Sep 30 16:04:52 1999 +++ php4/ext/gd/config.m4 Mon Oct 4 11:18:08 1999 @@ -139,7 +139,7 @@ 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 Index: php4/ext/gettext/Makefile.am diff -u php4/ext/gettext/Makefile.am:1.1 php4/ext/gettext/Makefile.am:1.2 --- php4/ext/gettext/Makefile.am:1.1 Wed Apr 21 13:26:16 1999 +++ php4/ext/gettext/Makefile.am Mon Oct 4 11:18:08 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/21 17:26:16 sas Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:08 sas Exp $ 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 Index: php4/ext/hyperwave/Makefile.am diff -u php4/ext/hyperwave/Makefile.am:1.1 php4/ext/hyperwave/Makefile.am:1.2 --- php4/ext/hyperwave/Makefile.am:1.1 Wed Apr 21 19:11:20 1999 +++ php4/ext/hyperwave/Makefile.am Mon Oct 4 11:18:09 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/21 23:11:20 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:09 sas Exp $ 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 Index: php4/ext/icap/Makefile.am diff -u php4/ext/icap/Makefile.am:1.2 php4/ext/icap/Makefile.am:1.3 --- php4/ext/icap/Makefile.am:1.2 Tue Aug 17 11:17:01 1999 +++ php4/ext/icap/Makefile.am Mon Oct 4 11:18:09 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.2 1999/08/17 15:17:01 musone Exp $ +# $Id: Makefile.am,v 1.3 1999/10/04 15:18:09 sas Exp $ 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 Index: php4/ext/imap/Makefile.am diff -u php4/ext/imap/Makefile.am:1.1 php4/ext/imap/Makefile.am:1.2 --- php4/ext/imap/Makefile.am:1.1 Wed Apr 21 20:45:13 1999 +++ php4/ext/imap/Makefile.am Mon Oct 4 11:18:10 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 00:45:13 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:10 sas Exp $ 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 Index: php4/ext/informix/Makefile.am diff -u php4/ext/informix/Makefile.am:1.2 php4/ext/informix/Makefile.am:1.3 --- php4/ext/informix/Makefile.am:1.2 Wed Apr 21 22:48:23 1999 +++ php4/ext/informix/Makefile.am Mon Oct 4 11:18:10 1999 @@ -1,8 +1,8 @@ -# $Id: Makefile.am,v 1.2 1999/04/22 02:48:23 ssb Exp $ +# $Id: Makefile.am,v 1.3 1999/10/04 15:18:10 sas Exp $ 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 \ Index: php4/ext/interbase/Makefile.am diff -u php4/ext/interbase/Makefile.am:1.1 php4/ext/interbase/Makefile.am:1.2 --- php4/ext/interbase/Makefile.am:1.1 Wed Apr 21 22:48:24 1999 +++ php4/ext/interbase/Makefile.am Mon Oct 4 11:18:11 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 02:48:24 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:11 sas Exp $ 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 Index: php4/ext/ldap/Makefile.am diff -u php4/ext/ldap/Makefile.am:1.1 php4/ext/ldap/Makefile.am:1.2 --- php4/ext/ldap/Makefile.am:1.1 Wed Apr 21 20:45:14 1999 +++ php4/ext/ldap/Makefile.am Mon Oct 4 11:18:11 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 00:45:14 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:11 sas Exp $ 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 Index: php4/ext/mcal/Makefile.am diff -u php4/ext/mcal/Makefile.am:1.1 php4/ext/mcal/Makefile.am:1.2 --- php4/ext/mcal/Makefile.am:1.1 Wed Sep 1 16:30:26 1999 +++ php4/ext/mcal/Makefile.am Mon Oct 4 11:18:12 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/09/01 20:30:26 musone Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:12 sas Exp $ 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 Index: php4/ext/mcrypt/Makefile.am diff -u php4/ext/mcrypt/Makefile.am:1.1 php4/ext/mcrypt/Makefile.am:1.2 --- php4/ext/mcrypt/Makefile.am:1.1 Sun Apr 25 12:50:40 1999 +++ php4/ext/mcrypt/Makefile.am Mon Oct 4 11:18:12 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/25 16:50:40 sas Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:12 sas Exp $ 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 Index: php4/ext/mhash/Makefile.am diff -u php4/ext/mhash/Makefile.am:1.1 php4/ext/mhash/Makefile.am:1.2 --- php4/ext/mhash/Makefile.am:1.1 Sun May 16 08:01:25 1999 +++ php4/ext/mhash/Makefile.am Mon Oct 4 11:18:13 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/05/16 12:01:25 sas Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:13 sas Exp $ 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 Index: php4/ext/mysql/Makefile.am diff -u php4/ext/mysql/Makefile.am:1.3 php4/ext/mysql/Makefile.am:1.4 --- php4/ext/mysql/Makefile.am:1.3 Fri Sep 3 15:37:46 1999 +++ php4/ext/mysql/Makefile.am Mon Oct 4 11:18:13 1999 @@ -1,14 +1,12 @@ -# $Id: Makefile.am,v 1.3 1999/09/03 19:37:46 zeev Exp $ +# $Id: Makefile.am,v 1.4 1999/10/04 15:18:13 sas Exp $ -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) Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.10 php4/ext/mysql/config.m4:1.11 --- php4/ext/mysql/config.m4:1.10 Mon Sep 13 13:17:51 1999 +++ php4/ext/mysql/config.m4 Mon Oct 4 11:18:13 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 1999/09/13 17:17:51 ssb Exp $ +dnl $Id: config.m4,v 1.11 1999/10/04 15:18:13 sas Exp $ AC_MSG_CHECKING(for MySQL support) AC_ARG_WITH(mysql, @@ -57,7 +57,7 @@ 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) Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.4 php4/ext/mysql/php_mysql.c:1.5 --- php4/ext/mysql/php_mysql.c:1.4 Fri Sep 24 10:07:15 1999 +++ php4/ext/mysql/php_mysql.c Mon Oct 4 11:18:13 1999 @@ -16,17 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.4 1999/09/24 14:07:15 zeev Exp $ */ +/* $Id: php_mysql.c,v 1.5 1999/10/04 15:18:13 sas Exp $ */ /* TODO: * * ? Safe mode implementation */ - -#ifdef PIC -# define COMPILE_DL 1 -#endif #if COMPILE_DL #include "dl/phpdl.h" Index: php4/ext/mysql/php_mysql.h diff -u php4/ext/mysql/php_mysql.h:1.1 php4/ext/mysql/php_mysql.h:1.2 --- php4/ext/mysql/php_mysql.h:1.1 Fri Sep 3 15:54:12 1999 +++ php4/ext/mysql/php_mysql.h Mon Oct 4 11:18:14 1999 @@ -17,7 +17,7 @@ */ -/* $Id: php_mysql.h,v 1.1 1999/09/03 19:54:12 zeev Exp $ */ +/* $Id: php_mysql.h,v 1.2 1999/10/04 15:18:14 sas Exp $ */ #ifndef _PHP_MYSQL_H #define _PHP_MYSQL_H @@ -38,7 +38,7 @@ #define DLEXPORT #endif -#ifdef ZTS +#ifdef __ZTS #include "TSRM.h" #endif Index: php4/ext/oci8/Makefile.am diff -u php4/ext/oci8/Makefile.am:1.1 php4/ext/oci8/Makefile.am:1.2 --- php4/ext/oci8/Makefile.am:1.1 Wed May 12 10:21:37 1999 +++ php4/ext/oci8/Makefile.am Mon Oct 4 11:18:14 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/05/12 14:21:37 thies Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:14 sas Exp $ 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 Index: php4/ext/odbc/Makefile.am diff -u php4/ext/odbc/Makefile.am:1.2 php4/ext/odbc/Makefile.am:1.3 --- php4/ext/odbc/Makefile.am:1.2 Sun Sep 5 09:01:42 1999 +++ php4/ext/odbc/Makefile.am Mon Oct 4 11:18:14 1999 @@ -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 Index: php4/ext/oracle/Makefile.am diff -u php4/ext/oracle/Makefile.am:1.2 php4/ext/oracle/Makefile.am:1.3 --- php4/ext/oracle/Makefile.am:1.2 Wed May 12 10:21:37 1999 +++ php4/ext/oracle/Makefile.am Mon Oct 4 11:18:15 1999 @@ -1,5 +1,5 @@ -# $Id: Makefile.am,v 1.2 1999/05/12 14:21:37 thies Exp $ +# $Id: Makefile.am,v 1.3 1999/10/04 15:18:15 sas Exp $ 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 Index: php4/ext/pcre/Makefile.am diff -u php4/ext/pcre/Makefile.am:1.4 php4/ext/pcre/Makefile.am:1.5 --- php4/ext/pcre/Makefile.am:1.4 Tue Jul 6 15:24:12 1999 +++ php4/ext/pcre/Makefile.am Mon Oct 4 11:18:15 1999 @@ -1,6 +1,8 @@ -# $Id: Makefile.am,v 1.4 1999/07/06 19:24:12 zeev Exp $ +# $Id: Makefile.am,v 1.5 1999/10/04 15:18:15 sas Exp $ 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@ Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.13 php4/ext/pcre/config.m4:1.14 --- php4/ext/pcre/config.m4:1.13 Wed Sep 29 18:18:43 1999 +++ php4/ext/pcre/config.m4 Mon Oct 4 11:18:16 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.13 1999/09/29 22:18:43 sas Exp $ +dnl $Id: config.m4,v 1.14 1999/10/04 15:18:16 sas Exp $ dnl config.m4 for extension pcre dnl By default we'll compile and link against the bundled PCRE library @@ -51,11 +51,12 @@ ;; 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) Index: php4/ext/pcre/pcrelib/Makefile.am diff -u php4/ext/pcre/pcrelib/Makefile.am:1.1 php4/ext/pcre/pcrelib/Makefile.am:1.2 --- php4/ext/pcre/pcrelib/Makefile.am:1.1 Wed May 26 21:34:18 1999 +++ php4/ext/pcre/pcrelib/Makefile.am Mon Oct 4 11:18:16 1999 @@ -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 Index: php4/ext/pdf/Makefile.am diff -u php4/ext/pdf/Makefile.am:1.1 php4/ext/pdf/Makefile.am:1.2 --- php4/ext/pdf/Makefile.am:1.1 Wed Apr 21 22:48:24 1999 +++ php4/ext/pdf/Makefile.am Mon Oct 4 11:18:17 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 02:48:24 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:17 sas Exp $ 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 Index: php4/ext/pgsql/Makefile.am diff -u php4/ext/pgsql/Makefile.am:1.2 php4/ext/pgsql/Makefile.am:1.3 --- php4/ext/pgsql/Makefile.am:1.2 Fri Sep 3 10:58:51 1999 +++ php4/ext/pgsql/Makefile.am Mon Oct 4 11:18:17 1999 @@ -1,14 +1,11 @@ -# $Id: Makefile.am,v 1.2 1999/09/03 14:58:51 gorgo Exp $ +# $Id: Makefile.am,v 1.3 1999/10/04 15:18:17 sas Exp $ -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) Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.4 php4/ext/pgsql/config.m4:1.5 --- php4/ext/pgsql/config.m4:1.4 Fri Sep 3 10:58:51 1999 +++ php4/ext/pgsql/config.m4 Mon Oct 4 11:18:17 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/09/03 14:58:51 gorgo Exp $ +dnl $Id: config.m4,v 1.5 1999/10/04 15:18:17 sas Exp $ AC_MSG_CHECKING(for PostgresSQL support) AC_ARG_WITH(pgsql, @@ -47,7 +47,7 @@ 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 Index: php4/ext/session/Makefile.am diff -u php4/ext/session/Makefile.am:1.3 php4/ext/session/Makefile.am:1.4 --- php4/ext/session/Makefile.am:1.3 Fri Sep 17 01:40:59 1999 +++ php4/ext/session/Makefile.am Mon Oct 4 11:18:18 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.3 1999/09/17 05:40:59 sas Exp $ +# $Id: Makefile.am,v 1.4 1999/10/04 15:18:18 sas Exp $ 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 Index: php4/ext/snmp/Makefile.am diff -u php4/ext/snmp/Makefile.am:1.2 php4/ext/snmp/Makefile.am:1.3 --- php4/ext/snmp/Makefile.am:1.2 Fri Sep 3 12:04:28 1999 +++ php4/ext/snmp/Makefile.am Mon Oct 4 11:18:18 1999 @@ -1,14 +1,11 @@ -# $Id: Makefile.am,v 1.2 1999/09/03 16:04:28 gorgo Exp $ +# $Id: Makefile.am,v 1.3 1999/10/04 15:18:18 sas Exp $ -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) Index: php4/ext/standard/Makefile.am diff -u php4/ext/standard/Makefile.am:1.14 php4/ext/standard/Makefile.am:1.15 --- php4/ext/standard/Makefile.am:1.14 Thu Sep 23 10:09:42 1999 +++ php4/ext/standard/Makefile.am Mon Oct 4 11:18:19 1999 @@ -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 $@ Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.37 php4/ext/standard/info.c:1.38 --- php4/ext/standard/info.c:1.37 Fri Oct 1 10:54:55 1999 +++ php4/ext/standard/info.c Mon Oct 4 11:18:19 1999 @@ -303,7 +303,7 @@ 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"); Index: php4/ext/sybase/Makefile.am diff -u php4/ext/sybase/Makefile.am:1.2 php4/ext/sybase/Makefile.am:1.3 --- php4/ext/sybase/Makefile.am:1.2 Thu Aug 12 20:14:15 1999 +++ php4/ext/sybase/Makefile.am Mon Oct 4 11:18:19 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.2 1999/08/13 00:14:15 zeev Exp $ +# $Id: Makefile.am,v 1.3 1999/10/04 15:18:19 sas Exp $ 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 Index: php4/ext/sybase_ct/Makefile.am diff -u php4/ext/sybase_ct/Makefile.am:1.1 php4/ext/sybase_ct/Makefile.am:1.2 --- php4/ext/sybase_ct/Makefile.am:1.1 Thu Aug 12 20:14:16 1999 +++ php4/ext/sybase_ct/Makefile.am Mon Oct 4 11:18:20 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/08/13 00:14:16 zeev Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:20 sas Exp $ 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 Index: php4/ext/sysvsem/Makefile.am diff -u php4/ext/sysvsem/Makefile.am:1.1 php4/ext/sysvsem/Makefile.am:1.2 --- php4/ext/sysvsem/Makefile.am:1.1 Wed Apr 21 22:48:26 1999 +++ php4/ext/sysvsem/Makefile.am Mon Oct 4 11:18:20 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 02:48:26 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:20 sas Exp $ 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 Index: php4/ext/sysvshm/Makefile.am diff -u php4/ext/sysvshm/Makefile.am:1.1 php4/ext/sysvshm/Makefile.am:1.2 --- php4/ext/sysvshm/Makefile.am:1.1 Wed Apr 21 22:48:27 1999 +++ php4/ext/sysvshm/Makefile.am Mon Oct 4 11:18:21 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 02:48:27 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:21 sas Exp $ 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 Index: php4/ext/wddx/Makefile.am diff -u php4/ext/wddx/Makefile.am:1.1 php4/ext/wddx/Makefile.am:1.2 --- php4/ext/wddx/Makefile.am:1.1 Mon Jul 19 16:24:02 1999 +++ php4/ext/wddx/Makefile.am Mon Oct 4 11:18:21 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/07/19 20:24:02 andrey Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:21 sas Exp $ 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 Index: php4/ext/xml/Makefile.am diff -u php4/ext/xml/Makefile.am:1.5 php4/ext/xml/Makefile.am:1.6 --- php4/ext/xml/Makefile.am:1.5 Fri Sep 24 11:35:35 1999 +++ php4/ext/xml/Makefile.am Mon Oct 4 11:18:22 1999 @@ -1,12 +1,11 @@ -# $Id: Makefile.am,v 1.5 1999/09/24 15:35:35 ssb Exp $ +# $Id: Makefile.am,v 1.6 1999/10/04 15:18:22 sas Exp $ 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) Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.13 php4/ext/xml/config.m4:1.14 --- php4/ext/xml/config.m4:1.13 Tue Sep 28 05:59:59 1999 +++ php4/ext/xml/config.m4 Mon Oct 4 11:18:22 1999 @@ -1,5 +1,5 @@ # $Source: /local/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.13 1999/09/28 09:59:59 thies Exp $ +# $Id: config.m4,v 1.14 1999/10/04 15:18:22 sas Exp $ AC_MSG_CHECKING(for XML support) AC_ARG_WITH(xml, @@ -41,7 +41,7 @@ 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" Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.23 php4/ext/xml/xml.c:1.24 --- php4/ext/xml/xml.c:1.23 Fri Oct 1 09:44:07 1999 +++ php4/ext/xml/xml.c Mon Oct 4 11:18:22 1999 @@ -17,13 +17,8 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.23 1999/10/01 13:44:07 thies Exp $ */ +/* $Id: xml.c,v 1.24 1999/10/04 15:18:22 sas Exp $ */ #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" Index: php4/ext/yp/Makefile.am diff -u php4/ext/yp/Makefile.am:1.1 php4/ext/yp/Makefile.am:1.2 --- php4/ext/yp/Makefile.am:1.1 Fri May 21 04:29:49 1999 +++ php4/ext/yp/Makefile.am Mon Oct 4 11:18:22 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/05/21 08:29:49 sas Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:22 sas Exp $ 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 Index: php4/ext/zlib/Makefile.am diff -u php4/ext/zlib/Makefile.am:1.1 php4/ext/zlib/Makefile.am:1.2 --- php4/ext/zlib/Makefile.am:1.1 Wed Apr 21 22:48:28 1999 +++ php4/ext/zlib/Makefile.am Mon Oct 4 11:18:23 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 02:48:28 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/10/04 15:18:23 sas Exp $ 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 Index: php4/sapi/Makefile.am diff -u php4/sapi/Makefile.am:1.1 php4/sapi/Makefile.am:1.2 --- php4/sapi/Makefile.am:1.1 Mon Sep 27 12:34:27 1999 +++ php4/sapi/Makefile.am Mon Oct 4 11:18:24 1999 @@ -1,14 +1,4 @@ ## Process this file with automake to produce Makefile.in -PHP_SAPI=@PHP_SAPI@ -PHP_SAPI_LIB=$(PHP_SAPI)/libphpsapi_$(PHP_SAPI).a SUBDIRS = $(PHP_SAPI) -noinst_LIBRARIES=libphpsapi.a - -libphpsapi.a: $(PHP_SAPI_LIB) - cp $(PHP_SAPI_LIB) $@ - @test "uname -s" = "Rhapsody" && $(RANLIB) $@ || exit 0 - -$(PHP_SAPI_LIB): - (cd $(PHP_SAPI); $(MAKE) libphpsapi_$(PHP_SAPI).a) Index: php4/sapi/README diff -u php4/sapi/README:1.1 php4/sapi/README:1.2 --- php4/sapi/README:1.1 Mon Sep 27 12:37:33 1999 +++ php4/sapi/README Mon Oct 4 11:18:24 1999 @@ -4,15 +4,17 @@ autoconf/automake directives that end up in the configure script. The only difference is that the sapi config.m4 files are read in diversion (output block) 2 instead of 3. The sapi config.m4 files should set -two variables: PHP_SAPI (which sapi backend to choose) and SAPI_TARGET -(the name of the resulting library or program, previously BINNAME). -If they are not specified, they will default to "cgi" and "php", -respectively. +two variables: PHP_SAPI (which sapi backend to choose) and INSTALL_IT +(the actions performed when "make install" is executed). If they are +not specified, they will default to "cgi" and "do nothing," +respectively. Additionally, the following m4 macros can be used to +influence what is created during "make": -Makefile.inc: has to exist, has to define "INSTALL_IT" to the command -used to install the final target (or ":" for no operation). It also -has to define a plain Makefile rule (without autoconf substitutions) -to build $(SAPI_TARGET) +PHP_BUILD_SHARED -- build shared target libs/php_lib.so +PHP_BUILD_STATIC -- build static target libs/php_lib.a +PHP_BUILD_PROGRAM -- build executable php +(paths relative to top build dir) + Makefile.am: just what you think. Make sure your target is called -"libphpsapi_NNN.a", where NNN is the value of PHP_SAPI. +"libphpsapi_NNN.la", where NNN is the value of PHP_SAPI. Index: php4/sapi/apache/Makefile.am diff -u php4/sapi/apache/Makefile.am:1.2 php4/sapi/apache/Makefile.am:1.3 --- php4/sapi/apache/Makefile.am:1.2 Wed Sep 29 11:17:01 1999 +++ php4/sapi/apache/Makefile.am Mon Oct 4 11:18:24 1999 @@ -2,5 +2,5 @@ APACHE_INCLUDE=@APACHE_INCLUDE@ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend $(APACHE_INCLUDE) -noinst_LIBRARIES=libphpsapi_apache.a -libphpsapi_apache_a_SOURCES=apache.c +noinst_LTLIBRARIES=libphpsapi_apache.la +libphpsapi_apache_la_SOURCES=sapi_apache.c mod_php4.c Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.4 php4/sapi/apache/config.m4:1.5 --- php4/sapi/apache/config.m4:1.4 Thu Sep 30 08:56:24 1999 +++ php4/sapi/apache/config.m4 Mon Oct 4 11:18:25 1999 @@ -15,16 +15,16 @@ if test -d "$APXS_INCLUDEDIR/xml" ; then XML_INCLUDE="$APXS_INCLUDEDIR/xml" fi - APACHE_INCLUDE="-I$APXS_INCLUDEDIR" + AC_ADD_INCLUDE($APXS_INCLUDEDIR) + PHP_EXTENSION(apache) PHP_SAPI=apache SAPI_TARGET=libphp4.so - APACHE_INSTALL="\$(APXS) -i -a -n php4 $SAPI_TARGET" + APACHE_INSTALL="$APXS -i -a -n php4 libs/libphp4.so" + PHP_BUILD_SHARED CFLAGS_SHLIB=perl -V:cccdlflags | cut -d\' -f2 LDFLAGS_SHLIB=perl -V:lddlflags | cut -d\' -f2 LDFLAGS_SHLIB_EXPORT=perl -V:ccdlflags | cut -d\' -f2 - PHP_LIBS= STRONGHOLD= - INCLUDES="$INCLUDES $APACHE_INCLUDE" AC_DEFINE(APACHE) AC_DEFINE(HAVE_AP_CONFIG_H) AC_DEFINE(HAVE_AP_COMPAT_H) @@ -35,7 +35,6 @@ APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module" -if test "$SAPI_TARGET" != "libmodphp4-so.a"; then if test "$SAPI_TARGET" != "libphp4.so"; then AC_MSG_CHECKING(for Apache module support) AC_ARG_WITH(apache, @@ -71,8 +70,8 @@ mkdir $APACHE_TARGET fi PHP_SAPI=apache - SAPI_TARGET=libmodphp4.a - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" + SAPI_TARGET=libs/libphp4.a + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" AC_DEFINE(APACHE) AC_MSG_RESULT(yes - Apache 1.3.x) @@ -101,9 +100,9 @@ mkdir $APACHE_TARGET fi PHP_SAPI=apache - SAPI_TARGET=libmodphp4.a + SAPI_TARGET=libs/libphp4.a PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" AC_DEFINE(APACHE) AC_MSG_RESULT(yes - Apache 1.3.x) STRONGHOLD= @@ -125,9 +124,9 @@ APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include" APACHE_TARGET=$withval/apache PHP_SAPI=apache - SAPI_TARGET=libmodphp4.a + SAPI_TARGET=libs/libphp4.a PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4" - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_INSTALL_FILES $APACHE_TARGET" + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_TARGET $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET" STRONGHOLD=-DSTRONGHOLD=1 AC_DEFINE(APACHE) AC_MSG_RESULT(yes - StrongHold) @@ -158,7 +157,6 @@ INCLUDES="$INCLUDES $APACHE_INCLUDE" dnl## AC_SUBST(APACHE_INCLUDE) fi -fi if test "x$APXS" != "x" -a "uname -sv" = "AIX 4" -a "$GCC" != "yes"; then APXS_EXP="-bE:sapi/apache/mod_php4.exp" @@ -183,9 +181,14 @@ ]) if test -n "$APACHE_MODULE"; then + PHP_EXTENSION(apache) PHP_OUTPUT(sapi/apache/libphp4.module) + PHP_BUILD_STATIC fi +if test -n "$APACHE_INSTALL"; then + INSTALL_IT=$APACHE_INSTALL +fi dnl ## Local Variables: dnl ## tab-width: 4 Index: php4/sapi/apache/libphp4.module.in diff -u php4/sapi/apache/libphp4.module.in:1.1 php4/sapi/apache/libphp4.module.in:1.2 --- php4/sapi/apache/libphp4.module.in:1.1 Wed Sep 29 11:17:01 1999 +++ php4/sapi/apache/libphp4.module.in Mon Oct 4 11:18:25 1999 @@ -1,7 +1,7 @@ Name: php4_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LIBS="@RPATHS@ @PHP_LIBS@ @EXTRA_LIBS@ @LIBS@ @RDYNAMIC_LFLAGS@ $LIBS" + LIBS="@NATIVE_RPATHS@ @PHP_LIBS@ @EXTRA_LIBS@ @LIBS@ $LIBS" RULE_HIDE=yes CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@/libzend -I@abs_builddir@" ConfigEnd Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.2 php4/sapi/apache/mod_php4.c:1.3 --- php4/sapi/apache/mod_php4.c:1.2 Wed Sep 29 11:17:01 1999 +++ php4/sapi/apache/mod_php4.c Mon Oct 4 11:18:25 1999 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.2 1999/09/29 15:17:01 ssb Exp $ */ +/* $Id: mod_php4.c,v 1.3 1999/10/04 15:18:25 sas Exp $ */ #include "httpd.h" #include "http_config.h" @@ -65,7 +65,7 @@ module MODULE_VAR_EXPORT php4_module; int saved_umask; -static unsigned char apache_php_initialized=0; +static unsigned char apache_php_initialized; typedef struct _php_per_dir_entry { char *key; Index: php4/sapi/cgi/Makefile.am diff -u php4/sapi/cgi/Makefile.am:1.1 php4/sapi/cgi/Makefile.am:1.2 --- php4/sapi/cgi/Makefile.am:1.1 Mon Sep 27 12:34:28 1999 +++ php4/sapi/cgi/Makefile.am Mon Oct 4 11:18:25 1999 @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpsapi_cgi.a -libphpsapi_cgi_a_SOURCES=cgi_main.c +noinst_LTLIBRARIES=libphpsapi_cgi.la +libphpsapi_cgi_la_SOURCES=cgi_main.c Index: php4/sapi/nsapi/Makefile.am diff -u php4/sapi/nsapi/Makefile.am:1.1 php4/sapi/nsapi/Makefile.am:1.2 --- php4/sapi/nsapi/Makefile.am:1.1 Mon Sep 27 12:34:28 1999 +++ php4/sapi/nsapi/Makefile.am Mon Oct 4 11:18:26 1999 @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpsapi_nsapi.a -libphpsapi_nsapi_a_SOURCES=aolserver.c +noinst_LTLIBRARIES=libphpsapi_nsapi.la +libphpsapi_nsapi_la_SOURCES=aolserver.c Index: php4/sapi/nsapi/config.m4 diff -u php4/sapi/nsapi/config.m4:1.1 php4/sapi/nsapi/config.m4:1.2 --- php4/sapi/nsapi/config.m4:1.1 Mon Sep 27 12:34:28 1999 +++ php4/sapi/nsapi/config.m4 Mon Oct 4 11:18:26 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: config.m4,v 1.1 1999/09/27 16:34:28 ssb Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.2 1999/10/04 15:18:26 sas Exp $ -*- sh -*- RESULT=no AC_MSG_CHECKING(for AOLserver support) @@ -8,15 +8,14 @@ if test ! -d $withval ; then AC_MSG_ERROR(You did not specify a directory) fi - if test "$enable_thread_safety" != "yes"; then - AC_MSG_ERROR(AOLserver must be compiled using --enable-thread-safety) - fi + enable_thread_safety=yes + passthru="$passthru --enable-thread-safety" NS_DIR=$withval AC_ADD_INCLUDE($NS_DIR/include) AC_DEFINE(HAVE_AOLSERVER) PHP_SAPI=nsapi - SAPI_TARGET=php4_nsapi.so - INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_TARGET $NS_DIR/root/bin/$SAPI_TARGET" + PHP_BUILD_SHARED + INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 libs/libphp4.so $NS_DIR/root/bin/libphp4.so" RESULT=yes ]) AC_MSG_RESULT($RESULT)