$NetBSD: patch-ab,v 1.25 2012/09/15 10:23:38 adam Exp $

--- configure.orig	2012-09-11 06:55:35.000000000 +0000
+++ configure
@@ -13971,7 +13971,7 @@ fi
 fi
 
 
-XML_LIBDIR='-L${libdir}'
+XML_LIBDIR='-Wl,-R${libdir} -L${libdir}'
 XML_INCLUDEDIR='-I${includedir}/libxml2'
 
 XML_CFLAGS=""
@@ -14436,13 +14436,13 @@ else
         if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
             ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
-$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+$as_echo_n "checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
 if ${ac_cv_lib_pthread_pthread_join+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14474,7 +14474,7 @@ fi
 $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
 
-                THREAD_LIBS="-lpthread"
+                THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
 
 $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
 
@@ -14496,12 +14496,12 @@ fi
        *beos*) WITH_THREADS="1"
 	   THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
        ;;
-       *linux*)
+       *linux* | *openbsd* | *mirbsd*)
            if test "${GCC}" = "yes" ; then
 	       GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
 	       GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
 	       GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[0-9]*\.++' | sed 's+\..*++'`
-	       if test "${THREAD_LIBS}" = "-lpthread" ; then
+	       if test "${THREAD_LIBS}" = "${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ; then
 	           if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
 		   then
 		       THREAD_LIBS=""
@@ -14518,6 +14518,10 @@ fi
 	       fi
 	   fi
        ;;
+       *freebsd* | *netbsd* | *dragonfly*)
+	   THREAD_LIBS=""
+	   BASE_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+       ;;
     esac
     if test "$WITH_THREADS" = "1" ; then
 	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
@@ -15209,10 +15213,6 @@ case "$host" in
 
 $as_echo "#define _WINSOCKAPI_ 1" >>confdefs.h
 
- if test "${PYTHON}" != ""
- then
-   WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython$(echo ${PYTHON_VERSION} | tr -d .)"
- fi
  ;;
  *-*-cygwin*)
  CYGWIN_EXTRA_LDFLAGS="-no-undefined"
