[PHP-CVS] cvs: php4 /sapi/cgi config9.m4
sniper Sun Feb 23 04:37:13 2003 EDT Modified files: /php4/sapi/cgi config9.m4 Log: MFB: Fixed bug #22356 (Do not add empty -I flags). Index: php4/sapi/cgi/config9.m4 diff -u php4/sapi/cgi/config9.m4:1.5 php4/sapi/cgi/config9.m4:1.6 --- php4/sapi/cgi/config9.m4:1.5Thu Dec 19 12:02:40 2002 +++ php4/sapi/cgi/config9.m4Sun Feb 23 04:37:13 2003 -1,5 +1,5 dnl -dnl $Id: config9.m4,v 1.5 2002/12/19 17:02:40 edink Exp $ +dnl $Id: config9.m4,v 1.6 2003/02/23 09:37:13 sniper Exp $ dnl AC_ARG_ENABLE(cgi, -135,7 +135,7 if test $PHP_ENABLE_FASTCGI = yes; then PHP_FASTCGI=1 PHP_FCGI_FILES=libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c - PHP_FCGI_INCLUDE=$PHP_LIBFCGI_DIR/include + PHP_FCGI_INCLUDE=-I$PHP_LIBFCGI_DIR/include PHP_FCGI_STATIC=1 else PHP_FASTCGI=0 -148,7 +148,7 AC_MSG_RESULT($PHP_ENABLE_FASTCGI) INSTALL_IT=\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php -PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, -I$PHP_FCGI_INCLUDE,'$(SAPI_CGI_PATH)') +PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)') case $host_alias in *darwin*) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/cgi config9.m4 /sapi/cli config.m4
msopacuaMon 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.12Wed 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.3Sun Dec 1 16:50:35 2002 +++ php4/sapi/cgi/config9.m4Mon 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
[PHP-CVS] cvs: php4 /sapi/cgi config9.m4
shane Sun Dec 1 16:50:35 2002 EDT Modified files: /php4/sapi/cgi config9.m4 Log: build support for cgi fixes previously commited Index: php4/sapi/cgi/config9.m4 diff -u php4/sapi/cgi/config9.m4:1.2 php4/sapi/cgi/config9.m4:1.3 --- php4/sapi/cgi/config9.m4:1.2Tue Nov 26 00:51:15 2002 +++ php4/sapi/cgi/config9.m4Sun Dec 1 16:50:35 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.2 2002/11/26 05:51:15 shane Exp $ +dnl $Id: config9.m4,v 1.3 2002/12/01 21:50:35 shane Exp $ dnl AC_ARG_ENABLE(cgi, @@ -41,6 +41,15 @@ PHP_ENABLE_FASTCGI=no ]) +AC_ARG_ENABLE(path-info-check, +[ --disable-path-info-check If this is disabled, paths such as + /info.php/test?a=b will fail to work.], +[ + PHP_ENABLE_PATHINFO_CHECK=$enableval +],[ + PHP_ENABLE_PATHINFO_CHECK=yes +]) + AC_DEFUN(PHP_TEST_WRITE_STDOUT,[ AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[ AC_TRY_RUN([ @@ -100,6 +109,15 @@ fi AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) AC_MSG_RESULT($PHP_DISCARD_PATH) + +AC_MSG_CHECKING(whether to enable path info checking) +if test $PHP_ENABLE_PATHINFO_CHECK = yes; then + ENABLE_PATHINFO_CHECK=1 +else + ENABLE_PATHINFO_CHECK=0 +fi +AC_DEFINE_UNQUOTED(ENABLE_PATHINFO_CHECK, $ENABLE_PATHINFO_CHECK, [ ]) +AC_MSG_RESULT($PHP_ENABLE_PATHINFO_CHECK) AC_MSG_CHECKING(whether to enable fastcgi support) PHP_LIBFCGI_DIR=$abs_srcdir/sapi/cgi/libfcgi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
