diff options
| author | Jani Taskinen <jani@php.net> | 2007-08-20 14:28:29 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-08-20 14:28:29 +0000 |
| commit | 56f88566e94ad9b439049580887123e989ae151e (patch) | |
| tree | 3c5837b9cdeacd958b744ce3b42b80a9e7a7e589 /acinclude.m4 | |
| parent | c7d82c75c905fe2e4e03276e94734de743fa1127 (diff) | |
| download | php-git-56f88566e94ad9b439049580887123e989ae151e.tar.gz | |
- 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 |