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

diff --git a/acinclude.m4 b/acinclude.m4
index 0971796bbfbca483ed56fbd4329e52b770165419..af59070fb78191915f3219a0e119aabda91c896f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -524,7 +524,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 43d666d2f330fabd4eab55521bdf8e8bf50889f0..c91fc4316e5c7ff7e4fe1b21d35fdd8a4c646b00 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -556,7 +556,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:])
 
@@ -613,7 +613,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 "$PHP_SAPI_CLI" != "no"; then
   install_pear="install-pear"