diff options
| -rw-r--r-- | Makefile.global | 14 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | scripts/Makefile.frag | 4 | ||||
| -rw-r--r-- | scripts/man1/php-config.1.in | 4 | ||||
| -rw-r--r-- | scripts/php-config.in | 9 | ||||
| -rw-r--r-- | scripts/phpize.in | 5 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 2 |
7 files changed, 30 insertions, 14 deletions
diff --git a/Makefile.global b/Makefile.global index 160dc5b6a0..d4a92a2e27 100644 --- a/Makefile.global +++ b/Makefile.global @@ -45,15 +45,15 @@ install-modules: build-modules @rm -f modules/*.la >/dev/null 2>&1 @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) -install-tester: - @echo "Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR) - @$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR) - -install-su: install-pear install-tester +install-su: install-pear test: - -@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \ + -@if test ! -z $(PHP_EXECUTABLE) && test -x $(PHP_EXECUTABLE); then \ + TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ + CC="$(CC)" \ + $(PHP_EXECUTABLE) -d 'extension_dir=modules/' -d 'extension='`basename $(PHP_MODULES) .la`'.so' -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php tests/; \ + elif test ! -z $(SAPI_CLI_PATH) && test -x $(SAPI_CLI_PATH); then \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ diff --git a/configure.in b/configure.in index 11d78a78a6..a99eab8f48 100644 --- a/configure.in +++ b/configure.in @@ -1082,8 +1082,8 @@ PHP_SUBST_OLD(php_abs_top_srcdir) PHP_SUBST(bindir) PHP_SUBST(exec_prefix) -PHP_SUBST(program_prefix) -PHP_SUBST(program_suffix) +PHP_SUBST_OLD(program_prefix) +PHP_SUBST_OLD(program_suffix) PHP_SUBST(includedir) PHP_SUBST(libdir) PHP_SUBST(mandir) @@ -1183,7 +1183,7 @@ 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 install-tester" +install_targets="$install_modules $install_pear install-build install-headers install-programs" case $PHP_SAPI in cgi) diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index debe7a5beb..f2fd54bf4d 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -13,7 +13,9 @@ BUILD_FILES = \ build/libtool.m4 \ Makefile.global \ acinclude.m4 \ - ltmain.sh + ltmain.sh \ + run-tests.php \ + run-tests-config.php BUILD_FILES_EXEC = \ build/shtool \ diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in index 0028151075..bdc5654785 100644 --- a/scripts/man1/php-config.1.in +++ b/scripts/man1/php-config.1.in @@ -51,6 +51,10 @@ Extra libraries which PHP was compiled with Directory where extensions are searched by default .TP .PD 0 +.B \-\-php-binary +Full path to php CLI/CGI binary +.TP +.PD 0 .B \-\-version PHP version .TP diff --git a/scripts/php-config.in b/scripts/php-config.in index a3105dff4d..44ebdce0e2 100644 --- a/scripts/php-config.in +++ b/scripts/php-config.in @@ -1,12 +1,17 @@ #! /bin/sh prefix="@prefix@" +exec_prefix="@exec_prefix@" version="@PHP_VERSION@" includedir="@includedir@/php" includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend" ldflags="@PHP_LDFLAGS@" libs="@EXTRA_LIBS@" extension_dir='@EXTENSION_DIR@' +program_prefix="@program_prefix@" +program_suffix="@program_suffix@" +exe_extension="@EXEEXT@" +php_binary="@bindir@/${program_prefix}php${program_suffix}${exe_extension}" case "$1" in --prefix) @@ -19,10 +24,12 @@ case "$1" in echo $libs;; --extension-dir) echo $extension_dir;; +--php-binary) + echo $php_binary;; --version) echo $version;; *) - echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--version]" + echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--php-binary|--version]" exit 1;; esac diff --git a/scripts/phpize.in b/scripts/phpize.in index c9b81deb56..ae7ef56486 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -8,11 +8,12 @@ includedir="`eval echo @includedir@`/php" builddir="`pwd`" FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" -FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh" +FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \ mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \ - config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h" + config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \ + run-tests*.php" # function declaration phpize_usage() diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index fd3caa0c26..87531ca675 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -18,6 +18,7 @@ AC_DEFUN([PHP_WITH_PHP_CONFIG],[ prefix=`$PHP_CONFIG --prefix 2>/dev/null` INCLUDES=`$PHP_CONFIG --includes 2>/dev/null` EXTENSION_DIR=`$PHP_CONFIG --extension-dir` + PHP_EXECUTABLE=`$PHP_CONFIG --php-binary` if test -z "$prefix"; then AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=PATH) @@ -99,6 +100,7 @@ PHP_SUBST(CPPFLAGS) PHP_SUBST(CXX) PHP_SUBST(CXXFLAGS) PHP_SUBST(EXTENSION_DIR) +PHP_SUBST(PHP_EXECUTABLE) PHP_SUBST(EXTRA_LDFLAGS) PHP_SUBST(EXTRA_LIBS) PHP_SUBST(INCLUDES) |