From 47a1d28ead0d9da9e3b39a5b5aa21b589fb67c3d Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 21 Jul 2019 23:14:39 +0200 Subject: [PATCH] Sync extension enablements symbols When PHP extension is enabled there is usually defined a symbol HAVE_{EXT_NAME}. This patch syncs this a bit and sets the help messages for the configuration headers main/php_config.php and main/config.w32.h. Help messages are based on the Autoconf's default messages for similar symbols. Additionally: - HAVE_PHP_SOAP has been renamed to HAVE_SOAP (for Windows) --- ext/bcmath/config.m4 | 2 +- ext/bcmath/config.w32 | 2 +- ext/bz2/config.m4 | 2 +- ext/bz2/config.w32 | 2 +- ext/calendar/config.m4 | 2 +- ext/calendar/config.w32 | 2 +- ext/com_dotnet/config.w32 | 2 +- ext/ctype/config.m4 | 2 +- ext/ctype/config.w32 | 2 +- ext/curl/config.m4 | 4 ++-- ext/curl/config.w32 | 2 +- ext/dba/config.m4 | 2 +- ext/dba/config.w32 | 2 +- ext/dom/config.m4 | 2 +- ext/dom/config.w32 | 2 +- ext/enchant/config.m4 | 2 +- ext/enchant/config.w32 | 2 +- ext/exif/config.m4 | 2 +- ext/exif/config.w32 | 2 +- ext/ffi/config.m4 | 2 +- ext/ffi/config.w32 | 2 +- ext/ftp/config.m4 | 2 +- ext/ftp/config.w32 | 2 +- ext/gd/config.m4 | 2 +- ext/gd/config.w32 | 2 +- ext/gmp/config.m4 | 2 +- ext/gmp/config.w32 | 2 +- ext/hash/config.m4 | 2 +- ext/hash/config.w32 | 2 +- ext/imap/config.m4 | 2 +- ext/imap/config.w32 | 2 +- ext/intl/config.m4 | 1 + ext/intl/config.w32 | 2 +- ext/json/config.m4 | 2 +- ext/json/config.w32 | 1 + ext/ldap/config.m4 | 2 +- ext/ldap/config.w32 | 2 +- ext/libxml/config.w32 | 2 +- ext/libxml/config0.m4 | 2 +- ext/mbstring/config.m4 | 2 +- ext/mbstring/config.w32 | 2 +- ext/mysqli/config.m4 | 2 +- ext/mysqli/config.w32 | 4 ++-- ext/oci8/config.m4 | 2 +- ext/oci8/config.w32 | 2 +- ext/openssl/config.w32 | 2 +- ext/openssl/config0.m4 | 2 +- ext/pcre/config.w32 | 2 +- ext/pcre/config0.m4 | 2 +- ext/pdo_dblib/config.m4 | 2 +- ext/pdo_firebird/config.m4 | 2 +- ext/pdo_firebird/config.w32 | 1 + ext/pdo_pgsql/config.m4 | 2 +- ext/pdo_pgsql/config.w32 | 2 +- ext/pdo_sqlite/config.w32 | 1 + ext/pgsql/config.m4 | 2 +- ext/pgsql/config.w32 | 2 +- ext/posix/config.m4 | 2 +- ext/pspell/config.m4 | 2 +- ext/pspell/config.w32 | 2 +- ext/session/config.m4 | 2 +- ext/session/config.w32 | 2 +- ext/shmop/config.m4 | 2 +- ext/shmop/config.w32 | 2 +- ext/simplexml/config.m4 | 2 +- ext/simplexml/config.w32 | 2 +- ext/skeleton/config.m4.in | 2 +- ext/skeleton/config.w32.in | 2 +- ext/snmp/config.m4 | 2 +- ext/snmp/config.w32 | 2 +- ext/soap/config.m4 | 2 +- ext/soap/config.w32 | 2 +- ext/sockets/config.m4 | 2 +- ext/sockets/config.w32 | 2 +- ext/sodium/config.m4 | 2 +- ext/sodium/config.w32 | 2 +- ext/sqlite3/config.w32 | 2 +- ext/sysvmsg/config.m4 | 2 +- ext/sysvsem/config.m4 | 2 +- ext/sysvshm/config.m4 | 2 +- ext/sysvshm/config.w32 | 2 +- ext/tidy/config.m4 | 2 +- ext/tidy/config.w32 | 2 +- ext/tokenizer/config.m4 | 1 + ext/tokenizer/config.w32 | 2 +- ext/xml/config.m4 | 2 +- ext/xml/config.w32 | 2 +- ext/xmlreader/config.m4 | 2 +- ext/xmlreader/config.w32 | 2 +- ext/xmlrpc/config.m4 | 2 +- ext/xmlrpc/config.w32 | 1 + ext/xmlwriter/config.m4 | 2 +- ext/xmlwriter/config.w32 | 2 +- ext/xsl/config.m4 | 2 +- ext/xsl/config.w32 | 2 +- ext/zip/config.m4 | 2 +- ext/zip/config.w32 | 2 +- ext/zlib/config.w32 | 2 +- ext/zlib/config0.m4 | 2 +- 99 files changed, 101 insertions(+), 95 deletions(-) diff --git a/ext/bcmath/config.m4 b/ext/bcmath/config.m4 index 2877a7d4adab0..cb08dd6951330 100644 --- a/ext/bcmath/config.m4 +++ b/ext/bcmath/config.m4 @@ -11,5 +11,5 @@ libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/do libbcmath/src/rmzero.c libbcmath/src/str2num.c, $ext_shared,,-I@ext_srcdir@/libbcmath/src -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_ADD_BUILD_DIR($ext_builddir/libbcmath/src) - AC_DEFINE(HAVE_BCMATH, 1, [Whether you have bcmath]) + AC_DEFINE(HAVE_BCMATH, 1, [Define to 1 if you have the bcmath extension enabled.]) fi diff --git a/ext/bcmath/config.w32 b/ext/bcmath/config.w32 index eaf217774d31d..b4f393b69b6f6 100644 --- a/ext/bcmath/config.w32 +++ b/ext/bcmath/config.w32 @@ -9,5 +9,5 @@ if (PHP_BCMATH == "yes") { num2long.c output.c recmul.c sqrt.c zero.c debug.c doaddsub.c \ nearzero.c num2str.c raise.c rmzero.c str2num.c", "bcmath"); - AC_DEFINE('HAVE_BCMATH', 1, 'Have BCMATH library'); + AC_DEFINE('HAVE_BCMATH', 1, 'Define to 1 if you have the bcmath extension enabled.'); } diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4 index 56d81a60d7951..f9d36613d731b 100644 --- a/ext/bz2/config.m4 +++ b/ext/bz2/config.m4 @@ -26,7 +26,7 @@ if test "$PHP_BZ2" != "no"; then [ PHP_ADD_INCLUDE($BZIP_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD) - AC_DEFINE(HAVE_BZ2,1,[ ]) + AC_DEFINE(HAVE_BZ2, 1, [Define to 1 if you have the bz2 extension enabled.]) ], [ AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0) ], [ diff --git a/ext/bz2/config.w32 b/ext/bz2/config.w32 index 96214faf9c78d..61aedb700caf1 100644 --- a/ext/bz2/config.w32 +++ b/ext/bz2/config.w32 @@ -6,7 +6,7 @@ if (PHP_BZ2 != "no") { if (CHECK_LIB("libbz2_a.lib;libbz2.lib", "bz2", PHP_BZ2) && CHECK_HEADER_ADD_INCLUDE("bzlib.h", "CFLAGS_BZ2")) { EXTENSION("bz2", "bz2.c bz2_filter.c"); - AC_DEFINE('HAVE_BZ2', 1, 'Have BZ2 library'); + AC_DEFINE('HAVE_BZ2', 1, 'Define to 1 if you have the bz2 extension enabled.'); // BZ2 extension does this slightly differently from others if (PHP_BZ2_SHARED) { ADD_FLAG("CFLAGS_BZ2", "/D PHP_BZ2_EXPORTS "); diff --git a/ext/calendar/config.m4 b/ext/calendar/config.m4 index bb3cfe4a622e3..beab2464a0a5f 100644 --- a/ext/calendar/config.m4 +++ b/ext/calendar/config.m4 @@ -4,6 +4,6 @@ PHP_ARG_ENABLE([calendar], [Enable support for calendar conversion])]) if test "$PHP_CALENDAR" = "yes"; then - AC_DEFINE(HAVE_CALENDAR,1,[ ]) + AC_DEFINE(HAVE_CALENDAR, 1, [Define to 1 if you have the calendar extension enabled.]) PHP_NEW_EXTENSION(calendar, calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c, $ext_shared) fi diff --git a/ext/calendar/config.w32 b/ext/calendar/config.w32 index 238c13eb16bee..476ec8880d386 100644 --- a/ext/calendar/config.w32 +++ b/ext/calendar/config.w32 @@ -5,5 +5,5 @@ ARG_ENABLE("calendar", "calendar conversion support", "yes"); if (PHP_CALENDAR == "yes") { EXTENSION("calendar", "calendar.c dow.c french.c gregor.c jewish.c \ julian.c easter.c cal_unix.c"); - AC_DEFINE('HAVE_CALENDAR', 1, 'Have calendar'); + AC_DEFINE('HAVE_CALENDAR', 1, 'Define to 1 if you have the calendar extension enabled.'); } diff --git a/ext/com_dotnet/config.w32 b/ext/com_dotnet/config.w32 index e1f20cba20db9..13845d928059b 100644 --- a/ext/com_dotnet/config.w32 +++ b/ext/com_dotnet/config.w32 @@ -8,6 +8,6 @@ if (PHP_COM_DOTNET == "yes") { com_handlers.c com_iterator.c com_misc.c com_olechar.c \ com_typeinfo.c com_variant.c com_wrapper.c com_saproxy.c com_persist.c", null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE('HAVE_COM_DOTNET', 1, 'Have COM_DOTNET support'); + AC_DEFINE('HAVE_COM_DOTNET', 1, 'Define to 1 if you have the com_dotnet extension enabled.'); CHECK_HEADER_ADD_INCLUDE('mscoree.h', 'CFLAGS_COM_DOTNET'); } diff --git a/ext/ctype/config.m4 b/ext/ctype/config.m4 index 7646525a709eb..a20e0ea9c49c3 100644 --- a/ext/ctype/config.m4 +++ b/ext/ctype/config.m4 @@ -5,6 +5,6 @@ PHP_ARG_ENABLE([ctype], [yes]) if test "$PHP_CTYPE" != "no"; then - AC_DEFINE(HAVE_CTYPE, 1, [ ]) + AC_DEFINE(HAVE_CTYPE, 1, [Define to 1 if you have the ctype extension enabled.]) PHP_NEW_EXTENSION(ctype, ctype.c, $ext_shared) fi diff --git a/ext/ctype/config.w32 b/ext/ctype/config.w32 index 552efada64ce3..fb49ccff8e577 100644 --- a/ext/ctype/config.w32 +++ b/ext/ctype/config.w32 @@ -4,5 +4,5 @@ ARG_ENABLE("ctype", "ctype", "yes"); if (PHP_CTYPE == "yes") { EXTENSION("ctype", "ctype.c"); - AC_DEFINE('HAVE_CTYPE', 1, 'Have ctype'); + AC_DEFINE('HAVE_CTYPE', 1, 'Define to 1 if you have the ctype extension enabled.'); } diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index 6e8d36b8a28cb..34d042685cada 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -23,7 +23,7 @@ if test "$PHP_CURL" != "no"; then esac if test "$CURL_SSL" = yes; then - AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) + AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CURL_CFLAGS" @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) PHP_CHECK_LIBRARY(curl,curl_easy_perform, [ - AC_DEFINE(HAVE_CURL,1,[ ]) + AC_DEFINE(HAVE_CURL, 1, [Define to 1 if you have the curl extension enabled.]) ],[ AC_MSG_ERROR(There is something wrong. Please check config.log for more information.) ],[ diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index 515747f893f4e..9557f597f4b62 100644 --- a/ext/curl/config.w32 +++ b/ext/curl/config.w32 @@ -27,7 +27,7 @@ if (PHP_CURL != "no") { CHECK_LIB("nghttp2.lib", "curl", PHP_CURL)) ) { EXTENSION("curl", "interface.c multi.c share.c curl_file.c"); - AC_DEFINE('HAVE_CURL', 1, 'Have cURL library'); + AC_DEFINE('HAVE_CURL', 1, 'Define to 1 if you have the curl extension enabled.'); AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL'); ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB"); // TODO: check for curl_version_info diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index dcf01d0d13172..453eab38ec046 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -695,7 +695,7 @@ if test "$HAVE_DBA" = "1"; then else AC_MSG_RESULT([yes]) fi - AC_DEFINE(HAVE_DBA, 1, [ ]) + AC_DEFINE(HAVE_DBA, 1, [Define to 1 if you have the dba extension enabled.]) PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c dba_tcadb.c dba_lmdb.c $cdb_sources $flat_sources $ini_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_ADD_BUILD_DIR($ext_builddir/libinifile) PHP_ADD_BUILD_DIR($ext_builddir/libcdb) diff --git a/ext/dba/config.w32 b/ext/dba/config.w32 index 6391076de8d18..8c0bb319fefcc 100644 --- a/ext/dba/config.w32 +++ b/ext/dba/config.w32 @@ -10,7 +10,7 @@ if (PHP_DBA != "no") { ADD_SOURCES("ext/dba/libcdb", "cdb.c cdb_make.c uint32.c", "dba"); ADD_SOURCES("ext/dba/libflatfile", "flatfile.c", "dba"); ADD_SOURCES("ext/dba/libinifile", "inifile.c", "dba"); - AC_DEFINE('HAVE_DBA', 1, 'DBA support'); + AC_DEFINE('HAVE_DBA', 1, 'Define to 1 if you have the dba extension enabled.'); ADD_FLAG("CFLAGS_DBA", "/D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1"); if (PHP_DB != "no") { diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 index 1a7f81ef8dae8..6a5c60981a814 100644 --- a/ext/dom/config.m4 +++ b/ext/dom/config.m4 @@ -11,7 +11,7 @@ if test "$PHP_DOM" != "no"; then fi PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [ - AC_DEFINE(HAVE_DOM,1,[ ]) + AC_DEFINE(HAVE_DOM, 1, [Define to 1 if you have the dom extension enabled.]) PHP_NEW_EXTENSION(dom, [php_dom.c attr.c document.c domerrorhandler.c \ domstringlist.c domexception.c namelist.c \ processinginstruction.c cdatasection.c \ diff --git a/ext/dom/config.w32 b/ext/dom/config.w32 index 1ac3c614a55d0..4298f7af49a7c 100644 --- a/ext/dom/config.w32 +++ b/ext/dom/config.w32 @@ -16,7 +16,7 @@ if (PHP_DOM == "yes") { notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \ domlocator.c namednodemap.c userdatahandler.c"); - AC_DEFINE("HAVE_DOM", 1, "DOM support"); + AC_DEFINE("HAVE_DOM", 1, "Define to 1 if you have the dom extension enabled."); if (!PHP_DOM_SHARED) { ADD_FLAG("CFLAGS_DOM", "/D LIBXML_STATIC "); diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4 index 6c8dd726ce98c..436bce94a58f6 100644 --- a/ext/enchant/config.m4 +++ b/ext/enchant/config.m4 @@ -9,7 +9,7 @@ if test "$PHP_ENCHANT" != "no"; then PHP_EVAL_INCLINE($ENCHANT_CFLAGS) PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD) - AC_DEFINE(HAVE_ENCHANT, 1, [ ]) + AC_DEFINE(HAVE_ENCHANT, 1, [Define to 1 if you have the enchant extension enabled.]) PHP_CHECK_LIBRARY(enchant, enchant_get_version, [ diff --git a/ext/enchant/config.w32 b/ext/enchant/config.w32 index 2418d99206323..8ba0fde1544f2 100644 --- a/ext/enchant/config.w32 +++ b/ext/enchant/config.w32 @@ -7,7 +7,7 @@ if (PHP_ENCHANT == "yes") { CHECK_HEADER_ADD_INCLUDE("glib.h", "CFLAGS_ENCHANT", PHP_ENCHANT+ ";" + PHP_PHP_BUILD + "\\include\\glib-2.0") && CHECK_LIB("libenchant.lib", "enchant", PHP_ENCHANT) ) { EXTENSION("enchant", "enchant.c"); - AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false); + AC_DEFINE('HAVE_ENCHANT', 1, 'Define to 1 if you have the enchant extension enabled.', false); AC_DEFINE('HAVE_ENCHANT_GET_VERSION', 1); AC_DEFINE('HAVE_ENCHANT_BROKER_SET_PARAM', 1); ADD_FLAG("CFLAG_ENCHANT", "/D _WIN32"); diff --git a/ext/exif/config.m4 b/ext/exif/config.m4 index a2e3250a9daa5..739c05c3068ae 100644 --- a/ext/exif/config.m4 +++ b/ext/exif/config.m4 @@ -4,6 +4,6 @@ PHP_ARG_ENABLE([exif], [Enable EXIF (metadata from images) support])]) if test "$PHP_EXIF" != "no"; then - AC_DEFINE(HAVE_EXIF, 1, [Whether you want EXIF (metadata from images) support]) + AC_DEFINE(HAVE_EXIF, 1, [Define to 1 if you have the exif extension enabled.]) PHP_NEW_EXTENSION(exif, exif.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) fi diff --git a/ext/exif/config.w32 b/ext/exif/config.w32 index 0fe93cdb56221..c9bc50baa70a3 100644 --- a/ext/exif/config.w32 +++ b/ext/exif/config.w32 @@ -6,7 +6,7 @@ if(PHP_EXIF != 'no') { if(ADD_EXTENSION_DEP('exif', 'mbstring')) { - AC_DEFINE('HAVE_EXIF', 1, 'Have EXIF Support'); + AC_DEFINE('HAVE_EXIF', 1, 'Define to 1 if you have the exif extension enabled.'); EXTENSION('exif', 'exif.c', null, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); } diff --git a/ext/ffi/config.m4 b/ext/ffi/config.m4 index 3f306c84154d9..9c2896d3c28b7 100644 --- a/ext/ffi/config.m4 +++ b/ext/ffi/config.m4 @@ -9,7 +9,7 @@ if test "$PHP_FFI" != "no"; then PHP_EVAL_INCLINE($FFI_CFLAGS) PHP_EVAL_LIBLINE($FFI_LIBS, FFI_SHARED_LIBADD) - AC_DEFINE(HAVE_FFI, 1, [Have ffi support]) + AC_DEFINE(HAVE_FFI, 1, [Define to 1 if you have the ffi extension enabled.]) AC_CHECK_TYPES(long double) diff --git a/ext/ffi/config.w32 b/ext/ffi/config.w32 index 7b2254e0f703a..3dd13ac4d4a3f 100644 --- a/ext/ffi/config.w32 +++ b/ext/ffi/config.w32 @@ -3,7 +3,7 @@ ARG_WITH('ffi', 'ffi support', 'no'); if (PHP_FFI != 'no') { if (CHECK_HEADER_ADD_INCLUDE("ffi.h", "CFLAGS_FFI", PHP_FFI+ ";" + PHP_PHP_BUILD + "\\include") && CHECK_LIB("libffi.lib", "ffi", PHP_FFI)) { - AC_DEFINE('HAVE_FFI', 1, 'ffi support enabled'); + AC_DEFINE('HAVE_FFI', 1, 'Define to 1 if you have the ffi extension enabled.'); if (!X64) { AC_DEFINE('HAVE_FFI_FASTCALL', 1 ,'libffi supports fastcall calling convention'); diff --git a/ext/ftp/config.m4 b/ext/ftp/config.m4 index 3d81242a69138..14d03f6180735 100644 --- a/ext/ftp/config.m4 +++ b/ext/ftp/config.m4 @@ -11,7 +11,7 @@ PHP_ARG_WITH([openssl-dir], [no]) if test "$PHP_FTP" = "yes"; then - AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support]) + AC_DEFINE(HAVE_FTP, 1, [Define to 1 if you have the ftp extension enabled.]) PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared) dnl Empty variable means 'no' diff --git a/ext/ftp/config.w32 b/ext/ftp/config.w32 index 0f8e249ac7712..67c96a224d970 100644 --- a/ext/ftp/config.w32 +++ b/ext/ftp/config.w32 @@ -13,5 +13,5 @@ if (PHP_FTP != "no") { AC_DEFINE('HAVE_FTP_SSL', 1, 'Have FTP over SSL support'); } - AC_DEFINE('HAVE_FTP', 1, 'Have FTP support'); + AC_DEFINE('HAVE_FTP', 1, 'Define to 1 if you have the ftp extension enabled.'); } diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 662a9c8c2e69b..b2cda514416ea 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -184,7 +184,7 @@ dnl Various checks for GD features PKG_CHECK_MODULES([GDLIB], [gdlib >= 2.1.0]) PHP_EVAL_LIBLINE($GDLIB_LIBS, GD_SHARED_LIBADD) PHP_EVAL_INCLINE($GDLIB_CFLAGS) - AC_DEFINE(HAVE_LIBGD, 1, [ ]) + AC_DEFINE(HAVE_LIBGD, 1, [Define to 1 if you have the gd extension enabled.]) PHP_GD_CHECK_VERSION PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared) diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 6695976d0e243..e851dc39be21a 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -41,7 +41,7 @@ if (PHP_GD != "no") { gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c gd_xbm.c gd_security.c gd_transform.c \ gd_filter.c gd_pixelate.c gd_rotate.c gd_color_match.c gd_webp.c \ gd_crop.c gd_interpolation.c gd_matrix.c gd_bmp.c gd_tga.c", "gd"); - AC_DEFINE('HAVE_LIBGD', 1, 'GD support'); + AC_DEFINE('HAVE_LIBGD', 1, 'Define to 1 if you have the gd extension enabled.'); ADD_FLAG("CFLAGS_GD", " \ /D HAVE_GD_DYNAMIC_CTX_EX=1 \ /D HAVE_GD_BUNDLED=1 \ diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4 index 622215fe25f47..7d1e36b86b1c6 100644 --- a/ext/gmp/config.m4 +++ b/ext/gmp/config.m4 @@ -29,5 +29,5 @@ if test "$PHP_GMP" != "no"; then PHP_NEW_EXTENSION(gmp, gmp.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(GMP_SHARED_LIBADD) - AC_DEFINE(HAVE_GMP, 1, [ ]) + AC_DEFINE(HAVE_GMP, 1, [Define to 1 if you have the gmp extension enabled.]) fi diff --git a/ext/gmp/config.w32 b/ext/gmp/config.w32 index 13083d97b2806..33e9656d33077 100644 --- a/ext/gmp/config.w32 +++ b/ext/gmp/config.w32 @@ -7,7 +7,7 @@ if (PHP_GMP != "no") { CHECK_HEADER_ADD_INCLUDE("gmp.h", "CFLAGS_GMP", PHP_GMP + ";" + PHP_PHP_BUILD + "\\include\\mpir")) { EXTENSION("gmp", "gmp.c", null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); PHP_INSTALL_HEADERS("ext/gmp", "php_gmp_int.h"); - AC_DEFINE('HAVE_GMP', 1, 'GMP support'); + AC_DEFINE('HAVE_GMP', 1, 'Define to 1 if you have the gmp extension enabled.'); } else { WARNING("GMP not enabled; libraries and headers not found"); } diff --git a/ext/hash/config.m4 b/ext/hash/config.m4 index 111574e749bb9..61f34e1e46989 100644 --- a/ext/hash/config.m4 +++ b/ext/hash/config.m4 @@ -12,7 +12,7 @@ if test "$PHP_MHASH" != "no"; then fi dnl Defined for BC. -AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension]) +AC_DEFINE(HAVE_HASH_EXT, 1, [Define to 1 if you have the hash extension enabled. (deprecated)]) if test $ac_cv_c_bigendian_php = yes; then EXT_HASH_SHA3_SOURCES="hash_sha3.c" diff --git a/ext/hash/config.w32 b/ext/hash/config.w32 index 3ed785bfdaaa9..53590500f7825 100644 --- a/ext/hash/config.w32 +++ b/ext/hash/config.w32 @@ -7,7 +7,7 @@ if (PHP_MHASH != 'no') { } // Defined for BC. -AC_DEFINE('HAVE_HASH_EXT', 1); +AC_DEFINE('HAVE_HASH_EXT', 1, 'Define to 1 if you have the hash extension enabled. (deprecated)'); PHP_HASH = 'yes'; diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index 74dbc2d9311ab..2759183fad02e 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -108,7 +108,7 @@ PHP_ARG_WITH([imap-ssl], if test "$PHP_IMAP" != "no"; then PHP_SUBST(IMAP_SHARED_LIBADD) PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) - AC_DEFINE(HAVE_IMAP,1,[ ]) + AC_DEFINE(HAVE_IMAP, 1, [Define to 1 if you have the imap extension enabled.]) for i in $PHP_IMAP /usr/local /usr; do IMAP_INC_CHK() diff --git a/ext/imap/config.w32 b/ext/imap/config.w32 index fec29310520f6..ab8831eb4412d 100644 --- a/ext/imap/config.w32 +++ b/ext/imap/config.w32 @@ -16,7 +16,7 @@ if (PHP_IMAP == "yes") { EXTENSION("imap", "php_imap.c", true, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); ADD_FLAG("CFLAGS_IMAP", "/D HAVE_IMAP2000=1 /D HAVE_IMAP2004=1 /D HAVE_IMAP2007a=1 /D HAVE_IMAP2007b=1 /D HAVE_IMAP_SSL=1"); - AC_DEFINE('HAVE_IMAP', 1, 'Have IMAP support', true); + AC_DEFINE('HAVE_IMAP', 1, 'Define to 1 if you have the imap extension enabled.'); AC_DEFINE('HAVE_RFC822_OUTPUT_ADDRESS_LIST', 1, 'Have rfc822_output_address_list', true); AC_DEFINE('HAVE_IMAP_MUTF7', 1, 'Have modified utf7 support', true); AC_DEFINE('HAVE_NEW_MIME2TEXT', 1, 'Whether utf8_mime2text() has new signature'); diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 index 7285f75e06a3e..9009edd6586bf 100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 @@ -7,6 +7,7 @@ if test "$PHP_INTL" != "no"; then PHP_SETUP_ICU(INTL_SHARED_LIBADD) PHP_SUBST(INTL_SHARED_LIBADD) INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" + AC_DEFINE(HAVE_INTL, 1, [Define to 1 if you have the intl extension enabled.]) PHP_NEW_EXTENSION(intl, php_intl.c \ intl_error.c \ intl_convert.c \ diff --git a/ext/intl/config.w32 b/ext/intl/config.w32 index ce6478f99f72e..1d24460d57c66 100644 --- a/ext/intl/config.w32 +++ b/ext/intl/config.w32 @@ -129,7 +129,7 @@ if (PHP_INTL != "no") { } ADD_FLAG("CFLAGS_INTL", "/EHsc /DUNISTR_FROM_CHAR_EXPLICIT=explicit /DUNISTR_FROM_STRING_EXPLICIT=explicit /DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 /DU_HIDE_OBSOLETE_UTF_OLD_H=1"); - AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled"); + AC_DEFINE("HAVE_INTL", 1, "Define to 1 if you have the intl extension enabled."); } else { WARNING("intl not enabled; libraries and/or headers not found"); } diff --git a/ext/json/config.m4 b/ext/json/config.m4 index 01328d57cc8be..7c97412ea1d87 100644 --- a/ext/json/config.m4 +++ b/ext/json/config.m4 @@ -5,7 +5,7 @@ PHP_ARG_ENABLE([json], [yes]) if test "$PHP_JSON" != "no"; then - AC_DEFINE([HAVE_JSON],1 ,[whether to enable JavaScript Object Serialization support]) + AC_DEFINE(HAVE_JSON, 1, [Define to 1 if you have the json extension enabled.]) PHP_NEW_EXTENSION(json, json.c \ diff --git a/ext/json/config.w32 b/ext/json/config.w32 index 82e470f2eec4b..2409031d45715 100644 --- a/ext/json/config.w32 +++ b/ext/json/config.w32 @@ -4,6 +4,7 @@ ARG_ENABLE("json", "JavaScript Object Serialization support", "yes"); if (PHP_JSON != "no") { EXTENSION('json', 'json.c', PHP_JSON_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); + AC_DEFINE("HAVE_JSON", 1, "Define to 1 if you have the json extension enabled."); if (!FSO.FileExists("ext/json/json_scanner.c")) { STDOUT.WriteLine("Generating ext/json/json_scanner.c"); diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index fff818b8f40fb..23be22a989201 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -150,7 +150,7 @@ if test "$PHP_LDAP" != "no"; then PHP_ADD_INCLUDE($LDAP_INCDIR) PHP_SUBST(LDAP_SHARED_LIBADD) - AC_DEFINE(HAVE_LDAP,1,[ ]) + AC_DEFINE(HAVE_LDAP, 1, [Define to 1 if you have the ldap extension enabled.]) dnl Save original values _SAVE_CPPFLAGS=$CPPFLAGS diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index b947aa5177ca3..b1cd6793df455 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -15,7 +15,7 @@ if (PHP_LDAP != "no") { AC_DEFINE('HAVE_LDAP_PARSE_RESULT', 1); AC_DEFINE('HAVE_LDAP_PARSE_REFERENCE', 1); AC_DEFINE('HAVE_LDAP_START_TLS_S', 1); - AC_DEFINE('HAVE_LDAP', 1); + AC_DEFINE('HAVE_LDAP', 1, "Define to 1 if you have the ldap extension enabled."); AC_DEFINE('HAVE_LDAP_SASL', 1); AC_DEFINE('LDAP_DEPRECATED', 1); AC_DEFINE('HAVE_LDAP_CONTROL_FIND', 1); diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32 index b11c57bc44a72..e57a89395fdb1 100644 --- a/ext/libxml/config.w32 +++ b/ext/libxml/config.w32 @@ -10,7 +10,7 @@ if (PHP_LIBXML == "yes") { ADD_EXTENSION_DEP('libxml', 'iconv')) { EXTENSION("libxml", "libxml.c", false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE("HAVE_LIBXML", 1, "LibXML support"); + AC_DEFINE("HAVE_LIBXML", 1, "Define to 1 if you have the libxml extension enabled."); ADD_FLAG("CFLAGS_LIBXML", "/D LIBXML_STATIC /D LIBXML_STATIC_FOR_DLL /D HAVE_WIN32_THREADS "); if (!PHP_LIBXML_SHARED) { ADD_DEF_FILE("ext\\libxml\\php_libxml2.def"); diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4 index 044a58fa6246f..0a3bbd03761bd 100644 --- a/ext/libxml/config0.m4 +++ b/ext/libxml/config0.m4 @@ -10,7 +10,7 @@ if test "$PHP_LIBXML" != "no"; then ext_shared=no PHP_SETUP_LIBXML(LIBXML_SHARED_LIBADD, [ - AC_DEFINE(HAVE_LIBXML,1,[ ]) + AC_DEFINE(HAVE_LIBXML, 1, [Define to 1 if you have the libxml extension enabled.]) PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/libxml/php_libxml.h]) ]) diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index e050286fbb0b4..8f1becb074e52 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -201,7 +201,7 @@ PHP_ARG_ENABLE([mbregex], [no]) if test "$PHP_MBSTRING" != "no"; then - AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) + AC_DEFINE([HAVE_MBSTRING], 1, [Define to 1 if you have the mbstring extension enabled.]) PHP_MBSTRING_ADD_BASE_SOURCES([mbstring.c php_unicode.c mb_gpc.c]) diff --git a/ext/mbstring/config.w32 b/ext/mbstring/config.w32 index b57fefa851740..6f255bce4f346 100644 --- a/ext/mbstring/config.w32 +++ b/ext/mbstring/config.w32 @@ -50,7 +50,7 @@ if (PHP_MBSTRING != "no") { PHP_INSTALL_HEADERS("ext/mbstring", "mbstring.h libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h"); - AC_DEFINE('HAVE_MBSTRING', 1, 'Have mbstring support'); + AC_DEFINE('HAVE_MBSTRING', 1, 'Define to 1 if you have the mbstring extension enabled.'); if (PHP_MBREGEX != "no") { if (CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_MBSTRING", PHP_MBREGEX) && diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 index c78eb2bedc42c..4ba89768acd45 100644 --- a/ext/mysqli/config.m4 +++ b/ext/mysqli/config.m4 @@ -71,7 +71,7 @@ elif test "$PHP_MYSQLI" != "no"; then [ PHP_EVAL_INCLINE($MYSQLI_INCLINE) PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD) - AC_DEFINE(HAVE_MYSQLILIB, 1, [ ]) + AC_DEFINE(HAVE_MYSQLILIB, 1, [Define to 1 if you have the mysqli extension enabled.]) PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_character_set, [ ],[ AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries.]) diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 index bd76923c0c7d3..43d2614d4baab 100644 --- a/ext/mysqli/config.w32 +++ b/ext/mysqli/config.w32 @@ -23,7 +23,7 @@ if (PHP_MYSQLI != "no") { if (PHP_MYSQLI == "yes" || PHP_MYSQLI == "mysqlnd") { EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'Using MySQL native driver'); - AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); + AC_DEFINE('HAVE_MYSQLILIB', 1, 'Define to 1 if you have the mysqli extension enabled.'); ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); MESSAGE("\tmysqlnd build"); PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h"); @@ -33,7 +33,7 @@ if (PHP_MYSQLI != "no") { "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library'); + AC_DEFINE('HAVE_MYSQLILIB', 1, 'Define to 1 if you have the mysqli extension enabled.'); MESSAGE("\tlibmysql build"); PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h"); } else { diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 89da625e27b0e..ffdff19eb5ccf 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -342,7 +342,7 @@ if test "$PHP_OCI8" != "no"; then PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) PHP_NEW_EXTENSION(oci8, oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c, $ext_shared) - AC_DEFINE(HAVE_OCI8,1,[Defined to 1 if the PHP OCI8 extension for Oracle Database is configured]) + AC_DEFINE(HAVE_OCI8, 1, [Define to 1 if you have the oci8 extension enabled.]) PHP_SUBST_OLD(OCI8_SHARED_LIBADD) PHP_SUBST_OLD(OCI8_DIR) diff --git a/ext/oci8/config.w32 b/ext/oci8/config.w32 index 6ac80aa9865a6..508cca05c8ffe 100644 --- a/ext/oci8/config.w32 +++ b/ext/oci8/config.w32 @@ -47,7 +47,7 @@ if (PHP_OCI8 != "no") { { EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c'); - AC_DEFINE('HAVE_OCI8', 1); + AC_DEFINE('HAVE_OCI8', 1, 'Define to 1 if you have the oci8 extension enabled.'); AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1); } else { diff --git a/ext/openssl/config.w32 b/ext/openssl/config.w32 index 6e5a4e549dc3c..d6d90865e1aea 100644 --- a/ext/openssl/config.w32 +++ b/ext/openssl/config.w32 @@ -7,7 +7,7 @@ if (PHP_OPENSSL != "no") { if (ret > 0) { EXTENSION("openssl", "openssl.c xp_ssl.c"); - AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Have openssl"); + AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Define to 1 if you have the openssl extension enabled."); AC_DEFINE("HAVE_OPENSSL", 1); switch (ret) { diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4 index 9df2469363fa6..df8230818bfd8 100644 --- a/ext/openssl/config0.m4 +++ b/ext/openssl/config0.m4 @@ -32,7 +32,7 @@ if test "$PHP_OPENSSL" != "no"; then PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, [ - AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ]) + AC_DEFINE(HAVE_OPENSSL_EXT, 1, [Define to 1 if you have the openssl extension enabled.]) ], [ AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.]) ]) diff --git a/ext/pcre/config.w32 b/ext/pcre/config.w32 index 86298bbe1bd72..cce11eec5986c 100644 --- a/ext/pcre/config.w32 +++ b/ext/pcre/config.w32 @@ -6,7 +6,7 @@ ADD_SOURCES("ext/pcre/pcre2lib", "pcre2_auto_possess.c pcre2_chartables.c pcre2_ ADD_DEF_FILE("ext\\pcre\\php_pcre.def"); AC_DEFINE('HAVE_BUNDLED_PCRE', 1, 'Using bundled PCRE library'); -AC_DEFINE('HAVE_PCRE', 1, 'Have PCRE library'); +AC_DEFINE('HAVE_PCRE', 1, 'Define to 1 if you have the pcre extension enabled. (deprecated)'); AC_DEFINE('PCRE2_CODE_UNIT_WIDTH', 8, 'Have PCRE library'); AC_DEFINE("PCRE2_STATIC", 1, ""); PHP_PCRE="yes"; diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 714a8d57e8a86..cc446a6b2a97b 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -19,7 +19,7 @@ if test "$PHP_EXTERNAL_PCRE" != "no"; then PHP_EVAL_INCLINE($PCRE2_CFLAGS) PHP_EVAL_LIBLINE($PCRE2_LIBS) AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ]) - AC_DEFINE(HAVE_PCRE, 1, [ ]) + AC_DEFINE(HAVE_PCRE, 1, [Define to 1 if you have the pcre extension enabled. (deprecated)]) if test "$PHP_PCRE_JIT" != "no"; then AC_CACHE_CHECK([for JIT support in PCRE2], ac_cv_have_pcre2_jit, [ diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4 index b6cbc01a5a34a..af4c8dd42aca7 100644 --- a/ext/pdo_dblib/config.m4 +++ b/ext/pdo_dblib/config.m4 @@ -58,7 +58,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then AC_CHECK_LIB(dnet_stub, dnet_addr, [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD) ]) - AC_DEFINE(HAVE_PDO_DBLIB,1,[ ]) + AC_DEFINE(HAVE_PDO_DBLIB, 1, [Define to 1 if you have the pdo_dblib extension enabled.]) PHP_SUBST(PDO_DBLIB_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo) diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index 594e7c220ecf1..6977b910d87d6 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -60,7 +60,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then PHP_CHECK_PDO_INCLUDES - AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ]) + AC_DEFINE(HAVE_PDO_FIREBIRD, 1, [Define to 1 if you have the pdo_firebird extension enabled.]) PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_cv_inc_path) PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) diff --git a/ext/pdo_firebird/config.w32 b/ext/pdo_firebird/config.w32 index 634ac4c8e984c..d0357ffe70cb8 100644 --- a/ext/pdo_firebird/config.w32 +++ b/ext/pdo_firebird/config.w32 @@ -10,6 +10,7 @@ if (PHP_PDO_FIREBIRD != "no") { PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD) ) { + AC_DEFINE("HAVE_PDO_FIREBIRD", 1, "Define to 1 if you have the openssl extension enabled."); EXTENSION("pdo_firebird", "pdo_firebird.c firebird_driver.c firebird_statement.c"); } else { WARNING("pdo_firebird not enabled; libraries and headers not found"); diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4 index 7655357de4f1a..f914519ced735 100644 --- a/ext/pdo_pgsql/config.m4 +++ b/ext/pdo_pgsql/config.m4 @@ -64,7 +64,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then AC_MSG_ERROR([Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS]) fi - AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or not]) + AC_DEFINE(HAVE_PDO_PGSQL, 1, [Define to 1 if you have the pdo_pgsql extension enabled.]) old_LIBS=$LIBS old_LDFLAGS=$LDFLAGS diff --git a/ext/pdo_pgsql/config.w32 b/ext/pdo_pgsql/config.w32 index 478b63ab7083b..bfb0a1298383d 100644 --- a/ext/pdo_pgsql/config.w32 +++ b/ext/pdo_pgsql/config.w32 @@ -14,7 +14,7 @@ if (PHP_PDO_PGSQL != "no") { ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_LO64=1"); } - AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library'); + AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Define to 1 if you have the pdo_pgsql extension enabled.'); ADD_EXTENSION_DEP('pdo_pgsql', 'pdo'); } else { diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32 index 1ad3b74e8c338..dc3ef06614d42 100644 --- a/ext/pdo_sqlite/config.w32 +++ b/ext/pdo_sqlite/config.w32 @@ -7,6 +7,7 @@ if (PHP_PDO_SQLITE != "no") { EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c"); ADD_EXTENSION_DEP('pdo_sqlite', 'pdo'); + AC_DEFINE("HAVE_PDO_SQLITELIB", 1, "Define to 1 if you have the pdo_sqlite extension enabled."); AC_DEFINE("HAVE_SQLITE3_COLUMN_TABLE_NAME", 1, "have sqlite3_column_table_name"); AC_DEFINE("HAVE_SQLITE3_CLOSE_V2", 1, "have sqlite3_close_v2"); } else { diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index 0c5dea37ebc3e..bf3c66207cbf2 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -64,7 +64,7 @@ if test "$PHP_PGSQL" != "no"; then AC_MSG_ERROR([Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS]) fi - AC_DEFINE(HAVE_PGSQL,1,[Whether to build PostgreSQL support or not]) + AC_DEFINE(HAVE_PGSQL, 1, [Define to 1 if you have the pgsql extension enabled.]) old_LIBS=$LIBS old_LDFLAGS=$LDFLAGS LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" diff --git a/ext/pgsql/config.w32 b/ext/pgsql/config.w32 index 6743be18f7397..1a08dd724e278 100644 --- a/ext/pgsql/config.w32 +++ b/ext/pgsql/config.w32 @@ -6,7 +6,7 @@ if (PHP_PGSQL != "no") { if (CHECK_LIB("libpq.lib", "pgsql", PHP_PGSQL) && CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PGSQL", PHP_PGSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PHP_BUILD + "\\include\\libpq;" + PHP_PGSQL)) { EXTENSION("pgsql", "pgsql.c", PHP_PGSQL_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library'); + AC_DEFINE('HAVE_PGSQL', 1, 'Define to 1 if you have the pgsql extension enabled.'); ADD_FLAG("CFLAGS_PGSQL", "/D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS /D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA /D HAVE_PQFTABLE /D HAVE_PQESCAPE_CONN /D HAVE_PQESCAPE_BYTEA_CONN /D HAVE_PQFREEMEM /D HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT /D HAVE_PQPROTOCOLVERSION /D HAVE_PG_LO_CREATE /D HAVE_PG_LO_IMPORT_WITH_OID /D HAVE_PG_LO_TRUNCATE" + (X64 ? " /D HAVE_PG_LO64" : "") + " /D HAVE_PQESCAPELITERAL /D HAVE_PQOIDVALUE"); } else { WARNING("pgsql not enabled; libraries and headers not found"); diff --git a/ext/posix/config.m4 b/ext/posix/config.m4 index e91041188ae73..ab7e29191cfcd 100644 --- a/ext/posix/config.m4 +++ b/ext/posix/config.m4 @@ -5,7 +5,7 @@ PHP_ARG_ENABLE([posix], [yes]) if test "$PHP_POSIX" = "yes"; then - AC_DEFINE(HAVE_POSIX, 1, [whether to include POSIX-like functions]) + AC_DEFINE(HAVE_POSIX, 1, [Define to 1 if you have the posix extension enabled.]) PHP_NEW_EXTENSION(posix, posix.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) AC_CHECK_HEADERS([sys/mkdev.h sys/sysmacros.h]) diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4 index a0212165f6e8f..98acff8060004 100644 --- a/ext/pspell/config.m4 +++ b/ext/pspell/config.m4 @@ -38,5 +38,5 @@ if test "$PHP_PSPELL" != "no"; then PHP_ADD_INCLUDE($PSPELL_INCDIR) PHP_SUBST(PSPELL_SHARED_LIBADD) - AC_DEFINE(HAVE_PSPELL,1,[ ]) + AC_DEFINE(HAVE_PSPELL, 1, [Define to 1 if you have the pspell extension enabled.]) fi diff --git a/ext/pspell/config.w32 b/ext/pspell/config.w32 index d88ea1d30c52f..b71de7a8a1aec 100644 --- a/ext/pspell/config.w32 +++ b/ext/pspell/config.w32 @@ -7,7 +7,7 @@ if (PHP_PSPELL != "no") { if (CHECK_HEADER_ADD_INCLUDE("pspell.h", "CFLAGS_PSPELL", PHP_PHP_BUILD + "\\include\\pspell;" + PHP_PSPELL) && CHECK_LIB("aspell*.lib", "pspell", PHP_PSPELL)) { EXTENSION('pspell', 'pspell.c'); - AC_DEFINE('HAVE_PSPELL', 1); + AC_DEFINE('HAVE_PSPELL', 1, "Define to 1 if you have the pspell extension enabled."); } else { WARNING("pspell not enabled; libraries and headers not found"); } diff --git a/ext/session/config.m4 b/ext/session/config.m4 index 198c94c739cb8..f9f544f39d731 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -19,7 +19,7 @@ if test "$PHP_SESSION" != "no"; then PHP_ADD_EXTENSION_DEP(session, spl) PHP_SUBST(SESSION_SHARED_LIBADD) PHP_INSTALL_HEADERS(ext/session, [php_session.h mod_files.h mod_user.h]) - AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) + AC_DEFINE(HAVE_PHP_SESSION, 1, [Define to 1 if you have the session extension enabled.]) fi if test "$PHP_MM" != "no"; then diff --git a/ext/session/config.w32 b/ext/session/config.w32 index aff34f3c84752..75ff56d23eae5 100644 --- a/ext/session/config.w32 +++ b/ext/session/config.w32 @@ -4,6 +4,6 @@ ARG_ENABLE("session", "session support", "yes"); if (PHP_SESSION == "yes") { EXTENSION("session", "mod_user_class.c session.c mod_files.c mod_mm.c mod_user.c", false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE("HAVE_PHP_SESSION", 1, "Session support"); + AC_DEFINE("HAVE_PHP_SESSION", 1, "Define to 1 if you have the session extension enabled."); PHP_INSTALL_HEADERS("ext/session/", "mod_mm.h php_session.h mod_files.h mod_user.h"); } diff --git a/ext/shmop/config.m4 b/ext/shmop/config.m4 index c5b1f84142ce1..819e71d2d784f 100644 --- a/ext/shmop/config.m4 +++ b/ext/shmop/config.m4 @@ -4,6 +4,6 @@ PHP_ARG_ENABLE([shmop], [Enable shmop support])]) if test "$PHP_SHMOP" != "no"; then - AC_DEFINE(HAVE_SHMOP, 1, [ ]) + AC_DEFINE(HAVE_SHMOP, 1, [Define to 1 if you have the shmop extension enabled.]) PHP_NEW_EXTENSION(shmop, shmop.c, $ext_shared) fi diff --git a/ext/shmop/config.w32 b/ext/shmop/config.w32 index f4b6885e781d5..0c63faf6cfe46 100644 --- a/ext/shmop/config.w32 +++ b/ext/shmop/config.w32 @@ -4,5 +4,5 @@ ARG_ENABLE("shmop", "shmop support", "no"); if (PHP_SHMOP == "yes") { EXTENSION("shmop", "shmop.c"); - AC_DEFINE('HAVE_SHMOP', 1, 'Have SHMOP support'); + AC_DEFINE('HAVE_SHMOP', 1, 'Define to 1 if you have the shmop extension enabled.'); } diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4 index 1acd1898c1cca..c770bb466bf79 100644 --- a/ext/simplexml/config.m4 +++ b/ext/simplexml/config.m4 @@ -11,7 +11,7 @@ if test "$PHP_SIMPLEXML" != "no"; then fi PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [ - AC_DEFINE(HAVE_SIMPLEXML,1,[ ]) + AC_DEFINE(HAVE_SIMPLEXML, 1, [Define to 1 if you have the simplexml extension enabled.]) PHP_NEW_EXTENSION(simplexml, simplexml.c sxe.c, $ext_shared) PHP_INSTALL_HEADERS([ext/simplexml/php_simplexml.h ext/simplexml/php_simplexml_exports.h]) PHP_SUBST(SIMPLEXML_SHARED_LIBADD) diff --git a/ext/simplexml/config.w32 b/ext/simplexml/config.w32 index a95be657384d2..1950b0aa047aa 100644 --- a/ext/simplexml/config.w32 +++ b/ext/simplexml/config.w32 @@ -8,7 +8,7 @@ if (PHP_SIMPLEXML == "yes") { CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_SIMPLEXML", PHP_PHP_BUILD + "\\include\\libxml2") ) { EXTENSION("simplexml", "simplexml.c sxe.c"); - AC_DEFINE("HAVE_SIMPLEXML", 1, "Simple XML support"); + AC_DEFINE("HAVE_SIMPLEXML", 1, "Define to 1 if you have the simplexml extension enabled."); if (!PHP_SIMPLEXML_SHARED) { ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC"); } else { diff --git a/ext/skeleton/config.m4.in b/ext/skeleton/config.m4.in index cc7c6354bb61e..37a9d289996e3 100644 --- a/ext/skeleton/config.m4.in +++ b/ext/skeleton/config.m4.in @@ -88,7 +88,7 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then dnl PHP_SUBST(%EXTNAMECAPS%_SHARED_LIBADD) dnl In case of no dependencies - AC_DEFINE(HAVE_%EXTNAMECAPS%, 1, [ Have %EXTNAME% support ]) + AC_DEFINE(HAVE_%EXTNAMECAPS%, 1, [Define to 1 if you have the %EXTNAME% extension enabled.]) PHP_NEW_EXTENSION(%EXTNAME%, %EXTNAME%.c, $ext_shared) fi diff --git a/ext/skeleton/config.w32.in b/ext/skeleton/config.w32.in index ea5064b7e2e3d..250e94fe0ec1c 100644 --- a/ext/skeleton/config.w32.in +++ b/ext/skeleton/config.w32.in @@ -1,7 +1,7 @@ ARG_ENABLE('%EXTNAME%', '%EXTNAME% support', 'no'); if (PHP_%EXTNAMECAPS% != 'no') { - AC_DEFINE('HAVE_%EXTNAMECAPS%', 1, '%EXTNAME% support enabled'); + AC_DEFINE('HAVE_%EXTNAMECAPS%', 1, 'Define to 1 if you have the %EXTNAME% extension enabled.'); EXTENSION('%EXTNAME%', '%EXTNAME%.c', null, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); } diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index 893edc79dba55..4d8421e56cec9 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -46,7 +46,7 @@ if test "$PHP_SNMP" != "no"; then dnl Test build. PHP_CHECK_LIBRARY($SNMP_LIBNAME, init_snmp, [ - AC_DEFINE(HAVE_SNMP,1,[ ]) + AC_DEFINE(HAVE_SNMP, 1, [Define to 1 if you have the snmp extension enabled.]) ], [ AC_MSG_ERROR([SNMP sanity check failed. Please check config.log for more information.]) ], [ diff --git a/ext/snmp/config.w32 b/ext/snmp/config.w32 index 635ddd593b282..73af92b41e8d5 100644 --- a/ext/snmp/config.w32 +++ b/ext/snmp/config.w32 @@ -7,7 +7,7 @@ if (PHP_SNMP != "no") { SETUP_OPENSSL("snmp", PHP_SNMP) > 0) { if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) { EXTENSION('snmp', 'snmp.c'); - AC_DEFINE('HAVE_SNMP', 1); + AC_DEFINE('HAVE_SNMP', 1, "Define to 1 if you have the snmp extension enabled."); } else { WARNING("snmp not enabled; libraries and headers not found"); } diff --git a/ext/soap/config.m4 b/ext/soap/config.m4 index 8e5fdd4ebcd24..b4150efdfed9c 100644 --- a/ext/soap/config.m4 +++ b/ext/soap/config.m4 @@ -10,7 +10,7 @@ if test "$PHP_SOAP" != "no"; then fi PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [ - AC_DEFINE(HAVE_SOAP,1,[ ]) + AC_DEFINE(HAVE_SOAP, 1, [Define to 1 if you have the soap extension enabled.]) PHP_NEW_EXTENSION(soap, soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(SOAP_SHARED_LIBADD) ]) diff --git a/ext/soap/config.w32 b/ext/soap/config.w32 index 44c69d8acb5aa..6436155b54b53 100644 --- a/ext/soap/config.w32 +++ b/ext/soap/config.w32 @@ -9,7 +9,7 @@ if (PHP_SOAP != "no") { CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_SOAP", PHP_PHP_BUILD + "\\include\\libxml2") ) { EXTENSION('soap', 'soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c', null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support"); + AC_DEFINE('HAVE_SOAP', 1, "Define to 1 if you have the soap extension enabled."); if (!PHP_SOAP_SHARED) { ADD_FLAG('CFLAGS_SOAP', "/D LIBXML_STATIC "); diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4 index b78186ee11ba6..1df31eb66ddce 100644 --- a/ext/sockets/config.m4 +++ b/ext/sockets/config.m4 @@ -6,7 +6,7 @@ PHP_ARG_ENABLE([sockets], if test "$PHP_SOCKETS" != "no"; then AC_CHECK_FUNCS([hstrerror if_nametoindex if_indextoname]) AC_CHECK_HEADERS([netinet/tcp.h sys/un.h sys/sockio.h]) - AC_DEFINE([HAVE_SOCKETS], 1, [ ]) + AC_DEFINE([HAVE_SOCKETS], 1, [Define to 1 if you have the sockets extension enabled.]) dnl Check for fied ss_family in sockaddr_storage (missing in AIX until 5.3) AC_CACHE_CHECK([for field ss_family in struct sockaddr_storage], ac_cv_ss_family, diff --git a/ext/sockets/config.w32 b/ext/sockets/config.w32 index aeb419c4f06ab..c3548ff1b1504 100644 --- a/ext/sockets/config.w32 +++ b/ext/sockets/config.w32 @@ -7,7 +7,7 @@ if (PHP_SOCKETS != "no") { && CHECK_LIB("Iphlpapi.lib", "sockets", PHP_SOCKETS) && CHECK_HEADER_ADD_INCLUDE("winsock.h", "CFLAGS_SOCKETS")) { EXTENSION('sockets', 'sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c', PHP_SOCKETS_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE('HAVE_SOCKETS', 1); + AC_DEFINE('HAVE_SOCKETS', 1, "Define to 1 if you have the sockets extension enabled."); PHP_INSTALL_HEADERS("ext/sockets", "php_sockets.h windows_common.h"); } else { WARNING("sockets not enabled; libraries and headers not found"); diff --git a/ext/sodium/config.m4 b/ext/sodium/config.m4 index 906e0ca7f225a..bc6bb2cb09a6b 100644 --- a/ext/sodium/config.m4 +++ b/ext/sodium/config.m4 @@ -9,7 +9,7 @@ if test "$PHP_SODIUM" != "no"; then PHP_EVAL_INCLINE($LIBSODIUM_CFLAGS) PHP_EVAL_LIBLINE($LIBSODIUM_LIBS, SODIUM_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBSODIUMLIB, 1, [ ]) + AC_DEFINE(HAVE_LIBSODIUMLIB, 1, [Define to 1 if you have the sodium extension enabled.]) PHP_NEW_EXTENSION(sodium, libsodium.c sodium_pwhash.c, $ext_shared) PHP_SUBST(SODIUM_SHARED_LIBADD) diff --git a/ext/sodium/config.w32 b/ext/sodium/config.w32 index 2ff8b998d2d4e..f240743e9b35c 100644 --- a/ext/sodium/config.w32 +++ b/ext/sodium/config.w32 @@ -5,7 +5,7 @@ ARG_WITH("sodium", "for libsodium support", "no"); if (PHP_SODIUM != "no") { if (CHECK_LIB("libsodium.lib", "sodium", PHP_SODIUM) && CHECK_HEADER_ADD_INCLUDE("sodium.h", "CFLAGS_SODIUM")) { EXTENSION("sodium", "libsodium.c sodium_pwhash.c"); - AC_DEFINE('HAVE_LIBSODIUMLIB', 1 , 'Have the Sodium library'); + AC_DEFINE('HAVE_LIBSODIUMLIB', 1 , 'Define to 1 if you have the sodium extension enabled.'); PHP_INSTALL_HEADERS("ext/sodium/", "php_libsodium.h"); } else { WARNING("libsodium not enabled; libraries and headers not found"); diff --git a/ext/sqlite3/config.w32 b/ext/sqlite3/config.w32 index 41eccb5af94ea..03364a106aa6e 100644 --- a/ext/sqlite3/config.w32 +++ b/ext/sqlite3/config.w32 @@ -6,7 +6,7 @@ if (PHP_SQLITE3 != "no") { if (SETUP_SQLITE3("sqlite3", PHP_SQLITE3, PHP_SQLITE3_SHARED)) { EXTENSION("sqlite3", "sqlite3.c", null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support"); + AC_DEFINE("HAVE_SQLITE3", 1, "Define to 1 if you have the sqlite3 extension enabled."); AC_DEFINE("HAVE_SQLITE3_ERRSTR", 1, "have sqlite3_errstr function"); } else { WARNING("sqlite3 not enabled; libraries and/or headers not found"); diff --git a/ext/sysvmsg/config.m4 b/ext/sysvmsg/config.m4 index 7ad70186fa167..7036233e6b42f 100644 --- a/ext/sysvmsg/config.m4 +++ b/ext/sysvmsg/config.m4 @@ -9,6 +9,6 @@ if test "$PHP_SYSVMSG" != "no"; then [AC_MSG_ERROR([Cannot enable System V IPC support, sys/msg.h is missing]) ]) - AC_DEFINE(HAVE_SYSVMSG, 1, [ ]) + AC_DEFINE(HAVE_SYSVMSG, 1, [Define to 1 if you have the sysvmsg extension enabled.]) PHP_NEW_EXTENSION(sysvmsg, sysvmsg.c, $ext_shared) fi diff --git a/ext/sysvsem/config.m4 b/ext/sysvsem/config.m4 index 5cbc06ce9c33c..708b19dc19c15 100644 --- a/ext/sysvsem/config.m4 +++ b/ext/sysvsem/config.m4 @@ -5,7 +5,7 @@ PHP_ARG_ENABLE([sysvsem], if test "$PHP_SYSVSEM" != "no"; then PHP_NEW_EXTENSION(sysvsem, sysvsem.c, $ext_shared) - AC_DEFINE(HAVE_SYSVSEM, 1, [ ]) + AC_DEFINE(HAVE_SYSVSEM, 1, [Define to 1 if you have the sysvsem extension enabled.]) AC_CACHE_CHECK(for union semun,php_cv_semun, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include diff --git a/ext/sysvshm/config.m4 b/ext/sysvshm/config.m4 index bd6e40cca92db..3b75d255580d1 100644 --- a/ext/sysvshm/config.m4 +++ b/ext/sysvshm/config.m4 @@ -4,6 +4,6 @@ PHP_ARG_ENABLE([sysvshm], [Enable the System V shared memory support])]) if test "$PHP_SYSVSHM" != "no"; then - AC_DEFINE(HAVE_SYSVSHM, 1, [ ]) + AC_DEFINE(HAVE_SYSVSHM, 1, [Define to 1 if you have the sysvshm extension enabled.]) PHP_NEW_EXTENSION(sysvshm, sysvshm.c, $ext_shared) fi diff --git a/ext/sysvshm/config.w32 b/ext/sysvshm/config.w32 index 80fb28ee61f43..8644c293de96f 100644 --- a/ext/sysvshm/config.w32 +++ b/ext/sysvshm/config.w32 @@ -3,6 +3,6 @@ ARG_ENABLE('sysvshm', 'SysV Shared Memory support', 'no'); if (PHP_SYSVSHM != 'no') { - AC_DEFINE('HAVE_SYSVSHM', 1); + AC_DEFINE('HAVE_SYSVSHM', 1, "Define to 1 if you have the sysvshm extension enabled."); EXTENSION('sysvshm', 'sysvshm.c'); } diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index dab58787d46bb..3902810e12764 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -68,5 +68,5 @@ if test "$PHP_TIDY" != "no"; then PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(TIDY_SHARED_LIBADD) - AC_DEFINE(HAVE_TIDY,1,[ ]) + AC_DEFINE(HAVE_TIDY, 1, [Define to 1 if you have the tidy extension enabled.]) fi diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index d12302ac5e0e3..6985cf94597f4 100644 --- a/ext/tidy/config.w32 +++ b/ext/tidy/config.w32 @@ -17,7 +17,7 @@ if (PHP_TIDY != "no") { } EXTENSION("tidy", "tidy.c"); - AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library'); + AC_DEFINE('HAVE_TIDY', 1, 'Define to 1 if you have the tidy extension enabled.'); AC_DEFINE('HAVE_TIDY_H', 1, "tidy include header") AC_DEFINE('HAVE_TIDYOPTGETDOC', 1, "tidy_get_opt_doc function") AC_DEFINE('HAVE_TIDYRELEASEDATE', 1, "tidy release date function") diff --git a/ext/tokenizer/config.m4 b/ext/tokenizer/config.m4 index e607fe50fc3e0..016872103b2ef 100644 --- a/ext/tokenizer/config.m4 +++ b/ext/tokenizer/config.m4 @@ -5,6 +5,7 @@ PHP_ARG_ENABLE([tokenizer], [yes]) if test "$PHP_TOKENIZER" != "no"; then + AC_DEFINE(HAVE_TOKENIZER, 1, [Define to 1 if you have the tokenizer extension enabled.]) PHP_NEW_EXTENSION(tokenizer, tokenizer.c tokenizer_data.c, $ext_shared) PHP_ADD_MAKEFILE_FRAGMENT fi diff --git a/ext/tokenizer/config.w32 b/ext/tokenizer/config.w32 index ee98c0cc138a4..99a3dca33e588 100644 --- a/ext/tokenizer/config.w32 +++ b/ext/tokenizer/config.w32 @@ -4,5 +4,5 @@ ARG_ENABLE("tokenizer", "tokenizer support", "yes"); if (PHP_TOKENIZER == "yes") { EXTENSION("tokenizer", "tokenizer.c tokenizer_data.c"); - AC_DEFINE("HAVE_TOKENIZER", 1, "Tokenizer support"); + AC_DEFINE("HAVE_TOKENIZER", 1, "Define to 1 if you have the tokenizer extension enabled."); } diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 208f9e4c160c8..856f0e8bb064c 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -33,5 +33,5 @@ if test "$PHP_XML" != "no"; then PHP_NEW_EXTENSION(xml, xml.c $xml_extra_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(XML_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/xml/]) - AC_DEFINE(HAVE_XML, 1, [ ]) + AC_DEFINE(HAVE_XML, 1, [Define to 1 if you have the xml extension enabled.]) fi diff --git a/ext/xml/config.w32 b/ext/xml/config.w32 index 564f6a43a899e..ea39db14ba530 100644 --- a/ext/xml/config.w32 +++ b/ext/xml/config.w32 @@ -9,7 +9,7 @@ if (PHP_XML == "yes") { CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_XML", PHP_PHP_BUILD + "\\include\\libxml2") ) { EXTENSION("xml", "xml.c compat.c", null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE("HAVE_XML", 1, "XML support"); + AC_DEFINE("HAVE_XML", 1, "Define to 1 if you have the xml extension enabled."); if (!PHP_XML_SHARED) { ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC "); } diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4 index 8777d93ba9cda..05fc070f67611 100644 --- a/ext/xmlreader/config.m4 +++ b/ext/xmlreader/config.m4 @@ -11,7 +11,7 @@ if test "$PHP_XMLREADER" != "no"; then fi PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [ - AC_DEFINE(HAVE_XMLREADER,1,[ ]) + AC_DEFINE(HAVE_XMLREADER, 1, [Define to 1 if you have the xmlreader extension enabled.]) PHP_NEW_EXTENSION(xmlreader, php_xmlreader.c, $ext_shared) PHP_ADD_EXTENSION_DEP(xmlreader, dom, true) PHP_SUBST(XMLREADER_SHARED_LIBADD) diff --git a/ext/xmlreader/config.w32 b/ext/xmlreader/config.w32 index b9ab7dbe030ca..bed94cc249163 100644 --- a/ext/xmlreader/config.w32 +++ b/ext/xmlreader/config.w32 @@ -8,7 +8,7 @@ if (PHP_XMLREADER == "yes" && CHECK_HEADER_ADD_INCLUDE("libxml/tree.h", "CFLAGS_XMLREADER", PHP_PHP_BUILD + "\\include\\libxml2") ) { EXTENSION("xmlreader", "php_xmlreader.c"); - AC_DEFINE("HAVE_XMLREADER", 1, "XMLReader support"); + AC_DEFINE("HAVE_XMLREADER", 1, "Define to 1 if you have the xmlreader extension enabled."); if (!PHP_XMLREADER_SHARED) { ADD_FLAG("CFLAGS_XMLREADER", "/D LIBXML_STATIC"); } diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index c341131297877..4d533dd0b6673 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -21,7 +21,7 @@ if test "$PHP_XMLRPC" != "no"; then PHP_ADD_EXTENSION_DEP(xmlrpc, libxml) PHP_SUBST(XMLRPC_SHARED_LIBADD) - AC_DEFINE(HAVE_XMLRPC,1,[ ]) + AC_DEFINE(HAVE_XMLRPC, 1, [Define to 1 if you have the xmlrpc extension enabled.]) dnl dnl Default to libxml2 if --with-expat is not specified. diff --git a/ext/xmlrpc/config.w32 b/ext/xmlrpc/config.w32 index aeb4b40cab189..36de3139f377d 100644 --- a/ext/xmlrpc/config.w32 +++ b/ext/xmlrpc/config.w32 @@ -12,6 +12,7 @@ if (PHP_XMLRPC != "no") { ADD_SOURCES(configure_module_dirname + "/libxmlrpc", "base64.c simplestring.c xml_to_dandarpc.c \ xmlrpc_introspection.c encodings.c system_methods.c xml_to_xmlrpc.c \ queue.c xml_element.c xmlrpc.c xml_to_soap.c", "xmlrpc"); + AC_DEFINE("HAVE_XMLRPC", 1, "Define to 1 if you have the xmlrpc extension enabled.") AC_DEFINE("HAVE_XMLRPC_BUNDLED", 1); } else { WARNING("xmlrpc support can't be enabled, libraries or headers are missing") diff --git a/ext/xmlwriter/config.m4 b/ext/xmlwriter/config.m4 index a3bce3c6526c1..66fb365e89eb6 100644 --- a/ext/xmlwriter/config.m4 +++ b/ext/xmlwriter/config.m4 @@ -11,7 +11,7 @@ if test "$PHP_XMLWRITER" != "no"; then fi PHP_SETUP_LIBXML(XMLWRITER_SHARED_LIBADD, [ - AC_DEFINE(HAVE_XMLWRITER,1,[ ]) + AC_DEFINE(HAVE_XMLWRITER, 1, [Define to 1 if you have the xmlwriter extension enabled.]) PHP_NEW_EXTENSION(xmlwriter, php_xmlwriter.c, $ext_shared) PHP_SUBST(XMLWRITER_SHARED_LIBADD) ]) diff --git a/ext/xmlwriter/config.w32 b/ext/xmlwriter/config.w32 index 1a787917bfd84..839bfd2e20f20 100644 --- a/ext/xmlwriter/config.w32 +++ b/ext/xmlwriter/config.w32 @@ -5,7 +5,7 @@ ARG_ENABLE("xmlwriter", "XMLWriter support", "yes"); if (PHP_XMLWRITER == "yes" && PHP_LIBXML == "yes") { if (CHECK_HEADER_ADD_INCLUDE('libxml/xmlwriter.h', 'CFLAGS_XMLWRITER', PHP_XMLWRITER + ";" + PHP_PHP_BUILD + "\\include\\libxml2")) { EXTENSION("xmlwriter", "php_xmlwriter.c"); - AC_DEFINE("HAVE_XMLWRITER", 1, "XMLWriter support"); + AC_DEFINE("HAVE_XMLWRITER", 1, "Define to 1 if you have the xmlwriter extension enabled."); if (!PHP_XMLWRITER_SHARED) { ADD_FLAG("CFLAGS_XMLWRITER", "/D LIBXML_STATIC"); } diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4 index 14af536fa7352..316432d9532fd 100644 --- a/ext/xsl/config.m4 +++ b/ext/xsl/config.m4 @@ -25,7 +25,7 @@ if test "$PHP_XSL" != "no"; then AC_DEFINE(HAVE_XSL_EXSLT, 1, [ ]) ], [ ]) - AC_DEFINE(HAVE_XSL,1,[ ]) + AC_DEFINE(HAVE_XSL, 1, [Define to 1 if you have the xsl extension enabled.]) PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared) PHP_SUBST(XSL_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(xsl, libxml) diff --git a/ext/xsl/config.w32 b/ext/xsl/config.w32 index 5425e1bfd1257..9628acf62a4cc 100644 --- a/ext/xsl/config.w32 +++ b/ext/xsl/config.w32 @@ -32,7 +32,7 @@ if (PHP_XSL != "no") { } } EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED); - AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled"); + AC_DEFINE("HAVE_XSL", 1, "Define to 1 if you have the xsl extension enabled."); if (! PHP_XSL_SHARED) { ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS /D LIBXML_STATIC"); } else { diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 0b151b7f2ae32..ec8b58dfe156b 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -26,7 +26,7 @@ if test "$PHP_ZIP" != "no"; then $LIBZIP_LIBS ]) - AC_DEFINE(HAVE_ZIP,1,[ ]) + AC_DEFINE(HAVE_ZIP, 1, [Define to 1 if you have the zip extension enabled.]) PHP_ZIP_SOURCES="php_zip.c zip_stream.c" PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared) diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index 2ac637189c65a..a457fd57ab5f4 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -14,7 +14,7 @@ if (PHP_ZIP != "no") { AC_DEFINE("ZIP_STATIC", 1); } - AC_DEFINE('HAVE_ZIP', 1); + AC_DEFINE('HAVE_ZIP', 1, "Define to 1 if you have the zip extension enabled."); ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION"); } else { WARNING("zip not enabled; libraries and headers not found"); diff --git a/ext/zlib/config.w32 b/ext/zlib/config.w32 index 70bd1a74fab4f..049ee44b936a9 100644 --- a/ext/zlib/config.w32 +++ b/ext/zlib/config.w32 @@ -7,7 +7,7 @@ if (PHP_ZLIB == "yes") { CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)) { EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", PHP_ZLIB_SHARED, "/D ZLIB_EXPORTS /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support"); + AC_DEFINE("HAVE_ZLIB", 1, "Define to 1 if you have the zlib extension enabled."); if (!PHP_ZLIB_SHARED) { ADD_DEF_FILE("ext\\zlib\\php_zlib.def"); diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index 0d60700565601..bd5bcc7f2c72f 100644 --- a/ext/zlib/config0.m4 +++ b/ext/zlib/config0.m4 @@ -9,7 +9,7 @@ if test "$PHP_ZLIB" != "no"; then PHP_EVAL_LIBLINE($ZLIB_LIBS, ZLIB_SHARED_LIBADD) PHP_EVAL_INCLINE($ZLIB_CFLAGS) - AC_DEFINE(HAVE_ZLIB,1,[ ]) + AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have the zlib extension enabled.]) PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(ZLIB_SHARED_LIBADD)