* libtool.m4: More fixes for the new GNU/FreeBSD triplet.

diff --git a/ChangeLog b/ChangeLog
index 36dcf7d94a1a989014a7f7d7c312d5d8dfc9c320..a6365cb6c6b54778d495d0554ee1190f9552572b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-24  Robert Millan  <robertmh@gnu.org>
+
+       * libtool.m4: More fixes for the new GNU/FreeBSD triplet.
+
 2003-07-14  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
        * config.guess, config.sub: Synchronized from ftp.gnu.org since

diff --git a/libtool.m4 b/libtool.m4
index 35aed42a86a50ba650d94558a78a6bf3611fc73b..9f0ac9496c0f9987965b39231f5f04fb160d51f9 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1299,7 +1299,7 @@ kfreebsd*-gnu)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
-  dynamic_linker='GNU/FreeBSD ld.so'
+  dynamic_linker='GNU ld.so'
   ;;
 
 freebsd*)
@@ -2123,7 +2123,7 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd*)
+freebsd* | kfreebsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -2946,7 +2946,7 @@ case $host_os in
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd*)
+  freebsd* | kfreebsd*-gnu)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -4592,7 +4592,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            ;;
        esac
        ;;
-      freebsd*)
+      freebsd* | kfreebsd*-gnu)
        # FreeBSD uses GNU C++
        ;;
       hpux9* | hpux10* | hpux11*)
@@ -5402,7 +5402,7 @@ EOF
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd*)
+    freebsd* | kfreebsd*-gnu)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes