* ltconfig.in: when $host_os is freebsd[23]* determine whether

	the current linker format is a.out or ELF
	* ltmain.in: add two new $version_type's, freebsd-aout and
	freebsd-elf, to support above change

diff --git a/ChangeLog b/ChangeLog
index 1a7825025153d0205fb5c80b2902d4010a2ab4c6..fc0367c138ad0d0da44b9f46fb670e4f085ee15b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-11-16  Steve Price  <sprice@hiwaay.net>
+
+       * ltconfig.in: when $host_os is freebsd[23]* determine whether
+       the current linker format is a.out or ELF
+       * ltmain.in: add two new $version_type's, freebsd-aout and
+       freebsd-elf, to support above change
+
 1998-11-16  Stephan Kulow  <coolo@kde.org>
 
        * ltconfig.in: extent no_builtin_flag to contain -fno-rtti and

diff --git a/ltconfig.in b/ltconfig.in
index 11da3572b8fe8a93154d1a1e624774a79ad1f186..a5bdb44087d9ddcdc61e5f7ce05c347d29a4f072 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1506,9 +1506,10 @@ cygwin32* | mingw32*)
   ;;
 
 freebsd2* | freebsd3*)
-  version_type=sunos
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
   library_names_spec='${libname}${release}.so$versuffix $libname.so'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 

diff --git a/ltmain.in b/ltmain.in
index 60001ccc0d744de0393d48a0d0638802e0bb256c..a032ca985ce61e49656946c759b34f942b694eb3 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1240,6 +1240,16 @@ compiler."
          versuffix=".$current.$revision"
          ;;
 
+       freebsd-aout)
+         major=".$current"
+         versuffix="$current.$revision";
+         ;;
+
+       freebsd-elf)
+         major=".$current"
+         versuffix="$current";
+         ;;
+
        windows)
          # Like Linux, but with '-' rather than '.', since we only
          # want one extension on Windows 95.

diff --git a/mail/freebsd b/mail/freebsd
index a59b7bbdbcd81abb845b8255469e9449ae378731..b40c2cdf435d6c12e728eaf139de1e29b5ee87f2 100644 (file)
--- a/mail/freebsd
+++ b/mail/freebsd
@@ -35,79 +35,3 @@ and make `-lgtk' work, the link must be named `libgtk.so.2.0':
 
 --Ben
 
-From nobody Wed Oct 14 17:09:30 1998
-X-From-Line: gord@gnu.org Thu Sep 24 04:23:48 1998
-Return-Path: <gord@gnu.org>
-Delivered-To: gord@trick.fig.org
-Received: (qmail 10420 invoked from network); 24 Sep 1998 04:23:42 -0000
-Received: from gen2-93ip34.cadvision.com (HELO bambam.m-tech.ab.ca) (209.91.93.34)
-  by cs366707-a.cgmo1.ab.wave.home.com with SMTP; 24 Sep 1998 04:23:42 -0000
-Received: from mescaline.gnu.org (gateway [10.0.0.1])
-       by bambam.m-tech.ab.ca (8.8.7/8.8.7) with ESMTP id WAA31967
-       for <gord@m-tech.ab.ca>; Wed, 23 Sep 1998 22:26:43 -0600
-Received: from CirX.ORG (genius.cirx.org [140.112.240.59]) by mescaline.gnu.org (8.8.5/8.6.12GNU) with ESMTP id AAA23595 for <bug-libtool@gnu.org>; Thu, 24 Sep 1998 00:25:59 -0400
-Received: (from clkao@localhost)
-       by CirX.ORG (8.9.1/8.8.8) id MAA18825;
-       Thu, 24 Sep 1998 12:23:15 +0800 (CST)
-       (envelope-from clkao@CirX.ORG)
-Date: Thu, 24 Sep 1998 12:23:15 +0800 (CST)
-Message-Id: <199809240423.MAA18825@CirX.ORG>
-X-Authentication-Warning: genius.cirx.org: clkao set sender to clkao@CirX.ORG using -f
-From: Chia-liang Kao <clkao@CirX.ORG>
-To: bug-libtool@gnu.org
-Subject: FreeBSD 3 support
-Xref: trick.fig.org libtool:1628
-Lines: 51
-X-Gnus-Article-Number: 2   Mon Nov  2 17:19:20 1998
-
-
-Greetings, 
-          Due to the recent ELF transistion on FreeBSD 3, The shared
-library version policy has been changed. Here is a patch from
-Vanilla I. Shu <vanilla@FreeBSD.ORG> to support the new elf world on FreeBSD3.
-
---- ltmain.sh.orig     Wed Sep 23 23:37:14 1998
-+++ ltmain.sh  Wed Sep 23 23:38:02 1998
-@@ -967,6 +967,16 @@
-         versuffix="$current.$revision"
-         ;;
- 
-+      freebsd)
-+        version_vars="$version_vars major versuffix"
-+        major="$current"
-+      if [ $PORTOBJFORMAT = elf ]; then
-+        versuffix="$current";
-+      else
-+        versuffix="$current.$revision";
-+      fi
-+        ;;
-+
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig      Wed Sep 23 23:37:18 1998
-+++ ltconfig   Wed Sep 23 23:39:06 1998
-@@ -1123,10 +1123,21 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-   ;;
- 
--freebsd2* | freebsd3*)
-+freebsd2*)
-   version_type=sunos
-   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd3*)
-+  version_type=freebsd
-+  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-+  if [ $PORTOBJFORMAT = elf ]; then
-+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+  else
-+  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
-