From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 5 Aug 2001 12:03:06 +0000 (+0000)
Subject: From Brad <brad@comstyle.com>:
X-Git-Tag: release-1-4d~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03c9017f793c53b1e86d6d6f23f8d29f0871e54f;p=thirdparty%2Flibtool.git

From Brad <brad@comstyle.com>:
* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [openbsd]:  OpenBSD
can build modules without a `lib' prefix and version number.
Move the deplibs check code from here...
(AC_DEPLIBS_CHECK_METHOD): ...to here.
---

diff --git a/ChangeLog b/ChangeLog
index dcbd32c73..293189f4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-05  Gary V. Vaughan  <gary@gnu.org>
+
+	From Brad <brad@comstyle.com>:
+	* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [openbsd]:  OpenBSD
+	can build modules without a `lib' prefix and version number.
+	Move the deplibs check code from here...
+	(AC_DEPLIBS_CHECK_METHOD): ...to here.
+
 2001-08-05  Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>
 
 	* libtool.m4 [osf3*, osf4*, osf5*]: Tru64 *can* build modules
diff --git a/libtool.m4 b/libtool.m4
index c08aa40b8..febe04371 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1294,15 +1294,15 @@ nto-qnx)
 
 openbsd*)
   version_type=sunos
+  need_lib_prefix=no
+  need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    [deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
+    shlibpath_overrides_runpath=no
   else
-    deplibs_check_method='file_magic OpenBSD.* shared library'
+    shlibpath_overrides_runpath=yes
   fi
   ;;
 
@@ -1952,6 +1952,16 @@ newos6*)
 nto-qnx)
   lt_cv_deplibs_check_method=unknown
   ;;
+
+openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
+  else
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+  fi
+  ;;
      
 osf3* | osf4* | osf5*)
   # this will be overridden with pass_all, but let us keep it just in case