diff options
| author | Jani Taskinen <jani@php.net> | 2007-08-20 14:28:45 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-08-20 14:28:45 +0000 |
| commit | c6a7e4cad43fb87986c72535f0595405f794125b (patch) | |
| tree | c51422932da48cd5832cda4d43e78e8124edbc68 /acinclude.m4 | |
| parent | 857aae2bd7b53c58033ee7a12347d2b2bcafaa34 (diff) | |
| download | php-git-c6a7e4cad43fb87986c72535f0595405f794125b.tar.gz | |
MFH:- Part 1 of fixing problems with runpath switch (make --disable-rpath work for real)
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0487728269..62baa98da3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -323,6 +323,9 @@ else ld_runpath_switch=-L fi fi +if test "$PHP_RPATH" = "no"; then + ld_runpath_switch= +fi ]) dnl @@ -447,7 +450,8 @@ AC_DEFUN([PHP_ADD_LIBPATH],[ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) ],[ if test "$ext_shared" = "yes"; then - $2="$ld_runpath_switch$ai_p -L$ai_p [$]$2" + $2="-L$ai_p [$]$2" + test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2" else _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) fi |