msopacua Mon Dec 9 12:02:39 2002 EDT Modified files: /php4/sapi/cli config.m4 /php4/sapi/cgi config9.m4 Log: Fix make install target on Cygwin, bug #20807 Index: php4/sapi/cli/config.m4 diff -u php4/sapi/cli/config.m4:1.12 php4/sapi/cli/config.m4:1.13 --- php4/sapi/cli/config.m4:1.12 Wed Nov 13 20:09:46 2002 +++ php4/sapi/cli/config.m4 Mon Dec 9 12:02:38 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.12 2002/11/14 01:09:46 sas Exp $ +dnl $Id: config.m4,v 1.13 2002/12/09 17:02:38 msopacua Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -21,6 +21,10 @@ case $host_alias in *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: php4/sapi/cgi/config9.m4 diff -u php4/sapi/cgi/config9.m4:1.3 php4/sapi/cgi/config9.m4:1.4 --- php4/sapi/cgi/config9.m4:1.3 Sun Dec 1 16:50:35 2002 +++ php4/sapi/cgi/config9.m4 Mon Dec 9 12:02:38 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.3 2002/12/01 21:50:35 shane Exp $ +dnl $Id: config9.m4,v 1.4 2002/12/09 17:02:38 msopacua Exp $ dnl AC_ARG_ENABLE(cgi, @@ -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 CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php