summaryrefslogtreecommitdiff
path: root/x11/kdebase3/patches/patch-aa
blob: dad83178039a211f9dcc668ee4188030b6022224 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
$NetBSD: patch-aa,v 1.16 2006/01/31 22:25:34 markd Exp $

--- configure.orig	2006-01-21 20:13:16.000000000 +1300
+++ configure
@@ -30884,7 +30884,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
@@ -42634,6 +42634,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
@@ -45486,7 +45503,7 @@ fi
 
 
 case "$host" in
-  *-*-linux*|*-*-freebsd*|*-*-kfreebsd*-gnu)
+  *-*-linux*|*-*-freebsd*|*-*-netbsd*|*-*-kfreebsd*-gnu)
 	FOUND_USBVIEW=yes
 	;;
 esac
@@ -46925,7 +46942,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
@@ -54341,6 +54358,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
 
@@ -54369,7 +54387,7 @@ fi
 
 
 
-if test "$UNAME" = FreeBSD; then
+if test "$UNAME" = FreeBSD || test "$UNAME" = DragonFly; then
   include_ksysguardd_freebsd_TRUE=
   include_ksysguardd_freebsd_FALSE='#'
 else
@@ -54704,6 +54722,7 @@ fi
 case "$UNAME" in
 	Linux) LIBHOSTS="$LIBSENSORS" ;;
 	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
+	NetBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
 	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
 esac