mirror of
https://github.com/php/php-src.git
synced 2025-08-18 23:18:56 +02:00
Revert mega patch.
This patch has at least the following deficiences: - the CGI is built using objects from another SAPI module. This usually results in unsatisfied symbol references. - the CGI makefile is not created properly - building CGI cannot be disabled
This commit is contained in:
Sascha Schumann
parent
d85be2956c
commit
466c226415
6 changed files with 61 additions and 105 deletions
11
Makefile.in
11
Makefile.in
|
|
@ -18,7 +18,7 @@ LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
|
|||
|
||||
PROGRAM_NAME = php
|
||||
PROGRAM_SOURCES = stub.c
|
||||
PROGRAM_LDADD = $(CGI_LDADD) libphp4.la $(EXT_PROGRAM_LDADD)
|
||||
PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD)
|
||||
PROGRAM_LDFLAGS = -export-dynamic
|
||||
PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
|
||||
|
||||
|
|
@ -41,7 +41,6 @@ install-sapi:
|
|||
fi; \
|
||||
done; \
|
||||
fi
|
||||
$(INSTALL_CGI)
|
||||
$(INSTALL_IT)
|
||||
|
||||
install-modules:
|
||||
|
|
@ -51,13 +50,7 @@ install-modules:
|
|||
rm -f modules/*.la && \
|
||||
cp modules/* $(INSTALL_ROOT)$(moduledir) >/dev/null 2>&1 || true
|
||||
|
||||
install-tester:
|
||||
-$(mkinstalldirs) $(bindir)
|
||||
$(INSTALL) -m 755 $(srcdir)/run-tests.php $(PEAR_INSTALLDIR)/.
|
||||
|
||||
install-pear: install-modules
|
||||
install-su: install-modules
|
||||
(cd pear && $(MAKE) install)
|
||||
|
||||
install-su: install-pear install-tester
|
||||
|
||||
.NOEXPORT:
|
||||
|
|
|
|||
116
configure.in
116
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"
|
||||
PEAR_INSTALLDIR="$prefix/lib/php"
|
||||
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, [ ])
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#define PHP_FHTTPD_INCLUDE ""
|
||||
#define PHP_FHTTPD_LIB ""
|
||||
#define PHP_FHTTPD_TARGET ""
|
||||
#define PHP_BINNAME "@BINNAME@"
|
||||
#define PHP_CFLAGS "@CFLAGS@"
|
||||
#define PHP_DBASE_LIB ""
|
||||
#define PHP_BUILD_DEBUG "@DEBUG_CFLAGS@"
|
||||
|
|
@ -38,6 +39,7 @@
|
|||
#define PHP_IFX_INCLUDE ""
|
||||
#define PHP_IFX_LFLAGS ""
|
||||
#define PHP_IFX_LIBS ""
|
||||
#define PHP_INSTALL_IT "@INSTALL_IT@"
|
||||
#define PHP_IODBC_INCLUDE ""
|
||||
#define PHP_IODBC_LFLAGS ""
|
||||
#define PHP_IODBC_LIBS ""
|
||||
|
|
@ -48,9 +50,14 @@
|
|||
#define PHP_MYSQL_LFLAGS ""
|
||||
#define PHP_MYSQL_LIBS ""
|
||||
#define PHP_ODBC_TYPE "@ODBC_TYPE@"
|
||||
#define PHP_ODBC_INCLUDE "@ODBC_INCLUDE@"
|
||||
#define PHP_ODBC_LFLAGS "@ODBC_LFLAGS@"
|
||||
#define PHP_ODBC_LIBS "@ODBC_LIBS@"
|
||||
#define PHP_OCI8_SHARED_LIBADD "@OCI8_SHARED_LIBADD@"
|
||||
#define PHP_OCI8_DIR "@OCI8_DIR@"
|
||||
#define PHP_OCI8_VERSION "@OCI8_VERSION@"
|
||||
#define PHP_ORACLE_SHARED_LIBADD "@ORACLE_SHARED_LIBADD@"
|
||||
#define PHP_ORACLE_DIR "@ORACLE_DIR@"
|
||||
#define PHP_ORACLE_VERSION "@ORACLE_VERSION@"
|
||||
#define PHP_PGSQL_INCLUDE ""
|
||||
#define PHP_PGSQL_LFLAGS ""
|
||||
|
|
@ -71,5 +78,5 @@
|
|||
#define PHP_LDAP_LIBS ""
|
||||
#define PHP_VELOCIS_INCLUDE ""
|
||||
#define PHP_VELOCIS_LIBS ""
|
||||
#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
|
||||
#define PHP_INCLUDE_PATH "@EXPANDED_INCLUDE_PATH@"
|
||||
#define PHP_EXTENSION_DIR "@EXTENSION_DIR@"
|
||||
#define PHP_INCLUDE_PATH "@INCLUDE_PATH@"
|
||||
|
|
|
|||
|
|
@ -27,19 +27,8 @@ define('PEAR_ERROR_DIE', 8);
|
|||
define('PEAR_ERROR_CALLBACK', 16);
|
||||
|
||||
define('PHP_BINDIR', '@prefix@/bin');
|
||||
define('PEAR_INSTALL_DIR', '@EXPANDED_PEAR_INSTALLDIR@');
|
||||
define('PEAR_EXTENSION_DIR', '@EXPANDED_EXTENSION_DIR@');
|
||||
define('PHP_LOCALSTATEDIR', '@EXPANDED_LOCALSTATEDIR@');
|
||||
|
||||
if (substr(php_uname(), 0, 7) == 'Windows') {
|
||||
define('OS_WINDOWS', true);
|
||||
define('OS_UNIX', false);
|
||||
define('PEAR_OS', 'Windows');
|
||||
} else {
|
||||
define('OS_WINDOWS', false);
|
||||
define('OS_UNIX', true);
|
||||
define('PEAR_OS', 'Unix'); // not exactly true, but...
|
||||
}
|
||||
define('PEAR_INSTALL_DIR', '@PEAR_INSTALLDIR@');
|
||||
define('PEAR_EXTENSION_DIR', '@EXTENSION_DIR@');
|
||||
|
||||
$_PEAR_default_error_mode = PEAR_ERROR_RETURN;
|
||||
$_PEAR_default_error_options = E_USER_NOTICE;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
SUBDIRS = $(CGI_DIR) $(PHP_SAPI)
|
||||
SUBDIRS = $(PHP_SAPI)
|
||||
|
||||
include $(top_srcdir)/build/rules.mk
|
||||
|
|
|
|||
|
|
@ -29,18 +29,9 @@ if test "$PHP_SAPI" = "cgi"; then
|
|||
|
||||
fi
|
||||
|
||||
# Always build and install the CGI binary
|
||||
INSTALL_CGI="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/$SAPI_CGI"
|
||||
if test "$PHP_SAPI" = "cgi" ; then
|
||||
CGI_DIR=""
|
||||
CGI_LDADD=""
|
||||
INSTALL_IT=""
|
||||
else
|
||||
CGI_DIR="cgi"
|
||||
CGI_LDADD="sapi/cgi/libsapi.la"
|
||||
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/$SAPI_CGI"
|
||||
fi
|
||||
PHP_SUBST(CGI_DIR)
|
||||
PHP_SUBST(CGI_LDADD)
|
||||
|
||||
AC_MSG_CHECKING(for fhttpd module support)
|
||||
AC_ARG_WITH(fhttpd,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue