81 lines
2.3 KiB
Text
81 lines
2.3 KiB
Text
$NetBSD: patch-aa,v 1.15 2005/11/08 18:25:44 joerg Exp $
|
|
|
|
--- configure.orig 2005-11-06 18:05:17.000000000 +0100
|
|
+++ configure
|
|
@@ -30769,7 +30769,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
|
|
@@ -42502,6 +42502,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
|
|
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
|
|
@@ -45346,6 +45363,9 @@ case "$host" in
|
|
*-*-freebsd*)
|
|
FOUND_USBVIEW=yes
|
|
;;
|
|
+ *-*-netbsd*)
|
|
+ FOUND_USBVIEW=yes
|
|
+ ;;
|
|
esac
|
|
|
|
|
|
@@ -46730,7 +46750,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
|
|
@@ -53339,6 +53359,7 @@ case "$host" in
|
|
*-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
|
|
*-*-irix*) ksysguardd_compile=yes; UNAME='Irix' ;;
|
|
*-*-openbsd*) ksysguardd_compile=yes; UNAME='OpenBSD' ;;
|
|
+ *-*-dragonfly*) ksysguardd_compile=yes; UNAME='DragonFly' ;;
|
|
*) ksysguardd_compile=no; UNAME='' ;;
|
|
esac
|
|
|
|
@@ -53367,7 +53388,7 @@ fi
|
|
|
|
|
|
|
|
-if test "$UNAME" = FreeBSD; then
|
|
+if test "$UNAME" = FreeBSD || test "$UNAME" = DragonFly; then
|
|
include_ksysguardd_freebsd_TRUE=
|
|
include_ksysguardd_freebsd_FALSE='#'
|
|
else
|
|
@@ -53523,6 +53544,7 @@ fi
|
|
case "$UNAME" in
|
|
Linux) LIBHOSTS="$LIBSENSORS" ;;
|
|
FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
|
|
+ NetBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
|
|
Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
|
|
esac
|
|
|