diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.in | 18 |
2 files changed, 11 insertions, 8 deletions
@@ -15,6 +15,7 @@ PHP NEWS is passed. (Tony) - Fixed posix_getsid() & posix_getpgid() to return sid & pgid instead of true. (Tony) +- 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 #31832 (SOAP encoding problem with complex types in WSDL mode with diff --git a/configure.in b/configure.in index 23e8ba3991..c351d59f1f 100644 --- a/configure.in +++ b/configure.in @@ -902,6 +902,11 @@ if test -z "$with_pear" && test "$enable_pear" = "no"; then 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) @@ -911,17 +916,13 @@ if test "$PHP_PEAR" != "no"; then 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 @@ -929,7 +930,7 @@ dnl ext/xmlrpc is not really there yet to be a requirement.. 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 @@ -946,6 +947,8 @@ dnl *) PEAR_INSTALLDIR=$libdir/php;; esac fi + + PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear) fi @@ -1295,7 +1298,6 @@ PHP_ADD_BUILD_DIR(TSRM) 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 |