sniper Mon Feb 7 07:51:53 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS configure.in
Log:
MFH: - Fixed bug #31858 (--disable-cli does not force --without-pear)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.830&r2=1.1247.2.831&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.830 php-src/NEWS:1.1247.2.831
--- php-src/NEWS:1.1247.2.830 Fri Feb 4 09:29:20 2005
+++ php-src/NEWS Mon Feb 7 07:51:52 2005
@@ -6,6 +6,7 @@
- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #31858 (--disable-cli does not force --without-pear). (Jani)
- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
(Jani)
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.150&r2=1.396.2.151&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.150 php-src/configure.in:1.396.2.151
--- php-src/configure.in:1.396.2.150 Wed Jan 19 20:46:57 2005
+++ php-src/configure.in Mon Feb 7 07:51:52 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.150 2005/01/20 01:46:57 sniper Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.396.2.151 2005/02/07 12:51:52 sniper Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -872,6 +872,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)
@@ -881,17 +886,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
@@ -899,7 +900,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
@@ -916,6 +917,8 @@
*) PEAR_INSTALLDIR=$libdir/php;;
esac
fi
+
+
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
fi
@@ -1259,7 +1262,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_GEN_BUILD_DIRS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
