@- Added --disable-all configure option. (Jani)

Author: foobar

acinclude.m4

@@ -280,7 +280,7 @@ AC_DEFUN(PHP_EVAL_INCLINE,[
     esac
   done
 ])
-	
+
 AC_DEFUN(PHP_READDIR_R_TYPE,[
   dnl HAVE_READDIR_R is also defined by libmysql
   AC_CHECK_FUNC(readdir_r,ac_cv_func_readdir_r=yes,ac_cv_func_readdir=no)
@@ -512,40 +512,58 @@ PHP_ALWAYS_SHARED([$1])
 ])
 
 AC_DEFUN(PHP_ARG_ANALYZE,[
-PHP_ARG_ANALYZE_EX([$1])
+ifelse([$3],yes,[PHP_ARG_ANALYZE_EX([$1])])
 ifelse([$2],,,[AC_MSG_RESULT([$ext_output])])
 ])
 
 dnl
-dnl PHP_ARG_WITH(arg-name, check message, help text[, default-val])
+dnl PHP_ARG_WITH(arg-name, check message, help text[, default-val[, extension-or-not]])
 dnl Sets PHP_ARG_NAME either to the user value or to the default value.
 dnl default-val defaults to no.  This will also set the variable ext_shared,
 dnl and will overwrite any previous variable of that name.
+dnl If extension-or-not is yes (default), then do the ENABLE_ALL check and run
+dnl the PHP_ARG_ANALYZE_EX.
 dnl
 AC_DEFUN(PHP_ARG_WITH,[
-PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_))
+PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_),[ifelse($5,,yes,$5)])
 ])
 
 AC_DEFUN(PHP_REAL_ARG_WITH,[
 ifelse([$2],,,[AC_MSG_CHECKING([$2])])
-AC_ARG_WITH($1,[$3],$5=[$]withval,$5=ifelse($4,,no,$4))
-PHP_ARG_ANALYZE($5,[$2])
+AC_ARG_WITH($1,[$3],$5=[$]withval,
+[
+  $5=ifelse($4,,no,$4)
+
+  if test "$PHP_ENABLE_ALL" && test "$6" = "yes"; then
+    $5=$PHP_ENABLE_ALL
+  fi
+])
+PHP_ARG_ANALYZE($5,[$2],$6)
 ])
 
 dnl
-dnl PHP_ARG_ENABLE(arg-name, check message, help text[, default-val])
+dnl PHP_ARG_ENABLE(arg-name, check message, help text[, default-val[, extension-or-not]])
 dnl Sets PHP_ARG_NAME either to the user value or to the default value.
 dnl default-val defaults to no.  This will also set the variable ext_shared,
 dnl and will overwrite any previous variable of that name.
+dnl If extension-or-not is yes (default), then do the ENABLE_ALL check and run
+dnl the PHP_ARG_ANALYZE_EX.
 dnl
 AC_DEFUN(PHP_ARG_ENABLE,[
-PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_))
+PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_),[ifelse($5,,yes,$5)])
 ])
 
 AC_DEFUN(PHP_REAL_ARG_ENABLE,[
 ifelse([$2],,,[AC_MSG_CHECKING([$2])])
-AC_ARG_ENABLE($1,[$3],$5=[$]enableval,$5=ifelse($4,,no,$4))
-PHP_ARG_ANALYZE($5,[$2])
+AC_ARG_ENABLE($1,[$3],$5=[$]enableval,
+[
+  $5=ifelse($4,,no,$4)
+
+  if test "$PHP_ENABLE_ALL" && test "$6" = "yes"; then
+    $5=$PHP_ENABLE_ALL
+  fi
+])
+PHP_ARG_ANALYZE($5,[$2],$6)
 ])
 
 AC_DEFUN(PHP_MODULE_PTR,[

configure.in

@@ -531,7 +531,7 @@ dnl -------------------------------------------------------------------------
 PHP_HELP_SEPARATOR([General settings:])
 
 PHP_ARG_ENABLE(debug, whether to include debugging symbols,
-[  --enable-debug          Compile with debugging symbols.], no)
+[  --enable-debug          Compile with debugging symbols.], no, no)
 
 if test "$PHP_DEBUG" = "yes"; then
   PHP_DEBUG=1
@@ -543,7 +543,7 @@ fi
 
 PHP_ARG_WITH(layout,[layout of installed files],
 [  --with-layout=TYPE      Sets how installed files will be laid out.  Type is
-                          one of "PHP" (default) or "GNU"], PHP)
+                          one of "PHP" (default) or "GNU"], PHP, no)
 
 case $PHP_LAYOUT in
   GNU)
