blob: c1d5b00a0511dced8d0568434a6102f2dfa124d1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
Description: Adds --phpapi argument to php-config(1)
.
TODO: make it more generic and add it to the man page.
Origin: vendor
Forwarded: no
Last-Update: 2010-01-18
--- php5.orig/configure.in
+++ php5/configure.in
@@ -1194,8 +1194,10 @@ dnl Build extension directory path
ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define 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
@@ -1338,6 +1340,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)
--- php5.orig/scripts/php-config.in
+++ php5/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@"
# Set php_cli_binary and php_cgi_binary if available
for sapi in $php_sapis; do
@@ -57,6 +58,8 @@ case "$1" in
echo $include_dir;;
--php-binary)
echo $php_binary;;
+--phpapi)
+ echo $phpapi;;
--php-sapis)
echo $php_sapis;;
--configure-options)
@@ -80,6 +83,7 @@ Options:
--man-dir [$man_dir]
--php-binary [$php_binary]
--php-sapis [$php_sapis]
+ --phpapi [$phpapi]
--configure-options [$configure_options]
--version [$version]
--vernum [$vernum]
|
