$NetBSD$

--- configure~	2008-03-01 23:16:07.000000000 -0500
+++ configure	2008-09-07 02:34:29.000000000 -0400
@@ -2549,17 +2549,25 @@ i[3456]86-*-darwin*) host_cpu=i386 host_
 arm*-*-darwin*) host_cpu=arm host_os=darwin libdl_needed=no ;;
 i386-*-openbsd*) host_os=bsd libdl_needed=no ;;
 i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
+i386-*-netbsd*) host_os=bsd libdl_needed=no ;;
+i386-*-dragonfly*) host_os=bsd libdl_needed=no ;;
 x86_64-*-linux*) host_os=linux ;;
 hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
 mipsel-*-linux*) host_cpu=mips host_os=linux ;;
-amd64-*-openbsd*) host_os=bsd libdl_needed=no ;;
-amd64-*-freebsd*) host_os=bsd libdl_needed=no ;;
+x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
+x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
+x86_64-*-netbsd*) host_os=bsd libdl_needed=no ;;
+x86_64-*-dragonfly*) host_os=bsd libdl_needed=no ;;
 arm*-*-linux*) host_cpu=arm host_os=linux ;;
 arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
 arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
+arm*-*-netbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
+arm*-*-dragonfly*) host_cpu=arm host_os=bsd libdl_needed=no ;;
 powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
 powerpc*-*-openbsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
 powerpc*-*-freebsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
+powerpc*-*-netbsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
+powerpc*-*-dragonfly*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
 powerpc-*-darwin*) host_os=darwin ;;
 *) { { echo "$as_me:$LINENO: error: $host not supported" >&5
 echo "$as_me: error: $host not supported" >&2;}
@@ -20707,13 +20715,13 @@ done
 
 
 
-{ echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5
-echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+echo $ECHO_N "checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
 if test "${ac_cv_lib_pthread_pthread_self+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
@@ -20773,7 +20781,7 @@ if test $ac_cv_lib_pthread_pthread_self 
 #define HAVE_LIBPTHREAD 1
 _ACEOF
 
-  LIBS="-lpthread $LIBS"
+  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
 
 else
   { { echo "$as_me:$LINENO: error: libpthread is missing" >&5
