summaryrefslogtreecommitdiff
path: root/devel/kdbg/patches/patch-aa
blob: e5bc398c4713e378af25c7f5456d3294af6b86c5 (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
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
$NetBSD: patch-aa,v 1.1 2000/02/02 13:47:43 scw Exp $

--- configure.orig	Sun Nov 14 17:01:51 1999
+++ configure	Wed Feb  2 12:51:57 2000
@@ -3818,7 +3818,8 @@
     
 
 
-
+# Use NetBSD package system libtool (start)
+if false; then
 
 kde_save_cc=$CC
 kde_save_cflags="$CFLAGS"
@@ -3921,6 +3922,10 @@
 CC=$kde_save_cc
 CFLAGS="$kde_save_cflags"
 
+fi
+# Use NetBSD package system libtool (end)
+
+
 echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
 echo "configure:3926: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
@@ -4254,7 +4259,7 @@
   fi
   
 else
-  ac_use_path_checking="default"
+  ac_use_path_checking=""
   
 fi
 
@@ -4269,7 +4274,9 @@
 if eval "test \"`echo '$''{'kde_cv_all_paths'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
+
+if test "$ac_use_path_checking" = "default"; then
+
   if test -z "$kde_htmldir"; then
     kde_htmldir='\$(prefix)/share/doc/HTML'
   fi
@@ -4330,6 +4337,124 @@
 	kde_servicetypesdir=\"$kde_servicetypesdir\" \
 	kde_result=defaults"
 
+else
+
+echo "$ac_t""compiling" 1>&6
+
+
+    echo $ac_n "checking for KDE headers installed""... $ac_c" 1>&6
+echo "configure:4346: checking for KDE headers installed" >&5
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+cat > conftest.$ac_ext <<EOF
+#include <stdio.h>
+#include "confdefs.h"
+#include <kapp.h>
+
+int main() {
+    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_wallpaperdir=\\"%s\\"\n", 
+	KApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+    printf("kde_servicesdir=\\"%s\\"\n", "dummy");
+    printf("kde_servicetypesdir=\\"%s\\"\n", "dummy");
+    return 0;
+    }
+EOF
+
+ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
+if { (eval echo configure:4410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo "$ac_t""yes" 1>&6
+else
+  { echo "configure: error: your system is not able to compile a small KDE application!
+Check, if you installed the KDE header files correctly." 1>&2; exit 1; }
+fi
+
+
+KDE_TEST_RPATH=
+
+if test -n "$USE_RPATH"; then
+
+  if test -n "$kde_libraries"; then
+    KDE_TEST_RPATH="-rpath $kde_libraries"
+  fi
+
+  if test -n "$qt_libraries"; then
+    KDE_TEST_RPATH="$KDE_TEST_RPATH -rpath $qt_libraries"
+  fi
+
+  if test -n "$x_libraries"; then
+    KDE_TEST_RPATH="$KDE_TEST_RPATH -rpath $x_libraries"
+  fi
+
+  KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+fi
+
+echo $ac_n "checking for KDE libraries installed""... $ac_c" 1>&6
+echo "configure:4438: checking for KDE libraries installed" >&5
+ac_link='/bin/sh $LIBTOOL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+
+if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then 
+  echo "$ac_t""yes" 1>&6
+else
+  { echo "configure: error: your system fails at linking a small KDE application!
+Check, if your compiler is installed correctly and if you have used the
+same compiler to compile Qt and kdelibs as you did use now" 1>&2; exit 1; }
+fi
+
+if eval `KDEDIR= ./conftest 2>&5`; then
+  kde_result=done
+else
+  kde_result=problems
+fi
+
+KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+kde_have_all_paths=yes
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+if test "$kde_have_all_paths" = "yes"; then
+kde_cv_all_paths="kde_have_all_paths=\"yes\" \
+	kde_htmldir=\"$kde_htmldir\" \
+	kde_appsdir=\"$kde_appsdir\" \
+	kde_icondir=\"$kde_icondir\" \
+	kde_sounddir=\"$kde_sounddir\" \
+	kde_datadir=\"$kde_datadir\" \
+	kde_locale=\"$kde_locale\" \
+	kde_cgidir=\"$kde_cgidir\" \
+	kde_confdir=\"$kde_confdir\" \
+	kde_mimedir=\"$kde_mimedir\" \
+	kde_toolbardir=\"$kde_toolbardir\" \
+	kde_wallpaperdir=\"$kde_wallpaperdir\" \
+	kde_bindir=\"$kde_bindir\" \
+	kde_partsdir=\"$kde_partsdir\" \
+	kde_servicesdir=\"$kde_servicesdir\" \
+	kde_servicetypesdir=\"$kde_servicetypesdir\" \
+	kde_result=$kde_result"
+fi
+rm -fr conftest*
+
+fi
 
 fi
 
@@ -4342,8 +4467,7 @@
    test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
    test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
    test -z "$kde_wallpaperdir" || test -z "$kde_bindir" ||
-   test -z "$kde_servicesdir" ||
-   test -z "$kde_servicetypesdir" || test "$kde_have_all_paths" != "yes"; then
+   test "$kde_have_all_paths" != "yes"; then
   kde_have_all_paths=no
   { echo "configure: error: configure could not run a little KDE program to test the environment. 
 Since it had compiled and linked before, it must be a strange problem on your system.