$NetBSD: patch-aa,v 1.2 2006/05/06 12:45:32 joerg Exp $

--- client/configure.orig	2004-04-05 10:58:32.000000000 +0000
+++ client/configure
@@ -3088,7 +3088,7 @@ if test $ac_cv_lib_X11_XFreePixmap = yes
 #define HAVE_LIBX11 1
 _ACEOF
 
-  LIBS="-lX11 $LIBS"
+  LIBS="-lX11 -lXext $LIBS"
 
 else
   { echo "$as_me:$LINENO: WARNING: \"cannot find required X11 library.\"" >&5
@@ -3102,7 +3102,7 @@ if test "${ac_cv_lib_GL_glBegin+set}" = 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
+LIBS="-lGL $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3648,7 +3648,7 @@ if test "${ac_cv_lib_rm_rmInit+set}" = s
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrm -lpthread $LIBS"
+LIBS="-lrm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3720,13 +3720,13 @@ echo "$as_me: error: \"Unable to find li
 fi
 
 
-echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
-echo $ECHO_N "checking for pthread_mutex_lock in -lpthread... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_mutex_lock in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+echo $ECHO_N "checking for pthread_mutex_lock in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
 if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3789,7 +3789,7 @@ if test $ac_cv_lib_pthread_pthread_mutex
 #define HAVE_LIBPTHREAD 1
 _ACEOF
 
-  LIBS="-lpthread $LIBS"
+  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
 
 else
   { { echo "$as_me:$LINENO: error: \"Unable to find pthread library\"" >&5