]>
Commit | Line | Data |
---|---|---|
759c91e6 | 1 | --- admin/acinclude.m4.in.orig 2004-01-04 14:41:18.653215568 +0100 |
2 | +++ admin/acinclude.m4.in 2004-01-04 14:40:41.376882432 +0100 | |
3 | @@ -29,7 +29,7 @@ | |
4 | # KDE_PATH_X_DIRECT | |
5 | dnl Internal subroutine of AC_PATH_X. | |
6 | dnl Set ac_x_includes and/or ac_x_libraries. | |
7 | -AC_DEFUN(KDE_PATH_X_DIRECT, | |
8 | +AC_DEFUN([KDE_PATH_X_DIRECT], | |
9 | [ | |
10 | AC_REQUIRE([KDE_CHECK_LIB64]) | |
11 | ||
12 | @@ -156,7 +156,7 @@ | |
13 | dnl Find a file (or one of more files in a list of dirs) | |
14 | dnl ------------------------------------------------------------------------ | |
15 | dnl | |
16 | -AC_DEFUN(AC_FIND_FILE, | |
17 | +AC_DEFUN([AC_FIND_FILE], | |
18 | [ | |
19 | $3=NO | |
20 | for i in $2; | |
21 | @@ -175,7 +175,7 @@ | |
22 | ||
23 | dnl KDE_FIND_PATH(programm-name, variable-name, list of directories, | |
24 | dnl if-not-found, test-parameter) | |
25 | -AC_DEFUN(KDE_FIND_PATH, | |
26 | +AC_DEFUN([KDE_FIND_PATH], | |
27 | [ | |
28 | AC_MSG_CHECKING([for $1]) | |
29 | if test -n "$$2"; then | |
30 | @@ -228,7 +228,7 @@ | |
31 | fi | |
32 | ]) | |
33 | ||
34 | -AC_DEFUN(KDE_MOC_ERROR_MESSAGE, | |
35 | +AC_DEFUN([KDE_MOC_ERROR_MESSAGE], | |
36 | [ | |
37 | AC_MSG_ERROR([No Qt meta object compiler (moc) found! | |
38 | Please check whether you installed Qt correctly. | |
39 | @@ -240,7 +240,7 @@ | |
40 | ]) | |
41 | ]) | |
42 | ||
43 | -AC_DEFUN(KDE_UIC_ERROR_MESSAGE, | |
44 | +AC_DEFUN([KDE_UIC_ERROR_MESSAGE], | |
45 | [ | |
46 | AC_MSG_WARN([No Qt ui compiler (uic) found! | |
47 | Please check whether you installed Qt correctly. | |
48 | @@ -253,7 +253,7 @@ | |
49 | ]) | |
50 | ||
51 | ||
52 | -AC_DEFUN(KDE_CHECK_UIC_FLAG, | |
53 | +AC_DEFUN([KDE_CHECK_UIC_FLAG], | |
54 | [ | |
55 | AC_MSG_CHECKING([whether uic supports -$1 ]) | |
56 | kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'` | |
57 | @@ -288,7 +288,7 @@ | |
58 | dnl in $QTDIR/bin, and some more usual places | |
59 | dnl ------------------------------------------------------------------------ | |
60 | dnl | |
61 | -AC_DEFUN(AC_PATH_QT_MOC_UIC, | |
62 | +AC_DEFUN([AC_PATH_QT_MOC_UIC], | |
63 | [ | |
64 | AC_REQUIRE([KDE_CHECK_PERL]) | |
65 | qt_bindirs="" | |
66 | @@ -336,7 +336,7 @@ | |
67 | AC_SUBST(UIC_TR) | |
68 | ]) | |
69 | ||
70 | -AC_DEFUN(KDE_1_CHECK_PATHS, | |
71 | +AC_DEFUN([KDE_1_CHECK_PATHS], | |
72 | [ | |
73 | KDE_1_CHECK_PATH_HEADERS | |
74 | ||
75 | @@ -384,7 +384,7 @@ | |
76 | ||
77 | ]) | |
78 | ||
79 | -AC_DEFUN(KDE_SET_PATHS, | |
80 | +AC_DEFUN([KDE_SET_PATHS], | |
81 | [ | |
82 | kde_cv_all_paths="kde_have_all_paths=\"yes\" \ | |
83 | kde_htmldir=\"$kde_htmldir\" \ | |
84 | @@ -412,7 +412,7 @@ | |
85 | kde_result=$1" | |
86 | ]) | |
87 | ||
88 | -AC_DEFUN(KDE_SET_DEFAULT_PATHS, | |
89 | +AC_DEFUN([KDE_SET_DEFAULT_PATHS], | |
90 | [ | |
91 | if test "$1" = "default"; then | |
92 | ||
93 | @@ -501,7 +501,7 @@ | |
94 | fi | |
95 | ]) | |
96 | ||
97 | -AC_DEFUN(KDE_CHECK_PATHS_FOR_COMPLETENESS, | |
98 | +AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS], | |
99 | [ if test -z "$kde_htmldir" || test -z "$kde_appsdir" || | |
100 | test -z "$kde_icondir" || test -z "$kde_sounddir" || | |
101 | test -z "$kde_datadir" || test -z "$kde_locale" || | |
102 | @@ -518,14 +518,14 @@ | |
103 | fi | |
104 | ]) | |
105 | ||
106 | -AC_DEFUN(KDE_MISSING_PROG_ERROR, | |
107 | +AC_DEFUN([KDE_MISSING_PROG_ERROR], | |
108 | [ | |
109 | AC_MSG_ERROR([The important program $1 was not found! | |
110 | Please check whether you installed KDE correctly. | |
111 | ]) | |
112 | ]) | |
113 | ||
114 | -AC_DEFUN(KDE_MISSING_ARTS_ERROR, | |
115 | +AC_DEFUN([KDE_MISSING_ARTS_ERROR], | |
116 | [ | |
117 | AC_MSG_ERROR([The important program $1 was not found! | |
118 | Please check whether you installed aRts correctly or use | |
119 | @@ -533,7 +533,7 @@ | |
120 | ]) | |
121 | ]) | |
122 | ||
123 | -AC_DEFUN(KDE_SUBST_PROGRAMS, | |
124 | +AC_DEFUN([KDE_SUBST_PROGRAMS], | |
125 | [ | |
126 | AC_ARG_WITH(arts, | |
127 | [ --without-arts build without aRts [default=yes] ], | |
128 | @@ -623,7 +623,7 @@ | |
129 | AC_SUBST(kde_libs_htmldir) | |
130 | ])dnl | |
131 | ||
132 | -AC_DEFUN(AC_CREATE_KFSSTND, | |
133 | +AC_DEFUN([AC_CREATE_KFSSTND], | |
134 | [ | |
135 | AC_REQUIRE([AC_CHECK_RPATH]) | |
136 | ||
137 | @@ -671,7 +671,7 @@ | |
138 | ||
139 | ]) | |
140 | ||
141 | -AC_DEFUN(AC_SUBST_KFSSTND, | |
142 | +AC_DEFUN([AC_SUBST_KFSSTND], | |
143 | [ | |
144 | AC_SUBST(kde_htmldir) | |
145 | AC_SUBST(kde_appsdir) | |
146 | @@ -708,7 +708,7 @@ | |
147 | dnl AC_SUBST(kde_toolbardir) | |
148 | ]) | |
149 | ||
150 | -AC_DEFUN(KDE_MISC_TESTS, | |
151 | +AC_DEFUN([KDE_MISC_TESTS], | |
152 | [ | |
153 | dnl Checks for libraries. | |
154 | AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD | |
155 | @@ -843,7 +843,7 @@ | |
156 | dnl macro AC_PATH_X | |
157 | dnl ------------------------------------------------------------------------ | |
158 | dnl | |
159 | -AC_DEFUN(K_PATH_X, | |
160 | +AC_DEFUN([K_PATH_X], | |
161 | [ | |
162 | AC_REQUIRE([KDE_MISC_TESTS])dnl | |
163 | AC_REQUIRE([KDE_CHECK_LIB64]) | |
164 | @@ -1060,7 +1060,7 @@ | |
165 | ||
166 | ]) | |
167 | ||
168 | -AC_DEFUN(KDE_PRINT_QT_PROGRAM, | |
169 | +AC_DEFUN([KDE_PRINT_QT_PROGRAM], | |
170 | [ | |
171 | AC_REQUIRE([KDE_USE_QT]) | |
172 | cat > conftest.$ac_ext <<EOF | |
173 | @@ -1123,7 +1123,7 @@ | |
174 | EOF | |
175 | ]) | |
176 | ||
177 | -AC_DEFUN(KDE_USE_QT, | |
178 | +AC_DEFUN([KDE_USE_QT], | |
179 | [ | |
180 | if test -z "$1"; then | |
181 | # Current default Qt version: 3.2 | |
182 | @@ -1202,7 +1202,7 @@ | |
183 | fi | |
184 | ]) | |
185 | ||
186 | -AC_DEFUN(KDE_CHECK_QT_DIRECT, | |
187 | +AC_DEFUN([KDE_CHECK_QT_DIRECT], | |
188 | [ | |
189 | AC_REQUIRE([KDE_USE_QT]) | |
190 | AC_MSG_CHECKING([if Qt compiles without flags]) | |
191 | @@ -1265,7 +1265,7 @@ | |
192 | dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) | |
193 | dnl ------------------------------------------------------------------------ | |
194 | dnl | |
195 | -AC_DEFUN(AC_PATH_QT_1_3, | |
196 | +AC_DEFUN([AC_PATH_QT_1_3], | |
197 | [ | |
198 | AC_REQUIRE([K_PATH_X]) | |
199 | AC_REQUIRE([KDE_USE_QT]) | |
200 | @@ -1571,12 +1571,12 @@ | |
201 | AC_SUBST(kde_qtver) | |
202 | ]) | |
203 | ||
204 | -AC_DEFUN(AC_PATH_QT, | |
205 | +AC_DEFUN([AC_PATH_QT], | |
206 | [ | |
207 | AC_PATH_QT_1_3 | |
208 | ]) | |
209 | ||
210 | -AC_DEFUN(KDE_CHECK_UIC_PLUGINS, | |
211 | +AC_DEFUN([KDE_CHECK_UIC_PLUGINS], | |
212 | [ | |
213 | AC_REQUIRE([AC_PATH_QT_MOC_UIC]) | |
214 | ||
215 | @@ -1624,7 +1624,7 @@ | |
216 | fi | |
217 | ]) | |
218 | ||
219 | -AC_DEFUN(KDE_CHECK_FINAL, | |
220 | +AC_DEFUN([KDE_CHECK_FINAL], | |
221 | [ | |
222 | AC_ARG_ENABLE(final, [ --enable-final build size optimized apps (experimental - needs lots of memory)], | |
223 | kde_use_final=$enableval, kde_use_final=no) | |
224 | @@ -1640,7 +1640,7 @@ | |
225 | AC_SUBST(KDE_USE_FINAL_FALSE) | |
226 | ]) | |
227 | ||
228 | -AC_DEFUN(KDE_CHECK_CLOSURE, | |
229 | +AC_DEFUN([KDE_CHECK_CLOSURE], | |
230 | [ | |
231 | AC_ARG_ENABLE(closure, [ --enable-closure delay template instantiation], | |
232 | kde_use_closure=$enableval, kde_use_closure=no) | |
233 | @@ -1669,7 +1669,7 @@ | |
234 | AC_SUBST(KDE_NO_UNDEFINED) | |
235 | ]) | |
236 | ||
237 | -AC_DEFUN(KDE_CHECK_NMCHECK, | |
238 | +AC_DEFUN([KDE_CHECK_NMCHECK], | |
239 | [ | |
240 | AC_ARG_ENABLE(nmcheck, [ --enable-nmcheck enable automatic namespace cleanness check], | |
241 | kde_use_nmcheck=$enableval, kde_use_nmcheck=no) | |
242 | @@ -1699,7 +1699,7 @@ | |
243 | dnl and $(kde_includes) will be the kdehdrlocation (if needed) | |
244 | dnl ------------------------------------------------------------------------ | |
245 | dnl | |
246 | -AC_DEFUN(AC_BASE_PATH_KDE, | |
247 | +AC_DEFUN([AC_BASE_PATH_KDE], | |
248 | [ | |
249 | AC_PREREQ([2.13]) | |
250 | AC_REQUIRE([KDE_CHECK_STL]) | |
251 | @@ -1854,7 +1854,7 @@ | |
252 | ||
253 | ]) | |
254 | ||
255 | -AC_DEFUN(KDE_CHECK_EXTRA_LIBS, | |
256 | +AC_DEFUN([KDE_CHECK_EXTRA_LIBS], | |
257 | [ | |
258 | AC_MSG_CHECKING(for extra includes) | |
259 | AC_ARG_WITH(extra-includes, [ --with-extra-includes=DIR | |
260 | @@ -1909,7 +1909,7 @@ | |
261 | ||
262 | ]) | |
263 | ||
264 | -AC_DEFUN(KDE_1_CHECK_PATH_HEADERS, | |
265 | +AC_DEFUN([KDE_1_CHECK_PATH_HEADERS], | |
266 | [ | |
267 | AC_MSG_CHECKING([for KDE headers installed]) | |
268 | AC_LANG_SAVE | |
269 | @@ -1964,7 +1964,7 @@ | |
270 | AC_LANG_RESTORE | |
271 | ]) | |
272 | ||
273 | -AC_DEFUN(KDE_CHECK_KDEQTADDON, | |
274 | +AC_DEFUN([KDE_CHECK_KDEQTADDON], | |
275 | [ | |
276 | AC_MSG_CHECKING(for kde-qt-addon) | |
277 | AC_CACHE_VAL(kde_cv_have_kdeqtaddon, | |
278 | @@ -2000,7 +2000,7 @@ | |
279 | fi | |
280 | ]) | |
281 | ||
282 | -AC_DEFUN(KDE_CHECK_KIMGIO, | |
283 | +AC_DEFUN([KDE_CHECK_KIMGIO], | |
284 | [ | |
285 | AC_REQUIRE([AC_BASE_PATH_KDE]) | |
286 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
287 | @@ -2031,7 +2031,7 @@ | |
288 | AC_SUBST(LIB_KIMGIO) | |
289 | ]) | |
290 | ||
291 | -AC_DEFUN(KDE_CREATE_LIBS_ALIASES, | |
292 | +AC_DEFUN([KDE_CREATE_LIBS_ALIASES], | |
293 | [ | |
294 | AC_REQUIRE([KDE_MISC_TESTS]) | |
295 | AC_REQUIRE([KDE_CHECK_LIBDL]) | |
296 | @@ -2074,7 +2074,7 @@ | |
297 | fi | |
298 | ]) | |
299 | ||
300 | -AC_DEFUN(AC_PATH_KDE, | |
301 | +AC_DEFUN([AC_PATH_KDE], | |
302 | [ | |
303 | AC_BASE_PATH_KDE | |
304 | AC_ARG_ENABLE(path-check, [ --disable-path-check don't try to find out, where to install], | |
305 | @@ -2099,7 +2099,7 @@ | |
306 | ]) | |
307 | ||
308 | dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found]) | |
309 | -AC_DEFUN(KDE_CHECK_FUNC_EXT, | |
310 | +AC_DEFUN([KDE_CHECK_FUNC_EXT], | |
311 | [ | |
312 | AC_MSG_CHECKING(for $1) | |
313 | AC_CACHE_VAL(kde_cv_func_$1, | |
314 | @@ -2190,7 +2190,7 @@ | |
315 | ]) | |
316 | ]) | |
317 | ||
318 | -AC_DEFUN(AC_CHECK_SETENV, | |
319 | +AC_DEFUN([AC_CHECK_SETENV], | |
320 | [ | |
321 | KDE_CHECK_FUNC_EXT(setenv, [ | |
322 | #include <stdlib.h> | |
323 | @@ -2200,7 +2200,7 @@ | |
324 | [SETENV]) | |
325 | ]) | |
326 | ||
327 | -AC_DEFUN(AC_CHECK_UNSETENV, | |
328 | +AC_DEFUN([AC_CHECK_UNSETENV], | |
329 | [ | |
330 | KDE_CHECK_FUNC_EXT(unsetenv, [ | |
331 | #include <stdlib.h> | |
332 | @@ -2210,7 +2210,7 @@ | |
333 | [UNSETENV]) | |
334 | ]) | |
335 | ||
336 | -AC_DEFUN(AC_CHECK_GETDOMAINNAME, | |
337 | +AC_DEFUN([AC_CHECK_GETDOMAINNAME], | |
338 | [ | |
339 | KDE_CHECK_FUNC_EXT(getdomainname, [ | |
340 | #include <stdlib.h> | |
341 | @@ -2226,7 +2226,7 @@ | |
342 | [GETDOMAINNAME]) | |
343 | ]) | |
344 | ||
345 | -AC_DEFUN(AC_CHECK_GETHOSTNAME, | |
346 | +AC_DEFUN([AC_CHECK_GETHOSTNAME], | |
347 | [ | |
348 | KDE_CHECK_FUNC_EXT(gethostname, [ | |
349 | #include <stdlib.h> | |
350 | @@ -2240,7 +2240,7 @@ | |
351 | [GETHOSTNAME]) | |
352 | ]) | |
353 | ||
354 | -AC_DEFUN(AC_CHECK_USLEEP, | |
355 | +AC_DEFUN([AC_CHECK_USLEEP], | |
356 | [ | |
357 | KDE_CHECK_FUNC_EXT(usleep, [ | |
358 | #include <unistd.h> | |
359 | @@ -2253,7 +2253,7 @@ | |
360 | ]) | |
361 | ||
362 | ||
363 | -AC_DEFUN(AC_CHECK_RANDOM, | |
364 | +AC_DEFUN([AC_CHECK_RANDOM], | |
365 | [ | |
366 | KDE_CHECK_FUNC_EXT(random, [ | |
367 | #include <stdlib.h> | |
368 | @@ -2275,7 +2275,7 @@ | |
369 | ||
370 | ]) | |
371 | ||
372 | -AC_DEFUN(AC_CHECK_INITGROUPS, | |
373 | +AC_DEFUN([AC_CHECK_INITGROUPS], | |
374 | [ | |
375 | KDE_CHECK_FUNC_EXT(initgroups, [ | |
376 | #include <sys/types.h> | |
377 | @@ -2290,7 +2290,7 @@ | |
378 | [INITGROUPS]) | |
379 | ]) | |
380 | ||
381 | -AC_DEFUN(AC_CHECK_MKSTEMPS, | |
382 | +AC_DEFUN([AC_CHECK_MKSTEMPS], | |
383 | [ | |
384 | KDE_CHECK_FUNC_EXT(mkstemps, [ | |
385 | #include <stdlib.h> | |
386 | @@ -2303,7 +2303,7 @@ | |
387 | [MKSTEMPS]) | |
388 | ]) | |
389 | ||
390 | -AC_DEFUN(AC_CHECK_MKDTEMP, | |
391 | +AC_DEFUN([AC_CHECK_MKDTEMP], | |
392 | [ | |
393 | KDE_CHECK_FUNC_EXT(mkdtemp, [ | |
394 | #include <stdlib.h> | |
395 | @@ -2317,7 +2317,7 @@ | |
396 | ]) | |
397 | ||
398 | ||
399 | -AC_DEFUN(AC_CHECK_RES_INIT, | |
400 | +AC_DEFUN([AC_CHECK_RES_INIT], | |
401 | [ | |
402 | AC_MSG_CHECKING([if res_init needs -lresolv]) | |
403 | kde_libs_safe="$LIBS" | |
404 | @@ -2361,7 +2361,7 @@ | |
405 | ) | |
406 | ]) | |
407 | ||
408 | -AC_DEFUN(AC_CHECK_STRLCPY, | |
409 | +AC_DEFUN([AC_CHECK_STRLCPY], | |
410 | [ | |
411 | KDE_CHECK_FUNC_EXT(strlcpy, [ | |
412 | #include <string.h> | |
413 | @@ -2373,7 +2373,7 @@ | |
414 | [STRLCPY]) | |
415 | ]) | |
416 | ||
417 | -AC_DEFUN(AC_CHECK_STRLCAT, | |
418 | +AC_DEFUN([AC_CHECK_STRLCAT], | |
419 | [ | |
420 | KDE_CHECK_FUNC_EXT(strlcat, [ | |
421 | #include <string.h> | |
422 | @@ -2386,7 +2386,7 @@ | |
423 | [STRLCAT]) | |
424 | ]) | |
425 | ||
426 | -AC_DEFUN(AC_FIND_GIF, | |
427 | +AC_DEFUN([AC_FIND_GIF], | |
428 | [AC_MSG_CHECKING([for giflib]) | |
429 | AC_CACHE_VAL(ac_cv_lib_gif, | |
430 | [ac_save_LIBS="$LIBS" | |
431 | @@ -2420,7 +2420,7 @@ | |
432 | fi | |
433 | ]) | |
434 | ||
435 | -AC_DEFUN(KDE_FIND_JPEG_HELPER, | |
436 | +AC_DEFUN([KDE_FIND_JPEG_HELPER], | |
437 | [ | |
438 | AC_MSG_CHECKING([for libjpeg$2]) | |
439 | AC_CACHE_VAL(ac_cv_lib_jpeg_$1, | |
440 | @@ -2462,7 +2462,7 @@ | |
441 | ||
442 | ]) | |
443 | ||
444 | -AC_DEFUN(AC_FIND_JPEG, | |
445 | +AC_DEFUN([AC_FIND_JPEG], | |
446 | [ | |
447 | dnl first look for libraries | |
448 | KDE_FIND_JPEG_HELPER(6b, 6b, | |
449 | @@ -2514,7 +2514,7 @@ | |
450 | ]) | |
451 | ]) | |
452 | ||
453 | -AC_DEFUN(KDE_CHECK_QT_JPEG, | |
454 | +AC_DEFUN([KDE_CHECK_QT_JPEG], | |
455 | [ | |
456 | if test -n "$LIBJPEG"; then | |
457 | AC_MSG_CHECKING([if Qt needs $LIBJPEG]) | |
458 | @@ -2551,7 +2551,7 @@ | |
459 | ||
460 | ]) | |
461 | ||
462 | -AC_DEFUN(AC_FIND_ZLIB, | |
463 | +AC_DEFUN([AC_FIND_ZLIB], | |
464 | [ | |
465 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
466 | AC_MSG_CHECKING([for libz]) | |
467 | @@ -2593,7 +2593,7 @@ | |
468 | AC_SUBST(LIBZ) | |
469 | ]) | |
470 | ||
471 | -AC_DEFUN(KDE_TRY_TIFFLIB, | |
472 | +AC_DEFUN([KDE_TRY_TIFFLIB], | |
473 | [ | |
474 | AC_MSG_CHECKING([for libtiff $1]) | |
475 | ||
476 | @@ -2639,7 +2639,7 @@ | |
477 | ||
478 | ]) | |
479 | ||
480 | -AC_DEFUN(AC_FIND_TIFF, | |
481 | +AC_DEFUN([AC_FIND_TIFF], | |
482 | [ | |
483 | AC_REQUIRE([K_PATH_X]) | |
484 | AC_REQUIRE([AC_FIND_ZLIB]) | |
485 | @@ -2653,7 +2653,7 @@ | |
486 | ]) | |
487 | ||
488 | ||
489 | -AC_DEFUN(AC_FIND_PNG, | |
490 | +AC_DEFUN([AC_FIND_PNG], | |
491 | [ | |
492 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
493 | AC_REQUIRE([AC_FIND_ZLIB]) | |
494 | @@ -2697,7 +2697,7 @@ | |
495 | ]) | |
496 | ||
497 | ||
498 | -AC_DEFUN(AC_FIND_JASPER, | |
499 | +AC_DEFUN([AC_FIND_JASPER], | |
500 | [ | |
501 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
502 | AC_REQUIRE([AC_FIND_JPEG]) | |
503 | @@ -2733,12 +2733,12 @@ | |
504 | AC_SUBST(LIB_JASPER) | |
505 | ]) | |
506 | ||
507 | -AC_DEFUN(AC_CHECK_BOOL, | |
508 | +AC_DEFUN([AC_CHECK_BOOL], | |
509 | [ | |
510 | AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) | |
511 | ]) | |
512 | ||
513 | -AC_DEFUN(AC_CHECK_GNU_EXTENSIONS, | |
514 | +AC_DEFUN([AC_CHECK_GNU_EXTENSIONS], | |
515 | [ | |
516 | AC_MSG_CHECKING(if you need GNU extensions) | |
517 | AC_CACHE_VAL(ac_cv_gnu_extensions, | |
518 | @@ -2766,7 +2766,7 @@ | |
519 | fi | |
520 | ]) | |
521 | ||
522 | -AC_DEFUN(KDE_CHECK_COMPILER_FLAG, | |
523 | +AC_DEFUN([KDE_CHECK_COMPILER_FLAG], | |
524 | [ | |
525 | AC_MSG_CHECKING([whether $CXX supports -$1]) | |
526 | kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'` | |
527 | @@ -2794,7 +2794,7 @@ | |
528 | dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables | |
529 | dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever]) | |
530 | dnl it's all white-space separated | |
531 | -AC_DEFUN(AC_REMOVE_FORBIDDEN, | |
532 | +AC_DEFUN([AC_REMOVE_FORBIDDEN], | |
533 | [ __val=$$1 | |
534 | __forbid=" $2 " | |
535 | if test -n "$__val"; then | |
536 | @@ -2815,7 +2815,7 @@ | |
537 | ]) | |
538 | ||
539 | dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given | |
540 | -AC_DEFUN(AC_VALIDIFY_CXXFLAGS, | |
541 | +AC_DEFUN([AC_VALIDIFY_CXXFLAGS], | |
542 | [dnl | |
543 | if test "x$kde_use_qt_emb" != "xyes"; then | |
544 | AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath]) | |
545 | @@ -2826,7 +2826,7 @@ | |
546 | fi | |
547 | ]) | |
548 | ||
549 | -AC_DEFUN(AC_CHECK_COMPILERS, | |
550 | +AC_DEFUN([AC_CHECK_COMPILERS], | |
551 | [ | |
552 | AC_ARG_ENABLE(debug,[ --enable-debug[=ARG] enables debug symbols (yes|no|full) [default=no]], | |
553 | [ | |
554 | @@ -3055,14 +3055,14 @@ | |
555 | ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) | |
556 | ]) | |
557 | ||
558 | -AC_DEFUN(KDE_ADD_DEPENDENCIES, | |
559 | +AC_DEFUN([KDE_ADD_DEPENDENCIES], | |
560 | [ | |
561 | [A]M_DEPENDENCIES(CC) | |
562 | [A]M_DEPENDENCIES(CXX) | |
563 | ]) | |
564 | ||
565 | dnl just a wrapper to clean up configure.in | |
566 | -AC_DEFUN(KDE_PROG_LIBTOOL, | |
567 | +AC_DEFUN([KDE_PROG_LIBTOOL], | |
568 | [ | |
569 | AC_REQUIRE([AC_CHECK_COMPILERS]) | |
570 | AC_REQUIRE([AC_ENABLE_SHARED]) | |
571 | @@ -3086,7 +3086,7 @@ | |
572 | AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') | |
573 | ]) | |
574 | ||
575 | -AC_DEFUN(KDE_CHECK_LIB64, | |
576 | +AC_DEFUN([KDE_CHECK_LIB64], | |
577 | [ | |
578 | kdelibsuff=no | |
579 | AC_ARG_ENABLE(libsuffix, | |
580 | @@ -3111,13 +3111,13 @@ | |
581 | fi | |
582 | ]) | |
583 | ||
584 | -AC_DEFUN(KDE_CHECK_TYPES, | |
585 | +AC_DEFUN([KDE_CHECK_TYPES], | |
586 | [ AC_CHECK_SIZEOF(int, 4)dnl | |
587 | AC_CHECK_SIZEOF(long, 4)dnl | |
588 | AC_CHECK_SIZEOF(char *, 4)dnl | |
589 | ])dnl | |
590 | ||
591 | -AC_DEFUN(KDE_DO_IT_ALL, | |
592 | +AC_DEFUN([KDE_DO_IT_ALL], | |
593 | [ | |
594 | AC_CANONICAL_SYSTEM | |
595 | AC_ARG_PROGRAM | |
596 | @@ -3130,7 +3130,7 @@ | |
597 | AC_PATH_KDE | |
598 | ]) | |
599 | ||
600 | -AC_DEFUN(AC_CHECK_RPATH, | |
601 | +AC_DEFUN([AC_CHECK_RPATH], | |
602 | [ | |
603 | AC_MSG_CHECKING(for rpath) | |
604 | AC_ARG_ENABLE(rpath, | |
605 | @@ -3160,7 +3160,7 @@ | |
606 | ]) | |
607 | ||
608 | dnl Check for the type of the third argument of getsockname | |
609 | -AC_DEFUN(AC_CHECK_SOCKLEN_T, [ | |
610 | +AC_DEFUN([AC_CHECK_SOCKLEN_T], [ | |
611 | AC_MSG_CHECKING(for socklen_t) | |
612 | AC_CACHE_VAL(ac_cv_socklen_t, [ | |
613 | AC_LANG_SAVE | |
614 | @@ -3212,7 +3212,7 @@ | |
615 | dnl > | |
616 | dnl for this file it is relicensed under LGPL | |
617 | ||
618 | -AC_DEFUN(AM_KDE_WITH_NLS, | |
619 | +AC_DEFUN([AM_KDE_WITH_NLS], | |
620 | [ | |
621 | dnl If we use NLS figure out what method | |
622 | ||
623 | @@ -3255,7 +3255,7 @@ | |
624 | ||
625 | dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR, | |
626 | dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) | |
627 | -AC_DEFUN(AM_PATH_PROG_WITH_TEST_KDE, | |
628 | +AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE], | |
629 | [# Extract the first word of "$2", so it can be a program name with args. | |
630 | set dummy $2; ac_word=[$]2 | |
631 | AC_MSG_CHECKING([for $ac_word]) | |
632 | @@ -3297,7 +3297,7 @@ | |
633 | ||
634 | # serial 1 | |
635 | ||
636 | -AC_DEFUN(AM_LC_MESSAGES, | |
637 | +AC_DEFUN([AM_LC_MESSAGES], | |
638 | [if test $ac_cv_header_locale_h = yes; then | |
639 | AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, | |
640 | [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], | |
641 | @@ -3343,7 +3343,7 @@ | |
642 | # serial 1 | |
643 | # Stephan Kulow: I put a KDE in it to avoid name conflicts | |
644 | ||
645 | -AC_DEFUN(AM_KDE_GNU_GETTEXT, | |
646 | +AC_DEFUN([AM_KDE_GNU_GETTEXT], | |
647 | [AC_REQUIRE([AC_PROG_MAKE_SET])dnl | |
648 | AC_REQUIRE([AC_PROG_RANLIB])dnl | |
649 | AC_REQUIRE([AC_HEADER_STDC])dnl | |
650 | @@ -3405,7 +3405,7 @@ | |
651 | ||
652 | ]) | |
653 | ||
654 | -AC_DEFUN(AC_HAVE_XPM, | |
655 | +AC_DEFUN([AC_HAVE_XPM], | |
656 | [AC_REQUIRE_CPP()dnl | |
657 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
658 | ||
659 | @@ -3460,7 +3460,7 @@ | |
660 | AC_SUBST(XPMLIB) | |
661 | ]) | |
662 | ||
663 | -AC_DEFUN(AC_HAVE_DPMS, | |
664 | +AC_DEFUN([AC_HAVE_DPMS], | |
665 | [AC_REQUIRE_CPP()dnl | |
666 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
667 | ||
668 | @@ -3561,7 +3561,7 @@ | |
669 | AC_SUBST(DPMSLIB) | |
670 | ]) | |
671 | ||
672 | -AC_DEFUN(AC_HAVE_GL, | |
673 | +AC_DEFUN([AC_HAVE_GL], | |
674 | [AC_REQUIRE_CPP()dnl | |
675 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
676 | ||
677 | @@ -3644,7 +3644,7 @@ | |
678 | ||
679 | dnl shadow password and PAM magic - maintained by ossi@kde.org | |
680 | ||
681 | -AC_DEFUN(KDE_PAM, [ | |
682 | +AC_DEFUN([KDE_PAM], [ | |
683 | AC_REQUIRE([KDE_CHECK_LIBDL]) | |
684 | ||
685 | want_pam= | |
686 | @@ -3707,7 +3707,7 @@ | |
687 | ]) | |
688 | ||
689 | dnl DEF_PAM_SERVICE(arg name, full name, define name) | |
690 | -AC_DEFUN(DEF_PAM_SERVICE, [ | |
691 | +AC_DEFUN([DEF_PAM_SERVICE], [ | |
692 | AC_ARG_WITH($1-pam, | |
693 | [ --with-$1-pam=[val] override PAM service from --with-pam for $2], | |
694 | [ if test "x$use_pam" = xyes; then | |
695 | @@ -3728,7 +3728,7 @@ | |
696 | AC_SUBST($3_PAM_SERVICE) | |
697 | ]) | |
698 | ||
699 | -AC_DEFUN(KDE_SHADOWPASSWD, [ | |
700 | +AC_DEFUN([KDE_SHADOWPASSWD], [ | |
701 | AC_REQUIRE([KDE_PAM]) | |
702 | ||
703 | AC_CHECK_LIB(shadow, getspent, | |
704 | @@ -3785,7 +3785,7 @@ | |
705 | ||
706 | ]) | |
707 | ||
708 | -AC_DEFUN(KDE_PASSWDLIBS, [ | |
709 | +AC_DEFUN([KDE_PASSWDLIBS], [ | |
710 | AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT | |
711 | AC_REQUIRE([KDE_PAM]) | |
712 | AC_REQUIRE([KDE_SHADOWPASSWD]) | |
713 | @@ -3811,7 +3811,7 @@ | |
714 | AC_SUBST(PASSWDLIBS) | |
715 | ]) | |
716 | ||
717 | -AC_DEFUN(KDE_CHECK_LIBDL, | |
718 | +AC_DEFUN([KDE_CHECK_LIBDL], | |
719 | [ | |
720 | AC_CHECK_LIB(dl, dlopen, [ | |
721 | LIBDL="-ldl" | |
722 | @@ -3826,7 +3826,7 @@ | |
723 | AC_SUBST(LIBDL) | |
724 | ]) | |
725 | ||
726 | -AC_DEFUN(KDE_CHECK_DLOPEN, | |
727 | +AC_DEFUN([KDE_CHECK_DLOPEN], | |
728 | [ | |
729 | KDE_CHECK_LIBDL | |
730 | AC_CHECK_HEADERS(dlfcn.h dl.h) | |
731 | @@ -3866,7 +3866,7 @@ | |
732 | ||
733 | ]) | |
734 | ||
735 | -AC_DEFUN(KDE_CHECK_DYNAMIC_LOADING, | |
736 | +AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING], | |
737 | [ | |
738 | KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no) | |
739 | KDE_PROG_LIBTOOL | |
740 | @@ -3886,7 +3886,7 @@ | |
741 | fi | |
742 | ]) | |
743 | ||
744 | -AC_DEFUN(KDE_ADD_INCLUDES, | |
745 | +AC_DEFUN([KDE_ADD_INCLUDES], | |
746 | [ | |
747 | if test -z "$1"; then | |
748 | test_include="Pix.h" | |
749 | @@ -3923,7 +3923,7 @@ | |
750 | ]) | |
751 | ]) | |
752 | ||
753 | -AC_DEFUN(KDE_CHECK_LIBPTHREAD, | |
754 | +AC_DEFUN([KDE_CHECK_LIBPTHREAD], | |
755 | [ | |
756 | LIBPTHREAD="" | |
757 | ||
758 | @@ -3941,7 +3941,7 @@ | |
759 | AC_SUBST(LIBPTHREAD) | |
760 | ]) | |
761 | ||
762 | -AC_DEFUN(KDE_CHECK_PTHREAD_OPTION, | |
763 | +AC_DEFUN([KDE_CHECK_PTHREAD_OPTION], | |
764 | [ | |
765 | USE_THREADS="" | |
766 | if test -z "$LIBPTHREAD"; then | |
767 | @@ -3978,7 +3978,7 @@ | |
768 | AC_SUBST(LIBPTHREAD) | |
769 | ]) | |
770 | ||
771 | -AC_DEFUN(KDE_CHECK_THREADING, | |
772 | +AC_DEFUN([KDE_CHECK_THREADING], | |
773 | [ | |
774 | AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) | |
775 | AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) | |
776 | @@ -3999,7 +3999,7 @@ | |
777 | fi | |
778 | ]) | |
779 | ||
780 | -AC_DEFUN(KDE_TRY_LINK_PYTHON, | |
781 | +AC_DEFUN([KDE_TRY_LINK_PYTHON], | |
782 | [ | |
783 | if test "$kde_python_link_found" = no; then | |
784 | ||
785 | @@ -4048,7 +4048,7 @@ | |
786 | ||
787 | ]) | |
788 | ||
789 | -AC_DEFUN(KDE_CHECK_PYTHON_DIR, | |
790 | +AC_DEFUN([KDE_CHECK_PYTHON_DIR], | |
791 | [ | |
792 | AC_MSG_CHECKING([for Python directory]) | |
793 | ||
794 | @@ -4071,7 +4071,7 @@ | |
795 | AC_MSG_RESULT($ac_python_dir) | |
796 | ]) | |
797 | ||
798 | -AC_DEFUN(KDE_CHECK_PYTHON_INTERN, | |
799 | +AC_DEFUN([KDE_CHECK_PYTHON_INTERN], | |
800 | [ | |
801 | AC_REQUIRE([KDE_CHECK_LIBDL]) | |
802 | AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) | |
803 | @@ -4163,7 +4163,7 @@ | |
804 | ]) | |
805 | ||
806 | ||
807 | -AC_DEFUN(KDE_CHECK_PYTHON, | |
808 | +AC_DEFUN([KDE_CHECK_PYTHON], | |
809 | [ | |
810 | KDE_CHECK_PYTHON_INTERN("2.3", | |
811 | [KDE_CHECK_PYTHON_INTERN("2.2", | |
812 | @@ -4175,7 +4175,7 @@ | |
813 | ]) | |
814 | ]) | |
815 | ||
816 | -AC_DEFUN(KDE_CHECK_STL, | |
817 | +AC_DEFUN([KDE_CHECK_STL], | |
818 | [ | |
819 | AC_LANG_SAVE | |
820 | AC_LANG_CPLUSPLUS | |
821 | @@ -4211,7 +4211,7 @@ | |
822 | AC_LANG_RESTORE | |
823 | ]) | |
824 | ||
825 | -AC_DEFUN(AC_FIND_QIMGIO, | |
826 | +AC_DEFUN([AC_FIND_QIMGIO], | |
827 | [AC_REQUIRE([AC_FIND_JPEG]) | |
828 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
829 | AC_MSG_CHECKING([for qimgio]) | |
830 | @@ -4250,7 +4250,7 @@ | |
831 | fi | |
832 | ]) | |
833 | ||
834 | -AC_DEFUN(AM_DISABLE_LIBRARIES, | |
835 | +AC_DEFUN([AM_DISABLE_LIBRARIES], | |
836 | [ | |
837 | AC_PROVIDE([AM_ENABLE_STATIC]) | |
838 | AC_PROVIDE([AM_ENABLE_SHARED]) | |
839 | @@ -4259,7 +4259,7 @@ | |
840 | ]) | |
841 | ||
842 | ||
843 | -AC_DEFUN(AC_CHECK_UTMP_FILE, | |
844 | +AC_DEFUN([AC_CHECK_UTMP_FILE], | |
845 | [ | |
846 | AC_MSG_CHECKING([for utmp file]) | |
847 | ||
848 | @@ -4292,7 +4292,7 @@ | |
849 | ]) | |
850 | ||
851 | ||
852 | -AC_DEFUN(KDE_CREATE_SUBDIRSLIST, | |
853 | +AC_DEFUN([KDE_CREATE_SUBDIRSLIST], | |
854 | [ | |
855 | ||
856 | DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" | |
857 | @@ -4339,7 +4339,7 @@ | |
858 | AC_SUBST(TOPSUBDIRS) | |
859 | ]) | |
860 | ||
861 | -AC_DEFUN(KDE_CHECK_NAMESPACES, | |
862 | +AC_DEFUN([KDE_CHECK_NAMESPACES], | |
863 | [ | |
864 | AC_MSG_CHECKING(whether C++ compiler supports namespaces) | |
865 | AC_LANG_SAVE | |
866 | @@ -4369,7 +4369,7 @@ | |
867 | dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org | |
868 | dnl ------------------------------------------------------------------------ | |
869 | dnl | |
870 | -AC_DEFUN(AC_CHECK_S_ISSOCK, | |
871 | +AC_DEFUN([AC_CHECK_S_ISSOCK], | |
872 | [ | |
873 | AC_MSG_CHECKING(for S_ISSOCK) | |
874 | AC_CACHE_VAL(ac_cv_have_s_issock, | |
875 | @@ -4404,7 +4404,7 @@ | |
876 | dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org | |
877 | dnl ------------------------------------------------------------------------ | |
878 | dnl | |
879 | -AC_DEFUN(AC_CHECK_KDEMAXPATHLEN, | |
880 | +AC_DEFUN([AC_CHECK_KDEMAXPATHLEN], | |
881 | [ | |
882 | AC_MSG_CHECKING(for MAXPATHLEN) | |
883 | AC_CACHE_VAL(ac_cv_maxpathlen, | |
884 | @@ -4438,7 +4438,7 @@ | |
885 | AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) | |
886 | ]) | |
887 | ||
888 | -AC_DEFUN(KDE_CHECK_HEADER, | |
889 | +AC_DEFUN([KDE_CHECK_HEADER], | |
890 | [ | |
891 | AC_LANG_SAVE | |
892 | kde_safe_cppflags=$CPPFLAGS | |
893 | @@ -4449,7 +4449,7 @@ | |
894 | AC_LANG_RESTORE | |
895 | ]) | |
896 | ||
897 | -AC_DEFUN(KDE_CHECK_HEADERS, | |
898 | +AC_DEFUN([KDE_CHECK_HEADERS], | |
899 | [ | |
900 | AH_CHECK_HEADERS([$1]) | |
901 | AC_LANG_SAVE | |
902 | @@ -4461,14 +4461,14 @@ | |
903 | AC_LANG_RESTORE | |
904 | ]) | |
905 | ||
906 | -AC_DEFUN(KDE_FAST_CONFIGURE, | |
907 | +AC_DEFUN([KDE_FAST_CONFIGURE], | |
908 | [ | |
909 | dnl makes configure fast (needs perl) | |
910 | AC_ARG_ENABLE(fast-perl, [ --disable-fast-perl disable fast Makefile generation (needs perl)], | |
911 | with_fast_perl=$enableval, with_fast_perl=yes) | |
912 | ]) | |
913 | ||
914 | -AC_DEFUN(KDE_CONF_FILES, | |
915 | +AC_DEFUN([KDE_CONF_FILES], | |
916 | [ | |
917 | val= | |
918 | if test -f $srcdir/configure.files ; then | |
919 | @@ -4483,7 +4483,7 @@ | |
920 | AC_SUBST(CONF_FILES) | |
921 | ])dnl | |
922 | ||
923 | -AC_DEFUN(KDE_SET_PREFIX, | |
924 | +AC_DEFUN([KDE_SET_PREFIX], | |
925 | [ | |
926 | unset CDPATH | |
927 | dnl make $KDEDIR the default for the installation | |
928 | @@ -4566,7 +4566,7 @@ | |
929 | fi | |
930 | ])dnl | |
931 | ||
932 | -AC_DEFUN(KDE_LANG_CPLUSPLUS, | |
933 | +AC_DEFUN([KDE_LANG_CPLUSPLUS], | |
934 | [AC_LANG_CPLUSPLUS | |
935 | ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' | |
936 | pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS]) | |
937 | @@ -4577,7 +4577,7 @@ | |
938 | KDE_LANG_CPLUSPLUS | |
939 | ]) | |
940 | ||
941 | -AC_DEFUN(KDE_CHECK_LONG_LONG, | |
942 | +AC_DEFUN([KDE_CHECK_LONG_LONG], | |
943 | [ | |
944 | AC_MSG_CHECKING(for long long) | |
945 | AC_CACHE_VAL(kde_cv_c_long_long, | |
946 | @@ -4597,7 +4597,7 @@ | |
947 | fi | |
948 | ]) | |
949 | ||
950 | -AC_DEFUN(KDE_CHECK_LIB, | |
951 | +AC_DEFUN([KDE_CHECK_LIB], | |
952 | [ | |
953 | kde_save_LDFLAGS="$LDFLAGS" | |
954 | dnl AC_CHECK_LIB modifies LIBS, so save it here | |
955 | @@ -4613,7 +4613,7 @@ | |
956 | LIBS="$kde_save_LIBS" | |
957 | ]) | |
958 | ||
959 | -AC_DEFUN(KDE_JAVA_PREFIX, | |
960 | +AC_DEFUN([KDE_JAVA_PREFIX], | |
961 | [ | |
962 | dir=`dirname "$1"` | |
963 | base=`basename "$1"` | |
964 | @@ -4636,7 +4636,7 @@ | |
965 | ]) | |
966 | ||
967 | dnl KDE_CHEC_JAVA_DIR(onlyjre) | |
968 | -AC_DEFUN(KDE_CHECK_JAVA_DIR, | |
969 | +AC_DEFUN([KDE_CHECK_JAVA_DIR], | |
970 | [ | |
971 | ||
972 | AC_ARG_WITH(java, | |
973 | @@ -4886,7 +4886,7 @@ | |
974 | m4_define([AC_FOREACH], | |
975 | [mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])]) | |
976 | ||
977 | -AC_DEFUN(KDE_NEED_FLEX, | |
978 | +AC_DEFUN([KDE_NEED_FLEX], | |
979 | [ | |
980 | kde_libs_safe=$LIBS | |
981 | LIBS="$LIBS $USER_LDFLAGS" | |
982 | @@ -4898,7 +4898,7 @@ | |
983 | AC_SUBST(LEXLIB) | |
984 | ]) | |
985 | ||
986 | -AC_DEFUN(AC_PATH_QTOPIA, | |
987 | +AC_DEFUN([AC_PATH_QTOPIA], | |
988 | [ | |
989 | dnl TODO: use AC_CACHE_VAL | |
990 | ||
991 | @@ -5002,7 +5002,7 @@ | |
992 | ]) | |
993 | ||
994 | ||
995 | -AC_DEFUN(KDE_INIT_DOXYGEN, | |
996 | +AC_DEFUN([KDE_INIT_DOXYGEN], | |
997 | [ | |
998 | AC_MSG_CHECKING([for Qt docs]) | |
999 | kde_qtdir= | |
1000 | @@ -5039,7 +5039,7 @@ | |
1001 | ]) | |
1002 | ||
1003 | ||
1004 | -AC_DEFUN(AC_FIND_BZIP2, | |
1005 | +AC_DEFUN([AC_FIND_BZIP2], | |
1006 | [ | |
1007 | AC_MSG_CHECKING([for bzDecompress in libbz2]) | |
1008 | AC_CACHE_VAL(ac_cv_lib_bzip2, | |
1009 | @@ -5126,7 +5126,7 @@ | |
1010 | dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed) | |
1011 | dnl ------------------------------------------------------------------------ | |
1012 | dnl | |
1013 | -AC_DEFUN(KDE_CHECK_SSL, | |
1014 | +AC_DEFUN([KDE_CHECK_SSL], | |
1015 | [ | |
1016 | LIBSSL="-lssl -lcrypto" | |
1017 | AC_REQUIRE([KDE_CHECK_LIB64]) | |
1018 | @@ -5308,7 +5308,7 @@ | |
1019 | AC_SUBST(LIBSSL) | |
1020 | ]) | |
1021 | ||
1022 | -AC_DEFUN(KDE_CHECK_STRLCPY, | |
1023 | +AC_DEFUN([KDE_CHECK_STRLCPY], | |
1024 | [ | |
1025 | AC_REQUIRE([AC_CHECK_STRLCAT]) | |
1026 | AC_REQUIRE([AC_CHECK_STRLCPY]) | |
1027 | @@ -5329,7 +5329,7 @@ | |
1028 | ]) | |
1029 | ]) | |
1030 | ||
1031 | -AC_DEFUN(KDE_CHECK_BINUTILS, | |
1032 | +AC_DEFUN([KDE_CHECK_BINUTILS], | |
1033 | [ | |
1034 | AC_MSG_CHECKING([if ld supports unversioned version maps]) | |
1035 | ||
1036 | @@ -5364,7 +5364,7 @@ | |
1037 | _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)]) | |
1038 | ]) | |
1039 | ||
1040 | -AC_DEFUN(KDE_CHECK_PERL, | |
1041 | +AC_DEFUN([KDE_CHECK_PERL], | |
1042 | [ | |
1043 | KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [ | |
1044 | AC_MSG_ERROR([No Perl found in your $PATH. | |
9f74db4a | 1045 | --- libltdl/ltdl.m4.orig 2004-01-04 15:47:53.996831016 +0100 |
1046 | +++ libltdl/ltdl.m4 2004-01-04 15:49:02.439426160 +0100 | |
1047 | @@ -22,7 +22,7 @@ | |
1048 | ||
1049 | # serial 1 AC_LIB_LTDL | |
1050 | ||
1051 | -AC_DEFUN(AC_LIB_LTDL, | |
1052 | +AC_DEFUN([AC_LIB_LTDL], | |
1053 | [AC_PREREQ(2.13)dnl | |
1054 | AC_REQUIRE([AC_PROG_CC])dnl | |
1055 | AC_REQUIRE([AC_C_CONST])dnl | |
1056 | @@ -30,13 +30,13 @@ | |
1057 | AC_REQUIRE([AC_LIB_LTDL_COMMON])dnl | |
1058 | ]) | |
1059 | ||
1060 | -AC_DEFUN(KDE_LIB_LTDL, | |
1061 | +AC_DEFUN([KDE_LIB_LTDL], | |
1062 | [AC_PREREQ(2.13)dnl | |
1063 | AC_REQUIRE([AC_PROG_CC])dnl | |
1064 | AC_REQUIRE([AC_LIB_LTDL_COMMON])dnl | |
1065 | ]) | |
1066 | ||
1067 | -AC_DEFUN(AC_LIB_LTDL_COMMON, | |
1068 | +AC_DEFUN([AC_LIB_LTDL_COMMON], | |
1069 | [dnl | |
1070 | dnl AC_LIB_LTDL must perform all the checks necessary for compilation | |
1071 | dnl of the ltdl objects -- including compiler checks (above) and header | |
1072 | @@ -62,7 +62,7 @@ | |
1073 | AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS])dnl | |
1074 | ]) | |
1075 | ||
1076 | -AC_DEFUN(AC_LTDL_ENABLE_INSTALL, | |
1077 | +AC_DEFUN([AC_LTDL_ENABLE_INSTALL], | |
1078 | [AC_ARG_ENABLE(ltdl-install, | |
1079 | [ --enable-ltdl-install install libltdl]) | |
1080 | ||
1081 | @@ -71,7 +71,7 @@ | |
1082 | ])]) | |
1083 | ||
1084 | ||
1085 | -AC_DEFUN(AC_LTDL_SNARF_CONFIG, | |
1086 | +AC_DEFUN([AC_LTDL_SNARF_CONFIG], | |
1087 | [# Read the libtool configuration | |
1088 | rm -f conftest | |
1089 | ./libtool --config > conftest | |
1090 | @@ -81,7 +81,7 @@ | |
1091 | ||
1092 | # AC_LTDL_SYS_DLOPEN_DEPLIBS | |
1093 | # -------------------------- | |
1094 | -AC_DEFUN(AC_LTDL_SYS_DLOPEN_DEPLIBS, | |
1095 | +AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], | |
1096 | [AC_REQUIRE([AC_CANONICAL_HOST]) | |
1097 | AC_CACHE_CHECK([whether deplibs are loaded by dlopen], | |
1098 | libltdl_cv_sys_dlopen_deplibs, [dnl | |
1099 | @@ -111,7 +111,7 @@ | |
1100 | fi | |
1101 | ])# AC_LTDL_SYS_DLOPEN_DEPLIBS | |
1102 | ||
1103 | -AC_DEFUN(AC_LTDL_SHLIBEXT, | |
1104 | +AC_DEFUN([AC_LTDL_SHLIBEXT], | |
1105 | [AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl | |
1106 | AC_CACHE_CHECK([which extension is used for shared libraries], | |
1107 | libltdl_cv_shlibext, [dnl | |
1108 | @@ -133,7 +133,7 @@ | |
1109 | fi | |
1110 | ]) | |
1111 | ||
1112 | -AC_DEFUN(AC_LTDL_SHLIBPATH, | |
1113 | +AC_DEFUN([AC_LTDL_SHLIBPATH], | |
1114 | [AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl | |
1115 | AC_CACHE_CHECK([which variable specifies run-time library path], | |
1116 | libltdl_cv_shlibpath_var, [libltdl_cv_shlibpath_var="$shlibpath_var"]) | |
1117 | @@ -143,7 +143,7 @@ | |
1118 | fi | |
1119 | ]) | |
1120 | ||
1121 | -AC_DEFUN(AC_LTDL_SYSSEARCHPATH, | |
1122 | +AC_DEFUN([AC_LTDL_SYSSEARCHPATH], | |
1123 | [AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl | |
1124 | AC_CACHE_CHECK([for the default library search path], | |
1125 | libltdl_cv_sys_search_path, [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"]) | |
1126 | @@ -165,7 +165,7 @@ | |
1127 | fi | |
1128 | ]) | |
1129 | ||
1130 | -AC_DEFUN(AC_LTDL_OBJDIR, | |
1131 | +AC_DEFUN([AC_LTDL_OBJDIR], | |
1132 | [AC_CACHE_CHECK([for objdir], | |
1133 | libltdl_cv_objdir, [libltdl_cv_objdir="$objdir" | |
1134 | if test -n "$objdir"; then | |
1135 | @@ -185,7 +185,7 @@ | |
1136 | [Define to the sub-directory in which libtool stores uninstalled libraries. ]) | |
1137 | ]) | |
1138 | ||
1139 | -AC_DEFUN(AC_LTDL_DLPREOPEN, | |
1140 | +AC_DEFUN([AC_LTDL_DLPREOPEN], | |
1141 | [AC_REQUIRE([AC_LTDL_GLOBAL_SYMBOL_PIPE])dnl | |
1142 | AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], | |
1143 | libltdl_cv_preloaded_symbols, [dnl | |
1144 | @@ -201,7 +201,7 @@ | |
1145 | fi | |
1146 | ]) | |
1147 | ||
1148 | -AC_DEFUN(AC_LTDL_DLLIB, | |
1149 | +AC_DEFUN([AC_LTDL_DLLIB], | |
1150 | [LIBADD_DL= | |
1151 | AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1, | |
1152 | [Define if you have the libdl library or equivalent. ]) LIBADD_DL="-ldl"], | |
1153 | @@ -230,7 +230,7 @@ | |
1154 | fi | |
1155 | ]) | |
1156 | ||
1157 | -AC_DEFUN(AC_LTDL_GLOBAL_SYMBOL_PIPE, | |
1158 | +AC_DEFUN([AC_LTDL_GLOBAL_SYMBOL_PIPE], | |
1159 | [dnl Check for command to grab the raw symbol name followed | |
1160 | dnl by C symbol name from nm. | |
1161 | AC_REQUIRE([AC_CANONICAL_HOST])dnl | |
1162 | @@ -401,7 +401,7 @@ | |
1163 | AC_MSG_RESULT($ac_result) | |
1164 | ]) | |
1165 | ||
1166 | -AC_DEFUN(AC_LTDL_SYMBOL_USCORE, | |
1167 | +AC_DEFUN([AC_LTDL_SYMBOL_USCORE], | |
1168 | [dnl does the compiler prefix global symbols with an underscore? | |
1169 | AC_REQUIRE([AC_LTDL_GLOBAL_SYMBOL_PIPE])dnl | |
1170 | AC_MSG_CHECKING([for _ prefix in compiled symbols]) | |
1171 | @@ -437,7 +437,7 @@ | |
1172 | AC_MSG_RESULT($ac_cv_sys_symbol_underscore) | |
1173 | ]) | |
1174 | ||
1175 | -AC_DEFUN(AC_LTDL_DLSYM_USCORE, | |
1176 | +AC_DEFUN([AC_LTDL_DLSYM_USCORE], | |
1177 | [AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])dnl | |
1178 | if test x"$ac_cv_sys_symbol_underscore" = xyes; then | |
1179 | if test x"$ac_cv_func_dlopen" = xyes || | |
476c840a | 1180 | --- admin/oldinclude.m4.in.orig 2004-01-04 15:52:07.759253264 +0100 |
1181 | +++ admin/oldinclude.m4.in 2004-01-04 15:53:21.846990216 +0100 | |
1182 | @@ -19,7 +19,7 @@ | |
1183 | dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
1184 | dnl Boston, MA 02111-1307, USA. | |
1185 | ||
1186 | -AC_DEFUN(KDE_CHECK_MICO, | |
1187 | +AC_DEFUN([KDE_CHECK_MICO], | |
1188 | [ | |
1189 | AC_REQUIRE([KDE_CHECK_LIBDL]) | |
1190 | AC_REQUIRE([KDE_MISC_TESTS]) | |
1191 | @@ -128,7 +128,7 @@ | |
1192 | ||
1193 | ]) | |
1194 | ||
1195 | -AC_DEFUN(KDE_CHECK_MINI_STL, | |
1196 | +AC_DEFUN([KDE_CHECK_MINI_STL], | |
1197 | [ | |
1198 | AC_REQUIRE([KDE_CHECK_MICO]) | |
1199 | ||
1200 | @@ -165,11 +165,11 @@ | |
1201 | ||
1202 | ]) | |
1203 | ||
1204 | -AC_DEFUN(KDE_CHECK_ANSI, | |
1205 | +AC_DEFUN([KDE_CHECK_ANSI], | |
1206 | [ | |
1207 | ]) | |
1208 | ||
1209 | -AC_DEFUN(KDE_CHECK_INSURE, | |
1210 | +AC_DEFUN([KDE_CHECK_INSURE], | |
1211 | [ | |
1212 | AC_ARG_ENABLE(insure, [ --enable-insure use insure++ for debugging [default=no]], | |
1213 | [ | |
1214 | @@ -186,7 +186,7 @@ | |
1215 | fi | |
1216 | ]) | |
1217 | ||
1218 | -AC_DEFUN(KDE_CHECK_NEWLIBS, | |
1219 | +AC_DEFUN([KDE_CHECK_NEWLIBS], | |
1220 | [ | |
1221 | ||
1222 | -]) | |
1223 |