sniper Tue Mar 25 08:43:56 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4 configure.in acinclude.m4
Log:
MFH: Made "--with-pear" "--disable-all"-aware. Plus some cosmetics fixes.
Index: php4/configure.in
diff -u php4/configure.in:1.396.2.41 php4/configure.in:1.396.2.42
--- php4/configure.in:1.396.2.41 Mon Mar 17 08:50:21 2003
+++ php4/configure.in Tue Mar 25 08:43:56 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.41 2003/03/17 13:50:21 wez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.42 2003/03/25 13:43:56 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -554,7 +554,7 @@
dnl General settings.
dnl -------------------------------------------------------------------------
-
+PHP_CONFIGURE_PART(General settings)
PHP_HELP_SEPARATOR([General settings:])
@@ -611,7 +611,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 "$disable_cli" != "1"; then
install_pear="install-pear"
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.218.2.11 php4/acinclude.m4:1.218.2.12
--- php4/acinclude.m4:1.218.2.11 Mon Mar 17 08:50:20 2003
+++ php4/acinclude.m4 Tue Mar 25 08:43:56 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.11 2003/03/17 13:50:20 wez Exp $
+dnl $Id: acinclude.m4,v 1.218.2.12 2003/03/25 13:43:56 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -531,7 +531,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])])
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
