From 0624da46cfa07fe545d8486f02bca79d09d75e25 Mon Sep 17 00:00:00 2001 From: Debian PHP Maintainers Date: Sat, 2 May 2015 10:26:51 +0200 Subject: [PATCH] extension_api Gbp-Pq: Name 0004-extension_api.patch --- configure.ac | 5 ++++- scripts/php-config.in | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4cef1818..b67338e3 100644 --- a/configure.ac +++ b/configure.ac @@ -1370,8 +1370,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 @@ -1505,6 +1507,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 355be049..cac95acc 100644 --- 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] -- 2.30.2