sniper Mon Jun 30 12:33:51 2003 EDT
Modified files:
/php-src configure.in
/php-src/ext/standard config.m4
Log:
- Moved the PEAR check after the extensions.
. added checks for the dependancies PEAR has.
- Moved PHP_REGEX checks to ext/standard/config.m4
# If someone knows the reason for PHP_REGEX macro being where it was,
# please tell..
Index: php-src/configure.in
diff -u php-src/configure.in:1.453 php-src/configure.in:1.454
--- php-src/configure.in:1.453 Sun Jun 29 11:07:03 2003
+++ php-src/configure.in Mon Jun 30 12:33:50 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.453 2003/06/29 15:07:03 derick Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.454 2003/06/30 16:33:50 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -615,27 +615,6 @@
PHP_CONFIG_FILE_SCAN_DIR=""
fi
-# compatibility
-if test -z "$with_pear" && test "$enable_pear" = "no"; then
- with_pear=no
-fi
-
-PHP_ARG_WITH(pear, [whether to install PEAR, and where],
-[ --with-pear=DIR Install PEAR in DIR (default PREFIX/lib/php)
- --without-pear Do not install PEAR], DEFAULT, yes)
-
-if test "$PHP_PEAR" != "no" && test "$PHP_SAPI_CLI" != "no"; then
- install_pear="install-pear"
- PEAR_INSTALLDIR=$PHP_PEAR
-fi
-
-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
-
test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
PHP_ARG_ENABLE(safe-mode, whether to enable safe mode by default,
@@ -733,6 +712,20 @@
AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support])
fi
+AC_MSG_CHECKING([whether to enable versioning])
+AC_ARG_ENABLE(versioning,
+[ --enable-versioning Export only required symbols.
+ See INSTALL for more information], [
+ if test "x$APXS" != "x"; then
+ PHP_VERSIONING=$enableval
+ else
+ PHP_VERSIONING=no
+ fi
+],[
+ PHP_VERSIONING=no
+])
+AC_MSG_RESULT([$PHP_VERSIONING])
+
divert(5)
dnl ## In diversion 5 we check which extensions should be compiled.
@@ -768,25 +761,9 @@
# reading config stubs
esyscmd(./build/config-stubs ext)
-dnl Other settings.
+dnl Extensions post-config
dnl -------------------------------------------------------------------------
-PHP_HELP_SEPARATOR([Other settings:])
-
-AC_MSG_CHECKING([whether to enable versioning])
-AC_ARG_ENABLE(versioning,
-[ --enable-versioning Export only required symbols.
- See INSTALL for more information], [
- if test "x$APXS" != "x"; then
- PHP_VERSIONING=$enableval
- else
- PHP_VERSIONING=no
- fi
-],[
- PHP_VERSIONING=no
-])
-AC_MSG_RESULT([$PHP_VERSIONING])
-
if test "$PHP_VERSIONING" = "yes"; then
test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym"
if test -f "$PHP_SYM_FILE"; then
@@ -812,8 +789,6 @@
;;
esac
-PHP_REGEX
-
EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
dnl this has to be here to prevent the openssl crypt() from
@@ -823,6 +798,64 @@
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
+
+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)
+
+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."
+ 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."
+ 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."
+ 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."
+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
+fi
+
dnl Configuring Zend and TSRM.
dnl -------------------------------------------------------------------------
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.61 php-src/ext/standard/config.m4:1.62
--- php-src/ext/standard/config.m4:1.61 Sat Jun 28 01:38:52 2003
+++ php-src/ext/standard/config.m4 Mon Jun 30 12:33:50 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.61 2003/06/28 05:38:52 sebastian Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.62 2003/06/30 16:33:50 sniper Exp $ -*- sh -*-
divert(3)dnl
@@ -225,6 +225,8 @@
],[
REGEX_TYPE=php
])
+
+PHP_REGEX
AC_FUNC_FNMATCH
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
