$NetBSD$

--- configure.orig	2011-01-14 20:15:50.000000000 +0000
+++ configure
@@ -51,6 +51,8 @@ case "$OS" in
     ;;
   freebsd)
     ;;
+  netbsd)
+    ;;
   sunos)
     OS='solaris'
     ;;
@@ -113,18 +115,17 @@ LIBPTHREAD="-lpthread"
 LIBCAP="-lcap"
 GSOAP=""
 GSOAP_IMPORT=""
-INCX11="/usr/local/include"
-LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11"
-LIBXCURSOR="-lXcursor"
-LIBXMU="-lXmu"
-LIBXINERAMA="-lXinerama"
-LIBXRANDR="-lXrandr"
+INCX11="-I${X11PREFIX}/include"
+LIBX11="-L${X11PREFIX}/lib -Wl,-R${X11PREFIX}/lib -lXext -lX11"
+LIBXCURSOR="-L${X11PREFIX}/lib -Wl,-R${X11PREFIX}/lib -lXcursor"
+LIBXMU="-L${X11PREFIX}/lib -Wl,-R${X11PREFIX}/lib -lXmu"
+LIBXINERAMA="-L${X11PREFIX}/lib -Wl,-R${X11PREFIX}/lib -lXinerama"
+LIBXRANDR="-L${X11PREFIX}/lib -Wl,-R${X11PREFIX}/lib -lXrandr"
 MAKESELF="makeself"
-MESA="-lGL"
-INCZ=""
-LIBZ="-lz"
+INCZ="-I${ZLIBPREFIX}/include"
+LIBZ="-L${ZLIBPREFIX}/lib -Wl,-R${ZLIBPREFIX}/lib -lz"
 CXX_FLAGS=""
-if [ "$OS" = "freebsd" ]; then
+if false; then
   INCCURL="-I/usr/local/include"
   LIBCURL="-L/usr/local/lib -lcurl"
   INCPULSE="-I/usr/local/include"
@@ -132,10 +133,10 @@ if [ "$OS" = "freebsd" ]; then
   INCPNG="-I/usr/local/include"
   LIBPNG="-L/usr/local/lib -lpng"
 else
-  INCCURL=""
-  LIBCURL="-lcurl"
-  INCPNG=""
-  LIBPNG="-lpng"
+  INCCURL="$(pkg-config --cflags libcurl)"
+  LIBCURL="$(pkg-config --libs libcurl)"
+  INCPNG="$(pkg-config --cflags libpng)"
+  LIBPNG="$(pkg-config --libs libpng)"
 fi
 PKGCONFIG="`which_wrapper pkg-config`"
 PYTHONDIR="/usr /usr/local"
@@ -2474,6 +2475,7 @@ check_gcc
 # the libraries
 [ "$OS" != "darwin"  ] && check_pthread
 check_libxml2
+check_libxslt
 [ $WITH_XPCOM  -eq 1 ] && check_libxslt
 [ $WITH_LIBIDL -eq 1 ] && check_libidl
 check_ssl
