cvs: /php4/ext/aspell config.h.stub /php4/ext/bcmath config.h.stub /php4/ext/cpdf config.h.stub /php4/ext/cybercash config.h.stub /php4/ext/dav
config.h.stub /php4/ext/db config.h.stub /php4/ext/dba config.h.stub /php4/ext/dbase config.h.stub /php4/ext/domxml config.h.stub /php4/ext/fdf
config.h.stub /php4/ext/filepro config.h.stub /php4/ext/ftp config.h.stub /php4/ext/gd config.h.stub /php4/ext/gettext config.h.stub
/php4/ext/hyperwave config.h.stub /php4/ext/icap config.h.stub /php4/ext/imap config.h.stub /php4/ext/informix config.h.stub /php4/ext/interbase
config.h.stub /php4/ext/java config.h.stub /php4/ext/ldap config.h.stub /php4/ext/mcal config.h.stub /php4/ext/mcrypt config.h.stub /php4/ext/mhash
config.h.stub /php4/ext/msql config.h.stub /php4/ext/oci8 config.h.stub /php4/ext/odbc config.h.stub /php4/ext/oracle config.h.stub /php4/ext/pcre
config.h.stub /php4/ext/pdf config.h.stub /php4/ext/pgsql config.h.stub /php4/ext/posix config.h.stub /php4/ext/readline config.h.stub /php4/ext/snmp
config.h.stub /php4/ext/standard config.h.stub /php4/ext/sybase config.h.stub /php4/ext/sybase_ct config.h.stub /php4/ext/sysvsem config.h.stub
/php4/ext/sysvshm config.h.stub /php4/ext/wddx config.h.stub /php4/ext/xml config.h.stub /php4/ext/yp config.h.stub /php4/ext/zlib config.h.stub /php4
configure.in /php4/build build.mk build2.mk /php4/ext ext_skel /php4/ext/aspell config.m4 /php4/ext/bcmath config.m4 /php4/ext/cpdf config.m4
/php4/ext/cybercash config.m4 /php4/ext/dav config.m4 /php4/ext/db config.m4 /php4/ext/dba config.m4 /php4/ext/dbase config.m4 /php4/ext/domxml
config.m4 /php4/ext/fdf config.m4 /php4/ext/filepro config.m4 /php4/ext/ftp config.m4 /php4/ext/gd config.m4 /php4/ext/gettext config.m4
/php4/ext/hyperwave config.m4 /php4/ext/icap config.m4 /php4/ext/imap config.m4 /php4/ext/informix config.m4 /php4/ext/interbase config.m4
/php4/ext/java config.m4 /php4/ext/ldap config.m4 /php4/ext/mcal config.m4 /php4/ext/mcrypt config.m4 /php4/ext/mhash config.m4 /php4/ext/msql
config.m4 /php4/ext/oci8 config.m4 /php4/ext/odbc config.m4 /php4/ext/oracle config.m4 /php4/ext/pcre config.m4 /php4/ext/pdf config.m4
/php4/ext/pgsql config.m4 /php4/ext/readline config.m4 /php4/ext/snmp config.m4 /php4/ext/standard config.m4 /php4/ext/sybase config.m4
/php4/ext/sybase_ct config.m4 /php4/ext/sysvsem config.m4 /php4/ext/sysvshm config.m4 /php4/ext/wddx config.m4 /php4/ext/xml config.m4 /php4/ext/yp
config.m4 /php4/ext/zlib config.m4

