cvs: php-src / Makefile.global configure.in makerpm run-tests.php server-tests.php /main build-defs.h.in

sniper Mon Aug 15 18:30:40 2005 EDT Modified files: /php-src Makefile.global configure.in makerpm run-tests.php server-tests.php /php-src/main build-defs.h.in Log: Goodbye PEAR http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.58&r2=1.59&ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.58 php-src/Makefile.global:1.59 --- php-src/Makefile.global:1.58 Thu Aug 11 19:35:51 2005 +++ php-src/Makefile.global Mon Aug 15 18:30:38 2005 @@ -45,8 +45,6 @@ @rm -f modules/*.la >/dev/null 2>&1 @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) -install-su: install-pear - test: all -@if test ! -z $(PHP_EXECUTABLE) && test -x $(PHP_EXECUTABLE); then \ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ http://cvs.php.net/diff.php/php-src/configure.in?r1=1.584&r2=1.585&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.584 php-src/configure.in:1.585 --- php-src/configure.in:1.584 Fri Aug 12 05:05:21 2005 +++ php-src/configure.in Mon Aug 15 18:30:38 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.584 2005/08/12 09:05:21 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.585 2005/08/15 22:30:38 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -882,67 +882,6 @@ unset LIBS LDFLAGS -dnl PEAR -dnl ------------------------------------------------------------------------- - -PHP_HELP_SEPARATOR([PEAR:]) -PHP_CONFIGURE_PART(Configuring PEAR) - -# compatibility -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 [PREFIX/lib/php] - --without-pear Do not install PEAR], DEFAULT, yes) - -if test "$PHP_PEAR" != "no"; then - - dnl - dnl PEAR dependancies - dnl - 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 --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 --without-pear)" - fi - -dnl -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 --without-pear)" -dnl fi -dnl - - if test "$pear_error_msg"; then - AC_MSG_ERROR([$pear_error_msg]) - fi - - install_pear="install-pear" - PEAR_INSTALLDIR=$PHP_PEAR - - if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then - case $PHP_LAYOUT in - GNU) PEAR_INSTALLDIR=$datadir/pear;; - *) PEAR_INSTALLDIR=$libdir/php;; - esac - fi - - PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear) -fi - - dnl Configuring Zend and TSRM. dnl ------------------------------------------------------------------------- @@ -1043,7 +982,6 @@ fi dnl Expand all directory names for use in macros/constants -EXPANDED_PEAR_INSTALLDIR=eval echo $PEAR_INSTALLDIR EXPANDED_EXTENSION_DIR=eval echo $EXTENSION_DIR EXPANDED_LOCALSTATEDIR=eval echo $localstatedir EXPANDED_BINDIR=eval echo $bindir @@ -1052,14 +990,13 @@ EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=eval echo "$PHP_CONFIG_FILE_PATH" EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=eval echo "$PHP_CONFIG_FILE_SCAN_DIR" -INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR +INCLUDE_PATH=. exec_prefix=$old_exec_prefix libdir=$old_libdir datadir=$old_datadir AC_SUBST(INCLUDE_PATH) -AC_SUBST(EXPANDED_PEAR_INSTALLDIR) AC_SUBST(EXPANDED_EXTENSION_DIR) AC_SUBST(EXPANDED_BINDIR) AC_SUBST(EXPANDED_LIBDIR) @@ -1158,7 +1095,6 @@ PHP_SUBST(LIBTOOL) PHP_SUBST(LN_S) PHP_SUBST_OLD(NATIVE_RPATHS) -PHP_SUBST_OLD(PEAR_INSTALLDIR) PHP_SUBST(PHP_BUILD_DATE) PHP_SUBST_OLD(PHP_LDFLAGS) PHP_SUBST_OLD(PHP_LIBS) @@ -1224,7 +1160,7 @@ CXXFLAGS="$CXXFLAGS $standard_libtool_flag" all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' -install_targets="$install_modules $install_pear install-build install-headers install-programs" +install_targets="$install_modules install-build install-headers install-programs" case $PHP_SAPI in cgi) @@ -1307,7 +1243,6 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ]) -$php_shtool mkdir -p pear/scripts $php_shtool mkdir -p scripts $php_shtool mkdir -p scripts/man1 http://cvs.php.net/diff.php/php-src/makerpm?r1=1.8&r2=1.9&ty=u Index: php-src/makerpm diff -u php-src/makerpm:1.8 php-src/makerpm:1.9 --- php-src/makerpm:1.8 Sun Feb 8 17:49:47 2004 +++ php-src/makerpm Mon Aug 15 18:30:38 2005 @@ -64,7 +64,6 @@ sh ./configure --prefix=/usr \ --with-config-file-path=%{_sysconfdir} \ --disable-cli \ - --without-pear \ --enable-force-cgi-redirect \ --enable-safe-mode \ --with-exec-dir=/usr/bin \ http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.228&r2=1.229&ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.228 php-src/run-tests.php:1.229 --- php-src/run-tests.php:1.228 Mon Aug 15 10:37:53 2005 +++ php-src/run-tests.php Mon Aug 15 18:30:38 2005 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.228 2005/08/15 14:37:53 dmitry Exp $ */ +/* $Id: run-tests.php,v 1.229 2005/08/15 22:30:38 sniper Exp $ */ /* * TODO: @@ -352,7 +352,7 @@ $ignored_by_ext = 0; sort($exts_to_test); $test_dirs = array('tests', 'ext'); -$optionals = array('pear', 'Zend', 'ZendEngine2'); +$optionals = array('Zend', 'ZendEngine2'); foreach($optionals as $dir) { if (@filetype($dir) == 'dir') { $test_dirs[] = $dir; http://cvs.php.net/diff.php/php-src/server-tests.php?r1=1.2&r2=1.3&ty=u Index: php-src/server-tests.php diff -u php-src/server-tests.php:1.2 php-src/server-tests.php:1.3 --- php-src/server-tests.php:1.2 Wed Aug 3 10:06:34 2005 +++ php-src/server-tests.php Mon Aug 15 18:30:39 2005 @@ -448,7 +448,7 @@ public $exts_tested = 0; public $exts_skipped = 0; public $ignored_by_ext = 0; - public $test_dirs = array('tests', 'pear', 'ext', 'sapi'); + public $test_dirs = array('tests', 'ext', 'sapi'); public $start_time; public $end_time; public $exec_info; http://cvs.php.net/diff.php/php-src/main/build-defs.h.in?r1=1.15&r2=1.16&ty=u Index: php-src/main/build-defs.h.in diff -u php-src/main/build-defs.h.in:1.15 php-src/main/build-defs.h.in:1.16 --- php-src/main/build-defs.h.in:1.15 Wed Aug 3 10:08:28 2005 +++ php-src/main/build-defs.h.in Mon Aug 15 18:30:40 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: build-defs.h.in,v 1.15 2005/08/03 14:08:28 sniper Exp $ */ +/* $Id: build-defs.h.in,v 1.16 2005/08/15 22:30:40 sniper Exp $ */ #define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@" #define PHP_ADA_INCLUDE "" @@ -77,7 +77,6 @@ #define PHP_LDAP_LIBS "" #define PHP_BIRDSTEP_INCLUDE "" #define PHP_BIRDSTEP_LIBS "" -#define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@" #define PHP_INCLUDE_PATH "@INCLUDE_PATH@" #define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@" #define PHP_PREFIX "@prefix@"