cvs: php-src(PHP_5_2) / configure.in /sapi/cgi config9.m4
| From: | Dmitry Stogov | Date: | Mon, 21 May 2007 08:47:51 +0000 |
| Subject: | cvs: php-src(PHP_5_2) / configure.in /sapi/cgi config9.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-44397@lists.php.net to get a copy of this message | ||
dmitry Mon May 21 08:47:51 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src configure.in
/php-src/sapi/cgi config9.m4
Log:
libfcgi cleanup (Andrei Nigmatulin)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.50&r2=1.579.2.52.2.51&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.50 php-src/configure.in:1.579.2.52.2.51
--- php-src/configure.in:1.579.2.52.2.50 Thu May 3 01:16:50 2007
+++ php-src/configure.in Mon May 21 08:47:51 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.50 2007/05/03 01:16:50 iliaa Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.51 2007/05/21 08:47:51 dmitry Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -260,12 +260,6 @@
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
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/config9.m4?r1=1.17.2.2.2.2&r2=1.17.2.2.2.3&diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.17.2.2.2.2 php-src/sapi/cgi/config9.m4:1.17.2.2.2.3
--- php-src/sapi/cgi/config9.m4:1.17.2.2.2.2 Tue Feb 20 20:11:11 2007
+++ php-src/sapi/cgi/config9.m4 Mon May 21 08:47:51 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.17.2.2.2.2 2007/02/20 20:11:11 tony2001 Exp $
+dnl $Id: config9.m4,v 1.17.2.2.2.3 2007/05/21 08:47:51 dmitry Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -98,14 +98,11 @@
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)"