51 lines
1.6 KiB
Text
51 lines
1.6 KiB
Text
--- configure.in.orig Sat Jan 20 10:56:56 2007
|
|
+++ configure.in Sat Jan 20 10:57:33 2007
|
|
@@ -261,7 +261,6 @@
|
|
dnl .
|
|
dnl -------------------------------------------------------------------------
|
|
|
|
-PTHREADS_CHECK
|
|
PHP_HELP_SEPARATOR([SAPI modules:])
|
|
PHP_SHLIB_SUFFIX_NAME
|
|
PHP_SAPI=default
|
|
@@ -287,7 +286,6 @@
|
|
|
|
if test "$enable_experimental_zts" = "yes"; then
|
|
PTHREADS_ASSIGN_VARS
|
|
- PTHREADS_FLAGS
|
|
fi
|
|
|
|
if test "$PHP_ENABLE_FASTCGI" = "yes"; then
|
|
@@ -1058,7 +1056,7 @@
|
|
EXPANDED_DATADIR=$datadir
|
|
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
|
|
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
|
|
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
|
|
+INCLUDE_PATH=.:${prefix}/share/pear
|
|
|
|
exec_prefix=$old_exec_prefix
|
|
libdir=$old_libdir
|
|
@@ -1235,18 +1233,15 @@
|
|
INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
|
|
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
|
|
|
|
-all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
|
|
-install_targets="$install_modules $install_pear install-build install-headers install-programs"
|
|
+all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET) $(PHP_CGI_TARGET)'
|
|
+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules $install_pear install-build install-headers install-programs"
|
|
|
|
case $PHP_SAPI in
|
|
- cgi)
|
|
+ apache)
|
|
install_targets="install-sapi $install_targets"
|
|
;;
|
|
- cli)
|
|
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
|
|
- ;;
|
|
- *)
|
|
- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
|
|
+ apache2handler)
|
|
+ install_targets="install-sapi $install_targets"
|
|
;;
|
|
esac
|
|
|