diff options
author | Sascha Schumann <sas@php.net> | 1999-12-30 04:52:19 +0000 |
---|---|---|
committer | Sascha Schumann <sas@php.net> | 1999-12-30 04:52:19 +0000 |
commit | cf5a5fb1dd3800b9c7f69bb23326277eab3a4c72 (patch) | |
tree | 797b72cf3dd3b02052002d0398a3a79e9c768dfa | |
parent | 2c99bef442d71a455628628e932daf26aaec8a46 (diff) | |
download | php-git-cf5a5fb1dd3800b9c7f69bb23326277eab3a4c72.tar.gz |
Whoops, defining them to empty values generates many parse errors.
Defaulting to 1.
-rw-r--r-- | ext/cybercash/config.m4 | 2 | ||||
-rw-r--r-- | ext/db/config.m4 | 8 | ||||
-rw-r--r-- | ext/dba/config.m4 | 6 | ||||
-rw-r--r-- | ext/domxml/config.m4 | 4 | ||||
-rw-r--r-- | ext/fdf/config.m4 | 4 | ||||
-rw-r--r-- | ext/ftp/config.m4 | 2 | ||||
-rw-r--r-- | ext/gd/config.m4 | 16 | ||||
-rw-r--r-- | ext/gettext/config.m4 | 2 | ||||
-rw-r--r-- | ext/icap/config.m4 | 2 | ||||
-rw-r--r-- | ext/imap/config.m4 | 2 | ||||
-rw-r--r-- | ext/informix/config.m4 | 4 | ||||
-rw-r--r-- | ext/interbase/config.m4 | 2 | ||||
-rw-r--r-- | ext/java/config.m4 | 2 | ||||
-rw-r--r-- | ext/ldap/config.m4 | 10 | ||||
-rw-r--r-- | ext/mcal/config.m4 | 2 | ||||
-rw-r--r-- | ext/mcrypt/config.m4 | 2 | ||||
-rw-r--r-- | ext/mhash/config.m4 | 2 | ||||
-rw-r--r-- | ext/msql/config.m4 | 2 | ||||
-rw-r--r-- | ext/oci8/config.m4 | 2 | ||||
-rw-r--r-- | ext/odbc/config.m4 | 22 | ||||
-rw-r--r-- | ext/oracle/config.m4 | 2 | ||||
-rw-r--r-- | ext/pdf/config.m4 | 4 | ||||
-rw-r--r-- | ext/pgsql/config.m4 | 4 | ||||
-rw-r--r-- | ext/rpc/java/config.m4 | 2 | ||||
-rw-r--r-- | ext/snmp/config.m4 | 2 | ||||
-rw-r--r-- | ext/standard/config.m4 | 8 | ||||
-rw-r--r-- | ext/sybase/config.m4 | 4 | ||||
-rw-r--r-- | ext/sybase_ct/config.m4 | 2 | ||||
-rw-r--r-- | ext/yp/config.m4 | 4 | ||||
-rw-r--r-- | ext/zlib/config.m4 | 4 |
30 files changed, 67 insertions, 67 deletions
diff --git a/ext/cybercash/config.m4 b/ext/cybercash/config.m4 index 5f5730441a..8c4bc3425f 100644 --- a/ext/cybercash/config.m4 +++ b/ext/cybercash/config.m4 @@ -15,7 +15,7 @@ AC_ARG_WITH(cybercash, 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) diff --git a/ext/db/config.m4 b/ext/db/config.m4 index 710931ccd8..9cc9b38c6d 100644 --- a/ext/db/config.m4 +++ b/ext/db/config.m4 @@ -9,10 +9,10 @@ AC_CHECK_HEADERS(db1/ndbm.h) # 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 diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index c5310ef247..bc2256ae95 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -90,7 +90,7 @@ AC_ARG_WITH(ndbm, 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 @@ AC_ARG_WITH(db2, 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 @@ AC_ARG_WITH(db3, 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 diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4 index 68d986d833..c9ed3e8e99 100644 --- a/ext/domxml/config.m4 +++ b/ext/domxml/config.m4 @@ -14,7 +14,7 @@ AC_ARG_WITH(dom, 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 @@ AC_ARG_WITH(dom, 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) diff --git a/ext/fdf/config.m4 b/ext/fdf/config.m4 index 9cbb2d07b2..cf37153cee 100644 --- a/ext/fdf/config.m4 +++ b/ext/fdf/config.m4 @@ -13,7 +13,7 @@ AC_ARG_WITH(fdftk, 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 @@ AC_ARG_WITH(fdftk, 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 diff --git a/ext/ftp/config.m4 b/ext/ftp/config.m4 index 6f6e3bd652..ce5d6af78c 100644 --- a/ext/ftp/config.m4 +++ b/ext/ftp/config.m4 @@ -7,7 +7,7 @@ AC_ARG_WITH(ftp, [ --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 diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index d992b3771e..ce1ded2988 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -12,7 +12,7 @@ AC_ARG_WITH(gd, 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 @@ AC_ARG_WITH(gd, 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 @@ dnl A whole whack of possible places where this might be 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 @@ dnl A whole whack of possible places where this might be 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 @@ dnl A whole whack of possible places where this might be 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 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then 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 @@ if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then 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" diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index 0570b7f2c5..1ba8f94639 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -31,7 +31,7 @@ AC_ARG_WITH(gettext, ],) ],) - AC_DEFINE(HAVE_LIBINTL,,[ ]) + AC_DEFINE(HAVE_LIBINTL,1,[ ]) PHP_EXTENSION(gettext) EXTRA_LIBS="$EXTRA_LIBS $GETTEXT_LFLAGS $GETTEXT_LIBS" diff --git a/ext/icap/config.m4 b/ext/icap/config.m4 index 04732dde1f..372621546a 100644 --- a/ext/icap/config.m4 +++ b/ext/icap/config.m4 @@ -13,7 +13,7 @@ AC_ARG_WITH(icap, 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 diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index da8cf80e2a..857ffdf4da 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -50,7 +50,7 @@ AC_ARG_WITH(imap, 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 diff --git a/ext/informix/config.m4 b/ext/informix/config.m4 index 20c9e8096e..c2e00eb07f 100644 --- a/ext/informix/config.m4 +++ b/ext/informix/config.m4 @@ -57,11 +57,11 @@ WARNING: You specified Informix base install directory that is different 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" diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4 index 08f050138a..f79fa94695 100644 --- a/ext/interbase/config.m4 +++ b/ext/interbase/config.m4 @@ -16,7 +16,7 @@ AC_ARG_WITH(interbase, 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" diff --git a/ext/java/config.m4 b/ext/java/config.m4 index 28a86d3c5b..f0fdd80297 100644 --- a/ext/java/config.m4 +++ b/ext/java/config.m4 @@ -49,7 +49,7 @@ AC_ARG_WITH(java, fi fi - AC_DEFINE(HAVE_JAVA,,[ ]) + AC_DEFINE(HAVE_JAVA,1,[ ]) PHP_EXTENSION(java, shared) PHP_BUILD_SHARED AC_MSG_RESULT(yes) diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 9380eeb639..80ad89a21b 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -50,17 +50,17 @@ dnl these here if necessary. -RL 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 @@ dnl these here if necessary. -RL 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) diff --git a/ext/mcal/config.m4 b/ext/mcal/config.m4 index 03f1d0bc2c..79be84b821 100644 --- a/ext/mcal/config.m4 +++ b/ext/mcal/config.m4 @@ -13,7 +13,7 @@ AC_ARG_WITH(mcal, 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 diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4 index 4becc36e1e..5066b4ac44 100644 --- a/ext/mcrypt/config.m4 +++ b/ext/mcrypt/config.m4 @@ -19,7 +19,7 @@ AC_ARG_WITH(mcrypt, 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) diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4 index 7a82830c9f..de4bf5d270 100644 --- a/ext/mhash/config.m4 +++ b/ext/mhash/config.m4 @@ -19,7 +19,7 @@ AC_ARG_WITH(mhash, 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) diff --git a/ext/msql/config.m4 b/ext/msql/config.m4 index 0213377017..d971b7b91b 100644 --- a/ext/msql/config.m4 +++ b/ext/msql/config.m4 @@ -34,7 +34,7 @@ AC_ARG_WITH(msql, 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 diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 11d8ba1c48..ef722709bc 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -162,7 +162,7 @@ AC_ARG_WITH(oci8, # only using shared libs right now ORACLE_LIBS=$ORACLE_SHLIBS - AC_DEFINE(HAVE_ORACLE,,[ ]) + AC_DEFINE(HAVE_ORACLE,1,[ ]) fi diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 959b257d61..13408ab70e 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -89,7 +89,7 @@ AC_ARG_WITH(adabas, 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 @@ AC_ARG_WITH(solid, 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 @@ AC_ARG_WITH(empress, 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 @@ AC_ARG_WITH(velocis, 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 @@ AC_ARG_WITH(custom-odbc, 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 @@ AC_ARG_WITH(iodbc, 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 @@ AC_ARG_WITH(esoob, 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 @@ AC_ARG_WITH(unixODBC, 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 @@ AC_ARG_WITH(openlink, 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 @@ AC_ARG_WITH(dbmaker, 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 @@ fi 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) diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4 index 7f7c8b94a2..87c1f6a743 100644 --- a/ext/oracle/config.m4 +++ b/ext/oracle/config.m4 @@ -160,7 +160,7 @@ AC_ARG_WITH(oracle, # only using shared libs right now ORACLE_LIBS=$ORACLE_SHLIBS - AC_DEFINE(HAVE_ORACLE,,[ ]) + AC_DEFINE(HAVE_ORACLE,1,[ ]) fi diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4 index e45eb3c9e9..7d479d3460 100644 --- a/ext/pdf/config.m4 +++ b/ext/pdf/config.m4 @@ -16,7 +16,7 @@ echo $withval 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 @@ echo $withval 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) diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index adbcdd937b..2228e47c93 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -37,7 +37,7 @@ AC_ARG_WITH(pgsql, 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_ARG_WITH(pgsql, 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 diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4 index 28a86d3c5b..f0fdd80297 100644 --- a/ext/rpc/java/config.m4 +++ b/ext/rpc/java/config.m4 @@ -49,7 +49,7 @@ AC_ARG_WITH(java, fi fi - AC_DEFINE(HAVE_JAVA,,[ ]) + AC_DEFINE(HAVE_JAVA,1,[ ]) PHP_EXTENSION(java, shared) PHP_BUILD_SHARED AC_MSG_RESULT(yes) diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index 4dcbb4f069..9d59f2501e 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -40,7 +40,7 @@ AC_ARG_WITH(snmp, 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" diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 7fc5bad5fb..e1f1aa065d 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -113,18 +113,18 @@ main() { 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) diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4 index cd0928b1ec..96d38c0471 100644 --- a/ext/sybase/config.m4 +++ b/ext/sybase/config.m4 @@ -20,9 +20,9 @@ AC_ARG_WITH(sybase, 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 diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4 index 3bfdea28c7..68b3d0833c 100644 --- a/ext/sybase_ct/config.m4 +++ b/ext/sybase_ct/config.m4 @@ -10,7 +10,7 @@ AC_ARG_WITH(sybase-ct, 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 diff --git a/ext/yp/config.m4 b/ext/yp/config.m4 index 151661abf8..dd7eff9a0b 100644 --- a/ext/yp/config.m4 +++ b/ext/yp/config.m4 @@ -8,13 +8,13 @@ AC_ARG_WITH(yp, [ 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,[ ]) ;; *) ;; diff --git a/ext/zlib/config.m4 b/ext/zlib/config.m4 index e4111b9dca..30cfd541dd 100644 --- a/ext/zlib/config.m4 +++ b/ext/zlib/config.m4 @@ -12,7 +12,7 @@ AC_ARG_WITH(zlib, 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 @@ AC_ARG_WITH(zlib, 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) |