From: foobar <sniper@php.net>
Date: Sun, 4 Dec 2005 23:31:33 +0000 (+0000)
Subject: - Nuke non-working part
X-Git-Tag: RELEASE_1_1_1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89199c43b208b9597b15404cce866b7ef04c2a16;p=php

- Nuke non-working part
---

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 46286c3686..c928478d56 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -133,20 +133,9 @@ AC_ARG_WITH(apache,
     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
diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4
index c0ea405b03..7d28a463ad 100644
--- a/sapi/apache_hooks/config.m4
+++ b/sapi/apache_hooks/config.m4
@@ -135,20 +135,8 @@ AC_ARG_WITH(apache-hooks-static,
     AC_DEFINE(HAVE_APACHE_HOOKS,1,[ ])
     APACHE_HOOKS_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_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
-      APACHE_HOOKS_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