cvs: php4(PHP_4_3) / configure.in /sapi/apache libphp4.module.in
| From: | Jani Taskinen | Date: | Wed, 11 Dec 2002 08:42:07 +0000 |
| Subject: | cvs: php4(PHP_4_3) / configure.in /sapi/apache libphp4.module.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17102@lists.php.net to get a copy of this message | ||
sniper Wed Dec 11 03:42:07 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4 configure.in
/php4/sapi/apache libphp4.module.in
Log:
MFH: Fix for bug #20928
Index: php4/configure.in
diff -u php4/configure.in:1.396.2.11 php4/configure.in:1.396.2.12
--- php4/configure.in:1.396.2.11 Mon Dec 9 13:28:03 2002
+++ php4/configure.in Wed Dec 11 03:42:07 2002
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.11 2002/12/09 18:28:03 wez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.12 2002/12/11 08:42:07 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1008,7 +1008,7 @@
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)
Index: php4/sapi/apache/libphp4.module.in
diff -u php4/sapi/apache/libphp4.module.in:1.13 php4/sapi/apache/libphp4.module.in:1.13.4.1
--- php4/sapi/apache/libphp4.module.in:1.13 Sun Apr 28 00:53:40 2002
+++ php4/sapi/apache/libphp4.module.in Wed Dec 11 03:42:07 2002
@@ -2,7 +2,7 @@
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