MFH: Made "--with-pear" "--disable-all"-aware. Plus some cosmetics fixes.

diff --git a/acinclude.m4 b/acinclude.m4
index 60883a318fbeb886d7129d13b4650112d00ca563..789d859bc18ee3d95c9b1312c58264c1afcebc6b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -531,7 +531,7 @@ PHP_ALWAYS_SHARED([$1])
 ])
 
 AC_DEFUN([PHP_ARG_ANALYZE],[
-ifelse([$3],yes,[PHP_ARG_ANALYZE_EX([$1])])
+ifelse([$3],yes,[PHP_ARG_ANALYZE_EX([$1])],[ext_output=ifelse([$]$1,,no,[$]$1)])
 ifelse([$2],,,[AC_MSG_RESULT([$ext_output])])
 ])
 

diff --git a/configure.in b/configure.in
index 09f55339a3f87e24115b433120bf3c27aaf73149..ae7c50e5966fa0f31ea6a6c7d57fc9f1a78cdafb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -554,7 +554,7 @@ dnl ## In diversion 4 we check user-configurable general settings.
 
 dnl General settings.
 dnl -------------------------------------------------------------------------
-
+PHP_CONFIGURE_PART(General settings)
 
 PHP_HELP_SEPARATOR([General settings:])
 
@@ -611,7 +611,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, no)
+  --without-pear          Do not install PEAR], DEFAULT, yes)
 
 if test "$PHP_PEAR" != "no" && test "$disable_cli" != "1"; then
   install_pear="install-pear"