sniper Thu Feb 13 02:48:00 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/apache config.m4
Log:
MFH
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.62.4.3 php4/sapi/apache/config.m4:1.62.4.4
--- php4/sapi/apache/config.m4:1.62.4.3 Wed Feb 12 12:09:47 2003
+++ php4/sapi/apache/config.m4 Thu Feb 13 02:48:00 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.62.4.3 2003/02/12 17:09:47 sniper Exp $
+dnl $Id: config.m4,v 1.62.4.4 2003/02/13 07:48:00 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
@@ -79,23 +79,26 @@
STRONGHOLD=
AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
+ AC_DEFINE(HAVE_APACHE,1,[ ])
AC_MSG_RESULT(yes)
],[
AC_MSG_RESULT(no)
])
-APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module"
-
if test "$PHP_SAPI" != "apache"; then
AC_MSG_CHECKING(for Apache 1.x module support)
AC_ARG_WITH(apache,
[ --with-apache[=DIR] Build Apache 1.x module. DIR is the top-level Apache
build directory, defaults to /usr/local/apache.],[
+
+ APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module"
+
if test "$withval" = "yes"; then
# Apache's default directory
withval=/usr/local/apache
fi
if test "$withval" != "no"; then
+ AC_DEFINE(HAVE_APACHE,1,[ ])
APACHE_MODULE=yes
PHP_EXPAND_PATH($withval, withval)
# For Apache 1.2.x
@@ -223,7 +226,6 @@
if test "$ac_cv_php_fd_in_buff" = "yes"; then
AC_DEFINE(PHP_APACHE_HAVE_CLIENT_FD,1,[ ])
fi
-
AC_MSG_CHECKING(for mod_charset compatibility option)
AC_ARG_WITH(mod_charset,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
