extension_api

Gbp-Pq: Name 0004-extension_api.patch

diff --git a/configure.ac b/configure.ac
index 81c1a9eb39ed95ff390a7dd454d4a82c95780676..dc06f7a68c3ff998abf532c61338b248e73cc2ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1383,8 +1383,10 @@ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modul
 
 AC_SUBST(ZEND_MODULE_API_NO)
 
+DEBIAN_PHP_API=$ZEND_MODULE_API_NO
+
 if test -z "$EXTENSION_DIR"; then
-  extbasedir=$ZEND_MODULE_API_NO
+  extbasedir=$DEBIAN_PHP_API
   if test "$oldstyleextdir" = "yes"; then
     if test "$PHP_DEBUG" = "1"; then
       part1=debug
@@ -1518,6 +1520,7 @@ PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
 PHP_SUBST(CXXFLAGS_CLEAN)
 PHP_SUBST_OLD(DEBUG_CFLAGS)
+PHP_SUBST_OLD(DEBIAN_PHP_API)
 PHP_SUBST_OLD(EXTENSION_DIR)
 PHP_SUBST_OLD(EXTRA_LDFLAGS)
 PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)

diff --git a/scripts/php-config.in b/scripts/php-config.in
index 355be04954915e58d0e1c36d89eb957b2f0b012c..cac95acc478a070e93a4de655e97266fb770b049 100644 (file)
--- a/scripts/php-config.in
+++ b/scripts/php-config.in
@@ -19,6 +19,7 @@ php_cli_binary=NONE
 php_cgi_binary=NONE
 configure_options="@CONFIGURE_OPTIONS@"
 php_sapis="@PHP_INSTALLED_SAPIS@"
+phpapi="@DEBIAN_PHP_API@"
 ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
 ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
 
@@ -59,6 +60,8 @@ case "$1" in
   echo $include_dir;;
 --php-binary)
   echo $php_binary;;
+--phpapi)
+  echo $phpapi;;
 --php-sapis)
   echo $php_sapis;;
 --configure-options)
@@ -86,6 +89,7 @@ Options:
   --man-dir           [$man_dir]
   --php-binary        [$php_binary]
   --php-sapis         [$php_sapis]
+  --phpapi            [$phpapi]
   --ini-path          [$ini_path]
   --ini-dir           [$ini_dir]
   --configure-options [$configure_options]