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
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
|
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- centericq-4.9.7/./libyahoo2-0.1/configure.in~configure
+++ centericq-4.9.7/./libyahoo2-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(libyahoo2, 0.1)
AC_PROG_RANLIB
@@ -11,4 +12,5 @@
AC_PROG_CXX
fi
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./configure.in~configure
+++ centericq-4.9.7/./configure.in
@@ -1,4 +1,5 @@
-AC_INIT(src/centericq.cc)
+AC_INIT
+AC_CONFIG_SRCDIR([src/centericq.cc])
AM_INIT_AUTOMAKE(centericq, 4.9.7)
AC_CANONICAL_HOST
@@ -10,8 +11,7 @@
AM_CONFIG_HEADER(config.h)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH([C++])
### use option --enable-locales-fix to fix problems with double-byte
### encodings on systems with broken locale, iscntrl()
@@ -83,11 +83,11 @@
else
AC_MSG_RESULT([not found or disabled])
- AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [
- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS"
- LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra"
- AC_DEFINE(HAVE_GNUTLS, 1, [use gnutls])
- ])
+# AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [
+# CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS"
+# LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra"
+# AC_DEFINE(HAVE_GNUTLS, 1, [use gnutls])
+# ])
fi
fi
@@ -110,7 +110,7 @@
AC_CHECK_LIB(ncurses, initscr,,
[AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))])
-AC_LANG_RESTORE
+AC_LANG_POP()
case "$host_os" in
darwin*)
@@ -172,4 +172,5 @@
ALL_LINGUAS="zh_TW.Big5 uk sv ru ro pt_BR pl nl ms it hu fr es de cs bg"
AM_GNU_GETTEXT
AC_CONFIG_SUBDIRS(blip-0.1 firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1)
-AC_OUTPUT(Makefile contrib/Makefile contrib/spanish/Makefile misc/Makefile share/Makefile src/Makefile src/hooks/Makefile po/Makefile.in intl/Makefile)
+AC_CONFIG_FILES([Makefile contrib/Makefile contrib/spanish/Makefile misc/Makefile share/Makefile src/Makefile src/hooks/Makefile po/Makefile.in intl/Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./kkconsui-0.1/configure.in~configure
+++ centericq-4.9.7/./kkconsui-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(kkconsui, 0.1)
AC_CANONICAL_HOST
@@ -58,4 +59,5 @@
AC_CHECK_HEADERS(_G_config.h)
-AC_OUTPUT(Makefile include/Makefile src/Makefile)
+AC_CONFIG_FILES([Makefile include/Makefile src/Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./blip-0.1/configure.in~configure
+++ centericq-4.9.7/./blip-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(blip, 0.1)
AC_PROG_RANLIB
@@ -11,4 +12,5 @@
AC_PROG_CXX
fi
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./firetalk-0.1/configure.in~configure
+++ centericq-4.9.7/./firetalk-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(firetalk, 0.1)
AC_PROG_RANLIB
@@ -16,19 +17,19 @@
AC_MSG_CHECKING(for inet_aton() presence)
- AC_TRY_LINK([
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
- ], [
+ ]], [[
struct in_addr inp;
inet_aton("address", &inp);
- ], have_aton=yes, have_aton=no)
+ ]])],[have_aton=yes],[have_aton=no])
if test "$have_aton" = "yes"; then
AC_DEFINE(HAVE_INET_ATON)
@@ -38,4 +39,5 @@
fi
fi
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./kksystr-0.1/configure.in~configure
+++ centericq-4.9.7/./kksystr-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(kksystr, 0.1)
AC_PROG_CC
@@ -7,4 +8,5 @@
AC_CHECK_HEADERS(_G_config.h ftw.h)
-AC_OUTPUT(Makefile include/Makefile src/Makefile)
+AC_CONFIG_FILES([Makefile include/Makefile src/Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./libicq2000-0.1/configure.in~configure
+++ centericq-4.9.7/./libicq2000-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(libicq2000, 0.1)
AM_CONFIG_HEADER(config.h)
@@ -10,8 +11,7 @@
AC_STRUCT_TIMEZONE
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH([C++])
AC_CHECK_HEADERS([vector iostream fstream string algorithm list memory iterator exception utility],,
AC_MSG_ERROR([You need to have the libstdc++ headers installed]))
@@ -26,15 +26,16 @@
[AC_CHECK_HEADERS(strstream,,
AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes]))])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <sys/socket.h>
-],[ socklen_t foo; ], ac_cv_c_socklen_t=yes, ac_cv_c_socklen_t=no)
+]], [[ socklen_t foo; ]])],[ac_cv_c_socklen_t=yes],[ac_cv_c_socklen_t=no])
if test $ac_cv_c_socklen_t = no; then
AC_DEFINE(socklen_t, int, [Define type of socklen_t for systems missing it])
fi
-AC_LANG_RESTORE
+AC_LANG_POP()
-AC_OUTPUT(Makefile libicq2000/Makefile src/Makefile)
+AC_CONFIG_FILES([Makefile libicq2000/Makefile src/Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./connwrap-0.1/configure.in~configure
+++ centericq-4.9.7/./connwrap-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(connwrap, 0.1)
AC_PROG_RANLIB
@@ -45,29 +46,29 @@
else
AC_MSG_RESULT([not found or disabled])
- AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [
- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS"
- LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra"
- AC_DEFINE(HAVE_GNUTLS)
- ])
+# AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [
+# CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS"
+# LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra"
+# AC_DEFINE(HAVE_GNUTLS)
+# ])
fi
fi
AC_MSG_CHECKING(for inet_aton() presence)
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-], [
+]], [[
struct in_addr inp;
inet_aton("address", &inp);
-], have_aton=yes, have_aton=no)
+]])],[have_aton=yes],[have_aton=no])
if test "$have_aton" = "yes"; then
AC_DEFINE(HAVE_INET_ATON)
@@ -76,4 +77,5 @@
AC_MSG_RESULT(no)
fi
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./libjabber-0.1/configure.in~configure
+++ centericq-4.9.7/./libjabber-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(libjabber, 0.1)
AC_PROG_RANLIB
@@ -11,4 +12,5 @@
AC_PROG_CXX
fi
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--- centericq-4.9.7/./kkstrtext-0.1/configure.in~configure
+++ centericq-4.9.7/./kkstrtext-0.1/configure.in
@@ -1,4 +1,5 @@
-AC_INIT(aclocal.m4)
+AC_INIT
+AC_CONFIG_SRCDIR([aclocal.m4])
AM_INIT_AUTOMAKE(kkstrtext, 0.1)
AC_PROG_CC
@@ -14,7 +15,7 @@
AC_CHECK_HEADERS(_G_config.h)
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
#
# iconv const checking
@@ -24,13 +25,11 @@
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_CHECKING([for twisted iconv()])
- AC_TRY_COMPILE([ #include <iconv.h> ], [
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <iconv.h> ]], [[
char *inbuf, *outbuf; iconv_t k; size_t a, b;
iconv(k, &inbuf, &a, &outbuf, &b);
- ],
- iconv_const=no,
- iconv_const=yes
- )
+ ]])],[iconv_const=no],[iconv_const=yes
+ ])
AC_MSG_RESULT($iconv_const)
@@ -39,4 +38,5 @@
fi
fi
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
|
