1 diff -urN krusader-1.50.orig/configure krusader-1.50/configure
2 --- krusader-1.50.orig/configure 2004-10-31 09:34:17.000000000 +0000
3 +++ krusader-1.50/configure 2004-11-17 00:40:49.189822304 +0000
4 @@ -31505,148 +31505,7 @@
5 ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
8 - if test "${ac_cv_header_konq_popupmenu_h+set}" = set; then
9 - echo "$as_me:$LINENO: checking for konq_popupmenu.h" >&5
10 -echo $ECHO_N "checking for konq_popupmenu.h... $ECHO_C" >&6
11 -if test "${ac_cv_header_konq_popupmenu_h+set}" = set; then
12 - echo $ECHO_N "(cached) $ECHO_C" >&6
14 -echo "$as_me:$LINENO: result: $ac_cv_header_konq_popupmenu_h" >&5
15 -echo "${ECHO_T}$ac_cv_header_konq_popupmenu_h" >&6
17 - # Is the header compilable?
18 -echo "$as_me:$LINENO: checking konq_popupmenu.h usability" >&5
19 -echo $ECHO_N "checking konq_popupmenu.h usability... $ECHO_C" >&6
20 -cat >conftest.$ac_ext <<_ACEOF
23 -cat confdefs.h >>conftest.$ac_ext
24 -cat >>conftest.$ac_ext <<_ACEOF
25 -/* end confdefs.h. */
27 -#include <konq_popupmenu.h>
29 -rm -f conftest.$ac_objext
30 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
31 - (eval $ac_compile) 2>conftest.er1
33 - grep -v '^ *+' conftest.er1 >conftest.err
35 - cat conftest.err >&5
36 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
37 - (exit $ac_status); } &&
38 - { ac_try='test -z "$ac_cxx_werror_flag"
39 - || test ! -s conftest.err'
40 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
43 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
44 - (exit $ac_status); }; } &&
45 - { ac_try='test -s conftest.$ac_objext'
46 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
49 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
50 - (exit $ac_status); }; }; then
51 - ac_header_compiler=yes
53 - echo "$as_me: failed program was:" >&5
54 -sed 's/^/| /' conftest.$ac_ext >&5
56 -ac_header_compiler=no
58 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
59 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
60 -echo "${ECHO_T}$ac_header_compiler" >&6
62 -# Is the header present?
63 -echo "$as_me:$LINENO: checking konq_popupmenu.h presence" >&5
64 -echo $ECHO_N "checking konq_popupmenu.h presence... $ECHO_C" >&6
65 -cat >conftest.$ac_ext <<_ACEOF
68 -cat confdefs.h >>conftest.$ac_ext
69 -cat >>conftest.$ac_ext <<_ACEOF
70 -/* end confdefs.h. */
71 -#include <konq_popupmenu.h>
73 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
74 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
76 - grep -v '^ *+' conftest.er1 >conftest.err
78 - cat conftest.err >&5
79 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
80 - (exit $ac_status); } >/dev/null; then
81 - if test -s conftest.err; then
82 - ac_cpp_err=$ac_cxx_preproc_warn_flag
83 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
90 -if test -z "$ac_cpp_err"; then
91 - ac_header_preproc=yes
93 - echo "$as_me: failed program was:" >&5
94 -sed 's/^/| /' conftest.$ac_ext >&5
96 - ac_header_preproc=no
98 -rm -f conftest.err conftest.$ac_ext
99 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
100 -echo "${ECHO_T}$ac_header_preproc" >&6
102 -# So? What about this header?
103 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
105 - { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: accepted by the compiler, rejected by the preprocessor!" >&5
106 -echo "$as_me: WARNING: konq_popupmenu.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
107 - { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: proceeding with the compiler's result" >&5
108 -echo "$as_me: WARNING: konq_popupmenu.h: proceeding with the compiler's result" >&2;}
109 - ac_header_preproc=yes
112 - { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: present but cannot be compiled" >&5
113 -echo "$as_me: WARNING: konq_popupmenu.h: present but cannot be compiled" >&2;}
114 - { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: check for missing prerequisite headers?" >&5
115 -echo "$as_me: WARNING: konq_popupmenu.h: check for missing prerequisite headers?" >&2;}
116 - { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: see the Autoconf documentation" >&5
117 -echo "$as_me: WARNING: konq_popupmenu.h: see the Autoconf documentation" >&2;}
118 - { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: section \"Present But Cannot Be Compiled\"" >&5
119 -echo "$as_me: WARNING: konq_popupmenu.h: section \"Present But Cannot Be Compiled\"" >&2;}
120 - { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: proceeding with the preprocessor's result" >&5
121 -echo "$as_me: WARNING: konq_popupmenu.h: proceeding with the preprocessor's result" >&2;}
122 - { echo "$as_me:$LINENO: WARNING: konq_popupmenu.h: in the future, the compiler will take precedence" >&5
123 -echo "$as_me: WARNING: konq_popupmenu.h: in the future, the compiler will take precedence" >&2;}
126 -## ------------------------------------------ ##
127 -## Report this to the AC_PACKAGE_NAME lists. ##
128 -## ------------------------------------------ ##
131 - sed "s/^/$as_me: WARNING: /" >&2
134 -echo "$as_me:$LINENO: checking for konq_popupmenu.h" >&5
135 -echo $ECHO_N "checking for konq_popupmenu.h... $ECHO_C" >&6
136 -if test "${ac_cv_header_konq_popupmenu_h+set}" = set; then
137 - echo $ECHO_N "(cached) $ECHO_C" >&6
139 - ac_cv_header_konq_popupmenu_h=$ac_header_preproc
141 -echo "$as_me:$LINENO: result: $ac_cv_header_konq_popupmenu_h" >&5
142 -echo "${ECHO_T}$ac_cv_header_konq_popupmenu_h" >&6
145 -if test $ac_cv_header_konq_popupmenu_h = yes; then
152 CPPFLAGS=$kde_safe_cppflags
153 @@ -31671,148 +31530,7 @@
154 ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
157 - if test "${ac_cv_header_konqbookmarkmanager_h+set}" = set; then
158 - echo "$as_me:$LINENO: checking for konqbookmarkmanager.h" >&5
159 -echo $ECHO_N "checking for konqbookmarkmanager.h... $ECHO_C" >&6
160 -if test "${ac_cv_header_konqbookmarkmanager_h+set}" = set; then
161 - echo $ECHO_N "(cached) $ECHO_C" >&6
163 -echo "$as_me:$LINENO: result: $ac_cv_header_konqbookmarkmanager_h" >&5
164 -echo "${ECHO_T}$ac_cv_header_konqbookmarkmanager_h" >&6
166 - # Is the header compilable?
167 -echo "$as_me:$LINENO: checking konqbookmarkmanager.h usability" >&5
168 -echo $ECHO_N "checking konqbookmarkmanager.h usability... $ECHO_C" >&6
169 -cat >conftest.$ac_ext <<_ACEOF
172 -cat confdefs.h >>conftest.$ac_ext
173 -cat >>conftest.$ac_ext <<_ACEOF
174 -/* end confdefs.h. */
175 -$ac_includes_default
176 -#include <konqbookmarkmanager.h>
178 -rm -f conftest.$ac_objext
179 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
180 - (eval $ac_compile) 2>conftest.er1
182 - grep -v '^ *+' conftest.er1 >conftest.err
184 - cat conftest.err >&5
185 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
186 - (exit $ac_status); } &&
187 - { ac_try='test -z "$ac_cxx_werror_flag"
188 - || test ! -s conftest.err'
189 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
190 - (eval $ac_try) 2>&5
192 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
193 - (exit $ac_status); }; } &&
194 - { ac_try='test -s conftest.$ac_objext'
195 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
196 - (eval $ac_try) 2>&5
198 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
199 - (exit $ac_status); }; }; then
200 - ac_header_compiler=yes
202 - echo "$as_me: failed program was:" >&5
203 -sed 's/^/| /' conftest.$ac_ext >&5
205 -ac_header_compiler=no
207 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
208 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
209 -echo "${ECHO_T}$ac_header_compiler" >&6
211 -# Is the header present?
212 -echo "$as_me:$LINENO: checking konqbookmarkmanager.h presence" >&5
213 -echo $ECHO_N "checking konqbookmarkmanager.h presence... $ECHO_C" >&6
214 -cat >conftest.$ac_ext <<_ACEOF
217 -cat confdefs.h >>conftest.$ac_ext
218 -cat >>conftest.$ac_ext <<_ACEOF
219 -/* end confdefs.h. */
220 -#include <konqbookmarkmanager.h>
222 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
223 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
225 - grep -v '^ *+' conftest.er1 >conftest.err
227 - cat conftest.err >&5
228 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
229 - (exit $ac_status); } >/dev/null; then
230 - if test -s conftest.err; then
231 - ac_cpp_err=$ac_cxx_preproc_warn_flag
232 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
239 -if test -z "$ac_cpp_err"; then
240 - ac_header_preproc=yes
242 - echo "$as_me: failed program was:" >&5
243 -sed 's/^/| /' conftest.$ac_ext >&5
245 - ac_header_preproc=no
247 -rm -f conftest.err conftest.$ac_ext
248 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
249 -echo "${ECHO_T}$ac_header_preproc" >&6
251 -# So? What about this header?
252 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
254 - { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: accepted by the compiler, rejected by the preprocessor!" >&5
255 -echo "$as_me: WARNING: konqbookmarkmanager.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
256 - { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: proceeding with the compiler's result" >&5
257 -echo "$as_me: WARNING: konqbookmarkmanager.h: proceeding with the compiler's result" >&2;}
258 - ac_header_preproc=yes
261 - { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: present but cannot be compiled" >&5
262 -echo "$as_me: WARNING: konqbookmarkmanager.h: present but cannot be compiled" >&2;}
263 - { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: check for missing prerequisite headers?" >&5
264 -echo "$as_me: WARNING: konqbookmarkmanager.h: check for missing prerequisite headers?" >&2;}
265 - { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: see the Autoconf documentation" >&5
266 -echo "$as_me: WARNING: konqbookmarkmanager.h: see the Autoconf documentation" >&2;}
267 - { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: section \"Present But Cannot Be Compiled\"" >&5
268 -echo "$as_me: WARNING: konqbookmarkmanager.h: section \"Present But Cannot Be Compiled\"" >&2;}
269 - { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: proceeding with the preprocessor's result" >&5
270 -echo "$as_me: WARNING: konqbookmarkmanager.h: proceeding with the preprocessor's result" >&2;}
271 - { echo "$as_me:$LINENO: WARNING: konqbookmarkmanager.h: in the future, the compiler will take precedence" >&5
272 -echo "$as_me: WARNING: konqbookmarkmanager.h: in the future, the compiler will take precedence" >&2;}
275 -## ------------------------------------------ ##
276 -## Report this to the AC_PACKAGE_NAME lists. ##
277 -## ------------------------------------------ ##
280 - sed "s/^/$as_me: WARNING: /" >&2
283 -echo "$as_me:$LINENO: checking for konqbookmarkmanager.h" >&5
284 -echo $ECHO_N "checking for konqbookmarkmanager.h... $ECHO_C" >&6
285 -if test "${ac_cv_header_konqbookmarkmanager_h+set}" = set; then
286 - echo $ECHO_N "(cached) $ECHO_C" >&6
288 - ac_cv_header_konqbookmarkmanager_h=$ac_header_preproc
290 -echo "$as_me:$LINENO: result: $ac_cv_header_konqbookmarkmanager_h" >&5
291 -echo "${ECHO_T}$ac_cv_header_konqbookmarkmanager_h" >&6
294 -if test $ac_cv_header_konqbookmarkmanager_h = yes; then
301 CPPFLAGS=$kde_safe_cppflags