Last active
November 13, 2015 05:07
-
-
Save reeze/89fd045f1d0960d2add3 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/build/config-stubs b/build/config-stubs | |
index 765eb54..0d84f4b 100755 | |
--- a/build/config-stubs | |
+++ b/build/config-stubs | |
@@ -6,5 +6,11 @@ dir=$1; shift | |
for stubfile in $dir/*/config0.m4 $dir/*/config.m4 $dir/*/config9.m4; do | |
echo "config_m4_src=$stubfile | |
config_m4_dir=`dirname $stubfile` | |
+ | |
+dnl Define where extension directories are located in the configure context | |
+AC_DEFUN([PHP_EXT_BUILDDIR], [`dirname $stubfile`]) | |
+AC_DEFUN([PHP_EXT_DIR], [`dirname $stubfile`]) | |
+AC_DEFUN([PHP_EXT_SRCDIR], [\$abs_srcdir/`dirname $stubfile`]) | |
+ | |
sinclude($stubfile)" | |
done | |
diff --git a/configure.in b/configure.in | |
index 859574f..edbbfac 100644 | |
--- a/configure.in | |
+++ b/configure.in | |
@@ -131,9 +131,9 @@ PHP_SUBST(PHP_RELEASE_VERSION) | |
PHP_SUBST(PHP_EXTRA_VERSION) | |
-dnl Define where extension directories are located in the configure context | |
-AC_DEFUN([PHP_EXT_BUILDDIR],[$config_m4_dir])dnl | |
-AC_DEFUN([PHP_EXT_DIR],[$config_m4_dir])dnl | |
-AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/$config_m4_dir])dnl | |
AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl | |
dnl Setting up the PHP version based on the information above. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/build/config-stubs b/build/config-stubs | |
index 765eb54..8c88dc3 100755 | |
--- a/build/config-stubs | |
+++ b/build/config-stubs | |
@@ -6,5 +6,7 @@ dir=$1; shift | |
for stubfile in $dir/*/config0.m4 $dir/*/config.m4 $dir/*/config9.m4; do | |
echo "config_m4_src=$stubfile | |
config_m4_dir=`dirname $stubfile` | |
+m4_define([PHP_CURRENT_CONFIG_M4_SRC], [$stubfile]) | |
+m4_define([PHP_CURRENT_CONFIG_M4_DIR], [`dirname $stubfile`]) | |
sinclude($stubfile)" | |
done | |
diff --git a/configure.in b/configure.in | |
index 859574f..ea2388c 100644 | |
--- a/configure.in | |
+++ b/configure.in | |
@@ -131,9 +131,9 @@ PHP_SUBST(PHP_RELEASE_VERSION) | |
PHP_SUBST(PHP_EXTRA_VERSION) | |
dnl Define where extension directories are located in the configure context | |
-AC_DEFUN([PHP_EXT_BUILDDIR],[$config_m4_dir])dnl | |
-AC_DEFUN([PHP_EXT_DIR],[$config_m4_dir])dnl | |
-AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/$config_m4_dir])dnl | |
+AC_DEFUN([PHP_EXT_BUILDDIR],[PHP_CURRENT_CONFIG_M4_DIR])dnl | |
+AC_DEFUN([PHP_EXT_DIR],[PHP_CURRENT_CONFIG_M4_DIR])dnl | |
+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/PHP_CURRENT_CONFIG_M4_DIR])dnl | |
AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl | |
dnl Setting up the PHP version based on the information above. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment