cvs: /php4 acinclude.m4 configure.in /php4/sapi/apache libphp4.module.in

sas Mon Dec 6 10:32:32 1999 EDT Modified files: /php4 acinclude.m4 configure.in /php4/sapi/apache libphp4.module.in Log: Separate libpaths into PHP_LDFLAGS, so that we can address them separately (required for Apache build). Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.50 php4/acinclude.m4:1.51 --- php4/acinclude.m4:1.50 Sun Dec 5 18:10:51 1999 +++ php4/acinclude.m4 Mon Dec 6 10:31:59 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.50 1999/12/05 23:10:51 sas Exp $ +dnl $Id: acinclude.m4,v 1.51 1999/12/06 15:31:59 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -95,7 +95,8 @@ OLD_RPATHS="$PHP_RPATHS" PHP_RPATHS="" for i in $OLD_RPATHS; do - PHP_RPATHS="$PHP_RPATHS -R $i" + PHP_LDFLAGS="$PHP_LDFLAGS -L$i" + PHP_RPATHS="$PHP_RPATHS -R $i" NATIVE_RPATHS="$NATIVE_RPATHS ${ld_runpath_switch}$i" done fi Index: php4/configure.in diff -u php4/configure.in:1.60 php4/configure.in:1.61 --- php4/configure.in:1.60 Sun Dec 5 17:41:08 1999 +++ php4/configure.in Mon Dec 6 10:32:00 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.60 1999/12/05 22:41:08 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.61 1999/12/06 15:32:00 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -737,10 +737,8 @@ AC_SUBST(phplibdir) AC_SUBST(phptempdir) EXTRA_LIBS="$EXTRA_LIBS $LIBS" +EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" LIBS="" -for i in $PHP_RPATHS; do - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$i" -done LDFLAGS="" AC_BUILD_RPATH @@ -759,6 +757,7 @@ PHP_OS=uname AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS") +AC_SUBST(PHP_LDFLAGS) AC_SUBST(PHP_LIBS) AC_SUBST(PHP_SAPI) AC_SUBST(INSTALL_IT) Index: php4/sapi/apache/libphp4.module.in diff -u php4/sapi/apache/libphp4.module.in:1.3 php4/sapi/apache/libphp4.module.in:1.4 --- php4/sapi/apache/libphp4.module.in:1.3 Sat Nov 13 11:51:33 1999 +++ php4/sapi/apache/libphp4.module.in Mon Dec 6 10:32:01 1999 @@ -1,7 +1,7 @@ Name: php4_module ConfigStart RULE_WANTHSREGEX=@APACHE_WANT_HSREGEX@ - LIBS="@NATIVE_RPATHS@ @PHP_LIBS@ @EXTRA_LIBS@ @LIBS@ $LIBS" + LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS" RULE_HIDE=yes CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@/libzend -I@abs_builddir@" ConfigEnd