diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 118 |
1 files changed, 47 insertions, 71 deletions
diff --git a/configure.in b/configure.in index b137472313..ca31b0897d 100644 --- a/configure.in +++ b/configure.in @@ -461,11 +461,24 @@ fi divert(4) -PHP_ARG_WITH(config-file-path, path to configuration file, + + +PHP_ARG_WITH(config-file-path,whether to use a configuration file, [ --with-config-file-path=PATH Sets the path in which to look for php.ini. - defaults to --sysconfdir, set to "none" to disable], - $sysconfdir) + defaults to /usr/local/lib], yes) + +if test "$PHP_CONFIG_FILE_PATH" = "yes"; then + PHP_CONFIG_FILE_PATH="/usr/local/lib" +fi + +if test "$PHP_CONFIG_FILE_PATH" != "no"; then + AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "$PHP_CONFIG_FILE_PATH",[ ]) + AC_DEFINE(USE_CONFIG_FILE, 1, [ ]) +else + AC_DEFINE(CONFIGURATION_FILE_PATH, 0, [ ]) + AC_DEFINE(USE_CONFIG_FILE, 0, [ ]) +fi PHP_ARG_ENABLE(debug, whether to include debugging symbols, [ --enable-debug Compile with debugging symbols.], no) @@ -512,23 +525,6 @@ AC_ARG_WITH(exec-dir, AC_MSG_RESULT(/usr/local/php/bin) ]) - -# compatibility -if test "x$with_pear" = "x" -a "x$enable_pear" = "no"; then - with_pear="no" -fi - -PHP_ARG_WITH(pear, [whether to install PEAR, and where], -[ --with-pear=DIR Install PEAR files in DIR (default \$datadir/php/pear) - --without-pear Do not install PEAR],yes) - -if test "$PHP_PEAR" != "no"; then - PEAR_DIR=pear - if test "$PHP_PEAR" != "yes"; then - PEAR_INSTALLDIR="$PHP_PEAR" - fi -fi - PHP_ARG_WITH(openssl,for OpenSSL support, [ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.5) ]) if test "$PHP_OPENSSL" = "yes"; then @@ -596,6 +592,14 @@ if test "$PHP_DMALLOC" = "yes"; then CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK" fi +PHP_ARG_ENABLE(pear,whether to install PEAR, +[ --disable-pear Do not install PEAR],yes) + +if test "$PHP_PEAR" = "yes"; then + PEAR_DIR=pear +fi + + divert(5) PHP_CONFIGURE_PART(Configuring extensions) @@ -603,7 +607,6 @@ PHP_CONFIGURE_PART(Configuring extensions) # reading config stubs esyscmd(./scripts/config-stubs ext) -test "$PHP_SAPI" != "cgi" && PHP_FAST_OUTPUT(sapi/cgi/Makefile) PHP_FAST_OUTPUT(sapi/$PHP_SAPI/Makefile) AC_MSG_CHECKING(whether to enable versioning) @@ -641,7 +644,14 @@ static) ;; esac -PHP_PROGRAM=php +if test "$PHP_SAPI" = "cgi"; then + PHP_PROGRAM=php +fi + +if test "$PHP_SAPI" = "fastcgi"; then + PHP_PROGRAM=php +fi + PHP_REGEX @@ -685,64 +695,31 @@ $php_shtool mkdir -p $phplibdir phptempdir="`pwd`/libs" test "$prefix" = "NONE" && prefix="/usr/local" -test "$exec_prefix" = "NONE" && exec_prefix='${prefix}' -case $libdir in - */php) ;; - *) libdir="$libdir/php";; -esac -case $datadir in - */php) ;; - *) datadir="$datadir/php";; -esac +test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)' dnl Build extension directory path -ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'` - -extbasedir="$ZEND_MODULE_API_NO" +if test "$PHP_DEBUG" = "1"; then + PART1=debug +else + PART1=no-debug +fi if test "$enable_experimental_zts" = "yes"; then - extbasedir="${extbasedir}-zts" + PART2=zts +else + PART2=non-zts fi -if test "$PHP_DEBUG" = "1"; then - extbasedir="${extbasedir}-debug" -fi +ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'` if test -z "$PEAR_INSTALLDIR"; then - PEAR_INSTALLDIR="\${datadir}/pear" -fi -if test -z "$EXTENSION_DIR"; then - EXTENSION_DIR="\${libdir}/$extbasedir" -fi - -old_prefix="$prefix" -old_exec_prefix="$exec_prefix" -old_libdir="$libdir" -old_datadir="$datadir" -prefix=`eval echo $prefix` -exec_prefix=`eval echo $exec_prefix` -libdir=`eval echo $libdir` -datadir=`eval echo $datadir` -EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR` -EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR` -EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` -INCLUDE_PATH=".:$EXPANDED_PEAR_INSTALLDIR" -if test "$PHP_CONFIG_FILE_PATH" != "no"; then - EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` - AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "$EXPANDED_PHP_CONFIG_FILE_PATH",[ ]) - AC_DEFINE(USE_CONFIG_FILE, 1, [ ]) -else - AC_DEFINE(CONFIGURATION_FILE_PATH, 0, [ ]) - AC_DEFINE(USE_CONFIG_FILE, 0, [ ]) + PEAR_INSTALLDIR="$prefix/lib/php" fi -prefix="$old_prefix" -exec_prefix="$old_exec_prefix" -libdir="$old_libdir" -datadir="$old_datadir" -AC_SUBST(EXPANDED_PEAR_INSTALLDIR) -AC_SUBST(EXPANDED_EXTENSION_DIR) -AC_SUBST(EXPANDED_LOCALSTATEDIR) + +EXTENSION_DIR="${PEAR_INSTALLDIR}/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO" + +INCLUDE_PATH=".:${PEAR_INSTALLDIR}" PHP_BUILD_RPATH @@ -767,7 +744,6 @@ PHP_SUBST(phplibdir) PHP_SUBST(phptempdir) PHP_SUBST(prefix) PHP_SUBST(localstatedir) -PHP_SUBST(datadir) PHP_SUBST(AWK) PHP_SUBST(CC) |