| blob | eccd27e569bc34d970e464a3ba7e7725bd656b17 |
1 diff -Naur gnujump-1.0.8-orig/aclocal.m4 gnujump-1.0.8/aclocal.m4
2 --- gnujump-1.0.8-orig/aclocal.m4 2017-08-03 00:17:58.979142041 +0200
3 +++ gnujump-1.0.8/aclocal.m4 2017-08-03 00:35:43.323371719 +0200
4 @@ -1,8 +1,7 @@
5 -# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
6 +# generated automatically by aclocal 1.15 -*- Autoconf -*-
7 +
8 +# Copyright (C) 1996-2014 Free Software Foundation, Inc.
10 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
11 -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
12 -# Inc.
13 # This file is free software; the Free Software Foundation
14 # gives unlimited permission to copy and/or distribute it,
15 # with or without modifications, as long as this notice is preserved.
16 @@ -12,27 +11,28 @@
17 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
18 # PARTICULAR PURPOSE.
20 +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
21 m4_ifndef([AC_AUTOCONF_VERSION],
22 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
23 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
24 [m4_warning([this file was generated for autoconf 2.69.
25 You have another version of autoconf. It may work, but is not guaranteed to.
26 If you have problems, you may need to regenerate the build system entirely.
27 -To do so, use the procedure documented by the package, typically `autoreconf'.])])
28 +To do so, use the procedure documented by the package, typically 'autoreconf'.])])
30 -# gettext.m4 serial 63 (gettext-0.18)
31 -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
32 +# gettext.m4 serial 68 (gettext-0.19.8)
33 +dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
34 dnl This file is free software; the Free Software Foundation
35 dnl gives unlimited permission to copy and/or distribute it,
36 dnl with or without modifications, as long as this notice is preserved.
37 dnl
38 -dnl This file can can be used in projects which are not available under
39 +dnl This file can be used in projects which are not available under
40 dnl the GNU General Public License or the GNU Library General Public
41 dnl License but which still want to provide support for the GNU gettext
42 dnl functionality.
43 dnl Please note that the actual code of the GNU gettext library is covered
44 dnl by the GNU Library General Public License, and the rest of the GNU
45 -dnl gettext package package is covered by the GNU General Public License.
46 +dnl gettext package is covered by the GNU General Public License.
47 dnl They are *not* in the public domain.
49 dnl Authors:
50 @@ -57,7 +57,7 @@
51 dnl 'need-formatstring-macros', then GNU gettext implementations that don't
52 dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
53 dnl INTLDIR is used to find the intl libraries. If empty,
54 -dnl the value `$(top_builddir)/intl/' is used.
55 +dnl the value '$(top_builddir)/intl/' is used.
56 dnl
57 dnl The result of the configuration is one of three cases:
58 dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
59 @@ -119,7 +119,7 @@
60 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
61 ])
63 - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
64 + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
65 gt_INTL_MACOSX
67 dnl Set USE_NLS.
68 @@ -179,12 +179,23 @@
69 fi
71 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
72 - [AC_TRY_LINK([#include <libintl.h>
73 -$gt_revision_test_code
74 + [AC_LINK_IFELSE(
75 + [AC_LANG_PROGRAM(
76 + [[
77 +#include <libintl.h>
78 +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
79 extern int _nl_msg_cat_cntr;
80 -extern int *_nl_domain_bindings;],
81 - [bindtextdomain ("", "");
82 -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
83 +extern int *_nl_domain_bindings;
84 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
85 +#else
86 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
87 +#endif
88 +$gt_revision_test_code
89 + ]],
90 + [[
91 +bindtextdomain ("", "");
92 +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
93 + ]])],
94 [eval "$gt_func_gnugettext_libc=yes"],
95 [eval "$gt_func_gnugettext_libc=no"])])
97 @@ -205,35 +216,57 @@
98 gt_save_LIBS="$LIBS"
99 LIBS="$LIBS $LIBINTL"
100 dnl Now see whether libintl exists and does not depend on libiconv.
101 - AC_TRY_LINK([#include <libintl.h>
102 -$gt_revision_test_code
103 + AC_LINK_IFELSE(
104 + [AC_LANG_PROGRAM(
105 + [[
106 +#include <libintl.h>
107 +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
108 extern int _nl_msg_cat_cntr;
109 extern
110 #ifdef __cplusplus
111 "C"
112 #endif
113 -const char *_nl_expand_alias (const char *);],
114 - [bindtextdomain ("", "");
115 -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
116 +const char *_nl_expand_alias (const char *);
117 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
118 +#else
119 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
120 +#endif
121 +$gt_revision_test_code
122 + ]],
123 + [[
124 +bindtextdomain ("", "");
125 +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
126 + ]])],
127 [eval "$gt_func_gnugettext_libintl=yes"],
128 [eval "$gt_func_gnugettext_libintl=no"])
129 dnl Now see whether libintl exists and depends on libiconv.
130 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
131 LIBS="$LIBS $LIBICONV"
132 - AC_TRY_LINK([#include <libintl.h>
133 -$gt_revision_test_code
134 + AC_LINK_IFELSE(
135 + [AC_LANG_PROGRAM(
136 + [[
137 +#include <libintl.h>
138 +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
139 extern int _nl_msg_cat_cntr;
140 extern
141 #ifdef __cplusplus
142 "C"
143 #endif
144 -const char *_nl_expand_alias (const char *);],
145 - [bindtextdomain ("", "");
146 -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
147 - [LIBINTL="$LIBINTL $LIBICONV"
148 - LTLIBINTL="$LTLIBINTL $LTLIBICONV"
149 - eval "$gt_func_gnugettext_libintl=yes"
150 - ])
151 +const char *_nl_expand_alias (const char *);
152 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
153 +#else
154 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
155 +#endif
156 +$gt_revision_test_code
157 + ]],
158 + [[
159 +bindtextdomain ("", "");
160 +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
161 + ]])],
162 + [LIBINTL="$LIBINTL $LIBICONV"
163 + LTLIBINTL="$LTLIBINTL $LTLIBICONV"
164 + eval "$gt_func_gnugettext_libintl=yes"
165 + ])
166 fi
167 CPPFLAGS="$gt_save_CPPFLAGS"
168 LIBS="$gt_save_LIBS"])
169 @@ -404,8 +437,12 @@
170 dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
171 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
173 -# iconv.m4 serial 11 (gettext-0.18.1)
174 -dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
175 +
176 +dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
177 +AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
178 +
179 +# iconv.m4 serial 19 (gettext-0.18.2)
180 +dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
181 dnl This file is free software; the Free Software Foundation
182 dnl gives unlimited permission to copy and/or distribute it,
183 dnl with or without modifications, as long as this notice is preserved.
184 @@ -436,27 +473,35 @@
185 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
186 dnl because if the user has installed libiconv and not disabled its use
187 dnl via --without-libiconv-prefix, he wants to use it. The first
188 - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
189 + dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
190 am_save_CPPFLAGS="$CPPFLAGS"
191 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
193 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
194 am_cv_func_iconv="no, consider installing GNU libiconv"
195 am_cv_lib_iconv=no
196 - AC_TRY_LINK([#include <stdlib.h>
197 -#include <iconv.h>],
198 - [iconv_t cd = iconv_open("","");
199 - iconv(cd,NULL,NULL,NULL,NULL);
200 - iconv_close(cd);],
201 + AC_LINK_IFELSE(
202 + [AC_LANG_PROGRAM(
203 + [[
204 +#include <stdlib.h>
205 +#include <iconv.h>
206 + ]],
207 + [[iconv_t cd = iconv_open("","");
208 + iconv(cd,NULL,NULL,NULL,NULL);
209 + iconv_close(cd);]])],
210 [am_cv_func_iconv=yes])
211 if test "$am_cv_func_iconv" != yes; then
212 am_save_LIBS="$LIBS"
213 LIBS="$LIBS $LIBICONV"
214 - AC_TRY_LINK([#include <stdlib.h>
215 -#include <iconv.h>],
216 - [iconv_t cd = iconv_open("","");
217 - iconv(cd,NULL,NULL,NULL,NULL);
218 - iconv_close(cd);],
219 + AC_LINK_IFELSE(
220 + [AC_LANG_PROGRAM(
221 + [[
222 +#include <stdlib.h>
223 +#include <iconv.h>
224 + ]],
225 + [[iconv_t cd = iconv_open("","");
226 + iconv(cd,NULL,NULL,NULL,NULL);
227 + iconv_close(cd);]])],
228 [am_cv_lib_iconv=yes]
229 [am_cv_func_iconv=yes])
230 LIBS="$am_save_LIBS"
231 @@ -464,33 +509,43 @@
232 ])
233 if test "$am_cv_func_iconv" = yes; then
234 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
235 - dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
236 + dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
237 + dnl Solaris 10.
238 am_save_LIBS="$LIBS"
239 if test $am_cv_lib_iconv = yes; then
240 LIBS="$LIBS $LIBICONV"
241 fi
242 - AC_TRY_RUN([
243 + am_cv_func_iconv_works=no
244 + for ac_iconv_const in '' 'const'; do
245 + AC_RUN_IFELSE(
246 + [AC_LANG_PROGRAM(
247 + [[
248 #include <iconv.h>
249 #include <string.h>
250 -int main ()
251 -{
252 +
253 +#ifndef ICONV_CONST
254 +# define ICONV_CONST $ac_iconv_const
255 +#endif
256 + ]],
257 + [[int result = 0;
258 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
259 returns. */
260 {
261 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
262 if (cd_utf8_to_88591 != (iconv_t)(-1))
263 {
264 - static const char input[] = "\342\202\254"; /* EURO SIGN */
265 + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
266 char buf[10];
267 - const char *inptr = input;
268 + ICONV_CONST char *inptr = input;
269 size_t inbytesleft = strlen (input);
270 char *outptr = buf;
271 size_t outbytesleft = sizeof (buf);
272 size_t res = iconv (cd_utf8_to_88591,
273 - (char **) &inptr, &inbytesleft,
274 + &inptr, &inbytesleft,
275 &outptr, &outbytesleft);
276 if (res == 0)
277 - return 1;
278 + result |= 1;
279 + iconv_close (cd_utf8_to_88591);
280 }
281 }
282 /* Test against Solaris 10 bug: Failures are not distinguishable from
283 @@ -499,17 +554,37 @@
284 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
285 if (cd_ascii_to_88591 != (iconv_t)(-1))
286 {
287 - static const char input[] = "\263";
288 + static ICONV_CONST char input[] = "\263";
289 char buf[10];
290 - const char *inptr = input;
291 + ICONV_CONST char *inptr = input;
292 size_t inbytesleft = strlen (input);
293 char *outptr = buf;
294 size_t outbytesleft = sizeof (buf);
295 size_t res = iconv (cd_ascii_to_88591,
296 - (char **) &inptr, &inbytesleft,
297 + &inptr, &inbytesleft,
298 &outptr, &outbytesleft);
299 if (res == 0)
300 - return 1;
301 + result |= 2;
302 + iconv_close (cd_ascii_to_88591);
303 + }
304 + }
305 + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
306 + {
307 + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
308 + if (cd_88591_to_utf8 != (iconv_t)(-1))
309 + {
310 + static ICONV_CONST char input[] = "\304";
311 + static char buf[2] = { (char)0xDE, (char)0xAD };
312 + ICONV_CONST char *inptr = input;
313 + size_t inbytesleft = 1;
314 + char *outptr = buf;
315 + size_t outbytesleft = 1;
316 + size_t res = iconv (cd_88591_to_utf8,
317 + &inptr, &inbytesleft,
318 + &outptr, &outbytesleft);
319 + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
320 + result |= 4;
321 + iconv_close (cd_88591_to_utf8);
322 }
323 }
324 #if 0 /* This bug could be worked around by the caller. */
325 @@ -518,17 +593,18 @@
326 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
327 if (cd_88591_to_utf8 != (iconv_t)(-1))
328 {
329 - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
330 + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
331 char buf[50];
332 - const char *inptr = input;
333 + ICONV_CONST char *inptr = input;
334 size_t inbytesleft = strlen (input);
335 char *outptr = buf;
336 size_t outbytesleft = sizeof (buf);
337 size_t res = iconv (cd_88591_to_utf8,
338 - (char **) &inptr, &inbytesleft,
339 + &inptr, &inbytesleft,
340 &outptr, &outbytesleft);
341 if ((int)res > 0)
342 - return 1;
343 + result |= 8;
344 + iconv_close (cd_88591_to_utf8);
345 }
346 }
347 #endif
348 @@ -542,13 +618,16 @@
349 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
350 /* Try HP-UX names. */
351 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
352 - return 1;
353 - return 0;
354 -}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
355 - [case "$host_os" in
356 - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
357 - *) am_cv_func_iconv_works="guessing yes" ;;
358 - esac])
359 + result |= 16;
360 + return result;
361 +]])],
362 + [am_cv_func_iconv_works=yes], ,
363 + [case "$host_os" in
364 + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
365 + *) am_cv_func_iconv_works="guessing yes" ;;
366 + esac])
367 + test "$am_cv_func_iconv_works" = no || break
368 + done
369 LIBS="$am_save_LIBS"
370 ])
371 case "$am_cv_func_iconv_works" in
372 @@ -589,80 +668,100 @@
373 m4_version_prereq([2.64],
374 [[AC_DEFUN_ONCE(
375 [$1], [$2])]],
376 - [[AC_DEFUN(
377 - [$1], [$2])]]))
378 + [m4_ifdef([gl_00GNULIB],
379 + [[AC_DEFUN_ONCE(
380 + [$1], [$2])]],
381 + [[AC_DEFUN(
382 + [$1], [$2])]])]))
383 gl_iconv_AC_DEFUN([AM_ICONV],
384 [
385 AM_ICONV_LINK
386 if test "$am_cv_func_iconv" = yes; then
387 AC_MSG_CHECKING([for iconv declaration])
388 AC_CACHE_VAL([am_cv_proto_iconv], [
389 - AC_TRY_COMPILE([
390 + AC_COMPILE_IFELSE(
391 + [AC_LANG_PROGRAM(
392 + [[
393 #include <stdlib.h>
394 #include <iconv.h>
395 extern
396 #ifdef __cplusplus
397 "C"
398 #endif
399 -#if defined(__STDC__) || defined(__cplusplus)
400 +#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
401 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
402 #else
403 size_t iconv();
404 #endif
405 -], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
406 + ]],
407 + [[]])],
408 + [am_cv_proto_iconv_arg1=""],
409 + [am_cv_proto_iconv_arg1="const"])
410 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
411 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
412 AC_MSG_RESULT([
413 $am_cv_proto_iconv])
414 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
415 [Define as const if the declaration of iconv() needs const.])
416 + dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
417 + m4_ifdef([gl_ICONV_H_DEFAULTS],
418 + [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
419 + if test -n "$am_cv_proto_iconv_arg1"; then
420 + ICONV_CONST="const"
421 + fi
422 + ])
423 fi
424 ])
426 -# intlmacosx.m4 serial 3 (gettext-0.18)
427 -dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
428 +# intlmacosx.m4 serial 5 (gettext-0.18.2)
429 +dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
430 dnl This file is free software; the Free Software Foundation
431 dnl gives unlimited permission to copy and/or distribute it,
432 dnl with or without modifications, as long as this notice is preserved.
433 dnl
434 -dnl This file can can be used in projects which are not available under
435 +dnl This file can be used in projects which are not available under
436 dnl the GNU General Public License or the GNU Library General Public
437 dnl License but which still want to provide support for the GNU gettext
438 dnl functionality.
439 dnl Please note that the actual code of the GNU gettext library is covered
440 dnl by the GNU Library General Public License, and the rest of the GNU
441 -dnl gettext package package is covered by the GNU General Public License.
442 +dnl gettext package is covered by the GNU General Public License.
443 dnl They are *not* in the public domain.
445 -dnl Checks for special options needed on MacOS X.
446 +dnl Checks for special options needed on Mac OS X.
447 dnl Defines INTL_MACOSX_LIBS.
448 AC_DEFUN([gt_INTL_MACOSX],
449 [
450 - dnl Check for API introduced in MacOS X 10.2.
451 + dnl Check for API introduced in Mac OS X 10.2.
452 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
453 [gt_cv_func_CFPreferencesCopyAppValue],
454 [gt_save_LIBS="$LIBS"
455 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
456 - AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
457 - [CFPreferencesCopyAppValue(NULL, NULL)],
458 + AC_LINK_IFELSE(
459 + [AC_LANG_PROGRAM(
460 + [[#include <CoreFoundation/CFPreferences.h>]],
461 + [[CFPreferencesCopyAppValue(NULL, NULL)]])],
462 [gt_cv_func_CFPreferencesCopyAppValue=yes],
463 [gt_cv_func_CFPreferencesCopyAppValue=no])
464 LIBS="$gt_save_LIBS"])
465 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
466 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
467 - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
468 + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
469 fi
470 - dnl Check for API introduced in MacOS X 10.3.
471 + dnl Check for API introduced in Mac OS X 10.3.
472 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
473 [gt_save_LIBS="$LIBS"
474 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
475 - AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
476 + AC_LINK_IFELSE(
477 + [AC_LANG_PROGRAM(
478 + [[#include <CoreFoundation/CFLocale.h>]],
479 + [[CFLocaleCopyCurrent();]])],
480 [gt_cv_func_CFLocaleCopyCurrent=yes],
481 [gt_cv_func_CFLocaleCopyCurrent=no])
482 LIBS="$gt_save_LIBS"])
483 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
484 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
485 - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
486 + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
487 fi
488 INTL_MACOSX_LIBS=
489 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
490 @@ -671,53 +770,59 @@
491 AC_SUBST([INTL_MACOSX_LIBS])
492 ])
494 -# lib-ld.m4 serial 4 (gettext-0.18)
495 -dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
496 +# lib-ld.m4 serial 6
497 +dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc.
498 dnl This file is free software; the Free Software Foundation
499 dnl gives unlimited permission to copy and/or distribute it,
500 dnl with or without modifications, as long as this notice is preserved.
502 dnl Subroutines of libtool.m4,
503 -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
504 -dnl with libtool.m4.
505 +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
506 +dnl collision with libtool.m4.
508 -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
509 +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
510 AC_DEFUN([AC_LIB_PROG_LD_GNU],
511 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
512 -[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
513 +[# I'd rather use --version here, but apparently some GNU lds only accept -v.
514 case `$LD -v 2>&1 </dev/null` in
515 *GNU* | *'with BFD'*)
516 - acl_cv_prog_gnu_ld=yes ;;
517 + acl_cv_prog_gnu_ld=yes
518 + ;;
519 *)
520 - acl_cv_prog_gnu_ld=no ;;
521 + acl_cv_prog_gnu_ld=no
522 + ;;
523 esac])
524 with_gnu_ld=$acl_cv_prog_gnu_ld
525 ])
527 -dnl From libtool-1.4. Sets the variable LD.
528 +dnl From libtool-2.4. Sets the variable LD.
529 AC_DEFUN([AC_LIB_PROG_LD],
530 -[AC_ARG_WITH([gnu-ld],
531 -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
532 -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
533 -AC_REQUIRE([AC_PROG_CC])dnl
534 +[AC_REQUIRE([AC_PROG_CC])dnl
535 AC_REQUIRE([AC_CANONICAL_HOST])dnl
536 +
537 +AC_ARG_WITH([gnu-ld],
538 + [AS_HELP_STRING([--with-gnu-ld],
539 + [assume the C compiler uses GNU ld [default=no]])],
540 + [test "$withval" = no || with_gnu_ld=yes],
541 + [with_gnu_ld=no])dnl
542 +
543 # Prepare PATH_SEPARATOR.
544 # The user is always right.
545 if test "${PATH_SEPARATOR+set}" != set; then
546 - echo "#! /bin/sh" >conf$$.sh
547 - echo "exit 0" >>conf$$.sh
548 - chmod +x conf$$.sh
549 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
550 - PATH_SEPARATOR=';'
551 - else
552 - PATH_SEPARATOR=:
553 - fi
554 - rm -f conf$$.sh
555 + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
556 + # contains only /bin. Note that ksh looks also at the FPATH variable,
557 + # so we have to set that as well for the test.
558 + PATH_SEPARATOR=:
559 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
560 + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
561 + || PATH_SEPARATOR=';'
562 + }
563 fi
564 +
565 ac_prog=ld
566 if test "$GCC" = yes; then
567 # Check if gcc -print-prog-name=ld gives a path.
568 - AC_MSG_CHECKING([for ld used by GCC])
569 + AC_MSG_CHECKING([for ld used by $CC])
570 case $host in
571 *-*-mingw*)
572 # gcc leaves a trailing carriage return which upsets mingw
573 @@ -727,11 +832,11 @@
574 esac
575 case $ac_prog in
576 # Accept absolute paths.
577 - [[\\/]* | [A-Za-z]:[\\/]*)]
578 - [re_direlt='/[^/][^/]*/\.\./']
579 - # Canonicalize the path of ld
580 - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
581 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
582 + [[\\/]]* | ?:[[\\/]]*)
583 + re_direlt='/[[^/]][[^/]]*/\.\./'
584 + # Canonicalize the pathname of ld
585 + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
586 + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
587 ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
588 done
589 test -z "$LD" && LD="$ac_prog"
590 @@ -752,23 +857,26 @@
591 fi
592 AC_CACHE_VAL([acl_cv_path_LD],
593 [if test -z "$LD"; then
594 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
595 + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
596 for ac_dir in $PATH; do
597 + IFS="$acl_save_ifs"
598 test -z "$ac_dir" && ac_dir=.
599 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
600 acl_cv_path_LD="$ac_dir/$ac_prog"
601 # Check to see if the program is GNU ld. I'd rather use --version,
602 - # but apparently some GNU ld's only accept -v.
603 + # but apparently some variants of GNU ld only accept -v.
604 # Break only if it was the GNU/non-GNU ld that we prefer.
605 - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
606 + case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
607 *GNU* | *'with BFD'*)
608 - test "$with_gnu_ld" != no && break ;;
609 + test "$with_gnu_ld" != no && break
610 + ;;
611 *)
612 - test "$with_gnu_ld" != yes && break ;;
613 + test "$with_gnu_ld" != yes && break
614 + ;;
615 esac
616 fi
617 done
618 - IFS="$ac_save_ifs"
619 + IFS="$acl_save_ifs"
620 else
621 acl_cv_path_LD="$LD" # Let the user override the test with a path.
622 fi])
623 @@ -782,8 +890,8 @@
624 AC_LIB_PROG_LD_GNU
625 ])
627 -# lib-link.m4 serial 21 (gettext-0.18)
628 -dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
629 +# lib-link.m4 serial 26 (gettext-0.18.2)
630 +dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
631 dnl This file is free software; the Free Software Foundation
632 dnl gives unlimited permission to copy and/or distribute it,
633 dnl with or without modifications, as long as this notice is preserved.
634 @@ -802,9 +910,9 @@
635 [
636 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
637 AC_REQUIRE([AC_LIB_RPATH])
638 - pushdef([Name],[translit([$1],[./-], [___])])
639 - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
640 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
641 + pushdef([Name],[m4_translit([$1],[./+-], [____])])
642 + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
643 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
644 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
645 AC_LIB_LINKFLAGS_BODY([$1], [$2])
646 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
647 @@ -842,9 +950,9 @@
648 [
649 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
650 AC_REQUIRE([AC_LIB_RPATH])
651 - pushdef([Name],[translit([$1],[./-], [___])])
652 - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
653 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
654 + pushdef([Name],[m4_translit([$1],[./+-], [____])])
655 + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
656 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
658 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
659 dnl accordingly.
660 @@ -869,7 +977,8 @@
661 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
662 *) LIBS="$LIB[]NAME $LIBS" ;;
663 esac
664 - AC_TRY_LINK([$3], [$4],
665 + AC_LINK_IFELSE(
666 + [AC_LANG_PROGRAM([[$3]], [[$4]])],
667 [ac_cv_lib[]Name=yes],
668 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
669 LIBS="$ac_save_LIBS"
670 @@ -899,6 +1008,8 @@
671 dnl Determine the platform dependent parameters needed to use rpath:
672 dnl acl_libext,
673 dnl acl_shlibext,
674 +dnl acl_libname_spec,
675 +dnl acl_library_names_spec,
676 dnl acl_hardcode_libdir_flag_spec,
677 dnl acl_hardcode_libdir_separator,
678 dnl acl_hardcode_direct,
679 @@ -941,15 +1052,15 @@
680 dnl macro call that searches for libname.
681 AC_DEFUN([AC_LIB_FROMPACKAGE],
682 [
683 - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
684 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
685 + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
686 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
687 define([acl_frompackage_]NAME, [$2])
688 popdef([NAME])
689 pushdef([PACK],[$2])
690 - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
691 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
692 + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
693 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
694 define([acl_libsinpackage_]PACKUP,
695 - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
696 + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
697 popdef([PACKUP])
698 popdef([PACK])
699 ])
700 @@ -962,14 +1073,14 @@
701 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
702 [
703 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
704 - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
705 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
706 + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
707 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
708 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
709 - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
710 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
711 + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
712 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
713 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
714 dnl Autoconf >= 2.61 supports dots in --with options.
715 - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
716 + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
717 dnl By default, look in $includedir and $libdir.
718 use_additional=yes
719 AC_LIB_WITH_FINAL_PREFIX([
720 @@ -1026,7 +1137,7 @@
721 names_already_handled="$names_already_handled $name"
722 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
723 dnl or AC_LIB_HAVE_LINKFLAGS call.
724 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
725 + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
726 eval value=\"\$HAVE_LIB$uppername\"
727 if test -n "$value"; then
728 if test "$value" = yes; then
729 @@ -1558,7 +1669,7 @@
730 ])
732 # lib-prefix.m4 serial 7 (gettext-0.18)
733 -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
734 +dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
735 dnl This file is free software; the Free Software Foundation
736 dnl gives unlimited permission to copy and/or distribute it,
737 dnl with or without modifications, as long as this notice is preserved.
738 @@ -1783,19 +1894,19 @@
739 ])
741 # nls.m4 serial 5 (gettext-0.18)
742 -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
743 -dnl Inc.
744 +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
745 +dnl Foundation, Inc.
746 dnl This file is free software; the Free Software Foundation
747 dnl gives unlimited permission to copy and/or distribute it,
748 dnl with or without modifications, as long as this notice is preserved.
749 dnl
750 -dnl This file can can be used in projects which are not available under
751 +dnl This file can be used in projects which are not available under
752 dnl the GNU General Public License or the GNU Library General Public
753 dnl License but which still want to provide support for the GNU gettext
754 dnl functionality.
755 dnl Please note that the actual code of the GNU gettext library is covered
756 dnl by the GNU Library General Public License, and the rest of the GNU
757 -dnl gettext package package is covered by the GNU General Public License.
758 +dnl gettext package is covered by the GNU General Public License.
759 dnl They are *not* in the public domain.
761 dnl Authors:
762 @@ -1815,38 +1926,39 @@
763 AC_SUBST([USE_NLS])
764 ])
766 -# po.m4 serial 17 (gettext-0.18)
767 -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
768 +# po.m4 serial 24 (gettext-0.19)
769 +dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
770 dnl This file is free software; the Free Software Foundation
771 dnl gives unlimited permission to copy and/or distribute it,
772 dnl with or without modifications, as long as this notice is preserved.
773 dnl
774 -dnl This file can can be used in projects which are not available under
775 +dnl This file can be used in projects which are not available under
776 dnl the GNU General Public License or the GNU Library General Public
777 dnl License but which still want to provide support for the GNU gettext
778 dnl functionality.
779 dnl Please note that the actual code of the GNU gettext library is covered
780 dnl by the GNU Library General Public License, and the rest of the GNU
781 -dnl gettext package package is covered by the GNU General Public License.
782 +dnl gettext package is covered by the GNU General Public License.
783 dnl They are *not* in the public domain.
785 dnl Authors:
786 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
787 dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
789 -AC_PREREQ([2.50])
790 +AC_PREREQ([2.60])
792 dnl Checks for all prerequisites of the po subdirectory.
793 AC_DEFUN([AM_PO_SUBDIRS],
794 [
795 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
796 AC_REQUIRE([AC_PROG_INSTALL])dnl
797 - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
798 + AC_REQUIRE([AC_PROG_MKDIR_P])dnl
799 + AC_REQUIRE([AC_PROG_SED])dnl
800 AC_REQUIRE([AM_NLS])dnl
802 dnl Release version of the gettext macros. This is used to ensure that
803 dnl the gettext macros and po/Makefile.in.in are in sync.
804 - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
805 + AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
807 dnl Perform the following tests also if --disable-nls has been given,
808 dnl because they are needed for "make dist" to work.
809 @@ -1919,7 +2031,7 @@
810 case "$ac_file" in */Makefile.in)
811 # Adjust a relative srcdir.
812 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
813 - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
814 + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
815 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
816 # In autoconf-2.13 it is called $ac_given_srcdir.
817 # In autoconf-2.50 it is called $srcdir.
818 @@ -1935,7 +2047,8 @@
819 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
820 rm -f "$ac_dir/POTFILES"
821 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
822 - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
823 + gt_tab=`printf '\t'`
824 + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
825 POMAKEFILEDEPS="POTFILES.in"
826 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
827 # on $ac_dir but don't depend on user-specified configuration
828 @@ -1946,12 +2059,12 @@
829 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
830 fi
831 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
832 - # Hide the ALL_LINGUAS assigment from automake < 1.5.
833 + # Hide the ALL_LINGUAS assignment from automake < 1.5.
834 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
835 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
836 else
837 # The set of available languages was given in configure.in.
838 - # Hide the ALL_LINGUAS assigment from automake < 1.5.
839 + # Hide the ALL_LINGUAS assignment from automake < 1.5.
840 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
841 fi
842 # Compute POFILES
843 @@ -2043,7 +2156,7 @@
844 changequote(,)dnl
845 # Adjust a relative srcdir.
846 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
847 - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
848 + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
849 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
850 # In autoconf-2.13 it is called $ac_given_srcdir.
851 # In autoconf-2.50 it is called $srcdir.
852 @@ -2071,6 +2184,7 @@
853 fi
855 # A sed script that extracts the value of VARIABLE from a Makefile.
856 + tab=`printf '\t'`
857 sed_x_variable='
858 # Test if the hold space is empty.
859 x
860 @@ -2078,9 +2192,9 @@
861 x
862 ta
863 # Yes it was empty. Look if we have the expected variable definition.
864 -/^[ ]*VARIABLE[ ]*=/{
865 +/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
866 # Seen the first line of the variable definition.
867 - s/^[ ]*VARIABLE[ ]*=//
868 + s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
869 ba
870 }
871 bd
872 @@ -2132,7 +2246,7 @@
873 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
874 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
875 fi
876 - # Hide the ALL_LINGUAS assigment from automake < 1.5.
877 + # Hide the ALL_LINGUAS assignment from automake < 1.5.
878 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
879 # Compute POFILES
880 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
881 @@ -2222,14 +2336,15 @@
882 fi
884 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
885 + tab=`printf '\t'`
886 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
887 # Add dependencies that cannot be formulated as a simple suffix rule.
888 for lang in $ALL_LINGUAS; do
889 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
890 cat >> "$ac_file.tmp" <<EOF
891 $frobbedlang.msg: $lang.po
892 - @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
893 - \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
894 +${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
895 +${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
896 EOF
897 done
898 fi
899 @@ -2239,8 +2354,8 @@
900 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
901 cat >> "$ac_file.tmp" <<EOF
902 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
903 - @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
904 - \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
905 +${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
906 +${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
907 EOF
908 done
909 fi
910 @@ -2265,19 +2380,19 @@
911 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
912 ])
914 -# progtest.m4 serial 6 (gettext-0.18)
915 -dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
916 +# progtest.m4 serial 7 (gettext-0.18.2)
917 +dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
918 dnl This file is free software; the Free Software Foundation
919 dnl gives unlimited permission to copy and/or distribute it,
920 dnl with or without modifications, as long as this notice is preserved.
921 dnl
922 -dnl This file can can be used in projects which are not available under
923 +dnl This file can be used in projects which are not available under
924 dnl the GNU General Public License or the GNU Library General Public
925 dnl License but which still want to provide support for the GNU gettext
926 dnl functionality.
927 dnl Please note that the actual code of the GNU gettext library is covered
928 dnl by the GNU Library General Public License, and the rest of the GNU
929 -dnl gettext package package is covered by the GNU General Public License.
930 +dnl gettext package is covered by the GNU General Public License.
931 dnl They are *not* in the public domain.
933 dnl Authors:
934 @@ -2294,15 +2409,14 @@
935 # Prepare PATH_SEPARATOR.
936 # The user is always right.
937 if test "${PATH_SEPARATOR+set}" != set; then
938 - echo "#! /bin/sh" >conf$$.sh
939 - echo "exit 0" >>conf$$.sh
940 - chmod +x conf$$.sh
941 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
942 - PATH_SEPARATOR=';'
943 - else
944 - PATH_SEPARATOR=:
945 - fi
946 - rm -f conf$$.sh
947 + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
948 + # contains only /bin. Note that ksh looks also at the FPATH variable,
949 + # so we have to set that as well for the test.
950 + PATH_SEPARATOR=:
951 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
952 + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
953 + || PATH_SEPARATOR=';'
954 + }
955 fi
957 # Find out how to test for executable files. Don't use a zero-byte file,
958 @@ -2544,25 +2658,22 @@
959 rm -f conf.sdltest
960 ])
962 -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
963 -# Foundation, Inc.
964 +# Copyright (C) 2002-2014 Free Software Foundation, Inc.
965 #
966 # This file is free software; the Free Software Foundation
967 # gives unlimited permission to copy and/or distribute it,
968 # with or without modifications, as long as this notice is preserved.
970 -# serial 1
971 -
972 # AM_AUTOMAKE_VERSION(VERSION)
973 # ----------------------------
974 # Automake X.Y traces this macro to ensure aclocal.m4 has been
975 # generated from the m4 files accompanying Automake X.Y.
976 # (This private macro should not be called outside this file.)
977 AC_DEFUN([AM_AUTOMAKE_VERSION],
978 -[am__api_version='1.11'
979 +[am__api_version='1.15'
980 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
981 dnl require some minimum version. Point them to the right macro.
982 -m4_if([$1], [1.11.6], [],
983 +m4_if([$1], [1.15], [],
984 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
985 ])
987 @@ -2578,24 +2689,22 @@
988 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
989 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
990 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
991 -[AM_AUTOMAKE_VERSION([1.11.6])dnl
992 +[AM_AUTOMAKE_VERSION([1.15])dnl
993 m4_ifndef([AC_AUTOCONF_VERSION],
994 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
995 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
997 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
999 -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1000 +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1001 #
1002 # This file is free software; the Free Software Foundation
1003 # gives unlimited permission to copy and/or distribute it,
1004 # with or without modifications, as long as this notice is preserved.
1006 -# serial 1
1007 -
1008 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
1009 -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
1010 -# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
1011 +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
1012 +# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
1013 #
1014 # Of course, Automake must honor this variable whenever it calls a
1015 # tool from the auxiliary directory. The problem is that $srcdir (and
1016 @@ -2614,7 +2723,7 @@
1017 #
1018 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
1019 # are both prefixed by $srcdir. In an in-source build this is usually
1020 -# harmless because $srcdir is `.', but things will broke when you
1021 +# harmless because $srcdir is '.', but things will broke when you
1022 # start a VPATH build or use an absolute $srcdir.
1023 #
1024 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
1025 @@ -2632,30 +2741,26 @@
1026 # configured tree to be moved without reconfiguration.
1028 AC_DEFUN([AM_AUX_DIR_EXPAND],
1029 -[dnl Rely on autoconf to set up CDPATH properly.
1030 -AC_PREREQ([2.50])dnl
1031 -# expand $ac_aux_dir to an absolute path
1032 -am_aux_dir=`cd $ac_aux_dir && pwd`
1033 +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1034 +# Expand $ac_aux_dir to an absolute path.
1035 +am_aux_dir=`cd "$ac_aux_dir" && pwd`
1036 ])
1038 # AM_CONDITIONAL -*- Autoconf -*-
1040 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
1041 -# Free Software Foundation, Inc.
1042 +# Copyright (C) 1997-2014 Free Software Foundation, Inc.
1043 #
1044 # This file is free software; the Free Software Foundation
1045 # gives unlimited permission to copy and/or distribute it,
1046 # with or without modifications, as long as this notice is preserved.
1048 -# serial 9
1049 -
1050 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
1051 # -------------------------------------
1052 # Define a conditional.
1053 AC_DEFUN([AM_CONDITIONAL],
1054 -[AC_PREREQ(2.52)dnl
1055 - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1056 - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
1057 +[AC_PREREQ([2.52])dnl
1058 + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1059 + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
1060 AC_SUBST([$1_TRUE])dnl
1061 AC_SUBST([$1_FALSE])dnl
1062 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
1063 @@ -2674,16 +2779,14 @@
1064 Usually this means the macro was only invoked conditionally.]])
1065 fi])])
1067 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
1068 -# 2010, 2011 Free Software Foundation, Inc.
1069 +# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1070 #
1071 # This file is free software; the Free Software Foundation
1072 # gives unlimited permission to copy and/or distribute it,
1073 # with or without modifications, as long as this notice is preserved.
1075 -# serial 12
1077 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
1078 +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
1079 # written in clear, in which case automake, when reading aclocal.m4,
1080 # will think it sees a *use*, and therefore will trigger all it's
1081 # C support machinery. Also note that it means that autoscan, seeing
1082 @@ -2693,7 +2796,7 @@
1083 # _AM_DEPENDENCIES(NAME)
1084 # ----------------------
1085 # See how the compiler implements dependency checking.
1086 -# NAME is "CC", "CXX", "GCJ", or "OBJC".
1087 +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
1088 # We try a few techniques and use that to set a single cache variable.
1089 #
1090 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
1091 @@ -2706,12 +2809,13 @@
1092 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
1093 AC_REQUIRE([AM_DEP_TRACK])dnl
1095 -ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
1096 - [$1], CXX, [depcc="$CXX" am_compiler_list=],
1097 - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
1098 - [$1], UPC, [depcc="$UPC" am_compiler_list=],
1099 - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1100 - [depcc="$$1" am_compiler_list=])
1101 +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
1102 + [$1], [CXX], [depcc="$CXX" am_compiler_list=],
1103 + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
1104 + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
1105 + [$1], [UPC], [depcc="$UPC" am_compiler_list=],
1106 + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1107 + [depcc="$$1" am_compiler_list=])
1109 AC_CACHE_CHECK([dependency style of $depcc],
1110 [am_cv_$1_dependencies_compiler_type],
1111 @@ -2719,8 +2823,8 @@
1112 # We make a subdir and do the tests there. Otherwise we can end up
1113 # making bogus files that we don't know about and never remove. For
1114 # instance it was reported that on HP-UX the gcc test will end up
1115 - # making a dummy file named `D' -- because `-MD' means `put the output
1116 - # in D'.
1117 + # making a dummy file named 'D' -- because '-MD' means "put the output
1118 + # in D".
1119 rm -rf conftest.dir
1120 mkdir conftest.dir
1121 # Copy depcomp to subdir because otherwise we won't find it if we're
1122 @@ -2760,16 +2864,16 @@
1123 : > sub/conftest.c
1124 for i in 1 2 3 4 5 6; do
1125 echo '#include "conftst'$i'.h"' >> sub/conftest.c
1126 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
1127 - # Solaris 8's {/usr,}/bin/sh.
1128 - touch sub/conftst$i.h
1129 + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
1130 + # Solaris 10 /bin/sh.
1131 + echo '/* dummy */' > sub/conftst$i.h
1132 done
1133 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1135 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
1136 + # We check with '-c' and '-o' for the sake of the "dashmstdout"
1137 # mode. It turns out that the SunPro C++ compiler does not properly
1138 - # handle `-M -o', and we need to detect this. Also, some Intel
1139 - # versions had trouble with output in subdirs
1140 + # handle '-M -o', and we need to detect this. Also, some Intel
1141 + # versions had trouble with output in subdirs.
1142 am__obj=sub/conftest.${OBJEXT-o}
1143 am__minus_obj="-o $am__obj"
1144 case $depmode in
1145 @@ -2778,8 +2882,8 @@
1146 test "$am__universal" = false || continue
1147 ;;
1148 nosideeffect)
1149 - # after this tag, mechanisms are not by side-effect, so they'll
1150 - # only be used when explicitly requested
1151 + # After this tag, mechanisms are not by side-effect, so they'll
1152 + # only be used when explicitly requested.
1153 if test "x$enable_dependency_tracking" = xyes; then
1154 continue
1155 else
1156 @@ -2787,7 +2891,7 @@
1157 fi
1158 ;;
1159 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1160 - # This compiler won't grok `-c -o', but also, the minuso test has
1161 + # This compiler won't grok '-c -o', but also, the minuso test has
1162 # not run yet. These depmodes are late enough in the game, and
1163 # so weak that their functioning should not be impacted.
1164 am__obj=conftest.${OBJEXT-o}
1165 @@ -2835,7 +2939,7 @@
1166 # AM_SET_DEPDIR
1167 # -------------
1168 # Choose a directory name for dependency files.
1169 -# This macro is AC_REQUIREd in _AM_DEPENDENCIES
1170 +# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
1171 AC_DEFUN([AM_SET_DEPDIR],
1172 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
1173 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
1174 @@ -2845,9 +2949,13 @@
1175 # AM_DEP_TRACK
1176 # ------------
1177 AC_DEFUN([AM_DEP_TRACK],
1178 -[AC_ARG_ENABLE(dependency-tracking,
1179 -[ --disable-dependency-tracking speeds up one-time build
1180 - --enable-dependency-tracking do not reject slow dependency extractors])
1181 +[AC_ARG_ENABLE([dependency-tracking], [dnl
1182 +AS_HELP_STRING(
1183 + [--enable-dependency-tracking],
1184 + [do not reject slow dependency extractors])
1185 +AS_HELP_STRING(
1186 + [--disable-dependency-tracking],
1187 + [speeds up one-time build])])
1188 if test "x$enable_dependency_tracking" != xno; then
1189 am_depcomp="$ac_aux_dir/depcomp"
1190 AMDEPBACKSLASH='\'
1191 @@ -2862,20 +2970,18 @@
1193 # Generate code to set up dependency tracking. -*- Autoconf -*-
1195 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
1196 -# Free Software Foundation, Inc.
1197 +# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1198 #
1199 # This file is free software; the Free Software Foundation
1200 # gives unlimited permission to copy and/or distribute it,
1201 # with or without modifications, as long as this notice is preserved.
1203 -#serial 5
1205 # _AM_OUTPUT_DEPENDENCY_COMMANDS
1206 # ------------------------------
1207 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
1208 [{
1209 - # Autoconf 2.62 quotes --file arguments for eval, but not when files
1210 + # Older Autoconf quotes --file arguments for eval, but not when files
1211 # are listed without --file. Let's play safe and only enable the eval
1212 # if we detect the quoting.
1213 case $CONFIG_FILES in
1214 @@ -2888,7 +2994,7 @@
1215 # Strip MF so we end up with the name of the file.
1216 mf=`echo "$mf" | sed -e 's/:.*$//'`
1217 # Check whether this is an Automake generated Makefile or not.
1218 - # We used to match only the files named `Makefile.in', but
1219 + # We used to match only the files named 'Makefile.in', but
1220 # some people rename them; so instead we look at the file content.
1221 # Grep'ing the first line is not enough: some people post-process
1222 # each Makefile.in and add a new line on top of each file to say so.
1223 @@ -2900,21 +3006,19 @@
1224 continue
1225 fi
1226 # Extract the definition of DEPDIR, am__include, and am__quote
1227 - # from the Makefile without running `make'.
1228 + # from the Makefile without running 'make'.
1229 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
1230 test -z "$DEPDIR" && continue
1231 am__include=`sed -n 's/^am__include = //p' < "$mf"`
1232 - test -z "am__include" && continue
1233 + test -z "$am__include" && continue
1234 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
1235 - # When using ansi2knr, U may be empty or an underscore; expand it
1236 - U=`sed -n 's/^U = //p' < "$mf"`
1237 # Find all dependency output files, they are included files with
1238 # $(DEPDIR) in their names. We invoke sed twice because it is the
1239 # simplest approach to changing $(DEPDIR) to its actual value in the
1240 # expansion.
1241 for file in `sed -n "
1242 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
1243 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
1244 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
1245 # Make sure the directory exists.
1246 test -f "$dirpart/$file" && continue
1247 fdir=`AS_DIRNAME(["$file"])`
1248 @@ -2932,7 +3036,7 @@
1249 # This macro should only be invoked once -- use via AC_REQUIRE.
1250 #
1251 # This code is only required when automatic dependency tracking
1252 -# is enabled. FIXME. This creates each `.P' file that we will
1253 +# is enabled. FIXME. This creates each '.P' file that we will
1254 # need in order to bootstrap the dependency handling code.
1255 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1256 [AC_CONFIG_COMMANDS([depfiles],
1257 @@ -2940,32 +3044,23 @@
1258 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1259 ])
1261 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1262 -# Free Software Foundation, Inc.
1263 -#
1264 -# This file is free software; the Free Software Foundation
1265 -# gives unlimited permission to copy and/or distribute it,
1266 -# with or without modifications, as long as this notice is preserved.
1267 -
1268 -# serial 8
1269 -
1270 -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
1271 -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
1272 -
1273 # Do all the work for Automake. -*- Autoconf -*-
1275 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1276 -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
1277 +# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1278 #
1279 # This file is free software; the Free Software Foundation
1280 # gives unlimited permission to copy and/or distribute it,
1281 # with or without modifications, as long as this notice is preserved.
1283 -# serial 16
1284 -
1285 # This macro actually does too much. Some checks are only needed if
1286 # your package does certain things. But this isn't really a big deal.
1288 +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
1289 +m4_define([AC_PROG_CC],
1290 +m4_defn([AC_PROG_CC])
1291 +[_AM_PROG_CC_C_O
1292 +])
1293 +
1294 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
1295 # AM_INIT_AUTOMAKE([OPTIONS])
1296 # -----------------------------------------------
1297 @@ -2978,7 +3073,7 @@
1298 # arguments mandatory, and then we can depend on a new Autoconf
1299 # release and drop the old call support.
1300 AC_DEFUN([AM_INIT_AUTOMAKE],
1301 -[AC_PREREQ([2.62])dnl
1302 +[AC_PREREQ([2.65])dnl
1303 dnl Autoconf wants to disallow AM_ names. We explicitly allow
1304 dnl the ones we care about.
1305 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
1306 @@ -3007,33 +3102,42 @@
1307 # Define the identity of the package.
1308 dnl Distinguish between old-style and new-style calls.
1309 m4_ifval([$2],
1310 -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1311 +[AC_DIAGNOSE([obsolete],
1312 + [$0: two- and three-arguments forms are deprecated.])
1313 +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1314 AC_SUBST([PACKAGE], [$1])dnl
1315 AC_SUBST([VERSION], [$2])],
1316 [_AM_SET_OPTIONS([$1])dnl
1317 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
1318 -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
1319 +m4_if(
1320 + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
1321 + [ok:ok],,
1322 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
1323 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
1324 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
1326 _AM_IF_OPTION([no-define],,
1327 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
1328 - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
1329 +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
1330 + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
1332 # Some tools Automake needs.
1333 AC_REQUIRE([AM_SANITY_CHECK])dnl
1334 AC_REQUIRE([AC_ARG_PROGRAM])dnl
1335 -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
1336 -AM_MISSING_PROG(AUTOCONF, autoconf)
1337 -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
1338 -AM_MISSING_PROG(AUTOHEADER, autoheader)
1339 -AM_MISSING_PROG(MAKEINFO, makeinfo)
1340 +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
1341 +AM_MISSING_PROG([AUTOCONF], [autoconf])
1342 +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
1343 +AM_MISSING_PROG([AUTOHEADER], [autoheader])
1344 +AM_MISSING_PROG([MAKEINFO], [makeinfo])
1345 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1346 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
1347 -AC_REQUIRE([AM_PROG_MKDIR_P])dnl
1348 -# We need awk for the "check" target. The system "awk" is bad on
1349 -# some platforms.
1350 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1351 +# For better backward compatibility. To be removed once Automake 1.9.x
1352 +# dies out for good. For more background, see:
1353 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
1354 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
1355 +AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
1356 +# We need awk for the "check" target (and possibly the TAP driver). The
1357 +# system "awk" is bad on some platforms.
1358 AC_REQUIRE([AC_PROG_AWK])dnl
1359 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1360 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
1361 @@ -3042,34 +3146,82 @@
1362 [_AM_PROG_TAR([v7])])])
1363 _AM_IF_OPTION([no-dependencies],,
1364 [AC_PROVIDE_IFELSE([AC_PROG_CC],
1365 - [_AM_DEPENDENCIES(CC)],
1366 - [define([AC_PROG_CC],
1367 - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
1368 + [_AM_DEPENDENCIES([CC])],
1369 + [m4_define([AC_PROG_CC],
1370 + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
1371 AC_PROVIDE_IFELSE([AC_PROG_CXX],
1372 - [_AM_DEPENDENCIES(CXX)],
1373 - [define([AC_PROG_CXX],
1374 - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
1375 + [_AM_DEPENDENCIES([CXX])],
1376 + [m4_define([AC_PROG_CXX],
1377 + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
1378 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
1379 - [_AM_DEPENDENCIES(OBJC)],
1380 - [define([AC_PROG_OBJC],
1381 - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
1382 -])
1383 -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
1384 -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
1385 -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
1386 -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
1387 + [_AM_DEPENDENCIES([OBJC])],
1388 + [m4_define([AC_PROG_OBJC],
1389 + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
1390 +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
1391 + [_AM_DEPENDENCIES([OBJCXX])],
1392 + [m4_define([AC_PROG_OBJCXX],
1393 + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
1394 +])
1395 +AC_REQUIRE([AM_SILENT_RULES])dnl
1396 +dnl The testsuite driver may need to know about EXEEXT, so add the
1397 +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
1398 +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
1399 AC_CONFIG_COMMANDS_PRE(dnl
1400 [m4_provide_if([_AM_COMPILER_EXEEXT],
1401 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
1402 +
1403 +# POSIX will say in a future version that running "rm -f" with no argument
1404 +# is OK; and we want to be able to make that assumption in our Makefile
1405 +# recipes. So use an aggressive probe to check that the usage we want is
1406 +# actually supported "in the wild" to an acceptable degree.
1407 +# See automake bug#10828.
1408 +# To make any issue more visible, cause the running configure to be aborted
1409 +# by default if the 'rm' program in use doesn't match our expectations; the
1410 +# user can still override this though.
1411 +if rm -f && rm -fr && rm -rf; then : OK; else
1412 + cat >&2 <<'END'
1413 +Oops!
1414 +
1415 +Your 'rm' program seems unable to run without file operands specified
1416 +on the command line, even when the '-f' option is present. This is contrary
1417 +to the behaviour of most rm programs out there, and not conforming with
1418 +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
1419 +
1420 +Please tell bug-automake@gnu.org about your system, including the value
1421 +of your $PATH and any error possibly output before this message. This
1422 +can help us improve future automake versions.
1423 +
1424 +END
1425 + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
1426 + echo 'Configuration will proceed anyway, since you have set the' >&2
1427 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
1428 + echo >&2
1429 + else
1430 + cat >&2 <<'END'
1431 +Aborting the configuration process, to ensure you take notice of the issue.
1432 +
1433 +You can download and install GNU coreutils to get an 'rm' implementation
1434 +that behaves properly: <http://www.gnu.org/software/coreutils/>.
1435 +
1436 +If you want to complete the configuration process using your problematic
1437 +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
1438 +to "yes", and re-run configure.
1439 +
1440 +END
1441 + AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
1442 + fi
1443 +fi
1444 +dnl The trailing newline in this macro's definition is deliberate, for
1445 +dnl backward compatibility and to allow trailing 'dnl'-style comments
1446 +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
1447 ])
1449 -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1450 +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1451 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1452 dnl mangled by Autoconf and run in a shell conditional statement.
1453 m4_define([_AC_COMPILER_EXEEXT],
1454 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
1456 -
1457 # When config.status generates a header, we must update the stamp-h file.
1458 # This file resides in the same directory as the config header
1459 # that is generated. The stamp files are numbered to have different names.
1460 @@ -3091,21 +3243,18 @@
1461 done
1462 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1464 -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
1465 -# Inc.
1466 +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1467 #
1468 # This file is free software; the Free Software Foundation
1469 # gives unlimited permission to copy and/or distribute it,
1470 # with or without modifications, as long as this notice is preserved.
1472 -# serial 1
1473 -
1474 # AM_PROG_INSTALL_SH
1475 # ------------------
1476 # Define $install_sh.
1477 AC_DEFUN([AM_PROG_INSTALL_SH],
1478 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1479 -if test x"${install_sh}" != xset; then
1480 +if test x"${install_sh+set}" != xset; then
1481 case $am_aux_dir in
1482 *\ * | *\ *)
1483 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
1484 @@ -3113,16 +3262,14 @@
1485 install_sh="\${SHELL} $am_aux_dir/install-sh"
1486 esac
1487 fi
1488 -AC_SUBST(install_sh)])
1489 +AC_SUBST([install_sh])])
1491 -# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
1492 +# Copyright (C) 2003-2014 Free Software Foundation, Inc.
1493 #
1494 # This file is free software; the Free Software Foundation
1495 # gives unlimited permission to copy and/or distribute it,
1496 # with or without modifications, as long as this notice is preserved.
1498 -# serial 2
1499 -
1500 # Check whether the underlying file-system supports filenames
1501 # with a leading dot. For instance MS-DOS doesn't.
1502 AC_DEFUN([AM_SET_LEADING_DOT],
1503 @@ -3138,14 +3285,12 @@
1505 # Check to see how 'make' treats includes. -*- Autoconf -*-
1507 -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
1508 +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1509 #
1510 # This file is free software; the Free Software Foundation
1511 # gives unlimited permission to copy and/or distribute it,
1512 # with or without modifications, as long as this notice is preserved.
1514 -# serial 4
1515 -
1516 # AM_MAKE_INCLUDE()
1517 # -----------------
1518 # Check to see how make treats includes.
1519 @@ -3163,7 +3308,7 @@
1520 _am_result=none
1521 # First try GNU make style include.
1522 echo "include confinc" > confmf
1523 -# Ignore all kinds of additional output from `make'.
1524 +# Ignore all kinds of additional output from 'make'.
1525 case `$am_make -s -f confmf 2> /dev/null` in #(
1526 *the\ am__doit\ target*)
1527 am__include=include
1528 @@ -3190,15 +3335,12 @@
1530 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1532 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
1533 -# Free Software Foundation, Inc.
1534 +# Copyright (C) 1997-2014 Free Software Foundation, Inc.
1535 #
1536 # This file is free software; the Free Software Foundation
1537 # gives unlimited permission to copy and/or distribute it,
1538 # with or without modifications, as long as this notice is preserved.
1540 -# serial 6
1541 -
1542 # AM_MISSING_PROG(NAME, PROGRAM)
1543 # ------------------------------
1544 AC_DEFUN([AM_MISSING_PROG],
1545 @@ -3206,11 +3348,10 @@
1546 $1=${$1-"${am_missing_run}$2"}
1547 AC_SUBST($1)])
1549 -
1550 # AM_MISSING_HAS_RUN
1551 # ------------------
1552 -# Define MISSING if not defined so far and test if it supports --run.
1553 -# If it does, set am_missing_run to use it, otherwise, to nothing.
1554 +# Define MISSING if not defined so far and test if it is modern enough.
1555 +# If it is, set am_missing_run to use it, otherwise, to nothing.
1556 AC_DEFUN([AM_MISSING_HAS_RUN],
1557 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1558 AC_REQUIRE_AUX_FILE([missing])dnl
1559 @@ -3223,54 +3364,51 @@
1560 esac
1561 fi
1562 # Use eval to expand $SHELL
1563 -if eval "$MISSING --run true"; then
1564 - am_missing_run="$MISSING --run "
1565 +if eval "$MISSING --is-lightweight"; then
1566 + am_missing_run="$MISSING "
1567 else
1568 am_missing_run=
1569 - AC_MSG_WARN([`missing' script is too old or missing])
1570 + AC_MSG_WARN(['missing' script is too old or missing])
1571 fi
1572 ])
1574 -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
1575 -# Inc.
1576 +# -*- Autoconf -*-
1577 +# Obsolete and "removed" macros, that must however still report explicit
1578 +# error messages when used, to smooth transition.
1579 +#
1580 +# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1581 #
1582 # This file is free software; the Free Software Foundation
1583 # gives unlimited permission to copy and/or distribute it,
1584 # with or without modifications, as long as this notice is preserved.
1586 -# serial 1
1587 -
1588 -# AM_PROG_MKDIR_P
1589 -# ---------------
1590 -# Check for `mkdir -p'.
1591 -AC_DEFUN([AM_PROG_MKDIR_P],
1592 -[AC_PREREQ([2.60])dnl
1593 -AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1594 -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
1595 -dnl while keeping a definition of mkdir_p for backward compatibility.
1596 -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
1597 -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
1598 -dnl Makefile.ins that do not define MKDIR_P, so we do our own
1599 -dnl adjustment using top_builddir (which is defined more often than
1600 -dnl MKDIR_P).
1601 -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
1602 -case $mkdir_p in
1603 - [[\\/$]]* | ?:[[\\/]]*) ;;
1604 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
1605 -esac
1606 -])
1607 +AC_DEFUN([AM_CONFIG_HEADER],
1608 +[AC_DIAGNOSE([obsolete],
1609 +['$0': this macro is obsolete.
1610 +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
1611 +AC_CONFIG_HEADERS($@)])
1612 +
1613 +AC_DEFUN([AM_PROG_CC_STDC],
1614 +[AC_PROG_CC
1615 +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
1616 +AC_DIAGNOSE([obsolete],
1617 +['$0': this macro is obsolete.
1618 +You should simply use the 'AC][_PROG_CC' macro instead.
1619 +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
1620 +but upon 'ac_cv_prog_cc_stdc'.])])
1621 +
1622 +AC_DEFUN([AM_C_PROTOTYPES],
1623 + [AC_FATAL([automatic de-ANSI-fication support has been removed])])
1624 +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
1626 # Helper functions for option handling. -*- Autoconf -*-
1628 -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
1629 -# Foundation, Inc.
1630 +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1631 #
1632 # This file is free software; the Free Software Foundation
1633 # gives unlimited permission to copy and/or distribute it,
1634 # with or without modifications, as long as this notice is preserved.
1636 -# serial 5
1637 -
1638 # _AM_MANGLE_OPTION(NAME)
1639 # -----------------------
1640 AC_DEFUN([_AM_MANGLE_OPTION],
1641 @@ -3280,7 +3418,7 @@
1642 # --------------------
1643 # Set option NAME. Presently that only means defining a flag for this option.
1644 AC_DEFUN([_AM_SET_OPTION],
1645 -[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1646 +[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
1648 # _AM_SET_OPTIONS(OPTIONS)
1649 # ------------------------
1650 @@ -3294,24 +3432,82 @@
1651 AC_DEFUN([_AM_IF_OPTION],
1652 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1654 -# Check to make sure that the build environment is sane. -*- Autoconf -*-
1655 +# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1656 +#
1657 +# This file is free software; the Free Software Foundation
1658 +# gives unlimited permission to copy and/or distribute it,
1659 +# with or without modifications, as long as this notice is preserved.
1660 +
1661 +# _AM_PROG_CC_C_O
1662 +# ---------------
1663 +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
1664 +# to automatically call this.
1665 +AC_DEFUN([_AM_PROG_CC_C_O],
1666 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1667 +AC_REQUIRE_AUX_FILE([compile])dnl
1668 +AC_LANG_PUSH([C])dnl
1669 +AC_CACHE_CHECK(
1670 + [whether $CC understands -c and -o together],
1671 + [am_cv_prog_cc_c_o],
1672 + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
1673 + # Make sure it works both with $CC and with simple cc.
1674 + # Following AC_PROG_CC_C_O, we do the test twice because some
1675 + # compilers refuse to overwrite an existing .o file with -o,
1676 + # though they will create one.
1677 + am_cv_prog_cc_c_o=yes
1678 + for am_i in 1 2; do
1679 + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
1680 + && test -f conftest2.$ac_objext; then
1681 + : OK
1682 + else
1683 + am_cv_prog_cc_c_o=no
1684 + break
1685 + fi
1686 + done
1687 + rm -f core conftest*
1688 + unset am_i])
1689 +if test "$am_cv_prog_cc_c_o" != yes; then
1690 + # Losing compiler, so override with the script.
1691 + # FIXME: It is wrong to rewrite CC.
1692 + # But if we don't then we get into trouble of one sort or another.
1693 + # A longer-term fix would be to have automake use am__CC in this case,
1694 + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1695 + CC="$am_aux_dir/compile $CC"
1696 +fi
1697 +AC_LANG_POP([C])])
1699 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
1700 -# Free Software Foundation, Inc.
1701 +# For backward compatibility.
1702 +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
1703 +
1704 +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1705 #
1706 # This file is free software; the Free Software Foundation
1707 # gives unlimited permission to copy and/or distribute it,
1708 # with or without modifications, as long as this notice is preserved.
1710 -# serial 5
1711 +# AM_RUN_LOG(COMMAND)
1712 +# -------------------
1713 +# Run COMMAND, save the exit status in ac_status, and log it.
1714 +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
1715 +AC_DEFUN([AM_RUN_LOG],
1716 +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
1717 + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
1718 + ac_status=$?
1719 + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1720 + (exit $ac_status); }])
1721 +
1722 +# Check to make sure that the build environment is sane. -*- Autoconf -*-
1723 +
1724 +# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1725 +#
1726 +# This file is free software; the Free Software Foundation
1727 +# gives unlimited permission to copy and/or distribute it,
1728 +# with or without modifications, as long as this notice is preserved.
1730 # AM_SANITY_CHECK
1731 # ---------------
1732 AC_DEFUN([AM_SANITY_CHECK],
1733 [AC_MSG_CHECKING([whether build environment is sane])
1734 -# Just in case
1735 -sleep 1
1736 -echo timestamp > conftest.file
1737 # Reject unsafe characters in $srcdir or the absolute working directory
1738 # name. Accept space and tab only in the latter.
1739 am_lf='
1740 @@ -3322,32 +3518,40 @@
1741 esac
1742 case $srcdir in
1743 *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
1744 - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
1745 + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
1746 esac
1748 -# Do `set' in a subshell so we don't clobber the current shell's
1749 +# Do 'set' in a subshell so we don't clobber the current shell's
1750 # arguments. Must try -L first in case configure is actually a
1751 # symlink; some systems play weird games with the mod time of symlinks
1752 # (eg FreeBSD returns the mod time of the symlink's containing
1753 # directory).
1754 if (
1755 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1756 - if test "$[*]" = "X"; then
1757 - # -L didn't work.
1758 - set X `ls -t "$srcdir/configure" conftest.file`
1759 - fi
1760 - rm -f conftest.file
1761 - if test "$[*]" != "X $srcdir/configure conftest.file" \
1762 - && test "$[*]" != "X conftest.file $srcdir/configure"; then
1763 -
1764 - # If neither matched, then we have a broken ls. This can happen
1765 - # if, for instance, CONFIG_SHELL is bash and it inherits a
1766 - # broken ls alias from the environment. This has actually
1767 - # happened. Such a system could not be considered "sane".
1768 - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
1769 -alias in your environment])
1770 - fi
1771 + am_has_slept=no
1772 + for am_try in 1 2; do
1773 + echo "timestamp, slept: $am_has_slept" > conftest.file
1774 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1775 + if test "$[*]" = "X"; then
1776 + # -L didn't work.
1777 + set X `ls -t "$srcdir/configure" conftest.file`
1778 + fi
1779 + if test "$[*]" != "X $srcdir/configure conftest.file" \
1780 + && test "$[*]" != "X conftest.file $srcdir/configure"; then
1782 + # If neither matched, then we have a broken ls. This can happen
1783 + # if, for instance, CONFIG_SHELL is bash and it inherits a
1784 + # broken ls alias from the environment. This has actually
1785 + # happened. Such a system could not be considered "sane".
1786 + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
1787 + alias in your environment])
1788 + fi
1789 + if test "$[2]" = conftest.file || test $am_try -eq 2; then
1790 + break
1791 + fi
1792 + # Just in case.
1793 + sleep 1
1794 + am_has_slept=yes
1795 + done
1796 test "$[2]" = conftest.file
1797 )
1798 then
1799 @@ -3357,46 +3561,118 @@
1800 AC_MSG_ERROR([newly created file is older than distributed files!
1801 Check your system clock])
1802 fi
1803 -AC_MSG_RESULT(yes)])
1804 +AC_MSG_RESULT([yes])
1805 +# If we didn't sleep, we still need to ensure time stamps of config.status and
1806 +# generated files are strictly newer.
1807 +am_sleep_pid=
1808 +if grep 'slept: no' conftest.file >/dev/null 2>&1; then
1809 + ( sleep 1 ) &
1810 + am_sleep_pid=$!
1811 +fi
1812 +AC_CONFIG_COMMANDS_PRE(
1813 + [AC_MSG_CHECKING([that generated files are newer than configure])
1814 + if test -n "$am_sleep_pid"; then
1815 + # Hide warnings about reused PIDs.
1816 + wait $am_sleep_pid 2>/dev/null
1817 + fi
1818 + AC_MSG_RESULT([done])])
1819 +rm -f conftest.file
1820 +])
1822 -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1823 +# Copyright (C) 2009-2014 Free Software Foundation, Inc.
1824 #
1825 # This file is free software; the Free Software Foundation
1826 # gives unlimited permission to copy and/or distribute it,
1827 # with or without modifications, as long as this notice is preserved.
1829 -# serial 1
1830 +# AM_SILENT_RULES([DEFAULT])
1831 +# --------------------------
1832 +# Enable less verbose build rules; with the default set to DEFAULT
1833 +# ("yes" being less verbose, "no" or empty being verbose).
1834 +AC_DEFUN([AM_SILENT_RULES],
1835 +[AC_ARG_ENABLE([silent-rules], [dnl
1836 +AS_HELP_STRING(
1837 + [--enable-silent-rules],
1838 + [less verbose build output (undo: "make V=1")])
1839 +AS_HELP_STRING(
1840 + [--disable-silent-rules],
1841 + [verbose build output (undo: "make V=0")])dnl
1842 +])
1843 +case $enable_silent_rules in @%:@ (((
1844 + yes) AM_DEFAULT_VERBOSITY=0;;
1845 + no) AM_DEFAULT_VERBOSITY=1;;
1846 + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
1847 +esac
1848 +dnl
1849 +dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
1850 +dnl do not support nested variable expansions.
1851 +dnl See automake bug#9928 and bug#10237.
1852 +am_make=${MAKE-make}
1853 +AC_CACHE_CHECK([whether $am_make supports nested variables],
1854 + [am_cv_make_support_nested_variables],
1855 + [if AS_ECHO([['TRUE=$(BAR$(V))
1856 +BAR0=false
1857 +BAR1=true
1858 +V=1
1859 +am__doit:
1860 + @$(TRUE)
1861 +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
1862 + am_cv_make_support_nested_variables=yes
1863 +else
1864 + am_cv_make_support_nested_variables=no
1865 +fi])
1866 +if test $am_cv_make_support_nested_variables = yes; then
1867 + dnl Using '$V' instead of '$(V)' breaks IRIX make.
1868 + AM_V='$(V)'
1869 + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1870 +else
1871 + AM_V=$AM_DEFAULT_VERBOSITY
1872 + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
1873 +fi
1874 +AC_SUBST([AM_V])dnl
1875 +AM_SUBST_NOTMAKE([AM_V])dnl
1876 +AC_SUBST([AM_DEFAULT_V])dnl
1877 +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
1878 +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
1879 +AM_BACKSLASH='\'
1880 +AC_SUBST([AM_BACKSLASH])dnl
1881 +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1882 +])
1883 +
1884 +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1885 +#
1886 +# This file is free software; the Free Software Foundation
1887 +# gives unlimited permission to copy and/or distribute it,
1888 +# with or without modifications, as long as this notice is preserved.
1890 # AM_PROG_INSTALL_STRIP
1891 # ---------------------
1892 -# One issue with vendor `install' (even GNU) is that you can't
1893 +# One issue with vendor 'install' (even GNU) is that you can't
1894 # specify the program used to strip binaries. This is especially
1895 # annoying in cross-compiling environments, where the build's strip
1896 # is unlikely to handle the host's binaries.
1897 # Fortunately install-sh will honor a STRIPPROG variable, so we
1898 -# always use install-sh in `make install-strip', and initialize
1899 +# always use install-sh in "make install-strip", and initialize
1900 # STRIPPROG with the value of the STRIP variable (set by the user).
1901 AC_DEFUN([AM_PROG_INSTALL_STRIP],
1902 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1903 -# Installed binaries are usually stripped using `strip' when the user
1904 -# run `make install-strip'. However `strip' might not be the right
1905 +# Installed binaries are usually stripped using 'strip' when the user
1906 +# run "make install-strip". However 'strip' might not be the right
1907 # tool to use in cross-compilation environments, therefore Automake
1908 -# will honor the `STRIP' environment variable to overrule this program.
1909 -dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1910 +# will honor the 'STRIP' environment variable to overrule this program.
1911 +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
1912 if test "$cross_compiling" != no; then
1913 AC_CHECK_TOOL([STRIP], [strip], :)
1914 fi
1915 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1916 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1918 -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1919 +# Copyright (C) 2006-2014 Free Software Foundation, Inc.
1920 #
1921 # This file is free software; the Free Software Foundation
1922 # gives unlimited permission to copy and/or distribute it,
1923 # with or without modifications, as long as this notice is preserved.
1925 -# serial 3
1926 -
1927 # _AM_SUBST_NOTMAKE(VARIABLE)
1928 # ---------------------------
1929 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
1930 @@ -3410,18 +3686,16 @@
1932 # Check how to create a tarball. -*- Autoconf -*-
1934 -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1935 +# Copyright (C) 2004-2014 Free Software Foundation, Inc.
1936 #
1937 # This file is free software; the Free Software Foundation
1938 # gives unlimited permission to copy and/or distribute it,
1939 # with or without modifications, as long as this notice is preserved.
1941 -# serial 2
1942 -
1943 # _AM_PROG_TAR(FORMAT)
1944 # --------------------
1945 # Check how to create a tarball in format FORMAT.
1946 -# FORMAT should be one of `v7', `ustar', or `pax'.
1947 +# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1948 #
1949 # Substitute a variable $(am__tar) that is a command
1950 # writing to stdout a FORMAT-tarball containing the directory
1951 @@ -3431,76 +3705,114 @@
1952 # Substitute a variable $(am__untar) that extract such
1953 # a tarball read from stdin.
1954 # $(am__untar) < result.tar
1955 +#
1956 AC_DEFUN([_AM_PROG_TAR],
1957 [# Always define AMTAR for backward compatibility. Yes, it's still used
1958 # in the wild :-( We should find a proper way to deprecate it ...
1959 AC_SUBST([AMTAR], ['$${TAR-tar}'])
1960 -m4_if([$1], [v7],
1961 - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1962 - [m4_case([$1], [ustar],, [pax],,
1963 - [m4_fatal([Unknown tar format])])
1964 -AC_MSG_CHECKING([how to create a $1 tar archive])
1965 -# Loop over all known methods to create a tar archive until one works.
1966 +
1967 +# We'll loop over all known methods to create a tar archive until one works.
1968 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1969 -_am_tools=${am_cv_prog_tar_$1-$_am_tools}
1970 -# Do not fold the above two line into one, because Tru64 sh and
1971 -# Solaris sh will not grok spaces in the rhs of `-'.
1972 -for _am_tool in $_am_tools
1973 -do
1974 - case $_am_tool in
1975 - gnutar)
1976 - for _am_tar in tar gnutar gtar;
1977 - do
1978 - AM_RUN_LOG([$_am_tar --version]) && break
1979 - done
1980 - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1981 - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1982 - am__untar="$_am_tar -xf -"
1983 - ;;
1984 - plaintar)
1985 - # Must skip GNU tar: if it does not support --format= it doesn't create
1986 - # ustar tarball either.
1987 - (tar --version) >/dev/null 2>&1 && continue
1988 - am__tar='tar chf - "$$tardir"'
1989 - am__tar_='tar chf - "$tardir"'
1990 - am__untar='tar xf -'
1991 - ;;
1992 - pax)
1993 - am__tar='pax -L -x $1 -w "$$tardir"'
1994 - am__tar_='pax -L -x $1 -w "$tardir"'
1995 - am__untar='pax -r'
1996 - ;;
1997 - cpio)
1998 - am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1999 - am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
2000 - am__untar='cpio -i -H $1 -d'
2001 - ;;
2002 - none)
2003 - am__tar=false
2004 - am__tar_=false
2005 - am__untar=false
2006 - ;;
2007 - esac
2009 - # If the value was cached, stop now. We just wanted to have am__tar
2010 - # and am__untar set.
2011 - test -n "${am_cv_prog_tar_$1}" && break
2012 +m4_if([$1], [v7],
2013 + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
2015 - # tar/untar a dummy directory, and stop if the command works
2016 - rm -rf conftest.dir
2017 - mkdir conftest.dir
2018 - echo GrepMe > conftest.dir/file
2019 - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
2020 + [m4_case([$1],
2021 + [ustar],
2022 + [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
2023 + # There is notably a 21 bits limit for the UID and the GID. In fact,
2024 + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
2025 + # and bug#13588).
2026 + am_max_uid=2097151 # 2^21 - 1
2027 + am_max_gid=$am_max_uid
2028 + # The $UID and $GID variables are not portable, so we need to resort
2029 + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
2030 + # below are definitely unexpected, so allow the users to see them
2031 + # (that is, avoid stderr redirection).
2032 + am_uid=`id -u || echo unknown`
2033 + am_gid=`id -g || echo unknown`
2034 + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
2035 + if test $am_uid -le $am_max_uid; then
2036 + AC_MSG_RESULT([yes])
2037 + else
2038 + AC_MSG_RESULT([no])
2039 + _am_tools=none
2040 + fi
2041 + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
2042 + if test $am_gid -le $am_max_gid; then
2043 + AC_MSG_RESULT([yes])
2044 + else
2045 + AC_MSG_RESULT([no])
2046 + _am_tools=none
2047 + fi],
2048 +
2049 + [pax],
2050 + [],
2051 +
2052 + [m4_fatal([Unknown tar format])])
2053 +
2054 + AC_MSG_CHECKING([how to create a $1 tar archive])
2055 +
2056 + # Go ahead even if we have the value already cached. We do so because we
2057 + # need to set the values for the 'am__tar' and 'am__untar' variables.
2058 + _am_tools=${am_cv_prog_tar_$1-$_am_tools}
2059 +
2060 + for _am_tool in $_am_tools; do
2061 + case $_am_tool in
2062 + gnutar)
2063 + for _am_tar in tar gnutar gtar; do
2064 + AM_RUN_LOG([$_am_tar --version]) && break
2065 + done
2066 + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
2067 + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
2068 + am__untar="$_am_tar -xf -"
2069 + ;;
2070 + plaintar)
2071 + # Must skip GNU tar: if it does not support --format= it doesn't create
2072 + # ustar tarball either.
2073 + (tar --version) >/dev/null 2>&1 && continue
2074 + am__tar='tar chf - "$$tardir"'
2075 + am__tar_='tar chf - "$tardir"'
2076 + am__untar='tar xf -'
2077 + ;;
2078 + pax)
2079 + am__tar='pax -L -x $1 -w "$$tardir"'
2080 + am__tar_='pax -L -x $1 -w "$tardir"'
2081 + am__untar='pax -r'
2082 + ;;
2083 + cpio)
2084 + am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
2085 + am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
2086 + am__untar='cpio -i -H $1 -d'
2087 + ;;
2088 + none)
2089 + am__tar=false
2090 + am__tar_=false
2091 + am__untar=false
2092 + ;;
2093 + esac
2094 +
2095 + # If the value was cached, stop now. We just wanted to have am__tar
2096 + # and am__untar set.
2097 + test -n "${am_cv_prog_tar_$1}" && break
2098 +
2099 + # tar/untar a dummy directory, and stop if the command works.
2100 + rm -rf conftest.dir
2101 + mkdir conftest.dir
2102 + echo GrepMe > conftest.dir/file
2103 + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
2104 + rm -rf conftest.dir
2105 + if test -s conftest.tar; then
2106 + AM_RUN_LOG([$am__untar <conftest.tar])
2107 + AM_RUN_LOG([cat conftest.dir/file])
2108 + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
2109 + fi
2110 + done
2111 rm -rf conftest.dir
2112 - if test -s conftest.tar; then
2113 - AM_RUN_LOG([$am__untar <conftest.tar])
2114 - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
2115 - fi
2116 -done
2117 -rm -rf conftest.dir
2119 -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
2120 -AC_MSG_RESULT([$am_cv_prog_tar_$1])])
2121 + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
2122 + AC_MSG_RESULT([$am_cv_prog_tar_$1])])
2123 +
2124 AC_SUBST([am__tar])
2125 AC_SUBST([am__untar])
2126 ]) # _AM_PROG_TAR
2127 diff -Naur gnujump-1.0.8-orig/config.h.in gnujump-1.0.8/config.h.in
2128 --- gnujump-1.0.8-orig/config.h.in 2017-08-03 00:17:58.979142041 +0200
2129 +++ gnujump-1.0.8/config.h.in 2017-08-03 00:36:48.902891688 +0200
2130 @@ -7,11 +7,11 @@
2131 /* Use the Apple OpenGL framework. */
2132 #undef HAVE_APPLE_OPENGL_FRAMEWORK
2134 -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
2135 +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
2136 CoreFoundation framework. */
2137 #undef HAVE_CFLOCALECOPYCURRENT
2139 -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
2140 +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
2141 the CoreFoundation framework. */
2142 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
2144 diff -Naur gnujump-1.0.8-orig/configure gnujump-1.0.8/configure
2145 --- gnujump-1.0.8-orig/configure 2017-08-03 00:17:58.983142010 +0200
2146 +++ gnujump-1.0.8/configure 2017-08-03 00:35:43.755368554 +0200
2147 @@ -651,7 +651,6 @@
2148 DUMPBIN
2149 LD
2150 FGREP
2151 -SED
2152 LIBTOOL
2153 GLU_CFLAGS
2154 GL_LIBS
2155 @@ -701,6 +700,11 @@
2156 MSGFMT
2157 GETTEXT_MACRO_VERSION
2158 USE_NLS
2159 +SED
2160 +AM_BACKSLASH
2161 +AM_DEFAULT_VERBOSITY
2162 +AM_DEFAULT_V
2163 +AM_V
2164 am__untar
2165 am__tar
2166 AMTAR
2167 @@ -755,6 +759,7 @@
2168 docdir
2169 oldincludedir
2170 includedir
2171 +runstatedir
2172 localstatedir
2173 sharedstatedir
2174 sysconfdir
2175 @@ -777,6 +782,7 @@
2176 ac_subst_files=''
2177 ac_user_opts='
2178 enable_option_checking
2179 +enable_silent_rules
2180 enable_nls
2181 enable_dependency_tracking
2182 with_gnu_ld
2183 @@ -843,6 +849,7 @@
2184 sysconfdir='${prefix}/etc'
2185 sharedstatedir='${prefix}/com'
2186 localstatedir='${prefix}/var'
2187 +runstatedir='${localstatedir}/run'
2188 includedir='${prefix}/include'
2189 oldincludedir='/usr/include'
2190 docdir='${datarootdir}/doc/${PACKAGE}'
2191 @@ -1095,6 +1102,15 @@
2192 | -silent | --silent | --silen | --sile | --sil)
2193 silent=yes ;;
2195 + -runstatedir | --runstatedir | --runstatedi | --runstated \
2196 + | --runstate | --runstat | --runsta | --runst | --runs \
2197 + | --run | --ru | --r)
2198 + ac_prev=runstatedir ;;
2199 + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
2200 + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
2201 + | --run=* | --ru=* | --r=*)
2202 + runstatedir=$ac_optarg ;;
2203 +
2204 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
2205 ac_prev=sbindir ;;
2206 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
2207 @@ -1232,7 +1248,7 @@
2208 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
2209 datadir sysconfdir sharedstatedir localstatedir includedir \
2210 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
2211 - libdir localedir mandir
2212 + libdir localedir mandir runstatedir
2213 do
2214 eval ac_val=\$$ac_var
2215 # Remove trailing slashes.
2216 @@ -1385,6 +1401,7 @@
2217 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
2218 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
2219 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
2220 + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
2221 --libdir=DIR object code libraries [EPREFIX/lib]
2222 --includedir=DIR C header files [PREFIX/include]
2223 --oldincludedir=DIR C header files for non-gcc [/usr/include]
2224 @@ -1426,9 +1443,13 @@
2225 --disable-option-checking ignore unrecognized --enable/--with options
2226 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
2227 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
2228 + --enable-silent-rules less verbose build output (undo: "make V=1")
2229 + --disable-silent-rules verbose build output (undo: "make V=0")
2230 --disable-nls do not use Native Language Support
2231 - --disable-dependency-tracking speeds up one-time build
2232 - --enable-dependency-tracking do not reject slow dependency extractors
2233 + --enable-dependency-tracking
2234 + do not reject slow dependency extractors
2235 + --disable-dependency-tracking
2236 + speeds up one-time build
2237 --disable-rpath do not hardcode runtime library paths
2238 --disable-sdltest Do not try to compile and run a test SDL program
2239 --enable-shared[=PKGS] build shared libraries [default=yes]
2240 @@ -1440,7 +1461,7 @@
2241 Optional Packages:
2242 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
2243 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
2244 - --with-gnu-ld assume the C compiler uses GNU ld default=no
2245 + --with-gnu-ld assume the C compiler uses GNU ld [default=no]
2246 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
2247 --without-libiconv-prefix don't search for libiconv in includedir and libdir
2248 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
2249 @@ -2390,7 +2411,7 @@
2251 ac_config_headers="$ac_config_headers config.h"
2253 -am__api_version='1.11'
2254 +am__api_version='1.15'
2256 # Find a good install program. We prefer a C program (faster),
2257 # so one script is as good as another. But avoid the broken or
2258 @@ -2487,9 +2508,6 @@
2260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2261 $as_echo_n "checking whether build environment is sane... " >&6; }
2262 -# Just in case
2263 -sleep 1
2264 -echo timestamp > conftest.file
2265 # Reject unsafe characters in $srcdir or the absolute working directory
2266 # name. Accept space and tab only in the latter.
2267 am_lf='
2268 @@ -2500,32 +2518,40 @@
2269 esac
2270 case $srcdir in
2271 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2272 - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2273 + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2274 esac
2276 -# Do `set' in a subshell so we don't clobber the current shell's
2277 +# Do 'set' in a subshell so we don't clobber the current shell's
2278 # arguments. Must try -L first in case configure is actually a
2279 # symlink; some systems play weird games with the mod time of symlinks
2280 # (eg FreeBSD returns the mod time of the symlink's containing
2281 # directory).
2282 if (
2283 - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2284 - if test "$*" = "X"; then
2285 - # -L didn't work.
2286 - set X `ls -t "$srcdir/configure" conftest.file`
2287 - fi
2288 - rm -f conftest.file
2289 - if test "$*" != "X $srcdir/configure conftest.file" \
2290 - && test "$*" != "X conftest.file $srcdir/configure"; then
2291 -
2292 - # If neither matched, then we have a broken ls. This can happen
2293 - # if, for instance, CONFIG_SHELL is bash and it inherits a
2294 - # broken ls alias from the environment. This has actually
2295 - # happened. Such a system could not be considered "sane".
2296 - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2297 -alias in your environment" "$LINENO" 5
2298 - fi
2299 + am_has_slept=no
2300 + for am_try in 1 2; do
2301 + echo "timestamp, slept: $am_has_slept" > conftest.file
2302 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2303 + if test "$*" = "X"; then
2304 + # -L didn't work.
2305 + set X `ls -t "$srcdir/configure" conftest.file`
2306 + fi
2307 + if test "$*" != "X $srcdir/configure conftest.file" \
2308 + && test "$*" != "X conftest.file $srcdir/configure"; then
2310 + # If neither matched, then we have a broken ls. This can happen
2311 + # if, for instance, CONFIG_SHELL is bash and it inherits a
2312 + # broken ls alias from the environment. This has actually
2313 + # happened. Such a system could not be considered "sane".
2314 + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2315 + alias in your environment" "$LINENO" 5
2316 + fi
2317 + if test "$2" = conftest.file || test $am_try -eq 2; then
2318 + break
2319 + fi
2320 + # Just in case.
2321 + sleep 1
2322 + am_has_slept=yes
2323 + done
2324 test "$2" = conftest.file
2325 )
2326 then
2327 @@ -2537,6 +2563,16 @@
2328 fi
2329 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2330 $as_echo "yes" >&6; }
2331 +# If we didn't sleep, we still need to ensure time stamps of config.status and
2332 +# generated files are strictly newer.
2333 +am_sleep_pid=
2334 +if grep 'slept: no' conftest.file >/dev/null 2>&1; then
2335 + ( sleep 1 ) &
2336 + am_sleep_pid=$!
2337 +fi
2338 +
2339 +rm -f conftest.file
2340 +
2341 test "$program_prefix" != NONE &&
2342 program_transform_name="s&^&$program_prefix&;$program_transform_name"
2343 # Use a double $ so make ignores it.
2344 @@ -2547,8 +2583,8 @@
2345 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
2346 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
2348 -# expand $ac_aux_dir to an absolute path
2349 -am_aux_dir=`cd $ac_aux_dir && pwd`
2350 +# Expand $ac_aux_dir to an absolute path.
2351 +am_aux_dir=`cd "$ac_aux_dir" && pwd`
2353 if test x"${MISSING+set}" != xset; then
2354 case $am_aux_dir in
2355 @@ -2559,15 +2595,15 @@
2356 esac
2357 fi
2358 # Use eval to expand $SHELL
2359 -if eval "$MISSING --run true"; then
2360 - am_missing_run="$MISSING --run "
2361 +if eval "$MISSING --is-lightweight"; then
2362 + am_missing_run="$MISSING "
2363 else
2364 am_missing_run=
2365 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2366 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2367 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
2368 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2369 fi
2371 -if test x"${install_sh}" != xset; then
2372 +if test x"${install_sh+set}" != xset; then
2373 case $am_aux_dir in
2374 *\ * | *\ *)
2375 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
2376 @@ -2576,10 +2612,10 @@
2377 esac
2378 fi
2380 -# Installed binaries are usually stripped using `strip' when the user
2381 -# run `make install-strip'. However `strip' might not be the right
2382 +# Installed binaries are usually stripped using 'strip' when the user
2383 +# run "make install-strip". However 'strip' might not be the right
2384 # tool to use in cross-compilation environments, therefore Automake
2385 -# will honor the `STRIP' environment variable to overrule this program.
2386 +# will honor the 'STRIP' environment variable to overrule this program.
2387 if test "$cross_compiling" != no; then
2388 if test -n "$ac_tool_prefix"; then
2389 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2390 @@ -2718,12 +2754,6 @@
2391 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2392 $as_echo "$MKDIR_P" >&6; }
2394 -mkdir_p="$MKDIR_P"
2395 -case $mkdir_p in
2396 - [\\/$]* | ?:[\\/]*) ;;
2397 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2398 -esac
2399 -
2400 for ac_prog in gawk mawk nawk awk
2401 do
2402 # Extract the first word of "$ac_prog", so it can be a program name with args.
2403 @@ -2806,6 +2836,45 @@
2404 fi
2405 rmdir .tst 2>/dev/null
2407 +# Check whether --enable-silent-rules was given.
2408 +if test "${enable_silent_rules+set}" = set; then :
2409 + enableval=$enable_silent_rules;
2410 +fi
2411 +
2412 +case $enable_silent_rules in # (((
2413 + yes) AM_DEFAULT_VERBOSITY=0;;
2414 + no) AM_DEFAULT_VERBOSITY=1;;
2415 + *) AM_DEFAULT_VERBOSITY=1;;
2416 +esac
2417 +am_make=${MAKE-make}
2418 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2419 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2420 +if ${am_cv_make_support_nested_variables+:} false; then :
2421 + $as_echo_n "(cached) " >&6
2422 +else
2423 + if $as_echo 'TRUE=$(BAR$(V))
2424 +BAR0=false
2425 +BAR1=true
2426 +V=1
2427 +am__doit:
2428 + @$(TRUE)
2429 +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2430 + am_cv_make_support_nested_variables=yes
2431 +else
2432 + am_cv_make_support_nested_variables=no
2433 +fi
2434 +fi
2435 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2436 +$as_echo "$am_cv_make_support_nested_variables" >&6; }
2437 +if test $am_cv_make_support_nested_variables = yes; then
2438 + AM_V='$(V)'
2439 + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2440 +else
2441 + AM_V=$AM_DEFAULT_VERBOSITY
2442 + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2443 +fi
2444 +AM_BACKSLASH='\'
2445 +
2446 if test "`cd $srcdir && pwd`" != "`pwd`"; then
2447 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2448 # is not polluted with repeated "-I."
2449 @@ -2827,6 +2896,7 @@
2452 # Define the identity of the package.
2453 +
2454 PACKAGE=gnujump
2455 VERSION=1.0.8
2457 @@ -2856,12 +2926,22 @@
2459 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
2461 -# We need awk for the "check" target. The system "awk" is bad on
2462 -# some platforms.
2463 +# For better backward compatibility. To be removed once Automake 1.9.x
2464 +# dies out for good. For more background, see:
2465 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2466 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2467 +mkdir_p='$(MKDIR_P)'
2468 +
2469 +# We need awk for the "check" target (and possibly the TAP driver). The
2470 +# system "awk" is bad on some platforms.
2471 # Always define AMTAR for backward compatibility. Yes, it's still used
2472 # in the wild :-( We should find a proper way to deprecate it ...
2473 AMTAR='$${TAR-tar}'
2475 +
2476 +# We'll loop over all known methods to create a tar archive until one works.
2477 +_am_tools='gnutar pax cpio none'
2478 +
2479 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
2482 @@ -2869,8 +2949,120 @@
2486 +# POSIX will say in a future version that running "rm -f" with no argument
2487 +# is OK; and we want to be able to make that assumption in our Makefile
2488 +# recipes. So use an aggressive probe to check that the usage we want is
2489 +# actually supported "in the wild" to an acceptable degree.
2490 +# See automake bug#10828.
2491 +# To make any issue more visible, cause the running configure to be aborted
2492 +# by default if the 'rm' program in use doesn't match our expectations; the
2493 +# user can still override this though.
2494 +if rm -f && rm -fr && rm -rf; then : OK; else
2495 + cat >&2 <<'END'
2496 +Oops!
2497 +
2498 +Your 'rm' program seems unable to run without file operands specified
2499 +on the command line, even when the '-f' option is present. This is contrary
2500 +to the behaviour of most rm programs out there, and not conforming with
2501 +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
2502 +
2503 +Please tell bug-automake@gnu.org about your system, including the value
2504 +of your $PATH and any error possibly output before this message. This
2505 +can help us improve future automake versions.
2506 +
2507 +END
2508 + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
2509 + echo 'Configuration will proceed anyway, since you have set the' >&2
2510 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
2511 + echo >&2
2512 + else
2513 + cat >&2 <<'END'
2514 +Aborting the configuration process, to ensure you take notice of the issue.
2515 +
2516 +You can download and install GNU coreutils to get an 'rm' implementation
2517 +that behaves properly: <http://www.gnu.org/software/coreutils/>.
2518 +
2519 +If you want to complete the configuration process using your problematic
2520 +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
2521 +to "yes", and re-run configure.
2522 +
2523 +END
2524 + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
2525 + fi
2526 +fi
2527 +
2528 +
2529 ALL_LINGUAS="tr it"
2531 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
2532 +$as_echo_n "checking for a sed that does not truncate output... " >&6; }
2533 +if ${ac_cv_path_SED+:} false; then :
2534 + $as_echo_n "(cached) " >&6
2535 +else
2536 + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
2537 + for ac_i in 1 2 3 4 5 6 7; do
2538 + ac_script="$ac_script$as_nl$ac_script"
2539 + done
2540 + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
2541 + { ac_script=; unset ac_script;}
2542 + if test -z "$SED"; then
2543 + ac_path_SED_found=false
2544 + # Loop through the user's path and test for each of PROGNAME-LIST
2545 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2546 +for as_dir in $PATH
2547 +do
2548 + IFS=$as_save_IFS
2549 + test -z "$as_dir" && as_dir=.
2550 + for ac_prog in sed gsed; do
2551 + for ac_exec_ext in '' $ac_executable_extensions; do
2552 + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
2553 + as_fn_executable_p "$ac_path_SED" || continue
2554 +# Check for GNU ac_path_SED and select it if it is found.
2555 + # Check for GNU $ac_path_SED
2556 +case `"$ac_path_SED" --version 2>&1` in
2557 +*GNU*)
2558 + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
2559 +*)
2560 + ac_count=0
2561 + $as_echo_n 0123456789 >"conftest.in"
2562 + while :
2563 + do
2564 + cat "conftest.in" "conftest.in" >"conftest.tmp"
2565 + mv "conftest.tmp" "conftest.in"
2566 + cp "conftest.in" "conftest.nl"
2567 + $as_echo '' >> "conftest.nl"
2568 + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
2569 + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
2570 + as_fn_arith $ac_count + 1 && ac_count=$as_val
2571 + if test $ac_count -gt ${ac_path_SED_max-0}; then
2572 + # Best one so far, save it but keep looking for a better one
2573 + ac_cv_path_SED="$ac_path_SED"
2574 + ac_path_SED_max=$ac_count
2575 + fi
2576 + # 10*(2^10) chars as input seems more than enough
2577 + test $ac_count -gt 10 && break
2578 + done
2579 + rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
2580 +esac
2581 +
2582 + $ac_path_SED_found && break 3
2583 + done
2584 + done
2585 + done
2586 +IFS=$as_save_IFS
2587 + if test -z "$ac_cv_path_SED"; then
2588 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
2589 + fi
2590 +else
2591 + ac_cv_path_SED=$SED
2592 +fi
2593 +
2594 +fi
2595 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
2596 +$as_echo "$ac_cv_path_SED" >&6; }
2597 + SED="$ac_cv_path_SED"
2598 + rm -f conftest.sed
2599 +
2601 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
2602 $as_echo_n "checking whether NLS is requested... " >&6; }
2603 @@ -2887,7 +3079,7 @@
2607 - GETTEXT_MACRO_VERSION=0.18
2608 + GETTEXT_MACRO_VERSION=0.19
2612 @@ -2895,15 +3087,14 @@
2613 # Prepare PATH_SEPARATOR.
2614 # The user is always right.
2615 if test "${PATH_SEPARATOR+set}" != set; then
2616 - echo "#! /bin/sh" >conf$$.sh
2617 - echo "exit 0" >>conf$$.sh
2618 - chmod +x conf$$.sh
2619 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2620 - PATH_SEPARATOR=';'
2621 - else
2622 - PATH_SEPARATOR=:
2623 - fi
2624 - rm -f conf$$.sh
2625 + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
2626 + # contains only /bin. Note that ksh looks also at the FPATH variable,
2627 + # so we have to set that as well for the test.
2628 + PATH_SEPARATOR=:
2629 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2630 + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2631 + || PATH_SEPARATOR=';'
2632 + }
2633 fi
2635 # Find out how to test for executable files. Don't use a zero-byte file,
2636 @@ -3018,15 +3209,14 @@
2637 # Prepare PATH_SEPARATOR.
2638 # The user is always right.
2639 if test "${PATH_SEPARATOR+set}" != set; then
2640 - echo "#! /bin/sh" >conf$$.sh
2641 - echo "exit 0" >>conf$$.sh
2642 - chmod +x conf$$.sh
2643 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2644 - PATH_SEPARATOR=';'
2645 - else
2646 - PATH_SEPARATOR=:
2647 - fi
2648 - rm -f conf$$.sh
2649 + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
2650 + # contains only /bin. Note that ksh looks also at the FPATH variable,
2651 + # so we have to set that as well for the test.
2652 + PATH_SEPARATOR=:
2653 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2654 + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2655 + || PATH_SEPARATOR=';'
2656 + }
2657 fi
2659 # Find out how to test for executable files. Don't use a zero-byte file,
2660 @@ -3096,15 +3286,14 @@
2661 # Prepare PATH_SEPARATOR.
2662 # The user is always right.
2663 if test "${PATH_SEPARATOR+set}" != set; then
2664 - echo "#! /bin/sh" >conf$$.sh
2665 - echo "exit 0" >>conf$$.sh
2666 - chmod +x conf$$.sh
2667 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2668 - PATH_SEPARATOR=';'
2669 - else
2670 - PATH_SEPARATOR=:
2671 - fi
2672 - rm -f conf$$.sh
2673 + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
2674 + # contains only /bin. Note that ksh looks also at the FPATH variable,
2675 + # so we have to set that as well for the test.
2676 + PATH_SEPARATOR=:
2677 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2678 + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2679 + || PATH_SEPARATOR=';'
2680 + }
2681 fi
2683 # Find out how to test for executable files. Don't use a zero-byte file,
2684 @@ -3206,7 +3395,7 @@
2685 _am_result=none
2686 # First try GNU make style include.
2687 echo "include confinc" > confmf
2688 -# Ignore all kinds of additional output from `make'.
2689 +# Ignore all kinds of additional output from 'make'.
2690 case `$am_make -s -f confmf 2> /dev/null` in #(
2691 *the\ am__doit\ target*)
2692 am__include=include
2693 @@ -4039,6 +4228,65 @@
2694 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2695 ac_compiler_gnu=$ac_cv_c_compiler_gnu
2697 +ac_ext=c
2698 +ac_cpp='$CPP $CPPFLAGS'
2699 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2700 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2701 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
2702 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
2703 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
2704 +if ${am_cv_prog_cc_c_o+:} false; then :
2705 + $as_echo_n "(cached) " >&6
2706 +else
2707 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2708 +/* end confdefs.h. */
2709 +
2710 +int
2711 +main ()
2712 +{
2713 +
2714 + ;
2715 + return 0;
2716 +}
2717 +_ACEOF
2718 + # Make sure it works both with $CC and with simple cc.
2719 + # Following AC_PROG_CC_C_O, we do the test twice because some
2720 + # compilers refuse to overwrite an existing .o file with -o,
2721 + # though they will create one.
2722 + am_cv_prog_cc_c_o=yes
2723 + for am_i in 1 2; do
2724 + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
2725 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
2726 + ac_status=$?
2727 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2728 + (exit $ac_status); } \
2729 + && test -f conftest2.$ac_objext; then
2730 + : OK
2731 + else
2732 + am_cv_prog_cc_c_o=no
2733 + break
2734 + fi
2735 + done
2736 + rm -f core conftest*
2737 + unset am_i
2738 +fi
2739 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
2740 +$as_echo "$am_cv_prog_cc_c_o" >&6; }
2741 +if test "$am_cv_prog_cc_c_o" != yes; then
2742 + # Losing compiler, so override with the script.
2743 + # FIXME: It is wrong to rewrite CC.
2744 + # But if we don't then we get into trouble of one sort or another.
2745 + # A longer-term fix would be to have automake use am__CC in this case,
2746 + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
2747 + CC="$am_aux_dir/compile $CC"
2748 +fi
2749 +ac_ext=c
2750 +ac_cpp='$CPP $CPPFLAGS'
2751 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2752 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2753 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
2754 +
2755 +
2756 depcc="$CC" am_compiler_list=
2758 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
2759 @@ -4050,8 +4298,8 @@
2760 # We make a subdir and do the tests there. Otherwise we can end up
2761 # making bogus files that we don't know about and never remove. For
2762 # instance it was reported that on HP-UX the gcc test will end up
2763 - # making a dummy file named `D' -- because `-MD' means `put the output
2764 - # in D'.
2765 + # making a dummy file named 'D' -- because '-MD' means "put the output
2766 + # in D".
2767 rm -rf conftest.dir
2768 mkdir conftest.dir
2769 # Copy depcomp to subdir because otherwise we won't find it if we're
2770 @@ -4086,16 +4334,16 @@
2771 : > sub/conftest.c
2772 for i in 1 2 3 4 5 6; do
2773 echo '#include "conftst'$i'.h"' >> sub/conftest.c
2774 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
2775 - # Solaris 8's {/usr,}/bin/sh.
2776 - touch sub/conftst$i.h
2777 + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
2778 + # Solaris 10 /bin/sh.
2779 + echo '/* dummy */' > sub/conftst$i.h
2780 done
2781 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
2783 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
2784 + # We check with '-c' and '-o' for the sake of the "dashmstdout"
2785 # mode. It turns out that the SunPro C++ compiler does not properly
2786 - # handle `-M -o', and we need to detect this. Also, some Intel
2787 - # versions had trouble with output in subdirs
2788 + # handle '-M -o', and we need to detect this. Also, some Intel
2789 + # versions had trouble with output in subdirs.
2790 am__obj=sub/conftest.${OBJEXT-o}
2791 am__minus_obj="-o $am__obj"
2792 case $depmode in
2793 @@ -4104,8 +4352,8 @@
2794 test "$am__universal" = false || continue
2795 ;;
2796 nosideeffect)
2797 - # after this tag, mechanisms are not by side-effect, so they'll
2798 - # only be used when explicitly requested
2799 + # After this tag, mechanisms are not by side-effect, so they'll
2800 + # only be used when explicitly requested.
2801 if test "x$enable_dependency_tracking" = xyes; then
2802 continue
2803 else
2804 @@ -4113,7 +4361,7 @@
2805 fi
2806 ;;
2807 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
2808 - # This compiler won't grok `-c -o', but also, the minuso test has
2809 + # This compiler won't grok '-c -o', but also, the minuso test has
2810 # not run yet. These depmodes are late enough in the game, and
2811 # so weak that their functioning should not be impacted.
2812 am__obj=conftest.${OBJEXT-o}
2813 @@ -4168,6 +4416,7 @@
2817 +
2818 # Check whether --with-gnu-ld was given.
2819 if test "${with_gnu_ld+set}" = set; then :
2820 withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
2821 @@ -4178,21 +4427,21 @@
2822 # Prepare PATH_SEPARATOR.
2823 # The user is always right.
2824 if test "${PATH_SEPARATOR+set}" != set; then
2825 - echo "#! /bin/sh" >conf$$.sh
2826 - echo "exit 0" >>conf$$.sh
2827 - chmod +x conf$$.sh
2828 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2829 - PATH_SEPARATOR=';'
2830 - else
2831 - PATH_SEPARATOR=:
2832 - fi
2833 - rm -f conf$$.sh
2834 + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
2835 + # contains only /bin. Note that ksh looks also at the FPATH variable,
2836 + # so we have to set that as well for the test.
2837 + PATH_SEPARATOR=:
2838 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2839 + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2840 + || PATH_SEPARATOR=';'
2841 + }
2842 fi
2843 +
2844 ac_prog=ld
2845 if test "$GCC" = yes; then
2846 # Check if gcc -print-prog-name=ld gives a path.
2847 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
2848 -$as_echo_n "checking for ld used by GCC... " >&6; }
2849 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
2850 +$as_echo_n "checking for ld used by $CC... " >&6; }
2851 case $host in
2852 *-*-mingw*)
2853 # gcc leaves a trailing carriage return which upsets mingw
2854 @@ -4202,11 +4451,11 @@
2855 esac
2856 case $ac_prog in
2857 # Accept absolute paths.
2858 - [\\/]* | [A-Za-z]:[\\/]*)
2859 + [\\/]* | ?:[\\/]*)
2860 re_direlt='/[^/][^/]*/\.\./'
2861 - # Canonicalize the path of ld
2862 - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
2863 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
2864 + # Canonicalize the pathname of ld
2865 + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
2866 + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
2867 ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
2868 done
2869 test -z "$LD" && LD="$ac_prog"
2870 @@ -4231,23 +4480,26 @@
2871 $as_echo_n "(cached) " >&6
2872 else
2873 if test -z "$LD"; then
2874 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
2875 + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
2876 for ac_dir in $PATH; do
2877 + IFS="$acl_save_ifs"
2878 test -z "$ac_dir" && ac_dir=.
2879 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
2880 acl_cv_path_LD="$ac_dir/$ac_prog"
2881 # Check to see if the program is GNU ld. I'd rather use --version,
2882 - # but apparently some GNU ld's only accept -v.
2883 + # but apparently some variants of GNU ld only accept -v.
2884 # Break only if it was the GNU/non-GNU ld that we prefer.
2885 - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
2886 + case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
2887 *GNU* | *'with BFD'*)
2888 - test "$with_gnu_ld" != no && break ;;
2889 + test "$with_gnu_ld" != no && break
2890 + ;;
2891 *)
2892 - test "$with_gnu_ld" != yes && break ;;
2893 + test "$with_gnu_ld" != yes && break
2894 + ;;
2895 esac
2896 fi
2897 done
2898 - IFS="$ac_save_ifs"
2899 + IFS="$acl_save_ifs"
2900 else
2901 acl_cv_path_LD="$LD" # Let the user override the test with a path.
2902 fi
2903 @@ -4267,12 +4519,14 @@
2904 if ${acl_cv_prog_gnu_ld+:} false; then :
2905 $as_echo_n "(cached) " >&6
2906 else
2907 - # I'd rather use --version here, but apparently some GNU ld's only accept -v.
2908 + # I'd rather use --version here, but apparently some GNU lds only accept -v.
2909 case `$LD -v 2>&1 </dev/null` in
2910 *GNU* | *'with BFD'*)
2911 - acl_cv_prog_gnu_ld=yes ;;
2912 + acl_cv_prog_gnu_ld=yes
2913 + ;;
2914 *)
2915 - acl_cv_prog_gnu_ld=no ;;
2916 + acl_cv_prog_gnu_ld=no
2917 + ;;
2918 esac
2919 fi
2920 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
2921 @@ -4724,7 +4978,7 @@
2922 done
2923 if test -z "$already_handled"; then
2924 names_already_handled="$names_already_handled $name"
2925 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
2926 + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
2927 eval value=\"\$HAVE_LIB$uppername\"
2928 if test -n "$value"; then
2929 if test "$value" = yes; then
2930 @@ -5253,15 +5507,24 @@
2931 else
2932 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2933 /* end confdefs.h. */
2934 +
2935 #include <libintl.h>
2936 -$gt_revision_test_code
2937 +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
2938 extern int _nl_msg_cat_cntr;
2939 extern int *_nl_domain_bindings;
2940 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
2941 +#else
2942 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
2943 +#endif
2944 +$gt_revision_test_code
2945 +
2946 int
2947 main ()
2948 {
2949 +
2950 bindtextdomain ("", "");
2951 -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
2952 +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
2953 +
2954 ;
2955 return 0;
2956 }
2957 @@ -5319,14 +5582,16 @@
2958 am_cv_lib_iconv=no
2959 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2960 /* end confdefs.h. */
2961 +
2962 #include <stdlib.h>
2963 #include <iconv.h>
2964 +
2965 int
2966 main ()
2967 {
2968 iconv_t cd = iconv_open("","");
2969 - iconv(cd,NULL,NULL,NULL,NULL);
2970 - iconv_close(cd);
2971 + iconv(cd,NULL,NULL,NULL,NULL);
2972 + iconv_close(cd);
2973 ;
2974 return 0;
2975 }
2976 @@ -5341,14 +5606,16 @@
2977 LIBS="$LIBS $LIBICONV"
2978 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2979 /* end confdefs.h. */
2980 +
2981 #include <stdlib.h>
2982 #include <iconv.h>
2983 +
2984 int
2985 main ()
2986 {
2987 iconv_t cd = iconv_open("","");
2988 - iconv(cd,NULL,NULL,NULL,NULL);
2989 - iconv_close(cd);
2990 + iconv(cd,NULL,NULL,NULL,NULL);
2991 + iconv_close(cd);
2992 ;
2993 return 0;
2994 }
2995 @@ -5372,40 +5639,50 @@
2996 $as_echo_n "(cached) " >&6
2997 else
2999 - am_save_LIBS="$LIBS"
3000 + am_save_LIBS="$LIBS"
3001 if test $am_cv_lib_iconv = yes; then
3002 LIBS="$LIBS $LIBICONV"
3003 fi
3004 - if test "$cross_compiling" = yes; then :
3005 + am_cv_func_iconv_works=no
3006 + for ac_iconv_const in '' 'const'; do
3007 + if test "$cross_compiling" = yes; then :
3008 case "$host_os" in
3009 - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
3010 - *) am_cv_func_iconv_works="guessing yes" ;;
3011 - esac
3012 + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
3013 + *) am_cv_func_iconv_works="guessing yes" ;;
3014 + esac
3015 else
3016 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3017 /* end confdefs.h. */
3019 #include <iconv.h>
3020 #include <string.h>
3021 -int main ()
3022 +
3023 +#ifndef ICONV_CONST
3024 +# define ICONV_CONST $ac_iconv_const
3025 +#endif
3026 +
3027 +int
3028 +main ()
3029 {
3030 +int result = 0;
3031 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
3032 returns. */
3033 {
3034 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
3035 if (cd_utf8_to_88591 != (iconv_t)(-1))
3036 {
3037 - static const char input[] = "\342\202\254"; /* EURO SIGN */
3038 + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
3039 char buf[10];
3040 - const char *inptr = input;
3041 + ICONV_CONST char *inptr = input;
3042 size_t inbytesleft = strlen (input);
3043 char *outptr = buf;
3044 size_t outbytesleft = sizeof (buf);
3045 size_t res = iconv (cd_utf8_to_88591,
3046 - (char **) &inptr, &inbytesleft,
3047 + &inptr, &inbytesleft,
3048 &outptr, &outbytesleft);
3049 if (res == 0)
3050 - return 1;
3051 + result |= 1;
3052 + iconv_close (cd_utf8_to_88591);
3053 }
3054 }
3055 /* Test against Solaris 10 bug: Failures are not distinguishable from
3056 @@ -5414,17 +5691,37 @@
3057 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
3058 if (cd_ascii_to_88591 != (iconv_t)(-1))
3059 {
3060 - static const char input[] = "\263";
3061 + static ICONV_CONST char input[] = "\263";
3062 char buf[10];
3063 - const char *inptr = input;
3064 + ICONV_CONST char *inptr = input;
3065 size_t inbytesleft = strlen (input);
3066 char *outptr = buf;
3067 size_t outbytesleft = sizeof (buf);
3068 size_t res = iconv (cd_ascii_to_88591,
3069 - (char **) &inptr, &inbytesleft,
3070 + &inptr, &inbytesleft,
3071 &outptr, &outbytesleft);
3072 if (res == 0)
3073 - return 1;
3074 + result |= 2;
3075 + iconv_close (cd_ascii_to_88591);
3076 + }
3077 + }
3078 + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
3079 + {
3080 + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
3081 + if (cd_88591_to_utf8 != (iconv_t)(-1))
3082 + {
3083 + static ICONV_CONST char input[] = "\304";
3084 + static char buf[2] = { (char)0xDE, (char)0xAD };
3085 + ICONV_CONST char *inptr = input;
3086 + size_t inbytesleft = 1;
3087 + char *outptr = buf;
3088 + size_t outbytesleft = 1;
3089 + size_t res = iconv (cd_88591_to_utf8,
3090 + &inptr, &inbytesleft,
3091 + &outptr, &outbytesleft);
3092 + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
3093 + result |= 4;
3094 + iconv_close (cd_88591_to_utf8);
3095 }
3096 }
3097 #if 0 /* This bug could be worked around by the caller. */
3098 @@ -5433,17 +5730,18 @@
3099 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
3100 if (cd_88591_to_utf8 != (iconv_t)(-1))
3101 {
3102 - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
3103 + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
3104 char buf[50];
3105 - const char *inptr = input;
3106 + ICONV_CONST char *inptr = input;
3107 size_t inbytesleft = strlen (input);
3108 char *outptr = buf;
3109 size_t outbytesleft = sizeof (buf);
3110 size_t res = iconv (cd_88591_to_utf8,
3111 - (char **) &inptr, &inbytesleft,
3112 + &inptr, &inbytesleft,
3113 &outptr, &outbytesleft);
3114 if ((int)res > 0)
3115 - return 1;
3116 + result |= 8;
3117 + iconv_close (cd_88591_to_utf8);
3118 }
3119 }
3120 #endif
3121 @@ -5457,19 +5755,22 @@
3122 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
3123 /* Try HP-UX names. */
3124 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
3125 - return 1;
3126 + result |= 16;
3127 + return result;
3128 +
3129 + ;
3130 return 0;
3131 }
3132 _ACEOF
3133 if ac_fn_c_try_run "$LINENO"; then :
3134 am_cv_func_iconv_works=yes
3135 -else
3136 - am_cv_func_iconv_works=no
3137 fi
3138 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
3139 conftest.$ac_objext conftest.beam conftest.$ac_ext
3140 fi
3142 + test "$am_cv_func_iconv_works" = no || break
3143 + done
3144 LIBS="$am_save_LIBS"
3146 fi
3147 @@ -5575,7 +5876,7 @@
3148 done
3149 if test -z "$already_handled"; then
3150 names_already_handled="$names_already_handled $name"
3151 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
3152 + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
3153 eval value=\"\$HAVE_LIB$uppername\"
3154 if test -n "$value"; then
3155 if test "$value" = yes; then
3156 @@ -5973,19 +6274,28 @@
3157 LIBS="$LIBS $LIBINTL"
3158 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3159 /* end confdefs.h. */
3160 +
3161 #include <libintl.h>
3162 -$gt_revision_test_code
3163 +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
3164 extern int _nl_msg_cat_cntr;
3165 extern
3166 #ifdef __cplusplus
3167 "C"
3168 #endif
3169 const char *_nl_expand_alias (const char *);
3170 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
3171 +#else
3172 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
3173 +#endif
3174 +$gt_revision_test_code
3175 +
3176 int
3177 main ()
3178 {
3179 +
3180 bindtextdomain ("", "");
3181 -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
3182 +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
3183 +
3184 ;
3185 return 0;
3186 }
3187 @@ -6001,27 +6311,36 @@
3188 LIBS="$LIBS $LIBICONV"
3189 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3190 /* end confdefs.h. */
3191 +
3192 #include <libintl.h>
3193 -$gt_revision_test_code
3194 +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
3195 extern int _nl_msg_cat_cntr;
3196 extern
3197 #ifdef __cplusplus
3198 "C"
3199 #endif
3200 const char *_nl_expand_alias (const char *);
3201 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
3202 +#else
3203 +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
3204 +#endif
3205 +$gt_revision_test_code
3206 +
3207 int
3208 main ()
3209 {
3210 +
3211 bindtextdomain ("", "");
3212 -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
3213 +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
3214 +
3215 ;
3216 return 0;
3217 }
3218 _ACEOF
3219 if ac_fn_c_try_link "$LINENO"; then :
3220 LIBINTL="$LIBINTL $LIBICONV"
3221 - LTLIBINTL="$LTLIBINTL $LTLIBICONV"
3222 - eval "$gt_func_gnugettext_libintl=yes"
3223 + LTLIBINTL="$LTLIBINTL $LTLIBICONV"
3224 + eval "$gt_func_gnugettext_libintl=yes"
3226 fi
3227 rm -f core conftest.err conftest.$ac_objext \
3228 @@ -7192,7 +7511,7 @@
3231 CFLAGS="$CFLAGS $GL_CFLAGS $GLU_CFLAGS"
3232 -LIBS="$LIBS $GL_LIBS $GLU_LIBS"
3233 +LIBS="$GL_LIBS $GLU_LIBS $LIBS"
3235 # Checks for header files.
3237 @@ -7205,7 +7524,7 @@
3238 fi
3241 -LIBS="$LIBS -lSDL_image"
3242 +LIBS="-lSDL_image -lpng -ljpeg $LIBS"
3244 ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL_mixer.h" "ac_cv_header_SDL_SDL_mixer_h" "$ac_includes_default"
3245 if test "x$ac_cv_header_SDL_SDL_mixer_h" = xyes; then :
3246 @@ -7216,7 +7535,7 @@
3247 fi
3250 -LIBS="$LIBS -lSDL_mixer"
3251 +LIBS="-lSDL_mixer -lmikmod -lvorbisfile -lvorbis -logg $LIBS"
3253 # Set PACKAGE PREFIX
3255 @@ -7773,6 +8092,65 @@
3256 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3257 ac_compiler_gnu=$ac_cv_c_compiler_gnu
3259 +ac_ext=c
3260 +ac_cpp='$CPP $CPPFLAGS'
3261 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3262 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3263 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
3264 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
3265 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
3266 +if ${am_cv_prog_cc_c_o+:} false; then :
3267 + $as_echo_n "(cached) " >&6
3268 +else
3269 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3270 +/* end confdefs.h. */
3271 +
3272 +int
3273 +main ()
3274 +{
3275 +
3276 + ;
3277 + return 0;
3278 +}
3279 +_ACEOF
3280 + # Make sure it works both with $CC and with simple cc.
3281 + # Following AC_PROG_CC_C_O, we do the test twice because some
3282 + # compilers refuse to overwrite an existing .o file with -o,
3283 + # though they will create one.
3284 + am_cv_prog_cc_c_o=yes
3285 + for am_i in 1 2; do
3286 + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
3287 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
3288 + ac_status=$?
3289 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3290 + (exit $ac_status); } \
3291 + && test -f conftest2.$ac_objext; then
3292 + : OK
3293 + else
3294 + am_cv_prog_cc_c_o=no
3295 + break
3296 + fi
3297 + done
3298 + rm -f core conftest*
3299 + unset am_i
3300 +fi
3301 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
3302 +$as_echo "$am_cv_prog_cc_c_o" >&6; }
3303 +if test "$am_cv_prog_cc_c_o" != yes; then
3304 + # Losing compiler, so override with the script.
3305 + # FIXME: It is wrong to rewrite CC.
3306 + # But if we don't then we get into trouble of one sort or another.
3307 + # A longer-term fix would be to have automake use am__CC in this case,
3308 + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3309 + CC="$am_aux_dir/compile $CC"
3310 +fi
3311 +ac_ext=c
3312 +ac_cpp='$CPP $CPPFLAGS'
3313 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3314 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3315 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
3316 +
3317 +
3318 depcc="$CC" am_compiler_list=
3320 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
3321 @@ -7784,8 +8162,8 @@
3322 # We make a subdir and do the tests there. Otherwise we can end up
3323 # making bogus files that we don't know about and never remove. For
3324 # instance it was reported that on HP-UX the gcc test will end up
3325 - # making a dummy file named `D' -- because `-MD' means `put the output
3326 - # in D'.
3327 + # making a dummy file named 'D' -- because '-MD' means "put the output
3328 + # in D".
3329 rm -rf conftest.dir
3330 mkdir conftest.dir
3331 # Copy depcomp to subdir because otherwise we won't find it if we're
3332 @@ -7820,16 +8198,16 @@
3333 : > sub/conftest.c
3334 for i in 1 2 3 4 5 6; do
3335 echo '#include "conftst'$i'.h"' >> sub/conftest.c
3336 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3337 - # Solaris 8's {/usr,}/bin/sh.
3338 - touch sub/conftst$i.h
3339 + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
3340 + # Solaris 10 /bin/sh.
3341 + echo '/* dummy */' > sub/conftst$i.h
3342 done
3343 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3345 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
3346 + # We check with '-c' and '-o' for the sake of the "dashmstdout"
3347 # mode. It turns out that the SunPro C++ compiler does not properly
3348 - # handle `-M -o', and we need to detect this. Also, some Intel
3349 - # versions had trouble with output in subdirs
3350 + # handle '-M -o', and we need to detect this. Also, some Intel
3351 + # versions had trouble with output in subdirs.
3352 am__obj=sub/conftest.${OBJEXT-o}
3353 am__minus_obj="-o $am__obj"
3354 case $depmode in
3355 @@ -7838,8 +8216,8 @@
3356 test "$am__universal" = false || continue
3357 ;;
3358 nosideeffect)
3359 - # after this tag, mechanisms are not by side-effect, so they'll
3360 - # only be used when explicitly requested
3361 + # After this tag, mechanisms are not by side-effect, so they'll
3362 + # only be used when explicitly requested.
3363 if test "x$enable_dependency_tracking" = xyes; then
3364 continue
3365 else
3366 @@ -7847,7 +8225,7 @@
3367 fi
3368 ;;
3369 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
3370 - # This compiler won't grok `-c -o', but also, the minuso test has
3371 + # This compiler won't grok '-c -o', but also, the minuso test has
3372 # not run yet. These depmodes are late enough in the game, and
3373 # so weak that their functioning should not be impacted.
3374 am__obj=conftest.${OBJEXT-o}
3375 @@ -15127,7 +15505,6 @@
3377 ac_libobjs=
3378 ac_ltlibobjs=
3379 -U=
3380 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
3381 # 1. Remove the extension, and $U if already installed.
3382 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
3383 @@ -15142,6 +15519,14 @@
3384 LTLIBOBJS=$ac_ltlibobjs
3387 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
3388 +$as_echo_n "checking that generated files are newer than configure... " >&6; }
3389 + if test -n "$am_sleep_pid"; then
3390 + # Hide warnings about reused PIDs.
3391 + wait $am_sleep_pid 2>/dev/null
3392 + fi
3393 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
3394 +$as_echo "done" >&6; }
3395 if test -n "$EXEEXT"; then
3396 am__EXEEXT_TRUE=
3397 am__EXEEXT_FALSE='#'
3398 @@ -16668,7 +17053,7 @@
3399 case "$ac_file" in */Makefile.in)
3400 # Adjust a relative srcdir.
3401 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
3402 - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
3403 + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
3404 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
3405 # In autoconf-2.13 it is called $ac_given_srcdir.
3406 # In autoconf-2.50 it is called $srcdir.
3407 @@ -16684,7 +17069,8 @@
3408 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
3409 rm -f "$ac_dir/POTFILES"
3410 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
3411 - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
3412 + gt_tab=`printf '\t'`
3413 + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
3414 POMAKEFILEDEPS="POTFILES.in"
3415 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
3416 # on $ac_dir but don't depend on user-specified configuration
3417 @@ -16695,12 +17081,12 @@
3418 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
3419 fi
3420 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
3421 - # Hide the ALL_LINGUAS assigment from automake < 1.5.
3422 + # Hide the ALL_LINGUAS assignment from automake < 1.5.
3423 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
3424 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
3425 else
3426 # The set of available languages was given in configure.in.
3427 - # Hide the ALL_LINGUAS assigment from automake < 1.5.
3428 + # Hide the ALL_LINGUAS assignment from automake < 1.5.
3429 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
3430 fi
3431 # Compute POFILES
3432 @@ -16772,7 +17158,7 @@
3433 esac
3434 done ;;
3435 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
3436 - # Autoconf 2.62 quotes --file arguments for eval, but not when files
3437 + # Older Autoconf quotes --file arguments for eval, but not when files
3438 # are listed without --file. Let's play safe and only enable the eval
3439 # if we detect the quoting.
3440 case $CONFIG_FILES in
3441 @@ -16785,7 +17171,7 @@
3442 # Strip MF so we end up with the name of the file.
3443 mf=`echo "$mf" | sed -e 's/:.*$//'`
3444 # Check whether this is an Automake generated Makefile or not.
3445 - # We used to match only the files named `Makefile.in', but
3446 + # We used to match only the files named 'Makefile.in', but
3447 # some people rename them; so instead we look at the file content.
3448 # Grep'ing the first line is not enough: some people post-process
3449 # each Makefile.in and add a new line on top of each file to say so.
3450 @@ -16819,21 +17205,19 @@
3451 continue
3452 fi
3453 # Extract the definition of DEPDIR, am__include, and am__quote
3454 - # from the Makefile without running `make'.
3455 + # from the Makefile without running 'make'.
3456 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
3457 test -z "$DEPDIR" && continue
3458 am__include=`sed -n 's/^am__include = //p' < "$mf"`
3459 - test -z "am__include" && continue
3460 + test -z "$am__include" && continue
3461 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
3462 - # When using ansi2knr, U may be empty or an underscore; expand it
3463 - U=`sed -n 's/^U = //p' < "$mf"`
3464 # Find all dependency output files, they are included files with
3465 # $(DEPDIR) in their names. We invoke sed twice because it is the
3466 # simplest approach to changing $(DEPDIR) to its actual value in the
3467 # expansion.
3468 for file in `sed -n "
3469 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
3470 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
3471 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
3472 # Make sure the directory exists.
3473 test -f "$dirpart/$file" && continue
3474 fdir=`$as_dirname -- "$file" ||
3475 diff -Naur gnujump-1.0.8-orig/configure.in gnujump-1.0.8/configure.in
3476 --- gnujump-1.0.8-orig/configure.in 2017-08-03 00:17:58.979142041 +0200
3477 +++ gnujump-1.0.8/configure.in 2017-08-03 00:34:48.475773768 +0200
3478 @@ -42,7 +42,7 @@
3479 AC_SUBST(GLU_CFLAGS)
3481 CFLAGS="$CFLAGS $GL_CFLAGS $GLU_CFLAGS"
3482 -LIBS="$LIBS $GL_LIBS $GLU_LIBS"
3483 +LIBS="$GL_LIBS $GLU_LIBS $LIBS"
3485 # Checks for header files.
3487 @@ -50,13 +50,13 @@
3488 :,
3489 [ AC_MSG_ERROR([*** Could not find SDL/SDL_image.h ! Install the SDL_image devel package.]) ]
3490 )
3491 -LIBS="$LIBS -lSDL_image"
3492 +LIBS="-lSDL_image -lpng -ljpeg $LIBS"
3494 AC_CHECK_HEADER([SDL/SDL_mixer.h],
3495 :,
3496 [ AC_MSG_ERROR([*** Could not find SDL/SDL_mixer.h ! Install the SDL_mixer devel package.]) ]
3497 )
3498 -LIBS="$LIBS -lSDL_mixer"
3499 +LIBS="-lSDL_mixer -lmikmod -lvorbisfile -lvorbis -logg $LIBS"
3501 # Set PACKAGE PREFIX
3503 diff -Naur gnujump-1.0.8-orig/src/gnujump.h gnujump-1.0.8/src/gnujump.h
3504 --- gnujump-1.0.8-orig/src/gnujump.h 2017-08-03 00:17:58.979142041 +0200
3505 +++ gnujump-1.0.8/src/gnujump.h 2017-08-03 00:22:03.997342571 +0200
3506 @@ -32,7 +32,9 @@
3507 #include <math.h>
3508 #include <stdio.h>
3509 #include <string.h>
3510 +#ifndef __AROS__
3511 #include <malloc.h>
3512 +#endif
3513 #include <stdlib.h>
3514 #include <unistd.h>
3515 #include <time.h>
3516 @@ -93,8 +95,10 @@
3518 #define MAX_CHAR 512
3520 +#ifndef __AROS__
3521 #define TRUE 1
3522 #define FALSE 0
3523 +#endif
3524 #define ON 1
3525 #define OFF 0
3527 diff -Naur gnujump-1.0.8-orig/src/main.c gnujump-1.0.8/src/main.c
3528 --- gnujump-1.0.8-orig/src/main.c 2017-08-03 00:17:58.975142069 +0200
3529 +++ gnujump-1.0.8/src/main.c 2017-08-03 00:25:40.315763585 +0200
3530 @@ -45,13 +45,19 @@
3531 char *replay = NULL;
3533 /* Init gettext */
3534 +#ifndef __AROS__
3535 setlocale (LC_ALL, "");
3536 textdomain (PACKAGE);
3537 bindtextdomain (PACKAGE, LOCALEDIR);
3538 +#endif
3540 /* Get the config file name */
3541 #ifndef WIN32
3542 +#ifdef __AROS__
3543 + homeDir = "/PROGDIR";
3544 +#else
3545 homeDir = getenv ("HOME");
3546 +#endif
3547 cfgFile =
3548 malloc (sizeof (char) *
3549 (strlen (homeDir) + strlen (CONFDIR) + strlen (CFGFILE) + 3));
3550 diff -Naur gnujump-1.0.8-orig/src/setup.c gnujump-1.0.8/src/setup.c
3551 --- gnujump-1.0.8-orig/src/setup.c 2017-08-03 00:17:58.975142069 +0200
3552 +++ gnujump-1.0.8/src/setup.c 2017-08-03 00:28:36.046485273 +0200
3553 @@ -35,7 +35,12 @@
3554 char *cfgDir;
3556 gblOps.aa = 0;
3557 +
3558 +#ifdef __AROS__
3559 + gblOps.useGL = FALSE;
3560 +#else
3561 gblOps.useGL = TRUE;
3562 +#endif
3563 gblOps.w = 0;
3564 gblOps.h = 0;
3565 gblOps.bpp = BPPAUTO;
3566 @@ -54,7 +59,11 @@
3567 gblOps.musvolume = 6;
3569 #ifndef WIN32
3570 +#ifdef __AROS__
3571 + homeDir = "/PROGDIR";
3572 +#else
3573 homeDir = getenv ("HOME");
3574 +#endif
3575 cfgDir = malloc (sizeof (char) * (strlen (homeDir) + strlen (CONFDIR) + 2));
3576 sprintf (cfgDir, "%s/" CONFDIR, homeDir);
3577 if (access (cfgDir, F_OK) < 0)
3578 diff -Naur gnujump-1.0.8-orig/src/surface.h gnujump-1.0.8/src/surface.h
3579 --- gnujump-1.0.8-orig/src/surface.h 2017-08-03 00:17:58.975142069 +0200
3580 +++ gnujump-1.0.8/src/surface.h 2017-08-03 00:22:59.132939418 +0200
3581 @@ -24,8 +24,10 @@
3582 #include "SDL_2dgl.h"
3584 #define LARGE_GL -1
3585 +#ifndef __AROS__
3586 #define TRUE 1
3587 #define FALSE 0
3588 +#endif
3590 /* MY SURFACE TYPE */
3591 typedef struct surface