libfcgi cleanup (Andrei Nigmatulin)

diff --git a/configure.in b/configure.in
index 0d166cdfcf141af224751f0e58d5d6b57eede7f4..73f6371644393a05a831a895953e144685e2b160 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -260,12 +260,6 @@ if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_FLAGS
 fi
 
-if test "$PHP_ENABLE_FASTCGI" = "yes"; then
-  PHP_CONFIGURE_PART(Running FastCGI checks)
-  sinclude(sapi/cgi/libfcgi/acinclude.m4)
-  sinclude(sapi/cgi/libfcgi/libfcgi.m4)
-fi
-
 divert(3)
 
 dnl ## In diversion 3 we check for compile-time options to the PHP

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 816cec799d8aa2b1b6869527cc3de6a61fda89c4..9dc807fd1f9f40e3cbbc5e8ef5f57c78cbfd5d5a 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -98,14 +98,11 @@ if test "$PHP_SAPI" = "default"; then
     if test "$PHP_ENABLE_FASTCGI" = "yes"; then
       PHP_FASTCGI=1
       PHP_FCGI_FILES="fastcgi.c"
-      PHP_FCGI_STATIC=1
     else
       PHP_FASTCGI=0
       PHP_FCGI_FILES=""
-      PHP_FCGI_STATIC=0
     fi
     AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ])
-    AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
     AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
 
     INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"