@@ -557,7 +557,7 @@ esac
 PHP_ARG_WITH(config-file-path,[path to configuration file],
 [  --with-config-file-path=PATH  
                           Sets the path in which to look for php.ini,
-                          defaults to PREFIX/lib], DEFAULT)
+                          defaults to PREFIX/lib], DEFAULT, no)
 
 if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then
   case $PHP_LAYOUT in
@@ -577,7 +577,7 @@ fi
 
 PHP_ARG_WITH(pear, [whether to install PEAR, and where],
 [  --with-pear=DIR         Install PEAR in DIR (default PREFIX/lib/php)
-  --without-pear          Do not install PEAR], DEFAULT)
+  --without-pear          Do not install PEAR], DEFAULT, no)
 
 if test "$PHP_PEAR" != "no" && test "$disable_cli" != "1"; then
   install_pear="install-pear install-build install-headers install-programs"
@@ -594,7 +594,7 @@ fi
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 PHP_ARG_ENABLE(safe-mode, whether to enable safe mode by default,
-[  --enable-safe-mode      Enable safe mode by default.])
+[  --enable-safe-mode      Enable safe mode by default.], no, no)
 
 if test "$PHP_SAFE_MODE" = "yes"; then
   AC_DEFINE(PHP_SAFE_MODE,1,[ ])
@@ -624,16 +624,8 @@ AC_ARG_WITH(exec-dir,
   AC_MSG_RESULT([/usr/local/php/bin])
 ])
 
-PHP_ARG_WITH(openssl,for OpenSSL support,
-[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.5) ])
-
-if test "$PHP_OPENSSL" != "no"; then
-  ext_openssl_shared=$ext_shared
-  PHP_SETUP_OPENSSL
-fi
-
 PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler,
-[  --enable-sigchild       Enable PHP's own SIGCHLD handler.],no)
+[  --enable-sigchild       Enable PHP's own SIGCHLD handler.], no, no)
 
 if test "$PHP_SIGCHILD" = "yes"; then
   AC_DEFINE(PHP_SIGCHILD, 1, [ ])
@@ -642,7 +634,7 @@ else
 fi
 
 PHP_ARG_ENABLE(magic-quotes,whether to enable magic quotes by default,
-[  --enable-magic-quotes   Enable magic quotes by default.])
+[  --enable-magic-quotes   Enable magic quotes by default.], no, no)
 
 if test "$PHP_MAGIC_QUOTES" = "yes"; then
   AC_DEFINE(MAGIC_QUOTES, 1, [ ])
@@ -652,10 +644,10 @@ fi
 
 PHP_ARG_ENABLE(rpath, whether to enable runpaths,
 [  --disable-rpath         Disable passing additional runtime library
-                          search paths], yes)
+                          search paths], yes, no)
 
 PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc,
-[  --enable-libgcc         Enable explicitly linking against libgcc])
+[  --enable-libgcc         Enable explicitly linking against libgcc], no, no)
 
 if test "$PHP_LIBGCC" = "yes"; then
   PHP_LIBGCC_LIBPATH(gcc)
@@ -667,17 +659,16 @@ if test "$PHP_LIBGCC" = "yes"; then
 fi
 
 PHP_ARG_ENABLE(short-tags,whether to enable short tags by default,
-[  --disable-short-tags    Disable the short-form <? start tag by default.],yes)
+[  --disable-short-tags    Disable the short-form <? start tag by default.],yes, no)
 
 if test "$PHP_SHORT_TAGS" = "yes"; then
   AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,"1",[ ])
 else
   AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,"0",[ ])
 fi
 
-
 PHP_ARG_ENABLE(dmalloc,whether to enable dmalloc,
-[  --enable-dmalloc        Enable dmalloc])
+[  --enable-dmalloc        Enable dmalloc], no, no)
 
 if test "$PHP_DMALLOC" = "yes"; then
   
@@ -691,27 +682,36 @@ if test "$PHP_DMALLOC" = "yes"; then
 fi
 
 PHP_ARG_ENABLE(ipv6,whether to enable IPv6 support,
-[  --disable-ipv6          Disable IPv6 support],yes)
+[  --disable-ipv6          Disable IPv6 support], yes, no)
 
 if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
   AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support])
 fi
 
