$NetBSD: patch-aa,v 1.17 2007/05/23 13:05:34 markd Exp $

--- configure.orig	2007-05-14 23:57:00.000000000 +1200
+++ configure
@@ -34288,7 +34288,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
 	# if you're trying to debug this check and think it's incorrect,
 	# better check your installation. The check _is_ correct - your
 	# installation is not.
-	if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
+	if test -f actest.cpp && grep -i klineedit actest.cpp > /dev/null; then
 		kde_cv_uic_plugins=yes
 	fi
 fi
@@ -47113,6 +47113,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
 
                   ac_cv_have_dpms="-lXdpms"
 
+	lib=Xdpms
+	shared_lib_found=no
+	for i in ${LDFLAGS}; do
+		case "$i" in
+		-L*)
+			dir=`echo $i | sed "s,^-L,,"`
+			if [ -e $dir/lib${lib}.so ] ||
+                           [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
+				shared_lib_found=yes
+				break;
+			fi
+		esac
+	done
+	if [ "$shared_lib_found" = "no" ]; then
+		eval "ac_cv_have_dpms=no"
+	fi
+
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -50244,7 +50261,7 @@ fi
 
 
 case "$host" in
-  *-*-linux*|*-*-freebsd*|*-*-kfreebsd*-gnu)
+  *-*-linux*|*-*-freebsd*|*-*-netbsd*|*-*-kfreebsd*-gnu)
 	FOUND_USBVIEW=yes
 	;;
 esac
@@ -51868,7 +51885,7 @@ acimake:
 
 EOF
     if $XMKMF >&5 2>&1 && test -f Makefile; then
-	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
+	kde_cv_defines_imake=`${MAKE-make} PREFIX='${X11_ROOT}' acimake 2> /dev/null | grep -v "^make"`
 	kde_cv_defines_imake_version=$imkv
     else
         { echo "$as_me:$LINENO: result: failed" >&5
@@ -60629,6 +60647,7 @@ fi
 case "$UNAME" in
 	Linux) LIBHOSTS="$LIBSENSORS" ;;
 	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
+	NetBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
 	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
 esac