$OpenBSD: patch-configure,v 1.2 2010/09/21 19:39:25 fgsch Exp $
--- configure.orig	Tue Sep 21 20:31:49 2010
+++ configure	Tue Sep 21 20:31:43 2010
@@ -6642,7 +6642,7 @@ fi
 
       if test "$gl_have_pthread_h" = yes; then
         # Other possible tests:
-        #   -lpthreads (FSU threads, PCthreads)
+        #   -pthreads (FSU threads, PCthreads)
         #   -lgthreads
         gl_have_pthread=
         # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
@@ -6697,13 +6697,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
         if test -n "$gl_have_pthread"; then
           # The program links fine without libpthread. But it may actually
           # need to link with libpthread in order to create multiple threads.
-          { echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
-echo $ECHO_N "checking for pthread_kill in -lpthread... $ECHO_C" >&6; }
+          { echo "$as_me:$LINENO: checking for pthread_kill in -pthread" >&5
+echo $ECHO_N "checking for pthread_kill in -pthread... $ECHO_C" >&6; }
 if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="-pthread  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6759,7 +6759,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_kill" >&6; }
 if test $ac_cv_lib_pthread_pthread_kill = yes; then
-  LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+  LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
              # On Solaris and HP-UX, most pthread functions exist also in libc.
              # Therefore pthread_in_use() needs to actually try to create a
              # thread: pthread_create from libc will fail, whereas
@@ -6777,13 +6777,13 @@ fi
 
         else
           # Some library is needed. Try libpthread and libc_r.
-          { echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
-echo $ECHO_N "checking for pthread_kill in -lpthread... $ECHO_C" >&6; }
+          { echo "$as_me:$LINENO: checking for pthread_kill in -pthread" >&5
+echo $ECHO_N "checking for pthread_kill in -pthread... $ECHO_C" >&6; }
 if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="-pthread  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6840,8 +6840,8 @@ fi
 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_kill" >&6; }
 if test $ac_cv_lib_pthread_pthread_kill = yes; then
   gl_have_pthread=yes
-             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
-             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+             LIBTHREAD=-pthread LTLIBTHREAD=-pthread
+             LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
 fi
 
           if test -z "$gl_have_pthread"; then
@@ -8042,10 +8042,10 @@ fi
     done
   fi
 
+LIBICONV="$LTLIBICONV"
 
 
 
-
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12033,7 +12033,7 @@ fi
       LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
     done
   fi
-
+LIBINTL="$LTLIBINTL"
           { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