+
+dnl
+dnl OpenSSL configure
+dnl
+PHP_ARG_WITH(openssl,for OpenSSL support,
+[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.5) ])
+
+if test "$PHP_OPENSSL" != "no"; then
+  ext_openssl_shared=$ext_shared
+  PHP_SETUP_OPENSSL
+fi
+
+
 AC_CHECK_LIB(crypt, crypt, [
   PHP_ADD_LIBRARY(crypt)
   PHP_ADD_LIBRARY(crypt, 1)
   AC_DEFINE(HAVE_CRYPT,1,[ ]) 
 ])
 
-
-
 divert(5)
 
 dnl ## In diversion 5 we check which extensions should be compiled.
 dnl ## All of these are normally in the extension directories.
 
-
-
 dnl Extension configuration.
 dnl -------------------------------------------------------------------------
 
@@ -729,6 +729,17 @@ PHP_HELP_SEPARATOR([Extensions:
 
 PHP_CONFIGURE_PART(Configuring extensions)
 
+dnl
+dnl Check if all enabled by default extensions should be disabled
+dnl
+
+AC_ARG_ENABLE(all,
+[ --disable-all   Disable all extensions enabled by default.
+ --enable-all    Enable all extensions.
+], [
+  PHP_ENABLE_ALL=$enableval
+])
+
 # reading config stubs
 esyscmd(./scripts/config-stubs ext)
 

ext/curl/config.m4

@@ -7,7 +7,7 @@ PHP_ARG_WITH(curl, for CURL support,
 
 dnl Temporary option while we develop this aspect of the extension
 PHP_ARG_WITH(curlwrappers, if we should use CURL for url streams,
-[  --with-curlwrappers     Use CURL for url streams])
+[  --with-curlwrappers     Use CURL for url streams], no, no)
 
 if test "$PHP_CURL" != "no"; then
   if test -r $PHP_CURL/include/curl/easy.h; then

ext/domxml/config.m4

@@ -108,12 +108,12 @@ AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
 ])
 
 PHP_ARG_WITH(dom-xslt, for DOM XSLT support,
-[  --with-dom-xslt[=DIR]   Include DOM XSLT support (requires libxslt >= 1.0.18).
-                          DIR is the libxslt install directory.])
+[  --with-dom-xslt[=DIR]     DOMXML: Include DOM XSLT support (requires libxslt >= 1.0.18).
+                            DIR is the libxslt install directory.], no, no)
 
 PHP_ARG_WITH(dom-exslt, for DOM EXSLT support,
-[  --with-dom-exslt[=DIR]  Include DOM EXSLT support (requires libxslt >= 1.0.18).
-                          DIR is the libexslt install directory.])
+[  --with-dom-exslt[=DIR]    DOMXML: Include DOM EXSLT support (requires libxslt >= 1.0.18).
+                            DIR is the libexslt install directory.], no, no)
 
 if test "$PHP_DOM_XSLT" != "no"; then
 

ext/gd/config.m4

@@ -10,25 +10,25 @@ PHP_ARG_WITH(gd, for GD support,
 [  --with-gd[=DIR]         Include GD support (DIR is GD's install dir).])
 
 PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
-[  --with-jpeg-dir=DIR       GD: Set the path to libjpeg install prefix.])
+[  --with-jpeg-dir=DIR       GD: Set the path to libjpeg install prefix.], no, no)
 
 PHP_ARG_WITH(png-dir, for the location of libpng,
-[  --with-png-dir=DIR        GD: Set the path to libpng install prefix.])
+[  --with-png-dir=DIR        GD: Set the path to libpng install prefix.], no, no)
 
 PHP_ARG_WITH(xpm-dir, for the location of libXpm,
-[  --with-xpm-dir=DIR        GD: Set the path to libXpm install prefix.])
+[  --with-xpm-dir=DIR        GD: Set the path to libXpm install prefix.], no, no)
 
 PHP_ARG_WITH(ttf, for FreeType 1.x support,
-[  --with-ttf[=DIR]          GD: Include FreeType 1.x support])
+[  --with-ttf[=DIR]          GD: Include FreeType 1.x support], no, no)
 
 PHP_ARG_WITH(freetype-dir, for FreeType 2,
-[  --with-freetype-dir=DIR   GD: Set the path to FreeType 2 install prefix.])
+[  --with-freetype-dir=DIR   GD: Set the path to FreeType 2 install prefix.], no, no)
 
 PHP_ARG_WITH(t1lib, for T1lib support,
-[  --with-t1lib[=DIR]        GD: Include T1lib support.])
+[  --with-t1lib[=DIR]        GD: Include T1lib support.], no, no)
 
 PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in GD,
