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

assume `aout' for modern FreeBSD by absence of deprecated
`objformat'.

diff --git a/ChangeLog b/ChangeLog
index 9d5df9c0af64d8fea9f53d912505ddef5eddb74a..babcbdef4f68ff391660d84f6dfc50c6304dd65e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-08-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ freebsd ]: Do not
+       assume `aout' for modern FreeBSD by absence of deprecated
+       `objformat'.
+
        * m4/libtool.m4 [sun, CC] (_LT_LANG_CXX_CONFIG): Move postdeps
        override ..
        (_LT_SYS_HIDDEN_LIBDEPS): ..here.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 44725b156c5c0fb4787fc1da6531003debdd4bb5..e6f482872d08829c0ec1b5f2c0653df67175c8ab 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1919,7 +1919,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*)