* 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 2e77eadb9a6c6aa0f22f03b688ee5e3561f666b2..9436b5715820c0e3553f892ae1895d62b95c1102 100644 (file)
--- 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 575e22fdcdfa8dd85a153d97fa345397b6c21dd9..c02326cd0d998952e39366704587bc5294fed067 100644 (file)
--- 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*)