]> granicus.if.org Git - php/commitdiff
Goodbye PEAR
authorfoobar <sniper@php.net>
Mon, 15 Aug 2005 22:30:40 +0000 (22:30 +0000)
committerfoobar <sniper@php.net>
Mon, 15 Aug 2005 22:30:40 +0000 (22:30 +0000)
Makefile.global
configure.in
main/build-defs.h.in
makerpm
run-tests.php
server-tests.php

index 6361b939ad26e537370fa8e82002d90ed27e6624..769a2a37c83a6775da337b1a698907f4346d974b 100644 (file)
@@ -45,8 +45,6 @@ install-modules: build-modules
        @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) \
index 4abb868c84a283a33819a01290954fc66687e941..4391422c931c189f8be1dd19bfdba7dfd0eaf4f6 100644 (file)
@@ -882,67 +882,6 @@ fi
 
 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 @@ if test -z "$EXTENSION_DIR"; then
 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_SYSCONFDIR=`eval echo $sysconfdir`
 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(LFLAGS)
 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 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 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 @@ PHP_GEN_GLOBAL_MAKEFILE
 
 AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
 
-$php_shtool mkdir -p pear/scripts
 $php_shtool mkdir -p scripts
 $php_shtool mkdir -p scripts/man1
 
index b496075cfb8f2020a01231e4e4a019d9b1de30bf..99c11c68ed3f7e0755b9602625786878c41a484b 100644 (file)
@@ -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@"
diff --git a/makerpm b/makerpm
index 07bd372df4379102d8e948b345f292d70754d96d..2b934fcae37cafbe07fe9ad6bea2758c5a776301 100644 (file)
--- a/makerpm
+++ b/makerpm
@@ -64,7 +64,6 @@ for suExec and stand alone php scripts too.
 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 \
index 6e02feefccd457da974084919ee81d8d142df13b..5c34e73cce445ed8572b20875aa3f336c5b954bf 100755 (executable)
@@ -352,7 +352,7 @@ $exts_skipped = 0;
 $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;
index 5dae09a7b11570bb8816e37ca40b06414afa2435..5662edb70daf1a80210b93f2a9d97c7a635e7863 100755 (executable)
@@ -448,7 +448,7 @@ class testHarness {
        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;