cvs: php-src(PHP_5_0) / configure.in /sapi/cgi config9.m4 /sapi/cli config.m4
| From: | Jani Taskinen | Date: | Thu, 21 Apr 2005 15:13:16 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / configure.in /sapi/cgi config9.m4 /sapi/cli config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31533@lists.php.net to get a copy of this message | ||
sniper Thu Apr 21 11:13:16 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src configure.in
/php-src/sapi/cli config.m4
/php-src/sapi/cgi config9.m4
Log:
MFH: expose EXEEXT and use with CLI/CGI
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.48&r2=1.514.2.49&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.48 php-src/configure.in:1.514.2.49
--- php-src/configure.in:1.514.2.48 Fri Apr 8 09:37:23 2005
+++ php-src/configure.in Thu Apr 21 11:13:15 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.48 2005/04/08 13:37:23 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.514.2.49 2005/04/21 15:13:15 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1142,6 +1142,7 @@
PHP_SUBST(sysconfdir)
PHP_SUBST(AWK)
+PHP_SUBST(EXEEXT)
PHP_SUBST(CC)
PHP_SUBST(CFLAGS)
PHP_SUBST(CFLAGS_CLEAN)
http://cvs.php.net/diff.php/php-src/sapi/cli/config.m4?r1=1.18&r2=1.18.2.1&ty=u
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.18 php-src/sapi/cli/config.m4:1.18.2.1
--- php-src/sapi/cli/config.m4:1.18 Mon Dec 1 10:17:10 2003
+++ php-src/sapi/cli/config.m4 Thu Apr 21 11:13:16 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.18 2003/12/01 15:17:10 sniper Exp $
+dnl $Id: config.m4,v 1.18.2.1 2005/04/21 15:13:16 sniper Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -22,15 +22,11 @@
*darwin*)
BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS)
\$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
- *cygwin*)
- SAPI_CLI_PATH=sapi/cli/php.exe
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
- ;;
*)
BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
esac
- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755
\$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"
+ INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755
\$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
PHP_SUBST(BUILD_CLI)
PHP_SUBST(INSTALL_CLI)
http://cvs.php.net/diff.php/php-src/sapi/cgi/config9.m4?r1=1.12.2.2&r2=1.12.2.3&ty=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.12.2.2 php-src/sapi/cgi/config9.m4:1.12.2.3
--- php-src/sapi/cgi/config9.m4:1.12.2.2 Sun Mar 6 18:16:53 2005
+++ php-src/sapi/cgi/config9.m4 Thu Apr 21 11:13:16 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.12.2.2 2005/03/06 23:16:53 sniper Exp $
+dnl $Id: config9.m4,v 1.12.2.3 2005/04/21 15:13:16 sniper Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -149,7 +149,7 @@
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)"
+ 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)"
PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE,
'$(SAPI_CGI_PATH)')
case $host_alias in