From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 11 Nov 2005 22:06:41 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ freebsd ]:
X-Git-Tag: release-1-5-22~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6ed2c005d5d9fca98f16d0f223f10c927e6b8a;p=thirdparty%2Flibtool.git

* 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 c573d8aa4..9e4554d24 100644
--- 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 22a898dab..a542ad161 100644
--- 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
   ;;