]>
Commit | Line | Data |
---|---|---|
7e09b35d | 1 | diff -urN cdget-0.2.3.orig/acinclude.m4 cdget-0.2.3.new/acinclude.m4 |
2 | --- cdget-0.2.3.orig/acinclude.m4 2003-02-04 02:16:16.000000000 +0100 | |
3 | +++ cdget-0.2.3.new/acinclude.m4 2004-07-02 19:36:00.955233000 +0200 | |
4 | @@ -36,7 +36,7 @@ | |
5 | dnl thanks to Raja R Harinath. | |
6 | dnl ------------------------------------------------------------------------ | |
7 | dnl | |
8 | -AC_DEFUN(KDE_CHECK_LIBDL, | |
9 | +AC_DEFUN([KDE_CHECK_LIBDL], | |
10 | [ | |
11 | AC_CHECK_LIB(dl, dlopen, [ | |
12 | LIBDL="-ldl" | |
13 | @@ -60,7 +60,7 @@ | |
14 | # KDE_PATH_X_DIRECT | |
15 | dnl Internal subroutine of AC_PATH_X. | |
16 | dnl Set ac_x_includes and/or ac_x_libraries. | |
17 | -AC_DEFUN(KDE_PATH_X_DIRECT, | |
18 | +AC_DEFUN([KDE_PATH_X_DIRECT], | |
19 | [if test "$ac_x_includes" = NO; then | |
20 | # Guess where to find include files, by looking for this one X11 .h file. | |
21 | test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h | |
22 | @@ -184,7 +184,7 @@ | |
23 | dnl Find a file (or one of more files in a list of dirs) | |
24 | dnl ------------------------------------------------------------------------ | |
25 | dnl | |
26 | -AC_DEFUN(AC_FIND_FILE, | |
27 | +AC_DEFUN([AC_FIND_FILE], | |
28 | [ | |
29 | $3=NO | |
30 | for i in $2; | |
31 | @@ -203,7 +203,7 @@ | |
32 | ||
33 | dnl KDE_FIND_PATH(programm-name, variable-name, list of directories, | |
34 | dnl if-not-found, test-parameter) | |
35 | -AC_DEFUN(KDE_FIND_PATH, | |
36 | +AC_DEFUN([KDE_FIND_PATH], | |
37 | [ | |
38 | AC_MSG_CHECKING([for $1]) | |
39 | if test -n "$$2"; then | |
40 | @@ -256,7 +256,7 @@ | |
41 | fi | |
42 | ]) | |
43 | ||
44 | -AC_DEFUN(KDE_MOC_ERROR_MESSAGE, | |
45 | +AC_DEFUN([KDE_MOC_ERROR_MESSAGE], | |
46 | [ | |
47 | AC_MSG_ERROR([No Qt meta object compiler (moc) found! | |
48 | Please check whether you installed Qt correctly. | |
49 | @@ -268,7 +268,7 @@ | |
50 | ]) | |
51 | ]) | |
52 | ||
53 | -AC_DEFUN(KDE_UIC_ERROR_MESSAGE, | |
54 | +AC_DEFUN([KDE_UIC_ERROR_MESSAGE], | |
55 | [ | |
56 | AC_MSG_WARN([No Qt ui compiler (uic) found! | |
57 | Please check whether you installed Qt correctly. | |
58 | @@ -281,7 +281,7 @@ | |
59 | ]) | |
60 | ||
61 | ||
62 | -AC_DEFUN(KDE_CHECK_UIC_FLAG, | |
63 | +AC_DEFUN([KDE_CHECK_UIC_FLAG], | |
64 | [ | |
65 | AC_MSG_CHECKING([whether uic supports -$1 ]) | |
66 | kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'` | |
67 | @@ -316,7 +316,7 @@ | |
68 | dnl in $QTDIR/bin, and some more usual places | |
69 | dnl ------------------------------------------------------------------------ | |
70 | dnl | |
71 | -AC_DEFUN(AC_PATH_QT_MOC_UIC, | |
72 | +AC_DEFUN([AC_PATH_QT_MOC_UIC], | |
73 | [ | |
74 | qt_bindirs="" | |
75 | for dir in $kde_qt_dirs; do | |
76 | @@ -359,7 +359,7 @@ | |
77 | AC_SUBST(UIC_TR) | |
78 | ]) | |
79 | ||
80 | -AC_DEFUN(AC_CHECK_SOCKLEN_T, [ | |
81 | +AC_DEFUN([AC_CHECK_SOCKLEN_T], [ | |
82 | AC_MSG_CHECKING(for socklen_t) | |
83 | AC_CACHE_VAL(ac_cv_socklen_t, [ | |
84 | AC_LANG_SAVE | |
85 | @@ -395,7 +395,7 @@ | |
86 | ||
87 | ]) | |
88 | ||
89 | -AC_DEFUN(KDE_CHECK_THREADING, | |
90 | +AC_DEFUN([KDE_CHECK_THREADING], | |
91 | [ | |
92 | AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) | |
93 | AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) | |
94 | @@ -417,7 +417,7 @@ | |
95 | ]) | |
96 | ||
97 | dnl ------------------------------------------------------------------------ | |
98 | -AC_DEFUN(KDE_MISC_TESTS, | |
99 | +AC_DEFUN([KDE_MISC_TESTS], | |
100 | [ | |
101 | AC_LANG_C | |
102 | dnl Checks for libraries. | |
103 | @@ -505,7 +505,7 @@ | |
104 | dnl macro AC_PATH_X | |
105 | dnl ------------------------------------------------------------------------ | |
106 | dnl | |
107 | -AC_DEFUN(K_PATH_X, | |
108 | +AC_DEFUN([K_PATH_X], | |
109 | [ | |
110 | AC_REQUIRE([KDE_MISC_TESTS])dnl | |
111 | ||
112 | @@ -759,7 +759,7 @@ | |
113 | ||
114 | ]) | |
115 | ||
116 | -AC_DEFUN(KDE_PRINT_QT_PROGRAM, | |
117 | +AC_DEFUN([KDE_PRINT_QT_PROGRAM], | |
118 | [ | |
119 | AC_REQUIRE([KDE_USE_QT]) | |
120 | cat > conftest.$ac_ext <<EOF | |
121 | @@ -822,7 +822,7 @@ | |
122 | EOF | |
123 | ]) | |
124 | ||
125 | -AC_DEFUN(KDE_USE_QT, | |
126 | +AC_DEFUN([KDE_USE_QT], | |
127 | [ | |
128 | if test -z "$1"; then | |
129 | kde_qtver=3 | |
130 | @@ -886,7 +886,7 @@ | |
131 | fi | |
132 | ]) | |
133 | ||
134 | -AC_DEFUN(KDE_CHECK_QT_DIRECT, | |
135 | +AC_DEFUN([KDE_CHECK_QT_DIRECT], | |
136 | [ | |
137 | AC_REQUIRE([KDE_USE_QT]) | |
138 | AC_MSG_CHECKING([if Qt compiles without flags]) | |
139 | @@ -949,7 +949,7 @@ | |
140 | dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) | |
141 | dnl ------------------------------------------------------------------------ | |
142 | dnl | |
143 | -AC_DEFUN(AC_PATH_QT_1_3, | |
144 | +AC_DEFUN([AC_PATH_QT_1_3], | |
145 | [ | |
146 | AC_REQUIRE([K_PATH_X]) | |
147 | AC_REQUIRE([KDE_USE_QT]) | |
148 | @@ -1036,7 +1036,7 @@ | |
149 | fi | |
150 | fi | |
151 | ||
152 | -AC_DEFUN(AC_FIND_PNG, | |
153 | +AC_DEFUN([AC_FIND_PNG], | |
154 | [ | |
155 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
156 | AC_REQUIRE([AC_FIND_ZLIB]) | |
157 | @@ -1285,12 +1285,12 @@ | |
158 | AC_SUBST(kde_qtver) | |
159 | ]) | |
160 | ||
161 | -AC_DEFUN(AC_PATH_QT, | |
162 | +AC_DEFUN([AC_PATH_QT], | |
163 | [ | |
164 | AC_PATH_QT_1_3 | |
165 | ]) | |
166 | ||
167 | -AC_DEFUN(KDE_FIND_JPEG_HELPER, | |
168 | +AC_DEFUN([KDE_FIND_JPEG_HELPER], | |
169 | [ | |
170 | AC_MSG_CHECKING([for libjpeg$2]) | |
171 | AC_CACHE_VAL(ac_cv_lib_jpeg_$1, | |
172 | @@ -1333,7 +1333,7 @@ | |
173 | ||
174 | ]) | |
175 | ||
176 | -AC_DEFUN(AC_FIND_JPEG, | |
177 | +AC_DEFUN([AC_FIND_JPEG], | |
178 | [ | |
179 | dnl first look for libraries | |
180 | KDE_FIND_JPEG_HELPER(6b, 6b, | |
181 | @@ -1375,7 +1375,7 @@ | |
182 | AC_SUBST(LIBJPEG) | |
183 | ]) | |
184 | ||
185 | -AC_DEFUN(KDE_CHECK_QT_JPEG, | |
186 | +AC_DEFUN([KDE_CHECK_QT_JPEG], | |
187 | [ | |
188 | AC_MSG_CHECKING([if Qt needs $LIBJPEG]) | |
189 | AC_CACHE_VAL(kde_cv_qt_jpeg, | |
190 | @@ -1410,7 +1410,7 @@ | |
191 | ||
192 | ]) | |
193 | ||
194 | -AC_DEFUN(KDE_CHECK_EXTRA_LIBS, | |
195 | +AC_DEFUN([KDE_CHECK_EXTRA_LIBS], | |
196 | [ | |
197 | AC_MSG_CHECKING(for extra includes) | |
198 | AC_ARG_WITH(extra-includes, [ --with-extra-includes=DIR | |
199 | @@ -1465,7 +1465,7 @@ | |
200 | ||
201 | ]) | |
202 | ||
203 | -AC_DEFUN(AC_FIND_ZLIB, | |
204 | +AC_DEFUN([AC_FIND_ZLIB], | |
205 | [ | |
206 | AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) | |
207 | AC_MSG_CHECKING([for libz]) | |
208 | @@ -1498,12 +1498,12 @@ | |
209 | fi | |
210 | ]) | |
211 | ||
212 | -AC_DEFUN(AC_CHECK_BOOL, | |
213 | +AC_DEFUN([AC_CHECK_BOOL], | |
214 | [ | |
215 | AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) | |
216 | ]) | |
217 | ||
218 | -AC_DEFUN(KDE_CHECK_COMPILER_FLAG, | |
219 | +AC_DEFUN([KDE_CHECK_COMPILER_FLAG], | |
220 | [ | |
221 | AC_MSG_CHECKING(whether $CXX supports -$1) | |
222 | kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'` | |
223 | @@ -1528,20 +1528,20 @@ | |
224 | fi | |
225 | ]) | |
226 | ||
227 | -AC_DEFUN(KDE_CHECK_TYPES, | |
228 | +AC_DEFUN([KDE_CHECK_TYPES], | |
229 | [ AC_CHECK_SIZEOF(int, 4)dnl | |
230 | AC_CHECK_SIZEOF(long, 4)dnl | |
231 | AC_CHECK_SIZEOF(char *, 4)dnl | |
232 | AC_CHECK_SIZEOF(char, 1)dnl | |
233 | ])dnl | |
234 | ||
235 | -AC_DEFUN(KDE_CHECK_LIBPTHREAD, | |
236 | +AC_DEFUN([KDE_CHECK_LIBPTHREAD], | |
237 | [ | |
238 | AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] ) | |
239 | AC_SUBST(LIBPTHREAD) | |
240 | ]) | |
241 | ||
242 | -AC_DEFUN(KDE_CHECK_PTHREAD_OPTION, | |
243 | +AC_DEFUN([KDE_CHECK_PTHREAD_OPTION], | |
244 | [ | |
245 | AC_ARG_ENABLE(kernel-threads, [ --enable-kernel-threads Enable the use of the LinuxThreads port on FreeBSD/i386 only.], | |
246 | kde_use_kernthreads=$enableval, kde_use_kernthreads=no) |