From 2f676485121e11ba1b4d8a3b7375196046e038be Mon Sep 17 00:00:00 2001 From: foobar Date: Tue, 25 Mar 2003 13:43:13 +0000 Subject: [PATCH] Made "--with-pear" "--disable-all"-aware. Plus some cosmetics fixes. --- acinclude.m4 | 2 +- configure.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 0971796bbfb..af59070fb78 100644 --- 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 43d666d2f33..c91fc4316e5 100644 --- 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"