sniper Sun Dec 4 18:30:42 2005 EDT
Modified files:
/php-src/sapi/apache config.m4
Log:
- Nuke non-working part
http://cvs.php.net/diff.php/php-src/sapi/apache/config.m4?r1=1.75&r2=1.76&ty=u
Index: php-src/sapi/apache/config.m4
diff -u php-src/sapi/apache/config.m4:1.75 php-src/sapi/apache/config.m4:1.76
--- php-src/sapi/apache/config.m4:1.75 Sun May 29 19:16:45 2005
+++ php-src/sapi/apache/config.m4 Sun Dec 4 18:30:40 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.75 2005/05/29 23:16:45 sniper Exp $
+dnl $Id: config.m4,v 1.76 2005/12/04 23:30:40 sniper Exp $
dnl
AC_DEFUN([PHP_APACHE_FD_CHECK], [
AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
@@ -133,20 +133,9 @@
AC_DEFINE(HAVE_APACHE,1,[ ])
APACHE_MODULE=yes
PHP_EXPAND_PATH($withval, withval)
- # For Apache 1.2.x
- if test -f $withval/src/httpd.h; then
- APACHE_INCLUDE=-I$withval/src
- APACHE_TARGET=$withval/src
- PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c,
$APACHE_INCLUDE)
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC
$APACHE_INSTALL_FILES $APACHE_TARGET"
- PHP_LIBS="-L. -lphp3"
- AC_MSG_RESULT(yes - Apache 1.2.x)
- STRONGHOLD=
- if test -f $withval/src/ap_config.h; then
- AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
- fi
+
# For Apache 2.0.x
- elif test -f $withval/include/httpd.h &&
+ if test -f $withval/include/httpd.h &&
test -f $withval/srclib/apr/include/apr_general.h ; then
AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!])
# For Apache 1.3.x
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
