- Made it possible to do "make test" for phpized extensions

5 files changed, 20 insertions, 4 deletions

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)