--- a/ltconfig	Thu Aug 09 06:08:57 2001 +0000
+++ b/ltconfig	Thu Aug 09 06:11:49 2001 +0000
@@ -1452,9 +1452,9 @@
       *)
 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	 if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
-	   export_dynamic_flag_spec='${wl}-E'
-	 fi
+	if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  export_dynamic_flag_spec='${wl}-E'
+	fi
       ;;
     esac
     ;;
@@ -2081,6 +2081,17 @@
 
 openbsd*)
   version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  file_magic_cmd=/usr/bin/file
+  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
+    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
   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH