diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-05 22:41:08 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-05 22:41:08 +0000 |
| commit | f2a090c6f18e6b0f12dbee9f590c339ee29e3f90 (patch) | |
| tree | 81f4b3d9fdf0295e3ac1b5cd7cac99c6c27098ef | |
| parent | 2e7c800e061be486e1667ba4fc2d9b1c845d36ef (diff) | |
| download | php-git-f2a090c6f18e6b0f12dbee9f590c339ee29e3f90.tar.gz | |
Add rpaths to LDFLAGS during configure, drop them later.
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a8a5c68ad4..ce8e69937a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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" ]) diff --git a/configure.in b/configure.in index 03a0506b5b..d77730b0ef 100644 --- a/configure.in +++ b/configure.in @@ -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) |