diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-06 15:32:01 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-06 15:32:01 +0000 |
| commit | b47cb50ccd398fd17cf8df6188a590ddcffb02b2 (patch) | |
| tree | a1b4785afdf382db065f441abcf9192e4cdc3745 | |
| parent | 00c3ac908b1f930160b1e2634a91f25b8e741d84 (diff) | |
| download | php-git-b47cb50ccd398fd17cf8df6188a590ddcffb02b2.tar.gz | |
Separate libpaths into PHP_LDFLAGS, so that we can address them
separately (required for Apache build).
| -rw-r--r-- | acinclude.m4 | 3 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | sapi/apache/libphp4.module.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 47f70a3a8f..aec18cfa50 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -95,7 +95,8 @@ AC_DEFUN(AC_BUILD_RPATH,[ 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 diff --git a/configure.in b/configure.in index d77730b0ef..597aeabf92 100644 --- a/configure.in +++ b/configure.in @@ -737,10 +737,8 @@ phptempdir="`pwd`/libs" 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 @@ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME") 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) diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp4.module.in index 8ecf83ebaa..2513a7b48d 100644 --- a/sapi/apache/libphp4.module.in +++ b/sapi/apache/libphp4.module.in @@ -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 |