Fixed bug #20298: LDFLAGS were not passed to the static apache module build

diff --git a/configure.in b/configure.in
index 2b49e64912c7bd182ac9904bac82ae1712d4243a..ab440b8474ce6720020e98fe3b5cac187b52253f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1008,7 +1008,7 @@ PHP_SUBST(CXX_PHP_COMPILE)
 PHP_SUBST_OLD(DEBUG_CFLAGS)
 PHP_SUBST(DEFS)
 PHP_SUBST_OLD(EXTENSION_DIR)
-PHP_SUBST(EXTRA_LDFLAGS)
+PHP_SUBST_OLD(EXTRA_LDFLAGS)
 PHP_SUBST_OLD(EXTRA_LIBS)
 PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
 PHP_SUBST_OLD(INCLUDES)

diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp4.module.in
index ccb97493a72fcc7c4a6d402eb5103594e1cba729..429c566fadbc29c94c92c81cbeba943e0ac648dc 100644 (file)
--- a/sapi/apache/libphp4.module.in
+++ b/sapi/apache/libphp4.module.in
@@ -2,7 +2,7 @@ Name: php4_module
 ConfigStart
        RULE_WANTHSREGEX=no
        RULE_HIDE=yes
-       PHP_LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS"
+       PHP_LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LDFLAGS@ @EXTRA_LIBS@ $LIBS"
        PHP_CFLAGS="$CFLAGS @OPENSSL_INCDIR_OPT@ -I@php_abs_top_builddir@/main -I@php_abs_top_builddir@/Zend -I@php_abs_top_builddir@/TSRM -I@php_abs_top_srcdir@ -I@php_abs_top_srcdir@/sapi/apache -I@php_abs_top_srcdir@/main -I@php_abs_top_srcdir@/Zend -I@php_abs_top_srcdir@/TSRM"
        my_outfile="Makefile.config"
        echo "PHP_CFLAGS=$PHP_CFLAGS" >>$my_outfile