Add rpaths to LDFLAGS during configure, drop them later.

This commit is contained in:
Sascha Schumann 1999-12-05 22:41:08 +00:00
parent 2e7c800e06
commit f2a090c6f1
2 changed files with 6 additions and 2 deletions

View File

@ -78,6 +78,7 @@ AC_DEFUN(AC_ADD_LIBPATH,[
if test "$1" != "/usr/lib"; then
AC_EXPAND_PATH($1, ai_p)
AC_PHP_ONCE(LIBPATH, $ai_p, [
test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
LDFLAGS="$LDFLAGS -L$ai_p"
PHP_RPATHS="$PHP_RPATHS $ai_p"
])

View File

@ -731,7 +731,6 @@ dnl test -n "$GCC" && CFLAGS="$CFLAGS -fpic"
dnl add -fPIC option on Solaris if we are building dynamic extensions
dnl PHP_SOLARIS_PIC_WEIRDNESS
AC_BUILD_RPATH
phplibdir="`pwd`/modules"
phptempdir="`pwd`/libs"
@ -739,9 +738,13 @@ AC_SUBST(phplibdir)
AC_SUBST(phptempdir)
EXTRA_LIBS="$EXTRA_LIBS $LIBS"
LIBS=""
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
for i in $PHP_RPATHS; do
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$i"
done
LDFLAGS=""
AC_BUILD_RPATH
AC_SUBST(CFLAGS)
AC_SUBST(PROG_SENDMAIL)
AC_SUBST(PHP_RPATHS)