From 58ad95724d1bb4cfdc96d053e427131b37d261f7 Mon Sep 17 00:00:00 2001
From: danh <danh@openbsd.org>
Date: Tue, 20 Feb 2001 20:27:22 +0000
Subject: [PATCH] sync libtool patch

---
 x11/windowmaker/patches/patch-ltmain_sh | 40 +++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/x11/windowmaker/patches/patch-ltmain_sh b/x11/windowmaker/patches/patch-ltmain_sh
index 683722c7a78..10e8f19849f 100644
--- a/x11/windowmaker/patches/patch-ltmain_sh
+++ b/x11/windowmaker/patches/patch-ltmain_sh
@@ -1,7 +1,37 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2001/02/15 17:57:55 wilfried Exp $
---- ltmain.sh.orig	Sat Feb 10 20:46:25 2001
-+++ ltmain.sh	Tue Feb 13 14:48:57 2001
-@@ -1799,6 +1799,9 @@ compiler."
+$OpenBSD: patch-ltmain_sh,v 1.3 2001/02/20 20:27:22 danh Exp $
+--- ltmain.sh.orig	Sat Feb 10 14:46:25 2001
++++ ltmain.sh	Tue Feb 20 15:25:28 2001
+@@ -1079,7 +1079,18 @@ compiler."
+ 	    # These systems don't actually have c library (as such)
+ 	    continue
+ 	    ;;
++          *-*-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
+ 	elif test "$arg" = "-lm"; then
+ 	  case "$host" in
+ 	  *-*-cygwin* | *-*-beos*)
+@@ -1091,6 +1102,10 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1799,6 +1814,9 @@ compiler."
  	  # rhapsody is a little odd...
  	  deplibs="$deplibs -framework System"
  	  ;;
@@ -11,7 +41,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2001/02/15 17:57:55 wilfried Exp $
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -3567,40 +3570,6 @@ libdir='$install_libdir'\
+@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0