From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 18 Aug 2005 06:56:19 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ freebsd ]: Do not
X-Git-Tag: release-1-5-20~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdbeb89c5ede3b84d3c15d377e7c9b07c6c09c6f;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ freebsd ]: Do not
assume `aout' for modern FreeBSD by absence of deprecated
`objformat'.
---

diff --git a/ChangeLog b/ChangeLog
index 2e77eadb9..9436b5715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-08-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ freebsd ]: Do not
+	assume `aout' for modern FreeBSD by absence of deprecated
+	`objformat'.
+
 	* libtool.m4 [sun, CC] (AC_LIBTOOL_LANG_CXX_CONFIG): Move
 	postdeps override ..
 	(AC_LIBTOOL_POSTDEP_PREDEP): ..here, so they actually override.
diff --git a/libtool.m4 b/libtool.m4
index 575e22fdc..c02326cd0 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1367,7 +1367,14 @@ kfreebsd*-gnu)
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)