summaryrefslogtreecommitdiff
path: root/x11/kdebase3/patches/patch-aa
blob: f4ac7833a9af2ad331a9131aa618d11aeb815ce7 (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
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
$NetBSD: patch-aa,v 1.10 2003/11/08 13:13:49 jdolecek Exp $

--- configure.orig	2003-09-10 17:00:30.000000000 +0200
+++ configure	2003-11-04 14:33:06.000000000 +0100
@@ -23166,7 +23166,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-	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
@@ -31619,63 +31619,6 @@
 
 
 
-  echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5
-echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-       choke me
-    #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-      { { echo "$as_me:$LINENO: error:
-       Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long)
-       does not apply. Please mail kde-devel@kde.org with a description of your system!
-      " >&5
-echo "$as_me: error:
-       Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long)
-       does not apply. Please mail kde-devel@kde.org with a description of your system!
-      " >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-
 echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
 echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6
 
@@ -33816,6 +33759,23 @@
 
                   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
@@ -38765,6 +38725,7 @@
 case "$UNAME" in
 	Linux) LIBHOSTS="$LIBSENSORS" ;;
 	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
+	NetBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
 	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
 esac