cvs: /php4/ext/cybercash config.m4 /php4/ext/db config.m4 /php4/ext/dba config.m4 /php4/ext/domxml config.m4 /php4/ext/fdf config.m4 /php4/ext/ftp
config.m4 /php4/ext/gd config.m4 /php4/ext/gettext 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/pdf config.m4
/php4/ext/pgsql 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/yp
config.m4 /php4/ext/zlib config.m4

sas Wed Dec 29 23:52:15 1999 EDT Modified files: /php4/ext/cybercash config.m4 /php4/ext/db config.m4 /php4/ext/dba config.m4 /php4/ext/domxml config.m4 /php4/ext/fdf config.m4 /php4/ext/ftp config.m4 /php4/ext/gd config.m4 /php4/ext/gettext 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/pdf config.m4 /php4/ext/pgsql 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/yp config.m4 /php4/ext/zlib config.m4 Log: Whoops, defining them to empty values generates many parse errors. Defaulting to 1. Index: php4/ext/cybercash/config.m4 diff -u php4/ext/cybercash/config.m4:1.3 php4/ext/cybercash/config.m4:1.4 --- php4/ext/cybercash/config.m4:1.3 Wed Dec 29 23:07:18 1999 +++ php4/ext/cybercash/config.m4 Wed Dec 29 23:51:58 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,,[Whether you have CyberCash]) + AC_DEFINE(HAVE_MCK,1,[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/db/config.m4 diff -u php4/ext/db/config.m4:1.6 php4/ext/db/config.m4:1.7 --- php4/ext/db/config.m4:1.6 Wed Dec 29 23:07:20 1999 +++ php4/ext/db/config.m4 Wed Dec 29 23:51:59 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 1999/12/30 04:07:20 sas Exp $ +dnl $Id: config.m4,v 1.7 1999/12/30 04:51:59 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,, [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], + AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm], + [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=-ldb], + [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=], + [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) 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.4 php4/ext/dba/config.m4:1.5 --- php4/ext/dba/config.m4:1.4 Wed Dec 29 23:07:20 1999 +++ php4/ext/dba/config.m4 Wed Dec 29 23:51:59 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/12/30 04:07:20 sas Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:51:59 sas Exp $ dnl config.m4 for extension dba dnl don't forget to call PHP_EXTENSION(dba) @@ -90,7 +90,7 @@ 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 @@ -135,7 +135,7 @@ 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 @@ -163,7 +163,7 @@ 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 Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.4 php4/ext/domxml/config.m4:1.5 --- php4/ext/domxml/config.m4:1.4 Wed Dec 29 23:07:21 1999 +++ php4/ext/domxml/config.m4 Wed Dec 29 23:52:00 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/12/30 04:07:21 sas Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:52:00 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,1,[ ])], [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,1,[ ])], [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.5 php4/ext/fdf/config.m4:1.6 --- php4/ext/fdf/config.m4:1.5 Wed Dec 29 23:07:22 1999 +++ php4/ext/fdf/config.m4 Wed Dec 29 23:52:00 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 04:07:22 sas Exp $ +dnl $Id: config.m4,v 1.6 1999/12/30 04:52:00 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,1,[ ]) 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,1,[ ]) EXTRA_LIBS="$EXTRA_LIBS -L$withval/lib -lFdfTk" ],[AC_MSG_ERROR(fdftk module requires fdftk lib 2.0.)]) LIBS=$old_LIBS Index: php4/ext/ftp/config.m4 diff -u php4/ext/ftp/config.m4:1.2 php4/ext/ftp/config.m4:1.3 --- php4/ext/ftp/config.m4:1.2 Wed Dec 29 23:07:26 1999 +++ php4/ext/ftp/config.m4 Wed Dec 29 23:52:01 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/12/30 04:07:26 sas Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:52:01 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,1,[ ]) PHP_EXTENSION(ftp) AC_MSG_RESULT(yes) else Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.21 php4/ext/gd/config.m4:1.22 --- php4/ext/gd/config.m4:1.21 Wed Dec 29 23:07:27 1999 +++ php4/ext/gd/config.m4 Wed Dec 29 23:52:01 1999 @@ -12,7 +12,7 @@ no) AC_MSG_RESULT(no) ;; yes) - AC_DEFINE(HAVE_LIBGD,,[ ]) + AC_DEFINE(HAVE_LIBGD,1,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) GD_LIBS="-lgd" @@ -22,7 +22,7 @@ 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,1,[ ]) ]) LIBS="$LIBS -lpng -lz" AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE,1,[ ])]) dnl Some versions of GD support both PNG and GIF. Check for both. @@ -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,1,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) GD_LIBS="-lgd" @@ -72,7 +72,7 @@ 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,1, [ ]) ]) 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, [ ])]) @@ -91,10 +91,10 @@ esac ],[ AC_CHECK_LIB(gd, gdImageLine) - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,, [ ]) ]) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13,1, [ ]) ]) 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,1, [ ]) ]) 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, [ ])]) @@ -131,7 +131,7 @@ fi done if test -n "$FREETYPE_DIR" ; then - AC_DEFINE(HAVE_LIBFREETYPE,,[ ]) + AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) 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,1,[ ]) if test "$shared" = "yes"; then GD_LIBS="$GD_LIBS -lttf" GD_LFLAGS="$GD_LFLAGS -L$TTF_DIR/lib" Index: php4/ext/gettext/config.m4 diff -u php4/ext/gettext/config.m4:1.3 php4/ext/gettext/config.m4:1.4 --- php4/ext/gettext/config.m4:1.3 Wed Dec 29 23:07:27 1999 +++ php4/ext/gettext/config.m4 Wed Dec 29 23:52:02 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:07:27 sas Exp $ +dnl $Id: config.m4,v 1.4 1999/12/30 04:52:02 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,1,[ ]) PHP_EXTENSION(gettext) EXTRA_LIBS="$EXTRA_LIBS $GETTEXT_LFLAGS $GETTEXT_LIBS" Index: php4/ext/icap/config.m4 diff -u php4/ext/icap/config.m4:1.5 php4/ext/icap/config.m4:1.6 --- php4/ext/icap/config.m4:1.5 Wed Dec 29 23:07:28 1999 +++ php4/ext/icap/config.m4 Wed Dec 29 23:52:02 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 04:07:28 sas Exp $ +dnl $Id: config.m4,v 1.6 1999/12/30 04:52:02 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,1,[ ]) PHP_EXTENSION(icap) AC_MSG_RESULT(yes) else Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.9 php4/ext/imap/config.m4:1.10 --- php4/ext/imap/config.m4:1.9 Wed Dec 29 23:07:29 1999 +++ php4/ext/imap/config.m4 Wed Dec 29 23:52:03 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 1999/12/30 04:07:29 sas Exp $ +dnl $Id: config.m4,v 1.10 1999/12/30 04:52:03 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,1,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(imap) else Index: php4/ext/informix/config.m4 diff -u php4/ext/informix/config.m4:1.11 php4/ext/informix/config.m4:1.12 --- php4/ext/informix/config.m4:1.11 Wed Dec 29 23:07:29 1999 +++ php4/ext/informix/config.m4 Wed Dec 29 23:52:03 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.11 1999/12/30 04:07:29 sas Exp $ +dnl $Id: config.m4,v 1.12 1999/12/30 04:52:03 sas Exp $ PHPIFXLIB=ext/informix/libphp_ifx.a @@ -57,11 +57,11 @@ if test "uname -s 2>/dev/null" = "AIX"; then CFLAGS="$CFLAGS -D__H_LOCALEDEF" fi - AC_DEFINE(HAVE_IFX,,[ ]) + AC_DEFINE(HAVE_IFX,1,[ ]) 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,1,[ ]) IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS" else IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS" Index: php4/ext/interbase/config.m4 diff -u php4/ext/interbase/config.m4:1.2 php4/ext/interbase/config.m4:1.3 --- php4/ext/interbase/config.m4:1.2 Wed Dec 29 23:07:30 1999 +++ php4/ext/interbase/config.m4 Wed Dec 29 23:52:04 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/12/30 04:07:30 sas Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:52:04 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,1,[ ]) 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.7 php4/ext/java/config.m4:1.8 --- php4/ext/java/config.m4:1.7 Wed Dec 29 23:07:31 1999 +++ php4/ext/java/config.m4 Wed Dec 29 23:52:04 1999 @@ -1,4 +1,4 @@ -# $Id: config.m4,v 1.7 1999/12/30 04:07:31 sas Exp $ +# $Id: config.m4,v 1.8 1999/12/30 04:52:04 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,1,[ ]) 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.5 php4/ext/ldap/config.m4:1.6 --- php4/ext/ldap/config.m4:1.5 Wed Dec 29 23:07:31 1999 +++ php4/ext/ldap/config.m4 Wed Dec 29 23:52:05 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 04:07:31 sas Exp $ +dnl $Id: config.m4,v 1.6 1999/12/30 04:52:05 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,1,[ ]) elif test -f $LDAP_LIBDIR/libldapssl30.sl; then AC_ADD_LIBRARY(ldapssl30) - AC_DEFINE(HAVE_NSLDAP,,[ ]) + AC_DEFINE(HAVE_NSLDAP,1,[ ]) 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,1,[ ]) elif test -f $LDAP_LIBDIR/libldap30.sl; then AC_ADD_LIBRARY(ldap30) - AC_DEFINE(HAVE_NSLDAP,,[ ]) + AC_DEFINE(HAVE_NSLDAP,1,[ ]) 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,1,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(ldap) Index: php4/ext/mcal/config.m4 diff -u php4/ext/mcal/config.m4:1.3 php4/ext/mcal/config.m4:1.4 --- php4/ext/mcal/config.m4:1.3 Wed Dec 29 23:07:32 1999 +++ php4/ext/mcal/config.m4 Wed Dec 29 23:52:06 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:07:32 sas Exp $ +dnl $Id: config.m4,v 1.4 1999/12/30 04:52:06 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,1,[ ]) PHP_EXTENSION(mcal) AC_MSG_RESULT(yes) else Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.5 php4/ext/mcrypt/config.m4:1.6 --- php4/ext/mcrypt/config.m4:1.5 Wed Dec 29 23:07:32 1999 +++ php4/ext/mcrypt/config.m4 Wed Dec 29 23:52:07 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 04:07:32 sas Exp $ +dnl $Id: config.m4,v 1.6 1999/12/30 04:52:07 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,1,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(mcrypt) Index: php4/ext/mhash/config.m4 diff -u php4/ext/mhash/config.m4:1.5 php4/ext/mhash/config.m4:1.6 --- php4/ext/mhash/config.m4:1.5 Wed Dec 29 23:07:33 1999 +++ php4/ext/mhash/config.m4 Wed Dec 29 23:52:08 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 04:07:33 sas Exp $ +dnl $Id: config.m4,v 1.6 1999/12/30 04:52:08 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,1,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(mhash) Index: php4/ext/msql/config.m4 diff -u php4/ext/msql/config.m4:1.5 php4/ext/msql/config.m4:1.6 --- php4/ext/msql/config.m4:1.5 Wed Dec 29 23:07:33 1999 +++ php4/ext/msql/config.m4 Wed Dec 29 23:52:08 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.5 1999/12/30 04:07:33 sas Exp $ +dnl $Id: config.m4,v 1.6 1999/12/30 04:52:08 sas Exp $ dnl dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined. @@ -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,1,[ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(msql) AC_MSQL_VERSION Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.9 php4/ext/oci8/config.m4:1.10 --- php4/ext/oci8/config.m4:1.9 Wed Dec 29 23:07:34 1999 +++ php4/ext/oci8/config.m4 Wed Dec 29 23:52:09 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.9 1999/12/30 04:07:34 sas Exp $ +dnl $Id: config.m4,v 1.10 1999/12/30 04:52:09 sas Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -162,7 +162,7 @@ # only using shared libs right now ORACLE_LIBS=$ORACLE_SHLIBS - AC_DEFINE(HAVE_ORACLE,,[ ]) + AC_DEFINE(HAVE_ORACLE,1,[ ]) fi Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.13 php4/ext/odbc/config.m4:1.14 --- php4/ext/odbc/config.m4:1.13 Wed Dec 29 23:07:34 1999 +++ php4/ext/odbc/config.m4 Wed Dec 29 23:52:09 1999 @@ -89,7 +89,7 @@ AC_ADD_LIBRARY(sqlrte) AC_ADD_LIBRARY(sqlptc) ODBC_TYPE=adabas - AC_DEFINE(HAVE_ADABAS,,[ ]) + AC_DEFINE(HAVE_ADABAS,1,[ ]) 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,1,[ ]) AC_MSG_RESULT(yes) AC_FIND_SOLID_LIBS($ODBC_LIBDIR) else @@ -168,7 +168,7 @@ fi ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=empress - AC_DEFINE(HAVE_EMPRESS,,[ ]) + AC_DEFINE(HAVE_EMPRESS,1,[ ]) 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,1,[ ]) 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,1,[ ]) 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,1,[ ]) 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,1,[ ]) 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,1,[ ]) 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,1,[ ]) 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,1,[ ]) 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,1,[ ]) 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.6 php4/ext/oracle/config.m4:1.7 --- php4/ext/oracle/config.m4:1.6 Wed Dec 29 23:07:35 1999 +++ php4/ext/oracle/config.m4 Wed Dec 29 23:52:10 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 1999/12/30 04:07:35 sas Exp $ +dnl $Id: config.m4,v 1.7 1999/12/30 04:52:10 sas Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -160,7 +160,7 @@ # only using shared libs right now ORACLE_LIBS=$ORACLE_SHLIBS - AC_DEFINE(HAVE_ORACLE,,[ ]) + AC_DEFINE(HAVE_ORACLE,1,[ ]) fi Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.8 php4/ext/pdf/config.m4:1.9 --- php4/ext/pdf/config.m4:1.8 Wed Dec 29 23:07:38 1999 +++ php4/ext/pdf/config.m4 Wed Dec 29 23:52:10 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 1999/12/30 04:07:38 sas Exp $ +dnl $Id: config.m4,v 1.9 1999/12/30 04:52:10 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,1,[ ])], [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,1,[ ]) 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.8 php4/ext/pgsql/config.m4:1.9 --- php4/ext/pgsql/config.m4:1.8 Wed Dec 29 23:07:38 1999 +++ php4/ext/pgsql/config.m4 Wed Dec 29 23:52:11 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 1999/12/30 04:07:38 sas Exp $ +dnl $Id: config.m4,v 1.9 1999/12/30 04:52:11 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,1,[ ]) 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,1,[ ])) CFLAGS=$old_CFLAGS PHP_EXTENSION(pgsql,$shared) else Index: php4/ext/snmp/config.m4 diff -u php4/ext/snmp/config.m4:1.11 php4/ext/snmp/config.m4:1.12 --- php4/ext/snmp/config.m4:1.11 Wed Dec 29 23:07:40 1999 +++ php4/ext/snmp/config.m4 Wed Dec 29 23:52:11 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.11 1999/12/30 04:07:40 sas Exp $ +dnl $Id: config.m4,v 1.12 1999/12/30 04:52:11 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,1,[ ]) if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) SNMP_INCLUDE="-I$SNMP_INCDIR" Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.15 php4/ext/standard/config.m4:1.16 --- php4/ext/standard/config.m4:1.15 Wed Dec 29 23:07:41 1999 +++ php4/ext/standard/config.m4 Wed Dec 29 23:52:12 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15 1999/12/30 04:07:41 sas Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.16 1999/12/30 04:52:12 sas Exp $ -*- sh -*- divert(2)dnl @@ -113,18 +113,18 @@ AC_CHECK_LIB(c, dlopen, [ # fake it - AC_DEFINE(HAVE_LIBDL,,[ ]) ], [ + AC_DEFINE(HAVE_LIBDL,1,[ ]) ], [ AC_CHECK_LIB(dl, dlopen, [ LIBS="-ldl $LIBS" - AC_DEFINE(HAVE_LIBDL,,[ ]) ], []) ]) + AC_DEFINE(HAVE_LIBDL,1,[ ]) ], []) ]) AC_CHECK_LIB(pam, pam_start, [ EXTRA_LIBS="$EXTRA_LIBS -lpam" - AC_DEFINE(HAVE_LIBPAM,,[ ]) ], []) + AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) AC_CHECK_LIB(crypt, crypt, [ AC_ADD_LIBRARY(crypt) - AC_DEFINE(HAVE_LIBCRYPT,,[ ]) ], []) + AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) ], []) AC_CHECK_FUNCS(getcwd) AC_CHECK_FUNCS(getwd) Index: php4/ext/sybase/config.m4 diff -u php4/ext/sybase/config.m4:1.4 php4/ext/sybase/config.m4:1.5 --- php4/ext/sybase/config.m4:1.4 Wed Dec 29 23:07:41 1999 +++ php4/ext/sybase/config.m4 Wed Dec 29 23:52:13 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 1999/12/30 04:07:41 sas Exp $ +dnl $Id: config.m4,v 1.5 1999/12/30 04:52:13 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,1,[ ]) ]) - AC_DEFINE(HAVE_SYBASE,,[ ]) + AC_DEFINE(HAVE_SYBASE,1,[ ]) else AC_MSG_RESULT(no) fi Index: php4/ext/sybase_ct/config.m4 diff -u php4/ext/sybase_ct/config.m4:1.2 php4/ext/sybase_ct/config.m4:1.3 --- php4/ext/sybase_ct/config.m4:1.2 Wed Dec 29 23:07:43 1999 +++ php4/ext/sybase_ct/config.m4 Wed Dec 29 23:52:13 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/12/30 04:07:43 sas Exp $ +dnl $Id: config.m4,v 1.3 1999/12/30 04:52:13 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,1,[ ]) if test "$withval" = "yes"; then SYBASE_CT_INCDIR=/home/sybase/include SYBASE_CT_LIBDIR=/home/sybase/lib Index: php4/ext/yp/config.m4 diff -u php4/ext/yp/config.m4:1.3 php4/ext/yp/config.m4:1.4 --- php4/ext/yp/config.m4:1.3 Wed Dec 29 23:07:45 1999 +++ php4/ext/yp/config.m4 Wed Dec 29 23:52:14 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:07:45 sas Exp $ +dnl $Id: config.m4,v 1.4 1999/12/30 04:52:14 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,1,[ ]) PHP_EXTENSION(yp) if test uname = "SunOS";then release=uname -r case "$release" in 5*) - AC_DEFINE(SOLARIS_YP,,[ ]) + AC_DEFINE(SOLARIS_YP,1,[ ]) ;; *) ;; Index: php4/ext/zlib/config.m4 diff -u php4/ext/zlib/config.m4:1.3 php4/ext/zlib/config.m4:1.4 --- php4/ext/zlib/config.m4:1.3 Wed Dec 29 23:07:46 1999 +++ php4/ext/zlib/config.m4 Wed Dec 29 23:52:14 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:07:46 sas Exp $ +dnl $Id: config.m4,v 1.4 1999/12/30 04:52:14 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,1,[ ])], [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,1,[ ])], [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)]) LIBS=$old_LIBS AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib)