$OpenBSD: patch-scripts_ltmain_sh,v 1.2 2004/08/09 11:46:23 espie Exp $
--- scripts/ltmain.sh.orig	Mon Jul 31 02:13:38 2000
+++ scripts/ltmain.sh	Mon Aug  9 13:32:27 2004
@@ -506,8 +506,29 @@ if test -z "$show_help"; then
         deplibs="$deplibs $arg"
         ;;
 
-      -l*) deplibs="$deplibs $arg" ;;
+      -l*)
+	if test "$arg" = "-lc"; then
+	   case "$host" in
+	   *-*-openbsd*)
+	     # Do not include libc due to us having libc/libc_r.
+	     continue
+	     ;;
+	   esac
+	elif test "$arg" = "-lc_r"; then
+	   case "$host" in
+	   *-*-openbsd*)
+	     # Do not include libc_r directly, use -pthread flag.
+	     continue
+	     ;;
+	   esac
+	fi
+	deplibs="$deplibs $arg"
+	;;
 
+      -?thread)
+	deplibs="$deplibs $arg"
+	;;
+
       -no-undefined)
 	allow_undefined=no
 	continue
@@ -1002,7 +1023,15 @@ if test -z "$show_help"; then
 
       # Add libc to deplibs on all systems.
       dependency_libs="$deplibs"
-      deplibs="$deplibs -lc"
+      case "$host_os" in
+      openbsd*)
+	# do not include libc due to us having libc/libc_r.
+      ;;
+      *)
+	# Add libc to deplibs on all other systems.
+	deplibs="$deplibs -lc"
+      ;;
+      esac
 
       if test "$build_libtool_libs" = yes; then
         # Get the real and link names of the library.
@@ -2023,37 +2052,6 @@ libdir='$install_libdir'\
       done
     fi
 
-    echo "------------------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      echo "   $libdir"
-    done
-    echo
-    echo "To link against installed libraries in a given directory, LIBDIR,"
-    echo "you must use the \`-LLIBDIR' flag during linking."
-    echo
-    echo " You will also need to do one of the following:"
-    if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      echo "   - use the \`$flag' linker flag"
-    fi
-    if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    echo
-    echo "See any operating system documentation about shared libraries for"
-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    echo "------------------------------------------------------------------------------"
     exit 0
     ;;
 