-[  --enable-gd-native-ttf    GD: Enable TrueType string function.])
+[  --enable-gd-native-ttf    GD: Enable TrueType string function.], no, no)
 
 dnl  
 dnl Checks for the configure options 

ext/mbstring/config.m4

@@ -35,11 +35,8 @@ fi
 
 
 PHP_ARG_ENABLE(mbregex, whether to enable multibyte regex support,
-[  --disable-mbregex         Disable multibyte regex support], yes)
+[  --disable-mbregex         Disable multibyte regex support], yes, no)
 
 if test "$MBREGEX" != "no" ; then
   AC_DEFINE(HAVE_MBREGEX, 1, [whether to have multibyte regex support])
 fi
-
-
-

ext/mysql/config.m4

@@ -43,14 +43,14 @@ AC_DEFUN(PHP_MYSQL_SOCKET_SEARCH, [
 ])
 
 
-PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
-[  --with-mysql-sock[=DIR] Location of the MySQL unix socket pointer.
-                          If unspecified, the default locations are searched.])
-
 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)
 
+PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
+[  --with-mysql-sock[=DIR] Location of the MySQL unix socket pointer.
+                          If unspecified, the default locations are searched.], no, no)
+
 if test "$PHP_MYSQL" != "no"; then
   AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
 

ext/pdf/config.m4

@@ -5,23 +5,21 @@ dnl
 PHP_ARG_WITH(pdflib,for PDFlib support,
 [  --with-pdflib[=DIR]     Include PDFlib support.])
 
-pdflib_ext_shared=$ext_shared
-
 PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, 
 [  --with-jpeg-dir[=DIR]     PDFLIB: define libjpeg install directory.
-                                     (OPTIONAL for PDFlib v4)])
+                                     (OPTIONAL for PDFlib v4)], no, no)
 
 PHP_ARG_WITH(png-dir, for the location of libpng, 
 [  --with-png-dir[=DIR]      PDFLIB: define libpng install directory.
-                                     (OPTIONAL for PDFlib v4)])
+                                     (OPTIONAL for PDFlib v4)], no, no)
 
 PHP_ARG_WITH(tiff-dir, for the location of libtiff,
 [  --with-tiff-dir[=DIR]     PDFLIB: define libtiff install directory.
-                                     (OPTIONAL for PDFlib v4)])
+                                     (OPTIONAL for PDFlib v4)], no, no)
 
 if test "$PHP_PDFLIB" != "no"; then
 
-  PHP_NEW_EXTENSION(pdf, pdf.c, $pdflib_ext_shared)
+  PHP_NEW_EXTENSION(pdf, pdf.c, $ext_shared)
   PHP_SUBST(PDFLIB_SHARED_LIBADD)
 
   dnl #

ext/rpc/xmlrpc/config.m4

@@ -10,13 +10,11 @@ sinclude(libxmlrpc/xmlrpc.m4)
 PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support,
 [  --with-xmlrpc[=DIR]     Include XMLRPC-EPI support.])
 
-xmlrpc_ext_shared=$ext_shared
-
 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.],yes,no)
 
 PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI,
-[  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI.])
+[  --with-iconv-dir=DIR      XMLRPC-EPI: iconv dir for XMLRPC-EPI.],yes,no)
 
 if test "$PHP_XMLRPC" != "no"; then
 
@@ -58,7 +56,7 @@ if test "$PHP_XMLRPC" = "yes"; then
           libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
           libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
           libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
-          libxmlrpc/xml_to_soap.c,$xmlrpc_ext_shared,,
+          libxmlrpc/xml_to_soap.c,$ext_shared,,
           -I@ext_srcdir@/libxmlrpc -DVERSION="0.50")
   PHP_ADD_BUILD_DIR($ext_builddir/libxmlrpc)
   XMLRPC_MODULE_TYPE=builtin