Unified the configure messages.

diff --git a/ext/aspell/config.m4 b/ext/aspell/config.m4
index 9955de570f134c754a860f2991495b1373b0c628..ee3bc154570634095e91998701ecd5b5e18673e7 100644 (file)
--- 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 ed5677416d674bdb383407fc37a7e061789b2a28..4d6e7bc02892e4ab2c43fcff45ad3833c2a039a8 100644 (file)
--- 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 3fdec44e3a1435a4b5c88f5e6f56ff828a325c30..96c3f96f6848b2a4ccac287d1cfe2d5ab6e186bb 100644 (file)
--- 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 480cea070df27f93eee578d79786b23b138d9d72..fd39e3e136d65f6ebf1deeb5e2267d4e9116a886 100644 (file)
--- 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 4d89c5041ef2f1953c91ba6eafb634504c230d0b..4a0bec453d852e6b4be4e1d31c30f87ec07d32a1 100644 (file)
--- 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 fbcca929467b9bf3fa181b9e28ecd67ae96c88ca..8e01fcf46b2248f10da8e7417e3be6106f8e6871 100644 (file)
--- 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 774047b9b9cb18c5ee0e527429355bd9687e4e29..ba9ae62e17af8be43989a59876f1f1c7ba13abde 100644 (file)
--- 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 ac7e3c640c5c469fd57048841464ded181e7dc48..29543baef357a70212ee1b0cdc3b0158e9b4d696 100644 (file)
--- 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 09751671cd51519d17790db0a6dfbf4b516cc318..439b7026a0951c1f99fbe37754f1fb638defd46d 100644 (file)
--- 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 cf93da9e9f55c2a998c7213a7ec4e16707864361..cfd56c5a38d9c19b03a93d8f4a349031ae45780d 100644 (file)
--- 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 2bf55d5bc66676d75c831b62cc54d1a0c38b0e09..bab48776bf88809af86c458d4da8e28b694244ee 100644 (file)
--- 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 a1dae8cb41b85492371a780c40c08eab8116ed46..5a3de1b567b291aa77f626ab7d5a55f57767cb2e 100644 (file)
--- 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 f9959a909ef9fa5435d4699472b0500942979d1d..86c7be00fd7a1f4a5fda62d35068fb4d9160ae4f 100644 (file)
--- 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 7a33750b90da50c372efe6a402b276b6b5e7341e..2c65e185590401cf2815ba0bbf738014ad7a5e06 100644 (file)
--- 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 7a4f4e8a76d05ac5d99108f39a0ea4674165a46e..3232ff2000fac7cb83dc88a9dc40902130485b61 100644 (file)
--- 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 5cf4885c7dc343de4001b705f450b816968af2ec..19fbbda70ffea7f3e7f3bdbfee96e84eaec918a9 100644 (file)
--- 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 4ad2cf65221b4b306e9422687f1752b500116d54..0250462e781212fbb998f4f61749d84d101c0e31 100644 (file)
--- 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 1c0a8791c36d670e72d92966f33fe8c7b58bdaaa..9004c3b8a6350e9a58aa57e127cd2cf2d9ea0493 100644 (file)
--- 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 53dabb6bd8dafcaccc041c29eed3ca10e1a34a98..128d74be739e21c2678266c4042574ced7a38c21 100644 (file)
--- 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 a683dbc0011e9266d360c44e7b049759560a02dd..c2559e7d6c55827407608bd3cf4a755d7b7a085b 100644 (file)
--- 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 b6569b6697ea13b3d89526b1090cbbd8db8304ff..b05770eeb6f391d7c83b0b7ff161567daa466803 100644 (file)
--- 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 314fbd1aaf4ae103a3e37c2ce1bee51d1e2d64be..8d7fb49e2044647b0718a1705dd26f09938c930c 100644 (file)
--- 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 511ecacefa1b3ef78df4573aa7706d2ac67a5ab0..381e800a25c9cf21473b573475bfc8108a9e3393 100644 (file)
--- 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 5060ea5a85bd794209fc9087ee2e9afb8f40ae03..d93860e6e66883c4125bfeb73421f13470b8bc36 100644 (file)
--- 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 218c7dcdac895fdea813732f4b39589c172131cd..58b101c291de1cf29ec35e92bbddeda65932b302 100644 (file)
--- 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 91df7ff26e8d6cdd581a0715913115eab279e69b..d5d4578938b906f93dd3c431a65567771b5a4b6d 100644 (file)
--- 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 0a0848f397187469254e75e1255d184c36b5c060..2d32dd741ef6cb610a817bdba92a3628e014868c 100644 (file)
--- 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 2044a162f2a25e8e55312eacf5b7a31b25e4fb90..45391481bc82e18ec5b0c8d443c31492b263d946 100644 (file)
--- 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 829677a3de50fcd7bf756bb0772de5a956649147..66db534c0f6d980b961c52bae128c27d08267c39 100644 (file)
--- 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 39aa64135bace0660b412f24223deb43987a5741..632bfb8150aaa3109e340c4e16c9fb87ee7f6141 100644 (file)
--- 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 dcd02d6dc7e53e1d5985deaa7f6dea2792e5bab3..5e5ea3b00476c0ceb4fa8f5a634d33397630b14c 100644 (file)
--- 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 6d28c51ae601b7d7d278e3b0928e7e8f8a514e8f..40228d63591132f8b77b356d6334e8e9179cbd0a 100644 (file)
--- 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 f7a4f03a7cc97c24afb53c2d83a675ff374d4e56..8a5997c901abc36c049835fe2732a321dadd7052 100644 (file)
--- 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 01929ca5868f9e64697836e8080a79d758f14a43..9fe8e754374aec5fd36643ccda1c9ae9ca4386eb 100644 (file)
--- 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 52745513992a8c42146c55f9b039a2641bbe5669..a7ad7853921b681ec119c5268c98322721b7f01d 100644 (file)
--- 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 0e0cb2a1d7d2385ea5e0f96e18fa58b6a51aaec3..29809d9ffde762b62560a04100987831c20e191f 100644 (file)
--- 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 1718a91464be1396007a61db802c338c94e6c4f7..b655530436c0ebb3ea3701fff1c49e0f6420f114 100644 (file)
--- 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 6a6e6eea850ec38415b0ade72ebe5c6cf8a971c4..58e1b060355f40da8e4e2073271139a1573cd612 100644 (file)
--- 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 5f6c206a94933abc2a80f8362fe4870b1a711751..091dc32efbb60d81debf021263f5ac2b6eb56320 100644 (file)
--- 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 bd99ebb52f91845b2758b11d91fc965f194b9721..f8cda29d5784d34453a608137b733d94247b18ba 100644 (file)
--- 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 1a6f05cf5959cca4eb899b31795aab5a5b2a56ee..b7452eaf629a4bb181daef8beb5c8aed3c32ff45 100644 (file)
--- 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 07df218739076205932863f3f74b5de5302b3004..6b9619fdf336efb5715cf2773ff6cd3fbabf6bdc 100644 (file)
--- 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 c9953dccfb4b755ba04b4b7f862f95a7a8833323..55a00a7b6cd638c5a59c5d0ebf3e921e1b1581c0 100644 (file)
--- 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 523ec15e30d33160986a2b6b2d4dd1622b8df48e..e51d91602bd6767045d57586c2396b9170bddbff 100644 (file)
--- 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 b9c680d9940b05f9c87c1370134519d8037bd88e..5dd397113283234e470b0e67bbd71acdf1ba9aac 100644 (file)
--- 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 15ed5d5bc8383028371b882c40b8f5b1986a5f9b..5f1e268c9ef27a3decb5289f260a09b4c4b861d7 100644 (file)
--- 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 2d4487b66d0649eb131bfb3ae2ffe65543e1a603..c4917990cc4c2ad77f77589bca5c8ab0443abb7a 100644 (file)
--- 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 5473d1f72350dd85b3e49c5aeb69af51fb27b9cd..d831b58881c842e2f5bf90eac6238300dfcd856a 100644 (file)
--- 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 aa2ea74b5517c7f963d65759ef63eae78b2cb2af..3a9df764e86e74ae5b16ac26709c7f00c58b30a5 100644 (file)
--- 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 cc8421111cac5122cb709c66fa82bb9bc7e1ba37..73357a9a5fc31307aa2b5b95f3a446312b79814c 100644 (file)
--- 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 d6eab7b28f4df98be07fdb7fea30fb2018071ecb..58a3795fd6178a2cfcc960033116ca977f66c93a 100644 (file)
--- 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 073d2c1902e396a37af8114e6fa613f61469a25c..7cf69f40fbb59995d745885ef952988eabf04426 100644 (file)
--- 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 f495e14a5fa9e4af4a080525bcc8e6a44564efa3..d57a66e5af046379ad0dcbd996ade6dbff6cbeb1 100644 (file)
--- 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 fc0c4956eab38745c664ae8ae042360b21020296..516b544f12fc6064e2488384b3f6be143507feba 100644 (file)
--- 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 b903b19c42db70248feb88334303a2e043768bd0..cf973fe05218ab40f558aefdef4c6f336cd4e54f 100644 (file)
--- 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 b903b19c42db70248feb88334303a2e043768bd0..cf973fe05218ab40f558aefdef4c6f336cd4e54f 100644 (file)
--- 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 fac40cdca9140217e89effaf0d2ac911fba34337..9d25a0a34e92f7145cd59286db815149be74bc29 100644 (file)
--- 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 46a4d9530321d3e74cc28d536aaf71b2d80b52eb..7ad7643cfc386b57d94dc1d2a9572b794cac2e7b 100644 (file)
--- 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 f7d71afb181c7654772846524a3451536934bab2..41d98b5170c4e0e712db5e399622b44f739a1e5b 100644 (file)
--- 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 af3d2abe0b9085230a0cbdb774b055727c3dd726..046f539307961ffb2d40e3c4d18c47afaefbc49f 100644 (file)
--- 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 af54cc1176b982f90e09a8a24140ee37ad9b072d..982a298a6f236cbb250243955b5065914fbe899c 100644 (file)
--- 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 ba136d2a8e9d1527c8107fe27c32611a749c3887..af75b5c63687d828dcb4c144d7f05389fea12352 100644 (file)
--- 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 848762338df4b7d173788adaabb3e6be0ca28585..6723d807e7915b4746b71f8caab2e07d9fc47ca0 100644 (file)
--- 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 01929ca5868f9e64697836e8080a79d758f14a43..9fe8e754374aec5fd36643ccda1c9ae9ca4386eb 100644 (file)
--- 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 fa938be26acb238223b5d2764a8ea55c460c67e9..9b097297a3c5101003d61909fd0bfca5fd9b1f19 100644 (file)
--- 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 23e7c95aa345986a76e75fa2f760174ccc41da20..779ca596406b7d667acd1691fd93fceb1b7fc64b 100644 (file)
--- 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 5366c4fec0a1f74e329d2c3f01dad17336396c6a..bf3f3b810502d2de69a307fa58d8f05028a8ab50 100644 (file)
--- 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 1a9ca6adade4b915e431a3c974d3cf37e1a6c750..e3044af35e1074362203f08ca43c1fddb1ff525b 100644 (file)
--- 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 b941b86011de2395d08dc43e603542be10b28ecc..6f24e5a2e74b9a08b9c73f3924223f767b0db030 100644 (file)
--- 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 af99809231b6afabff6a6848207da6366d12d579..10cdae12299503dd3c65d14bca8aed0ba9834b48 100644 (file)
--- 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 b05221bb60580ca1e28506e5cc78afd1a8f92303..2815b18e7bcd8ad09e4b362dd96b312703234748 100644 (file)
--- 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 60b55eca74d48a7de6295da38da378e8dd64f02d..a029bdb7438da3eedaae1c4cc56466cb77d97a29 100644 (file)
--- 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 10a51041a3dec10b480e6de382348ac659a4f52e..81233ace39e6f2aecfe23f5fe32a4e34d591c4d2 100644 (file)
--- 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 48ebc3f31d68a9145f07e60be1f2a5313953096e..7900565361d2e8396023094674ddb4de59606086 100644 (file)
--- 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 4d36ea474cbe19174c74c8dbe15e23246596aa6f..6a20c79c93961b817061583ac8efcd3f696cf10c 100644 (file)
--- 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 8580924bf6dbee0cf15abda4c4030ca253ca41c6..b4324959288435da7336782bd51437730fbd58dc 100644 (file)
--- 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 347ad117e94e1400b43237fa74a38fc43ed27eee..4e9a5dc44eca9cd776cf02610ac0bfa07f08260a 100644 (file)
--- 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 cacc65ec52e6313ebb7146a60ab06532d098204c..56445663f9243eebdb700490277e33b8c05eddac 100644 (file)
--- 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 fa938be26acb238223b5d2764a8ea55c460c67e9..9b097297a3c5101003d61909fd0bfca5fd9b1f19 100644 (file)
--- 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 f420ce5b2e7d58923d6c86d5011b4ddc0aea7201..9d405b4da305f9f4ac8096deda6518d09d97ee86 100644 (file)
--- 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 0f701fd7fe3be381f8a37a39ab8bbdba97c72239..7d5fd86ec938e50324588da122c8c14cebc30673 100644 (file)
--- 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 eba76b9ffa1cef69f3f799b2e07f05a3411f1321..a597eadfab57e9d3a324a51bc4c89fd168421df4 100644 (file)
--- 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 b5ec719c8befaea166e8d5824ba195f4a2fa4ae1..08a647de3828c9702eedb8612fdfeca692f62fa5 100644 (file)
--- 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 6038844b2f1fa6134db977727ad390c480f00c94..b947e41a83952d86451a7f487adb3cfcec5fe7a3 100644 (file)
--- 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)