summaryrefslogtreecommitdiffstats
path: root/scilab/aclocal.m4
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2013-08-21 14:09:53 +0200
committerClément DAVID <clement.david@scilab-enterprises.com>2013-08-21 17:50:38 +0200
commit4457d94705f3f9c0c615ea1cf921919a652b2821 (patch)
treedd0bfcd2171f3a0c9efd3b5d8a42c92f08add356 /scilab/aclocal.m4
parent906725b13af68cadd3acf57d2216ab91e02bd827 (diff)
downloadscilab-4457d94705f3f9c0c615ea1cf921919a652b2821.zip
scilab-4457d94705f3f9c0c615ea1cf921919a652b2821.tar.gz
New autotools version
Change-Id: I3c222e1c498c19774a68cce32c487961e61f0dfb
Diffstat (limited to 'scilab/aclocal.m4')
-rw-r--r--scilab/aclocal.m4949
1 files changed, 576 insertions, 373 deletions
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index 68f6a0c..1239349 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -1,8 +1,7 @@
1# generated automatically by aclocal 1.11.6 -*- Autoconf -*- 1# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
2
3# Copyright (C) 1996-2013 Free Software Foundation, Inc.
2 4
3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5# Inc.
6# This file is free software; the Free Software Foundation 5# This file is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 6# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 7# with or without modifications, as long as this notice is preserved.
@@ -12,16 +11,17 @@
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 11# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 12# PARTICULAR PURPOSE.
14 13
14m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15m4_ifndef([AC_AUTOCONF_VERSION], 15m4_ifndef([AC_AUTOCONF_VERSION],
16 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 16 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, 17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18[m4_warning([this file was generated for autoconf 2.69. 18[m4_warning([this file was generated for autoconf 2.69.
19You have another version of autoconf. It may work, but is not guaranteed to. 19You have another version of autoconf. It may work, but is not guaranteed to.
20If you have problems, you may need to regenerate the build system entirely. 20If you have problems, you may need to regenerate the build system entirely.
21To do so, use the procedure documented by the package, typically `autoreconf'.])]) 21To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22 22
23# gettext.m4 serial 63 (gettext-0.18) 23# gettext.m4 serial 66 (gettext-0.18.2)
24dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. 24dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
25dnl This file is free software; the Free Software Foundation 25dnl This file is free software; the Free Software Foundation
26dnl gives unlimited permission to copy and/or distribute it, 26dnl gives unlimited permission to copy and/or distribute it,
27dnl with or without modifications, as long as this notice is preserved. 27dnl with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is
57dnl 'need-formatstring-macros', then GNU gettext implementations that don't 57dnl 'need-formatstring-macros', then GNU gettext implementations that don't
58dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. 58dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
59dnl INTLDIR is used to find the intl libraries. If empty, 59dnl INTLDIR is used to find the intl libraries. If empty,
60dnl the value `$(top_builddir)/intl/' is used. 60dnl the value '$(top_builddir)/intl/' is used.
61dnl 61dnl
62dnl The result of the configuration is one of three cases: 62dnl The result of the configuration is one of three cases:
63dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled 63dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
@@ -119,7 +119,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
119 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) 119 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
120 ]) 120 ])
121 121
122 dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. 122 dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
123 gt_INTL_MACOSX 123 gt_INTL_MACOSX
124 124
125 dnl Set USE_NLS. 125 dnl Set USE_NLS.
@@ -179,12 +179,18 @@ changequote([,])dnl
179 fi 179 fi
180 180
181 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], 181 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
182 [AC_TRY_LINK([#include <libintl.h> 182 [AC_LINK_IFELSE(
183 [AC_LANG_PROGRAM(
184 [[
185#include <libintl.h>
183$gt_revision_test_code 186$gt_revision_test_code
184extern int _nl_msg_cat_cntr; 187extern int _nl_msg_cat_cntr;
185extern int *_nl_domain_bindings;], 188extern int *_nl_domain_bindings;
186 [bindtextdomain ("", ""); 189 ]],
187return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], 190 [[
191bindtextdomain ("", "");
192return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
193 ]])],
188 [eval "$gt_func_gnugettext_libc=yes"], 194 [eval "$gt_func_gnugettext_libc=yes"],
189 [eval "$gt_func_gnugettext_libc=no"])]) 195 [eval "$gt_func_gnugettext_libc=no"])])
190 196
@@ -205,35 +211,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b
205 gt_save_LIBS="$LIBS" 211 gt_save_LIBS="$LIBS"
206 LIBS="$LIBS $LIBINTL" 212 LIBS="$LIBS $LIBINTL"
207 dnl Now see whether libintl exists and does not depend on libiconv. 213 dnl Now see whether libintl exists and does not depend on libiconv.
208 AC_TRY_LINK([#include <libintl.h> 214 AC_LINK_IFELSE(
215 [AC_LANG_PROGRAM(
216 [[
217#include <libintl.h>
209$gt_revision_test_code 218$gt_revision_test_code
210extern int _nl_msg_cat_cntr; 219extern int _nl_msg_cat_cntr;
211extern 220extern
212#ifdef __cplusplus 221#ifdef __cplusplus
213"C" 222"C"
214#endif 223#endif
215const char *_nl_expand_alias (const char *);], 224const char *_nl_expand_alias (const char *);
216 [bindtextdomain ("", ""); 225 ]],
217return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], 226 [[
227bindtextdomain ("", "");
228return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
229 ]])],
218 [eval "$gt_func_gnugettext_libintl=yes"], 230 [eval "$gt_func_gnugettext_libintl=yes"],
219 [eval "$gt_func_gnugettext_libintl=no"]) 231 [eval "$gt_func_gnugettext_libintl=no"])
220 dnl Now see whether libintl exists and depends on libiconv. 232 dnl Now see whether libintl exists and depends on libiconv.
221 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then 233 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
222 LIBS="$LIBS $LIBICONV" 234 LIBS="$LIBS $LIBICONV"
223 AC_TRY_LINK([#include <libintl.h> 235 AC_LINK_IFELSE(
236 [AC_LANG_PROGRAM(
237 [[
238#include <libintl.h>
224$gt_revision_test_code 239$gt_revision_test_code
225extern int _nl_msg_cat_cntr; 240extern int _nl_msg_cat_cntr;
226extern 241extern
227#ifdef __cplusplus 242#ifdef __cplusplus
228"C" 243"C"
229#endif 244#endif
230const char *_nl_expand_alias (const char *);], 245const char *_nl_expand_alias (const char *);
231 [bindtextdomain ("", ""); 246 ]],
232return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], 247 [[
233 [LIBINTL="$LIBINTL $LIBICONV" 248bindtextdomain ("", "");
234 LTLIBINTL="$LTLIBINTL $LTLIBICONV" 249return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
235 eval "$gt_func_gnugettext_libintl=yes" 250 ]])],
236 ]) 251 [LIBINTL="$LIBINTL $LIBICONV"
252 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
253 eval "$gt_func_gnugettext_libintl=yes"
254 ])
237 fi 255 fi
238 CPPFLAGS="$gt_save_CPPFLAGS" 256 CPPFLAGS="$gt_save_CPPFLAGS"
239 LIBS="$gt_save_LIBS"]) 257 LIBS="$gt_save_LIBS"])
@@ -404,8 +422,8 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED],
404dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) 422dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
405AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) 423AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
406 424
407# iconv.m4 serial 11 (gettext-0.18.1) 425# iconv.m4 serial 18 (gettext-0.18.2)
408dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. 426dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc.
409dnl This file is free software; the Free Software Foundation 427dnl This file is free software; the Free Software Foundation
410dnl gives unlimited permission to copy and/or distribute it, 428dnl gives unlimited permission to copy and/or distribute it,
411dnl with or without modifications, as long as this notice is preserved. 429dnl with or without modifications, as long as this notice is preserved.
@@ -436,27 +454,35 @@ AC_DEFUN([AM_ICONV_LINK],
436 dnl Add $INCICONV to CPPFLAGS before performing the following checks, 454 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
437 dnl because if the user has installed libiconv and not disabled its use 455 dnl because if the user has installed libiconv and not disabled its use
438 dnl via --without-libiconv-prefix, he wants to use it. The first 456 dnl via --without-libiconv-prefix, he wants to use it. The first
439 dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. 457 dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
440 am_save_CPPFLAGS="$CPPFLAGS" 458 am_save_CPPFLAGS="$CPPFLAGS"
441 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) 459 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
442 460
443 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ 461 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
444 am_cv_func_iconv="no, consider installing GNU libiconv" 462 am_cv_func_iconv="no, consider installing GNU libiconv"
445 am_cv_lib_iconv=no 463 am_cv_lib_iconv=no
446 AC_TRY_LINK([#include <stdlib.h> 464 AC_LINK_IFELSE(
447#include <iconv.h>], 465 [AC_LANG_PROGRAM(
448 [iconv_t cd = iconv_open("",""); 466 [[
449 iconv(cd,NULL,NULL,NULL,NULL); 467#include <stdlib.h>
450 iconv_close(cd);], 468#include <iconv.h>
469 ]],
470 [[iconv_t cd = iconv_open("","");
471 iconv(cd,NULL,NULL,NULL,NULL);
472 iconv_close(cd);]])],
451 [am_cv_func_iconv=yes]) 473 [am_cv_func_iconv=yes])
452 if test "$am_cv_func_iconv" != yes; then 474 if test "$am_cv_func_iconv" != yes; then
453 am_save_LIBS="$LIBS" 475 am_save_LIBS="$LIBS"
454 LIBS="$LIBS $LIBICONV" 476 LIBS="$LIBS $LIBICONV"
455 AC_TRY_LINK([#include <stdlib.h> 477 AC_LINK_IFELSE(
456#include <iconv.h>], 478 [AC_LANG_PROGRAM(
457 [iconv_t cd = iconv_open("",""); 479 [[
458 iconv(cd,NULL,NULL,NULL,NULL); 480#include <stdlib.h>
459 iconv_close(cd);], 481#include <iconv.h>
482 ]],
483 [[iconv_t cd = iconv_open("","");
484 iconv(cd,NULL,NULL,NULL,NULL);
485 iconv_close(cd);]])],
460 [am_cv_lib_iconv=yes] 486 [am_cv_lib_iconv=yes]
461 [am_cv_func_iconv=yes]) 487 [am_cv_func_iconv=yes])
462 LIBS="$am_save_LIBS" 488 LIBS="$am_save_LIBS"
@@ -464,16 +490,19 @@ AC_DEFUN([AM_ICONV_LINK],
464 ]) 490 ])
465 if test "$am_cv_func_iconv" = yes; then 491 if test "$am_cv_func_iconv" = yes; then
466 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ 492 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
467 dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. 493 dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
494 dnl Solaris 10.
468 am_save_LIBS="$LIBS" 495 am_save_LIBS="$LIBS"
469 if test $am_cv_lib_iconv = yes; then 496 if test $am_cv_lib_iconv = yes; then
470 LIBS="$LIBS $LIBICONV" 497 LIBS="$LIBS $LIBICONV"
471 fi 498 fi
472 AC_TRY_RUN([ 499 AC_RUN_IFELSE(
500 [AC_LANG_SOURCE([[
473#include <iconv.h> 501#include <iconv.h>
474#include <string.h> 502#include <string.h>
475int main () 503int main ()
476{ 504{
505 int result = 0;
477 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful 506 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
478 returns. */ 507 returns. */
479 { 508 {
@@ -490,7 +519,8 @@ int main ()
490 (char **) &inptr, &inbytesleft, 519 (char **) &inptr, &inbytesleft,
491 &outptr, &outbytesleft); 520 &outptr, &outbytesleft);
492 if (res == 0) 521 if (res == 0)
493 return 1; 522 result |= 1;
523 iconv_close (cd_utf8_to_88591);
494 } 524 }
495 } 525 }
496 /* Test against Solaris 10 bug: Failures are not distinguishable from 526 /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -509,7 +539,27 @@ int main ()
509 (char **) &inptr, &inbytesleft, 539 (char **) &inptr, &inbytesleft,
510 &outptr, &outbytesleft); 540 &outptr, &outbytesleft);
511 if (res == 0) 541 if (res == 0)
512 return 1; 542 result |= 2;
543 iconv_close (cd_ascii_to_88591);
544 }
545 }
546 /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
547 {
548 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
549 if (cd_88591_to_utf8 != (iconv_t)(-1))
550 {
551 static const char input[] = "\304";
552 static char buf[2] = { (char)0xDE, (char)0xAD };
553 const char *inptr = input;
554 size_t inbytesleft = 1;
555 char *outptr = buf;
556 size_t outbytesleft = 1;
557 size_t res = iconv (cd_88591_to_utf8,
558 (char **) &inptr, &inbytesleft,
559 &outptr, &outbytesleft);
560 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
561 result |= 4;
562 iconv_close (cd_88591_to_utf8);
513 } 563 }
514 } 564 }
515#if 0 /* This bug could be worked around by the caller. */ 565#if 0 /* This bug could be worked around by the caller. */
@@ -528,7 +578,8 @@ int main ()
528 (char **) &inptr, &inbytesleft, 578 (char **) &inptr, &inbytesleft,
529 &outptr, &outbytesleft); 579 &outptr, &outbytesleft);
530 if ((int)res > 0) 580 if ((int)res > 0)
531 return 1; 581 result |= 8;
582 iconv_close (cd_88591_to_utf8);
532 } 583 }
533 } 584 }
534#endif 585#endif
@@ -542,13 +593,19 @@ int main ()
542 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) 593 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
543 /* Try HP-UX names. */ 594 /* Try HP-UX names. */
544 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) 595 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
545 return 1; 596 result |= 16;
546 return 0; 597 return result;
547}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], 598}]])],
548 [case "$host_os" in 599 [am_cv_func_iconv_works=yes],
600 [am_cv_func_iconv_works=no],
601 [
602changequote(,)dnl
603 case "$host_os" in
549 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; 604 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
550 *) am_cv_func_iconv_works="guessing yes" ;; 605 *) am_cv_func_iconv_works="guessing yes" ;;
551 esac]) 606 esac
607changequote([,])dnl
608 ])
552 LIBS="$am_save_LIBS" 609 LIBS="$am_save_LIBS"
553 ]) 610 ])
554 case "$am_cv_func_iconv_works" in 611 case "$am_cv_func_iconv_works" in
@@ -589,38 +646,53 @@ m4_define([gl_iconv_AC_DEFUN],
589 m4_version_prereq([2.64], 646 m4_version_prereq([2.64],
590 [[AC_DEFUN_ONCE( 647 [[AC_DEFUN_ONCE(
591 [$1], [$2])]], 648 [$1], [$2])]],
592 [[AC_DEFUN( 649 [m4_ifdef([gl_00GNULIB],
593 [$1], [$2])]])) 650 [[AC_DEFUN_ONCE(
651 [$1], [$2])]],
652 [[AC_DEFUN(
653 [$1], [$2])]])]))
594gl_iconv_AC_DEFUN([AM_ICONV], 654gl_iconv_AC_DEFUN([AM_ICONV],
595[ 655[
596 AM_ICONV_LINK 656 AM_ICONV_LINK
597 if test "$am_cv_func_iconv" = yes; then 657 if test "$am_cv_func_iconv" = yes; then
598 AC_MSG_CHECKING([for iconv declaration]) 658 AC_MSG_CHECKING([for iconv declaration])
599 AC_CACHE_VAL([am_cv_proto_iconv], [ 659 AC_CACHE_VAL([am_cv_proto_iconv], [
600 AC_TRY_COMPILE([ 660 AC_COMPILE_IFELSE(
661 [AC_LANG_PROGRAM(
662 [[
601#include <stdlib.h> 663#include <stdlib.h>
602#include <iconv.h> 664#include <iconv.h>
603extern 665extern
604#ifdef __cplusplus 666#ifdef __cplusplus
605"C" 667"C"
606#endif 668#endif
607#if defined(__STDC__) || defined(__cplusplus) 669#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
608size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); 670size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
609#else 671#else
610size_t iconv(); 672size_t iconv();
611#endif 673#endif
612], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) 674 ]],
675 [[]])],
676 [am_cv_proto_iconv_arg1=""],
677 [am_cv_proto_iconv_arg1="const"])
613 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);"]) 678 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);"])
614 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` 679 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
615 AC_MSG_RESULT([ 680 AC_MSG_RESULT([
616 $am_cv_proto_iconv]) 681 $am_cv_proto_iconv])
617 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], 682 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
618 [Define as const if the declaration of iconv() needs const.]) 683 [Define as const if the declaration of iconv() needs const.])
684 dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
685 m4_ifdef([gl_ICONV_H_DEFAULTS],
686 [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
687 if test -n "$am_cv_proto_iconv_arg1"; then
688 ICONV_CONST="const"
689 fi
690 ])
619 fi 691 fi
620]) 692])
621 693
622# intlmacosx.m4 serial 3 (gettext-0.18) 694# intlmacosx.m4 serial 5 (gettext-0.18.2)
623dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. 695dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
624dnl This file is free software; the Free Software Foundation 696dnl This file is free software; the Free Software Foundation
625dnl gives unlimited permission to copy and/or distribute it, 697dnl gives unlimited permission to copy and/or distribute it,
626dnl with or without modifications, as long as this notice is preserved. 698dnl with or without modifications, as long as this notice is preserved.
@@ -634,35 +706,40 @@ dnl by the GNU Library General Public License, and the rest of the GNU
634dnl gettext package package is covered by the GNU General Public License. 706dnl gettext package package is covered by the GNU General Public License.
635dnl They are *not* in the public domain. 707dnl They are *not* in the public domain.
636 708
637dnl Checks for special options needed on MacOS X. 709dnl Checks for special options needed on Mac OS X.
638dnl Defines INTL_MACOSX_LIBS. 710dnl Defines INTL_MACOSX_LIBS.
639AC_DEFUN([gt_INTL_MACOSX], 711AC_DEFUN([gt_INTL_MACOSX],
640[ 712[
641 dnl Check for API introduced in MacOS X 10.2. 713 dnl Check for API introduced in Mac OS X 10.2.
642 AC_CACHE_CHECK([for CFPreferencesCopyAppValue], 714 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
643 [gt_cv_func_CFPreferencesCopyAppValue], 715 [gt_cv_func_CFPreferencesCopyAppValue],
644 [gt_save_LIBS="$LIBS" 716 [gt_save_LIBS="$LIBS"
645 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 717 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
646 AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], 718 AC_LINK_IFELSE(
647 [CFPreferencesCopyAppValue(NULL, NULL)], 719 [AC_LANG_PROGRAM(
720 [[#include <CoreFoundation/CFPreferences.h>]],
721 [[CFPreferencesCopyAppValue(NULL, NULL)]])],
648 [gt_cv_func_CFPreferencesCopyAppValue=yes], 722 [gt_cv_func_CFPreferencesCopyAppValue=yes],
649 [gt_cv_func_CFPreferencesCopyAppValue=no]) 723 [gt_cv_func_CFPreferencesCopyAppValue=no])
650 LIBS="$gt_save_LIBS"]) 724 LIBS="$gt_save_LIBS"])
651 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then 725 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
652 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], 726 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
653 [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) 727 [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
654 fi 728 fi
655 dnl Check for API introduced in MacOS X 10.3. 729 dnl Check for API introduced in Mac OS X 10.3.
656 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], 730 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
657 [gt_save_LIBS="$LIBS" 731 [gt_save_LIBS="$LIBS"
658 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 732 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
659 AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], 733 AC_LINK_IFELSE(
734 [AC_LANG_PROGRAM(
735 [[#include <CoreFoundation/CFLocale.h>]],
736 [[CFLocaleCopyCurrent();]])],
660 [gt_cv_func_CFLocaleCopyCurrent=yes], 737 [gt_cv_func_CFLocaleCopyCurrent=yes],
661 [gt_cv_func_CFLocaleCopyCurrent=no]) 738 [gt_cv_func_CFLocaleCopyCurrent=no])
662 LIBS="$gt_save_LIBS"]) 739 LIBS="$gt_save_LIBS"])
663 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then 740 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
664 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], 741 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
665 [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) 742 [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
666 fi 743 fi
667 INTL_MACOSX_LIBS= 744 INTL_MACOSX_LIBS=
668 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then 745 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
@@ -671,8 +748,8 @@ AC_DEFUN([gt_INTL_MACOSX],
671 AC_SUBST([INTL_MACOSX_LIBS]) 748 AC_SUBST([INTL_MACOSX_LIBS])
672]) 749])
673 750
674# lib-link.m4 serial 21 (gettext-0.18) 751# lib-link.m4 serial 26 (gettext-0.18.2)
675dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. 752dnl Copyright (C) 2001-2013 Free Software Foundation, Inc.
676dnl This file is free software; the Free Software Foundation 753dnl This file is free software; the Free Software Foundation
677dnl gives unlimited permission to copy and/or distribute it, 754dnl gives unlimited permission to copy and/or distribute it,
678dnl with or without modifications, as long as this notice is preserved. 755dnl with or without modifications, as long as this notice is preserved.
@@ -691,9 +768,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
691[ 768[
692 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 769 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
693 AC_REQUIRE([AC_LIB_RPATH]) 770 AC_REQUIRE([AC_LIB_RPATH])
694 pushdef([Name],[translit([$1],[./-], [___])]) 771 pushdef([Name],[m4_translit([$1],[./+-], [____])])
695 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 772 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
696 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 773 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
697 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ 774 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
698 AC_LIB_LINKFLAGS_BODY([$1], [$2]) 775 AC_LIB_LINKFLAGS_BODY([$1], [$2])
699 ac_cv_lib[]Name[]_libs="$LIB[]NAME" 776 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -731,9 +808,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
731[ 808[
732 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 809 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
733 AC_REQUIRE([AC_LIB_RPATH]) 810 AC_REQUIRE([AC_LIB_RPATH])
734 pushdef([Name],[translit([$1],[./-], [___])]) 811 pushdef([Name],[m4_translit([$1],[./+-], [____])])
735 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 812 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
736 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 813 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
737 814
738 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME 815 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
739 dnl accordingly. 816 dnl accordingly.
@@ -758,7 +835,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
758 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; 835 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
759 *) LIBS="$LIB[]NAME $LIBS" ;; 836 *) LIBS="$LIB[]NAME $LIBS" ;;
760 esac 837 esac
761 AC_TRY_LINK([$3], [$4], 838 AC_LINK_IFELSE(
839 [AC_LANG_PROGRAM([[$3]], [[$4]])],
762 [ac_cv_lib[]Name=yes], 840 [ac_cv_lib[]Name=yes],
763 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) 841 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
764 LIBS="$ac_save_LIBS" 842 LIBS="$ac_save_LIBS"
@@ -788,6 +866,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
788dnl Determine the platform dependent parameters needed to use rpath: 866dnl Determine the platform dependent parameters needed to use rpath:
789dnl acl_libext, 867dnl acl_libext,
790dnl acl_shlibext, 868dnl acl_shlibext,
869dnl acl_libname_spec,
870dnl acl_library_names_spec,
791dnl acl_hardcode_libdir_flag_spec, 871dnl acl_hardcode_libdir_flag_spec,
792dnl acl_hardcode_libdir_separator, 872dnl acl_hardcode_libdir_separator,
793dnl acl_hardcode_direct, 873dnl acl_hardcode_direct,
@@ -830,15 +910,15 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
830dnl macro call that searches for libname. 910dnl macro call that searches for libname.
831AC_DEFUN([AC_LIB_FROMPACKAGE], 911AC_DEFUN([AC_LIB_FROMPACKAGE],
832[ 912[
833 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 913 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
834 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 914 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
835 define([acl_frompackage_]NAME, [$2]) 915 define([acl_frompackage_]NAME, [$2])
836 popdef([NAME]) 916 popdef([NAME])
837 pushdef([PACK],[$2]) 917 pushdef([PACK],[$2])
838 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], 918 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
839 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 919 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
840 define([acl_libsinpackage_]PACKUP, 920 define([acl_libsinpackage_]PACKUP,
841 m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) 921 m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
842 popdef([PACKUP]) 922 popdef([PACKUP])
843 popdef([PACK]) 923 popdef([PACK])
844]) 924])
@@ -851,14 +931,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
851AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 931AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
852[ 932[
853 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) 933 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
854 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 934 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
855 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 935 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
856 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) 936 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
857 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], 937 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
858 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 938 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
859 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) 939 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
860 dnl Autoconf >= 2.61 supports dots in --with options. 940 dnl Autoconf >= 2.61 supports dots in --with options.
861 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) 941 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
862 dnl By default, look in $includedir and $libdir. 942 dnl By default, look in $includedir and $libdir.
863 use_additional=yes 943 use_additional=yes
864 AC_LIB_WITH_FINAL_PREFIX([ 944 AC_LIB_WITH_FINAL_PREFIX([
@@ -915,7 +995,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
915 names_already_handled="$names_already_handled $name" 995 names_already_handled="$names_already_handled $name"
916 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS 996 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
917 dnl or AC_LIB_HAVE_LINKFLAGS call. 997 dnl or AC_LIB_HAVE_LINKFLAGS call.
918 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` 998 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
919 eval value=\"\$HAVE_LIB$uppername\" 999 eval value=\"\$HAVE_LIB$uppername\"
920 if test -n "$value"; then 1000 if test -n "$value"; then
921 if test "$value" = yes; then 1001 if test "$value" = yes; then
@@ -1447,7 +1527,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
1447]) 1527])
1448 1528
1449# lib-prefix.m4 serial 7 (gettext-0.18) 1529# lib-prefix.m4 serial 7 (gettext-0.18)
1450dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. 1530dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc.
1451dnl This file is free software; the Free Software Foundation 1531dnl This file is free software; the Free Software Foundation
1452dnl gives unlimited permission to copy and/or distribute it, 1532dnl gives unlimited permission to copy and/or distribute it,
1453dnl with or without modifications, as long as this notice is preserved. 1533dnl with or without modifications, as long as this notice is preserved.
@@ -1672,7 +1752,7 @@ sixtyfour bits
1672]) 1752])
1673 1753
1674# nls.m4 serial 5 (gettext-0.18) 1754# nls.m4 serial 5 (gettext-0.18)
1675dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, 1755dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
1676dnl Inc. 1756dnl Inc.
1677dnl This file is free software; the Free Software Foundation 1757dnl This file is free software; the Free Software Foundation
1678dnl gives unlimited permission to copy and/or distribute it, 1758dnl gives unlimited permission to copy and/or distribute it,
@@ -1704,8 +1784,8 @@ AC_DEFUN([AM_NLS],
1704 AC_SUBST([USE_NLS]) 1784 AC_SUBST([USE_NLS])
1705]) 1785])
1706 1786
1707# po.m4 serial 17 (gettext-0.18) 1787# po.m4 serial 21 (gettext-0.18.3)
1708dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. 1788dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
1709dnl This file is free software; the Free Software Foundation 1789dnl This file is free software; the Free Software Foundation
1710dnl gives unlimited permission to copy and/or distribute it, 1790dnl gives unlimited permission to copy and/or distribute it,
1711dnl with or without modifications, as long as this notice is preserved. 1791dnl with or without modifications, as long as this notice is preserved.
@@ -1723,14 +1803,15 @@ dnl Authors:
1723dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 1803dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1724dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 1804dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1725 1805
1726AC_PREREQ([2.50]) 1806AC_PREREQ([2.60])
1727 1807
1728dnl Checks for all prerequisites of the po subdirectory. 1808dnl Checks for all prerequisites of the po subdirectory.
1729AC_DEFUN([AM_PO_SUBDIRS], 1809AC_DEFUN([AM_PO_SUBDIRS],
1730[ 1810[
1731 AC_REQUIRE([AC_PROG_MAKE_SET])dnl 1811 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1732 AC_REQUIRE([AC_PROG_INSTALL])dnl 1812 AC_REQUIRE([AC_PROG_INSTALL])dnl
1733 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake 1813 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1814 AC_REQUIRE([AC_PROG_SED])dnl
1734 AC_REQUIRE([AM_NLS])dnl 1815 AC_REQUIRE([AM_NLS])dnl
1735 1816
1736 dnl Release version of the gettext macros. This is used to ensure that 1817 dnl Release version of the gettext macros. This is used to ensure that
@@ -1808,7 +1889,7 @@ changequote([,])dnl
1808 case "$ac_file" in */Makefile.in) 1889 case "$ac_file" in */Makefile.in)
1809 # Adjust a relative srcdir. 1890 # Adjust a relative srcdir.
1810 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` 1891 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
1811 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" 1892 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
1812 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` 1893 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
1813 # In autoconf-2.13 it is called $ac_given_srcdir. 1894 # In autoconf-2.13 it is called $ac_given_srcdir.
1814 # In autoconf-2.50 it is called $srcdir. 1895 # In autoconf-2.50 it is called $srcdir.
@@ -1824,7 +1905,8 @@ changequote([,])dnl
1824 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then 1905 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
1825 rm -f "$ac_dir/POTFILES" 1906 rm -f "$ac_dir/POTFILES"
1826 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" 1907 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
1827 cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" 1908 gt_tab=`printf '\t'`
1909 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"
1828 POMAKEFILEDEPS="POTFILES.in" 1910 POMAKEFILEDEPS="POTFILES.in"
1829 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend 1911 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
1830 # on $ac_dir but don't depend on user-specified configuration 1912 # on $ac_dir but don't depend on user-specified configuration
@@ -1835,12 +1917,12 @@ changequote([,])dnl
1835 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" 1917 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
1836 fi 1918 fi
1837 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` 1919 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
1838 # Hide the ALL_LINGUAS assigment from automake < 1.5. 1920 # Hide the ALL_LINGUAS assignment from automake < 1.5.
1839 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 1921 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
1840 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" 1922 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
1841 else 1923 else
1842 # The set of available languages was given in configure.in. 1924 # The set of available languages was given in configure.in.
1843 # Hide the ALL_LINGUAS assigment from automake < 1.5. 1925 # Hide the ALL_LINGUAS assignment from automake < 1.5.
1844 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' 1926 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
1845 fi 1927 fi
1846 # Compute POFILES 1928 # Compute POFILES
@@ -1932,7 +2014,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
1932changequote(,)dnl 2014changequote(,)dnl
1933 # Adjust a relative srcdir. 2015 # Adjust a relative srcdir.
1934 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` 2016 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
1935 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" 2017 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
1936 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` 2018 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
1937 # In autoconf-2.13 it is called $ac_given_srcdir. 2019 # In autoconf-2.13 it is called $ac_given_srcdir.
1938 # In autoconf-2.50 it is called $srcdir. 2020 # In autoconf-2.50 it is called $srcdir.
@@ -1960,6 +2042,7 @@ EOT
1960 fi 2042 fi
1961 2043
1962 # A sed script that extracts the value of VARIABLE from a Makefile. 2044 # A sed script that extracts the value of VARIABLE from a Makefile.
2045 tab=`printf '\t'`
1963 sed_x_variable=' 2046 sed_x_variable='
1964# Test if the hold space is empty. 2047# Test if the hold space is empty.
1965x 2048x
@@ -1967,9 +2050,9 @@ s/P/P/
1967x 2050x
1968ta 2051ta
1969# Yes it was empty. Look if we have the expected variable definition. 2052# Yes it was empty. Look if we have the expected variable definition.
1970/^[ ]*VARIABLE[ ]*=/{ 2053/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
1971 # Seen the first line of the variable definition. 2054 # Seen the first line of the variable definition.
1972 s/^[ ]*VARIABLE[ ]*=// 2055 s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
1973 ba 2056 ba
1974} 2057}
1975bd 2058bd
@@ -2021,7 +2104,7 @@ changequote([,])dnl
2021 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` 2104 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
2022 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` 2105 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
2023 fi 2106 fi
2024 # Hide the ALL_LINGUAS assigment from automake < 1.5. 2107 # Hide the ALL_LINGUAS assignment from automake < 1.5.
2025 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 2108 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
2026 # Compute POFILES 2109 # Compute POFILES
2027 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) 2110 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -2111,14 +2194,15 @@ changequote([,])dnl
2111 fi 2194 fi
2112 2195
2113 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" 2196 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"
2197 tab=`printf '\t'`
2114 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then 2198 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
2115 # Add dependencies that cannot be formulated as a simple suffix rule. 2199 # Add dependencies that cannot be formulated as a simple suffix rule.
2116 for lang in $ALL_LINGUAS; do 2200 for lang in $ALL_LINGUAS; do
2117 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 2201 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
2118 cat >> "$ac_file.tmp" <<EOF 2202 cat >> "$ac_file.tmp" <<EOF
2119$frobbedlang.msg: $lang.po 2203$frobbedlang.msg: $lang.po
2120 @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ 2204${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
2121 \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } 2205${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
2122EOF 2206EOF
2123 done 2207 done
2124 fi 2208 fi
@@ -2128,8 +2212,8 @@ EOF
2128 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/'` 2212 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/'`
2129 cat >> "$ac_file.tmp" <<EOF 2213 cat >> "$ac_file.tmp" <<EOF
2130$frobbedlang/\$(DOMAIN).resources.dll: $lang.po 2214$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
2131 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ 2215${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
2132 \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } 2216${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
2133EOF 2217EOF
2134 done 2218 done
2135 fi 2219 fi
@@ -2154,8 +2238,8 @@ AC_DEFUN([AM_XGETTEXT_OPTION],
2154 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" 2238 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
2155]) 2239])
2156 2240
2157# progtest.m4 serial 6 (gettext-0.18) 2241# progtest.m4 serial 7 (gettext-0.18.2)
2158dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. 2242dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc.
2159dnl This file is free software; the Free Software Foundation 2243dnl This file is free software; the Free Software Foundation
2160dnl gives unlimited permission to copy and/or distribute it, 2244dnl gives unlimited permission to copy and/or distribute it,
2161dnl with or without modifications, as long as this notice is preserved. 2245dnl with or without modifications, as long as this notice is preserved.
@@ -2183,15 +2267,14 @@ AC_DEFUN([AM_PATH_PROG_WITH_TEST],
2183# Prepare PATH_SEPARATOR. 2267# Prepare PATH_SEPARATOR.
2184# The user is always right. 2268# The user is always right.
2185if test "${PATH_SEPARATOR+set}" != set; then 2269if test "${PATH_SEPARATOR+set}" != set; then
2186 echo "#! /bin/sh" >conf$$.sh 2270 # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
2187 echo "exit 0" >>conf$$.sh 2271 # contains only /bin. Note that ksh looks also at the FPATH variable,
2188 chmod +x conf$$.sh 2272 # so we have to set that as well for the test.
2189 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then 2273 PATH_SEPARATOR=:
2190 PATH_SEPARATOR=';' 2274 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2191 else 2275 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2192 PATH_SEPARATOR=: 2276 || PATH_SEPARATOR=';'
2193 fi 2277 }
2194 rm -f conf$$.sh
2195fi 2278fi
2196 2279
2197# Find out how to test for executable files. Don't use a zero-byte file, 2280# Find out how to test for executable files. Don't use a zero-byte file,
@@ -2247,25 +2330,22 @@ fi
2247AC_SUBST([$1])dnl 2330AC_SUBST([$1])dnl
2248]) 2331])
2249 2332
2250# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software 2333# Copyright (C) 2002-2013 Free Software Foundation, Inc.
2251# Foundation, Inc.
2252# 2334#
2253# This file is free software; the Free Software Foundation 2335# This file is free software; the Free Software Foundation
2254# gives unlimited permission to copy and/or distribute it, 2336# gives unlimited permission to copy and/or distribute it,
2255# with or without modifications, as long as this notice is preserved. 2337# with or without modifications, as long as this notice is preserved.
2256 2338
2257# serial 1
2258
2259# AM_AUTOMAKE_VERSION(VERSION) 2339# AM_AUTOMAKE_VERSION(VERSION)
2260# ---------------------------- 2340# ----------------------------
2261# Automake X.Y traces this macro to ensure aclocal.m4 has been 2341# Automake X.Y traces this macro to ensure aclocal.m4 has been
2262# generated from the m4 files accompanying Automake X.Y. 2342# generated from the m4 files accompanying Automake X.Y.
2263# (This private macro should not be called outside this file.) 2343# (This private macro should not be called outside this file.)
2264AC_DEFUN([AM_AUTOMAKE_VERSION], 2344AC_DEFUN([AM_AUTOMAKE_VERSION],
2265[am__api_version='1.11' 2345[am__api_version='1.13'
2266dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 2346dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
2267dnl require some minimum version. Point them to the right macro. 2347dnl require some minimum version. Point them to the right macro.
2268m4_if([$1], [1.11.6], [], 2348m4_if([$1], [1.13.3], [],
2269 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 2349 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
2270]) 2350])
2271 2351
@@ -2281,24 +2361,81 @@ m4_define([_AM_AUTOCONF_VERSION], [])
2281# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. 2361# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
2282# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 2362# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
2283AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 2363AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
2284[AM_AUTOMAKE_VERSION([1.11.6])dnl 2364[AM_AUTOMAKE_VERSION([1.13.3])dnl
2285m4_ifndef([AC_AUTOCONF_VERSION], 2365m4_ifndef([AC_AUTOCONF_VERSION],
2286 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 2366 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2287_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) 2367_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
2288 2368
2369# Copyright (C) 2011-2013 Free Software Foundation, Inc.
2370#
2371# This file is free software; the Free Software Foundation
2372# gives unlimited permission to copy and/or distribute it,
2373# with or without modifications, as long as this notice is preserved.
2374
2375# AM_PROG_AR([ACT-IF-FAIL])
2376# -------------------------
2377# Try to determine the archiver interface, and trigger the ar-lib wrapper
2378# if it is needed. If the detection of archiver interface fails, run
2379# ACT-IF-FAIL (default is to abort configure with a proper error message).
2380AC_DEFUN([AM_PROG_AR],
2381[AC_BEFORE([$0], [LT_INIT])dnl
2382AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
2383AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2384AC_REQUIRE_AUX_FILE([ar-lib])dnl
2385AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
2386: ${AR=ar}
2387
2388AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
2389 [am_cv_ar_interface=ar
2390 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
2391 [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
2392 AC_TRY_EVAL([am_ar_try])
2393 if test "$ac_status" -eq 0; then
2394 am_cv_ar_interface=ar
2395 else
2396 am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
2397 AC_TRY_EVAL([am_ar_try])
2398 if test "$ac_status" -eq 0; then
2399 am_cv_ar_interface=lib
2400 else
2401 am_cv_ar_interface=unknown
2402 fi
2403 fi
2404 rm -f conftest.lib libconftest.a
2405 ])
2406 ])
2407
2408case $am_cv_ar_interface in
2409ar)
2410 ;;
2411lib)
2412 # Microsoft lib, so override with the ar-lib wrapper script.
2413 # FIXME: It is wrong to rewrite AR.
2414 # But if we don't then we get into trouble of one sort or another.
2415 # A longer-term fix would be to have automake use am__AR in this case,
2416 # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
2417 # similar.
2418 AR="$am_aux_dir/ar-lib $AR"
2419 ;;
2420unknown)
2421 m4_default([$1],
2422 [AC_MSG_ERROR([could not determine $AR interface])])
2423 ;;
2424esac
2425AC_SUBST([AR])dnl
2426])
2427
2289# AM_AUX_DIR_EXPAND -*- Autoconf -*- 2428# AM_AUX_DIR_EXPAND -*- Autoconf -*-
2290 2429
2291# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. 2430# Copyright (C) 2001-2013 Free Software Foundation, Inc.
2292# 2431#
2293# This file is free software; the Free Software Foundation 2432# This file is free software; the Free Software Foundation
2294# gives unlimited permission to copy and/or distribute it, 2433# gives unlimited permission to copy and/or distribute it,
2295# with or without modifications, as long as this notice is preserved. 2434# with or without modifications, as long as this notice is preserved.
2296 2435
2297# serial 1
2298
2299# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets 2436# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
2300# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to 2437# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
2301# `$srcdir', `$srcdir/..', or `$srcdir/../..'. 2438# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
2302# 2439#
2303# Of course, Automake must honor this variable whenever it calls a 2440# Of course, Automake must honor this variable whenever it calls a
2304# tool from the auxiliary directory. The problem is that $srcdir (and 2441# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -2317,7 +2454,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
2317# 2454#
2318# The reason of the latter failure is that $top_srcdir and $ac_aux_dir 2455# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
2319# are both prefixed by $srcdir. In an in-source build this is usually 2456# are both prefixed by $srcdir. In an in-source build this is usually
2320# harmless because $srcdir is `.', but things will broke when you 2457# harmless because $srcdir is '.', but things will broke when you
2321# start a VPATH build or use an absolute $srcdir. 2458# start a VPATH build or use an absolute $srcdir.
2322# 2459#
2323# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, 2460# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -2343,22 +2480,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
2343 2480
2344# AM_CONDITIONAL -*- Autoconf -*- 2481# AM_CONDITIONAL -*- Autoconf -*-
2345 2482
2346# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 2483# Copyright (C) 1997-2013 Free Software Foundation, Inc.
2347# Free Software Foundation, Inc.
2348# 2484#
2349# This file is free software; the Free Software Foundation 2485# This file is free software; the Free Software Foundation
2350# gives unlimited permission to copy and/or distribute it, 2486# gives unlimited permission to copy and/or distribute it,
2351# with or without modifications, as long as this notice is preserved. 2487# with or without modifications, as long as this notice is preserved.
2352 2488
2353# serial 9
2354
2355# AM_CONDITIONAL(NAME, SHELL-CONDITION) 2489# AM_CONDITIONAL(NAME, SHELL-CONDITION)
2356# ------------------------------------- 2490# -------------------------------------
2357# Define a conditional. 2491# Define a conditional.
2358AC_DEFUN([AM_CONDITIONAL], 2492AC_DEFUN([AM_CONDITIONAL],
2359[AC_PREREQ(2.52)dnl 2493[AC_PREREQ([2.52])dnl
2360 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], 2494 m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
2361 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl 2495 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
2362AC_SUBST([$1_TRUE])dnl 2496AC_SUBST([$1_TRUE])dnl
2363AC_SUBST([$1_FALSE])dnl 2497AC_SUBST([$1_FALSE])dnl
2364_AM_SUBST_NOTMAKE([$1_TRUE])dnl 2498_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -2377,16 +2511,14 @@ AC_CONFIG_COMMANDS_PRE(
2377Usually this means the macro was only invoked conditionally.]]) 2511Usually this means the macro was only invoked conditionally.]])
2378fi])]) 2512fi])])
2379 2513
2380# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2514# Copyright (C) 1999-2013 Free Software Foundation, Inc.
2381# 2010, 2011 Free Software Foundation, Inc.
2382# 2515#
2383# This file is free software; the Free Software Foundation 2516# This file is free software; the Free Software Foundation
2384# gives unlimited permission to copy and/or distribute it, 2517# gives unlimited permission to copy and/or distribute it,
2385# with or without modifications, as long as this notice is preserved. 2518# with or without modifications, as long as this notice is preserved.
2386 2519
2387# serial 12
2388 2520
2389# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be 2521# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
2390# written in clear, in which case automake, when reading aclocal.m4, 2522# written in clear, in which case automake, when reading aclocal.m4,
2391# will think it sees a *use*, and therefore will trigger all it's 2523# will think it sees a *use*, and therefore will trigger all it's
2392# C support machinery. Also note that it means that autoscan, seeing 2524# C support machinery. Also note that it means that autoscan, seeing
@@ -2396,7 +2528,7 @@ fi])])
2396# _AM_DEPENDENCIES(NAME) 2528# _AM_DEPENDENCIES(NAME)
2397# ---------------------- 2529# ----------------------
2398# See how the compiler implements dependency checking. 2530# See how the compiler implements dependency checking.
2399# NAME is "CC", "CXX", "GCJ", or "OBJC". 2531# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
2400# We try a few techniques and use that to set a single cache variable. 2532# We try a few techniques and use that to set a single cache variable.
2401# 2533#
2402# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was 2534# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -2409,12 +2541,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
2409AC_REQUIRE([AM_MAKE_INCLUDE])dnl 2541AC_REQUIRE([AM_MAKE_INCLUDE])dnl
2410AC_REQUIRE([AM_DEP_TRACK])dnl 2542AC_REQUIRE([AM_DEP_TRACK])dnl
2411 2543
2412ifelse([$1], CC, [depcc="$CC" am_compiler_list=], 2544m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
2413 [$1], CXX, [depcc="$CXX" am_compiler_list=], 2545 [$1], [CXX], [depcc="$CXX" am_compiler_list=],
2414 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], 2546 [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
2415 [$1], UPC, [depcc="$UPC" am_compiler_list=], 2547 [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
2416 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], 2548 [$1], [UPC], [depcc="$UPC" am_compiler_list=],
2417 [depcc="$$1" am_compiler_list=]) 2549 [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
2550 [depcc="$$1" am_compiler_list=])
2418 2551
2419AC_CACHE_CHECK([dependency style of $depcc], 2552AC_CACHE_CHECK([dependency style of $depcc],
2420 [am_cv_$1_dependencies_compiler_type], 2553 [am_cv_$1_dependencies_compiler_type],
@@ -2422,8 +2555,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
2422 # We make a subdir and do the tests there. Otherwise we can end up 2555 # We make a subdir and do the tests there. Otherwise we can end up
2423 # making bogus files that we don't know about and never remove. For 2556 # making bogus files that we don't know about and never remove. For
2424 # instance it was reported that on HP-UX the gcc test will end up 2557 # instance it was reported that on HP-UX the gcc test will end up
2425 # making a dummy file named `D' -- because `-MD' means `put the output 2558 # making a dummy file named 'D' -- because '-MD' means "put the output
2426 # in D'. 2559 # in D".
2427 rm -rf conftest.dir 2560 rm -rf conftest.dir
2428 mkdir conftest.dir 2561 mkdir conftest.dir
2429 # Copy depcomp to subdir because otherwise we won't find it if we're 2562 # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -2463,16 +2596,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
2463 : > sub/conftest.c 2596 : > sub/conftest.c
2464 for i in 1 2 3 4 5 6; do 2597 for i in 1 2 3 4 5 6; do
2465 echo '#include "conftst'$i'.h"' >> sub/conftest.c 2598 echo '#include "conftst'$i'.h"' >> sub/conftest.c
2466 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 2599 # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
2467 # Solaris 8's {/usr,}/bin/sh. 2600 # Solaris 10 /bin/sh.
2468 touch sub/conftst$i.h 2601 echo '/* dummy */' > sub/conftst$i.h
2469 done 2602 done
2470 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf 2603 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
2471 2604
2472 # We check with `-c' and `-o' for the sake of the "dashmstdout" 2605 # We check with '-c' and '-o' for the sake of the "dashmstdout"
2473 # mode. It turns out that the SunPro C++ compiler does not properly 2606 # mode. It turns out that the SunPro C++ compiler does not properly
2474 # handle `-M -o', and we need to detect this. Also, some Intel 2607 # handle '-M -o', and we need to detect this. Also, some Intel
2475 # versions had trouble with output in subdirs 2608 # versions had trouble with output in subdirs.
2476 am__obj=sub/conftest.${OBJEXT-o} 2609 am__obj=sub/conftest.${OBJEXT-o}
2477 am__minus_obj="-o $am__obj" 2610 am__minus_obj="-o $am__obj"
2478 case $depmode in 2611 case $depmode in
@@ -2481,8 +2614,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
2481 test "$am__universal" = false || continue 2614 test "$am__universal" = false || continue
2482 ;; 2615 ;;
2483 nosideeffect) 2616 nosideeffect)
2484 # after this tag, mechanisms are not by side-effect, so they'll 2617 # After this tag, mechanisms are not by side-effect, so they'll
2485 # only be used when explicitly requested 2618 # only be used when explicitly requested.
2486 if test "x$enable_dependency_tracking" = xyes; then 2619 if test "x$enable_dependency_tracking" = xyes; then
2487 continue 2620 continue
2488 else 2621 else
@@ -2490,7 +2623,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
2490 fi 2623 fi
2491 ;; 2624 ;;
2492 msvc7 | msvc7msys | msvisualcpp | msvcmsys) 2625 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
2493 # This compiler won't grok `-c -o', but also, the minuso test has 2626 # This compiler won't grok '-c -o', but also, the minuso test has
2494 # not run yet. These depmodes are late enough in the game, and 2627 # not run yet. These depmodes are late enough in the game, and
2495 # so weak that their functioning should not be impacted. 2628 # so weak that their functioning should not be impacted.
2496 am__obj=conftest.${OBJEXT-o} 2629 am__obj=conftest.${OBJEXT-o}
@@ -2538,7 +2671,7 @@ AM_CONDITIONAL([am__fastdep$1], [
2538# AM_SET_DEPDIR 2671# AM_SET_DEPDIR
2539# ------------- 2672# -------------
2540# Choose a directory name for dependency files. 2673# Choose a directory name for dependency files.
2541# This macro is AC_REQUIREd in _AM_DEPENDENCIES 2674# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
2542AC_DEFUN([AM_SET_DEPDIR], 2675AC_DEFUN([AM_SET_DEPDIR],
2543[AC_REQUIRE([AM_SET_LEADING_DOT])dnl 2676[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
2544AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl 2677AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -2548,9 +2681,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
2548# AM_DEP_TRACK 2681# AM_DEP_TRACK
2549# ------------ 2682# ------------
2550AC_DEFUN([AM_DEP_TRACK], 2683AC_DEFUN([AM_DEP_TRACK],
2551[AC_ARG_ENABLE(dependency-tracking, 2684[AC_ARG_ENABLE([dependency-tracking], [dnl
2552[ --disable-dependency-tracking speeds up one-time build 2685AS_HELP_STRING(
2553 --enable-dependency-tracking do not reject slow dependency extractors]) 2686 [--enable-dependency-tracking],
2687 [do not reject slow dependency extractors])
2688AS_HELP_STRING(
2689 [--disable-dependency-tracking],
2690 [speeds up one-time build])])
2554if test "x$enable_dependency_tracking" != xno; then 2691if test "x$enable_dependency_tracking" != xno; then
2555 am_depcomp="$ac_aux_dir/depcomp" 2692 am_depcomp="$ac_aux_dir/depcomp"
2556 AMDEPBACKSLASH='\' 2693 AMDEPBACKSLASH='\'
@@ -2565,20 +2702,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
2565 2702
2566# Generate code to set up dependency tracking. -*- Autoconf -*- 2703# Generate code to set up dependency tracking. -*- Autoconf -*-
2567 2704
2568# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 2705# Copyright (C) 1999-2013 Free Software Foundation, Inc.
2569# Free Software Foundation, Inc.
2570# 2706#
2571# This file is free software; the Free Software Foundation 2707# This file is free software; the Free Software Foundation
2572# gives unlimited permission to copy and/or distribute it, 2708# gives unlimited permission to copy and/or distribute it,
2573# with or without modifications, as long as this notice is preserved. 2709# with or without modifications, as long as this notice is preserved.
2574 2710
2575#serial 5
2576 2711
2577# _AM_OUTPUT_DEPENDENCY_COMMANDS 2712# _AM_OUTPUT_DEPENDENCY_COMMANDS
2578# ------------------------------ 2713# ------------------------------
2579AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], 2714AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
2580[{ 2715[{
2581 # Autoconf 2.62 quotes --file arguments for eval, but not when files 2716 # Older Autoconf quotes --file arguments for eval, but not when files
2582 # are listed without --file. Let's play safe and only enable the eval 2717 # are listed without --file. Let's play safe and only enable the eval
2583 # if we detect the quoting. 2718 # if we detect the quoting.
2584 case $CONFIG_FILES in 2719 case $CONFIG_FILES in
@@ -2591,7 +2726,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
2591 # Strip MF so we end up with the name of the file. 2726 # Strip MF so we end up with the name of the file.
2592 mf=`echo "$mf" | sed -e 's/:.*$//'` 2727 mf=`echo "$mf" | sed -e 's/:.*$//'`
2593 # Check whether this is an Automake generated Makefile or not. 2728 # Check whether this is an Automake generated Makefile or not.
2594 # We used to match only the files named `Makefile.in', but 2729 # We used to match only the files named 'Makefile.in', but
2595 # some people rename them; so instead we look at the file content. 2730 # some people rename them; so instead we look at the file content.
2596 # Grep'ing the first line is not enough: some people post-process 2731 # Grep'ing the first line is not enough: some people post-process
2597 # each Makefile.in and add a new line on top of each file to say so. 2732 # each Makefile.in and add a new line on top of each file to say so.
@@ -2603,21 +2738,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
2603 continue 2738 continue
2604 fi 2739 fi
2605 # Extract the definition of DEPDIR, am__include, and am__quote 2740 # Extract the definition of DEPDIR, am__include, and am__quote
2606 # from the Makefile without running `make'. 2741 # from the Makefile without running 'make'.
2607 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 2742 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
2608 test -z "$DEPDIR" && continue 2743 test -z "$DEPDIR" && continue
2609 am__include=`sed -n 's/^am__include = //p' < "$mf"` 2744 am__include=`sed -n 's/^am__include = //p' < "$mf"`
2610 test -z "am__include" && continue 2745 test -z "$am__include" && continue
2611 am__quote=`sed -n 's/^am__quote = //p' < "$mf"` 2746 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
2612 # When using ansi2knr, U may be empty or an underscore; expand it
2613 U=`sed -n 's/^U = //p' < "$mf"`
2614 # Find all dependency output files, they are included files with 2747 # Find all dependency output files, they are included files with
2615 # $(DEPDIR) in their names. We invoke sed twice because it is the 2748 # $(DEPDIR) in their names. We invoke sed twice because it is the
2616 # simplest approach to changing $(DEPDIR) to its actual value in the 2749 # simplest approach to changing $(DEPDIR) to its actual value in the
2617 # expansion. 2750 # expansion.
2618 for file in `sed -n " 2751 for file in `sed -n "
2619 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ 2752 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
2620 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do 2753 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
2621 # Make sure the directory exists. 2754 # Make sure the directory exists.
2622 test -f "$dirpart/$file" && continue 2755 test -f "$dirpart/$file" && continue
2623 fdir=`AS_DIRNAME(["$file"])` 2756 fdir=`AS_DIRNAME(["$file"])`
@@ -2635,7 +2768,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
2635# This macro should only be invoked once -- use via AC_REQUIRE. 2768# This macro should only be invoked once -- use via AC_REQUIRE.
2636# 2769#
2637# This code is only required when automatic dependency tracking 2770# This code is only required when automatic dependency tracking
2638# is enabled. FIXME. This creates each `.P' file that we will 2771# is enabled. FIXME. This creates each '.P' file that we will
2639# need in order to bootstrap the dependency handling code. 2772# need in order to bootstrap the dependency handling code.
2640AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], 2773AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
2641[AC_CONFIG_COMMANDS([depfiles], 2774[AC_CONFIG_COMMANDS([depfiles],
@@ -2645,15 +2778,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
2645 2778
2646# Do all the work for Automake. -*- Autoconf -*- 2779# Do all the work for Automake. -*- Autoconf -*-
2647 2780
2648# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2781# Copyright (C) 1996-2013 Free Software Foundation, Inc.
2649# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
2650# 2782#
2651# This file is free software; the Free Software Foundation 2783# This file is free software; the Free Software Foundation
2652# gives unlimited permission to copy and/or distribute it, 2784# gives unlimited permission to copy and/or distribute it,
2653# with or without modifications, as long as this notice is preserved. 2785# with or without modifications, as long as this notice is preserved.
2654 2786
2655# serial 16
2656
2657# This macro actually does too much. Some checks are only needed if 2787# This macro actually does too much. Some checks are only needed if
2658# your package does certain things. But this isn't really a big deal. 2788# your package does certain things. But this isn't really a big deal.
2659 2789
@@ -2669,7 +2799,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
2669# arguments mandatory, and then we can depend on a new Autoconf 2799# arguments mandatory, and then we can depend on a new Autoconf
2670# release and drop the old call support. 2800# release and drop the old call support.
2671AC_DEFUN([AM_INIT_AUTOMAKE], 2801AC_DEFUN([AM_INIT_AUTOMAKE],
2672[AC_PREREQ([2.62])dnl 2802[AC_PREREQ([2.65])dnl
2673dnl Autoconf wants to disallow AM_ names. We explicitly allow 2803dnl Autoconf wants to disallow AM_ names. We explicitly allow
2674dnl the ones we care about. 2804dnl the ones we care about.
2675m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl 2805m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -2698,31 +2828,40 @@ AC_SUBST([CYGPATH_W])
2698# Define the identity of the package. 2828# Define the identity of the package.
2699dnl Distinguish between old-style and new-style calls. 2829dnl Distinguish between old-style and new-style calls.
2700m4_ifval([$2], 2830m4_ifval([$2],
2701[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl 2831[AC_DIAGNOSE([obsolete],
2832 [$0: two- and three-arguments forms are deprecated.])
2833m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
2702 AC_SUBST([PACKAGE], [$1])dnl 2834 AC_SUBST([PACKAGE], [$1])dnl
2703 AC_SUBST([VERSION], [$2])], 2835 AC_SUBST([VERSION], [$2])],
2704[_AM_SET_OPTIONS([$1])dnl 2836[_AM_SET_OPTIONS([$1])dnl
2705dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. 2837dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
2706m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, 2838m4_if(
2839 m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
2840 [ok:ok],,
2707 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl 2841 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
2708 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl 2842 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
2709 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl 2843 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
2710 2844
2711_AM_IF_OPTION([no-define],, 2845_AM_IF_OPTION([no-define],,
2712[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) 2846[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
2713 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl 2847 AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
2714 2848
2715# Some tools Automake needs. 2849# Some tools Automake needs.
2716AC_REQUIRE([AM_SANITY_CHECK])dnl 2850AC_REQUIRE([AM_SANITY_CHECK])dnl
2717AC_REQUIRE([AC_ARG_PROGRAM])dnl 2851AC_REQUIRE([AC_ARG_PROGRAM])dnl
2718AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) 2852AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
2719AM_MISSING_PROG(AUTOCONF, autoconf) 2853AM_MISSING_PROG([AUTOCONF], [autoconf])
2720AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) 2854AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
2721AM_MISSING_PROG(AUTOHEADER, autoheader) 2855AM_MISSING_PROG([AUTOHEADER], [autoheader])
2722AM_MISSING_PROG(MAKEINFO, makeinfo) 2856AM_MISSING_PROG([MAKEINFO], [makeinfo])
2723AC_REQUIRE([AM_PROG_INSTALL_SH])dnl 2857AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
2724AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl 2858AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
2725AC_REQUIRE([AM_PROG_MKDIR_P])dnl 2859AC_REQUIRE([AC_PROG_MKDIR_P])dnl
2860# For better backward compatibility. To be removed once Automake 1.9.x
2861# dies out for good. For more background, see:
2862# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2863# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2864AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
2726# We need awk for the "check" target. The system "awk" is bad on 2865# We need awk for the "check" target. The system "awk" is bad on
2727# some platforms. 2866# some platforms.
2728AC_REQUIRE([AC_PROG_AWK])dnl 2867AC_REQUIRE([AC_PROG_AWK])dnl
@@ -2733,28 +2872,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
2733 [_AM_PROG_TAR([v7])])]) 2872 [_AM_PROG_TAR([v7])])])
2734_AM_IF_OPTION([no-dependencies],, 2873_AM_IF_OPTION([no-dependencies],,
2735[AC_PROVIDE_IFELSE([AC_PROG_CC], 2874[AC_PROVIDE_IFELSE([AC_PROG_CC],
2736 [_AM_DEPENDENCIES(CC)], 2875 [_AM_DEPENDENCIES([CC])],
2737 [define([AC_PROG_CC], 2876 [m4_define([AC_PROG_CC],
2738 defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl 2877 m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
2739AC_PROVIDE_IFELSE([AC_PROG_CXX], 2878AC_PROVIDE_IFELSE([AC_PROG_CXX],
2740 [_AM_DEPENDENCIES(CXX)], 2879 [_AM_DEPENDENCIES([CXX])],
2741 [define([AC_PROG_CXX], 2880 [m4_define([AC_PROG_CXX],
2742 defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl 2881 m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
2743AC_PROVIDE_IFELSE([AC_PROG_OBJC], 2882AC_PROVIDE_IFELSE([AC_PROG_OBJC],
2744 [_AM_DEPENDENCIES(OBJC)], 2883 [_AM_DEPENDENCIES([OBJC])],
2745 [define([AC_PROG_OBJC], 2884 [m4_define([AC_PROG_OBJC],
2746 defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl 2885 m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
2886AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
2887 [_AM_DEPENDENCIES([OBJCXX])],
2888 [m4_define([AC_PROG_OBJCXX],
2889 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
2747]) 2890])
2748_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl 2891AC_REQUIRE([AM_SILENT_RULES])dnl
2749dnl The `parallel-tests' driver may need to know about EXEEXT, so add the 2892dnl The testsuite driver may need to know about EXEEXT, so add the
2750dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro 2893dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
2751dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. 2894dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
2752AC_CONFIG_COMMANDS_PRE(dnl 2895AC_CONFIG_COMMANDS_PRE(dnl
2753[m4_provide_if([_AM_COMPILER_EXEEXT], 2896[m4_provide_if([_AM_COMPILER_EXEEXT],
2754 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl 2897 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
2755]) 2898])
2756 2899
2757dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not 2900dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
2758dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further 2901dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
2759dnl mangled by Autoconf and run in a shell conditional statement. 2902dnl mangled by Autoconf and run in a shell conditional statement.
2760m4_define([_AC_COMPILER_EXEEXT], 2903m4_define([_AC_COMPILER_EXEEXT],
@@ -2782,15 +2925,12 @@ for _am_header in $config_headers :; do
2782done 2925done
2783echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) 2926echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
2784 2927
2785# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, 2928# Copyright (C) 2001-2013 Free Software Foundation, Inc.
2786# Inc.
2787# 2929#
2788# This file is free software; the Free Software Foundation 2930# This file is free software; the Free Software Foundation
2789# gives unlimited permission to copy and/or distribute it, 2931# gives unlimited permission to copy and/or distribute it,
2790# with or without modifications, as long as this notice is preserved. 2932# with or without modifications, as long as this notice is preserved.
2791 2933
2792# serial 1
2793
2794# AM_PROG_INSTALL_SH 2934# AM_PROG_INSTALL_SH
2795# ------------------ 2935# ------------------
2796# Define $install_sh. 2936# Define $install_sh.
@@ -2804,16 +2944,14 @@ if test x"${install_sh}" != xset; then
2804 install_sh="\${SHELL} $am_aux_dir/install-sh" 2944 install_sh="\${SHELL} $am_aux_dir/install-sh"
2805 esac 2945 esac
2806fi 2946fi
2807AC_SUBST(install_sh)]) 2947AC_SUBST([install_sh])])
2808 2948
2809# Copyright (C) 2003, 2005 Free Software Foundation, Inc. 2949# Copyright (C) 2003-2013 Free Software Foundation, Inc.
2810# 2950#
2811# This file is free software; the Free Software Foundation 2951# This file is free software; the Free Software Foundation
2812# gives unlimited permission to copy and/or distribute it, 2952# gives unlimited permission to copy and/or distribute it,
2813# with or without modifications, as long as this notice is preserved. 2953# with or without modifications, as long as this notice is preserved.
2814 2954
2815# serial 2
2816
2817# Check whether the underlying file-system supports filenames 2955# Check whether the underlying file-system supports filenames
2818# with a leading dot. For instance MS-DOS doesn't. 2956# with a leading dot. For instance MS-DOS doesn't.
2819AC_DEFUN([AM_SET_LEADING_DOT], 2957AC_DEFUN([AM_SET_LEADING_DOT],
@@ -2830,20 +2968,17 @@ AC_SUBST([am__leading_dot])])
2830# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- 2968# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
2831# From Jim Meyering 2969# From Jim Meyering
2832 2970
2833# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2971# Copyright (C) 1996-2013 Free Software Foundation, Inc.
2834# 2011 Free Software Foundation, Inc.
2835# 2972#
2836# This file is free software; the Free Software Foundation 2973# This file is free software; the Free Software Foundation
2837# gives unlimited permission to copy and/or distribute it, 2974# gives unlimited permission to copy and/or distribute it,
2838# with or without modifications, as long as this notice is preserved. 2975# with or without modifications, as long as this notice is preserved.
2839 2976
2840# serial 5
2841
2842# AM_MAINTAINER_MODE([DEFAULT-MODE]) 2977# AM_MAINTAINER_MODE([DEFAULT-MODE])
2843# ---------------------------------- 2978# ----------------------------------
2844# Control maintainer-specific portions of Makefiles. 2979# Control maintainer-specific portions of Makefiles.
2845# Default is to disable them, unless `enable' is passed literally. 2980# Default is to disable them, unless 'enable' is passed literally.
2846# For symmetry, `disable' may be passed as well. Anyway, the user 2981# For symmetry, 'disable' may be passed as well. Anyway, the user
2847# can override the default with the --enable/--disable switch. 2982# can override the default with the --enable/--disable switch.
2848AC_DEFUN([AM_MAINTAINER_MODE], 2983AC_DEFUN([AM_MAINTAINER_MODE],
2849[m4_case(m4_default([$1], [disable]), 2984[m4_case(m4_default([$1], [disable]),
@@ -2854,10 +2989,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
2854AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) 2989AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
2855 dnl maintainer-mode's default is 'disable' unless 'enable' is passed 2990 dnl maintainer-mode's default is 'disable' unless 'enable' is passed
2856 AC_ARG_ENABLE([maintainer-mode], 2991 AC_ARG_ENABLE([maintainer-mode],
2857[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful 2992 [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
2858 (and sometimes confusing) to the casual installer], 2993 am_maintainer_other[ make rules and dependencies not useful
2859 [USE_MAINTAINER_MODE=$enableval], 2994 (and sometimes confusing) to the casual installer])],
2860 [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) 2995 [USE_MAINTAINER_MODE=$enableval],
2996 [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
2861 AC_MSG_RESULT([$USE_MAINTAINER_MODE]) 2997 AC_MSG_RESULT([$USE_MAINTAINER_MODE])
2862 AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) 2998 AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
2863 MAINT=$MAINTAINER_MODE_TRUE 2999 MAINT=$MAINTAINER_MODE_TRUE
@@ -2865,18 +3001,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
2865] 3001]
2866) 3002)
2867 3003
2868AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
2869
2870# Check to see how 'make' treats includes. -*- Autoconf -*- 3004# Check to see how 'make' treats includes. -*- Autoconf -*-
2871 3005
2872# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. 3006# Copyright (C) 2001-2013 Free Software Foundation, Inc.
2873# 3007#
2874# This file is free software; the Free Software Foundation 3008# This file is free software; the Free Software Foundation
2875# gives unlimited permission to copy and/or distribute it, 3009# gives unlimited permission to copy and/or distribute it,
2876# with or without modifications, as long as this notice is preserved. 3010# with or without modifications, as long as this notice is preserved.
2877 3011
2878# serial 4
2879
2880# AM_MAKE_INCLUDE() 3012# AM_MAKE_INCLUDE()
2881# ----------------- 3013# -----------------
2882# Check to see how make treats includes. 3014# Check to see how make treats includes.
@@ -2894,7 +3026,7 @@ am__quote=
2894_am_result=none 3026_am_result=none
2895# First try GNU make style include. 3027# First try GNU make style include.
2896echo "include confinc" > confmf 3028echo "include confinc" > confmf
2897# Ignore all kinds of additional output from `make'. 3029# Ignore all kinds of additional output from 'make'.
2898case `$am_make -s -f confmf 2> /dev/null` in #( 3030case `$am_make -s -f confmf 2> /dev/null` in #(
2899*the\ am__doit\ target*) 3031*the\ am__doit\ target*)
2900 am__include=include 3032 am__include=include
@@ -2919,15 +3051,12 @@ AC_MSG_RESULT([$_am_result])
2919rm -f confinc confmf 3051rm -f confinc confmf
2920]) 3052])
2921 3053
2922# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 3054# Copyright (C) 1999-2013 Free Software Foundation, Inc.
2923# Free Software Foundation, Inc.
2924# 3055#
2925# This file is free software; the Free Software Foundation 3056# This file is free software; the Free Software Foundation
2926# gives unlimited permission to copy and/or distribute it, 3057# gives unlimited permission to copy and/or distribute it,
2927# with or without modifications, as long as this notice is preserved. 3058# with or without modifications, as long as this notice is preserved.
2928 3059
2929# serial 6
2930
2931# AM_PROG_CC_C_O 3060# AM_PROG_CC_C_O
2932# -------------- 3061# --------------
2933# Like AC_PROG_CC_C_O, but changed for automake. 3062# Like AC_PROG_CC_C_O, but changed for automake.
@@ -2956,15 +3085,12 @@ m4_define([AC_PROG_CC],
2956 3085
2957# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- 3086# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
2958 3087
2959# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 3088# Copyright (C) 1997-2013 Free Software Foundation, Inc.
2960# Free Software Foundation, Inc.
2961# 3089#
2962# This file is free software; the Free Software Foundation 3090# This file is free software; the Free Software Foundation
2963# gives unlimited permission to copy and/or distribute it, 3091# gives unlimited permission to copy and/or distribute it,
2964# with or without modifications, as long as this notice is preserved. 3092# with or without modifications, as long as this notice is preserved.
2965 3093
2966# serial 6
2967
2968# AM_MISSING_PROG(NAME, PROGRAM) 3094# AM_MISSING_PROG(NAME, PROGRAM)
2969# ------------------------------ 3095# ------------------------------
2970AC_DEFUN([AM_MISSING_PROG], 3096AC_DEFUN([AM_MISSING_PROG],
@@ -2972,11 +3098,10 @@ AC_DEFUN([AM_MISSING_PROG],
2972$1=${$1-"${am_missing_run}$2"} 3098$1=${$1-"${am_missing_run}$2"}
2973AC_SUBST($1)]) 3099AC_SUBST($1)])
2974 3100
2975
2976# AM_MISSING_HAS_RUN 3101# AM_MISSING_HAS_RUN
2977# ------------------ 3102# ------------------
2978# Define MISSING if not defined so far and test if it supports --run. 3103# Define MISSING if not defined so far and test if it is modern enough.
2979# If it does, set am_missing_run to use it, otherwise, to nothing. 3104# If it is, set am_missing_run to use it, otherwise, to nothing.
2980AC_DEFUN([AM_MISSING_HAS_RUN], 3105AC_DEFUN([AM_MISSING_HAS_RUN],
2981[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl 3106[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2982AC_REQUIRE_AUX_FILE([missing])dnl 3107AC_REQUIRE_AUX_FILE([missing])dnl
@@ -2989,54 +3114,22 @@ if test x"${MISSING+set}" != xset; then
2989 esac 3114 esac
2990fi 3115fi
2991# Use eval to expand $SHELL 3116# Use eval to expand $SHELL
2992if eval "$MISSING --run true"; then 3117if eval "$MISSING --is-lightweight"; then
2993 am_missing_run="$MISSING --run " 3118 am_missing_run="$MISSING "
2994else 3119else
2995 am_missing_run= 3120 am_missing_run=
2996 AC_MSG_WARN([`missing' script is too old or missing]) 3121 AC_MSG_WARN(['missing' script is too old or missing])
2997fi 3122fi
2998]) 3123])
2999 3124
3000# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
3001# Inc.
3002#
3003# This file is free software; the Free Software Foundation
3004# gives unlimited permission to copy and/or distribute it,
3005# with or without modifications, as long as this notice is preserved.
3006
3007# serial 1
3008
3009# AM_PROG_MKDIR_P
3010# ---------------
3011# Check for `mkdir -p'.
3012AC_DEFUN([AM_PROG_MKDIR_P],
3013[AC_PREREQ([2.60])dnl
3014AC_REQUIRE([AC_PROG_MKDIR_P])dnl
3015dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
3016dnl while keeping a definition of mkdir_p for backward compatibility.
3017dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
3018dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
3019dnl Makefile.ins that do not define MKDIR_P, so we do our own
3020dnl adjustment using top_builddir (which is defined more often than
3021dnl MKDIR_P).
3022AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
3023case $mkdir_p in
3024 [[\\/$]]* | ?:[[\\/]]*) ;;
3025 */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3026esac
3027])
3028
3029# Helper functions for option handling. -*- Autoconf -*- 3125# Helper functions for option handling. -*- Autoconf -*-
3030 3126
3031# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software 3127# Copyright (C) 2001-2013 Free Software Foundation, Inc.
3032# Foundation, Inc.
3033# 3128#
3034# This file is free software; the Free Software Foundation 3129# This file is free software; the Free Software Foundation
3035# gives unlimited permission to copy and/or distribute it, 3130# gives unlimited permission to copy and/or distribute it,
3036# with or without modifications, as long as this notice is preserved. 3131# with or without modifications, as long as this notice is preserved.
3037 3132
3038# serial 5
3039
3040# _AM_MANGLE_OPTION(NAME) 3133# _AM_MANGLE_OPTION(NAME)
3041# ----------------------- 3134# -----------------------
3042AC_DEFUN([_AM_MANGLE_OPTION], 3135AC_DEFUN([_AM_MANGLE_OPTION],
@@ -3046,7 +3139,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
3046# -------------------- 3139# --------------------
3047# Set option NAME. Presently that only means defining a flag for this option. 3140# Set option NAME. Presently that only means defining a flag for this option.
3048AC_DEFUN([_AM_SET_OPTION], 3141AC_DEFUN([_AM_SET_OPTION],
3049[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) 3142[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
3050 3143
3051# _AM_SET_OPTIONS(OPTIONS) 3144# _AM_SET_OPTIONS(OPTIONS)
3052# ------------------------ 3145# ------------------------
@@ -3062,22 +3155,16 @@ AC_DEFUN([_AM_IF_OPTION],
3062 3155
3063# Check to make sure that the build environment is sane. -*- Autoconf -*- 3156# Check to make sure that the build environment is sane. -*- Autoconf -*-
3064 3157
3065# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 3158# Copyright (C) 1996-2013 Free Software Foundation, Inc.
3066# Free Software Foundation, Inc.
3067# 3159#
3068# This file is free software; the Free Software Foundation 3160# This file is free software; the Free Software Foundation
3069# gives unlimited permission to copy and/or distribute it, 3161# gives unlimited permission to copy and/or distribute it,
3070# with or without modifications, as long as this notice is preserved. 3162# with or without modifications, as long as this notice is preserved.
3071 3163
3072# serial 5
3073
3074# AM_SANITY_CHECK 3164# AM_SANITY_CHECK
3075# --------------- 3165# ---------------
3076AC_DEFUN([AM_SANITY_CHECK], 3166AC_DEFUN([AM_SANITY_CHECK],
3077[AC_MSG_CHECKING([whether build environment is sane]) 3167[AC_MSG_CHECKING([whether build environment is sane])
3078# Just in case
3079sleep 1
3080echo timestamp > conftest.file
3081# Reject unsafe characters in $srcdir or the absolute working directory 3168# Reject unsafe characters in $srcdir or the absolute working directory
3082# name. Accept space and tab only in the latter. 3169# name. Accept space and tab only in the latter.
3083am_lf=' 3170am_lf='
@@ -3088,32 +3175,40 @@ case `pwd` in
3088esac 3175esac
3089case $srcdir in 3176case $srcdir in
3090 *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) 3177 *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
3091 AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; 3178 AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
3092esac 3179esac
3093 3180
3094# Do `set' in a subshell so we don't clobber the current shell's 3181# Do 'set' in a subshell so we don't clobber the current shell's
3095# arguments. Must try -L first in case configure is actually a 3182# arguments. Must try -L first in case configure is actually a
3096# symlink; some systems play weird games with the mod time of symlinks 3183# symlink; some systems play weird games with the mod time of symlinks
3097# (eg FreeBSD returns the mod time of the symlink's containing 3184# (eg FreeBSD returns the mod time of the symlink's containing
3098# directory). 3185# directory).
3099if ( 3186if (
3100 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` 3187 am_has_slept=no
3101 if test "$[*]" = "X"; then 3188 for am_try in 1 2; do
3102 # -L didn't work. 3189 echo "timestamp, slept: $am_has_slept" > conftest.file
3103 set X `ls -t "$srcdir/configure" conftest.file` 3190 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3104 fi 3191 if test "$[*]" = "X"; then
3105 rm -f conftest.file 3192 # -L didn't work.
3106 if test "$[*]" != "X $srcdir/configure conftest.file" \ 3193 set X `ls -t "$srcdir/configure" conftest.file`
3107 && test "$[*]" != "X conftest.file $srcdir/configure"; then 3194 fi
3108 3195 if test "$[*]" != "X $srcdir/configure conftest.file" \
3109 # If neither matched, then we have a broken ls. This can happen 3196 && test "$[*]" != "X conftest.file $srcdir/configure"; then
3110 # if, for instance, CONFIG_SHELL is bash and it inherits a 3197
3111 # broken ls alias from the environment. This has actually 3198 # If neither matched, then we have a broken ls. This can happen
3112 # happened. Such a system could not be considered "sane". 3199 # if, for instance, CONFIG_SHELL is bash and it inherits a
3113 AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken 3200 # broken ls alias from the environment. This has actually
3114alias in your environment]) 3201 # happened. Such a system could not be considered "sane".
3115 fi 3202 AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
3116 3203 alias in your environment])
3204 fi
3205 if test "$[2]" = conftest.file || test $am_try -eq 2; then
3206 break
3207 fi
3208 # Just in case.
3209 sleep 1
3210 am_has_slept=yes
3211 done
3117 test "$[2]" = conftest.file 3212 test "$[2]" = conftest.file
3118 ) 3213 )
3119then 3214then
@@ -3123,46 +3218,118 @@ else
3123 AC_MSG_ERROR([newly created file is older than distributed files! 3218 AC_MSG_ERROR([newly created file is older than distributed files!
3124Check your system clock]) 3219Check your system clock])
3125fi 3220fi
3126AC_MSG_RESULT(yes)]) 3221AC_MSG_RESULT([yes])
3222# If we didn't sleep, we still need to ensure time stamps of config.status and
3223# generated files are strictly newer.
3224am_sleep_pid=
3225if grep 'slept: no' conftest.file >/dev/null 2>&1; then
3226 ( sleep 1 ) &
3227 am_sleep_pid=$!
3228fi
3229AC_CONFIG_COMMANDS_PRE(
3230 [AC_MSG_CHECKING([that generated files are newer than configure])
3231 if test -n "$am_sleep_pid"; then
3232 # Hide warnings about reused PIDs.
3233 wait $am_sleep_pid 2>/dev/null
3234 fi
3235 AC_MSG_RESULT([done])])
3236rm -f conftest.file
3237])
3127 3238
3128# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. 3239# Copyright (C) 2009-2013 Free Software Foundation, Inc.
3129# 3240#
3130# This file is free software; the Free Software Foundation 3241# This file is free software; the Free Software Foundation
3131# gives unlimited permission to copy and/or distribute it, 3242# gives unlimited permission to copy and/or distribute it,
3132# with or without modifications, as long as this notice is preserved. 3243# with or without modifications, as long as this notice is preserved.
3133 3244
3134# serial 1 3245# AM_SILENT_RULES([DEFAULT])
3246# --------------------------
3247# Enable less verbose build rules; with the default set to DEFAULT
3248# ("yes" being less verbose, "no" or empty being verbose).
3249AC_DEFUN([AM_SILENT_RULES],
3250[AC_ARG_ENABLE([silent-rules], [dnl
3251AS_HELP_STRING(
3252 [--enable-silent-rules],
3253 [less verbose build output (undo: "make V=1")])
3254AS_HELP_STRING(
3255 [--disable-silent-rules],
3256 [verbose build output (undo: "make V=0")])dnl
3257])
3258case $enable_silent_rules in @%:@ (((
3259 yes) AM_DEFAULT_VERBOSITY=0;;
3260 no) AM_DEFAULT_VERBOSITY=1;;
3261 *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
3262esac
3263dnl
3264dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
3265dnl do not support nested variable expansions.
3266dnl See automake bug#9928 and bug#10237.
3267am_make=${MAKE-make}
3268AC_CACHE_CHECK([whether $am_make supports nested variables],
3269 [am_cv_make_support_nested_variables],
3270 [if AS_ECHO([['TRUE=$(BAR$(V))
3271BAR0=false
3272BAR1=true
3273V=1
3274am__doit:
3275 @$(TRUE)
3276.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
3277 am_cv_make_support_nested_variables=yes
3278else
3279 am_cv_make_support_nested_variables=no
3280fi])
3281if test $am_cv_make_support_nested_variables = yes; then
3282 dnl Using '$V' instead of '$(V)' breaks IRIX make.
3283 AM_V='$(V)'
3284 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
3285else
3286 AM_V=$AM_DEFAULT_VERBOSITY
3287 AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
3288fi
3289AC_SUBST([AM_V])dnl
3290AM_SUBST_NOTMAKE([AM_V])dnl
3291AC_SUBST([AM_DEFAULT_V])dnl
3292AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
3293AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
3294AM_BACKSLASH='\'
3295AC_SUBST([AM_BACKSLASH])dnl
3296_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
3297])
3298
3299# Copyright (C) 2001-2013 Free Software Foundation, Inc.
3300#
3301# This file is free software; the Free Software Foundation
3302# gives unlimited permission to copy and/or distribute it,
3303# with or without modifications, as long as this notice is preserved.
3135 3304
3136# AM_PROG_INSTALL_STRIP 3305# AM_PROG_INSTALL_STRIP
3137# --------------------- 3306# ---------------------
3138# One issue with vendor `install' (even GNU) is that you can't 3307# One issue with vendor 'install' (even GNU) is that you can't
3139# specify the program used to strip binaries. This is especially 3308# specify the program used to strip binaries. This is especially
3140# annoying in cross-compiling environments, where the build's strip 3309# annoying in cross-compiling environments, where the build's strip
3141# is unlikely to handle the host's binaries. 3310# is unlikely to handle the host's binaries.
3142# Fortunately install-sh will honor a STRIPPROG variable, so we 3311# Fortunately install-sh will honor a STRIPPROG variable, so we
3143# always use install-sh in `make install-strip', and initialize 3312# always use install-sh in "make install-strip", and initialize
3144# STRIPPROG with the value of the STRIP variable (set by the user). 3313# STRIPPROG with the value of the STRIP variable (set by the user).
3145AC_DEFUN([AM_PROG_INSTALL_STRIP], 3314AC_DEFUN([AM_PROG_INSTALL_STRIP],
3146[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl 3315[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
3147# Installed binaries are usually stripped using `strip' when the user 3316# Installed binaries are usually stripped using 'strip' when the user
3148# run `make install-strip'. However `strip' might not be the right 3317# run "make install-strip". However 'strip' might not be the right
3149# tool to use in cross-compilation environments, therefore Automake 3318# tool to use in cross-compilation environments, therefore Automake
3150# will honor the `STRIP' environment variable to overrule this program. 3319# will honor the 'STRIP' environment variable to overrule this program.
3151dnl Don't test for $cross_compiling = yes, because it might be `maybe'. 3320dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
3152if test "$cross_compiling" != no; then 3321if test "$cross_compiling" != no; then
3153 AC_CHECK_TOOL([STRIP], [strip], :) 3322 AC_CHECK_TOOL([STRIP], [strip], :)
3154fi 3323fi
3155INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" 3324INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
3156AC_SUBST([INSTALL_STRIP_PROGRAM])]) 3325AC_SUBST([INSTALL_STRIP_PROGRAM])])
3157 3326
3158# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. 3327# Copyright (C) 2006-2013 Free Software Foundation, Inc.
3159# 3328#
3160# This file is free software; the Free Software Foundation 3329# This file is free software; the Free Software Foundation
3161# gives unlimited permission to copy and/or distribute it, 3330# gives unlimited permission to copy and/or distribute it,
3162# with or without modifications, as long as this notice is preserved. 3331# with or without modifications, as long as this notice is preserved.
3163 3332
3164# serial 3
3165
3166# _AM_SUBST_NOTMAKE(VARIABLE) 3333# _AM_SUBST_NOTMAKE(VARIABLE)
3167# --------------------------- 3334# ---------------------------
3168# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. 3335# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -3176,18 +3343,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
3176 3343
3177# Check how to create a tarball. -*- Autoconf -*- 3344# Check how to create a tarball. -*- Autoconf -*-
3178 3345
3179# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. 3346# Copyright (C) 2004-2013 Free Software Foundation, Inc.
3180# 3347#
3181# This file is free software; the Free Software Foundation 3348# This file is free software; the Free Software Foundation
3182# gives unlimited permission to copy and/or distribute it, 3349# gives unlimited permission to copy and/or distribute it,
3183# with or without modifications, as long as this notice is preserved. 3350# with or without modifications, as long as this notice is preserved.
3184 3351
3185# serial 2
3186
3187# _AM_PROG_TAR(FORMAT) 3352# _AM_PROG_TAR(FORMAT)
3188# -------------------- 3353# --------------------
3189# Check how to create a tarball in format FORMAT. 3354# Check how to create a tarball in format FORMAT.
3190# FORMAT should be one of `v7', `ustar', or `pax'. 3355# FORMAT should be one of 'v7', 'ustar', or 'pax'.
3191# 3356#
3192# Substitute a variable $(am__tar) that is a command 3357# Substitute a variable $(am__tar) that is a command
3193# writing to stdout a FORMAT-tarball containing the directory 3358# writing to stdout a FORMAT-tarball containing the directory
@@ -3197,76 +3362,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
3197# Substitute a variable $(am__untar) that extract such 3362# Substitute a variable $(am__untar) that extract such
3198# a tarball read from stdin. 3363# a tarball read from stdin.
3199# $(am__untar) < result.tar 3364# $(am__untar) < result.tar
3365#
3200AC_DEFUN([_AM_PROG_TAR], 3366AC_DEFUN([_AM_PROG_TAR],
3201[# Always define AMTAR for backward compatibility. Yes, it's still used 3367[# Always define AMTAR for backward compatibility. Yes, it's still used
3202# in the wild :-( We should find a proper way to deprecate it ... 3368# in the wild :-( We should find a proper way to deprecate it ...
3203AC_SUBST([AMTAR], ['$${TAR-tar}']) 3369AC_SUBST([AMTAR], ['$${TAR-tar}'])
3204m4_if([$1], [v7], 3370
3205 [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], 3371# We'll loop over all known methods to create a tar archive until one works.
3206 [m4_case([$1], [ustar],, [pax],,
3207 [m4_fatal([Unknown tar format])])
3208AC_MSG_CHECKING([how to create a $1 tar archive])
3209# Loop over all known methods to create a tar archive until one works.
3210_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' 3372_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
3211_am_tools=${am_cv_prog_tar_$1-$_am_tools}
3212# Do not fold the above two line into one, because Tru64 sh and
3213# Solaris sh will not grok spaces in the rhs of `-'.
3214for _am_tool in $_am_tools
3215do
3216 case $_am_tool in
3217 gnutar)
3218 for _am_tar in tar gnutar gtar;
3219 do
3220 AM_RUN_LOG([$_am_tar --version]) && break
3221 done
3222 am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
3223 am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
3224 am__untar="$_am_tar -xf -"
3225 ;;
3226 plaintar)
3227 # Must skip GNU tar: if it does not support --format= it doesn't create
3228 # ustar tarball either.
3229 (tar --version) >/dev/null 2>&1 && continue
3230 am__tar='tar chf - "$$tardir"'
3231 am__tar_='tar chf - "$tardir"'
3232 am__untar='tar xf -'
3233 ;;
3234 pax)
3235 am__tar='pax -L -x $1 -w "$$tardir"'
3236 am__tar_='pax -L -x $1 -w "$tardir"'
3237 am__untar='pax -r'
3238 ;;
3239 cpio)
3240 am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
3241 am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
3242 am__untar='cpio -i -H $1 -d'
3243 ;;
3244 none)
3245 am__tar=false
3246 am__tar_=false
3247 am__untar=false
3248 ;;
3249 esac
3250 3373
3251 # If the value was cached, stop now. We just wanted to have am__tar 3374m4_if([$1], [v7],
3252 # and am__untar set. 3375 [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
3253 test -n "${am_cv_prog_tar_$1}" && break 3376
3377 [m4_case([$1],
3378 [ustar],
3379 [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
3380 # There is notably a 21 bits limit for the UID and the GID. In fact,
3381 # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
3382 # and bug#13588).
3383 am_max_uid=2097151 # 2^21 - 1
3384 am_max_gid=$am_max_uid
3385 # The $UID and $GID variables are not portable, so we need to resort
3386 # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
3387 # below are definitely unexpected, so allow the users to see them
3388 # (that is, avoid stderr redirection).
3389 am_uid=`id -u || echo unknown`
3390 am_gid=`id -g || echo unknown`
3391 AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
3392 if test $am_uid -le $am_max_uid; then
3393 AC_MSG_RESULT([yes])
3394 else
3395 AC_MSG_RESULT([no])
3396 _am_tools=none
3397 fi
3398 AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
3399 if test $am_gid -le $am_max_gid; then
3400 AC_MSG_RESULT([yes])
3401 else
3402 AC_MSG_RESULT([no])
3403 _am_tools=none
3404 fi],
3254 3405
3255 # tar/untar a dummy directory, and stop if the command works 3406 [pax],
3256 rm -rf conftest.dir 3407 [],
3257 mkdir conftest.dir 3408
3258 echo GrepMe > conftest.dir/file 3409 [m4_fatal([Unknown tar format])])
3259 AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) 3410
3411 AC_MSG_CHECKING([how to create a $1 tar archive])
3412
3413 # Go ahead even if we have the value already cached. We do so because we
3414 # need to set the values for the 'am__tar' and 'am__untar' variables.
3415 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
3416
3417 for _am_tool in $_am_tools; do
3418 case $_am_tool in
3419 gnutar)
3420 for _am_tar in tar gnutar gtar; do
3421 AM_RUN_LOG([$_am_tar --version]) && break
3422 done
3423 am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
3424 am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
3425 am__untar="$_am_tar -xf -"
3426 ;;
3427 plaintar)
3428 # Must skip GNU tar: if it does not support --format= it doesn't create
3429 # ustar tarball either.
3430 (tar --version) >/dev/null 2>&1 && continue
3431 am__tar='tar chf - "$$tardir"'
3432 am__tar_='tar chf - "$tardir"'
3433 am__untar='tar xf -'
3434 ;;
3435 pax)
3436 am__tar='pax -L -x $1 -w "$$tardir"'
3437 am__tar_='pax -L -x $1 -w "$tardir"'
3438 am__untar='pax -r'
3439 ;;
3440 cpio)
3441 am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
3442 am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
3443 am__untar='cpio -i -H $1 -d'
3444 ;;
3445 none)
3446 am__tar=false
3447 am__tar_=false
3448 am__untar=false
3449 ;;
3450 esac
3451
3452 # If the value was cached, stop now. We just wanted to have am__tar
3453 # and am__untar set.
3454 test -n "${am_cv_prog_tar_$1}" && break
3455
3456 # tar/untar a dummy directory, and stop if the command works.
3457 rm -rf conftest.dir
3458 mkdir conftest.dir
3459 echo GrepMe > conftest.dir/file
3460 AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
3461 rm -rf conftest.dir
3462 if test -s conftest.tar; then
3463 AM_RUN_LOG([$am__untar <conftest.tar])
3464 AM_RUN_LOG([cat conftest.dir/file])
3465 grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3466 fi
3467 done
3260 rm -rf conftest.dir 3468 rm -rf conftest.dir
3261 if test -s conftest.tar; then
3262 AM_RUN_LOG([$am__untar <conftest.tar])
3263 grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3264 fi
3265done
3266rm -rf conftest.dir
3267 3469
3268AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) 3470 AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
3269AC_MSG_RESULT([$am_cv_prog_tar_$1])]) 3471 AC_MSG_RESULT([$am_cv_prog_tar_$1])])
3472
3270AC_SUBST([am__tar]) 3473AC_SUBST([am__tar])
3271AC_SUBST([am__untar]) 3474AC_SUBST([am__untar])
3272]) # _AM_PROG_TAR 3475]) # _AM_PROG_TAR