]> granicus.if.org Git - php/commitdiff
- Nuke non-working part
authorfoobar <sniper@php.net>
Sun, 4 Dec 2005 23:31:33 +0000 (23:31 +0000)
committerfoobar <sniper@php.net>
Sun, 4 Dec 2005 23:31:33 +0000 (23:31 +0000)
sapi/apache/config.m4
sapi/apache_hooks/config.m4

index 46286c36866dcf765d423133ca46ff56446d3313..c928478d56c662e9e8ae1f96a904bafd228ccf06 100644 (file)
@@ -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
index c0ea405b0305edc0fff4032a3782c41226cb2334..7d28a463ad0ab20498ea2304301ac76f93943983 100644 (file)
@@ -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