* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ freebsd ]:

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

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

diff --git a/libtool.m4 b/libtool.m4
index 22a898dabee4fb22e7fcb818aa6c9dc11b4b2821..a542ad16141c472abb9de2de1a2092bdca234cdb 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1425,10 +1425,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
   ;;