sas Wed Dec 29 23:08:17 1999 EDT Removed files: /php4/ext/aspell config.h.stub /php4/ext/bcmath config.h.stub /php4/ext/cpdf config.h.stub /php4/ext/cybercash config.h.stub /php4/ext/dav config.h.stub /php4/ext/db config.h.stub /php4/ext/dba config.h.stub /php4/ext/dbase config.h.stub /php4/ext/domxml config.h.stub /php4/ext/fdf config.h.stub /php4/ext/filepro config.h.stub /php4/ext/ftp config.h.stub /php4/ext/gd config.h.stub /php4/ext/gettext config.h.stub /php4/ext/hyperwave config.h.stub /php4/ext/icap config.h.stub /php4/ext/imap config.h.stub /php4/ext/informix config.h.stub /php4/ext/interbase config.h.stub /php4/ext/java config.h.stub /php4/ext/ldap config.h.stub /php4/ext/mcal config.h.stub /php4/ext/mcrypt config.h.stub /php4/ext/mhash config.h.stub /php4/ext/msql config.h.stub /php4/ext/oci8 config.h.stub /php4/ext/odbc config.h.stub /php4/ext/oracle config.h.stub /php4/ext/pcre config.h.stub /php4/ext/pdf config.h.stub /php4/ext/pgsql config.h.stub /php4/ext/posix config.h.stub /php4/ext/readline config.h.stub /php4/ext/snmp config.h.stub /php4/ext/standard config.h.stub /php4/ext/sybase config.h.stub /php4/ext/sybase_ct config.h.stub /php4/ext/sysvsem config.h.stub /php4/ext/sysvshm config.h.stub /php4/ext/wddx config.h.stub /php4/ext/xml config.h.stub /php4/ext/yp config.h.stub /php4/ext/zlib config.h.stub Modified files: /php4 configure.in /php4/build build.mk build2.mk /php4/ext ext_skel /php4/ext/aspell config.m4 /php4/ext/bcmath config.m4 /php4/ext/cpdf config.m4 /php4/ext/cybercash config.m4 /php4/ext/dav config.m4 /php4/ext/db config.m4 /php4/ext/dba config.m4 /php4/ext/dbase config.m4 /php4/ext/domxml config.m4 /php4/ext/fdf config.m4 /php4/ext/filepro config.m4 /php4/ext/ftp config.m4 /php4/ext/gd config.m4 /php4/ext/gettext config.m4 /php4/ext/hyperwave config.m4 /php4/ext/icap config.m4 /php4/ext/imap config.m4 /php4/ext/informix config.m4 /php4/ext/interbase config.m4 /php4/ext/java config.m4 /php4/ext/ldap config.m4 /php4/ext/mcal config.m4 /php4/ext/mcrypt config.m4 /php4/ext/mhash config.m4 /php4/ext/msql config.m4 /php4/ext/oci8 config.m4 /php4/ext/odbc config.m4 /php4/ext/oracle config.m4 /php4/ext/pcre config.m4 /php4/ext/pdf config.m4 /php4/ext/pgsql config.m4 /php4/ext/readline config.m4 /php4/ext/snmp config.m4 /php4/ext/standard config.m4 /php4/ext/sybase config.m4 /php4/ext/sybase_ct config.m4 /php4/ext/sysvsem config.m4 /php4/ext/sysvshm config.m4 /php4/ext/wddx config.m4 /php4/ext/xml config.m4 /php4/ext/yp config.m4 /php4/ext/zlib config.m4 Log: Get rid of config.h.stub. Note that you should embed a comment about what the respective define does into the AC_DEFINE macro. I.e. AC_DEFINE(HAVE_FOO, 1, [Whether you have FOO]) Index: php4/configure.in diff -u php4/configure.in:1.81 php4/configure.in:1.82 --- php4/configure.in:1.81 Wed Dec 29 21:58:26 1999 +++ php4/configure.in Wed Dec 29 23:07:15 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.81 1999/12/30 02:58:26 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.82 1999/12/30 04:07:15 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -177,7 +177,7 @@ AC_CHECK_LIB(crypt, crypt, [ AC_ADD_LIBRARY(crypt) - AC_DEFINE(HAVE_LIBCRYPT) ], []) + AC_DEFINE(HAVE_LIBCRYPT,,[ ]) ], []) dnl The sin may be in a library which need not be specifed dnl as well as res_search resides in libsocket Index: php4/build/build.mk diff -u php4/build/build.mk:1.1 php4/build/build.mk:1.2 --- php4/build/build.mk:1.1 Wed Dec 29 21:58:32 1999 +++ php4/build/build.mk Wed Dec 29 23:07:16 1999 @@ -21,7 +21,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: build.mk,v 1.1 1999/12/30 02:58:32 sas Exp $ +# $Id: build.mk,v 1.2 1999/12/30 04:07:16 sas Exp $ # # Makefile to generate build tools # @@ -38,8 +38,7 @@ generated_lists: @echo makefile_am_files = Zend/Makefile.am \ TSRM/Makefile.am > $@ - @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h \ - ext/*/config.h.stub >> $@ + @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@ @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 \ Zend/acinclude.m4 ext/*/config.m4 sapi/*/config.m4 >> $@ Index: php4/build/build2.mk diff -u php4/build/build2.mk:1.2 php4/build/build2.mk:1.3 --- php4/build/build2.mk:1.2 Wed Dec 29 22:23:05 1999 +++ php4/build/build2.mk Wed Dec 29 23:07:16 1999 @@ -21,7 +21,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: build2.mk,v 1.2 1999/12/30 03:23:05 sas Exp $ +# $Id: build2.mk,v 1.3 1999/12/30 04:07:16 sas Exp $ include generated_lists @@ -36,7 +36,7 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files) -targets = $(makefile_in_files) configure $(config_h_in) $(TOUCH_FILES) +targets = $(TOUCH_FILES) $(makefile_in_files) configure $(config_h_in) all: .deps Zend/Makefile.am TSRM/Makefile.am $(targets) Index: php4/ext/ext_skel diff -u php4/ext/ext_skel:1.12 php4/ext/ext_skel:1.13 --- php4/ext/ext_skel:1.12 Wed Dec 29 21:58:33 1999 +++ php4/ext/ext_skel Wed Dec 29 23:07:16 1999 @@ -65,18 +65,11 @@ $ECHO_N " .cvsignore$ECHO_C" cat >.cvsignore <<eof .deps -Makefile.in Makefile *.o *.lo *.la .libs -eof - -$ECHO_N " config.h.stub$ECHO_C" -cat >config.h.stub<<eof -/* define if you want to use the $extname extension */ -/* #undef HAVE_LIB$EXTNAME */ eof chmod 644 * Index: php4/ext/aspell/config.m4 diff -u php4/ext/aspell/config.m4:1.2 php4/ext/aspell/config.m4:1.3 --- php4/ext/aspell/config.m4:1.2 Mon Jul 12 15:17:53 1999 +++ php4/ext/aspell/config.m4 Wed Dec 29 23:07:17 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/07/12 19:17:53 rasmus Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:07:17 sas Exp $ AC_MSG_CHECKING(for ASPELL support) AC_ARG_WITH(aspell, @@ -17,7 +17,7 @@ if test ! -f "$ASPELL_DIR/include/aspell-c.h"; then AC_MSG_ERROR(Could not find aspell-c.h in $ASPELL_DIR/include - please copy it manually from the aspell sources to $ASPELL_DIR/include) fi - AC_DEFINE(HAVE_ASPELL) + AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell]) AC_MSG_RESULT(yes) PHP_EXTENSION(aspell) else Index: php4/ext/bcmath/config.m4 diff -u php4/ext/bcmath/config.m4:1.3 php4/ext/bcmath/config.m4:1.4 --- php4/ext/bcmath/config.m4:1.3 Mon Sep 13 13:17:50 1999 +++ php4/ext/bcmath/config.m4 Wed Dec 29 23:07:17 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/09/13 17:17:50 ssb Exp $ +dnl $Id: config.m4,v 1.4 1999/12/30 04:07:17 sas Exp $ AC_MSG_CHECKING(whether to enable bc style precision math functions) AC_ARG_ENABLE(bcmath, @@ -7,7 +7,7 @@ get this module installed. ], [ if test "$enableval" = "yes"; then - AC_DEFINE(WITH_BCMATH, 1) + AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath]) AC_MSG_RESULT(yes) PHP_EXTENSION(bcmath) else Index: php4/ext/cpdf/config.m4 diff -u php4/ext/cpdf/config.m4:1.2 php4/ext/cpdf/config.m4:1.3 --- php4/ext/cpdf/config.m4:1.2 Thu Dec 9 02:15:34 1999 +++ php4/ext/cpdf/config.m4 Wed Dec 29 23:07:18 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/12/09 07:15:34 steinm Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:07:18 sas Exp $ AC_MSG_CHECKING(whether to include cpdflib support) AC_ARG_WITH(cpdflib, @@ -12,7 +12,7 @@ yes) AC_MSG_RESULT(yes) PHP_EXTENSION(cpdflib) - AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB)], + AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], [AC_MSG_ERROR(Cpdf module requires cpdflib >= 2.)]) AC_ADD_LIBRARY(cpdf) AC_ADD_LIBRARY(tiff) @@ -58,7 +58,7 @@ withval=$old_withval LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB)], + AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], [AC_MSG_ERROR(Cpdflib module requires cpdflib >= 2.)]) LIBS=$old_LIBS AC_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib) Index: php4/ext/cybercash/config.m4 diff -u php4/ext/cybercash/config.m4:1.2 php4/ext/cybercash/config.m4:1.3 --- php4/ext/cybercash/config.m4:1.2 Mon Dec 6 21:02:05 1999 +++ php4/ext/cybercash/config.m4 Wed Dec 29 23:07:18 1999 @@ -15,7 +15,7 @@ LIBS="$LIBS -L$MCK_DIR/lib" AC_ADD_LIBRARY_WITH_PATH(mckcrypto, $MCK_DIR/lib) AC_ADD_INCLUDE($MCK_DIR) - AC_DEFINE(HAVE_MCK) + AC_DEFINE(HAVE_MCK,,[Whether you have CyberCash]) else AC_MSG_ERROR(Please reinstall the CyberCash MCK - I cannot find mckcrypt.h) AC_MSG_RESULT(no) Index: php4/ext/dav/config.m4 diff -u php4/ext/dav/config.m4:1.1 php4/ext/dav/config.m4:1.2 --- php4/ext/dav/config.m4:1.1 Wed Apr 21 18:49:15 1999 +++ php4/ext/dav/config.m4 Wed Dec 29 23:07:19 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/04/21 22:49:15 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:19 sas Exp $ dnl config.m4 for extension dav dnl don't forget to call PHP_EXTENSION(dav) @@ -13,17 +13,17 @@ else if test "$withval" != "no"; then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MOD_DAV, 1) + AC_DEFINE(HAVE_MOD_DAV, 1, [Whether you have mod_dav]) CFLAGS="$CFLAGS -DHAVE_MOD_DAV -I$withval" INCLUDES="$INCLUDES -I$withval" PHP_EXTENSION(dav) else AC_MSG_RESULT(no) - AC_DEFINE(HAVE_MOD_DAV, 0) + AC_DEFINE(HAVE_MOD_DAV, 0, [Whether you have mod_dav]) fi fi ],[ AC_MSG_RESULT(no) - AC_DEFINE(HAVE_MOD_DAV, 0) + AC_DEFINE(HAVE_MOD_DAV, 0, [Whether you have mod_dav]) ]) Index: php4/ext/db/config.m4 diff -u php4/ext/db/config.m4:1.5 php4/ext/db/config.m4:1.6 --- php4/ext/db/config.m4:1.5 Wed Dec 29 21:58:44 1999 +++ php4/ext/db/config.m4 Wed Dec 29 23:07:20 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 02:58:44 sas Exp $ +dnl $Id: config.m4,v 1.6 1999/12/30 04:07:20 sas Exp $ dnl config.m4 for extension db dnl don't forget to call PHP_EXTENSION(db) @@ -9,10 +9,10 @@ # Checks for libraries. # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order AC_DEFUN(AC_PREFERRED_DB_LIB,[ - AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM) DBM_TYPE=gdbm; DBM_LIB=-lgdbm], - [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=-ldb], - [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=], - [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=-ldbm], + AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm], + [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=-ldb], + [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,,[ ]) DBM_TYPE=ndbm; DBM_LIB=], + [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm], [DBM_TYPE=""])])])]) AC_MSG_CHECKING([preferred dbm library]) if test "a$DBM_TYPE" = a; then Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.3 php4/ext/dba/config.m4:1.4 --- php4/ext/dba/config.m4:1.3 Sat Nov 20 17:50:42 1999 +++ php4/ext/dba/config.m4 Wed Dec 29 23:07:20 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/11/20 22:50:42 sas Exp $ +dnl $Id: config.m4,v 1.4 1999/12/30 04:07:20 sas Exp $ dnl config.m4 for extension dba dnl don't forget to call PHP_EXTENSION(dba) @@ -65,7 +65,7 @@ unset ac_cv_lib_gdbm_gdbm_open AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1) THIS_LIBS="gdbm"]) + AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1, [ ]) THIS_LIBS="gdbm"]) ]) AC_DBA_STD_ASSIGN @@ -90,12 +90,12 @@ done if test "$NDBM_EXTRA" != ""; then - eval "AC_DEFINE($NDBM_EXTRA, 1)" + eval "AC_DEFINE($NDBM_EXTRA, 1, [ ])" fi for LIB in db1 ndbm c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1) THIS_LIBS="$LIB"]) + AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1, [ ]) THIS_LIBS="$LIB"]) ]) done @@ -135,12 +135,12 @@ fi if test -n "$DB2_EXTRA"; then - eval "AC_DEFINE($DB2_EXTRA, 1)" + eval "AC_DEFINE($DB2_EXTRA, 1, [ ])" fi for LIB in db db2 c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, db_appinit, [AC_DEFINE(DBA_DB2,1) THIS_LIBS="$LIB"]) + AC_CHECK_LIB($LIB, db_appinit, [AC_DEFINE(DBA_DB2,1,[ ]) THIS_LIBS="$LIB"]) ]) done @@ -163,12 +163,12 @@ done if test -n "$DB3_EXTRA"; then - eval "AC_DEFINE($DB3_EXTRA, 1)" + eval "AC_DEFINE($DB3_EXTRA, 1, [ ])" fi for LIB in db; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, db_create, [AC_DEFINE(DBA_DB3,1) THIS_LIBS="$LIB"]) + AC_CHECK_LIB($LIB, db_create, [AC_DEFINE(DBA_DB3,1,[ ]) THIS_LIBS="$LIB"]) ]) done @@ -191,7 +191,7 @@ for LIB in db1 dbm c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1) THIS_LIBS="$LIB"]) + AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1,[ ]) THIS_LIBS="$LIB"]) ]) done @@ -214,7 +214,7 @@ for LIB in cdb c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1) THIS_LIBS="$LIB"]) + AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1,[ ]) THIS_LIBS="$LIB"]) ]) done @@ -229,10 +229,10 @@ AC_MSG_CHECKING(whether to enable DBA interface) if test "$HAVE_DBA" = "1"; then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DBA, 1) + AC_DEFINE(HAVE_DBA, 1, [ ]) PHP_EXTENSION(dba) else AC_MSG_RESULT(no) - AC_DEFINE(HAVE_DBA, 0) + AC_DEFINE(HAVE_DBA, 0, [ ]) fi Index: php4/ext/dbase/config.m4 diff -u php4/ext/dbase/config.m4:1.2 php4/ext/dbase/config.m4:1.3 --- php4/ext/dbase/config.m4:1.2 Wed Dec 29 21:58:46 1999 +++ php4/ext/dbase/config.m4 Wed Dec 29 23:07:21 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/12/30 02:58:46 sas Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:07:21 sas Exp $ AC_MSG_CHECKING(whether to include the bundled dbase library) AC_ARG_WITH(dbase, @@ -6,13 +6,13 @@ [ if test "$withval" = "yes"; then AC_MSG_RESULT(yes) - AC_DEFINE(DBASE,1) + AC_DEFINE(DBASE,1,[ ]) PHP_EXTENSION(dbase) else AC_MSG_RESULT(no) - AC_DEFINE(DBASE,0) + AC_DEFINE(DBASE,0,[ ]) fi ],[ AC_MSG_RESULT(no) - AC_DEFINE(DBASE,0) + AC_DEFINE(DBASE,0,[ ]) ]) Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.3 php4/ext/domxml/config.m4:1.4 --- php4/ext/domxml/config.m4:1.3 Thu Dec 9 02:15:35 1999 +++ php4/ext/domxml/config.m4 Wed Dec 29 23:07:21 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/12/09 07:15:35 steinm Exp $ +dnl $Id: config.m4,v 1.4 1999/12/30 04:07:21 sas Exp $ AC_MSG_CHECKING(whether to include DOM support) AC_ARG_WITH(dom, @@ -14,7 +14,7 @@ PHP_EXTENSION(domxml) old_LIBS=$LIBS LIBS="$LIBS -lgz" - AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML)], + AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML,,[ ])], [AC_MSG_ERROR(DOM module requires libxml >= 1.0)]) LIBS=$old_LIBS AC_ADD_LIBRARY(gz) @@ -52,7 +52,7 @@ LIBS="$LIBS -L$withval/lib -lz" fi - AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML)], + AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML,,[ ])], [AC_MSG_ERROR(DOM module requires libxml >= 1.0.)]) LIBS=$old_LIBS AC_ADD_LIBRARY_WITH_PATH(xml, $withval/lib) Index: php4/ext/fdf/config.m4 diff -u php4/ext/fdf/config.m4:1.4 php4/ext/fdf/config.m4:1.5 --- php4/ext/fdf/config.m4:1.4 Tue Dec 7 05:49:17 1999 +++ php4/ext/fdf/config.m4 Wed Dec 29 23:07:22 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/12/07 10:49:17 steinm Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:07:22 sas Exp $ AC_MSG_CHECKING(whether to include fdftk support) AC_ARG_WITH(fdftk, @@ -13,7 +13,7 @@ AC_MSG_RESULT(yes) PHP_EXTENSION(fdf) AC_CHECK_LIB(FdfTk, FDFOpen, [ - AC_DEFINE(HAVE_FDFLIB) + AC_DEFINE(HAVE_FDFLIB,,[ ]) EXTRA_LIBS="$EXTRA_LIBS -lFdfTk" ],[AC_MSG_ERROR(fdftk module requires fdftk 2.0)]) ;; @@ -25,7 +25,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(FdfTk, FDFOpen, [ - AC_DEFINE(HAVE_FDFLIB) + AC_DEFINE(HAVE_FDFLIB,,[ ]) EXTRA_LIBS="$EXTRA_LIBS -L$withval/lib -lFdfTk" ],[AC_MSG_ERROR(fdftk module requires fdftk lib 2.0.)]) LIBS=$old_LIBS Index: php4/ext/filepro/config.m4 diff -u php4/ext/filepro/config.m4:1.1 php4/ext/filepro/config.m4:1.2 --- php4/ext/filepro/config.m4:1.1 Wed Apr 21 18:02:46 1999 +++ php4/ext/filepro/config.m4 Wed Dec 29 23:07:22 1999 @@ -1,17 +1,17 @@ -dnl $Id: config.m4,v 1.1 1999/04/21 22:02:46 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:22 sas Exp $ AC_MSG_CHECKING(whether to include the bundled filePro support) AC_ARG_WITH(filepro, [ --with-filepro Include the bundled read-only filePro support],[ if test "$withval" != "no"; then - AC_DEFINE(HAVE_FILEPRO, 1) + AC_DEFINE(HAVE_FILEPRO, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(filepro) else - AC_DEFINE(HAVE_FILEPRO, 0) + AC_DEFINE(HAVE_FILEPRO, 0, [ ]) AC_MSG_RESULT(no) fi ],[ - AC_DEFINE(HAVE_FILEPRO, 0) + AC_DEFINE(HAVE_FILEPRO, 0, [ ]) AC_MSG_RESULT(no) ]) Index: php4/ext/ftp/config.m4 diff -u php4/ext/ftp/config.m4:1.1 php4/ext/ftp/config.m4:1.2 --- php4/ext/ftp/config.m4:1.1 Thu Sep 16 11:57:51 1999 +++ php4/ext/ftp/config.m4 Wed Dec 29 23:07:26 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/09/16 15:57:51 askalski Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:26 sas Exp $ dnl config.m4 for extension ftp dnl don't forget to call PHP_EXTENSION(ftp) @@ -7,7 +7,7 @@ [ --with-ftp Include FTP support.], [ if test "$withval" != "no"; then - AC_DEFINE(HAVE_FTP) + AC_DEFINE(HAVE_FTP,,[ ]) PHP_EXTENSION(ftp) AC_MSG_RESULT(yes) else Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.20 php4/ext/gd/config.m4:1.21 --- php4/ext/gd/config.m4:1.20 Wed Dec 29 21:58:52 1999 +++ php4/ext/gd/config.m4 Wed Dec 29 23:07:27 1999 @@ -12,7 +12,7 @@ no) AC_MSG_RESULT(no) ;; yes) - AC_DEFINE(HAVE_LIBGD) + AC_DEFINE(HAVE_LIBGD,,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) GD_LIBS="-lgd" @@ -22,12 +22,12 @@ fi old_LDFLAGS=$LDFLAGS old_LIBS=$LIBS - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,,[ ]) ]) LIBS="$LIBS -lpng -lz" - AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1)]) + AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])]) dnl Some versions of GD support both PNG and GIF. Check for both. - AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1)]) - AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1)]) + AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])]) LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS @@ -60,7 +60,7 @@ test -f $withval/gd/libgd.a && GD_LIB="$withval/gd" test -f $withval/gd1.3/libgd.a && GD_LIB="$withval/gd1.3" if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then - AC_DEFINE(HAVE_LIBGD) + AC_DEFINE(HAVE_LIBGD,,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) GD_LIBS="-lgd" @@ -72,11 +72,11 @@ old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GD_LIB" old_LIBS=$LIBS - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,, [ ]) ]) LIBS="$LIBS -lpng -lz" - AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1)]) - AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1)]) - AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1)]) + AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])]) + AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])]) LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS @@ -91,14 +91,14 @@ esac ],[ AC_CHECK_LIB(gd, gdImageLine) - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,, [ ]) ]) if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then old_LIBS=$LIBS - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,, [ ]) ]) LIBS="$LIBS -lpng -lz" - AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1)]) - AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1)]) - AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1)]) + AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1, [ ])]) + AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])]) LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS @@ -131,7 +131,7 @@ fi done if test -n "$FREETYPE_DIR" ; then - AC_DEFINE(HAVE_LIBFREETYPE) + AC_DEFINE(HAVE_LIBFREETYPE,,[ ]) if test "$shared" = "yes"; then GD_LIBS="$GD_LIBS -lfreetype" GD_LFLAGS="$GD_LFLAGS -L$FREETYPE_DIR/lib" @@ -142,7 +142,7 @@ AC_MSG_RESULT(yes) else if test -n "$TTF_DIR" ; then - AC_DEFINE(HAVE_LIBTTF) + AC_DEFINE(HAVE_LIBTTF,,[ ]) if test "$shared" = "yes"; then GD_LIBS="$GD_LIBS -lttf" GD_LFLAGS="$GD_LFLAGS -L$TTF_DIR/lib" @@ -168,7 +168,7 @@ [ --enable-freetype-4bit-antialias-hack Include support for FreeType2 (experimental).],[ if test "$enableval" = "yes" ; then - AC_DEFINE(FREETYPE_4BIT_ANTIALIAS_HACK, 1) + AC_DEFINE(FREETYPE_4BIT_ANTIALIAS_HACK, 1, [ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) Index: php4/ext/gettext/config.m4 diff -u php4/ext/gettext/config.m4:1.2 php4/ext/gettext/config.m4:1.3 --- php4/ext/gettext/config.m4:1.2 Mon Sep 13 13:17:50 1999 +++ php4/ext/gettext/config.m4 Wed Dec 29 23:07:27 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/09/13 17:17:50 ssb Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:07:27 sas Exp $ dnl config.m4 for extension gettext dnl don't forget to call PHP_EXTENSION(gettext) @@ -31,7 +31,7 @@ ],) ],) - AC_DEFINE(HAVE_LIBINTL) + AC_DEFINE(HAVE_LIBINTL,,[ ]) PHP_EXTENSION(gettext) EXTRA_LIBS="$EXTRA_LIBS $GETTEXT_LFLAGS $GETTEXT_LIBS" Index: php4/ext/hyperwave/config.m4 diff -u php4/ext/hyperwave/config.m4:1.1 php4/ext/hyperwave/config.m4:1.2 --- php4/ext/hyperwave/config.m4:1.1 Wed Apr 21 19:11:20 1999 +++ php4/ext/hyperwave/config.m4 Wed Dec 29 23:07:28 1999 @@ -1,18 +1,18 @@ -dnl $Id: config.m4,v 1.1 1999/04/21 23:11:20 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:28 sas Exp $ AC_MSG_CHECKING(for Hyperwave support) AC_ARG_WITH(hyperwave, [ --with-hyperwave Include Hyperwave support], [ if test "$withval" != "no"; then - AC_DEFINE(HYPERWAVE,1) + AC_DEFINE(HYPERWAVE,1,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(hyperwave) else - AC_DEFINE(HYPERWAVE,0) + AC_DEFINE(HYPERWAVE,0,[ ]) AC_MSG_RESULT(no) fi ],[ - AC_DEFINE(HYPERWAVE,0) + AC_DEFINE(HYPERWAVE,0,[ ]) AC_MSG_RESULT(no) ]) Index: php4/ext/icap/config.m4 diff -u php4/ext/icap/config.m4:1.4 php4/ext/icap/config.m4:1.5 --- php4/ext/icap/config.m4:1.4 Mon Sep 13 13:17:50 1999 +++ php4/ext/icap/config.m4 Wed Dec 29 23:07:28 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/09/13 17:17:50 ssb Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:07:28 sas Exp $ AC_MSG_CHECKING(for ICAP support) AC_ARG_WITH(icap, @@ -13,7 +13,7 @@ AC_ADD_INCLUDE($ICAP_DIR) AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR) - AC_DEFINE(HAVE_ICAP) + AC_DEFINE(HAVE_ICAP,,[ ]) PHP_EXTENSION(icap) AC_MSG_RESULT(yes) else Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.8 php4/ext/imap/config.m4:1.9 --- php4/ext/imap/config.m4:1.8 Thu Sep 16 11:35:48 1999 +++ php4/ext/imap/config.m4 Wed Dec 29 23:07:29 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 1999/09/16 15:35:48 sas Exp $ +dnl $Id: config.m4,v 1.9 1999/12/30 04:07:29 sas Exp $ AC_MSG_CHECKING(for IMAP support) AC_ARG_WITH(imap, @@ -50,7 +50,7 @@ fi AC_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR) AC_ADD_INCLUDE($IMAP_INC_DIR) - AC_DEFINE(HAVE_IMAP) + AC_DEFINE(HAVE_IMAP,,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(imap) else Index: php4/ext/informix/config.m4 diff -u php4/ext/informix/config.m4:1.10 php4/ext/informix/config.m4:1.11 --- php4/ext/informix/config.m4:1.10 Wed Dec 29 21:58:58 1999 +++ php4/ext/informix/config.m4 Wed Dec 29 23:07:29 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 1999/12/30 02:58:58 sas Exp $ +dnl $Id: config.m4,v 1.11 1999/12/30 04:07:29 sas Exp $ PHPIFXLIB=ext/informix/libphp_ifx.a @@ -57,17 +57,17 @@ if test "uname -s 2>/dev/null" = "AIX"; then CFLAGS="$CFLAGS -D__H_LOCALEDEF" fi - AC_DEFINE(HAVE_IFX) + AC_DEFINE(HAVE_IFX,,[ ]) AC_MSG_CHECKING([Informix version]) IFX_VERSION=[esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'] if test $IFX_VERSION -ge "900"; then - AC_DEFINE(HAVE_IFX_IUS) + AC_DEFINE(HAVE_IFX_IUS,,[ ]) IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS" else IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS" fi PHP_SUBST(IFX_ESQL_FLAGS) - AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION) + AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(informix) for i in $IFX_LIBS; do Index: php4/ext/interbase/config.m4 diff -u php4/ext/interbase/config.m4:1.1 php4/ext/interbase/config.m4:1.2 --- php4/ext/interbase/config.m4:1.1 Wed Apr 21 22:48:24 1999 +++ php4/ext/interbase/config.m4 Wed Dec 29 23:07:30 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/04/22 02:48:24 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:30 sas Exp $ AC_MSG_CHECKING(for InterBase support) AC_ARG_WITH(interbase, @@ -16,7 +16,7 @@ IBASE_INCLUDE=-I$IBASE_INCDIR IBASE_LFLAGS=-L$IBASE_LIBDIR IBASE_LIBS="-lgds" - AC_DEFINE(HAVE_IBASE) + AC_DEFINE(HAVE_IBASE,,[ ]) AC_MSG_RESULT(yes) EXTRA_LIBS="$EXTRA_LIBS $IBASE_LFLAGS $IBASE_LIBS" INCLUDES="$INCLUDES $IBASE_INCLUDE" Index: php4/ext/java/config.m4 diff -u php4/ext/java/config.m4:1.6 php4/ext/java/config.m4:1.7 --- php4/ext/java/config.m4:1.6 Wed Dec 29 21:59:00 1999 +++ php4/ext/java/config.m4 Wed Dec 29 23:07:31 1999 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.6 1999/12/30 02:59:00 sas Exp $ +# $Id: config.m4,v 1.7 1999/12/30 04:07:31 sas Exp $ # config.m4 for extension java AC_MSG_CHECKING(for Java support) @@ -49,7 +49,7 @@ fi fi - AC_DEFINE(HAVE_JAVA) + AC_DEFINE(HAVE_JAVA,,[ ]) PHP_EXTENSION(java, shared) PHP_BUILD_SHARED AC_MSG_RESULT(yes) Index: php4/ext/ldap/config.m4 diff -u php4/ext/ldap/config.m4:1.4 php4/ext/ldap/config.m4:1.5 --- php4/ext/ldap/config.m4:1.4 Sun Sep 5 12:28:16 1999 +++ php4/ext/ldap/config.m4 Wed Dec 29 23:07:31 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/09/05 16:28:16 sr Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:07:31 sas Exp $ AC_MSG_CHECKING(for LDAP support) AC_ARG_WITH(ldap, @@ -50,17 +50,17 @@ elif test -f $LDAP_LIBDIR/libldapssl30.so; then AC_ADD_LIBRARY(ldapssl30) AC_ADD_LIBRARY($LDAP_PTHREAD) - AC_DEFINE(HAVE_NSLDAP) + AC_DEFINE(HAVE_NSLDAP,,[ ]) elif test -f $LDAP_LIBDIR/libldapssl30.sl; then AC_ADD_LIBRARY(ldapssl30) - AC_DEFINE(HAVE_NSLDAP) + AC_DEFINE(HAVE_NSLDAP,,[ ]) elif test -f $LDAP_LIBDIR/libldap30.so; then AC_ADD_LIBRARY(ldap30) AC_ADD_LIBRARY($LDAP_PTHREAD) - AC_DEFINE(HAVE_NSLDAP) + AC_DEFINE(HAVE_NSLDAP,,[ ]) elif test -f $LDAP_LIBDIR/libldap30.sl; then AC_ADD_LIBRARY(ldap30) - AC_DEFINE(HAVE_NSLDAP) + AC_DEFINE(HAVE_NSLDAP,,[ ]) elif test -f $LDAP_LIBDIR/libumich_ldap.so; then AC_ADD_LIBRARY(umich_ldap) AC_ADD_LIBRARY(umich_lber) @@ -69,7 +69,7 @@ AC_ADD_INCLUDE($LDAP_INCDIR) AC_ADD_LIBPATH($LDAP_LIBDIR) - AC_DEFINE(HAVE_LDAP) + AC_DEFINE(HAVE_LDAP,,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(ldap) Index: php4/ext/mcal/config.m4 diff -u php4/ext/mcal/config.m4:1.2 php4/ext/mcal/config.m4:1.3 --- php4/ext/mcal/config.m4:1.2 Mon Sep 13 13:17:50 1999 +++ php4/ext/mcal/config.m4 Wed Dec 29 23:07:32 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/09/13 17:17:50 ssb Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:07:32 sas Exp $ AC_MSG_CHECKING(for MCAL support) AC_ARG_WITH(mcal, @@ -13,7 +13,7 @@ AC_ADD_INCLUDE($MCAL_DIR) AC_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_DIR) - AC_DEFINE(HAVE_MCAL) + AC_DEFINE(HAVE_MCAL,,[ ]) PHP_EXTENSION(mcal) AC_MSG_RESULT(yes) else Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.4 php4/ext/mcrypt/config.m4:1.5 --- php4/ext/mcrypt/config.m4:1.4 Sun Jun 20 14:52:41 1999 +++ php4/ext/mcrypt/config.m4 Wed Dec 29 23:07:32 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/06/20 18:52:41 sas Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:07:32 sas Exp $ dnl config.m4 for extension mcrypt dnl don't forget to call PHP_EXTENSION(mcrypt) @@ -19,7 +19,7 @@ AC_ADD_INCLUDE($MCRYPT_DIR/include) AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib) - AC_DEFINE(HAVE_LIBMCRYPT) + AC_DEFINE(HAVE_LIBMCRYPT,,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(mcrypt) Index: php4/ext/mhash/config.m4 diff -u php4/ext/mhash/config.m4:1.4 php4/ext/mhash/config.m4:1.5 --- php4/ext/mhash/config.m4:1.4 Mon Sep 13 13:17:51 1999 +++ php4/ext/mhash/config.m4 Wed Dec 29 23:07:33 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/09/13 17:17:51 ssb Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:07:33 sas Exp $ dnl config.m4 for extension mhash dnl don't forget to call PHP_EXTENSION(mhash) @@ -19,7 +19,7 @@ AC_ADD_INCLUDE($MHASH_DIR/include) AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib) - AC_DEFINE(HAVE_LIBMHASH) + AC_DEFINE(HAVE_LIBMHASH,,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(mhash) Index: php4/ext/msql/config.m4 diff -u php4/ext/msql/config.m4:1.4 php4/ext/msql/config.m4:1.5 --- php4/ext/msql/config.m4:1.4 Wed Jul 21 11:12:21 1999 +++ php4/ext/msql/config.m4 Wed Dec 29 23:07:33 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/07/21 15:12:21 sas Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:07:33 sas Exp $ dnl dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined. @@ -9,10 +9,10 @@ CFLAGS="$INCLUDES $CFLAGS" AC_TRY_COMPILE([#include <sys/types.h> #include "msql.h"],[int i = IDX_TYPE],[ - AC_DEFINE(MSQL1,0) + AC_DEFINE(MSQL1,0,[ ]) MSQL_VERSION="2.0 or newer" ],[ - AC_DEFINE(MSQL1,1) + AC_DEFINE(MSQL1,1,[ ]) MSQL_VERSION="1.0" ]) CFLAGS=$ac_php_oldcflags @@ -34,7 +34,7 @@ fi AC_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR) AC_ADD_INCLUDE($MSQL_INCDIR) - AC_DEFINE(HAVE_MSQL) + AC_DEFINE(HAVE_MSQL,,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(msql) AC_MSQL_VERSION Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.8 php4/ext/oci8/config.m4:1.9 --- php4/ext/oci8/config.m4:1.8 Wed Dec 29 21:59:09 1999 +++ php4/ext/oci8/config.m4 Wed Dec 29 23:07:34 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 1999/12/30 02:59:09 sas Exp $ +dnl $Id: config.m4,v 1.9 1999/12/30 04:07:34 sas Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -148,11 +148,11 @@ else ORACLE_SHLIBS="$ORACLE_STLIBS" fi - AC_DEFINE(HAVE_OCI8) + AC_DEFINE(HAVE_OCI8,,[ ]) ;; 8.1) ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB" - AC_DEFINE(HAVE_OCI8) + AC_DEFINE(HAVE_OCI8,,[ ]) ;; *) ORACLE_SHLIBS= @@ -162,7 +162,7 @@ # only using shared libs right now ORACLE_LIBS=$ORACLE_SHLIBS - AC_DEFINE(HAVE_ORACLE) + AC_DEFINE(HAVE_ORACLE,,[ ]) fi Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.12 php4/ext/odbc/config.m4:1.13 --- php4/ext/odbc/config.m4:1.12 Wed Dec 29 21:59:10 1999 +++ php4/ext/odbc/config.m4 Wed Dec 29 23:07:34 1999 @@ -89,7 +89,7 @@ AC_ADD_LIBRARY(sqlrte) AC_ADD_LIBRARY(sqlptc) ODBC_TYPE=adabas - AC_DEFINE(HAVE_ADABAS) + AC_DEFINE(HAVE_ADABAS,,[ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -113,7 +113,7 @@ ODBC_LIBDIR=$withval/lib ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=solid - AC_DEFINE(HAVE_SOLID) + AC_DEFINE(HAVE_SOLID,,[ ]) AC_MSG_RESULT(yes) AC_FIND_SOLID_LIBS($ODBC_LIBDIR) else @@ -141,7 +141,7 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=db2 ODBC_LIBS="-ldb2" - AC_DEFINE(HAVE_IBMDB2) + AC_DEFINE(HAVE_IBMDB2,,[ ]) AC_MSG_RESULT(yes) else @@ -168,7 +168,7 @@ fi ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=empress - AC_DEFINE(HAVE_EMPRESS) + AC_DEFINE(HAVE_EMPRESS,,[ ]) AC_MSG_RESULT(yes) AC_FIND_EMPRESS_LIBS($ODBC_LIBDIR) else @@ -202,7 +202,7 @@ ODBC_LIBS="-l_rdbc -l_sql";; esac ODBC_TYPE=velocis - AC_DEFINE(HAVE_VELOCIS) + AC_DEFINE(HAVE_VELOCIS,,[ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -238,7 +238,7 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=$CUSTOM_ODBC_LIBS ODBC_TYPE=custom - AC_DEFINE(HAVE_CODBC) + AC_DEFINE(HAVE_CODBC,,[ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -264,7 +264,7 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-liodbc ODBC_TYPE=iodbc - AC_DEFINE(HAVE_IODBC) + AC_DEFINE(HAVE_IODBC,,[ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -291,7 +291,7 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lesoobclient ODBC_TYPE=ESOOB - AC_DEFINE(HAVE_ESOOB) + AC_DEFINE(HAVE_ESOOB,,[ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -317,7 +317,7 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lodbc ODBC_TYPE=unixODBC - AC_DEFINE(HAVE_UNIXODBC) + AC_DEFINE(HAVE_UNIXODBC,,[ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -344,7 +344,7 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-liodbc ODBC_TYPE=openlink - AC_DEFINE(HAVE_OPENLINK) + AC_DEFINE(HAVE_OPENLINK,,[ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -377,7 +377,7 @@ ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS="-ldmapic -lc" ODBC_TYPE=dbmaker - AC_DEFINE(HAVE_DBMAKER) + AC_DEFINE(HAVE_DBMAKER,,[ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -390,7 +390,7 @@ 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_DEFINE(HAVE_UODBC,,[ ]) PHP_SUBST(ODBC_INCDIR) PHP_SUBST(ODBC_INCLUDE) PHP_SUBST(ODBC_LIBDIR) Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.5 php4/ext/oracle/config.m4:1.6 --- php4/ext/oracle/config.m4:1.5 Wed Dec 29 21:59:11 1999 +++ php4/ext/oracle/config.m4 Wed Dec 29 23:07:35 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 02:59:11 sas Exp $ +dnl $Id: config.m4,v 1.6 1999/12/30 04:07:35 sas Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -146,11 +146,11 @@ else ORACLE_SHLIBS="$ORACLE_STLIBS" fi - AC_DEFINE(HAVE_OCI8) + AC_DEFINE(HAVE_OCI8,,[ ]) ;; 8.1) ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB" - AC_DEFINE(HAVE_OCI8) + AC_DEFINE(HAVE_OCI8,,[ ]) ;; *) ORACLE_SHLIBS= @@ -160,7 +160,7 @@ # only using shared libs right now ORACLE_LIBS=$ORACLE_SHLIBS - AC_DEFINE(HAVE_ORACLE) + AC_DEFINE(HAVE_ORACLE,,[ ]) fi Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.16 php4/ext/pcre/config.m4:1.17 --- php4/ext/pcre/config.m4:1.16 Wed Dec 29 21:59:12 1999 +++ php4/ext/pcre/config.m4 Wed Dec 29 23:07:36 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.16 1999/12/30 02:59:12 sas Exp $ +dnl $Id: config.m4,v 1.17 1999/12/30 04:07:36 sas Exp $ dnl config.m4 for extension pcre dnl By default we'll compile and link against the bundled PCRE library @@ -18,7 +18,7 @@ yes) EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) @@ -45,7 +45,7 @@ AC_MSG_ERROR(Could not find libpcre.a in $withval) fi - AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) ;; @@ -53,7 +53,7 @@ ],[ PCRE_LIBADD=pcrelib/libpcre.la PCRE_SUBDIRS=pcrelib - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) @@ -61,4 +61,4 @@ PHP_SUBST(PCRE_LIBADD) PHP_SUBST(PCRE_SUBDIRS) -AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)]) +AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1, [ ])]) Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.7 php4/ext/pdf/config.m4:1.8 --- php4/ext/pdf/config.m4:1.7 Thu Dec 9 02:15:36 1999 +++ php4/ext/pdf/config.m4 Wed Dec 29 23:07:38 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 1999/12/09 07:15:36 steinm Exp $ +dnl $Id: config.m4,v 1.8 1999/12/30 04:07:38 sas Exp $ AC_MSG_CHECKING(whether to include Pdflib 2.x support) AC_ARG_WITH(pdflib, @@ -16,7 +16,7 @@ old_LDFLAGS=$LDFLAGS old_LIBS=$LIBS LIBS="$LIBS -ltiff -ljpeg -lz" - AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB)], + AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB,,[ ])], [AC_MSG_ERROR(pdflib extension requires pdflib 2.x. You may as well need libtiff and libjpeg. In such a case use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>)]) LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS @@ -94,7 +94,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"], + AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB,,[ ]) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"], [AC_MSG_ERROR(pdflib extension requires pdflib 2.x.)]) LIBS=$old_LIBS AC_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib) Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.7 php4/ext/pgsql/config.m4:1.8 --- php4/ext/pgsql/config.m4:1.7 Wed Dec 29 21:59:16 1999 +++ php4/ext/pgsql/config.m4 Wed Dec 29 23:07:38 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 1999/12/30 02:59:16 sas Exp $ +dnl $Id: config.m4,v 1.8 1999/12/30 04:07:38 sas Exp $ AC_MSG_CHECKING(for PostgresSQL support) AC_ARG_WITH(pgsql, @@ -37,7 +37,7 @@ old_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $PGSQL_INCLUDE" - AC_DEFINE(HAVE_PGSQL) + AC_DEFINE(HAVE_PGSQL,,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) PGSQL_SHARED="pgsql.la" @@ -47,7 +47,7 @@ AC_ADD_INCLUDE($PGSQL_INCDIR) PGSQL_STATIC="libphpext_pgsql.la" fi - AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES)) + AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES,,[ ])) CFLAGS=$old_CFLAGS PHP_EXTENSION(pgsql,$shared) else Index: php4/ext/readline/config.m4 diff -u php4/ext/readline/config.m4:1.4 php4/ext/readline/config.m4:1.5 --- php4/ext/readline/config.m4:1.4 Wed Dec 29 21:59:18 1999 +++ php4/ext/readline/config.m4 Wed Dec 29 23:07:40 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/12/30 02:59:18 sas Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:07:40 sas Exp $ dnl config.m4 for extension readline dnl don't forget to call PHP_EXTENSION(readline) @@ -24,7 +24,7 @@ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LIBREADLINE, 1) + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) PHP_EXTENSION(readline) else AC_MSG_RESULT(no) Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.10 php4/ext/snmp/config.m4:1.11 --- php4/ext/snmp/config.m4:1.10 Wed Dec 29 21:59:21 1999 +++ php4/ext/snmp/config.m4 Wed Dec 29 23:07:40 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 1999/12/30 02:59:21 sas Exp $ +dnl $Id: config.m4,v 1.11 1999/12/30 04:07:40 sas Exp $ AC_MSG_CHECKING(for SNMP support) AC_ARG_WITH(snmp, @@ -40,7 +40,7 @@ test -d $withval/include/ucd-snmp && SNMP_INCDIR=$withval/include/ucd-snmp SNMP_LIBDIR=$withval/lib fi - AC_DEFINE(HAVE_SNMP) + AC_DEFINE(HAVE_SNMP,,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) SNMP_INCLUDE="-I$SNMP_INCDIR" @@ -73,7 +73,7 @@ AC_ARG_ENABLE(ucd-snmp-hack, [ --enable-ucd-snmp-hack Enable UCD SNMP hack],[ if test "$enableval" = "yes" ; then - AC_DEFINE(UCD_SNMP_HACK, 1) + AC_DEFINE(UCD_SNMP_HACK, 1, [ ]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.14 php4/ext/standard/config.m4:1.15 --- php4/ext/standard/config.m4:1.14 Wed Dec 29 21:59:22 1999 +++ php4/ext/standard/config.m4 Wed Dec 29 23:07:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 1999/12/30 02:59:22 sas Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.15 1999/12/30 04:07:41 sas Exp $ -*- sh -*- divert(2)dnl @@ -24,9 +24,9 @@ ]) ]) if test "$ac_cv_crypt_des" = "yes"; then - AC_DEFINE(PHP3_STD_DES_CRYPT, 1) + AC_DEFINE(PHP3_STD_DES_CRYPT, 1, [ ]) else - AC_DEFINE(PHP3_STD_DES_CRYPT, 0) + AC_DEFINE(PHP3_STD_DES_CRYPT, 0, [ ]) fi AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[ @@ -46,9 +46,9 @@ ]) ]) if test "$ac_cv_crypt_ext_des" = "yes"; then - AC_DEFINE(PHP3_EXT_DES_CRYPT,1) + AC_DEFINE(PHP3_EXT_DES_CRYPT,1, [ ]) else - AC_DEFINE(PHP3_EXT_DES_CRYPT,0) + AC_DEFINE(PHP3_EXT_DES_CRYPT,0, [ ]) fi AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[ @@ -77,9 +77,9 @@ ]) ]) if test "$ac_cv_crypt_md5" = "yes"; then - AC_DEFINE(PHP3_MD5_CRYPT,1) + AC_DEFINE(PHP3_MD5_CRYPT,1,[ ]) else - AC_DEFINE(PHP3_MD5_CRYPT,0) + AC_DEFINE(PHP3_MD5_CRYPT,0,[ ]) fi AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[ @@ -105,26 +105,26 @@ ]) ]) if test "$ac_cv_crypt_blowfish" = "yes"; then - AC_DEFINE(PHP3_BLOWFISH_CRYPT,1) + AC_DEFINE(PHP3_BLOWFISH_CRYPT,1,[ ]) else - AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) + AC_DEFINE(PHP3_BLOWFISH_CRYPT,0,[ ]) fi ]) AC_CHECK_LIB(c, dlopen, [ # fake it - AC_DEFINE(HAVE_LIBDL) ], [ + AC_DEFINE(HAVE_LIBDL,,[ ]) ], [ AC_CHECK_LIB(dl, dlopen, [ LIBS="-ldl $LIBS" - AC_DEFINE(HAVE_LIBDL) ], []) ]) + AC_DEFINE(HAVE_LIBDL,,[ ]) ], []) ]) AC_CHECK_LIB(pam, pam_start, [ EXTRA_LIBS="$EXTRA_LIBS -lpam" - AC_DEFINE(HAVE_LIBPAM) ], []) + AC_DEFINE(HAVE_LIBPAM,,[ ]) ], []) AC_CHECK_LIB(crypt, crypt, [ AC_ADD_LIBRARY(crypt) - AC_DEFINE(HAVE_LIBCRYPT) ], []) + AC_DEFINE(HAVE_LIBCRYPT,,[ ]) ], []) AC_CHECK_FUNCS(getcwd) AC_CHECK_FUNCS(getwd) Index: php4/ext/sybase/config.m4 diff -u php4/ext/sybase/config.m4:1.3 php4/ext/sybase/config.m4:1.4 --- php4/ext/sybase/config.m4:1.3 Thu Aug 12 20:14:16 1999 +++ php4/ext/sybase/config.m4 Wed Dec 29 23:07:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/08/13 00:14:16 zeev Exp $ +dnl $Id: config.m4,v 1.4 1999/12/30 04:07:41 sas Exp $ AC_MSG_CHECKING(for Sybase support) AC_ARG_WITH(sybase, @@ -20,9 +20,9 @@ PHP_EXTENSION(sybase) AC_CHECK_LIB(dnet_stub, dnet_addr, [ AC_ADD_LIBRARY(dnet_stub) - AC_DEFINE(HAVE_LIBDNET_STUB) + AC_DEFINE(HAVE_LIBDNET_STUB,,[ ]) ]) - AC_DEFINE(HAVE_SYBASE) + AC_DEFINE(HAVE_SYBASE,,[ ]) else AC_MSG_RESULT(no) fi Index: php4/ext/sybase_ct/config.m4 diff -u php4/ext/sybase_ct/config.m4:1.1 php4/ext/sybase_ct/config.m4:1.2 --- php4/ext/sybase_ct/config.m4:1.1 Thu Aug 12 20:14:16 1999 +++ php4/ext/sybase_ct/config.m4 Wed Dec 29 23:07:43 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/08/13 00:14:16 zeev Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:43 sas Exp $ AC_MSG_CHECKING(for Sybase-CT support) AC_ARG_WITH(sybase-ct, @@ -10,7 +10,7 @@ if test -z "$SYBASE_LIBS"; then PHP_EXTENSION(sybase_ct) fi - AC_DEFINE(HAVE_SYBASE_CT) + AC_DEFINE(HAVE_SYBASE_CT,,[ ]) if test "$withval" = "yes"; then SYBASE_CT_INCDIR=/home/sybase/include SYBASE_CT_LIBDIR=/home/sybase/lib Index: php4/ext/sysvsem/config.m4 diff -u php4/ext/sysvsem/config.m4:1.1 php4/ext/sysvsem/config.m4:1.2 --- php4/ext/sysvsem/config.m4:1.1 Wed Apr 21 22:48:26 1999 +++ php4/ext/sysvsem/config.m4 Wed Dec 29 23:07:43 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/04/22 02:48:26 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:43 sas Exp $ AC_MSG_CHECKING(whether to enable System V semaphore support) AC_ARG_ENABLE(sysvsem, @@ -7,7 +7,7 @@ if test "$enableval" = "yes"; then AC_MSG_RESULT(yes) PHP_EXTENSION(sysvsem) - AC_DEFINE(HAVE_SYSVSEM, 1) + AC_DEFINE(HAVE_SYSVSEM, 1, [ ]) AC_CACHE_CHECK(for union semun,php_cv_semun, AC_TRY_COMPILE([ #include <sys/types.h> @@ -22,16 +22,16 @@ ]) ) if test $php_cv_semun = "yes"; then - AC_DEFINE(HAVE_SEMUN, 1) + AC_DEFINE(HAVE_SEMUN, 1, [ ]) else - AC_DEFINE(HAVE_SEMUN, 0) + AC_DEFINE(HAVE_SEMUN, 0, [ ]) fi else AC_MSG_RESULT(no) - AC_DEFINE(HAVE_SYSVSEM, 0) + AC_DEFINE(HAVE_SYSVSEM, 0, [ ]) fi ],[ AC_MSG_RESULT(no) - AC_DEFINE(HAVE_SYSVSEM, 0) + AC_DEFINE(HAVE_SYSVSEM, 0, [ ]) ]) Index: php4/ext/sysvshm/config.m4 diff -u php4/ext/sysvshm/config.m4:1.1 php4/ext/sysvshm/config.m4:1.2 --- php4/ext/sysvshm/config.m4:1.1 Wed Apr 21 22:48:27 1999 +++ php4/ext/sysvshm/config.m4 Wed Dec 29 23:07:44 1999 @@ -1,17 +1,17 @@ -dnl $Id: config.m4,v 1.1 1999/04/22 02:48:27 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:44 sas Exp $ AC_MSG_CHECKING(whether to enable System V shared memory support) AC_ARG_ENABLE(sysvshm, [ --enable-sysvshm Enable the System V shared memory support],[ if test "$enableval" = "yes"; then - AC_DEFINE(HAVE_SYSVSHM, 1) + AC_DEFINE(HAVE_SYSVSHM, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(sysvshm) else - AC_DEFINE(HAVE_SYSVSHM, 0) + AC_DEFINE(HAVE_SYSVSHM, 0, [ ]) AC_MSG_RESULT(no) fi ],[ - AC_DEFINE(HAVE_SYSVSHM, 0) + AC_DEFINE(HAVE_SYSVSHM, 0, [ ]) AC_MSG_RESULT(no) ]) Index: php4/ext/wddx/config.m4 diff -u php4/ext/wddx/config.m4:1.1 php4/ext/wddx/config.m4:1.2 --- php4/ext/wddx/config.m4:1.1 Mon Jul 19 16:24:03 1999 +++ php4/ext/wddx/config.m4 Wed Dec 29 23:07:44 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/07/19 20:24:03 andrey Exp $ +dnl $Id: config.m4,v 1.2 1999/12/30 04:07:44 sas Exp $ dnl config.m4 for extension wddx AC_MSG_CHECKING(whether to include WDDX support) @@ -8,7 +8,7 @@ if test "${with_xml+set}" != "set" -o "$with_xml" = "no"; then AC_MSG_ERROR(WDDX requires --with-xml) else - AC_DEFINE(HAVE_WDDX, 1) + AC_DEFINE(HAVE_WDDX, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(wddx) fi Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.15 php4/ext/xml/config.m4:1.16 --- php4/ext/xml/config.m4:1.15 Wed Dec 29 21:59:29 1999 +++ php4/ext/xml/config.m4 Wed Dec 29 23:07:45 1999 @@ -1,5 +1,5 @@ # $Source: /local/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.15 1999/12/30 02:59:29 sas Exp $ +# $Id: config.m4,v 1.16 1999/12/30 04:07:45 sas Exp $ AC_MSG_CHECKING(for XML support) AC_ARG_WITH(xml, @@ -35,7 +35,7 @@ fi fi fi - AC_DEFINE(HAVE_LIBEXPAT, 1) + AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) PHP_EXTENSION(xml, $shared) if test "$shared" != "yes"; then EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS" Index: php4/ext/yp/config.m4 diff -u php4/ext/yp/config.m4:1.2 php4/ext/yp/config.m4:1.3 --- php4/ext/yp/config.m4:1.2 Mon Sep 13 13:17:51 1999 +++ php4/ext/yp/config.m4 Wed Dec 29 23:07:45 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/09/13 17:17:51 ssb Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:07:45 sas Exp $ dnl config.m4 for extension yp dnl don't forget to call PHP_EXTENSION(yp) @@ -8,13 +8,13 @@ [ if test "$withval" = "yes"; then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_YP) + AC_DEFINE(HAVE_YP,,[ ]) PHP_EXTENSION(yp) if test uname = "SunOS";then release=uname -r case "$release" in 5*) - AC_DEFINE(SOLARIS_YP) + AC_DEFINE(SOLARIS_YP,,[ ]) ;; *) ;; Index: php4/ext/zlib/config.m4 diff -u php4/ext/zlib/config.m4:1.2 php4/ext/zlib/config.m4:1.3 --- php4/ext/zlib/config.m4:1.2 Thu Jul 1 11:39:58 1999 +++ php4/ext/zlib/config.m4 Wed Dec 29 23:07:46 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/07/01 15:39:58 sas Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:07:46 sas Exp $ AC_MSG_CHECKING(whether to include zlib support) AC_ARG_WITH(zlib, @@ -12,7 +12,7 @@ yes) AC_MSG_RESULT(yes) PHP_EXTENSION(zlib) - AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB)], + AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB,,[ ])], [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)]) AC_ADD_LIBRARY(z) ;; @@ -24,7 +24,7 @@ PHP_EXTENSION(zlib) old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB)], + AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB,,[ ])], [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)]) LIBS=$old_LIBS AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib)