summaryrefslogtreecommitdiffstats
path: root/scilab/aclocal.m4
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab-enterprises.com>2014-01-14 16:45:57 +0100
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-01-14 17:51:16 +0100
commit8e2ab8da2cba07c9749143e337c1409e8a3cbd2f (patch)
tree5f2cbd03737f95b8253604031da8aafa7f97bd46 /scilab/aclocal.m4
parent9b514623e1d642e6c2d27da3b54e5090efa72253 (diff)
downloadscilab-8e2ab8da2cba07c9749143e337c1409e8a3cbd2f.zip
scilab-8e2ab8da2cba07c9749143e337c1409e8a3cbd2f.tar.gz
Scilab build: libhdf5 might require libz and libsz
depending on the configuration options used to build libhdf5, these librairies might be needed to ./configure. Change-Id: I1d5628998f2d0e53d47b23a364b30bdcf12410a6
Diffstat (limited to 'scilab/aclocal.m4')
-rw-r--r--scilab/aclocal.m4329
1 files changed, 139 insertions, 190 deletions
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index e8b4a4d..7220cdf 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 66 (gettext-0.18.2) 23# gettext.m4 serial 63 (gettext-0.18)
24dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. 24dnl Copyright (C) 1995-2010 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 Mac OS X, libintl requires linking with CoreFoundation. 122 dnl Sometimes, on MacOS 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,18 +179,12 @@ 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_LINK_IFELSE( 182 [AC_TRY_LINK([#include <libintl.h>
183 [AC_LANG_PROGRAM(
184 [[
185#include <libintl.h>
186$gt_revision_test_code 183$gt_revision_test_code
187extern int _nl_msg_cat_cntr; 184extern int _nl_msg_cat_cntr;
188extern int *_nl_domain_bindings; 185extern int *_nl_domain_bindings;],
189 ]], 186 [bindtextdomain ("", "");
190 [[ 187return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
191bindtextdomain ("", "");
192return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
193 ]])],
194 [eval "$gt_func_gnugettext_libc=yes"], 188 [eval "$gt_func_gnugettext_libc=yes"],
195 [eval "$gt_func_gnugettext_libc=no"])]) 189 [eval "$gt_func_gnugettext_libc=no"])])
196 190
@@ -211,47 +205,35 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b
211 gt_save_LIBS="$LIBS" 205 gt_save_LIBS="$LIBS"
212 LIBS="$LIBS $LIBINTL" 206 LIBS="$LIBS $LIBINTL"
213 dnl Now see whether libintl exists and does not depend on libiconv. 207 dnl Now see whether libintl exists and does not depend on libiconv.
214 AC_LINK_IFELSE( 208 AC_TRY_LINK([#include <libintl.h>
215 [AC_LANG_PROGRAM(
216 [[
217#include <libintl.h>
218$gt_revision_test_code 209$gt_revision_test_code
219extern int _nl_msg_cat_cntr; 210extern int _nl_msg_cat_cntr;
220extern 211extern
221#ifdef __cplusplus 212#ifdef __cplusplus
222"C" 213"C"
223#endif 214#endif
224const char *_nl_expand_alias (const char *); 215const char *_nl_expand_alias (const char *);],
225 ]], 216 [bindtextdomain ("", "");
226 [[ 217return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
227bindtextdomain ("", "");
228return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
229 ]])],
230 [eval "$gt_func_gnugettext_libintl=yes"], 218 [eval "$gt_func_gnugettext_libintl=yes"],
231 [eval "$gt_func_gnugettext_libintl=no"]) 219 [eval "$gt_func_gnugettext_libintl=no"])
232 dnl Now see whether libintl exists and depends on libiconv. 220 dnl Now see whether libintl exists and depends on libiconv.
233 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then 221 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
234 LIBS="$LIBS $LIBICONV" 222 LIBS="$LIBS $LIBICONV"
235 AC_LINK_IFELSE( 223 AC_TRY_LINK([#include <libintl.h>
236 [AC_LANG_PROGRAM(
237 [[
238#include <libintl.h>
239$gt_revision_test_code 224$gt_revision_test_code
240extern int _nl_msg_cat_cntr; 225extern int _nl_msg_cat_cntr;
241extern 226extern
242#ifdef __cplusplus 227#ifdef __cplusplus
243"C" 228"C"
244#endif 229#endif
245const char *_nl_expand_alias (const char *); 230const char *_nl_expand_alias (const char *);],
246 ]], 231 [bindtextdomain ("", "");
247 [[ 232return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
248bindtextdomain ("", ""); 233 [LIBINTL="$LIBINTL $LIBICONV"
249return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") 234 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
250 ]])], 235 eval "$gt_func_gnugettext_libintl=yes"
251 [LIBINTL="$LIBINTL $LIBICONV" 236 ])
252 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
253 eval "$gt_func_gnugettext_libintl=yes"
254 ])
255 fi 237 fi
256 CPPFLAGS="$gt_save_CPPFLAGS" 238 CPPFLAGS="$gt_save_CPPFLAGS"
257 LIBS="$gt_save_LIBS"]) 239 LIBS="$gt_save_LIBS"])
@@ -422,8 +404,8 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED],
422dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) 404dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
423AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) 405AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
424 406
425# iconv.m4 serial 18 (gettext-0.18.2) 407# iconv.m4 serial 11 (gettext-0.18.1)
426dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc. 408dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
427dnl This file is free software; the Free Software Foundation 409dnl This file is free software; the Free Software Foundation
428dnl gives unlimited permission to copy and/or distribute it, 410dnl gives unlimited permission to copy and/or distribute it,
429dnl with or without modifications, as long as this notice is preserved. 411dnl with or without modifications, as long as this notice is preserved.
@@ -454,35 +436,27 @@ AC_DEFUN([AM_ICONV_LINK],
454 dnl Add $INCICONV to CPPFLAGS before performing the following checks, 436 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
455 dnl because if the user has installed libiconv and not disabled its use 437 dnl because if the user has installed libiconv and not disabled its use
456 dnl via --without-libiconv-prefix, he wants to use it. The first 438 dnl via --without-libiconv-prefix, he wants to use it. The first
457 dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. 439 dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
458 am_save_CPPFLAGS="$CPPFLAGS" 440 am_save_CPPFLAGS="$CPPFLAGS"
459 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) 441 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
460 442
461 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ 443 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
462 am_cv_func_iconv="no, consider installing GNU libiconv" 444 am_cv_func_iconv="no, consider installing GNU libiconv"
463 am_cv_lib_iconv=no 445 am_cv_lib_iconv=no
464 AC_LINK_IFELSE( 446 AC_TRY_LINK([#include <stdlib.h>
465 [AC_LANG_PROGRAM( 447#include <iconv.h>],
466 [[ 448 [iconv_t cd = iconv_open("","");
467#include <stdlib.h> 449 iconv(cd,NULL,NULL,NULL,NULL);
468#include <iconv.h> 450 iconv_close(cd);],
469 ]],
470 [[iconv_t cd = iconv_open("","");
471 iconv(cd,NULL,NULL,NULL,NULL);
472 iconv_close(cd);]])],
473 [am_cv_func_iconv=yes]) 451 [am_cv_func_iconv=yes])
474 if test "$am_cv_func_iconv" != yes; then 452 if test "$am_cv_func_iconv" != yes; then
475 am_save_LIBS="$LIBS" 453 am_save_LIBS="$LIBS"
476 LIBS="$LIBS $LIBICONV" 454 LIBS="$LIBS $LIBICONV"
477 AC_LINK_IFELSE( 455 AC_TRY_LINK([#include <stdlib.h>
478 [AC_LANG_PROGRAM( 456#include <iconv.h>],
479 [[ 457 [iconv_t cd = iconv_open("","");
480#include <stdlib.h> 458 iconv(cd,NULL,NULL,NULL,NULL);
481#include <iconv.h> 459 iconv_close(cd);],
482 ]],
483 [[iconv_t cd = iconv_open("","");
484 iconv(cd,NULL,NULL,NULL,NULL);
485 iconv_close(cd);]])],
486 [am_cv_lib_iconv=yes] 460 [am_cv_lib_iconv=yes]
487 [am_cv_func_iconv=yes]) 461 [am_cv_func_iconv=yes])
488 LIBS="$am_save_LIBS" 462 LIBS="$am_save_LIBS"
@@ -490,19 +464,16 @@ AC_DEFUN([AM_ICONV_LINK],
490 ]) 464 ])
491 if test "$am_cv_func_iconv" = yes; then 465 if test "$am_cv_func_iconv" = yes; then
492 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ 466 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
493 dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, 467 dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
494 dnl Solaris 10.
495 am_save_LIBS="$LIBS" 468 am_save_LIBS="$LIBS"
496 if test $am_cv_lib_iconv = yes; then 469 if test $am_cv_lib_iconv = yes; then
497 LIBS="$LIBS $LIBICONV" 470 LIBS="$LIBS $LIBICONV"
498 fi 471 fi
499 AC_RUN_IFELSE( 472 AC_TRY_RUN([
500 [AC_LANG_SOURCE([[
501#include <iconv.h> 473#include <iconv.h>
502#include <string.h> 474#include <string.h>
503int main () 475int main ()
504{ 476{
505 int result = 0;
506 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful 477 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
507 returns. */ 478 returns. */
508 { 479 {
@@ -519,8 +490,7 @@ int main ()
519 (char **) &inptr, &inbytesleft, 490 (char **) &inptr, &inbytesleft,
520 &outptr, &outbytesleft); 491 &outptr, &outbytesleft);
521 if (res == 0) 492 if (res == 0)
522 result |= 1; 493 return 1;
523 iconv_close (cd_utf8_to_88591);
524 } 494 }
525 } 495 }
526 /* Test against Solaris 10 bug: Failures are not distinguishable from 496 /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -539,27 +509,7 @@ int main ()
539 (char **) &inptr, &inbytesleft, 509 (char **) &inptr, &inbytesleft,
540 &outptr, &outbytesleft); 510 &outptr, &outbytesleft);
541 if (res == 0) 511 if (res == 0)
542 result |= 2; 512 return 1;
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);
563 } 513 }
564 } 514 }
565#if 0 /* This bug could be worked around by the caller. */ 515#if 0 /* This bug could be worked around by the caller. */
@@ -578,8 +528,7 @@ int main ()
578 (char **) &inptr, &inbytesleft, 528 (char **) &inptr, &inbytesleft,
579 &outptr, &outbytesleft); 529 &outptr, &outbytesleft);
580 if ((int)res > 0) 530 if ((int)res > 0)
581 result |= 8; 531 return 1;
582 iconv_close (cd_88591_to_utf8);
583 } 532 }
584 } 533 }
585#endif 534#endif
@@ -593,19 +542,13 @@ int main ()
593 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) 542 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
594 /* Try HP-UX names. */ 543 /* Try HP-UX names. */
595 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) 544 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
596 result |= 16; 545 return 1;
597 return result; 546 return 0;
598}]])], 547}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
599 [am_cv_func_iconv_works=yes], 548 [case "$host_os" in
600 [am_cv_func_iconv_works=no],
601 [
602changequote(,)dnl
603 case "$host_os" in
604 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; 549 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
605 *) am_cv_func_iconv_works="guessing yes" ;; 550 *) am_cv_func_iconv_works="guessing yes" ;;
606 esac 551 esac])
607changequote([,])dnl
608 ])
609 LIBS="$am_save_LIBS" 552 LIBS="$am_save_LIBS"
610 ]) 553 ])
611 case "$am_cv_func_iconv_works" in 554 case "$am_cv_func_iconv_works" in
@@ -646,53 +589,38 @@ m4_define([gl_iconv_AC_DEFUN],
646 m4_version_prereq([2.64], 589 m4_version_prereq([2.64],
647 [[AC_DEFUN_ONCE( 590 [[AC_DEFUN_ONCE(
648 [$1], [$2])]], 591 [$1], [$2])]],
649 [m4_ifdef([gl_00GNULIB], 592 [[AC_DEFUN(
650 [[AC_DEFUN_ONCE( 593 [$1], [$2])]]))
651 [$1], [$2])]],
652 [[AC_DEFUN(
653 [$1], [$2])]])]))
654gl_iconv_AC_DEFUN([AM_ICONV], 594gl_iconv_AC_DEFUN([AM_ICONV],
655[ 595[
656 AM_ICONV_LINK 596 AM_ICONV_LINK
657 if test "$am_cv_func_iconv" = yes; then 597 if test "$am_cv_func_iconv" = yes; then
658 AC_MSG_CHECKING([for iconv declaration]) 598 AC_MSG_CHECKING([for iconv declaration])
659 AC_CACHE_VAL([am_cv_proto_iconv], [ 599 AC_CACHE_VAL([am_cv_proto_iconv], [
660 AC_COMPILE_IFELSE( 600 AC_TRY_COMPILE([
661 [AC_LANG_PROGRAM(
662 [[
663#include <stdlib.h> 601#include <stdlib.h>
664#include <iconv.h> 602#include <iconv.h>
665extern 603extern
666#ifdef __cplusplus 604#ifdef __cplusplus
667"C" 605"C"
668#endif 606#endif
669#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) 607#if defined(__STDC__) || defined(__cplusplus)
670size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); 608size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
671#else 609#else
672size_t iconv(); 610size_t iconv();
673#endif 611#endif
674 ]], 612], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
675 [[]])],
676 [am_cv_proto_iconv_arg1=""],
677 [am_cv_proto_iconv_arg1="const"])
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);"]) 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);"])
679 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` 614 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
680 AC_MSG_RESULT([ 615 AC_MSG_RESULT([
681 $am_cv_proto_iconv]) 616 $am_cv_proto_iconv])
682 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], 617 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
683 [Define as const if the declaration of iconv() needs const.]) 618 [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 ])
691 fi 619 fi
692]) 620])
693 621
694# intlmacosx.m4 serial 5 (gettext-0.18.2) 622# intlmacosx.m4 serial 3 (gettext-0.18)
695dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. 623dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
696dnl This file is free software; the Free Software Foundation 624dnl This file is free software; the Free Software Foundation
697dnl gives unlimited permission to copy and/or distribute it, 625dnl gives unlimited permission to copy and/or distribute it,
698dnl with or without modifications, as long as this notice is preserved. 626dnl with or without modifications, as long as this notice is preserved.
@@ -706,40 +634,35 @@ dnl by the GNU Library General Public License, and the rest of the GNU
706dnl gettext package package is covered by the GNU General Public License. 634dnl gettext package package is covered by the GNU General Public License.
707dnl They are *not* in the public domain. 635dnl They are *not* in the public domain.
708 636
709dnl Checks for special options needed on Mac OS X. 637dnl Checks for special options needed on MacOS X.
710dnl Defines INTL_MACOSX_LIBS. 638dnl Defines INTL_MACOSX_LIBS.
711AC_DEFUN([gt_INTL_MACOSX], 639AC_DEFUN([gt_INTL_MACOSX],
712[ 640[
713 dnl Check for API introduced in Mac OS X 10.2. 641 dnl Check for API introduced in MacOS X 10.2.
714 AC_CACHE_CHECK([for CFPreferencesCopyAppValue], 642 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
715 [gt_cv_func_CFPreferencesCopyAppValue], 643 [gt_cv_func_CFPreferencesCopyAppValue],
716 [gt_save_LIBS="$LIBS" 644 [gt_save_LIBS="$LIBS"
717 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 645 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
718 AC_LINK_IFELSE( 646 AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
719 [AC_LANG_PROGRAM( 647 [CFPreferencesCopyAppValue(NULL, NULL)],
720 [[#include <CoreFoundation/CFPreferences.h>]],
721 [[CFPreferencesCopyAppValue(NULL, NULL)]])],
722 [gt_cv_func_CFPreferencesCopyAppValue=yes], 648 [gt_cv_func_CFPreferencesCopyAppValue=yes],
723 [gt_cv_func_CFPreferencesCopyAppValue=no]) 649 [gt_cv_func_CFPreferencesCopyAppValue=no])
724 LIBS="$gt_save_LIBS"]) 650 LIBS="$gt_save_LIBS"])
725 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then 651 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
726 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], 652 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
727 [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) 653 [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
728 fi 654 fi
729 dnl Check for API introduced in Mac OS X 10.3. 655 dnl Check for API introduced in MacOS X 10.3.
730 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], 656 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
731 [gt_save_LIBS="$LIBS" 657 [gt_save_LIBS="$LIBS"
732 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 658 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
733 AC_LINK_IFELSE( 659 AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
734 [AC_LANG_PROGRAM(
735 [[#include <CoreFoundation/CFLocale.h>]],
736 [[CFLocaleCopyCurrent();]])],
737 [gt_cv_func_CFLocaleCopyCurrent=yes], 660 [gt_cv_func_CFLocaleCopyCurrent=yes],
738 [gt_cv_func_CFLocaleCopyCurrent=no]) 661 [gt_cv_func_CFLocaleCopyCurrent=no])
739 LIBS="$gt_save_LIBS"]) 662 LIBS="$gt_save_LIBS"])
740 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then 663 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
741 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], 664 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
742 [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) 665 [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
743 fi 666 fi
744 INTL_MACOSX_LIBS= 667 INTL_MACOSX_LIBS=
745 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then 668 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
@@ -748,8 +671,8 @@ AC_DEFUN([gt_INTL_MACOSX],
748 AC_SUBST([INTL_MACOSX_LIBS]) 671 AC_SUBST([INTL_MACOSX_LIBS])
749]) 672])
750 673
751# lib-link.m4 serial 26 (gettext-0.18.2) 674# lib-link.m4 serial 21 (gettext-0.18)
752dnl Copyright (C) 2001-2013 Free Software Foundation, Inc. 675dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
753dnl This file is free software; the Free Software Foundation 676dnl This file is free software; the Free Software Foundation
754dnl gives unlimited permission to copy and/or distribute it, 677dnl gives unlimited permission to copy and/or distribute it,
755dnl with or without modifications, as long as this notice is preserved. 678dnl with or without modifications, as long as this notice is preserved.
@@ -768,9 +691,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
768[ 691[
769 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 692 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
770 AC_REQUIRE([AC_LIB_RPATH]) 693 AC_REQUIRE([AC_LIB_RPATH])
771 pushdef([Name],[m4_translit([$1],[./+-], [____])]) 694 pushdef([Name],[translit([$1],[./-], [___])])
772 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], 695 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
773 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) 696 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
774 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ 697 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
775 AC_LIB_LINKFLAGS_BODY([$1], [$2]) 698 AC_LIB_LINKFLAGS_BODY([$1], [$2])
776 ac_cv_lib[]Name[]_libs="$LIB[]NAME" 699 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -808,9 +731,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
808[ 731[
809 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 732 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
810 AC_REQUIRE([AC_LIB_RPATH]) 733 AC_REQUIRE([AC_LIB_RPATH])
811 pushdef([Name],[m4_translit([$1],[./+-], [____])]) 734 pushdef([Name],[translit([$1],[./-], [___])])
812 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], 735 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
813 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) 736 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
814 737
815 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME 738 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
816 dnl accordingly. 739 dnl accordingly.
@@ -835,8 +758,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
835 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; 758 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
836 *) LIBS="$LIB[]NAME $LIBS" ;; 759 *) LIBS="$LIB[]NAME $LIBS" ;;
837 esac 760 esac
838 AC_LINK_IFELSE( 761 AC_TRY_LINK([$3], [$4],
839 [AC_LANG_PROGRAM([[$3]], [[$4]])],
840 [ac_cv_lib[]Name=yes], 762 [ac_cv_lib[]Name=yes],
841 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) 763 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
842 LIBS="$ac_save_LIBS" 764 LIBS="$ac_save_LIBS"
@@ -866,8 +788,6 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
866dnl Determine the platform dependent parameters needed to use rpath: 788dnl Determine the platform dependent parameters needed to use rpath:
867dnl acl_libext, 789dnl acl_libext,
868dnl acl_shlibext, 790dnl acl_shlibext,
869dnl acl_libname_spec,
870dnl acl_library_names_spec,
871dnl acl_hardcode_libdir_flag_spec, 791dnl acl_hardcode_libdir_flag_spec,
872dnl acl_hardcode_libdir_separator, 792dnl acl_hardcode_libdir_separator,
873dnl acl_hardcode_direct, 793dnl acl_hardcode_direct,
@@ -910,15 +830,15 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
910dnl macro call that searches for libname. 830dnl macro call that searches for libname.
911AC_DEFUN([AC_LIB_FROMPACKAGE], 831AC_DEFUN([AC_LIB_FROMPACKAGE],
912[ 832[
913 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], 833 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
914 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) 834 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
915 define([acl_frompackage_]NAME, [$2]) 835 define([acl_frompackage_]NAME, [$2])
916 popdef([NAME]) 836 popdef([NAME])
917 pushdef([PACK],[$2]) 837 pushdef([PACK],[$2])
918 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], 838 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
919 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) 839 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
920 define([acl_libsinpackage_]PACKUP, 840 define([acl_libsinpackage_]PACKUP,
921 m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) 841 m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
922 popdef([PACKUP]) 842 popdef([PACKUP])
923 popdef([PACK]) 843 popdef([PACK])
924]) 844])
@@ -931,14 +851,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
931AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 851AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
932[ 852[
933 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) 853 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
934 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], 854 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
935 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) 855 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
936 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) 856 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
937 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], 857 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
938 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) 858 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
939 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) 859 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
940 dnl Autoconf >= 2.61 supports dots in --with options. 860 dnl Autoconf >= 2.61 supports dots in --with options.
941 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) 861 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
942 dnl By default, look in $includedir and $libdir. 862 dnl By default, look in $includedir and $libdir.
943 use_additional=yes 863 use_additional=yes
944 AC_LIB_WITH_FINAL_PREFIX([ 864 AC_LIB_WITH_FINAL_PREFIX([
@@ -995,7 +915,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
995 names_already_handled="$names_already_handled $name" 915 names_already_handled="$names_already_handled $name"
996 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS 916 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
997 dnl or AC_LIB_HAVE_LINKFLAGS call. 917 dnl or AC_LIB_HAVE_LINKFLAGS call.
998 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` 918 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
999 eval value=\"\$HAVE_LIB$uppername\" 919 eval value=\"\$HAVE_LIB$uppername\"
1000 if test -n "$value"; then 920 if test -n "$value"; then
1001 if test "$value" = yes; then 921 if test "$value" = yes; then
@@ -1527,7 +1447,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
1527]) 1447])
1528 1448
1529# lib-prefix.m4 serial 7 (gettext-0.18) 1449# lib-prefix.m4 serial 7 (gettext-0.18)
1530dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc. 1450dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
1531dnl This file is free software; the Free Software Foundation 1451dnl This file is free software; the Free Software Foundation
1532dnl gives unlimited permission to copy and/or distribute it, 1452dnl gives unlimited permission to copy and/or distribute it,
1533dnl with or without modifications, as long as this notice is preserved. 1453dnl with or without modifications, as long as this notice is preserved.
@@ -1752,7 +1672,7 @@ sixtyfour bits
1752]) 1672])
1753 1673
1754# nls.m4 serial 5 (gettext-0.18) 1674# nls.m4 serial 5 (gettext-0.18)
1755dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, 1675dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
1756dnl Inc. 1676dnl Inc.
1757dnl This file is free software; the Free Software Foundation 1677dnl This file is free software; the Free Software Foundation
1758dnl gives unlimited permission to copy and/or distribute it, 1678dnl gives unlimited permission to copy and/or distribute it,
@@ -1784,8 +1704,8 @@ AC_DEFUN([AM_NLS],
1784 AC_SUBST([USE_NLS]) 1704 AC_SUBST([USE_NLS])
1785]) 1705])
1786 1706
1787# po.m4 serial 21 (gettext-0.18.3) 1707# po.m4 serial 17 (gettext-0.18)
1788dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. 1708dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
1789dnl This file is free software; the Free Software Foundation 1709dnl This file is free software; the Free Software Foundation
1790dnl gives unlimited permission to copy and/or distribute it, 1710dnl gives unlimited permission to copy and/or distribute it,
1791dnl with or without modifications, as long as this notice is preserved. 1711dnl with or without modifications, as long as this notice is preserved.
@@ -1803,15 +1723,14 @@ dnl Authors:
1803dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 1723dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1804dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 1724dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1805 1725
1806AC_PREREQ([2.60]) 1726AC_PREREQ([2.50])
1807 1727
1808dnl Checks for all prerequisites of the po subdirectory. 1728dnl Checks for all prerequisites of the po subdirectory.
1809AC_DEFUN([AM_PO_SUBDIRS], 1729AC_DEFUN([AM_PO_SUBDIRS],
1810[ 1730[
1811 AC_REQUIRE([AC_PROG_MAKE_SET])dnl 1731 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1812 AC_REQUIRE([AC_PROG_INSTALL])dnl 1732 AC_REQUIRE([AC_PROG_INSTALL])dnl
1813 AC_REQUIRE([AC_PROG_MKDIR_P])dnl 1733 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
1814 AC_REQUIRE([AC_PROG_SED])dnl
1815 AC_REQUIRE([AM_NLS])dnl 1734 AC_REQUIRE([AM_NLS])dnl
1816 1735
1817 dnl Release version of the gettext macros. This is used to ensure that 1736 dnl Release version of the gettext macros. This is used to ensure that
@@ -1889,7 +1808,7 @@ changequote([,])dnl
1889 case "$ac_file" in */Makefile.in) 1808 case "$ac_file" in */Makefile.in)
1890 # Adjust a relative srcdir. 1809 # Adjust a relative srcdir.
1891 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` 1810 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
1892 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` 1811 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
1893 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` 1812 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
1894 # In autoconf-2.13 it is called $ac_given_srcdir. 1813 # In autoconf-2.13 it is called $ac_given_srcdir.
1895 # In autoconf-2.50 it is called $srcdir. 1814 # In autoconf-2.50 it is called $srcdir.
@@ -1905,8 +1824,7 @@ changequote([,])dnl
1905 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then 1824 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
1906 rm -f "$ac_dir/POTFILES" 1825 rm -f "$ac_dir/POTFILES"
1907 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" 1826 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
1908 gt_tab=`printf '\t'` 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"
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"
1910 POMAKEFILEDEPS="POTFILES.in" 1828 POMAKEFILEDEPS="POTFILES.in"
1911 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend 1829 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
1912 # on $ac_dir but don't depend on user-specified configuration 1830 # on $ac_dir but don't depend on user-specified configuration
@@ -1917,12 +1835,12 @@ changequote([,])dnl
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" 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"
1918 fi 1836 fi
1919 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` 1837 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
1920 # Hide the ALL_LINGUAS assignment from automake < 1.5. 1838 # Hide the ALL_LINGUAS assigment from automake < 1.5.
1921 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 1839 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
1922 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" 1840 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
1923 else 1841 else
1924 # The set of available languages was given in configure.in. 1842 # The set of available languages was given in configure.in.
1925 # Hide the ALL_LINGUAS assignment from automake < 1.5. 1843 # Hide the ALL_LINGUAS assigment from automake < 1.5.
1926 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' 1844 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
1927 fi 1845 fi
1928 # Compute POFILES 1846 # Compute POFILES
@@ -2014,7 +1932,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
2014changequote(,)dnl 1932changequote(,)dnl
2015 # Adjust a relative srcdir. 1933 # Adjust a relative srcdir.
2016 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` 1934 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
2017 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` 1935 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
2018 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` 1936 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
2019 # In autoconf-2.13 it is called $ac_given_srcdir. 1937 # In autoconf-2.13 it is called $ac_given_srcdir.
2020 # In autoconf-2.50 it is called $srcdir. 1938 # In autoconf-2.50 it is called $srcdir.
@@ -2042,7 +1960,6 @@ EOT
2042 fi 1960 fi
2043 1961
2044 # A sed script that extracts the value of VARIABLE from a Makefile. 1962 # A sed script that extracts the value of VARIABLE from a Makefile.
2045 tab=`printf '\t'`
2046 sed_x_variable=' 1963 sed_x_variable='
2047# Test if the hold space is empty. 1964# Test if the hold space is empty.
2048x 1965x
@@ -2050,9 +1967,9 @@ s/P/P/
2050x 1967x
2051ta 1968ta
2052# Yes it was empty. Look if we have the expected variable definition. 1969# Yes it was empty. Look if we have the expected variable definition.
2053/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ 1970/^[ ]*VARIABLE[ ]*=/{
2054 # Seen the first line of the variable definition. 1971 # Seen the first line of the variable definition.
2055 s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// 1972 s/^[ ]*VARIABLE[ ]*=//
2056 ba 1973 ba
2057} 1974}
2058bd 1975bd
@@ -2104,7 +2021,7 @@ changequote([,])dnl
2104 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` 2021 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
2105 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` 2022 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
2106 fi 2023 fi
2107 # Hide the ALL_LINGUAS assignment from automake < 1.5. 2024 # Hide the ALL_LINGUAS assigment from automake < 1.5.
2108 eval 'ALL_LINGUAS''=$ALL_LINGUAS_' 2025 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
2109 # Compute POFILES 2026 # Compute POFILES
2110 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) 2027 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -2194,15 +2111,14 @@ changequote([,])dnl
2194 fi 2111 fi
2195 2112
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" 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"
2197 tab=`printf '\t'`
2198 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then 2114 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
2199 # Add dependencies that cannot be formulated as a simple suffix rule. 2115 # Add dependencies that cannot be formulated as a simple suffix rule.
2200 for lang in $ALL_LINGUAS; do 2116 for lang in $ALL_LINGUAS; do
2201 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 2117 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
2202 cat >> "$ac_file.tmp" <<EOF 2118 cat >> "$ac_file.tmp" <<EOF
2203$frobbedlang.msg: $lang.po 2119$frobbedlang.msg: $lang.po
2204${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ 2120 @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
2205${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } 2121 \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
2206EOF 2122EOF
2207 done 2123 done
2208 fi 2124 fi
@@ -2212,8 +2128,8 @@ EOF
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/'` 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/'`
2213 cat >> "$ac_file.tmp" <<EOF 2129 cat >> "$ac_file.tmp" <<EOF
2214$frobbedlang/\$(DOMAIN).resources.dll: $lang.po 2130$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
2215${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ 2131 @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
2216${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } 2132 \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
2217EOF 2133EOF
2218 done 2134 done
2219 fi 2135 fi
@@ -2238,8 +2154,8 @@ AC_DEFUN([AM_XGETTEXT_OPTION],
2238 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" 2154 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
2239]) 2155])
2240 2156
2241# progtest.m4 serial 7 (gettext-0.18.2) 2157# progtest.m4 serial 6 (gettext-0.18)
2242dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc. 2158dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
2243dnl This file is free software; the Free Software Foundation 2159dnl This file is free software; the Free Software Foundation
2244dnl gives unlimited permission to copy and/or distribute it, 2160dnl gives unlimited permission to copy and/or distribute it,
2245dnl with or without modifications, as long as this notice is preserved. 2161dnl with or without modifications, as long as this notice is preserved.
@@ -2267,14 +2183,15 @@ AC_DEFUN([AM_PATH_PROG_WITH_TEST],
2267# Prepare PATH_SEPARATOR. 2183# Prepare PATH_SEPARATOR.
2268# The user is always right. 2184# The user is always right.
2269if test "${PATH_SEPARATOR+set}" != set; then 2185if test "${PATH_SEPARATOR+set}" != set; then
2270 # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which 2186 echo "#! /bin/sh" >conf$$.sh
2271 # contains only /bin. Note that ksh looks also at the FPATH variable, 2187 echo "exit 0" >>conf$$.sh
2272 # so we have to set that as well for the test. 2188 chmod +x conf$$.sh
2273 PATH_SEPARATOR=: 2189 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2274 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ 2190 PATH_SEPARATOR=';'
2275 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ 2191 else
2276 || PATH_SEPARATOR=';' 2192 PATH_SEPARATOR=:
2277 } 2193 fi
2194 rm -f conf$$.sh
2278fi 2195fi
2279 2196
2280# Find out how to test for executable files. Don't use a zero-byte file, 2197# Find out how to test for executable files. Don't use a zero-byte file,
@@ -3137,6 +3054,38 @@ else
3137fi 3054fi
3138]) 3055])
3139 3056
3057# Copyright (C) 2003-2013 Free Software Foundation, Inc.
3058#
3059# This file is free software; the Free Software Foundation
3060# gives unlimited permission to copy and/or distribute it,
3061# with or without modifications, as long as this notice is preserved.
3062
3063# AM_PROG_MKDIR_P
3064# ---------------
3065# Check for 'mkdir -p'.
3066AC_DEFUN([AM_PROG_MKDIR_P],
3067[AC_PREREQ([2.60])dnl
3068AC_REQUIRE([AC_PROG_MKDIR_P])dnl
3069dnl FIXME we are no longer going to remove this! adjust warning
3070dnl FIXME message accordingly.
3071AC_DIAGNOSE([obsolete],
3072[$0: this macro is deprecated, and will soon be removed.
3073You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
3074and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
3075dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
3076dnl while keeping a definition of mkdir_p for backward compatibility.
3077dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
3078dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
3079dnl Makefile.ins that do not define MKDIR_P, so we do our own
3080dnl adjustment using top_builddir (which is defined more often than
3081dnl MKDIR_P).
3082AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
3083case $mkdir_p in
3084 [[\\/$]]* | ?:[[\\/]]*) ;;
3085 */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3086esac
3087])
3088
3140# Helper functions for option handling. -*- Autoconf -*- 3089# Helper functions for option handling. -*- Autoconf -*-
3141 3090
3142# Copyright (C) 2001-2013 Free Software Foundation, Inc. 3091# Copyright (C) 2001-2013 Free Software Foundation, Inc.