$NetBSD: patch-aa,v 1.3 2007/02/19 18:22:59 joerg Exp $

--- configure.orig	2006-01-04 15:53:37.000000000 +0000
+++ configure
@@ -5689,7 +5689,7 @@ fi
 
 
 # Do we use uclibc++?
-if test "$foundcxxl"x == "x"; then
+if test "$foundcxxl"x = "x"; then
 	echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
 echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6
 if test "${ac_cv_lib_stdcpp_main+set}" = set; then
@@ -5757,7 +5757,7 @@ fi
 
 fi
 
-if test "$foundcxxl"x == "x"; then
+if test "$foundcxxl"x = "x"; then
 	{ { echo "$as_me:$LINENO: error: Neither uclibc uClibc++ or standard gcc stdc++ libraries found." >&5
 echo "$as_me: error: Neither uclibc uClibc++ or standard gcc stdc++ libraries found." >&2;}
    { (exit 1); exit 1; }; }
@@ -7084,6 +7084,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	    #include <stdio.h>
+	    #include <sys/param.h>
 	    #include <sys/socket.h>
 	    #include <net/if.h>
 	    #include <net/if_media.h>
@@ -8540,13 +8541,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" 
 
 fi
 if test $ac_cv_header_pthread_h = yes; then
-  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
 if test "${ac_cv_lib_pthread_pthread_create+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
@@ -8625,7 +8626,7 @@ fi
 echo "$as_me: WARNING: *** GPSMap will be built without pthread support. ***" >&2;};
 		threadlib=""
 	else
-		threadlib="-lpthread"
+		threadlib="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
 	fi
 
 	# Update the companion to this...