summaryrefslogtreecommitdiffstats
path: root/scilab/aclocal.m4
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2013-09-18 14:39:03 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2013-09-18 14:47:16 +0200
commit5ade146fe536210219f5b1a81e1f43dec4fd1492 (patch)
tree7c3e407537ecf087ffa9c65d54d166f49f533b8e /scilab/aclocal.m4
parent08bbe998feb96d8ab37c40238c94ba716192eb05 (diff)
downloadscilab-5ade146fe536210219f5b1a81e1f43dec4fd1492.zip
scilab-5ade146fe536210219f5b1a81e1f43dec4fd1492.tar.gz
in the code coverage generation, the option --config-file is gone. Use an other way to setup the conf.
It should fix the failure of the Jenkins job: http://build.scilab.org/job/scilab-build-code-coverage/441/console Change-Id: Ib314d2845a13b1851523052c6e6f98759bc454ce
Diffstat (limited to 'scilab/aclocal.m4')
-rw-r--r--scilab/aclocal.m4329
1 files changed, 190 insertions, 139 deletions
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index 4cb329b..2509a71 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -20,8 +20,8 @@ You 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,
@@ -3039,38 +3122,6 @@ else
3039fi 3122fi
3040]) 3123])
3041 3124
3042# Copyright (C) 2003-2013 Free Software Foundation, Inc.
3043#
3044# This file is free software; the Free Software Foundation
3045# gives unlimited permission to copy and/or distribute it,
3046# with or without modifications, as long as this notice is preserved.
3047
3048# AM_PROG_MKDIR_P
3049# ---------------
3050# Check for 'mkdir -p'.
3051AC_DEFUN([AM_PROG_MKDIR_P],
3052[AC_PREREQ([2.60])dnl
3053AC_REQUIRE([AC_PROG_MKDIR_P])dnl
3054dnl FIXME we are no longer going to remove this! adjust warning
3055dnl FIXME message accordingly.
3056AC_DIAGNOSE([obsolete],
3057[$0: this macro is deprecated, and will soon be removed.
3058You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
3059and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
3060dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
3061dnl while keeping a definition of mkdir_p for backward compatibility.
3062dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
3063dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
3064dnl Makefile.ins that do not define MKDIR_P, so we do our own
3065dnl adjustment using top_builddir (which is defined more often than
3066dnl MKDIR_P).
3067AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
3068case $mkdir_p in
3069 [[\\/$]]* | ?:[[\\/]]*) ;;
3070 */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3071esac
3072])
3073
3074# Helper functions for option handling. -*- Autoconf -*- 3125# Helper functions for option handling. -*- Autoconf -*-
3075 3126
3076# Copyright (C) 2001-2013 Free Software Foundation, Inc. 3127# Copyright (C) 2001-2013 Free Software Foundation, Inc.