diff options
| author | foobar <sniper@php.net> | 2001-11-30 19:00:13 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-11-30 19:00:13 +0000 |
| commit | f1397d533969095577f9d11005015a1291b16568 (patch) | |
| tree | b2bf7c7cbd6bcda7d16530d137968f9e7c85f71d | |
| parent | e858d27888471107a4816d62033db785fab5f2da (diff) | |
| download | php-git-f1397d533969095577f9d11005015a1291b16568.tar.gz | |
Unified the configure messages.
84 files changed, 255 insertions, 203 deletions
diff --git a/ext/aspell/config.m4 b/ext/aspell/config.m4 index 9955de570f..ee3bc15457 100644 --- a/ext/aspell/config.m4 +++ b/ext/aspell/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl AC_MSG_CHECKING(for ASPELL support) AC_ARG_WITH(aspell, diff --git a/ext/bcmath/config.m4 b/ext/bcmath/config.m4 index ed5677416d..4d6e7bc028 100644 --- a/ext/bcmath/config.m4 +++ b/ext/bcmath/config.m4 @@ -1,6 +1,8 @@ +dnl dnl $Id$ +dnl -PHP_ARG_ENABLE(bcmath, for bc style precision math functions, +PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions, [ --enable-bcmath Enable bc style precision math functions.]) if test "$PHP_BCMATH" != "no"; then @@ -10,7 +12,3 @@ if test "$PHP_BCMATH" != "no"; then LIB_BUILD($ext_builddir/libbcmath,$ext_shared,yes) LIB_BUILD($ext_builddir/libbcmath/src,$ext_shared,yes) fi - -dnl ## Local Variables: -dnl ## tab-width: 4 -dnl ## End: diff --git a/ext/calendar/config.m4 b/ext/calendar/config.m4 index 3fdec44e3a..96c3f96f68 100644 --- a/ext/calendar/config.m4 +++ b/ext/calendar/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl PHP_ARG_ENABLE(calendar,whether to enable calendar conversion support, [ --enable-calendar Enable support for calendar conversion]) diff --git a/ext/ccvs/config.m4 b/ext/ccvs/config.m4 index 480cea070d..fd39e3e136 100644 --- a/ext/ccvs/config.m4 +++ b/ext/ccvs/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for PHP4 CCVS Extension +dnl PHP_ARG_WITH(ccvs, for CCVS support, [ --with-ccvs[=DIR] Include CCVS support]) diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4 index 4d89c5041e..4a0bec453d 100644 --- a/ext/cpdf/config.m4 +++ b/ext/cpdf/config.m4 @@ -1,10 +1,8 @@ dnl $Id$ -AC_MSG_CHECKING(whether to include cpdflib support) +AC_MSG_CHECKING(for cpdflib support) AC_ARG_WITH(cpdflib, -[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2). - DIR is the cpdfllib install directory, - defaults to /usr.], +[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).], [ case $withval in no) diff --git a/ext/crack/config.m4 b/ext/crack/config.m4 index fbcca92946..8e01fcf46b 100644 --- a/ext/crack/config.m4 +++ b/ext/crack/config.m4 @@ -1,6 +1,8 @@ +dnl dnl $Id$ +dnl -PHP_ARG_WITH(crack, whether to include crack support, +PHP_ARG_WITH(crack, for CRACKlib support, [ --with-crack[=DIR] Include crack support.]) if test "$PHP_CRACK" != "no"; then diff --git a/ext/ctype/config.m4 b/ext/ctype/config.m4 index 774047b9b9..ba9ae62e17 100644 --- a/ext/ctype/config.m4 +++ b/ext/ctype/config.m4 @@ -1,18 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension ctype -dnl don't forget to call PHP_EXTENSION(ctype) - -dnl Comments in this file start with the string 'dnl'. -dnl Remove where necessary. This file will not work -dnl without editing. - -dnl If your extension references something external, use with: - -dnl PHP_ARG_WITH(ctype, for ctype support, -dnl Make sure that the comment is aligned: -dnl [ --with-ctype Include ctype support]) - -dnl Otherwise use enable: +dnl PHP_ARG_ENABLE(ctype, whether to enable ctype support, [ --enable-ctype Enable ctype support]) diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index ac7e3c640c..29543baef3 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension CURL +dnl PHP_ARG_WITH(curl, for CURL support, [ --with-curl[=DIR] Include CURL support]) diff --git a/ext/cybercash/config.m4 b/ext/cybercash/config.m4 index 09751671cd..439b7026a0 100644 --- a/ext/cybercash/config.m4 +++ b/ext/cybercash/config.m4 @@ -1,5 +1,6 @@ -dnl config.m4 for extension CyberCash -dnl don't forget to call PHP_EXTENSION(cybercash) +dnl +dnl $Id$ +dnl AC_MSG_CHECKING(for CyberCash support) AC_ARG_WITH(cybercash, diff --git a/ext/cybermut/config.m4 b/ext/cybermut/config.m4 index cf93da9e9f..cfd56c5a38 100644 --- a/ext/cybermut/config.m4 +++ b/ext/cybermut/config.m4 @@ -1,11 +1,10 @@ +dnl dnl $Id$ -dnl config.m4 for extension cybermut - +dnl PHP_ARG_WITH(cybermut, for cybermut support, [ --with-cybermut[=DIR] Include CyberMut (french Credit Mutuel telepaiement)]) - if test "$PHP_CYBERMUT" != "no"; then for i in /usr/local /usr $PHP_CYBERMUT; do if test -r $i/cm-mac.h; then diff --git a/ext/cyrus/config.m4 b/ext/cyrus/config.m4 index 2bf55d5bc6..bab48776bf 100644 --- a/ext/cyrus/config.m4 +++ b/ext/cyrus/config.m4 @@ -1,4 +1,6 @@ -dnl config.m4 for extension cyrus +dnl +dnl $Id$ +dnl PHP_ARG_WITH(cyrus, for cyrus imap support, [ --with-cyrus Include cyrus imap support]) diff --git a/ext/db/config.m4 b/ext/db/config.m4 index a1dae8cb41..5a3de1b567 100644 --- a/ext/db/config.m4 +++ b/ext/db/config.m4 @@ -1,7 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension db -dnl don't forget to call PHP_EXTENSION(db) - +dnl # Checks for libraries. # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order @@ -26,7 +25,7 @@ AC_DEFUN(AC_PREFERRED_DB_LIB,[ ]) -PHP_ARG_WITH(db, whether to include old xDBM support, +PHP_ARG_WITH(db, for xDBM support, [ --with-db Include old xDBM support (deprecated)]) if test "$PHP_DB" != "no"; then diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index f9959a909e..86c7be00fd 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -1,6 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension dba -dnl don't forget to call PHP_EXTENSION(dba) +dnl AC_DEFUN(PHP_TEMP_LDFLAGS,[ old_LDFLAGS=$LDFLAGS diff --git a/ext/dbase/config.m4 b/ext/dbase/config.m4 index 7a33750b90..2c65e18559 100644 --- a/ext/dbase/config.m4 +++ b/ext/dbase/config.m4 @@ -1,8 +1,10 @@ +dnl dnl $Id$ +dnl AC_ARG_WITH(dbase,[],[enable_dbase=$withval]) -PHP_ARG_ENABLE(dbase,whether to enable the bundled dbase library, +PHP_ARG_ENABLE(dbase,whether to enable dbase support, [ --enable-dbase Enable the bundled dbase library]) if test "$PHP_DBASE" = "yes"; then diff --git a/ext/dbplus/config.m4 b/ext/dbplus/config.m4 index 7a4f4e8a76..3232ff2000 100644 --- a/ext/dbplus/config.m4 +++ b/ext/dbplus/config.m4 @@ -1,6 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension dbplus - +dnl PHP_ARG_WITH(dbplus, for dbplus support, [ --with-dbplus Include dbplus support]) diff --git a/ext/dbx/config.m4 b/ext/dbx/config.m4 index 5cf4885c7d..19fbbda70f 100644 --- a/ext/dbx/config.m4 +++ b/ext/dbx/config.m4 @@ -1,3 +1,6 @@ +dnl +dnl $Id$ +dnl PHP_ARG_ENABLE(dbx,whether to enable dbx support, [ --enable-dbx Enable dbx]) diff --git a/ext/dio/config.m4 b/ext/dio/config.m4 index 4ad2cf6522..0250462e78 100644 --- a/ext/dio/config.m4 +++ b/ext/dio/config.m4 @@ -1,5 +1,9 @@ -PHP_ARG_ENABLE(dio, whether to enable dio support, -[ --enable-dio Enable dio support]) +dnl +dnl $Id$ +dnl + +PHP_ARG_ENABLE(dio, whether to enable direct I/O support, +[ --enable-dio Enable direct I/O support]) if test "$PHP_DIO" != "no"; then PHP_EXTENSION(dio, $ext_shared) diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4 index 1c0a8791c3..9004c3b8a6 100644 --- a/ext/domxml/config.m4 +++ b/ext/domxml/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension domxml +dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ old_CPPFLAGS=$CPPFLAGS @@ -20,8 +21,7 @@ AC_DEFUN(PHP_DOM_CHECK_VERSION,[ PHP_ARG_WITH(dom, for DOM support, [ --with-dom[=DIR] Include DOM support (requires libxml >= 2.4.2). - DIR is the libxml install directory, - defaults to /usr.]) + DIR is the libxml install directory.]) if test "$PHP_DOM" != "no"; then diff --git a/ext/exif/config.m4 b/ext/exif/config.m4 index 53dabb6bd8..128d74be73 100644 --- a/ext/exif/config.m4 +++ b/ext/exif/config.m4 @@ -1,9 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension exif +dnl -PHP_ARG_ENABLE(exif, whether to enable exif support, -dnl Make sure that the comment is aligned: -[ --enable-exif Enable exif support]) +PHP_ARG_ENABLE(exif, whether to enable EXIF support, +[ --enable-exif Enable EXIF support]) if test "$PHP_EXIF" != "no"; then AC_DEFINE(HAVE_EXIF, 1, [Whether you want exif support]) diff --git a/ext/fbsql/config.m4 b/ext/fbsql/config.m4 index a683dbc001..c2559e7d6c 100644 --- a/ext/fbsql/config.m4 +++ b/ext/fbsql/config.m4 @@ -1,8 +1,9 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(fbsql, for FrontBase SQL92 (fbsql) support, -[ --with-fbsql[=DIR] Include FrontBase support. DIR is the FrontBase base - directory.]) +[ --with-fbsql[=DIR] Include FrontBase support. DIR is the FrontBase base directory.]) if test "$PHP_FBSQL" != "no"; then diff --git a/ext/fdf/config.m4 b/ext/fdf/config.m4 index b6569b6697..b05770eeb6 100644 --- a/ext/fdf/config.m4 +++ b/ext/fdf/config.m4 @@ -1,7 +1,9 @@ +dnl dnl $Id$ +dnl -PHP_ARG_WITH(fdftk, for fdftk support, -[ --with-fdftk[=DIR] Include fdftk support]) +PHP_ARG_WITH(fdftk, for FDF support, +[ --with-fdftk[=DIR] Include FDF support.]) if test "$PHP_FDFTK" != "no"; then @@ -12,7 +14,7 @@ if test "$PHP_FDFTK" != "no"; then done if test -z "$FDFTK_DIR"; then - AC_MSG_ERROR(FdfTk.h or fdftk.h not found. Please reinstall the fdftk distribution) + AC_MSG_ERROR(FdfTk.h or fdftk.h not found. Please reinstall the fdftk distribution.) fi PHP_ADD_INCLUDE($FDFTK_DIR/include) diff --git a/ext/filepro/config.m4 b/ext/filepro/config.m4 index 314fbd1aaf..8d7fb49e20 100644 --- a/ext/filepro/config.m4 +++ b/ext/filepro/config.m4 @@ -1,9 +1,11 @@ +dnl dnl $Id$ +dnl AC_ARG_WITH(filepro,[],[enable_filepro=$withval]) PHP_ARG_ENABLE(filepro,whether to enable the bundled filePro support, -[ --enable-filepro Enable the bundled read-only filePro support]) +[ --enable-filepro Enable the bundled read-only filePro support.]) if test "$PHP_FILEPRO" = "yes"; then AC_DEFINE(HAVE_FILEPRO, 1, [ ]) diff --git a/ext/fribidi/config.m4 b/ext/fribidi/config.m4 index 511ecacefa..381e800a25 100644 --- a/ext/fribidi/config.m4 +++ b/ext/fribidi/config.m4 @@ -1,10 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension fribidi +dnl -PHP_ARG_WITH(fribidi, whether to add fribidi support, -[ --with-fribidi[=DIR] Include fribidi support (requires FriBidi >=0.1.12). - DIR is the fribidi installation directory - - default /usr/local/]) +PHP_ARG_WITH(fribidi, for FriBidi support, +[ --with-fribidi[=DIR] Include fribidi support (requires FriBidi >=0.1.12).]) if test "$PHP_FRIBIDI" != "no"; then diff --git a/ext/ftp/config.m4 b/ext/ftp/config.m4 index 5060ea5a85..d93860e6e6 100644 --- a/ext/ftp/config.m4 +++ b/ext/ftp/config.m4 @@ -1,6 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension ftp -dnl don't forget to call PHP_EXTENSION(ftp) +dnl PHP_ARG_ENABLE(ftp,whether to enable FTP support, [ --enable-ftp Enable FTP support]) diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 218c7dcdac..58b101c291 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -91,7 +91,7 @@ AC_DEFUN(PHP_GD_XPM,[ ]) AC_DEFUN(PHP_GD_FREETYPE1,[ - PHP_ARG_WITH(ttf,whether to include include FreeType 1.x support, + PHP_ARG_WITH(ttf,for FreeType 1.x support, [ --with-ttf[=DIR] GD: Include FreeType 1.x support]) if test "$PHP_TTF" != "no"; then @@ -148,7 +148,7 @@ AC_DEFUN(PHP_GD_FREETYPE2,[ ]) AC_DEFUN(PHP_GD_T1LIB,[ - PHP_ARG_WITH(t1lib, whether to include T1lib support, + PHP_ARG_WITH(t1lib, for T1lib support, [ --with-t1lib[=DIR] GD: Include T1lib support.]) if test "$PHP_T1LIB" != "no"; then @@ -175,8 +175,8 @@ AC_DEFUN(PHP_GD_T1LIB,[ ]) AC_DEFUN(PHP_GD_TTSTR,[ - PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in gd, - [ --enable-gd-native-ttf GD: Enable TrueType string function in gd]) + PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in GD, + [ --enable-gd-native-ttf GD: Enable TrueType string function.]) if test "$PHP_GD_NATIVE_TTF" = "yes"; then AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) @@ -205,10 +205,8 @@ AC_DEFUN(PHP_GD_CHECK_VERSION,[ ]) -PHP_ARG_WITH(gd, whether to include GD support, -[ --with-gd[=DIR] Include GD support (DIR is GD's install dir). - Set DIR to "shared" to build as a dl, or - "shared,DIR" to build as a dl and still specify DIR.]) +PHP_ARG_WITH(gd, for GD support, +[ --with-gd[=DIR] Include GD support (DIR is GD's install dir).]) if test "$PHP_GD" != "no"; then diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index 91df7ff26e..d5d4578938 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -1,10 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension gettext -dnl don't forget to call PHP_EXTENSION(gettext) +dnl -PHP_ARG_WITH(gettext,whether to include GNU gettext support, -[ --with-gettext[=DIR] Include GNU gettext support. DIR is the gettext - install directory, defaults to /usr/local]) +PHP_ARG_WITH(gettext,for GNU gettext support, +[ --with-gettext[=DIR] Include GNU gettext support.]) if test "$PHP_GETTEXT" != "no"; then for i in /usr /usr/local $PHP_GETTEXT; do diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4 index 0a0848f397..2d32dd741e 100644 --- a/ext/gmp/config.m4 +++ b/ext/gmp/config.m4 @@ -1,11 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension gmp +dnl -dnl If your extension references something external, use with: - -PHP_ARG_WITH(gmp, for gmp support, -dnl Make sure that the comment is aligned: -[ --with-gmp Include gmp support]) +PHP_ARG_WITH(gmp, for GNU MP support, +[ --with-gmp Include GNU MP support]) if test "$PHP_GMP" != "no"; then diff --git a/ext/hyperwave/config.m4 b/ext/hyperwave/config.m4 index 2044a162f2..45391481bc 100644 --- a/ext/hyperwave/config.m4 +++ b/ext/hyperwave/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl AC_MSG_CHECKING(for Hyperwave support) AC_ARG_WITH(hyperwave, diff --git a/ext/icap/config.m4 b/ext/icap/config.m4 index 829677a3de..66db534c0f 100644 --- a/ext/icap/config.m4 +++ b/ext/icap/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(icap,for ICAP support, [ --with-icap[=DIR] Include ICAP support.]) diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 index 39aa64135b..632bfb8150 100644 --- a/ext/iconv/config.m4 +++ b/ext/iconv/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension iconv +dnl PHP_ARG_WITH(iconv, for iconv support, [ --with-iconv[=DIR] Include iconv support]) diff --git a/ext/informix/config.m4 b/ext/informix/config.m4 index dcd02d6dc7..5e5ea3b004 100644 --- a/ext/informix/config.m4 +++ b/ext/informix/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(informix,for Informix support, [ --with-informix[=DIR] Include Informix support. DIR is the Informix base diff --git a/ext/ingres_ii/config.m4 b/ext/ingres_ii/config.m4 index 6d28c51ae6..40228d6359 100644 --- a/ext/ingres_ii/config.m4 +++ b/ext/ingres_ii/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension ingres_ii +dnl PHP_ARG_WITH(ingres, for Ingres II support, [ --with-ingres[=DIR] Include Ingres II support. DIR is the Ingres diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4 index f7a4f03a7c..8a5997c901 100644 --- a/ext/interbase/config.m4 +++ b/ext/interbase/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(interbase,for InterBase support, [ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base diff --git a/ext/java/config.m4 b/ext/java/config.m4 index 01929ca586..9fe8e75437 100644 --- a/ext/java/config.m4 +++ b/ext/java/config.m4 @@ -1,11 +1,11 @@ -# $Id$ -# config.m4 for extension java +dnl +dnl $Id$ +dnl AC_MSG_CHECKING(for Java support) AC_ARG_WITH(java, -[ --with-java[=DIR] Include Java support. DIR is the base install - directory for the JDK. This extension can only - be built as a shared dl.], +[ --with-java[=DIR] Include Java support. DIR is the JDK base install directory. + This extension is always built as shared.], [ if test "$withval" != "no"; then JAVA_SHARED=libphp_java.la diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 5274551399..a7ad785392 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl AC_DEFUN(PHP_LDAP_CHECKS, [ if test -f $1/include/ldap.h; then @@ -15,10 +17,9 @@ AC_DEFUN(PHP_LDAP_CHECKS, [ LDAP_LIBDIR=$1/lib fi ]) - -PHP_ARG_WITH(ldap,whether to include LDAP support, -[ --with-ldap[=DIR] Include LDAP support. DIR is the LDAP base - install directory.]) + +PHP_ARG_WITH(ldap,for LDAP support, +[ --with-ldap[=DIR] Include LDAP support.]) if test "$PHP_LDAP" != "no"; then diff --git a/ext/mailparse/config.m4 b/ext/mailparse/config.m4 index 0e0cb2a1d7..29809d9ffd 100644 --- a/ext/mailparse/config.m4 +++ b/ext/mailparse/config.m4 @@ -1,8 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension mailparse +dnl PHP_ARG_ENABLE(mailparse, whether to enable mailparse support, -[ --enable-mailparse Enable mailparse support]) +[ --enable-mailparse Enable mailparse support.]) if test "$PHP_MAILPARSE" != "no"; then if test "$ext_shared" != "yes" && test "$enable_mbstring" != "yes"; then diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index 1718a91464..b655530436 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension mbstring +dnl PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support, [ --enable-mbstring Enable multibyte string support]) @@ -11,7 +12,8 @@ fi AC_MSG_CHECKING(whether to enable japanese encoding translation) AC_ARG_ENABLE(mbstr_enc_trans, -[ --enable-mbstr-enc-trans Enable japanese encoding translation],[ +[ --enable-mbstr-enc-trans + Enable japanese encoding translation],[ if test "$enableval" = "yes" ; then AC_DEFINE(MBSTR_ENC_TRANS, 1, [ ]) AC_MSG_RESULT(yes) diff --git a/ext/mcal/config.m4 b/ext/mcal/config.m4 index 6a6e6eea85..58e1b06035 100644 --- a/ext/mcal/config.m4 +++ b/ext/mcal/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(mcal,for MCAL support, [ --with-mcal[=DIR] Include MCAL support.]) diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4 index 5f6c206a94..091dc32efb 100644 --- a/ext/mcrypt/config.m4 +++ b/ext/mcrypt/config.m4 @@ -3,8 +3,7 @@ dnl $Id$ dnl PHP_ARG_WITH(mcrypt, for mcrypt support, -[ --with-mcrypt[=DIR] Include mcrypt support. DIR is the mcrypt install - directory.]) +[ --with-mcrypt[=DIR] Include mcrypt support.]) if test "$PHP_MCRYPT" != "no"; then for i in /usr/local /usr $PHP_MCRYPT; do diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4 index bd99ebb52f..f8cda29d57 100644 --- a/ext/mhash/config.m4 +++ b/ext/mhash/config.m4 @@ -1,10 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension mhash -dnl don't forget to call PHP_EXTENSION(mhash) +dnl PHP_ARG_WITH(mhash, for mhash support, -[ --with-mhash[=DIR] Include mhash support. DIR is the mhash - install directory.]) +[ --with-mhash[=DIR] Include mhash support.]) if test "$PHP_MHASH" != "no"; then for i in /usr/local /usr /opt/mhash $PHP_MHASH; do diff --git a/ext/ming/config.m4 b/ext/ming/config.m4 index 1a6f05cf59..b7452eaf62 100644 --- a/ext/ming/config.m4 +++ b/ext/ming/config.m4 @@ -1,8 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension libming +dnl -PHP_ARG_WITH(ming, whether to include ming support, -[ --with-ming[=DIR] Include ming support]) +PHP_ARG_WITH(ming, for MING support, +[ --with-ming[=DIR] Include MING support]) if test "$PHP_MING" != "no"; then for i in $PHP_MING /usr/local /usr; do diff --git a/ext/mnogosearch/config.m4 b/ext/mnogosearch/config.m4 index 07df218739..6b9619fdf3 100644 --- a/ext/mnogosearch/config.m4 +++ b/ext/mnogosearch/config.m4 @@ -1,5 +1,7 @@ +dnl dnl $Source$ dnl $Id$ +dnl PHP_ARG_WITH(mnogosearch,for mnoGoSearch support, [ --with-mnogosearch[=DIR] diff --git a/ext/msession/config.m4 b/ext/msession/config.m4 index c9953dccfb..55a00a7b6c 100644 --- a/ext/msession/config.m4 +++ b/ext/msession/config.m4 @@ -1,3 +1,6 @@ +dnl +dnl $Id$ +dnl PHP_ARG_WITH(msession, for msession support, [ --with-msession[=DIR] Include msession support]) diff --git a/ext/msql/config.m4 b/ext/msql/config.m4 index 523ec15e30..e51d91602b 100644 --- a/ext/msql/config.m4 +++ b/ext/msql/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl dnl dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined. diff --git a/ext/muscat/config.m4 b/ext/muscat/config.m4 index b9c680d994..5dd3971132 100644 --- a/ext/muscat/config.m4 +++ b/ext/muscat/config.m4 @@ -1,7 +1,9 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(muscat, for Muscat support, -[ --with-muscat[=DIR] Include muscat support.]) +[ --with-muscat[=DIR] Include Muscat support.]) if test "$PHP_MUSCAT" != "no"; then PHP_EXTENSION(muscat, $ext_shared) diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 15ed5d5bc8..5f1e268c9e 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) @@ -34,9 +36,8 @@ AC_DEFUN(PHP_MYSQL_SOCK,[ ]) PHP_ARG_WITH(mysql, for MySQL support, -[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base - directory. If unspecified, the bundled MySQL library - will be used.], yes) +[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. + If unspecified, the bundled MySQL library will be used.], yes) if test "$PHP_MYSQL" != "no"; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) diff --git a/ext/ncurses/config.m4 b/ext/ncurses/config.m4 index 2d4487b66d..c4917990cc 100644 --- a/ext/ncurses/config.m4 +++ b/ext/ncurses/config.m4 @@ -1,8 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension ncurses +dnl PHP_ARG_WITH(ncurses, for ncurses support, -[ --with-ncurses[=DIR] Include ncurses support]) +[ --with-ncurses[=DIR] Include ncurses support.]) if test "$PHP_NCURSES" != "no"; then # --with-ncurses -> check with-path diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 5473d1f723..d831b58881 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index aa2ea74b55..3a9df764e8 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl dnl dnl Figure out which library file to link with for the Solid support. diff --git a/ext/openssl/config.m4 b/ext/openssl/config.m4 index cc8421111c..73357a9a5f 100644 --- a/ext/openssl/config.m4 +++ b/ext/openssl/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension OpenSSL +dnl if test "$OPENSSL_DIR"; then PHP_EXTENSION(openssl, $ext_shared) diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4 index d6eab7b28f..58a3795fd6 100644 --- a/ext/oracle/config.m4 +++ b/ext/oracle/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) diff --git a/ext/overload/config.m4 b/ext/overload/config.m4 index 073d2c1902..7cf69f40fb 100644 --- a/ext/overload/config.m4 +++ b/ext/overload/config.m4 @@ -1,8 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension overload +dnl -PHP_ARG_ENABLE(overload,for user-space object overloading support, -[ --enable-overload Enable user-space object overloading support]) +PHP_ARG_ENABLE(overload,whether to enable user-space object overloading support, +[ --enable-overload Enable user-space object overloading support.]) if test "$PHP_OVERLOAD" != "no"; then AC_DEFINE(HAVE_OVERLOAD, 1, [ ]) diff --git a/ext/ovrimos/config.m4 b/ext/ovrimos/config.m4 index f495e14a5f..d57a66e5af 100644 --- a/ext/ovrimos/config.m4 +++ b/ext/ovrimos/config.m4 @@ -1,10 +1,10 @@ +dnl dnl $Id$ -dnl config.m4 for extension ovrimos -dnl don't forget to call PHP_EXTENSION(ovrimos) +dnl PHP_ARG_WITH(ovrimos, for Ovrimos SQL Server support, [ --with-ovrimos[=DIR] Include Ovrimos SQL Server support. DIR is the - Ovrimos' libsqlcli install directory.]) + Ovrimos libsqlcli install directory.]) if test "$PHP_OVRIMOS" != "no"; then for i in /usr/local /usr $PHP_OVRIMOS; do diff --git a/ext/pcntl/config.m4 b/ext/pcntl/config.m4 index fc0c4956ea..516b544f12 100644 --- a/ext/pcntl/config.m4 +++ b/ext/pcntl/config.m4 @@ -1,8 +1,10 @@ +dnl dnl $Id$ -dnl config.m4 for extension pcntl +dnl dnl Process Control (pcntl) extentsion --EXPERIMENTAL-- dnl TODO - Add platform checks + PHP_ARG_ENABLE(pcntl, whether to enable pcntl support, [ --enable-pcntl Enable experimental pcntl support (CGI ONLY!)]) diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4 index b903b19c42..cf973fe052 100644 --- a/ext/pcre/config.m4 +++ b/ext/pcre/config.m4 @@ -1,10 +1,11 @@ +dnl dnl $Id$ -dnl config.m4 for extension pcre +dnl dnl By default we'll compile and link against the bundled PCRE library dnl if DIR is supplied, we'll use that for linking -PHP_ARG_WITH(pcre-regex,whether to include PCRE support, +PHP_ARG_WITH(pcre-regex,for PCRE support, [ --without-pcre-regex Do not include Perl Compatible Regular Expressions support. Use --with-pcre-regex=DIR to specify DIR where PCRE's include and library files are located, @@ -57,5 +58,4 @@ if test "$PHP_PCRE_REGEX" != "no"; then fi PHP_SUBST(PCRE_SHARED_LIBADD) - AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1, [ ])]) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index b903b19c42..cf973fe052 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -1,10 +1,11 @@ +dnl dnl $Id$ -dnl config.m4 for extension pcre +dnl dnl By default we'll compile and link against the bundled PCRE library dnl if DIR is supplied, we'll use that for linking -PHP_ARG_WITH(pcre-regex,whether to include PCRE support, +PHP_ARG_WITH(pcre-regex,for PCRE support, [ --without-pcre-regex Do not include Perl Compatible Regular Expressions support. Use --with-pcre-regex=DIR to specify DIR where PCRE's include and library files are located, @@ -57,5 +58,4 @@ if test "$PHP_PCRE_REGEX" != "no"; then fi PHP_SUBST(PCRE_SHARED_LIBADD) - AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1, [ ])]) diff --git a/ext/pfpro/config.m4 b/ext/pfpro/config.m4 index fac40cdca9..9d25a0a34e 100644 --- a/ext/pfpro/config.m4 +++ b/ext/pfpro/config.m4 @@ -1,8 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension pfpro +dnl -PHP_ARG_WITH(pfpro, whether to include Verisign Payflow Pro support, -[ --with-pfpro[=DIR] Include Verisign Payflow Pro support]) +PHP_ARG_WITH(pfpro, for Verisign Payflow Pro support, +[ --with-pfpro[=DIR] Include Verisign Payflow Pro support.]) if test "$PHP_PFPRO" != "no"; then PFPRO_LIB=libpfpro.so diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index 46a4d95303..7ad7643cfc 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -1,12 +1,12 @@ +dnl dnl $Id$ +dnl AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; PGSQL_INCDIR=$i$1]) PHP_ARG_WITH(pgsql,for PostgreSQL support, [ --with-pgsql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL - base install directory, defaults to /usr/local/pgsql. - Set DIR to "shared" to build as a dl, or "shared,DIR" - to build as a dl and still specify DIR.]) + base install directory, defaults to /usr/local/pgsql.]) if test "$PHP_PGSQL" != "no"; then PHP_EXPAND_PATH($PHP_PGSQL, PHP_PGSQL) @@ -40,7 +40,7 @@ if test "$PHP_PGSQL" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD) PHP_EXTENSION(pgsql,$ext_shared) + PHP_SUBST(PGSQL_SHARED_LIBADD) + PHP_SUBST(PGSQL_INCLUDE) fi -PHP_SUBST(PGSQL_INCLUDE) -PHP_SUBST(PGSQL_SHARED_LIBADD) diff --git a/ext/posix/config.m4 b/ext/posix/config.m4 index f7d71afb18..41d98b5170 100644 --- a/ext/posix/config.m4 +++ b/ext/posix/config.m4 @@ -1,8 +1,8 @@ +dnl dnl $Id$ -dnl config.m4 for extension posix -dnl don't forget to call PHP_EXTENSION(posix) +dnl -PHP_ARG_ENABLE(posix,whether to include POSIX-like functions, +PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions, [ --disable-posix Disable POSIX-like functions], yes) if test "$PHP_POSIX" = "yes"; then diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4 index af3d2abe0b..046f539307 100644 --- a/ext/pspell/config.m4 +++ b/ext/pspell/config.m4 @@ -1,6 +1,8 @@ +dnl dnl $Id$ +dnl -PHP_ARG_WITH(pspell,whether to include pspell support, +PHP_ARG_WITH(pspell,for PSPELL support, [ --with-pspell[=DIR] Include PSPELL support.]) if test "$PHP_PSPELL" != "no"; then diff --git a/ext/qtdom/config.m4 b/ext/qtdom/config.m4 index af54cc1176..982a298a6f 100644 --- a/ext/qtdom/config.m4 +++ b/ext/qtdom/config.m4 @@ -1,6 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension qtdom -dnl don't forget to call PHP_EXTENSION(qtdom) +dnl AC_MSG_CHECKING(whether to include QDOM support) AC_ARG_WITH(qtdom, diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index ba136d2a8e..af75b5c636 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -1,13 +1,12 @@ +dnl dnl $Id$ -dnl config.m4 for extension readline -dnl don't forget to call PHP_EXTENSION(readline) +dnl PHP_ARG_WITH(libedit,for libedit readline replacement, [ --with-libedit[=DIR] Include libedit readline replacement.]) PHP_ARG_WITH(readline,for readline support, -[ --with-readline[=DIR] Include readline support. DIR is the readline - install directory.]) +[ --with-readline[=DIR] Include readline support.]) if test "$PHP_READLINE" != "no" -o "$PHP_LIBEDIT" != "no"; then if test "$PHP_SAPI" != "cgi"; then @@ -64,4 +63,4 @@ if test "$PHP_LIBEDIT" != "no"; then AC_DEFINE(HAVE_LIBEDIT, 1, [ ]) PHP_EXTENSION(readline, $ext_shared) -fi
\ No newline at end of file +fi diff --git a/ext/recode/config.m4 b/ext/recode/config.m4 index 848762338d..6723d807e7 100644 --- a/ext/recode/config.m4 +++ b/ext/recode/config.m4 @@ -1,11 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension recode -dnl don't forget to call PHP_EXTENSION(recode) - +dnl PHP_ARG_WITH(recode,for recode support, -[ --with-recode[=DIR] Include recode support. DIR is the recode install - directory.]) +[ --with-recode[=DIR] Include recode support.]) if test "$PHP_RECODE" != "no"; then RECODE_LIST="$PHP_RECODE /usr /usr/local /opt" diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4 index 01929ca586..9fe8e75437 100644 --- a/ext/rpc/java/config.m4 +++ b/ext/rpc/java/config.m4 @@ -1,11 +1,11 @@ -# $Id$ -# config.m4 for extension java +dnl +dnl $Id$ +dnl AC_MSG_CHECKING(for Java support) AC_ARG_WITH(java, -[ --with-java[=DIR] Include Java support. DIR is the base install - directory for the JDK. This extension can only - be built as a shared dl.], +[ --with-java[=DIR] Include Java support. DIR is the JDK base install directory. + This extension is always built as shared.], [ if test "$withval" != "no"; then JAVA_SHARED=libphp_java.la diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4 index fa938be26a..9b097297a3 100644 --- a/ext/rpc/xmlrpc/config.m4 +++ b/ext/rpc/xmlrpc/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension Xmlrpc +dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) sinclude(ext/xmlrpc/libxmlrpc/xmlrpc.m4) @@ -7,10 +8,10 @@ sinclude(libxmlrpc/acinclude.m4) sinclude(libxmlrpc/xmlrpc.m4) PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support, -[ --with-xmlrpc[=DIR] Include XMLRPC-EPI support]) +[ --with-xmlrpc[=DIR] Include XMLRPC-EPI support.]) PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI, -[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI]) +[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI.]) if test "$PHP_XMLRPC" != "no"; then diff --git a/ext/satellite/config.m4 b/ext/satellite/config.m4 index 23e7c95aa3..779ca59640 100644 --- a/ext/satellite/config.m4 +++ b/ext/satellite/config.m4 @@ -1,10 +1,9 @@ +dnl dnl $Id$ +dnl dnl vim: syntax=config -dnl My first config.m4 - now much improved... :-) - -PHP_ARG_WITH(satellite, whether to enable CORBA support via Satellite, -dnl Make sure that the comment is aligned: +PHP_ARG_WITH(satellite, for CORBA support via Satellite, [ --with-satellite[=DIR] Enable CORBA support via Satellite (EXPERIMENTIAL) DIR is the base directory for ORBit]) diff --git a/ext/session/config.m4 b/ext/session/config.m4 index 5366c4fec0..bf3f3b8105 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -1,11 +1,13 @@ +dnl dnl $Id$ +dnl + +PHP_ARG_ENABLE(session, whether to enable PHP sessions, +[ --disable-session Disable session support], yes) PHP_ARG_WITH(mm,for mm support, [ --with-mm[=DIR] Include mm support for session storage]) -PHP_ARG_ENABLE(session, whether to enable session support, -[ --disable-session Disable session support], yes) - if test "$PHP_MM" != "no"; then for i in /usr/local /usr $PHP_MM; do if test -f "$i/include/mm.h"; then diff --git a/ext/shmop/config.m4 b/ext/shmop/config.m4 index 1a9ca6adad..e3044af35e 100644 --- a/ext/shmop/config.m4 +++ b/ext/shmop/config.m4 @@ -1,4 +1,7 @@ +dnl dnl $Id$ +dnl + PHP_ARG_ENABLE(shmop, whether to enable shmop support, [ --enable-shmop Enable shmop support]) diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index b941b86011..6f24e5a2e7 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -3,11 +3,7 @@ dnl $Id$ dnl PHP_ARG_WITH(snmp,for SNMP support, -[ --with-snmp[=DIR] Include SNMP support. DIR is the SNMP base - install directory, defaults to searching through - a number of common locations for the snmp install. - Set DIR to "shared" to build as a dl, or "shared,DIR" - to build as a dl and still specify DIR.]) +[ --with-snmp[=DIR] Include SNMP support.]) if test "$PHP_SNMP" != "no"; then diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4 index af99809231..10cdae1229 100644 --- a/ext/sockets/config.m4 +++ b/ext/sockets/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension sockets +dnl PHP_ARG_ENABLE(sockets, whether to enable sockets support, [ --enable-sockets Enable sockets support]) diff --git a/ext/swf/config.m4 b/ext/swf/config.m4 index b05221bb60..2815b18e7b 100644 --- a/ext/swf/config.m4 +++ b/ext/swf/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension libswf +dnl PHP_ARG_WITH(swf, for libswf support, [ --with-swf[=DIR] Include swf support]) diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4 index 60b55eca74..a029bdb743 100644 --- a/ext/sybase/config.m4 +++ b/ext/sybase/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(sybase,for Sybase support, [ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4 index 10a51041a3..81233ace39 100644 --- a/ext/sybase_ct/config.m4 +++ b/ext/sybase_ct/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(sybase-ct, for Sybase-CT support, [ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home diff --git a/ext/sysvsem/config.m4 b/ext/sysvsem/config.m4 index 48ebc3f31d..7900565361 100644 --- a/ext/sysvsem/config.m4 +++ b/ext/sysvsem/config.m4 @@ -1,4 +1,6 @@ +dnl dnl $Id$ +dnl PHP_ARG_ENABLE(sysvsem,whether to enable System V semaphore support, [ --enable-sysvsem Enable System V semaphore support.]) diff --git a/ext/sysvshm/config.m4 b/ext/sysvshm/config.m4 index 4d36ea474c..6a20c79c93 100644 --- a/ext/sysvshm/config.m4 +++ b/ext/sysvshm/config.m4 @@ -1,7 +1,9 @@ +dnl dnl $Id$ +dnl PHP_ARG_ENABLE(sysvshm,whether to enable System V shared memory support, -[ --enable-sysvshm Enable the System V shared memory support]) +[ --enable-sysvshm Enable the System V shared memory support.]) if test "$PHP_SYSVSHM" != "no"; then AC_DEFINE(HAVE_SYSVSHM, 1, [ ]) diff --git a/ext/vpopmail/config.m4 b/ext/vpopmail/config.m4 index 8580924bf6..b432495928 100644 --- a/ext/vpopmail/config.m4 +++ b/ext/vpopmail/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension vpopmail +dnl PHP_ARG_WITH(vpopmail, for vpopmail support, [ --with-vpopmail[=DIR] Include vpopmail support.]) diff --git a/ext/wddx/config.m4 b/ext/wddx/config.m4 index 347ad117e9..4e9a5dc44e 100644 --- a/ext/wddx/config.m4 +++ b/ext/wddx/config.m4 @@ -1,8 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension wddx +dnl -PHP_ARG_ENABLE(wddx,for WDDX support, -[ --enable-wddx Enable WDDX support]) +PHP_ARG_ENABLE(wddx,whether to enable WDDX support, +[ --enable-wddx Enable WDDX support.]) if test "$PHP_WDDX" != "no"; then if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index cacc65ec52..56445663f9 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -1,5 +1,6 @@ -# $Source$ -# $Id$ +dnl +dnl $Id$ +dnl dnl Fallback for --with-xml[=DIR] AC_ARG_WITH(xml,[],enable_xml=$withval) @@ -12,7 +13,7 @@ else order=12 fi -PHP_ARG_ENABLE(xml,for XML support, +PHP_ARG_ENABLE(xml,whether to enable XML support, [ --disable-xml Disable XML support using bundled expat lib], yes) PHP_ARG_WITH(expat-dir, external libexpat install dir, diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index fa938be26a..9b097297a3 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -1,5 +1,6 @@ +dnl dnl $Id$ -dnl config.m4 for extension Xmlrpc +dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) sinclude(ext/xmlrpc/libxmlrpc/xmlrpc.m4) @@ -7,10 +8,10 @@ sinclude(libxmlrpc/acinclude.m4) sinclude(libxmlrpc/xmlrpc.m4) PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support, -[ --with-xmlrpc[=DIR] Include XMLRPC-EPI support]) +[ --with-xmlrpc[=DIR] Include XMLRPC-EPI support.]) PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI, -[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI]) +[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI.]) if test "$PHP_XMLRPC" != "no"; then diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4 index f420ce5b2e..9d405b4da3 100644 --- a/ext/xslt/config.m4 +++ b/ext/xslt/config.m4 @@ -1,18 +1,19 @@ -dnl config.m4 for extension xslt +dnl +dnl $Id$ +dnl dnl +------------------------------------------------------------------------------+ dnl | This is where the magic of the extension reallly is. Depending on what | dnl | backend the user chooses, this script performs the magic | dnl +------------------------------------------------------------------------------+ -dnl $Id$ PHP_ARG_ENABLE(xslt, whether to enable xslt support, -[ --enable-xslt Enable xslt support]) +[ --enable-xslt Enable xslt support.]) -PHP_ARG_WITH(xslt-sablot, whether to enable the XSLT Sablotron backend, -[ --with-xslt-sablot XSLT: Enable the sablotron backend]) +PHP_ARG_WITH(xslt-sablot, for XSLT Sablotron backend, +[ --with-xslt-sablot XSLT: Enable the sablotron backend.]) PHP_ARG_WITH(expat-dir, libexpat dir for Sablotron XSL support, -[ --with-expat-dir=DIR Sablotron: libexpat dir for Sablotron 0.50]) +[ --with-expat-dir=DIR XSLT: libexpat dir for Sablotron 0.50]) if test "$PHP_XSLT" != "no"; then diff --git a/ext/yaz/config.m4 b/ext/yaz/config.m4 index 0f701fd7fe..7d5fd86ec9 100644 --- a/ext/yaz/config.m4 +++ b/ext/yaz/config.m4 @@ -1,8 +1,10 @@ +dnl dnl $Id$ +dnl PHP_ARG_WITH(yaz,for YAZ support, -[ --with-yaz[=DIR] Include YAZ support (ANSI/NISO Z39.50). DIR is - the YAZ bin install directory]) +[ --with-yaz[=DIR] Include YAZ support (ANSI/NISO Z39.50). + DIR is the YAZ bin install directory.]) if test "$PHP_YAZ" != "no"; then diff --git a/ext/yp/config.m4 b/ext/yp/config.m4 index eba76b9ffa..a597eadfab 100644 --- a/ext/yp/config.m4 +++ b/ext/yp/config.m4 @@ -1,9 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension yp -dnl don't forget to call PHP_EXTENSION(yp) +dnl PHP_ARG_ENABLE(yp,whether to include YP support, -[ --enable-yp Include YP support]) +[ --enable-yp Include YP support.]) if test "$PHP_YP" != "no"; then AC_DEFINE(HAVE_YP,1,[ ]) diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index b5ec719c8b..08a647de38 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -1,11 +1,9 @@ +dnl dnl $Id$ -dnl config.m4 for extension zziplib - -PHP_ARG_WITH(zip,whether to include zziplib support, -[ --with-zip[=DIR] Include zip support (requires zziplib >= 0.10.6). - DIR is the zziplib install directory, - default is /usr/local.]) +dnl +PHP_ARG_WITH(zip,for ZIP support, +[ --with-zip[=DIR] Include ZIP support (requires zziplib >= 0.10.6).]) if test "$PHP_ZIP" != "no"; then PHP_EXTENSION(zip, $ext_shared) diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index 6038844b2f..b947e41a83 100644 --- a/ext/zlib/config0.m4 +++ b/ext/zlib/config0.m4 @@ -5,9 +5,8 @@ dnl PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, [ --with-zlib-dir=<DIR> Define the location of zlib install directory]) -PHP_ARG_WITH(zlib,whether to include ZLIB support, -[ --with-zlib[=DIR] Include zlib support (requires zlib >= 1.0.9). - DIR is the zlib install directory.]) +PHP_ARG_WITH(zlib,for ZLIB support, +[ --with-zlib[=DIR] Include ZLIB support (requires zlib >= 1.0.9).]) if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then PHP_EXTENSION(zlib, $ext_shared) |