]>
Commit | Line | Data |
---|---|---|
71398d48 | 1 | diff -burN php-4.3.5RC1.orig/configure.in php-4.3.5RC1/configure.in |
2 | --- php-4.3.5RC1.orig/configure.in 2004-02-05 10:28:06.283736312 +0100 | |
3 | +++ php-4.3.5RC1/configure.in 2004-02-05 10:31:29.388859640 +0100 | |
4 | @@ -1138,7 +1138,7 @@ | |
9e76af2c AG |
5 | CXXFLAGS="$CXXFLAGS $standard_libtool_flag" |
6 | ||
7 | all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' | |
7cc30df6 AG |
8 | -install_targets="$install_modules $install_pear install-build install-headers install-programs" |
9 | +install_targets="$install_modules install-build install-headers install-programs" | |
10 | ||
11 | case $PHP_SAPI in | |
12 | cgi) | |
2e730e7e ER |
13 | --- ./configure.in~ 2005-10-17 19:09:07.000000000 +0300 |
14 | +++ ./configure.in 2005-10-17 19:19:18.000000000 +0300 | |
15 | @@ -937,15 +937,6 @@ | |
16 | dnl | |
17 | dnl PEAR dependancies | |
18 | dnl | |
19 | - if test "$PHP_PCRE_REGEX" = "no"; then | |
20 | - pear_error_msg="$pear_error_msg | |
21 | - PEAR requires PCRE to be enabled. Add --with-pcre-regex to the configure line. (or --without-pear)" | |
22 | - fi | |
23 | - if test "$PHP_XML" = "no"; then | |
24 | - pear_error_msg="$pear_error_msg | |
25 | - PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" | |
26 | - fi | |
27 | - | |
28 | dnl | |
29 | dnl ext/xmlrpc is not really there yet to be a requirement.. | |
30 | dnl | |
31 | @@ -968,8 +959,6 @@ | |
32 | *) PEAR_INSTALLDIR=$libdir/php;; | |
33 | esac | |
34 | fi | |
35 | - | |
36 | - PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear) | |
37 | fi | |
38 | ||
39 |