diff options
| author | foobar <sniper@php.net> | 2003-03-25 13:43:13 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-03-25 13:43:13 +0000 |
| commit | 2f676485121e11ba1b4d8a3b7375196046e038be (patch) | |
| tree | faa3544550068ec2a0924aa3fdfcadc001eb144a | |
| parent | 67c24604eef095baefc3ed9e99eeba6d28dc468c (diff) | |
| download | php-git-2f676485121e11ba1b4d8a3b7375196046e038be.tar.gz | |
Made "--with-pear" "--disable-all"-aware. Plus some cosmetics fixes.
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0971796bbf..af59070fb7 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 43d666d2f3..c91fc4316e 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" |