From: Jani Taskinen Date: Wed, 11 Jul 2007 23:20:37 +0000 (+0000) Subject: MFH: - Changed AC_ARG_* options to PHP_ARG_* options. X-Git-Tag: php-5.2.4RC1~174 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb923bf6fc9cf71aaf45641784aeb3d23254bf45;p=php MFH: - Changed AC_ARG_* options to PHP_ARG_* options. MFH: - Some cleanups here and there MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure MFH: options) # Note to Marcus: ext/dba/config.m4 needs to be "converted" to use # the PHP_ARG_* options. I did't touch it needs quite a lot of work to keep # it's current behaviour regarding "enabled-by-default" parts of it. # # Hint: By using the PHP_ARG_* options you have the "default" option.. ;) --- diff --git a/configure.in b/configure.in index 8e88952db3..0e0d967bab 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ - ## $Id$ -*- autoconf -*- +## $Id$ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -10,8 +10,6 @@ dnl ## options and check for the basic compile tools. dnl ## Diversion 2 is the initial checking of OS features, programs, dnl ## libraries and so on. - - dnl ## In diversion 3 we check for compile-time options to the PHP dnl ## core and how to deal with different system dependencies. This dnl ## includes what regex library is used and whether debugging or short @@ -131,9 +129,8 @@ AC_AIX AC_PROG_LN_S dnl Support systems with system libraries in e.g. /usr/lib64 -AC_ARG_WITH(libdir, -[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], -[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) +PHP_ARG_WITH(libdir, for system library directory, +[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib],lib,no) dnl check for -R, etc. switch PHP_RUNPATH_SWITCH @@ -707,9 +704,9 @@ else ZEND_DEBUG=no fi -PHP_ARG_WITH(layout,[layout of installed files], -[ --with-layout=TYPE Set how installed files will be laid out. Type is - one of "PHP" or "GNU" [TYPE=PHP]], PHP, no) +PHP_ARG_WITH(layout, layout of installed files, +[ --with-layout=TYPE Set how installed files will be laid out. Type can + be either PHP or GNU [PHP]], PHP, no) case $PHP_LAYOUT in GNU) @@ -720,7 +717,7 @@ case $PHP_LAYOUT in ;; esac -PHP_ARG_WITH(config-file-path,[path to configuration file], +PHP_ARG_WITH(config-file-path, path to configuration file, [ --with-config-file-path=PATH Set the path in which to look for php.ini [PREFIX/lib]], DEFAULT, no) @@ -735,12 +732,14 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then esac fi -PHP_ARG_WITH(config-file-scan-dir,[where to scan for configuration files], +AC_MSG_CHECKING([where to scan for configuration files]) +PHP_ARG_WITH(config-file-scan-dir,, [ --with-config-file-scan-dir=PATH Set the path where to scan for configuration files], DEFAULT, no) if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then PHP_CONFIG_FILE_SCAN_DIR= fi +AC_MSG_RESULT([$PHP_CONFIG_FILE_SCAN_DIR]) test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" @@ -754,28 +753,19 @@ else fi AC_MSG_CHECKING([for safe mode exec dir]) -AC_ARG_WITH(exec-dir, +PHP_ARG_WITH(exec-dir,, [ --with-exec-dir[=DIR] Only allow executables in DIR under safe-mode - [/usr/local/php/bin]], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ]) - AC_MSG_RESULT([/usr/local/php/bin]) - else - AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval", [ ]) - AC_MSG_RESULT([$withval]) - fi - else - AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ]) - AC_MSG_RESULT([/usr/local/php/bin]) - fi -],[ - AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ]) + [/usr/local/php/bin]], no, no) + +if test "$PHP_EXEC_DIR" != "no" && test "$PHP_EXEC_DIR" != "yes" ; then + AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR, "$PHP_EXEC_DIR", [ ]) + AC_MSG_RESULT([$PHP_EXEC_DIR]) +else + AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR, "/usr/local/php/bin", [ ]) AC_MSG_RESULT([/usr/local/php/bin]) -]) +fi -PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler, +PHP_ARG_ENABLE(sigchild, whether to enable PHP's own SIGCHLD handler, [ --enable-sigchild Enable PHP's own SIGCHLD handler], no, no) if test "$PHP_SIGCHILD" = "yes"; then @@ -784,7 +774,7 @@ else AC_DEFINE(PHP_SIGCHILD, 0, [ ]) fi -PHP_ARG_ENABLE(magic-quotes,whether to enable magic quotes by default, +PHP_ARG_ENABLE(magic-quotes, whether to enable magic quotes by default, [ --enable-magic-quotes Enable magic quotes by default.], no, no) if test "$PHP_MAGIC_QUOTES" = "yes"; then @@ -809,20 +799,19 @@ if test "$PHP_LIBGCC" = "yes"; then PHP_ADD_LIBRARY(gcc, yes) fi -PHP_ARG_ENABLE(short-tags,whether to enable short tags by default, -[ --disable-short-tags Disable the short-form disable PEAR -if test "$PHP_SAPI_CLI" = "no"; then +if test "$PHP_CLI" = "no"; then with_pear=no fi @@ -1146,7 +1133,7 @@ case $host_alias in ;; esac -if test "$PHP_SAPI_CLI" != "no"; then +if test "$PHP_CLI" != "no"; then PHP_CLI_TARGET="\$(SAPI_CLI_PATH)" PHP_INSTALL_CLI_TARGET="install-cli" PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c getopt.c,, cli) @@ -1365,6 +1352,14 @@ scripts/phpize scripts/man1/phpize.1 \ scripts/php-config scripts/man1/php-config.1 \ $PHP_OUTPUT_FILES" +dnl +dnl Check for unknown configure options +dnl +PHP_CHECK_CONFIGURE_OPTIONS + +dnl +dnl Generate build files +dnl AC_OUTPUT($ALL_OUTPUT_FILES, [], [ if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then @@ -1426,17 +1421,15 @@ dnl fi # Warn about CGI version with no extra security options. if test "$PHP_SAPI" = "cgi"; then - if test "$REDIRECT" = "0"; then - if test "$DISCARD_PATH" = "0"; then - echo "+--------------------------------------------------------------------+" - echo "| *** WARNING *** |" - echo "| |" - echo "| You will be compiling the CGI version of PHP without any |" - echo "| redirection checking. By putting this cgi binary somewhere in |" - echo "| your web space, users may be able to circumvent existing .htaccess |" - echo "| security by loading files directly through the parser. See |" - echo "| http://www.php.net/manual/security.php for more details. |" - fi + if test "$PHP_FORCE_CGI_REDIRECT" = "no" && test "$PHP_DISCARD_PATH" = "no"; then + echo "+--------------------------------------------------------------------+" + echo "| *** WARNING *** |" + echo "| |" + echo "| You will be compiling the CGI version of PHP without any |" + echo "| redirection checking. By putting this cgi binary somewhere in |" + echo "| your web space, users may be able to circumvent existing .htaccess |" + echo "| security by loading files directly through the parser. See |" + echo "| http://www.php.net/manual/security.php for more details. |" fi fi @@ -1498,6 +1491,15 @@ Thank you for using PHP. X + # Output unknown configure options + if test "$PHP_UNKNOWN_CONFIGURE_OPTIONS"; then + echo "Notice: Following unknown configure options were used: +$PHP_UNKNOWN_CONFIGURE_OPTIONS + +Check '[$]0 --help' for available options +" + fi + fi ]) diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 00ac70bb27..26e2f1f43d 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -96,19 +96,21 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[ AC_MSG_RESULT(`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`) ]) +dnl +dnl configure options +dnl if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for Adabas support) -AC_ARG_WITH(adabas, -[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], -[ - PHP_WITH_SHARED - if test "$withval" = "yes"; then - withval=/usr/local - fi - if test "$withval" != "no"; then - PHP_ADD_INCLUDE($withval/incl) - PHP_ADD_LIBPATH($withval/$PHP_LIBDIR) - ODBC_OBJS="$withval/$PHP_LIBDIR/odbclib.a" +PHP_ARG_WITH(adabas,, +[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) + + if test "$PHP_ADABAS" != "no"; then + AC_MSG_CHECKING([for Adabas support]) + if test "$PHP_ADABAS" = "yes"; then + PHP_ADABAS=/usr/local + fi + PHP_ADD_INCLUDE($PHP_ADABAS/incl) + PHP_ADD_LIBPATH($PHP_ADABAS/$PHP_LIBDIR) + ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a" ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" $srcdir/build/shtool mkdir -f -p ext/odbc rm -f "$ODBC_LIB" @@ -119,52 +121,39 @@ AC_ARG_WITH(adabas, ODBC_TYPE=adabas PHP_ODBC_CHECK_HEADER(sqlext.h) AC_DEFINE(HAVE_ADABAS,1,[ ]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_MSG_RESULT([$ext_output]) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for SAP DB support) -AC_ARG_WITH(sapdb, -[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], -[ - PHP_WITH_SHARED - if test "$withval" = "yes"; then - withval=/usr/local - fi - if test "$withval" != "no"; then - PHP_ADD_INCLUDE($withval/incl) - PHP_ADD_LIBPATH($withval/lib) +PHP_ARG_WITH(sapdb,, +[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) + + if test "$PHP_SAPDB" != "no"; then + AC_MSG_CHECKING([for SAP DB support]) + if test "$PHP_SAPDB" = "yes"; then + PHP_SAPDB=/usr/local + fi + PHP_ADD_INCLUDE($PHP_SAPDB/incl) + PHP_ADD_LIBPATH($PHP_SAPDB/lib) PHP_ADD_LIBRARY(sqlod) ODBC_TYPE=sapdb AC_DEFINE(HAVE_SAPDB,1,[ ]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_MSG_RESULT([$ext_output]) fi -],[ - AC_MSG_RESULT(no) -]) fi - if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for Solid support) -AC_ARG_WITH(solid, -[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], -[ - PHP_WITH_SHARED - if test "$withval" = "yes"; then - withval=/usr/local/solid - fi - if test "$withval" != "no"; then - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/$PHP_LIBDIR +PHP_ARG_WITH(solid,, +[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) + + if test "$PHP_SOLID" != "no"; then + AC_MSG_CHECKING(for Solid support) + if test "$PHP_SOLID" = "yes"; then + PHP_SOLID=/usr/local/solid + fi + ODBC_INCDIR=$PHP_SOLID/include + ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=solid if test -f $ODBC_LIBDIR/soc*35.a; then @@ -174,41 +163,35 @@ AC_ARG_WITH(solid, elif test -f $ODBC_LIBDIR/scl*23.a; then AC_DEFINE(HAVE_SOLID,1,[ ]) fi - AC_MSG_RESULT(yes) + AC_MSG_RESULT([$ext_output]) PHP_ODBC_FIND_SOLID_LIBS($ODBC_LIBDIR) - else - AC_MSG_RESULT(no) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for IBM DB2 support) -AC_ARG_WITH(ibm-db2, -[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], -[ - PHP_WITH_SHARED - if test "$withval" != "no"; then - if test "$withval" = "yes"; then +PHP_ARG_WITH(ibm-db2,, +[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) + + if test "$PHP_IBM_DB2" != "no"; then + AC_MSG_CHECKING(for IBM DB2 support) + if test "$PHP_IBM_DB2" = "yes"; then ODBC_INCDIR=/home/db2inst1/sqllib/include ODBC_LIBDIR=/home/db2inst1/sqllib/lib else - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/$PHP_LIBDIR + ODBC_INCDIR=$PHP_IBM_DB2/include + ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR fi PHP_ODBC_CHECK_HEADER(sqlcli1.h) ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR - ODBC_TYPE=db2 + ODBC_TYPE=ibm-db2 ODBC_LIBS=-ldb2 PHP_TEST_BUILD(SQLExecute, [ AC_DEFINE(HAVE_IBMDB2,1,[ ]) - AC_MSG_RESULT(yes) + AC_MSG_RESULT([$ext_output]) ], [ AC_MSG_RESULT(no) AC_MSG_ERROR([ @@ -219,84 +202,66 @@ You need to source your DB2 environment before running PHP configure: ], [ $ODBC_LFLAGS $ODBC_LIBS ]) - else - AC_MSG_RESULT(no) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for ODBCRouter.com support) -AC_ARG_WITH(ODBCRouter, -[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], -[ - PHP_WITH_SHARED - if test "$withval" = "yes"; then - withval=/usr - fi - if test "$withval" != "no"; then - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib +PHP_ARG_WITH(ODBCRouter,, +[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) + + if test "$PHP_ODBCROUTER" != "no"; then + AC_MSG_CHECKING(for ODBCRouter.com support) + if test "$PHP_ODBCROUTER" = "yes"; then + PHP_ODBCROUTER=/usr + fi + ODBC_INCDIR=$PHP_ODBCROUTER/include + ODBC_LIBDIR=$PHP_ODBCROUTER/lib ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lodbcsdk ODBC_TYPE=ODBCRouter AC_DEFINE(HAVE_ODBC_ROUTER,1,[ ]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_MSG_RESULT([$ext_output]) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for Empress support) -AC_ARG_WITH(empress, +PHP_ARG_WITH(empress,, [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)], -[ - PHP_WITH_SHARED - if test "$withval" != "no"; then - if test "$withval" = "yes"; then + (Empress Version >= 8.60 required)]) + + if test "$PHP_EMPRESS" != "no"; then + AC_MSG_CHECKING(for Empress support) + if test "$PHP_EMPRESS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc ODBC_LIBDIR=$EMPRESSPATH/shlib else - ODBC_INCDIR=$withval/include/odbc - ODBC_LIBDIR=$withval/shlib + ODBC_INCDIR=$PHP_EMPRESS/include/odbc + ODBC_LIBDIR=$PHP_EMPRESS/shlib fi ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_TYPE=empress AC_DEFINE(HAVE_EMPRESS,1,[ ]) - AC_MSG_RESULT(yes) + AC_MSG_RESULT([$ext_output]) PHP_ODBC_FIND_EMPRESS_LIBS($ODBC_LIBDIR) - else - AC_MSG_RESULT(no) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for Empress local access support) -AC_ARG_WITH(empress-bcs, +PHP_ARG_WITH(empress-bcs,, [ --with-empress-bcs[=DIR] Include Empress Local Access support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)], -[ - PHP_WITH_SHARED - if test "$withval" != "no"; then - if test "$withval" = "yes"; then + (Empress Version >= 8.60 required)]) + + if test "$PHP_EMPRESS_BCS" != "no"; then + AC_MSG_CHECKING(for Empress local access support) + if test "$PHP_EMPRESS_BCS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc ODBC_LIBDIR=$EMPRESSPATH/shlib else - ODBC_INCDIR=$withval/include/odbc - ODBC_LIBDIR=$withval/shlib + ODBC_INCDIR=$PHP_EMPRESS_BCS/include/odbc + ODBC_LIBDIR=$PHP_EMPRESS_BCS/shlib fi CC="empocc -bcs";export CC; LD="empocc -bcs";export LD; @@ -307,41 +272,34 @@ AC_ARG_WITH(empress-bcs, NEWLIST= for I in $LIST do - case $I in - $EMPRESSPATH/odbccl/lib/* | \ - $EMPRESSPATH/rdbms/lib/* | \ - $EMPRESSPATH/common/lib/*) - NEWLIST="$NEWLIST $I" - ;; - esac + case $I in + $EMPRESSPATH/odbccl/lib/* | \ + $EMPRESSPATH/rdbms/lib/* | \ + $EMPRESSPATH/common/lib/*) + NEWLIST="$NEWLIST $I" + ;; + esac done ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt" - ODBC_TYPE=empress + ODBC_TYPE=empress-bcs AC_DEFINE(HAVE_EMPRESS,1,[ ]) - AC_MSG_RESULT(yes) + AC_MSG_RESULT([$ext_output]) PHP_ODBC_FIND_EMPRESS_BCS_LIBS($ODBC_LIBDIR) - else - AC_MSG_RESULT(no) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for Birdstep support) -AC_ARG_WITH(birdstep, -[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], -[ - PHP_WITH_SHARED - - if test "$withval" != "no"; then - if test "$withval" = "yes"; then +PHP_ARG_WITH(birdstep,, +[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) + + if test "$PHP_BIRDSTEP" != "no"; then + AC_MSG_CHECKING(for Birdstep support) + if test "$PHP_BIRDSTEP" = "yes"; then ODBC_INCDIR=/usr/local/birdstep/include ODBC_LIBDIR=/usr/local/birdstep/lib else - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/$PHP_LIBDIR + ODBC_INCDIR=$PHP_BIRDSTEP/include + ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR fi case $host_alias in @@ -373,19 +331,12 @@ AC_ARG_WITH(birdstep, fi AC_DEFINE(HAVE_BIRDSTEP,1,[ ]) - - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_MSG_RESULT([$ext_output]) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for a custom ODBC support) -AC_ARG_WITH(custom-odbc, +PHP_ARG_WITH(custom-odbc,, [ --with-custom-odbc[=DIR] Include user defined ODBC support. DIR is ODBC install base directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and @@ -394,140 +345,115 @@ AC_ARG_WITH(custom-odbc, running this configure script: CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" LDFLAGS=-lunix - CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], -[ - if test "$withval" = "yes"; then - withval=/usr/local - fi - if test "$withval" != "no"; then - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/$PHP_LIBDIR + CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) + + if test "$PHP_CUSTOM_ODBC" != "no"; then + AC_MSG_CHECKING(for a custom ODBC support) + if test "$PHP_CUSTOM_ODBC" = "yes"; then + PHP_CUSTOM_ODBC=/usr/local + fi + ODBC_INCDIR=$PHP_CUSTOM_ODBC/include + ODBC_LIBDIR=$PHP_CUSTOM_ODBC/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=$CUSTOM_ODBC_LIBS - ODBC_TYPE=custom + ODBC_TYPE=custom-odbc AC_DEFINE(HAVE_CODBC,1,[ ]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_MSG_RESULT([$ext_ouput]) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for iODBC support) -AC_ARG_WITH(iodbc, -[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], -[ - PHP_WITH_SHARED - if test "$withval" = "yes"; then - withval=/usr/local - fi - if test "$withval" != "no"; then - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) - PHP_ADD_INCLUDE($withval/include, 1) +PHP_ARG_WITH(iodbc,, +[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) + + if test "$PHP_IODBC" != "no"; then + AC_MSG_CHECKING(for iODBC support) + if test "$PHP_IODBC" = "yes"; then + PHP_IODBC=/usr/local + fi + PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/lib) + PHP_ADD_INCLUDE($PHP_IODBC/include, 1) ODBC_TYPE=iodbc - ODBC_INCLUDE=-I$withval/include - ODBC_LFLAGS=-L$withval/$PHP_LIBDIR + ODBC_INCLUDE=-I$PHP_IODBC/include + ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR ODBC_LIBS=-liodbc AC_DEFINE(HAVE_IODBC,1,[ ]) AC_DEFINE(HAVE_ODBC2,1,[ ]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_MSG_RESULT([$ext_output]) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) -AC_ARG_WITH(esoob, -[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], -[ - PHP_WITH_SHARED - if test "$withval" = "yes"; then - withval=/usr/local/easysoft/oob/client - fi - if test "$withval" != "no"; then - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/$PHP_LIBDIR +PHP_ARG_WITH(esoob,, +[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) + + if test "$PHP_ESOOB" != "no"; then + AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) + if test "$PHP_ESOOB" = "yes"; then + PHP_ESOOB=/usr/local/easysoft/oob/client + fi + ODBC_INCDIR=$PHP_ESOOB/include + ODBC_LIBDIR=$PHP_ESOOB/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lesoobclient - ODBC_TYPE=ESOOB + ODBC_TYPE=esoob AC_DEFINE(HAVE_ESOOB,1,[ ]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_MSG_RESULT([$ext_output]) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for unixODBC support) -AC_ARG_WITH(unixODBC, -[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], -[ - PHP_WITH_SHARED - if test "$withval" = "yes"; then - withval=/usr/local - fi - if test "$withval" != "no"; then - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/$PHP_LIBDIR +PHP_ARG_WITH(unixODBC,, +[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) + + if test "$PHP_UNIXODBC" != "no"; then + AC_MSG_CHECKING(for unixODBC support) + if test "$PHP_UNIXODBC" = "yes"; then + PHP_UNIXODBC=/usr/local + fi + ODBC_INCDIR=$PHP_UNIXODBC/include + ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lodbc ODBC_TYPE=unixODBC PHP_ODBC_CHECK_HEADER(sqlext.h) AC_DEFINE(HAVE_UNIXODBC,1,[ ]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_MSG_RESULT([$ext_output]) fi -],[ - AC_MSG_RESULT(no) -]) fi if test -z "$ODBC_TYPE"; then -AC_MSG_CHECKING(for DBMaker support) -AC_ARG_WITH(dbmaker, -[ --with-dbmaker[=DIR] Include DBMaker support], -[ - PHP_WITH_SHARED - if test "$withval" = "yes"; then - # find dbmaker's home directory - DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` - - # check DBMaker version (from 5.0 to 2.0) - DBMAKER_VERSION=5.0 - - while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do +PHP_ARG_WITH(dbmaker,, +[ --with-dbmaker[=DIR] Include DBMaker support]) + + if test "$PHP_DBMAKER" != "no"; then + AC_MSG_CHECKING(for DBMaker support) + if test "$PHP_DBMAKER" = "yes"; then + # find dbmaker's home directory + DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` + + # check DBMaker version (from 5.0 to 2.0) + DBMAKER_VERSION=5.0 + + while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print $1-1;}'` MAJOR_V=`echo $DM_VER | $AWK '{ print $1/10; }' | $AWK -F. '{ print $1; }'` MINOR_V=`echo $DM_VER | $AWK '{ print $1%10; }'` DBMAKER_VERSION=$MAJOR_V.$MINOR_V - done + done - if test "$DBMAKER_VERSION" = "2.9"; then - withval=$DBMAKER_HOME - else - DBMAKER_PATH=$DBMAKER_HOME/$DBMAKER_VERSION + if test "$DBMAKER_VERSION" = "2.9"; then + PHP_DBMAKER=$DBMAKER_HOME + else + PHP_DBMAKER=$DBMAKER_HOME/$DBMAKER_VERSION + fi fi - withval=$DBMAKER_PATH - fi - - if test "$withval" != "no"; then - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/$PHP_LIBDIR + ODBC_INCDIR=$PHP_DBMAKER/include + ODBC_LIBDIR=$PHP_DBMAKER/$PHP_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR @@ -536,35 +462,30 @@ AC_ARG_WITH(dbmaker, AC_DEFINE(HAVE_DBMAKER,1,[Whether you want DBMaker]) - if test "$shared" = "yes"; then - AC_MSG_RESULT(yes (shared)) - ODBC_LIBS="-ldmapic -lc -lm" - ODBC_SHARED="odbc.la" + if test "$ext_shared" = "yes"; then + AC_MSG_RESULT([yes (shared)]) + ODBC_LIBS="-ldmapic -lc -lm" + ODBC_SHARED="odbc.la" else - AC_MSG_RESULT(yes (static)) - PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR) - PHP_ADD_INCLUDE($ODBC_INCDIR) - ODBC_STATIC="libphpext_odbc.la" + AC_MSG_RESULT([yes (static)]) + PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR) + PHP_ADD_INCLUDE($ODBC_INCDIR) + ODBC_STATIC="libphpext_odbc.la" fi - - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) fi -],[ - AC_MSG_RESULT(no) -]) fi +dnl +dnl Extension setup +dnl if test -n "$ODBC_TYPE"; then if test "$ODBC_TYPE" != "dbmaker"; then - ext_shared=$shared PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD) if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ]) fi fi - + AC_DEFINE(HAVE_UODBC,1,[ ]) PHP_SUBST(ODBC_SHARED_LIBADD) PHP_SUBST(ODBC_INCDIR) diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4 index 2c905af2cc..a193bfd058 100644 --- a/sapi/aolserver/config.m4 +++ b/sapi/aolserver/config.m4 @@ -2,14 +2,10 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for AOLserver support) -AC_ARG_WITH(aolserver, -[ --with-aolserver=DIR Specify path to the installed AOLserver],[ - PHP_AOLSERVER=$withval -],[ - PHP_AOLSERVER=no -]) -AC_MSG_RESULT($PHP_AOLSERVER) +PHP_ARG_WITH(aolserver,, +[ --with-aolserver=DIR Specify path to the installed AOLserver], no, no) + +AC_MSG_CHECKING([for AOLserver support]) if test "$PHP_AOLSERVER" != "no"; then if test -d "$PHP_AOLSERVER/include"; then @@ -28,6 +24,8 @@ if test "$PHP_AOLSERVER" != "no"; then INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_AOLSERVER/bin/" fi +AC_MSG_RESULT([$PHP_AOLSERVER]) + dnl ## Local Variables: dnl ## tab-width: 4 dnl ## End: diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index 0ac7ccfb87..af83e9bcfa 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -18,14 +18,12 @@ if test "$ac_cv_php_fd_in_buff" = "yes"; then fi ]) -AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) -AC_ARG_WITH(apxs, +dnl Apache 1.x shared module +PHP_ARG_WITH(apxs,, [ --with-apxs[=FILE] Build shared Apache 1.x module. FILE is the optional - pathname to the Apache apxs tool [apxs]],[ - PHP_APXS=$withval -],[ - PHP_APXS=no -]) + pathname to the Apache apxs tool [apxs]], no, no) + +AC_MSG_CHECKING([for Apache 1.x module support via DSO through APXS]) if test "$PHP_APXS" != "no"; then if test "$PHP_APXS" = "yes"; then @@ -123,138 +121,130 @@ else AC_MSG_RESULT(no) fi -AC_MSG_CHECKING(for Apache 1.x module support) -AC_ARG_WITH(apache, +dnl Apache 1.x static module +PHP_ARG_WITH(apache,, [ --with-apache[=DIR] Build Apache 1.x module. DIR is the top-level Apache - build directory [/usr/local/apache]],[ - if test "$withval" = "yes"; then + build directory [/usr/local/apache]], no, no) + +AC_MSG_CHECKING([for Apache 1.x module support]) + +if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then + + if test "$PHP_APACHE" = "yes"; then # Apache's default directory PHP_APACHE=/usr/local/apache - else - PHP_APACHE=$withval fi -], [ - PHP_APACHE=no -]) -if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module" - if test "$PHP_APACHE" != "no"; then - AC_DEFINE(HAVE_APACHE,1,[ ]) - APACHE_MODULE=yes - PHP_EXPAND_PATH($PHP_APACHE, PHP_APACHE) - # For Apache 1.2.x - if test -f $PHP_APACHE/src/httpd.h; then - APACHE_INCLUDE=-I$PHP_APACHE/src - APACHE_TARGET=$PHP_APACHE/src - PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET" - PHP_LIBS="-L. -lphp3" - AC_MSG_RESULT(yes - Apache 1.2.x) - STRONGHOLD= - if test -f $PHP_APACHE/src/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) - fi - # For Apache 2.0.x - elif test -f $PHP_APACHE/include/httpd.h && - test -f $PHP_APACHE/srclib/apr/include/apr_general.h ; then - AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) - # For Apache 1.3.x - elif test -f $PHP_APACHE/src/main/httpd.h; then - APACHE_HAS_REGEX=1 - APACHE_INCLUDE="-I$PHP_APACHE/src/main -I$PHP_APACHE/src/os/unix -I$PHP_APACHE/src/ap" - APACHE_TARGET=$PHP_APACHE/src/modules/php5 - if test ! -d $APACHE_TARGET; then - mkdir $APACHE_TARGET - fi - PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" - PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" - AC_MSG_RESULT(yes - Apache 1.3.x) - STRONGHOLD= - if test -f $PHP_APACHE/src/include/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) - fi - if test -f $PHP_APACHE/src/include/ap_compat.h; then - AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) - if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again) - fi - else - if test -f $PHP_APACHE/src/include/compat.h; then - AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ]) - fi - fi - # Also for Apache 1.3.x - elif test -f $PHP_APACHE/src/include/httpd.h; then - APACHE_HAS_REGEX=1 - APACHE_INCLUDE="-I$PHP_APACHE/src/include -I$PHP_APACHE/src/os/unix" - APACHE_TARGET=$PHP_APACHE/src/modules/php5 - if test ! -d $APACHE_TARGET; then - mkdir $APACHE_TARGET - fi - PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) - PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" - AC_MSG_RESULT(yes - Apache 1.3.x) - STRONGHOLD= - if test -f $PHP_APACHE/src/include/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) - fi - if test -f $PHP_APACHE/src/include/ap_compat.h; then - AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) - if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again) - fi - else - if test -f $PHP_APACHE/src/include/compat.h; then - AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ]) - fi + AC_DEFINE(HAVE_APACHE,1,[ ]) + APACHE_MODULE=yes + PHP_EXPAND_PATH($PHP_APACHE, PHP_APACHE) + # For Apache 1.2.x + if test -f $PHP_APACHE/src/httpd.h; then + APACHE_INCLUDE=-I$PHP_APACHE/src + APACHE_TARGET=$PHP_APACHE/src + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET" + PHP_LIBS="-L. -lphp3" + AC_MSG_RESULT([yes - Apache 1.2.x]) + STRONGHOLD= + if test -f $PHP_APACHE/src/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) + fi + # For Apache 2.0.x + elif test -f $PHP_APACHE/include/httpd.h && test -f $PHP_APACHE/srclib/apr/include/apr_general.h ; then + AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) + # For Apache 1.3.x + elif test -f $PHP_APACHE/src/main/httpd.h; then + APACHE_HAS_REGEX=1 + APACHE_INCLUDE="-I$PHP_APACHE/src/main -I$PHP_APACHE/src/os/unix -I$PHP_APACHE/src/ap" + APACHE_TARGET=$PHP_APACHE/src/modules/php5 + if test ! -d $APACHE_TARGET; then + mkdir $APACHE_TARGET + fi + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" + PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" + AC_MSG_RESULT([yes - Apache 1.3.x]) + STRONGHOLD= + if test -f $PHP_APACHE/src/include/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H, 1, [ ]) + fi + if test -f $PHP_APACHE/src/include/ap_compat.h; then + AC_DEFINE(HAVE_AP_COMPAT_H, 1, [ ]) + if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then + AC_MSG_ERROR([Please run Apache\'s configure or src/Configure program once and try again]) fi - # For StrongHold 2.2 - elif test -f $PHP_APACHE/apache/httpd.h; then - APACHE_INCLUDE="-I$PHP_APACHE/apache -I$PHP_APACHE/ssl/include" - APACHE_TARGET=$PHP_APACHE/apache - PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) - PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" - APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET" - STRONGHOLD=-DSTRONGHOLD=1 - AC_MSG_RESULT(yes - StrongHold) - if test -f $PHP_APACHE/apache/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) + elif test -f $PHP_APACHE/src/include/compat.h; then + AC_DEFINE(HAVE_OLD_COMPAT_H, 1, [ ]) + fi + # Also for Apache 1.3.x + elif test -f $PHP_APACHE/src/include/httpd.h; then + APACHE_HAS_REGEX=1 + APACHE_INCLUDE="-I$PHP_APACHE/src/include -I$PHP_APACHE/src/os/unix" + APACHE_TARGET=$PHP_APACHE/src/modules/php5 + if test ! -d $APACHE_TARGET; then + mkdir $APACHE_TARGET + fi + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) + PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" + AC_MSG_RESULT([yes - Apache 1.3.x]) + STRONGHOLD= + if test -f $PHP_APACHE/src/include/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H, 1, [ ]) + fi + if test -f $PHP_APACHE/src/include/ap_compat.h; then + AC_DEFINE(HAVE_AP_COMPAT_H, 1, [ ]) + if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then + AC_MSG_ERROR([Please run Apache\'s configure or src/Configure program once and try again]) fi - if test -f $PHP_APACHE/src/ap_compat.h; then - AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) - if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then - AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again) - fi - else - if test -f $PHP_APACHE/src/compat.h; then - AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ]) - fi + elif test -f $PHP_APACHE/src/include/compat.h; then + AC_DEFINE(HAVE_OLD_COMPAT_H, 1, [ ]) + fi + # For StrongHold 2.2 + elif test -f $PHP_APACHE/apache/httpd.h; then + APACHE_INCLUDE="-I$PHP_APACHE/apache -I$PHP_APACHE/ssl/include" + APACHE_TARGET=$PHP_APACHE/apache + PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) + PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" + APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET" + STRONGHOLD=-DSTRONGHOLD=1 + AC_MSG_RESULT([yes - StrongHold]) + if test -f $PHP_APACHE/apache/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H, 1, [ ]) + fi + if test -f $PHP_APACHE/src/ap_compat.h; then + AC_DEFINE(HAVE_AP_COMPAT_H, 1, [ ]) + if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then + AC_MSG_ERROR([Please run Apache\'s configure or src/Configure program once and try again]) fi - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid Apache directory - unable to find httpd.h under $PHP_APACHE) + elif test -f $PHP_APACHE/src/compat.h; then + AC_DEFINE(HAVE_OLD_COMPAT_H, 1, [ ]) fi else AC_MSG_RESULT(no) + AC_MSG_ERROR([Invalid Apache directory - unable to find httpd.h under $PHP_APACHE]) fi +else + AC_MSG_RESULT(no) fi -AC_MSG_CHECKING(for mod_charset compatibility option) -AC_ARG_WITH(mod_charset, -[ --with-mod_charset Enable transfer tables for mod_charset (Rus Apache)], -[ - AC_MSG_RESULT(yes) - AC_DEFINE(USE_TRANSFER_TABLES,1,[ ]) -],[ - AC_MSG_RESULT(no) -]) +# compatibility +if test -z "$enable_mod_charset" && test "$with_mod_charset"; then + enable_mod_charset=$with_mod_charset +fi + +PHP_ARG_ENABLE(mod-charset, whether to enable Apache charset compatibility option, +[ --enable-mod-charset APACHE: Enable transfer tables for mod_charset (Rus Apache)], no, no) + +if test "$PHP_MOD_CHARSET" = "yes"; then + AC_DEFINE(USE_TRANSFER_TABLES, 1, [ ]) +fi dnl Build as static module -if test -n "$APACHE_MODULE"; then +if test "$APACHE_MODULE" = "yes"; then PHP_TARGET_RDYNAMIC $php_shtool mkdir -p sapi/apache PHP_OUTPUT(sapi/apache/libphp5.module) diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index 8c8490250c..148799ca61 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -2,15 +2,12 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS) -AC_ARG_WITH(apxs2filter, +PHP_ARG_WITH(apxs2filter,, [ --with-apxs2filter[=FILE] EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional - pathname to the Apache apxs tool [apxs]],[ - PHP_APXS2FILTER=$withval -],[ - PHP_APXS2FILTER=no -]) + pathname to the Apache apxs tool [apxs]], no, no) + +AC_MSG_CHECKING([for Apache 2.0 filter-module support via DSO through APXS]) if test "$PHP_APXS2FILTER" != "no"; then if test "$PHP_APXS2FILTER" = "yes"; then diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 69db4e78e9..8bc677b4cc 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -2,14 +2,11 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS) -AC_ARG_WITH(apxs2, +PHP_ARG_WITH(apxs2,, [ --with-apxs2[=FILE] Build shared Apache 2.0 Handler module. FILE is the optional - pathname to the Apache apxs tool [apxs]],[ - PHP_APXS2=$withval -], [ - PHP_APXS2=no -]) + pathname to the Apache apxs tool [apxs]], no, no) + +AC_MSG_CHECKING([for Apache 2.0 handler-module support via DSO through APXS]) if test "$PHP_APXS2" != "no"; then if test "$PHP_APXS2" = "yes"; then diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4 index a6ce6828e3..4213b7c6a6 100644 --- a/sapi/apache_hooks/config.m4 +++ b/sapi/apache_hooks/config.m4 @@ -18,15 +18,13 @@ if test "$ac_cv_php_fd_in_buff" = "yes"; then fi ]) -AC_MSG_CHECKING(for Apache 1.x (hooks) module support via DSO through APXS) -AC_ARG_WITH(apache-hooks, +dnl Apache 1.x shared module +PHP_ARG_WITH(apache-hooks,, [ --with-apache-hooks[=FILE] EXPERIMENTAL: Build shared Apache 1.x module. FILE is the optional - pathname to the Apache apxs tool [apxs]], [ - PHP_APACHE_HOOKS=$withval -],[ - PHP_APACHE_HOOKS=no -]) + pathname to the Apache apxs tool [apxs]], no, no) + +AC_MSG_CHECKING([for Apache 1.x (hooks) module support via DSO through APXS]) if test "$PHP_APACHE_HOOKS" != "no"; then if test "$PHP_APACHE_HOOKS" = "yes"; then @@ -124,139 +122,131 @@ else AC_MSG_RESULT(no) fi -AC_MSG_CHECKING(for Apache 1.x (hooks) module support) -AC_ARG_WITH(apache-hooks-static, +dnl Apache 1.x static module +PHP_ARG_WITH(apache-hooks-static,, [ --with-apache-hooks-static[=DIR] EXPERIMENTAL: Build Apache 1.x module. DIR is the top-level Apache - build directory [/usr/local/apache]], [ - if test "$withval" = "yes"; then + build directory [/usr/local/apache]], no, no) + +AC_MSG_CHECKING(for Apache 1.x (hooks) module support) + +if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then + + if test "$PHP_APACHE_HOOKS_STATIC" = "yes"; then # Apache's default directory - PHP_APACHE_HOOKS=/usr/local/apache - else - PHP_APACHE_HOOKS=$withval + PHP_APACHE_HOOKS_STATIC=/usr/local/apache fi -], [ - PHP_APACHE_HOOKS=no -]) -if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS" != "no"; then - APACHE_HOOKS_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module" + APACHE_HOOKS_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php5.* sapi/apache_hooks/libphp5.module" - if test "$PHP_APACHE_HOOKS" != "no"; then - AC_DEFINE(HAVE_APACHE,1,[ ]) - APACHE_HOOKS_MODULE=yes - PHP_EXPAND_PATH($PHP_APACHE_HOOKS, PHP_APACHE_HOOKS) - # For Apache 1.2.x - if test -f $PHP_APACHE_HOOKS/src/httpd.h; then - APACHE_INCLUDE=-I$PHP_APACHE_HOOKS/src - APACHE_TARGET=$PHP_APACHE_HOOKS/src - PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) - APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET" - PHP_LIBS="-L. -lphp3" - AC_MSG_RESULT(yes - Apache 1.2.x) - STRONGHOLD= - if test -f $PHP_APACHE_HOOKS/src/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) - fi - # For Apache 2.0.x - elif test -f $PHP_APACHE_HOOKS/include/httpd.h && - test -f $PHP_APACHE_HOOKS/srclib/apr/include/apr_general.h ; then - AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) - # For Apache 1.3.x - elif test -f $PHP_APACHE_HOOKS/src/main/httpd.h; then - APACHE_HAS_REGEX=1 - APACHE_INCLUDE="-I$PHP_APACHE_HOOKS/src/main -I$PHP_APACHE_HOOKS/src/os/unix -I$PHP_APACHE_HOOKS/src/ap" - APACHE_TARGET=$PHP_APACHE_HOOKS/src/modules/php5 - if test ! -d $APACHE_TARGET; then - mkdir $APACHE_TARGET - fi - PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) - APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" - PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" - AC_MSG_RESULT(yes - Apache 1.3.x) - STRONGHOLD= - if test -f $PHP_APACHE_HOOKS/src/include/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) - fi - if test -f $PHP_APACHE_HOOKS/src/include/ap_compat.h; then - AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) - if test ! -f $PHP_APACHE_HOOKS/src/include/ap_config_auto.h; then - AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again) - fi - else - if test -f $PHP_APACHE_HOOKS/src/include/compat.h; then - AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ]) - fi - fi - # Also for Apache 1.3.x - elif test -f $PHP_APACHE_HOOKS/src/include/httpd.h; then - APACHE_HAS_REGEX=1 - APACHE_INCLUDE="-I$PHP_APACHE_HOOKS/src/include -I$PHP_APACHE_HOOKS/src/os/unix" - APACHE_TARGET=$PHP_APACHE_HOOKS/src/modules/php5 - if test ! -d $APACHE_TARGET; then - mkdir $APACHE_TARGET - fi - PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) - PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" - APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" - AC_MSG_RESULT(yes - Apache 1.3.x) - STRONGHOLD= - if test -f $PHP_APACHE_HOOKS/src/include/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) - fi - if test -f $PHP_APACHE_HOOKS/src/include/ap_compat.h; then - AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) - if test ! -f $PHP_APACHE_HOOKS/src/include/ap_config_auto.h; then - AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again) - fi - else - if test -f $PHP_APACHE_HOOKS/src/include/compat.h; then - AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ]) - fi + AC_DEFINE(HAVE_APACHE,1,[ ]) + APACHE_HOOKS_MODULE=yes + PHP_EXPAND_PATH($PHP_APACHE_HOOKS_STATIC, PHP_APACHE_HOOKS_STATIC) + # For Apache 1.2.x + if test -f $PHP_APACHE_HOOKS_STATIC/src/httpd.h; then + APACHE_INCLUDE=-I$PHP_APACHE_HOOKS_STATIC/src + APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src + PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) + APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET" + PHP_LIBS="-L. -lphp3" + AC_MSG_RESULT([yes - Apache 1.2.x]) + STRONGHOLD= + if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) + fi + # For Apache 2.0.x + elif test -f $PHP_APACHE_HOOKS_STATIC/include/httpd.h && test -f $PHP_APACHE_HOOKS_STATIC/srclib/apr/include/apr_general.h ; then + AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!]) + # For Apache 1.3.x + elif test -f $PHP_APACHE_HOOKS_STATIC/src/main/httpd.h; then + APACHE_HAS_REGEX=1 + APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/src/main -I$PHP_APACHE_HOOKS_STATIC/src/os/unix -I$PHP_APACHE_HOOKS_STATIC/src/ap" + APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src/modules/php5 + if test ! -d $APACHE_TARGET; then + mkdir $APACHE_TARGET + fi + PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) + APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" + PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" + AC_MSG_RESULT([yes - Apache 1.3.x]) + STRONGHOLD= + if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H, 1, [ ]) + fi + if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then + AC_DEFINE(HAVE_AP_COMPAT_H, 1, [ ]) + if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then + AC_MSG_ERROR([Please run Apache\'s configure or src/Configure program once and try again]) fi - # For StrongHold 2.2 - elif test -f $PHP_APACHE_HOOKS/apache/httpd.h; then - APACHE_INCLUDE="-I$PHP_APACHE_HOOKS/apache -I$PHP_APACHE_HOOKS/ssl/include" - APACHE_TARGET=$PHP_APACHE_HOOKS/apache - PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) - PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" - APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET" - STRONGHOLD=-DSTRONGHOLD=1 - AC_MSG_RESULT(yes - StrongHold) - if test -f $PHP_APACHE_HOOKS/apache/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) + elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then + AC_DEFINE(HAVE_OLD_COMPAT_H, 1, [ ]) + fi + # Also for Apache 1.3.x + elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/httpd.h; then + APACHE_HAS_REGEX=1 + APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/src/include -I$PHP_APACHE_HOOKS_STATIC/src/os/unix" + APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src/modules/php5 + if test ! -d $APACHE_TARGET; then + mkdir $APACHE_TARGET + fi + PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) + PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" + APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" + AC_MSG_RESULT([yes - Apache 1.3.x]) + STRONGHOLD= + if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H, 1, [ ]) + fi + if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then + AC_DEFINE(HAVE_AP_COMPAT_H, 1, [ ]) + if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then + AC_MSG_ERROR([Please run Apache\'s configure or src/Configure program once and try again]) fi - if test -f $PHP_APACHE_HOOKS/src/ap_compat.h; then - AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) - if test ! -f $PHP_APACHE_HOOKS/src/include/ap_config_auto.h; then - AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again) - fi - else - if test -f $PHP_APACHE_HOOKS/src/compat.h; then - AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ]) - fi + elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then + AC_DEFINE(HAVE_OLD_COMPAT_H, 1, [ ]) + fi + # For StrongHold 2.2 + elif test -f $PHP_APACHE_HOOKS_STATIC/apache/httpd.h; then + APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/apache -I$PHP_APACHE_HOOKS_STATIC/ssl/include" + APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/apache + PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE) + PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" + APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET" + STRONGHOLD=-DSTRONGHOLD=1 + AC_MSG_RESULT([yes - StrongHold]) + if test -f $PHP_APACHE_HOOKS_STATIC/apache/ap_config.h; then + AC_DEFINE(HAVE_AP_CONFIG_H, 1, [ ]) + fi + if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_compat.h; then + AC_DEFINE(HAVE_AP_COMPAT_H, 1, [ ]) + if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then + AC_MSG_ERROR([Please run Apache\'s configure or src/Configure program once and try again]) fi - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS) + elif test -f $PHP_APACHE_HOOKS_STATIC/src/compat.h; then + AC_DEFINE(HAVE_OLD_COMPAT_H, 1, [ ]) fi else AC_MSG_RESULT(no) + AC_MSG_ERROR([Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC]) fi +else + AC_MSG_RESULT(no) fi -AC_MSG_CHECKING(for mod_charset compatibility option) -AC_ARG_WITH(mod_charset, -[ --with-mod_charset Enable transfer tables for mod_charset (Rus Apache)], -[ - AC_MSG_RESULT(yes) - AC_DEFINE(USE_TRANSFER_TABLES,1,[ ]) -],[ - AC_MSG_RESULT(no) -]) +# compatibility +if test -z "$enable_mod_charset" && test "$with_mod_charset"; then + enable_mod_charset=$with_mod_charset +fi + +PHP_ARG_ENABLE(mod-charset, whether to enable Apache charset compatibility option, +[ --enable-mod-charset APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache)], no, no) + +if test "$PHP_MOD_CHARSET" = "yes"; then + AC_DEFINE(USE_TRANSFER_TABLES, 1, [ ]) +fi dnl Build as static module -if test -n "$APACHE_HOOKS_MODULE"; then +if test "$APACHE_HOOKS_MODULE" = "yes"; then PHP_TARGET_RDYNAMIC $php_shtool mkdir -p sapi/apache_hooks PHP_OUTPUT(sapi/apache_hooks/libphp5.module) diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4 index ba9dc3fa60..8aba33e23d 100644 --- a/sapi/caudium/config.m4 +++ b/sapi/caudium/config.m4 @@ -3,100 +3,96 @@ dnl $Id$ dnl RESULT=no -AC_MSG_CHECKING(for Caudium support) -AC_ARG_WITH(caudium, +PHP_ARG_WITH(caudium,, [ --with-caudium[=DIR] Build PHP as a Pike module for use with Caudium. - DIR is the Caudium server dir [/usr/local/caudium/server]],[ - PHP_CAUDIUM=$withval -], [ - PHP_CAUDIUM=no -]) + DIR is the Caudium server dir [/usr/local/caudium/server]], no, no) + +AC_MSG_CHECKING([for Caudium support]) if test "$PHP_CAUDIUM" != "no"; then - if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi - if test ! -d $PHP_CAUDIUM ; then - if test "$prefix" = "NONE"; then - PHP_CAUDIUM=/usr/local/caudium/server/ - else - PHP_CAUDIUM=$prefix/caudium/server/ - fi - fi - if test -f $PHP_CAUDIUM/bin/caudium; then - PIKE=$PHP_CAUDIUM/bin/caudium - elif test -f $PHP_CAUDIUM/bin/pike; then - PIKE=$PHP_CAUDIUM/bin/pike - else - AC_MSG_ERROR(Couldn't find a pike in $PHP_CAUDIUM/bin/) - fi - if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then - PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` - PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' ` - if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then - AC_MSG_ERROR(Failed to figure out Pike module and include directories) - fi - AC_MSG_RESULT(yes) - PIKE=`echo $PIKE | pike -e 'int tries=100; - string orig,pike=Stdio.File("stdin")->read()-"\n"; - orig=pike; - if(search(orig, "/")) - orig = combine_path(getcwd(), orig); - while(!catch(pike=readlink(pike)) && tries--) - ; - write(combine_path(dirname(orig), pike)); '` - PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) - if test "$prefix" != "NONE"; then - PIKE_C_INCLUDE=$prefix/include/`basename $PIKE` - else - PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE` - fi - AC_MSG_CHECKING(for C includes in $PIKE_C_INCLUDE) - if test -f $PIKE_C_INCLUDE/version.h; then - PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` - ###### VERSION MATCH CHECK ####### - PMAJOR="^#define PIKE_MAJOR_VERSION" - PMINOR="^#define PIKE_MINOR_VERSION" - PBUILD="^#define PIKE_BUILD_VERSION" + if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi + if test ! -d $PHP_CAUDIUM ; then + if test "$prefix" = "NONE"; then + PHP_CAUDIUM=/usr/local/caudium/server/ + else + PHP_CAUDIUM=$prefix/caudium/server/ + fi + fi + if test -f $PHP_CAUDIUM/bin/caudium; then + PIKE=$PHP_CAUDIUM/bin/caudium + elif test -f $PHP_CAUDIUM/bin/pike; then + PIKE=$PHP_CAUDIUM/bin/pike + else + AC_MSG_ERROR([Could not find a pike in $PHP_CAUDIUM/bin/]) + fi + if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then + PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` + PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' ` + if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then + AC_MSG_ERROR(Failed to figure out Pike module and include directories) + fi + AC_MSG_RESULT(yes) + PIKE=`echo $PIKE | pike -e 'int tries=100; + string orig,pike=Stdio.File("stdin")->read()-"\n"; + orig=pike; + if(search(orig, "/")) + orig = combine_path(getcwd(), orig); + while(!catch(pike=readlink(pike)) && tries--) + ; + write(combine_path(dirname(orig), pike)); '` + PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) + if test "$prefix" != "NONE"; then + PIKE_C_INCLUDE=$prefix/include/`basename $PIKE` + else + PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE` + fi + AC_MSG_CHECKING([for C includes in $PIKE_C_INCLUDE]) + if test -f $PIKE_C_INCLUDE/version.h; then + PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` + ###### VERSION MATCH CHECK ####### + PMAJOR="^#define PIKE_MAJOR_VERSION" + PMINOR="^#define PIKE_MINOR_VERSION" + PBUILD="^#define PIKE_BUILD_VERSION" - PIKE_CMAJOR_VERSION=0 - PIKE_CMINOR_VERSION=0 - PIKE_CBUILD_VERSION=0 + PIKE_CMAJOR_VERSION=0 + PIKE_CMINOR_VERSION=0 + PIKE_CBUILD_VERSION=0 - PIKE_CMAJOR_VERSION=`grep "$PMAJOR" $PIKE_C_INCLUDE/version.h | sed -e 's/\(#define.*N \)\(.*\)/\2/'` - if test -z "$PIKE_CMAJOR_VERSION"; then - if test -n "`grep f_version $PIKE_C_INCLUDE/version.h`"; then - PIKE_CMAJOR_VERSION=6 - fi - else - PIKE_CMINOR_VERSION=`grep "$PMINOR" $PIKE_C_INCLUDE/version.h | sed -e 's/\(#define.*N \)\(.*\)/\2/'` - PIKE_CBUILD_VERSION=`grep "$PBUILD" $PIKE_C_INCLUDE/version.h | sed -e 's/\(#define.*N \)\(.*\)/\2/'` - fi - - if test "$PIKE_TEST_VER" = "${PIKE_CMAJOR_VERSION}.${PIKE_CMINOR_VERSION}.${PIKE_CBUILD_VERSION}"; then - PHP_ADD_INCLUDE($PIKE_C_INCLUDE) - PIKE_INCLUDE_DIR="$PIKE_INCLUDE_DIR, $PIKE_C_INCLUDE" - AC_MSG_RESULT(found) - else - AC_MSG_RESULT(version mismatch) - fi - else - AC_MSG_RESULT(not found) - fi - else - AC_MSG_ERROR(Caudium PHP5 requires Pike 7.0 or newer) - fi - PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` - AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support]) - PHP_SELECT_SAPI(caudium, shared, caudium.c) - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so" - RESULT=" *** Pike binary used: $PIKE - *** Pike include dir(s) used: $PIKE_INCLUDE_DIR - *** Pike version: $PIKE_VERSION" - dnl Always use threads since thread-free support really blows. - PHP_BUILD_THREAD_SAFE + PIKE_CMAJOR_VERSION=`grep "$PMAJOR" $PIKE_C_INCLUDE/version.h | sed -e 's/\(#define.*N \)\(.*\)/\2/'` + if test -z "$PIKE_CMAJOR_VERSION"; then + if test -n "`grep f_version $PIKE_C_INCLUDE/version.h`"; then + PIKE_CMAJOR_VERSION=6 + fi + else + PIKE_CMINOR_VERSION=`grep "$PMINOR" $PIKE_C_INCLUDE/version.h | sed -e 's/\(#define.*N \)\(.*\)/\2/'` + PIKE_CBUILD_VERSION=`grep "$PBUILD" $PIKE_C_INCLUDE/version.h | sed -e 's/\(#define.*N \)\(.*\)/\2/'` + fi + + if test "$PIKE_TEST_VER" = "${PIKE_CMAJOR_VERSION}.${PIKE_CMINOR_VERSION}.${PIKE_CBUILD_VERSION}"; then + PHP_ADD_INCLUDE($PIKE_C_INCLUDE) + PIKE_INCLUDE_DIR="$PIKE_INCLUDE_DIR, $PIKE_C_INCLUDE" + AC_MSG_RESULT(found) + else + AC_MSG_RESULT(version mismatch) + fi + else + AC_MSG_RESULT(not found) + fi + else + AC_MSG_ERROR([Caudium PHP5 requires Pike 7.0 or newer]) + fi + PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` + AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support]) + PHP_SELECT_SAPI(caudium, shared, caudium.c) + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so" + RESULT=" *** Pike binary used: $PIKE + *** Pike include dir(s) used: $PIKE_INCLUDE_DIR + *** Pike version: $PIKE_VERSION" + dnl Always use threads since thread-free support really blows. + PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT($RESULT) dnl ## Local Variables: dnl ## tab-width: 4 dnl ## End: - diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 index e465eaea67..855a8348ff 100644 --- a/sapi/cgi/config9.m4 +++ b/sapi/cgi/config9.m4 @@ -2,57 +2,36 @@ dnl dnl $Id$ dnl -AC_ARG_ENABLE(cgi, -[ --disable-cgi Disable building CGI version of PHP], -[ - PHP_SAPI_CGI=$enableval -],[ - PHP_SAPI_CGI=yes -]) +PHP_ARG_ENABLE(cgi,, +[ --disable-cgi Disable building CGI version of PHP], yes, no) -AC_ARG_ENABLE(force-cgi-redirect, +PHP_ARG_ENABLE(fastcgi,, +[ --enable-fastcgi CGI: Enable FastCGI support in the CGI binary], no, no) + +PHP_ARG_ENABLE(force-cgi-redirect,, [ --enable-force-cgi-redirect CGI: Enable security check for internal server - redirects. Use this if you run the PHP CGI with Apache], -[ - PHP_FORCE_CGI_REDIRECT=$enableval -],[ - PHP_FORCE_CGI_REDIRECT=no -]) + redirects. Use this if you run the PHP CGI with Apache], no, no) -AC_ARG_ENABLE(discard-path, +PHP_ARG_ENABLE(discard-path,, [ --enable-discard-path CGI: When this is enabled the PHP CGI binary can safely be placed outside of the web tree and people - will not be able to circumvent .htaccess security], -[ - PHP_DISCARD_PATH=$enableval -],[ - PHP_DISCARD_PATH=no -]) - -AC_ARG_ENABLE(fastcgi, -[ --enable-fastcgi CGI: Enable FastCGI support in the CGI binary], -[ - PHP_ENABLE_FASTCGI=$enableval -],[ - PHP_ENABLE_FASTCGI=no -]) + will not be able to circumvent .htaccess security], no, no) -AC_ARG_ENABLE(path-info-check, +PHP_ARG_ENABLE(path-info-check,, [ --disable-path-info-check CGI: 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 -]) + /info.php/test?a=b will fail to work], yes, no) +dnl +dnl CGI setup +dnl if test "$PHP_SAPI" = "default"; then - AC_MSG_CHECKING(for CGI build) - if test "$PHP_SAPI_CGI" != "no"; then + AC_MSG_CHECKING(whether to build CGI binary) + if test "$PHP_CGI" != "no"; then AC_MSG_RESULT(yes) - PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) + + dnl Set filename case $host_alias in *cygwin* ) SAPI_CGI_PATH=sapi/cgi/php-cgi.exe @@ -63,16 +42,29 @@ if test "$PHP_SAPI" = "default"; then esac PHP_SUBST(SAPI_CGI_PATH) + dnl --enable-fastcgi + AC_MSG_CHECKING(whether to enable fastcgi support) + if test "$PHP_FASTCGI" = "yes"; then + PHP_ENABLE_FASTCGI=1 + PHP_FCGI_FILES="fastcgi.c" + else + PHP_ENABLE_FASTCGI=0 + PHP_FCGI_FILES= + fi + AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_ENABLE_FASTCGI, [ ]) + AC_MSG_RESULT($PHP_FASTCGI) + + dnl --enable-force-cgi-redirect AC_MSG_CHECKING(whether to force Apache CGI redirect) if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then - REDIRECT=1 + CGI_REDIRECT=1 else - REDIRECT=0 + CGI_REDIRECT=0 fi - AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT,$REDIRECT,[ ]) + AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT, $CGI_REDIRECT, [ ]) AC_MSG_RESULT($PHP_FORCE_CGI_REDIRECT) - + dnl --enable-discard-path AC_MSG_CHECKING(whether to discard path_info + path_translated) if test "$PHP_DISCARD_PATH" = "yes"; then DISCARD_PATH=1 @@ -82,28 +74,19 @@ if test "$PHP_SAPI" = "default"; then AC_DEFINE_UNQUOTED(DISCARD_PATH, $DISCARD_PATH, [ ]) AC_MSG_RESULT($PHP_DISCARD_PATH) + dnl --enable-path-info-check AC_MSG_CHECKING(whether to enable path info checking) - if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then + if test "$PHP_PATH_INFO_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) - if test "$PHP_ENABLE_FASTCGI" = "yes"; then - PHP_FASTCGI=1 - PHP_FCGI_FILES="fastcgi.c" - else - PHP_FASTCGI=0 - PHP_FCGI_FILES="" - fi - AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ]) - AC_MSG_RESULT($PHP_ENABLE_FASTCGI) + AC_MSG_RESULT($PHP_PATH_INFO_CHECK) + dnl Set install target and select SAPI INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" - PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)') + PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)') case $host_alias in *aix*) @@ -119,7 +102,7 @@ if test "$PHP_SAPI" = "default"; then PHP_SUBST(BUILD_CGI) - elif test "$PHP_SAPI_CLI" != "no"; then + elif test "$PHP_CLI" != "no"; then AC_MSG_RESULT(no) OVERALL_TARGET= PHP_SAPI=cli diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index c31ddd1209..6017443044 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -2,18 +2,12 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for CLI build) - -AC_ARG_ENABLE(cli, +PHP_ARG_ENABLE(cli,, [ --disable-cli Disable building CLI version of PHP - (this forces --without-pear)], -[ - PHP_SAPI_CLI=$enableval -],[ - PHP_SAPI_CLI=yes -]) + (this forces --without-pear)], yes, no) -if test "$PHP_SAPI_CLI" != "no"; then +AC_MSG_CHECKING(for CLI build) +if test "$PHP_CLI" != "no"; then PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag,$abs_srcdir/sapi/cli,sapi/cli) SAPI_CLI_PATH=sapi/cli/php PHP_SUBST(SAPI_CLI_PATH) @@ -38,5 +32,4 @@ if test "$PHP_SAPI_CLI" != "no"; then PHP_SUBST(INSTALL_CLI) PHP_OUTPUT(sapi/cli/php.1) fi - -AC_MSG_RESULT($PHP_SAPI_CLI) +AC_MSG_RESULT($PHP_CLI) diff --git a/sapi/continuity/config.m4 b/sapi/continuity/config.m4 index 1be2dfa3a1..8d2741921a 100644 --- a/sapi/continuity/config.m4 +++ b/sapi/continuity/config.m4 @@ -1,36 +1,28 @@ dnl ## $Id$ -*- sh -*- -AC_MSG_CHECKING(for Continuity support) -AC_ARG_WITH(continuity, +PHP_ARG_WITH(continuity, for Continuity support, [ --with-continuity=DIR Build PHP as Continuity Server module. - DIR is path to the installed Continuity Server root],[ - PHP_CONTINUITY=$withval -],[ - PHP_CONTINUITY=no -]) -AC_MSG_RESULT($PHP_CONTINUITY) + DIR is path to the installed Continuity Server root], no, no) if test "$PHP_CONTINUITY" != "no"; then - if test ! -d $PHP_CONTINUITY; then - AC_MSG_ERROR(Please specify the path to the root of your Continuity server using --with-continuity=DIR) + AC_MSG_ERROR([Please specify the path to the root of your Continuity server using --with-continuity=DIR]) fi - AC_MSG_CHECKING(for Continuity include files) + AC_MSG_CHECKING([for Continuity include files]) if test -d $PHP_CONTINUITY/include ; then CAPI_INCLUDE=$PHP_CONTINUITY/include - AC_MSG_RESULT(Continuity Binary Distribution) + AC_MSG_RESULT([Continuity Binary Distribution]) else - AC_MSG_ERROR(Cannot find your CAPI include files in either DIR/src or DIR/include) + AC_MSG_ERROR([Cannot find your CAPI include files in either DIR/src or DIR/include]) fi - PHP_SELECT_SAPI(continuity,shared,capi.c) + PHP_SELECT_SAPI(continuity, shared, capi.c) PHP_ADD_INCLUDE($CAPI_INCLUDE) PHP_BUILD_THREAD_SAFE - AC_DEFINE(HAVE_CONTINUITY,1,[Whether you have a Continuity Server]) + AC_DEFINE(HAVE_CONTINUITY, 1, [Whether you have a Continuity Server]) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_CONTINUITY/lib/" fi - dnl ## Local Variables: dnl ## tab-width: 4 dnl ## End: diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4 index fccae0198f..3a61b458f0 100644 --- a/sapi/embed/config.m4 +++ b/sapi/embed/config.m4 @@ -2,15 +2,11 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for embedded SAPI library support) - -AC_ARG_ENABLE(embed, +PHP_ARG_ENABLE(embed,, [ --enable-embed[=TYPE] EXPERIMENTAL: Enable building of embedded SAPI library - TYPE is either 'shared' or 'static'. [TYPE=shared]], [ - PHP_EMBED=$enableval -], [ - PHP_EMBED=no -]) + TYPE is either 'shared' or 'static'. [TYPE=shared]], no, no) + +AC_MSG_CHECKING([for embedded SAPI library support]) if test "$PHP_EMBED" != "no"; then case "$PHP_EMBED" in @@ -30,7 +26,7 @@ if test "$PHP_EMBED" != "no"; then PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c) PHP_INSTALL_HEADERS([sapi/embed/php_embed.h]) fi - AC_MSG_RESULT($PHP_EMBED_TYPE) + AC_MSG_RESULT([$PHP_EMBED_TYPE]) else AC_MSG_RESULT(no) fi diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4 index 050c4d9e9b..7c7dcf0c21 100644 --- a/sapi/isapi/config.m4 +++ b/sapi/isapi/config.m4 @@ -2,14 +2,8 @@ dnl dnl $Id$ dnl -RESULT=no -AC_MSG_CHECKING(for Zeus ISAPI support) -AC_ARG_WITH(isapi, -[ --with-isapi[=DIR] Build PHP as an ISAPI module for use with Zeus], [ - PHP_ISAPI=$withval -], [ - PHP_ISAPI=no -]) +PHP_ARG_WITH(isapi, for Zeus ISAPI support, +[ --with-isapi[=DIR] Build PHP as an ISAPI module for use with Zeus], no, no) if test "$PHP_ISAPI" != "no"; then if test "$PHP_ISAPI" = "yes"; then @@ -19,13 +13,11 @@ if test "$PHP_ISAPI" != "no"; then fi test -f "$ZEUSPATH/web/include/httpext.h" || AC_MSG_ERROR(Unable to find httpext.h in $ZEUSPATH/web/include) PHP_BUILD_THREAD_SAFE - AC_DEFINE(WITH_ZEUS,1,[ ]) + AC_DEFINE(WITH_ZEUS, 1, [ ]) PHP_ADD_INCLUDE($ZEUSPATH/web/include) PHP_SELECT_SAPI(isapi, shared, php5isapi.c) INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/" - RESULT=yes fi -AC_MSG_RESULT($RESULT) dnl ## Local Variables: dnl ## tab-width: 4 diff --git a/sapi/milter/config.m4 b/sapi/milter/config.m4 index 36c212b4c5..e314551857 100644 --- a/sapi/milter/config.m4 +++ b/sapi/milter/config.m4 @@ -2,15 +2,9 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for Milter support) -AC_ARG_WITH(milter, -[ --with-milter[=DIR] Build PHP as Milter application],[ - PHP_MILTER=$withval -], [ - PHP_MILTER=no -]) +PHP_ARG_WITH(milter, for Milter support, +[ --with-milter[=DIR] Build PHP as Milter application], no, no) -RESULT=no if test "$PHP_MILTER" != "no"; then if test "$PHP_MILTER" = "yes"; then if test -f /usr/lib/libmilter.a ; then @@ -19,7 +13,7 @@ if test "$PHP_MILTER" != "no"; then if test -f /usr/lib/libmilter/libmilter.a ; then MILTERPATH=/usr/lib/libmilter else - AC_MSG_ERROR(Unable to find libmilter.a) + AC_MSG_ERROR([Unable to find libmilter.a]) fi fi else @@ -33,8 +27,6 @@ if test "$PHP_MILTER" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(milter, $MILTERPATH,) BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)" INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter" - RESULT=yes PHP_SUBST(SAPI_MILTER_PATH) PHP_SUBST(BUILD_MILTER) fi -AC_MSG_RESULT($RESULT) diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4 index ce8cc96ae8..8923f53227 100644 --- a/sapi/nsapi/config.m4 +++ b/sapi/nsapi/config.m4 @@ -2,39 +2,33 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for NSAPI support) -AC_ARG_WITH(nsapi, -[ --with-nsapi=DIR Build PHP as NSAPI module for Netscape/iPlanet/Sun Webserver],[ - PHP_NSAPI=$withval -],[ - PHP_NSAPI=no -]) -AC_MSG_RESULT($PHP_NSAPI) +PHP_ARG_WITH(nsapi, for NSAPI support, +[ --with-nsapi=DIR Build PHP as NSAPI module for Netscape/iPlanet/Sun Webserver], no, no) if test "$PHP_NSAPI" != "no"; then if test ! -d $PHP_NSAPI/bin ; then AC_MSG_ERROR(Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR) fi - AC_MSG_CHECKING(for NSAPI include files) + AC_MSG_CHECKING([for NSAPI include files]) if test -d $PHP_NSAPI/include ; then NSAPI_INC_DIR="$PHP_NSAPI/include" - AC_MSG_RESULT(Netscape 3.x / Sun 7.x style) + AC_MSG_RESULT([Netscape 3.x / Sun 7.x style]) AC_CHECK_HEADERS([$NSAPI_INC_DIR/nsapi.h]) NSAPI_INCLUDE="-I$NSAPI_INC_DIR" fi if test -d $PHP_NSAPI/plugins/include ; then NSAPI_INC_DIR="$PHP_NSAPI/plugins/include" - AC_MSG_RESULT(iPlanet 4.x / Sun 6.x style) + AC_MSG_RESULT([iPlanet 4.x / Sun 6.x style]) AC_CHECK_HEADERS([$NSAPI_INC_DIR/nsapi.h]) NSAPI_INCLUDE="$NSAPI_INCLUDE -I$NSAPI_INC_DIR" fi - if test "$NSAPI_INCLUDE" = ""; then - AC_MSG_ERROR(Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include) + if test -z "$NSAPI_INCLUDE"; then + AC_MSG_ERROR([Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include]) fi PHP_EVAL_INCLINE($NSAPI_INCLUDE) PHP_BUILD_THREAD_SAFE - AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape/iPlanet/Sun Webserver]) + AC_DEFINE(HAVE_NSAPI, 1, [Whether you have a Netscape/iPlanet/Sun Webserver]) PHP_SELECT_SAPI(nsapi, shared, nsapi.c) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/" fi diff --git a/sapi/phttpd/config.m4 b/sapi/phttpd/config.m4 index a1f294c74c..91339a5278 100644 --- a/sapi/phttpd/config.m4 +++ b/sapi/phttpd/config.m4 @@ -2,27 +2,19 @@ dnl dnl $Id$ dnl -RESULT=no -AC_MSG_CHECKING(for PHTTPD support) -AC_ARG_WITH(phttpd, -[ --with-phttpd=DIR Build PHP as phttpd module],[ - PHP_PHTTPD=$withval -], [ - PHP_PHTTPD=no -]) +PHP_ARG_WITH(phttpd, for PHTTPD support, +[ --with-phttpd=DIR Build PHP as phttpd module], no, no) if test "$PHP_PHTTPD" != "no"; then if test ! -d $PHP_PHTTPD ; then - AC_MSG_ERROR(You did not specify a directory) + AC_MSG_ERROR([You did not specify a directory]) fi PHP_BUILD_THREAD_SAFE PHP_ADD_INCLUDE($PHP_PHTTPD/include) - AC_DEFINE(HAVE_PHTTPD,1,[Whether you have phttpd]) + AC_DEFINE(HAVE_PHTTPD, 1, [Whether you have phttpd]) PHP_SELECT_SAPI(phttpd, shared, phttpd.c) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_PHTTPD/modules/" - RESULT=yes fi -AC_MSG_RESULT($RESULT) dnl ## Local Variables: dnl ## tab-width: 4 diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4 index 83c212af46..7859481508 100644 --- a/sapi/pi3web/config.m4 +++ b/sapi/pi3web/config.m4 @@ -2,35 +2,25 @@ dnl dnl $Id$ dnl -RESULT=no -AC_MSG_CHECKING(for Pi3Web support) -AC_ARG_WITH(pi3web, -[ --with-pi3web[=DIR] Build PHP as Pi3Web module],[ - PHP_PI3WEB=$withval -], [ - PHP_PI3WEB=no -]) +PHP_ARG_WITH(pi3web, for Pi3Web support, +[ --with-pi3web[=DIR] Build PHP as Pi3Web module], no, no) if test "$PHP_PI3WEB" != "no"; then - if test "$PHP_PI3WEB" = "yes"; then - PI3PATH=../.. # the default - else - PI3PATH=$PHP_PI3WEB - fi - test -f "$PI3PATH/PiAPI/PiAPI.h" || AC_MSG_ERROR(Unable to find PiAPI.h in $PI3PATH/PiAPI) - PHP_BUILD_THREAD_SAFE - AC_DEFINE(WITH_PI3WEB,1,[whether you want Pi3Web support]) - PHP_ADD_INCLUDE($PI3PATH/PiAPI) - PHP_ADD_INCLUDE($PI3PATH/Pi2API) - PHP_ADD_INCLUDE($PI3PATH/Pi3API) - PHP_ADD_INCLUDE($PI3PATH/PHP5) - PHP_SELECT_SAPI(pi3web, shared, pi3web_sapi.c) - INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/" - RESULT=yes -else - RESULT=no + if test "$PHP_PI3WEB" = "yes"; then + PI3PATH=../.. # the default + else + PI3PATH=$PHP_PI3WEB + fi + test -f "$PI3PATH/PiAPI/PiAPI.h" || AC_MSG_ERROR([Unable to find PiAPI.h in $PI3PATH/PiAPI]) + PHP_BUILD_THREAD_SAFE + AC_DEFINE(WITH_PI3WEB, 1, [whether you want Pi3Web support]) + PHP_ADD_INCLUDE($PI3PATH/PiAPI) + PHP_ADD_INCLUDE($PI3PATH/Pi2API) + PHP_ADD_INCLUDE($PI3PATH/Pi3API) + PHP_ADD_INCLUDE($PI3PATH/PHP5) + PHP_SELECT_SAPI(pi3web, shared, pi3web_sapi.c) + INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/" fi -AC_MSG_RESULT($RESULT) dnl ## Local Variables: dnl ## tab-width: 4 diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4 index e050682d70..9b0bb90c35 100644 --- a/sapi/roxen/config.m4 +++ b/sapi/roxen/config.m4 @@ -2,46 +2,39 @@ dnl dnl $Id$ dnl -AC_ARG_WITH(roxen, +PHP_ARG_WITH(roxen,, [ --with-roxen=DIR Build PHP as a Pike module. DIR is the base Roxen - directory, normally /usr/local/roxen/server], [ - PHP_ROXEN=$withval -], [ - PHP_ROXEN=no -]) + directory, normally /usr/local/roxen/server], no, no) -AC_ARG_ENABLE(roxen-zts, -[ --enable-roxen-zts Build the Roxen module using Zend Thread Safety], [ - PHP_ROXEN_ZTS=$enableval -], [ - PHP_ROXEN_ZTS=no -]) +PHP_ARG_ENABLE(roxen-zts, whether Roxen module is build using ZTS, +[ --enable-roxen-zts ROXEN: Build the Roxen module using Zend Thread Safety], no, no) -AC_MSG_CHECKING(for Roxen/Pike support) +RESULT= +AC_MSG_CHECKING([for Roxen/Pike support]) if test "$PHP_ROXEN" != "no"; then if test ! -d $PHP_ROXEN ; then - AC_MSG_ERROR(You did not specify a directory) + AC_MSG_ERROR([You did not specify a directory]) fi if test -f $PHP_ROXEN/bin/roxen; then PIKE=$PHP_ROXEN/bin/roxen elif test -f $PHP_ROXEN/bin/pike; then PIKE=$PHP_ROXEN/bin/pike else - AC_MSG_ERROR(Couldn't find a pike in $PHP_ROXEN/bin/) + AC_MSG_ERROR([Could not find a pike in $PHP_ROXEN/bin/]) fi if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` - PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'` + PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'` if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then - AC_MSG_ERROR(Failed to figure out Pike module and include directories) + AC_MSG_ERROR([Failed to figure out Pike module and include directories]) fi else - AC_MSG_ERROR(Roxen/PHP requires Pike 0.7.79 or newer) + AC_MSG_ERROR([Roxen/PHP requires Pike 0.7.79 or newer]) fi PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR) - AC_DEFINE(HAVE_ROXEN,1,[Whether you use Roxen]) + AC_DEFINE(HAVE_ROXEN, 1, [Whether you use Roxen]) PHP_SELECT_SAPI(roxen, shared, roxen.c) INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP5.so" RESULT="yes @@ -50,16 +43,12 @@ if test "$PHP_ROXEN" != "no"; then Pike module directory: $PIKE_MODULE_DIR" PIKE_INCLUDE_DIR=" -I$PIKE_INCLUDE_DIR " - AC_MSG_CHECKING(if Roxen should use ZTS) if test "$PHP_ROXEN_ZTS" != "no"; then PHP_BUILD_THREAD_SAFE - AC_DEFINE(ROXEN_USE_ZTS,1,[Whether to use Roxen in ZTS mode]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) + AC_DEFINE(ROXEN_USE_ZTS, 1, [Whether to use Roxen in ZTS mode]) fi fi -AC_MSG_RESULT($RESULT) +AC_MSG_RESULT([$RESULT]) dnl ## Local Variables: dnl ## tab-width: 4 diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4 index f872aa4d2a..371edaee84 100644 --- a/sapi/thttpd/config.m4 +++ b/sapi/thttpd/config.m4 @@ -2,14 +2,11 @@ dnl dnl $Id$ dnl -AC_ARG_WITH(thttpd, -[ --with-thttpd=SRCDIR Build PHP as thttpd module], [ - PHP_THTTPD=$withval -],[ - PHP_THTTPD=no -]) +PHP_ARG_WITH(thttpd,, +[ --with-thttpd=SRCDIR Build PHP as thttpd module], no, no) + +AC_MSG_CHECKING([for thttpd]) -AC_MSG_CHECKING(for thttpd) if test "$PHP_THTTPD" != "no"; then if test ! -d $PHP_THTTPD; then AC_MSG_RESULT(thttpd directory does not exist ($PHP_THTTPD)) diff --git a/sapi/tux/config.m4 b/sapi/tux/config.m4 index d0a8196b68..06788be757 100644 --- a/sapi/tux/config.m4 +++ b/sapi/tux/config.m4 @@ -2,19 +2,15 @@ dnl dnl $Id$ dnl -AC_ARG_WITH(tux, -[ --with-tux=MODULEDIR Build PHP as a TUX module (Linux only)], [ - PHP_TUX=$withval -], [ - PHP_TUX=no -]) +PHP_ARG_WITH(tux,, +[ --with-tux=MODULEDIR Build PHP as a TUX module (Linux only)], no, no) -AC_MSG_CHECKING(for TUX) +AC_MSG_CHECKING([for TUX]) if test "$PHP_TUX" != "no"; then INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so" AC_CHECK_HEADERS(tuxmodule.h,[:],[AC_MSG_ERROR([Cannot find tuxmodule.h])]) PHP_SELECT_SAPI(tux, shared, php_tux.c) - AC_MSG_RESULT($PHP_TUX) + AC_MSG_RESULT([$PHP_TUX]) else AC_MSG_RESULT(no) fi diff --git a/sapi/webjames/config.m4 b/sapi/webjames/config.m4 index 9e406fc057..78c8a1936d 100644 --- a/sapi/webjames/config.m4 +++ b/sapi/webjames/config.m4 @@ -2,14 +2,11 @@ dnl dnl $Id$ dnl -AC_ARG_WITH(webjames, -[ --with-webjames=SRCDIR Build PHP as a WebJames module (RISC OS only)],[ - PHP_WEBJAMES=$withval -],[ - PHP_WEBJAMES=no -]) +PHP_ARG_WITH(webjames,, +[ --with-webjames=SRCDIR Build PHP as a WebJames module (RISC OS only)], no, no) + +AC_MSG_CHECKING([for webjames]) -AC_MSG_CHECKING(for webjames) if test "$PHP_WEBJAMES" != "no"; then PHP_EXPAND_PATH($PHP_WEBJAMES, PHP_WEBJAMES) INSTALL_IT="\