summaryrefslogtreecommitdiffstats
path: root/scilab/aclocal.m4
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-13 12:04:44 +0100
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-13 14:03:36 +0100
commitba0902ab6a77ca532086b5b4f27d67489be4b814 (patch)
tree3bdaf3c398f4f32dffb1fc14e017f8a98bd0a729 /scilab/aclocal.m4
parenta7015d45ff3ac2f10c1564d14fb0f6669478a806 (diff)
parenta53c2c4f46b1ea42d908b751310cb6bd92b7a870 (diff)
downloadscilab-windows.zip
scilab-windows.tar.gz
Merge remote-tracking branch 'origin/master' into windowswindows
Change-Id: I80edbceb67381ca1af2b19ef82ee08fc5b385909
Diffstat (limited to 'scilab/aclocal.m4')
-rw-r--r--scilab/aclocal.m481
1 files changed, 39 insertions, 42 deletions
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index 78f430f..de6b4a5 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -21,7 +21,7 @@ If 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 66 (gettext-0.18.2)
24dnl Copyright (C) 1995-2014 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.
@@ -422,8 +422,8 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED],
422dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) 422dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
423AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) 423AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
424 424
425# iconv.m4 serial 19 (gettext-0.18.2) 425# iconv.m4 serial 18 (gettext-0.18.2)
426dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. 426dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc.
427dnl This file is free software; the Free Software Foundation 427dnl This file is free software; the Free Software Foundation
428dnl gives unlimited permission to copy and/or distribute it, 428dnl gives unlimited permission to copy and/or distribute it,
429dnl with or without modifications, as long as this notice is preserved. 429dnl with or without modifications, as long as this notice is preserved.
@@ -496,33 +496,27 @@ AC_DEFUN([AM_ICONV_LINK],
496 if test $am_cv_lib_iconv = yes; then 496 if test $am_cv_lib_iconv = yes; then
497 LIBS="$LIBS $LIBICONV" 497 LIBS="$LIBS $LIBICONV"
498 fi 498 fi
499 am_cv_func_iconv_works=no 499 AC_RUN_IFELSE(
500 for ac_iconv_const in '' 'const'; do 500 [AC_LANG_SOURCE([[
501 AC_RUN_IFELSE(
502 [AC_LANG_PROGRAM(
503 [[
504#include <iconv.h> 501#include <iconv.h>
505#include <string.h> 502#include <string.h>
506 503int main ()
507#ifndef ICONV_CONST 504{
508# define ICONV_CONST $ac_iconv_const 505 int result = 0;
509#endif
510 ]],
511 [[int result = 0;
512 /* 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
513 returns. */ 507 returns. */
514 { 508 {
515 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); 509 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
516 if (cd_utf8_to_88591 != (iconv_t)(-1)) 510 if (cd_utf8_to_88591 != (iconv_t)(-1))
517 { 511 {
518 static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ 512 static const char input[] = "\342\202\254"; /* EURO SIGN */
519 char buf[10]; 513 char buf[10];
520 ICONV_CONST char *inptr = input; 514 const char *inptr = input;
521 size_t inbytesleft = strlen (input); 515 size_t inbytesleft = strlen (input);
522 char *outptr = buf; 516 char *outptr = buf;
523 size_t outbytesleft = sizeof (buf); 517 size_t outbytesleft = sizeof (buf);
524 size_t res = iconv (cd_utf8_to_88591, 518 size_t res = iconv (cd_utf8_to_88591,
525 &inptr, &inbytesleft, 519 (char **) &inptr, &inbytesleft,
526 &outptr, &outbytesleft); 520 &outptr, &outbytesleft);
527 if (res == 0) 521 if (res == 0)
528 result |= 1; 522 result |= 1;
@@ -535,14 +529,14 @@ AC_DEFUN([AM_ICONV_LINK],
535 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); 529 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
536 if (cd_ascii_to_88591 != (iconv_t)(-1)) 530 if (cd_ascii_to_88591 != (iconv_t)(-1))
537 { 531 {
538 static ICONV_CONST char input[] = "\263"; 532 static const char input[] = "\263";
539 char buf[10]; 533 char buf[10];
540 ICONV_CONST char *inptr = input; 534 const char *inptr = input;
541 size_t inbytesleft = strlen (input); 535 size_t inbytesleft = strlen (input);
542 char *outptr = buf; 536 char *outptr = buf;
543 size_t outbytesleft = sizeof (buf); 537 size_t outbytesleft = sizeof (buf);
544 size_t res = iconv (cd_ascii_to_88591, 538 size_t res = iconv (cd_ascii_to_88591,
545 &inptr, &inbytesleft, 539 (char **) &inptr, &inbytesleft,
546 &outptr, &outbytesleft); 540 &outptr, &outbytesleft);
547 if (res == 0) 541 if (res == 0)
548 result |= 2; 542 result |= 2;
@@ -554,14 +548,14 @@ AC_DEFUN([AM_ICONV_LINK],
554 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); 548 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
555 if (cd_88591_to_utf8 != (iconv_t)(-1)) 549 if (cd_88591_to_utf8 != (iconv_t)(-1))
556 { 550 {
557 static ICONV_CONST char input[] = "\304"; 551 static const char input[] = "\304";
558 static char buf[2] = { (char)0xDE, (char)0xAD }; 552 static char buf[2] = { (char)0xDE, (char)0xAD };
559 ICONV_CONST char *inptr = input; 553 const char *inptr = input;
560 size_t inbytesleft = 1; 554 size_t inbytesleft = 1;
561 char *outptr = buf; 555 char *outptr = buf;
562 size_t outbytesleft = 1; 556 size_t outbytesleft = 1;
563 size_t res = iconv (cd_88591_to_utf8, 557 size_t res = iconv (cd_88591_to_utf8,
564 &inptr, &inbytesleft, 558 (char **) &inptr, &inbytesleft,
565 &outptr, &outbytesleft); 559 &outptr, &outbytesleft);
566 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) 560 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
567 result |= 4; 561 result |= 4;
@@ -574,14 +568,14 @@ AC_DEFUN([AM_ICONV_LINK],
574 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); 568 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
575 if (cd_88591_to_utf8 != (iconv_t)(-1)) 569 if (cd_88591_to_utf8 != (iconv_t)(-1))
576 { 570 {
577 static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; 571 static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
578 char buf[50]; 572 char buf[50];
579 ICONV_CONST char *inptr = input; 573 const char *inptr = input;
580 size_t inbytesleft = strlen (input); 574 size_t inbytesleft = strlen (input);
581 char *outptr = buf; 575 char *outptr = buf;
582 size_t outbytesleft = sizeof (buf); 576 size_t outbytesleft = sizeof (buf);
583 size_t res = iconv (cd_88591_to_utf8, 577 size_t res = iconv (cd_88591_to_utf8,
584 &inptr, &inbytesleft, 578 (char **) &inptr, &inbytesleft,
585 &outptr, &outbytesleft); 579 &outptr, &outbytesleft);
586 if ((int)res > 0) 580 if ((int)res > 0)
587 result |= 8; 581 result |= 8;
@@ -601,14 +595,17 @@ AC_DEFUN([AM_ICONV_LINK],
601 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) 595 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
602 result |= 16; 596 result |= 16;
603 return result; 597 return result;
604]])], 598}]])],
605 [am_cv_func_iconv_works=yes], , 599 [am_cv_func_iconv_works=yes],
606 [case "$host_os" in 600 [am_cv_func_iconv_works=no],
607 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; 601 [
608 *) am_cv_func_iconv_works="guessing yes" ;; 602changequote(,)dnl
609 esac]) 603 case "$host_os" in
610 test "$am_cv_func_iconv_works" = no || break 604 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
611 done 605 *) am_cv_func_iconv_works="guessing yes" ;;
606 esac
607changequote([,])dnl
608 ])
612 LIBS="$am_save_LIBS" 609 LIBS="$am_save_LIBS"
613 ]) 610 ])
614 case "$am_cv_func_iconv_works" in 611 case "$am_cv_func_iconv_works" in
@@ -695,7 +692,7 @@ size_t iconv();
695]) 692])
696 693
697# intlmacosx.m4 serial 5 (gettext-0.18.2) 694# intlmacosx.m4 serial 5 (gettext-0.18.2)
698dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. 695dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
699dnl This file is free software; the Free Software Foundation 696dnl This file is free software; the Free Software Foundation
700dnl gives unlimited permission to copy and/or distribute it, 697dnl gives unlimited permission to copy and/or distribute it,
701dnl with or without modifications, as long as this notice is preserved. 698dnl with or without modifications, as long as this notice is preserved.
@@ -752,7 +749,7 @@ AC_DEFUN([gt_INTL_MACOSX],
752]) 749])
753 750
754# lib-link.m4 serial 26 (gettext-0.18.2) 751# lib-link.m4 serial 26 (gettext-0.18.2)
755dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. 752dnl Copyright (C) 2001-2013 Free Software Foundation, Inc.
756dnl This file is free software; the Free Software Foundation 753dnl This file is free software; the Free Software Foundation
757dnl gives unlimited permission to copy and/or distribute it, 754dnl gives unlimited permission to copy and/or distribute it,
758dnl with or without modifications, as long as this notice is preserved. 755dnl with or without modifications, as long as this notice is preserved.
@@ -1530,7 +1527,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
1530]) 1527])
1531 1528
1532# lib-prefix.m4 serial 7 (gettext-0.18) 1529# lib-prefix.m4 serial 7 (gettext-0.18)
1533dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc. 1530dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc.
1534dnl This file is free software; the Free Software Foundation 1531dnl This file is free software; the Free Software Foundation
1535dnl gives unlimited permission to copy and/or distribute it, 1532dnl gives unlimited permission to copy and/or distribute it,
1536dnl with or without modifications, as long as this notice is preserved. 1533dnl with or without modifications, as long as this notice is preserved.
@@ -1755,7 +1752,7 @@ sixtyfour bits
1755]) 1752])
1756 1753
1757# nls.m4 serial 5 (gettext-0.18) 1754# nls.m4 serial 5 (gettext-0.18)
1758dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, 1755dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
1759dnl Inc. 1756dnl Inc.
1760dnl This file is free software; the Free Software Foundation 1757dnl This file is free software; the Free Software Foundation
1761dnl gives unlimited permission to copy and/or distribute it, 1758dnl gives unlimited permission to copy and/or distribute it,
@@ -1787,8 +1784,8 @@ AC_DEFUN([AM_NLS],
1787 AC_SUBST([USE_NLS]) 1784 AC_SUBST([USE_NLS])
1788]) 1785])
1789 1786
1790# po.m4 serial 24 (gettext-0.19) 1787# po.m4 serial 21 (gettext-0.18.3)
1791dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. 1788dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
1792dnl This file is free software; the Free Software Foundation 1789dnl This file is free software; the Free Software Foundation
1793dnl gives unlimited permission to copy and/or distribute it, 1790dnl gives unlimited permission to copy and/or distribute it,
1794dnl with or without modifications, as long as this notice is preserved. 1791dnl with or without modifications, as long as this notice is preserved.
@@ -1819,7 +1816,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
1819 1816
1820 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
1821 dnl the gettext macros and po/Makefile.in.in are in sync. 1818 dnl the gettext macros and po/Makefile.in.in are in sync.
1822 AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) 1819 AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
1823 1820
1824 dnl Perform the following tests also if --disable-nls has been given, 1821 dnl Perform the following tests also if --disable-nls has been given,
1825 dnl because they are needed for "make dist" to work. 1822 dnl because they are needed for "make dist" to work.
@@ -2242,7 +2239,7 @@ AC_DEFUN([AM_XGETTEXT_OPTION],
2242]) 2239])
2243 2240
2244# progtest.m4 serial 7 (gettext-0.18.2) 2241# progtest.m4 serial 7 (gettext-0.18.2)
2245dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. 2242dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc.
2246dnl This file is free software; the Free Software Foundation 2243dnl This file is free software; the Free Software Foundation
2247dnl gives unlimited permission to copy and/or distribute it, 2244dnl gives unlimited permission to copy and/or distribute it,
2248dnl with or without modifications, as long as this notice is preserved. 2245dnl with or without modifications, as long as this notice is preserved.