* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ freebsd ]:

Fix shlibpath_overrides_runpath settings.
Reported by Dave Benson <daveb@idealab.com>.

diff --git a/ChangeLog b/ChangeLog
index e8c5387330725e755d7af5f2e52fdb558252c616..7611153624774346f3b358694bf14a6e3b5b8bf3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-11  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ freebsd ]:
+       Fix shlibpath_overrides_runpath settings.
+       Reported by Dave Benson <daveb@idealab.com>.
+
 2005-09-10  Charles Wilson  <cygwin@cwilson.fastmail.fm>
 
        * libltdl/config/ltmain.m4sh (func_win32_libid): use $SED not

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 90d019f9a438fbf4096921b1527361c6b47ecc66..09e8b10f2d25e3f3722d45a7140e60faa2e4c37b 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2139,10 +2139,15 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;