cvs: php4 / acinclude.m4 configure.in

sniper Tue Mar 25 08:43:13 2003 EDT Modified files: /php4 configure.in acinclude.m4 Log: Made "--with-pear" "--disable-all"-aware. Plus some cosmetics fixes. Index: php4/configure.in diff -u php4/configure.in:1.432 php4/configure.in:1.433 --- php4/configure.in:1.432 Sat Mar 22 23:32:22 2003 +++ php4/configure.in Tue Mar 25 08:43:13 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.432 2003/03/23 04:32:22 sterling Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.433 2003/03/25 13:43:13 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -556,7 +556,7 @@ dnl General settings. dnl ------------------------------------------------------------------------- - +PHP_CONFIGURE_PART(General settings) PHP_HELP_SEPARATOR([General settings:]) @@ -613,7 +613,7 @@ 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" Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.232 php4/acinclude.m4:1.233 --- php4/acinclude.m4:1.232 Mon Mar 17 08:40:42 2003 +++ php4/acinclude.m4 Tue Mar 25 08:43:13 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.232 2003/03/17 13:40:42 wez Exp $ +dnl $Id: acinclude.m4,v 1.233 2003/03/25 13:43:13 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -524,7 +524,7 @@ ]) 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])]) ])