sniper Mon Feb 7 07:48:13 2005 EDT
Modified files:
/php-src configure.in
Log:
- Fixed bug #31858 (--disable-cli does not force --without-pear)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.538&r2=1.539&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.538 php-src/configure.in:1.539
--- php-src/configure.in:1.538 Wed Jan 19 19:51:41 2005
+++ php-src/configure.in Mon Feb 7 07:48:11 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.538 2005/01/20 00:51:41 sniper Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.539 2005/02/07 12:48:11 sniper Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -934,6 +934,11 @@
with_pear=no
fi
+# If CLI is disabled -> disable PEAR
+if test "$PHP_SAPI_CLI" = "no"; then
+ with_pear=no
+fi
+
PHP_ARG_WITH(pear, [whether to install PEAR],
[ --with-pear=DIR Install PEAR in DIR (default PREFIX/lib/php)
--without-pear Do not install PEAR], DEFAULT, yes)
@@ -943,17 +948,13 @@
dnl
dnl PEAR dependancies
dnl
- if test "$PHP_SAPI_CLI" = "no"; then
- pear_error_msg="$pear_error_msg
- PEAR requires CLI to be enabled. Add --enable-cli to
the configure line. (or --disable-pear)"
- fi
if test "$PHP_PCRE_REGEX" = "no"; then
pear_error_msg="$pear_error_msg
- PEAR requires PCRE to be enabled. Add --with-pcre-regex
to the configure line. (or --disable-pear)"
+ PEAR requires PCRE to be enabled. Add --with-pcre-regex
to the configure line. (or --without-pear)"
fi
if test "$PHP_XML" = "no"; then
pear_error_msg="$pear_error_msg
- PEAR requires XML to be enabled. Add --enable-xml to
the configure line. (or --disable-pear)"
+ PEAR requires XML to be enabled. Add --enable-xml to
the configure line. (or --without-pear)"
fi
dnl
@@ -961,7 +962,7 @@
dnl
dnl if test "$PHP_XMLRPC" = "no"; then
dnl pear_error_msg="$pear_error_msg
-dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc
to the configure line. (or --disable-pear)"
+dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc
to the configure line. (or --without-pear)"
dnl fi
dnl
@@ -978,6 +979,8 @@
*) PEAR_INSTALLDIR=$libdir/php;;
esac
fi
+
+
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
fi
@@ -1327,7 +1330,6 @@
PHP_ADD_BUILD_DIR(Zend)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts)
-PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
