Hi,
the attached patch fixes bug #20807. It's against current HEAD.
Verified to install 'php' and 'php-cli' (without the exe
extension).
--
With kind regards,
Melvyn Sopacua
<?php include("not_reflecting_employers_views.txt"); ?>
Index: sapi/cli/config.m4
===================================================================
RCS file: /repository/php4/sapi/cli/config.m4,v
retrieving revision 1.12
diff -u -r1.12 config.m4
--- sapi/cli/config.m4 14 Nov 2002 01:09:46 -0000 1.12
+++ sapi/cli/config.m4 9 Dec 2002 00:21:26 -0000
@@ -22,6 +22,10 @@
*darwin*)
BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(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) \$(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) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
Index: sapi/cgi/config9.m4
===================================================================
RCS file: /repository/php4/sapi/cgi/config9.m4,v
retrieving revision 1.3
diff -u -r1.3 config9.m4
--- sapi/cgi/config9.m4 1 Dec 2002 21:50:35 -0000 1.3
+++ sapi/cgi/config9.m4 9 Dec 2002 00:21:26 -0000
@@ -86,7 +86,14 @@
AC_MSG_RESULT(yes)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
- SAPI_CGI_PATH=sapi/cgi/php-cgi
+ case $host_alias in
+ *cygwin* )
+ SAPI_CGI_PATH=sapi/cgi/php-cgi.exe
+ ;;
+ * )
+ SAPI_CGI_PATH=sapi/cgi/php-cgi
+ ;;
+ esac
PHP_SUBST(SAPI_CGI_PATH)
PHP_TEST_WRITE_STDOUT
--
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php
