summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément DAVID <clement.david@esi-group.com>2018-10-04 15:08:20 +0200
committerClément DAVID <clement.david@esi-group.com>2018-10-04 15:08:20 +0200
commit2b14178c2f92356e0bca92beec6e61ca07d45dee (patch)
tree70d7337cb6e7e384b9f7922ace58807ea617517f
parentde4010185dae41185396b4ee6c432708d88ca795 (diff)
downloadscilab-2b14178c2f92356e0bca92beec6e61ca07d45dee.zip
scilab-2b14178c2f92356e0bca92beec6e61ca07d45dee.tar.gz
Linux: fix ./configure after de401018
Change-Id: Ib4edcb1b087c319a65d21124086366e645c5b640
-rw-r--r--scilab/Makefile.in13
-rw-r--r--scilab/aclocal.m42332
-rwxr-xr-xscilab/config/ar-lib4
-rwxr-xr-xscilab/config/compile11
-rwxr-xr-xscilab/config/config.guess193
-rwxr-xr-xscilab/config/config.sub73
-rwxr-xr-xscilab/config/depcomp8
-rwxr-xr-xscilab/config/install-sh4
-rw-r--r--scilab/config/ltmain.sh4
-rwxr-xr-xscilab/config/missing8
-rwxr-xr-xscilab/config/mkinstalldirs6
-rwxr-xr-xscilab/configure2342
-rw-r--r--scilab/contrib/Makefile.in5
-rw-r--r--scilab/desktop/Makefile.in5
-rw-r--r--scilab/desktop/images/icons/Makefile.in5
-rw-r--r--scilab/m4/libtool.m42
-rw-r--r--scilab/modules/Makefile.in5
-rw-r--r--scilab/modules/action_binding/Makefile.in5
-rw-r--r--scilab/modules/api_scilab/Makefile.in5
-rw-r--r--scilab/modules/arnoldi/Makefile.in5
-rw-r--r--scilab/modules/ast/Makefile.in5
-rw-r--r--scilab/modules/atoms/Makefile.in5
-rw-r--r--scilab/modules/boolean/Makefile.in5
-rw-r--r--scilab/modules/cacsd/Makefile.in5
-rw-r--r--scilab/modules/call_scilab/Makefile.in5
-rw-r--r--scilab/modules/commons/Makefile.in5
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in5
-rw-r--r--scilab/modules/completion/Makefile.in5
-rw-r--r--scilab/modules/console/Makefile.in5
-rw-r--r--scilab/modules/core/Makefile.in5
-rw-r--r--scilab/modules/coverage/Makefile.in5
-rw-r--r--scilab/modules/data_structures/Makefile.in5
-rw-r--r--scilab/modules/demo_tools/Makefile.in5
-rw-r--r--scilab/modules/development_tools/Makefile.in5
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in5
-rw-r--r--scilab/modules/differential_equations/Makefile.in5
-rw-r--r--scilab/modules/dynamic_link/Makefile.in5
-rw-r--r--scilab/modules/elementary_functions/Makefile.in5
-rw-r--r--scilab/modules/external_objects/Makefile.in5
-rw-r--r--scilab/modules/external_objects_java/Makefile.in5
-rw-r--r--scilab/modules/fftw/Makefile.in5
-rw-r--r--scilab/modules/fileio/Makefile.in5
-rw-r--r--scilab/modules/functions/Makefile.in5
-rw-r--r--scilab/modules/functions_manager/Makefile.in5
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in5
-rw-r--r--scilab/modules/graph/Makefile.in5
-rw-r--r--scilab/modules/graphic_export/Makefile.in5
-rw-r--r--scilab/modules/graphic_objects/Makefile.in5
-rw-r--r--scilab/modules/graphics/Makefile.in5
-rw-r--r--scilab/modules/gui/Makefile.in5
-rw-r--r--scilab/modules/hdf5/Makefile.in5
-rw-r--r--scilab/modules/helptools/Makefile.in5
-rw-r--r--scilab/modules/history_browser/Makefile.in5
-rw-r--r--scilab/modules/history_manager/Makefile.in5
-rw-r--r--scilab/modules/integer/Makefile.in5
-rw-r--r--scilab/modules/interpolation/Makefile.in5
-rw-r--r--scilab/modules/io/Makefile.in5
-rw-r--r--scilab/modules/javasci/Makefile.in9
-rw-r--r--scilab/modules/jvm/Makefile.in5
-rw-r--r--scilab/modules/linear_algebra/Makefile.in5
-rw-r--r--scilab/modules/localization/Makefile.in5
-rw-r--r--scilab/modules/m2sci/Makefile.in5
-rw-r--r--scilab/modules/matio/Makefile.in5
-rw-r--r--scilab/modules/mexlib/Makefile.in5
-rw-r--r--scilab/modules/modules_manager/Makefile.in5
-rw-r--r--scilab/modules/mpi/Makefile.in5
-rw-r--r--scilab/modules/optimization/Makefile.in5
-rw-r--r--scilab/modules/output_stream/Makefile.in5
-rw-r--r--scilab/modules/overloading/Makefile.in5
-rw-r--r--scilab/modules/parallel/Makefile.in5
-rw-r--r--scilab/modules/parameters/Makefile.in5
-rw-r--r--scilab/modules/polynomials/Makefile.in5
-rw-r--r--scilab/modules/prebuildjava/Makefile.in5
-rw-r--r--scilab/modules/preferences/Makefile.in5
-rw-r--r--scilab/modules/randlib/Makefile.in5
-rw-r--r--scilab/modules/renderer/Makefile.in5
-rw-r--r--scilab/modules/scicos/Makefile.in5
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in5
-rw-r--r--scilab/modules/scinotes/Makefile.in5
-rw-r--r--scilab/modules/signal_processing/Makefile.in5
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in5
-rw-r--r--scilab/modules/slint/Makefile.in5
-rw-r--r--scilab/modules/sound/Makefile.in5
-rw-r--r--scilab/modules/sparse/Makefile.in5
-rw-r--r--scilab/modules/special_functions/Makefile.in5
-rw-r--r--scilab/modules/spreadsheet/Makefile.in5
-rw-r--r--scilab/modules/statistics/Makefile.in5
-rw-r--r--scilab/modules/string/Makefile.in5
-rw-r--r--scilab/modules/tclsci/Makefile.in5
-rw-r--r--scilab/modules/threads/Makefile.in5
-rw-r--r--scilab/modules/time/Makefile.in5
-rw-r--r--scilab/modules/types/Makefile.in5
-rw-r--r--scilab/modules/ui_data/Makefile.in5
-rw-r--r--scilab/modules/umfpack/Makefile.in5
-rw-r--r--scilab/modules/webtools/Makefile.in5
-rw-r--r--scilab/modules/windows_tools/Makefile.in5
-rw-r--r--scilab/modules/xcos/Makefile.in5
-rw-r--r--scilab/modules/xml/Makefile.in5
98 files changed, 4968 insertions, 461 deletions
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index af11886..156df1c 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.15 from Makefile.am. 1# Makefile.in generated by automake 1.15.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2014 Free Software Foundation, Inc. 4# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
@@ -812,7 +812,6 @@ pdfdir = @pdfdir@
812prefix = @prefix@ 812prefix = @prefix@
813program_transform_name = @program_transform_name@ 813program_transform_name = @program_transform_name@
814psdir = @psdir@ 814psdir = @psdir@
815runstatedir = @runstatedir@
816sbindir = @sbindir@ 815sbindir = @sbindir@
817sharedstatedir = @sharedstatedir@ 816sharedstatedir = @sharedstatedir@
818srcdir = @srcdir@ 817srcdir = @srcdir@
@@ -1843,7 +1842,7 @@ distdir: $(DISTFILES)
1843 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ 1842 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1844 || chmod -R a+r "$(distdir)" 1843 || chmod -R a+r "$(distdir)"
1845dist-gzip: distdir 1844dist-gzip: distdir
1846 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 1845 tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
1847 $(am__post_remove_distdir) 1846 $(am__post_remove_distdir)
1848dist-bzip2: distdir 1847dist-bzip2: distdir
1849 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 1848 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -1868,7 +1867,7 @@ dist-shar: distdir
1868 @echo WARNING: "Support for shar distribution archives is" \ 1867 @echo WARNING: "Support for shar distribution archives is" \
1869 "deprecated." >&2 1868 "deprecated." >&2
1870 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 1869 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
1871 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz 1870 shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
1872 $(am__post_remove_distdir) 1871 $(am__post_remove_distdir)
1873dist-zip: distdir 1872dist-zip: distdir
1874 -rm -f $(distdir).zip 1873 -rm -f $(distdir).zip
@@ -1885,7 +1884,7 @@ dist dist-all:
1885distcheck: dist 1884distcheck: dist
1886 case '$(DIST_ARCHIVES)' in \ 1885 case '$(DIST_ARCHIVES)' in \
1887 *.tar.gz*) \ 1886 *.tar.gz*) \
1888 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ 1887 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
1889 *.tar.bz2*) \ 1888 *.tar.bz2*) \
1890 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ 1889 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1891 *.tar.lz*) \ 1890 *.tar.lz*) \
@@ -1895,7 +1894,7 @@ distcheck: dist
1895 *.tar.Z*) \ 1894 *.tar.Z*) \
1896 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ 1895 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1897 *.shar.gz*) \ 1896 *.shar.gz*) \
1898 GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ 1897 eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
1899 *.zip*) \ 1898 *.zip*) \
1900 unzip $(distdir).zip ;;\ 1899 unzip $(distdir).zip ;;\
1901 esac 1900 esac
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index 17fe115..8cf277e 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -20,6 +20,2338 @@ 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 68 (gettext-0.19.8)
24dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
25dnl This file is free software; the Free Software Foundation
26dnl gives unlimited permission to copy and/or distribute it,
27dnl with or without modifications, as long as this notice is preserved.
28dnl
29dnl This file can be used in projects which are not available under
30dnl the GNU General Public License or the GNU Library General Public
31dnl License but which still want to provide support for the GNU gettext
32dnl functionality.
33dnl Please note that the actual code of the GNU gettext library is covered
34dnl by the GNU Library General Public License, and the rest of the GNU
35dnl gettext package is covered by the GNU General Public License.
36dnl They are *not* in the public domain.
37
38dnl Authors:
39dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
40dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
41
42dnl Macro to add for using GNU gettext.
43
44dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
45dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
46dnl default (if it is not specified or empty) is 'no-libtool'.
47dnl INTLSYMBOL should be 'external' for packages with no intl directory,
48dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
49dnl If INTLSYMBOL is 'use-libtool', then a libtool library
50dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
51dnl depending on --{enable,disable}-{shared,static} and on the presence of
52dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
53dnl $(top_builddir)/intl/libintl.a will be created.
54dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
55dnl implementations (in libc or libintl) without the ngettext() function
56dnl will be ignored. If NEEDSYMBOL is specified and is
57dnl 'need-formatstring-macros', then GNU gettext implementations that don't
58dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
59dnl INTLDIR is used to find the intl libraries. If empty,
60dnl the value '$(top_builddir)/intl/' is used.
61dnl
62dnl The result of the configuration is one of three cases:
63dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
64dnl and used.
65dnl Catalog format: GNU --> install in $(datadir)
66dnl Catalog extension: .mo after installation, .gmo in source tree
67dnl 2) GNU gettext has been found in the system's C library.
68dnl Catalog format: GNU --> install in $(datadir)
69dnl Catalog extension: .mo after installation, .gmo in source tree
70dnl 3) No internationalization, always use English msgid.
71dnl Catalog format: none
72dnl Catalog extension: none
73dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
74dnl The use of .gmo is historical (it was needed to avoid overwriting the
75dnl GNU format catalogs when building on a platform with an X/Open gettext),
76dnl but we keep it in order not to force irrelevant filename changes on the
77dnl maintainers.
78dnl
79AC_DEFUN([AM_GNU_GETTEXT],
80[
81 dnl Argument checking.
82 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
83 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
84])])])])])
85 ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
86 [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
87 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
88 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
89])])])])
90 define([gt_included_intl],
91 ifelse([$1], [external],
92 ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
93 [yes]))
94 define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
95 gt_NEEDS_INIT
96 AM_GNU_GETTEXT_NEED([$2])
97
98 AC_REQUIRE([AM_PO_SUBDIRS])dnl
99 ifelse(gt_included_intl, yes, [
100 AC_REQUIRE([AM_INTL_SUBDIR])dnl
101 ])
102
103 dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
104 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
105 AC_REQUIRE([AC_LIB_RPATH])
106
107 dnl Sometimes libintl requires libiconv, so first search for libiconv.
108 dnl Ideally we would do this search only after the
109 dnl if test "$USE_NLS" = "yes"; then
110 dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
111 dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
112 dnl the configure script would need to contain the same shell code
113 dnl again, outside any 'if'. There are two solutions:
114 dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
115 dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
116 dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
117 dnl documented, we avoid it.
118 ifelse(gt_included_intl, yes, , [
119 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
120 ])
121
122 dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
123 gt_INTL_MACOSX
124
125 dnl Set USE_NLS.
126 AC_REQUIRE([AM_NLS])
127
128 ifelse(gt_included_intl, yes, [
129 BUILD_INCLUDED_LIBINTL=no
130 USE_INCLUDED_LIBINTL=no
131 ])
132 LIBINTL=
133 LTLIBINTL=
134 POSUB=
135
136 dnl Add a version number to the cache macros.
137 case " $gt_needs " in
138 *" need-formatstring-macros "*) gt_api_version=3 ;;
139 *" need-ngettext "*) gt_api_version=2 ;;
140 *) gt_api_version=1 ;;
141 esac
142 gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
143 gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
144
145 dnl If we use NLS figure out what method
146 if test "$USE_NLS" = "yes"; then
147 gt_use_preinstalled_gnugettext=no
148 ifelse(gt_included_intl, yes, [
149 AC_MSG_CHECKING([whether included gettext is requested])
150 AC_ARG_WITH([included-gettext],
151 [ --with-included-gettext use the GNU gettext library included here],
152 nls_cv_force_use_gnu_gettext=$withval,
153 nls_cv_force_use_gnu_gettext=no)
154 AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
155
156 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
157 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
158 ])
159 dnl User does not insist on using GNU NLS library. Figure out what
160 dnl to use. If GNU gettext is available we use this. Else we have
161 dnl to fall back to GNU NLS library.
162
163 if test $gt_api_version -ge 3; then
164 gt_revision_test_code='
165#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
166#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
167#endif
168changequote(,)dnl
169typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
170changequote([,])dnl
171'
172 else
173 gt_revision_test_code=
174 fi
175 if test $gt_api_version -ge 2; then
176 gt_expression_test_code=' + * ngettext ("", "", 0)'
177 else
178 gt_expression_test_code=
179 fi
180
181 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
182 [AC_LINK_IFELSE(
183 [AC_LANG_PROGRAM(
184 [[
185#include <libintl.h>
186#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
187extern int _nl_msg_cat_cntr;
188extern int *_nl_domain_bindings;
189#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
190#else
191#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
192#endif
193$gt_revision_test_code
194 ]],
195 [[
196bindtextdomain ("", "");
197return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
198 ]])],
199 [eval "$gt_func_gnugettext_libc=yes"],
200 [eval "$gt_func_gnugettext_libc=no"])])
201
202 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
203 dnl Sometimes libintl requires libiconv, so first search for libiconv.
204 ifelse(gt_included_intl, yes, , [
205 AM_ICONV_LINK
206 ])
207 dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
208 dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
209 dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
210 dnl even if libiconv doesn't exist.
211 AC_LIB_LINKFLAGS_BODY([intl])
212 AC_CACHE_CHECK([for GNU gettext in libintl],
213 [$gt_func_gnugettext_libintl],
214 [gt_save_CPPFLAGS="$CPPFLAGS"
215 CPPFLAGS="$CPPFLAGS $INCINTL"
216 gt_save_LIBS="$LIBS"
217 LIBS="$LIBS $LIBINTL"
218 dnl Now see whether libintl exists and does not depend on libiconv.
219 AC_LINK_IFELSE(
220 [AC_LANG_PROGRAM(
221 [[
222#include <libintl.h>
223#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
224extern int _nl_msg_cat_cntr;
225extern
226#ifdef __cplusplus
227"C"
228#endif
229const char *_nl_expand_alias (const char *);
230#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
231#else
232#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
233#endif
234$gt_revision_test_code
235 ]],
236 [[
237bindtextdomain ("", "");
238return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
239 ]])],
240 [eval "$gt_func_gnugettext_libintl=yes"],
241 [eval "$gt_func_gnugettext_libintl=no"])
242 dnl Now see whether libintl exists and depends on libiconv.
243 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
244 LIBS="$LIBS $LIBICONV"
245 AC_LINK_IFELSE(
246 [AC_LANG_PROGRAM(
247 [[
248#include <libintl.h>
249#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
250extern int _nl_msg_cat_cntr;
251extern
252#ifdef __cplusplus
253"C"
254#endif
255const char *_nl_expand_alias (const char *);
256#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
257#else
258#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
259#endif
260$gt_revision_test_code
261 ]],
262 [[
263bindtextdomain ("", "");
264return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
265 ]])],
266 [LIBINTL="$LIBINTL $LIBICONV"
267 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
268 eval "$gt_func_gnugettext_libintl=yes"
269 ])
270 fi
271 CPPFLAGS="$gt_save_CPPFLAGS"
272 LIBS="$gt_save_LIBS"])
273 fi
274
275 dnl If an already present or preinstalled GNU gettext() is found,
276 dnl use it. But if this macro is used in GNU gettext, and GNU
277 dnl gettext is already preinstalled in libintl, we update this
278 dnl libintl. (Cf. the install rule in intl/Makefile.in.)
279 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
280 || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
281 && test "$PACKAGE" != gettext-runtime \
282 && test "$PACKAGE" != gettext-tools; }; then
283 gt_use_preinstalled_gnugettext=yes
284 else
285 dnl Reset the values set by searching for libintl.
286 LIBINTL=
287 LTLIBINTL=
288 INCINTL=
289 fi
290
291 ifelse(gt_included_intl, yes, [
292 if test "$gt_use_preinstalled_gnugettext" != "yes"; then
293 dnl GNU gettext is not found in the C library.
294 dnl Fall back on included GNU gettext library.
295 nls_cv_use_gnu_gettext=yes
296 fi
297 fi
298
299 if test "$nls_cv_use_gnu_gettext" = "yes"; then
300 dnl Mark actions used to generate GNU NLS library.
301 BUILD_INCLUDED_LIBINTL=yes
302 USE_INCLUDED_LIBINTL=yes
303 LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
304 LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
305 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
306 fi
307
308 CATOBJEXT=
309 if test "$gt_use_preinstalled_gnugettext" = "yes" \
310 || test "$nls_cv_use_gnu_gettext" = "yes"; then
311 dnl Mark actions to use GNU gettext tools.
312 CATOBJEXT=.gmo
313 fi
314 ])
315
316 if test -n "$INTL_MACOSX_LIBS"; then
317 if test "$gt_use_preinstalled_gnugettext" = "yes" \
318 || test "$nls_cv_use_gnu_gettext" = "yes"; then
319 dnl Some extra flags are needed during linking.
320 LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
321 LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
322 fi
323 fi
324
325 if test "$gt_use_preinstalled_gnugettext" = "yes" \
326 || test "$nls_cv_use_gnu_gettext" = "yes"; then
327 AC_DEFINE([ENABLE_NLS], [1],
328 [Define to 1 if translation of program messages to the user's native language
329 is requested.])
330 else
331 USE_NLS=no
332 fi
333 fi
334
335 AC_MSG_CHECKING([whether to use NLS])
336 AC_MSG_RESULT([$USE_NLS])
337 if test "$USE_NLS" = "yes"; then
338 AC_MSG_CHECKING([where the gettext function comes from])
339 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
340 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
341 gt_source="external libintl"
342 else
343 gt_source="libc"
344 fi
345 else
346 gt_source="included intl directory"
347 fi
348 AC_MSG_RESULT([$gt_source])
349 fi
350
351 if test "$USE_NLS" = "yes"; then
352
353 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
354 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
355 AC_MSG_CHECKING([how to link with libintl])
356 AC_MSG_RESULT([$LIBINTL])
357 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
358 fi
359
360 dnl For backward compatibility. Some packages may be using this.
361 AC_DEFINE([HAVE_GETTEXT], [1],
362 [Define if the GNU gettext() function is already present or preinstalled.])
363 AC_DEFINE([HAVE_DCGETTEXT], [1],
364 [Define if the GNU dcgettext() function is already present or preinstalled.])
365 fi
366
367 dnl We need to process the po/ directory.
368 POSUB=po
369 fi
370
371 ifelse(gt_included_intl, yes, [
372 dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
373 dnl to 'yes' because some of the testsuite requires it.
374 if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
375 BUILD_INCLUDED_LIBINTL=yes
376 fi
377
378 dnl Make all variables we use known to autoconf.
379 AC_SUBST([BUILD_INCLUDED_LIBINTL])
380 AC_SUBST([USE_INCLUDED_LIBINTL])
381 AC_SUBST([CATOBJEXT])
382
383 dnl For backward compatibility. Some configure.ins may be using this.
384 nls_cv_header_intl=
385 nls_cv_header_libgt=
386
387 dnl For backward compatibility. Some Makefiles may be using this.
388 DATADIRNAME=share
389 AC_SUBST([DATADIRNAME])
390
391 dnl For backward compatibility. Some Makefiles may be using this.
392 INSTOBJEXT=.mo
393 AC_SUBST([INSTOBJEXT])
394
395 dnl For backward compatibility. Some Makefiles may be using this.
396 GENCAT=gencat
397 AC_SUBST([GENCAT])
398
399 dnl For backward compatibility. Some Makefiles may be using this.
400 INTLOBJS=
401 if test "$USE_INCLUDED_LIBINTL" = yes; then
402 INTLOBJS="\$(GETTOBJS)"
403 fi
404 AC_SUBST([INTLOBJS])
405
406 dnl Enable libtool support if the surrounding package wishes it.
407 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
408 AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
409 ])
410
411 dnl For backward compatibility. Some Makefiles may be using this.
412 INTLLIBS="$LIBINTL"
413 AC_SUBST([INTLLIBS])
414
415 dnl Make all documented variables known to autoconf.
416 AC_SUBST([LIBINTL])
417 AC_SUBST([LTLIBINTL])
418 AC_SUBST([POSUB])
419])
420
421
422dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
423m4_define([gt_NEEDS_INIT],
424[
425 m4_divert_text([DEFAULTS], [gt_needs=])
426 m4_define([gt_NEEDS_INIT], [])
427])
428
429
430dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
431AC_DEFUN([AM_GNU_GETTEXT_NEED],
432[
433 m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
434])
435
436
437dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
438AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
439
440
441dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
442AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
443
444# iconv.m4 serial 19 (gettext-0.18.2)
445dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
446dnl This file is free software; the Free Software Foundation
447dnl gives unlimited permission to copy and/or distribute it,
448dnl with or without modifications, as long as this notice is preserved.
449
450dnl From Bruno Haible.
451
452AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
453[
454 dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
455 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
456 AC_REQUIRE([AC_LIB_RPATH])
457
458 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
459 dnl accordingly.
460 AC_LIB_LINKFLAGS_BODY([iconv])
461])
462
463AC_DEFUN([AM_ICONV_LINK],
464[
465 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
466 dnl those with the standalone portable GNU libiconv installed).
467 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
468
469 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
470 dnl accordingly.
471 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
472
473 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
474 dnl because if the user has installed libiconv and not disabled its use
475 dnl via --without-libiconv-prefix, he wants to use it. The first
476 dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
477 am_save_CPPFLAGS="$CPPFLAGS"
478 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
479
480 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
481 am_cv_func_iconv="no, consider installing GNU libiconv"
482 am_cv_lib_iconv=no
483 AC_LINK_IFELSE(
484 [AC_LANG_PROGRAM(
485 [[
486#include <stdlib.h>
487#include <iconv.h>
488 ]],
489 [[iconv_t cd = iconv_open("","");
490 iconv(cd,NULL,NULL,NULL,NULL);
491 iconv_close(cd);]])],
492 [am_cv_func_iconv=yes])
493 if test "$am_cv_func_iconv" != yes; then
494 am_save_LIBS="$LIBS"
495 LIBS="$LIBS $LIBICONV"
496 AC_LINK_IFELSE(
497 [AC_LANG_PROGRAM(
498 [[
499#include <stdlib.h>
500#include <iconv.h>
501 ]],
502 [[iconv_t cd = iconv_open("","");
503 iconv(cd,NULL,NULL,NULL,NULL);
504 iconv_close(cd);]])],
505 [am_cv_lib_iconv=yes]
506 [am_cv_func_iconv=yes])
507 LIBS="$am_save_LIBS"
508 fi
509 ])
510 if test "$am_cv_func_iconv" = yes; then
511 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
512 dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
513 dnl Solaris 10.
514 am_save_LIBS="$LIBS"
515 if test $am_cv_lib_iconv = yes; then
516 LIBS="$LIBS $LIBICONV"
517 fi
518 am_cv_func_iconv_works=no
519 for ac_iconv_const in '' 'const'; do
520 AC_RUN_IFELSE(
521 [AC_LANG_PROGRAM(
522 [[
523#include <iconv.h>
524#include <string.h>
525
526#ifndef ICONV_CONST
527# define ICONV_CONST $ac_iconv_const
528#endif
529 ]],
530 [[int result = 0;
531 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
532 returns. */
533 {
534 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
535 if (cd_utf8_to_88591 != (iconv_t)(-1))
536 {
537 static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
538 char buf[10];
539 ICONV_CONST char *inptr = input;
540 size_t inbytesleft = strlen (input);
541 char *outptr = buf;
542 size_t outbytesleft = sizeof (buf);
543 size_t res = iconv (cd_utf8_to_88591,
544 &inptr, &inbytesleft,
545 &outptr, &outbytesleft);
546 if (res == 0)
547 result |= 1;
548 iconv_close (cd_utf8_to_88591);
549 }
550 }
551 /* Test against Solaris 10 bug: Failures are not distinguishable from
552 successful returns. */
553 {
554 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
555 if (cd_ascii_to_88591 != (iconv_t)(-1))
556 {
557 static ICONV_CONST char input[] = "\263";
558 char buf[10];
559 ICONV_CONST char *inptr = input;
560 size_t inbytesleft = strlen (input);
561 char *outptr = buf;
562 size_t outbytesleft = sizeof (buf);
563 size_t res = iconv (cd_ascii_to_88591,
564 &inptr, &inbytesleft,
565 &outptr, &outbytesleft);
566 if (res == 0)
567 result |= 2;
568 iconv_close (cd_ascii_to_88591);
569 }
570 }
571 /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
572 {
573 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
574 if (cd_88591_to_utf8 != (iconv_t)(-1))
575 {
576 static ICONV_CONST char input[] = "\304";
577 static char buf[2] = { (char)0xDE, (char)0xAD };
578 ICONV_CONST char *inptr = input;
579 size_t inbytesleft = 1;
580 char *outptr = buf;
581 size_t outbytesleft = 1;
582 size_t res = iconv (cd_88591_to_utf8,
583 &inptr, &inbytesleft,
584 &outptr, &outbytesleft);
585 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
586 result |= 4;
587 iconv_close (cd_88591_to_utf8);
588 }
589 }
590#if 0 /* This bug could be worked around by the caller. */
591 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
592 {
593 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
594 if (cd_88591_to_utf8 != (iconv_t)(-1))
595 {
596 static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
597 char buf[50];
598 ICONV_CONST char *inptr = input;
599 size_t inbytesleft = strlen (input);
600 char *outptr = buf;
601 size_t outbytesleft = sizeof (buf);
602 size_t res = iconv (cd_88591_to_utf8,
603 &inptr, &inbytesleft,
604 &outptr, &outbytesleft);
605 if ((int)res > 0)
606 result |= 8;
607 iconv_close (cd_88591_to_utf8);
608 }
609 }
610#endif
611 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
612 provided. */
613 if (/* Try standardized names. */
614 iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
615 /* Try IRIX, OSF/1 names. */
616 && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
617 /* Try AIX names. */
618 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
619 /* Try HP-UX names. */
620 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
621 result |= 16;
622 return result;
623]])],
624 [am_cv_func_iconv_works=yes], ,
625 [case "$host_os" in
626 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
627 *) am_cv_func_iconv_works="guessing yes" ;;
628 esac])
629 test "$am_cv_func_iconv_works" = no || break
630 done
631 LIBS="$am_save_LIBS"
632 ])
633 case "$am_cv_func_iconv_works" in
634 *no) am_func_iconv=no am_cv_lib_iconv=no ;;
635 *) am_func_iconv=yes ;;
636 esac
637 else
638 am_func_iconv=no am_cv_lib_iconv=no
639 fi
640 if test "$am_func_iconv" = yes; then
641 AC_DEFINE([HAVE_ICONV], [1],
642 [Define if you have the iconv() function and it works.])
643 fi
644 if test "$am_cv_lib_iconv" = yes; then
645 AC_MSG_CHECKING([how to link with libiconv])
646 AC_MSG_RESULT([$LIBICONV])
647 else
648 dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
649 dnl either.
650 CPPFLAGS="$am_save_CPPFLAGS"
651 LIBICONV=
652 LTLIBICONV=
653 fi
654 AC_SUBST([LIBICONV])
655 AC_SUBST([LTLIBICONV])
656])
657
658dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
659dnl avoid warnings like
660dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
661dnl This is tricky because of the way 'aclocal' is implemented:
662dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
663dnl Otherwise aclocal's initial scan pass would miss the macro definition.
664dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
665dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
666dnl warnings.
667m4_define([gl_iconv_AC_DEFUN],
668 m4_version_prereq([2.64],
669 [[AC_DEFUN_ONCE(
670 [$1], [$2])]],
671 [m4_ifdef([gl_00GNULIB],
672 [[AC_DEFUN_ONCE(
673 [$1], [$2])]],
674 [[AC_DEFUN(
675 [$1], [$2])]])]))
676gl_iconv_AC_DEFUN([AM_ICONV],
677[
678 AM_ICONV_LINK
679 if test "$am_cv_func_iconv" = yes; then
680 AC_MSG_CHECKING([for iconv declaration])
681 AC_CACHE_VAL([am_cv_proto_iconv], [
682 AC_COMPILE_IFELSE(
683 [AC_LANG_PROGRAM(
684 [[
685#include <stdlib.h>
686#include <iconv.h>
687extern
688#ifdef __cplusplus
689"C"
690#endif
691#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
692size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
693#else
694size_t iconv();
695#endif
696 ]],
697 [[]])],
698 [am_cv_proto_iconv_arg1=""],
699 [am_cv_proto_iconv_arg1="const"])
700 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);"])
701 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
702 AC_MSG_RESULT([
703 $am_cv_proto_iconv])
704 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
705 [Define as const if the declaration of iconv() needs const.])
706 dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
707 m4_ifdef([gl_ICONV_H_DEFAULTS],
708 [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
709 if test -n "$am_cv_proto_iconv_arg1"; then
710 ICONV_CONST="const"
711 fi
712 ])
713 fi
714])
715
716# intlmacosx.m4 serial 5 (gettext-0.18.2)
717dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
718dnl This file is free software; the Free Software Foundation
719dnl gives unlimited permission to copy and/or distribute it,
720dnl with or without modifications, as long as this notice is preserved.
721dnl
722dnl This file can be used in projects which are not available under
723dnl the GNU General Public License or the GNU Library General Public
724dnl License but which still want to provide support for the GNU gettext
725dnl functionality.
726dnl Please note that the actual code of the GNU gettext library is covered
727dnl by the GNU Library General Public License, and the rest of the GNU
728dnl gettext package is covered by the GNU General Public License.
729dnl They are *not* in the public domain.
730
731dnl Checks for special options needed on Mac OS X.
732dnl Defines INTL_MACOSX_LIBS.
733AC_DEFUN([gt_INTL_MACOSX],
734[
735 dnl Check for API introduced in Mac OS X 10.2.
736 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
737 [gt_cv_func_CFPreferencesCopyAppValue],
738 [gt_save_LIBS="$LIBS"
739 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
740 AC_LINK_IFELSE(
741 [AC_LANG_PROGRAM(
742 [[#include <CoreFoundation/CFPreferences.h>]],
743 [[CFPreferencesCopyAppValue(NULL, NULL)]])],
744 [gt_cv_func_CFPreferencesCopyAppValue=yes],
745 [gt_cv_func_CFPreferencesCopyAppValue=no])
746 LIBS="$gt_save_LIBS"])
747 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
748 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
749 [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
750 fi
751 dnl Check for API introduced in Mac OS X 10.3.
752 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
753 [gt_save_LIBS="$LIBS"
754 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
755 AC_LINK_IFELSE(
756 [AC_LANG_PROGRAM(
757 [[#include <CoreFoundation/CFLocale.h>]],
758 [[CFLocaleCopyCurrent();]])],
759 [gt_cv_func_CFLocaleCopyCurrent=yes],
760 [gt_cv_func_CFLocaleCopyCurrent=no])
761 LIBS="$gt_save_LIBS"])
762 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
763 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
764 [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
765 fi
766 INTL_MACOSX_LIBS=
767 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
768 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
769 fi
770 AC_SUBST([INTL_MACOSX_LIBS])
771])
772
773# lib-link.m4 serial 26 (gettext-0.18.2)
774dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
775dnl This file is free software; the Free Software Foundation
776dnl gives unlimited permission to copy and/or distribute it,
777dnl with or without modifications, as long as this notice is preserved.
778
779dnl From Bruno Haible.
780
781AC_PREREQ([2.54])
782
783dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
784dnl the libraries corresponding to explicit and implicit dependencies.
785dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
786dnl augments the CPPFLAGS variable.
787dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
788dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
789AC_DEFUN([AC_LIB_LINKFLAGS],
790[
791 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
792 AC_REQUIRE([AC_LIB_RPATH])
793 pushdef([Name],[m4_translit([$1],[./+-], [____])])
794 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
795 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
796 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
797 AC_LIB_LINKFLAGS_BODY([$1], [$2])
798 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
799 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
800 ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
801 ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
802 ])
803 LIB[]NAME="$ac_cv_lib[]Name[]_libs"
804 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
805 INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
806 LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
807 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
808 AC_SUBST([LIB]NAME)
809 AC_SUBST([LTLIB]NAME)
810 AC_SUBST([LIB]NAME[_PREFIX])
811 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
812 dnl results of this search when this library appears as a dependency.
813 HAVE_LIB[]NAME=yes
814 popdef([NAME])
815 popdef([Name])
816])
817
818dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
819dnl searches for libname and the libraries corresponding to explicit and
820dnl implicit dependencies, together with the specified include files and
821dnl the ability to compile and link the specified testcode. The missing-message
822dnl defaults to 'no' and may contain additional hints for the user.
823dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
824dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
825dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
826dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
827dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
828dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
829AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
830[
831 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
832 AC_REQUIRE([AC_LIB_RPATH])
833 pushdef([Name],[m4_translit([$1],[./+-], [____])])
834 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
835 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
836
837 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
838 dnl accordingly.
839 AC_LIB_LINKFLAGS_BODY([$1], [$2])
840
841 dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
842 dnl because if the user has installed lib[]Name and not disabled its use
843 dnl via --without-lib[]Name-prefix, he wants to use it.
844 ac_save_CPPFLAGS="$CPPFLAGS"
845 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
846
847 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
848 ac_save_LIBS="$LIBS"
849 dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
850 dnl because these -l options might require -L options that are present in
851 dnl LIBS. -l options benefit only from the -L options listed before it.
852 dnl Otherwise, add it to the front of LIBS, because it may be a static
853 dnl library that depends on another static library that is present in LIBS.
854 dnl Static libraries benefit only from the static libraries listed after
855 dnl it.
856 case " $LIB[]NAME" in
857 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
858 *) LIBS="$LIB[]NAME $LIBS" ;;
859 esac
860 AC_LINK_IFELSE(
861 [AC_LANG_PROGRAM([[$3]], [[$4]])],
862 [ac_cv_lib[]Name=yes],
863 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
864 LIBS="$ac_save_LIBS"
865 ])
866 if test "$ac_cv_lib[]Name" = yes; then
867 HAVE_LIB[]NAME=yes
868 AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
869 AC_MSG_CHECKING([how to link with lib[]$1])
870 AC_MSG_RESULT([$LIB[]NAME])
871 else
872 HAVE_LIB[]NAME=no
873 dnl If $LIB[]NAME didn't lead to a usable library, we don't need
874 dnl $INC[]NAME either.
875 CPPFLAGS="$ac_save_CPPFLAGS"
876 LIB[]NAME=
877 LTLIB[]NAME=
878 LIB[]NAME[]_PREFIX=
879 fi
880 AC_SUBST([HAVE_LIB]NAME)
881 AC_SUBST([LIB]NAME)
882 AC_SUBST([LTLIB]NAME)
883 AC_SUBST([LIB]NAME[_PREFIX])
884 popdef([NAME])
885 popdef([Name])
886])
887
888dnl Determine the platform dependent parameters needed to use rpath:
889dnl acl_libext,
890dnl acl_shlibext,
891dnl acl_libname_spec,
892dnl acl_library_names_spec,
893dnl acl_hardcode_libdir_flag_spec,
894dnl acl_hardcode_libdir_separator,
895dnl acl_hardcode_direct,
896dnl acl_hardcode_minus_L.
897AC_DEFUN([AC_LIB_RPATH],
898[
899 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
900 m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
901 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
902 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
903 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
904 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
905 AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
906 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
907 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
908 . ./conftest.sh
909 rm -f ./conftest.sh
910 acl_cv_rpath=done
911 ])
912 wl="$acl_cv_wl"
913 acl_libext="$acl_cv_libext"
914 acl_shlibext="$acl_cv_shlibext"
915 acl_libname_spec="$acl_cv_libname_spec"
916 acl_library_names_spec="$acl_cv_library_names_spec"
917 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
918 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
919 acl_hardcode_direct="$acl_cv_hardcode_direct"
920 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
921 dnl Determine whether the user wants rpath handling at all.
922 AC_ARG_ENABLE([rpath],
923 [ --disable-rpath do not hardcode runtime library paths],
924 :, enable_rpath=yes)
925])
926
927dnl AC_LIB_FROMPACKAGE(name, package)
928dnl declares that libname comes from the given package. The configure file
929dnl will then not have a --with-libname-prefix option but a
930dnl --with-package-prefix option. Several libraries can come from the same
931dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
932dnl macro call that searches for libname.
933AC_DEFUN([AC_LIB_FROMPACKAGE],
934[
935 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
936 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
937 define([acl_frompackage_]NAME, [$2])
938 popdef([NAME])
939 pushdef([PACK],[$2])
940 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
941 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
942 define([acl_libsinpackage_]PACKUP,
943 m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
944 popdef([PACKUP])
945 popdef([PACK])
946])
947
948dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
949dnl the libraries corresponding to explicit and implicit dependencies.
950dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
951dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
952dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
953AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
954[
955 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
956 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
957 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
958 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
959 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
960 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
961 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
962 dnl Autoconf >= 2.61 supports dots in --with options.
963 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
964 dnl By default, look in $includedir and $libdir.
965 use_additional=yes
966 AC_LIB_WITH_FINAL_PREFIX([
967 eval additional_includedir=\"$includedir\"
968 eval additional_libdir=\"$libdir\"
969 ])
970 AC_ARG_WITH(P_A_C_K[-prefix],
971[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
972 --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
973[
974 if test "X$withval" = "Xno"; then
975 use_additional=no
976 else
977 if test "X$withval" = "X"; then
978 AC_LIB_WITH_FINAL_PREFIX([
979 eval additional_includedir=\"$includedir\"
980 eval additional_libdir=\"$libdir\"
981 ])
982 else
983 additional_includedir="$withval/include"
984 additional_libdir="$withval/$acl_libdirstem"
985 if test "$acl_libdirstem2" != "$acl_libdirstem" \
986 && ! test -d "$withval/$acl_libdirstem"; then
987 additional_libdir="$withval/$acl_libdirstem2"
988 fi
989 fi
990 fi
991])
992 dnl Search the library and its dependencies in $additional_libdir and
993 dnl $LDFLAGS. Using breadth-first-seach.
994 LIB[]NAME=
995 LTLIB[]NAME=
996 INC[]NAME=
997 LIB[]NAME[]_PREFIX=
998 dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
999 dnl computed. So it has to be reset here.
1000 HAVE_LIB[]NAME=
1001 rpathdirs=
1002 ltrpathdirs=
1003 names_already_handled=
1004 names_next_round='$1 $2'
1005 while test -n "$names_next_round"; do
1006 names_this_round="$names_next_round"
1007 names_next_round=
1008 for name in $names_this_round; do
1009 already_handled=
1010 for n in $names_already_handled; do
1011 if test "$n" = "$name"; then
1012 already_handled=yes
1013 break
1014 fi
1015 done
1016 if test -z "$already_handled"; then
1017 names_already_handled="$names_already_handled $name"
1018 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
1019 dnl or AC_LIB_HAVE_LINKFLAGS call.
1020 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
1021 eval value=\"\$HAVE_LIB$uppername\"
1022 if test -n "$value"; then
1023 if test "$value" = yes; then
1024 eval value=\"\$LIB$uppername\"
1025 test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
1026 eval value=\"\$LTLIB$uppername\"
1027 test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
1028 else
1029 dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
1030 dnl that this library doesn't exist. So just drop it.
1031 :
1032 fi
1033 else
1034 dnl Search the library lib$name in $additional_libdir and $LDFLAGS
1035 dnl and the already constructed $LIBNAME/$LTLIBNAME.
1036 found_dir=
1037 found_la=
1038 found_so=
1039 found_a=
1040 eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
1041 if test -n "$acl_shlibext"; then
1042 shrext=".$acl_shlibext" # typically: shrext=.so
1043 else
1044 shrext=
1045 fi
1046 if test $use_additional = yes; then
1047 dir="$additional_libdir"
1048 dnl The same code as in the loop below:
1049 dnl First look for a shared library.
1050 if test -n "$acl_shlibext"; then
1051 if test -f "$dir/$libname$shrext"; then
1052 found_dir="$dir"
1053 found_so="$dir/$libname$shrext"
1054 else
1055 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
1056 ver=`(cd "$dir" && \
1057 for f in "$libname$shrext".*; do echo "$f"; done \
1058 | sed -e "s,^$libname$shrext\\\\.,," \
1059 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
1060 | sed 1q ) 2>/dev/null`
1061 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
1062 found_dir="$dir"
1063 found_so="$dir/$libname$shrext.$ver"
1064 fi
1065 else
1066 eval library_names=\"$acl_library_names_spec\"
1067 for f in $library_names; do
1068 if test -f "$dir/$f"; then
1069 found_dir="$dir"
1070 found_so="$dir/$f"
1071 break
1072 fi
1073 done
1074 fi
1075 fi
1076 fi
1077 dnl Then look for a static library.
1078 if test "X$found_dir" = "X"; then
1079 if test -f "$dir/$libname.$acl_libext"; then
1080 found_dir="$dir"
1081 found_a="$dir/$libname.$acl_libext"
1082 fi
1083 fi
1084 if test "X$found_dir" != "X"; then
1085 if test -f "$dir/$libname.la"; then
1086 found_la="$dir/$libname.la"
1087 fi
1088 fi
1089 fi
1090 if test "X$found_dir" = "X"; then
1091 for x in $LDFLAGS $LTLIB[]NAME; do
1092 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1093 case "$x" in
1094 -L*)
1095 dir=`echo "X$x" | sed -e 's/^X-L//'`
1096 dnl First look for a shared library.
1097 if test -n "$acl_shlibext"; then
1098 if test -f "$dir/$libname$shrext"; then
1099 found_dir="$dir"
1100 found_so="$dir/$libname$shrext"
1101 else
1102 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
1103 ver=`(cd "$dir" && \
1104 for f in "$libname$shrext".*; do echo "$f"; done \
1105 | sed -e "s,^$libname$shrext\\\\.,," \
1106 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
1107 | sed 1q ) 2>/dev/null`
1108 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
1109 found_dir="$dir"
1110 found_so="$dir/$libname$shrext.$ver"
1111 fi
1112 else
1113 eval library_names=\"$acl_library_names_spec\"
1114 for f in $library_names; do
1115 if test -f "$dir/$f"; then
1116 found_dir="$dir"
1117 found_so="$dir/$f"
1118 break
1119 fi
1120 done
1121 fi
1122 fi
1123 fi
1124 dnl Then look for a static library.
1125 if test "X$found_dir" = "X"; then
1126 if test -f "$dir/$libname.$acl_libext"; then
1127 found_dir="$dir"
1128 found_a="$dir/$libname.$acl_libext"
1129 fi
1130 fi
1131 if test "X$found_dir" != "X"; then
1132 if test -f "$dir/$libname.la"; then
1133 found_la="$dir/$libname.la"
1134 fi
1135 fi
1136 ;;
1137 esac
1138 if test "X$found_dir" != "X"; then
1139 break
1140 fi
1141 done
1142 fi
1143 if test "X$found_dir" != "X"; then
1144 dnl Found the library.
1145 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
1146 if test "X$found_so" != "X"; then
1147 dnl Linking with a shared library. We attempt to hardcode its
1148 dnl directory into the executable's runpath, unless it's the
1149 dnl standard /usr/lib.
1150 if test "$enable_rpath" = no \
1151 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
1152 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
1153 dnl No hardcoding is needed.
1154 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
1155 else
1156 dnl Use an explicit option to hardcode DIR into the resulting
1157 dnl binary.
1158 dnl Potentially add DIR to ltrpathdirs.
1159 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
1160 haveit=
1161 for x in $ltrpathdirs; do
1162 if test "X$x" = "X$found_dir"; then
1163 haveit=yes
1164 break
1165 fi
1166 done
1167 if test -z "$haveit"; then
1168 ltrpathdirs="$ltrpathdirs $found_dir"
1169 fi
1170 dnl The hardcoding into $LIBNAME is system dependent.
1171 if test "$acl_hardcode_direct" = yes; then
1172 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
1173 dnl resulting binary.
1174 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
1175 else
1176 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
1177 dnl Use an explicit option to hardcode DIR into the resulting
1178 dnl binary.
1179 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
1180 dnl Potentially add DIR to rpathdirs.
1181 dnl The rpathdirs will be appended to $LIBNAME at the end.
1182 haveit=
1183 for x in $rpathdirs; do
1184 if test "X$x" = "X$found_dir"; then
1185 haveit=yes
1186 break
1187 fi
1188 done
1189 if test -z "$haveit"; then
1190 rpathdirs="$rpathdirs $found_dir"
1191 fi
1192 else
1193 dnl Rely on "-L$found_dir".
1194 dnl But don't add it if it's already contained in the LDFLAGS
1195 dnl or the already constructed $LIBNAME
1196 haveit=
1197 for x in $LDFLAGS $LIB[]NAME; do
1198 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1199 if test "X$x" = "X-L$found_dir"; then
1200 haveit=yes
1201 break
1202 fi
1203 done
1204 if test -z "$haveit"; then
1205 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
1206 fi
1207 if test "$acl_hardcode_minus_L" != no; then
1208 dnl FIXME: Not sure whether we should use
1209 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
1210 dnl here.
1211 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
1212 else
1213 dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
1214 dnl here, because this doesn't fit in flags passed to the
1215 dnl compiler. So give up. No hardcoding. This affects only
1216 dnl very old systems.
1217 dnl FIXME: Not sure whether we should use
1218 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
1219 dnl here.
1220 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
1221 fi
1222 fi
1223 fi
1224 fi
1225 else
1226 if test "X$found_a" != "X"; then
1227 dnl Linking with a static library.
1228 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
1229 else
1230 dnl We shouldn't come here, but anyway it's good to have a
1231 dnl fallback.
1232 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
1233 fi
1234 fi
1235 dnl Assume the include files are nearby.
1236 additional_includedir=
1237 case "$found_dir" in
1238 */$acl_libdirstem | */$acl_libdirstem/)
1239 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
1240 if test "$name" = '$1'; then
1241 LIB[]NAME[]_PREFIX="$basedir"
1242 fi
1243 additional_includedir="$basedir/include"
1244 ;;
1245 */$acl_libdirstem2 | */$acl_libdirstem2/)
1246 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
1247 if test "$name" = '$1'; then
1248 LIB[]NAME[]_PREFIX="$basedir"
1249 fi
1250 additional_includedir="$basedir/include"
1251 ;;
1252 esac
1253 if test "X$additional_includedir" != "X"; then
1254 dnl Potentially add $additional_includedir to $INCNAME.
1255 dnl But don't add it
1256 dnl 1. if it's the standard /usr/include,
1257 dnl 2. if it's /usr/local/include and we are using GCC on Linux,
1258 dnl 3. if it's already present in $CPPFLAGS or the already
1259 dnl constructed $INCNAME,
1260 dnl 4. if it doesn't exist as a directory.
1261 if test "X$additional_includedir" != "X/usr/include"; then
1262 haveit=
1263 if test "X$additional_includedir" = "X/usr/local/include"; then
1264 if test -n "$GCC"; then
1265 case $host_os in
1266 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
1267 esac
1268 fi
1269 fi
1270 if test -z "$haveit"; then
1271 for x in $CPPFLAGS $INC[]NAME; do
1272 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1273 if test "X$x" = "X-I$additional_includedir"; then
1274 haveit=yes
1275 break
1276 fi
1277 done
1278 if test -z "$haveit"; then
1279 if test -d "$additional_includedir"; then
1280 dnl Really add $additional_includedir to $INCNAME.
1281 INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
1282 fi
1283 fi
1284 fi
1285 fi
1286 fi
1287 dnl Look for dependencies.
1288 if test -n "$found_la"; then
1289 dnl Read the .la file. It defines the variables
1290 dnl dlname, library_names, old_library, dependency_libs, current,
1291 dnl age, revision, installed, dlopen, dlpreopen, libdir.
1292 save_libdir="$libdir"
1293 case "$found_la" in
1294 */* | *\\*) . "$found_la" ;;
1295 *) . "./$found_la" ;;
1296 esac
1297 libdir="$save_libdir"
1298 dnl We use only dependency_libs.
1299 for dep in $dependency_libs; do
1300 case "$dep" in
1301 -L*)
1302 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
1303 dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
1304 dnl But don't add it
1305 dnl 1. if it's the standard /usr/lib,
1306 dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
1307 dnl 3. if it's already present in $LDFLAGS or the already
1308 dnl constructed $LIBNAME,
1309 dnl 4. if it doesn't exist as a directory.
1310 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
1311 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
1312 haveit=
1313 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
1314 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
1315 if test -n "$GCC"; then
1316 case $host_os in
1317 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
1318 esac
1319 fi
1320 fi
1321 if test -z "$haveit"; then
1322 haveit=
1323 for x in $LDFLAGS $LIB[]NAME; do
1324 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1325 if test "X$x" = "X-L$additional_libdir"; then
1326 haveit=yes
1327 break
1328 fi
1329 done
1330 if test -z "$haveit"; then
1331 if test -d "$additional_libdir"; then
1332 dnl Really add $additional_libdir to $LIBNAME.
1333 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
1334 fi
1335 fi
1336 haveit=
1337 for x in $LDFLAGS $LTLIB[]NAME; do
1338 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1339 if test "X$x" = "X-L$additional_libdir"; then
1340 haveit=yes
1341 break
1342 fi
1343 done
1344 if test -z "$haveit"; then
1345 if test -d "$additional_libdir"; then
1346 dnl Really add $additional_libdir to $LTLIBNAME.
1347 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
1348 fi
1349 fi
1350 fi
1351 fi
1352 ;;
1353 -R*)
1354 dir=`echo "X$dep" | sed -e 's/^X-R//'`
1355 if test "$enable_rpath" != no; then
1356 dnl Potentially add DIR to rpathdirs.
1357 dnl The rpathdirs will be appended to $LIBNAME at the end.
1358 haveit=
1359 for x in $rpathdirs; do
1360 if test "X$x" = "X$dir"; then
1361 haveit=yes
1362 break
1363 fi
1364 done
1365 if test -z "$haveit"; then
1366 rpathdirs="$rpathdirs $dir"
1367 fi
1368 dnl Potentially add DIR to ltrpathdirs.
1369 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
1370 haveit=
1371 for x in $ltrpathdirs; do
1372 if test "X$x" = "X$dir"; then
1373 haveit=yes
1374 break
1375 fi
1376 done
1377 if test -z "$haveit"; then
1378 ltrpathdirs="$ltrpathdirs $dir"
1379 fi
1380 fi
1381 ;;
1382 -l*)
1383 dnl Handle this in the next round.
1384 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
1385 ;;
1386 *.la)
1387 dnl Handle this in the next round. Throw away the .la's
1388 dnl directory; it is already contained in a preceding -L
1389 dnl option.
1390 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
1391 ;;
1392 *)
1393 dnl Most likely an immediate library name.
1394 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
1395 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
1396 ;;
1397 esac
1398 done
1399 fi
1400 else
1401 dnl Didn't find the library; assume it is in the system directories
1402 dnl known to the linker and runtime loader. (All the system
1403 dnl directories known to the linker should also be known to the
1404 dnl runtime loader, otherwise the system is severely misconfigured.)
1405 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
1406 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
1407 fi
1408 fi
1409 fi
1410 done
1411 done
1412 if test "X$rpathdirs" != "X"; then
1413 if test -n "$acl_hardcode_libdir_separator"; then
1414 dnl Weird platform: only the last -rpath option counts, the user must
1415 dnl pass all path elements in one option. We can arrange that for a
1416 dnl single library, but not when more than one $LIBNAMEs are used.
1417 alldirs=
1418 for found_dir in $rpathdirs; do
1419 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
1420 done
1421 dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
1422 acl_save_libdir="$libdir"
1423 libdir="$alldirs"
1424 eval flag=\"$acl_hardcode_libdir_flag_spec\"
1425 libdir="$acl_save_libdir"
1426 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
1427 else
1428 dnl The -rpath options are cumulative.
1429 for found_dir in $rpathdirs; do
1430 acl_save_libdir="$libdir"
1431 libdir="$found_dir"
1432 eval flag=\"$acl_hardcode_libdir_flag_spec\"
1433 libdir="$acl_save_libdir"
1434 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
1435 done
1436 fi
1437 fi
1438 if test "X$ltrpathdirs" != "X"; then
1439 dnl When using libtool, the option that works for both libraries and
1440 dnl executables is -R. The -R options are cumulative.
1441 for found_dir in $ltrpathdirs; do
1442 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
1443 done
1444 fi
1445 popdef([P_A_C_K])
1446 popdef([PACKLIBS])
1447 popdef([PACKUP])
1448 popdef([PACK])
1449 popdef([NAME])
1450])
1451
1452dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
1453dnl unless already present in VAR.
1454dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
1455dnl contains two or three consecutive elements that belong together.
1456AC_DEFUN([AC_LIB_APPENDTOVAR],
1457[
1458 for element in [$2]; do
1459 haveit=
1460 for x in $[$1]; do
1461 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1462 if test "X$x" = "X$element"; then
1463 haveit=yes
1464 break
1465 fi
1466 done
1467 if test -z "$haveit"; then
1468 [$1]="${[$1]}${[$1]:+ }$element"
1469 fi
1470 done
1471])
1472
1473dnl For those cases where a variable contains several -L and -l options
1474dnl referring to unknown libraries and directories, this macro determines the
1475dnl necessary additional linker options for the runtime path.
1476dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
1477dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
1478dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
1479dnl otherwise linking without libtool is assumed.
1480AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
1481[
1482 AC_REQUIRE([AC_LIB_RPATH])
1483 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
1484 $1=
1485 if test "$enable_rpath" != no; then
1486 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
1487 dnl Use an explicit option to hardcode directories into the resulting
1488 dnl binary.
1489 rpathdirs=
1490 next=
1491 for opt in $2; do
1492 if test -n "$next"; then
1493 dir="$next"
1494 dnl No need to hardcode the standard /usr/lib.
1495 if test "X$dir" != "X/usr/$acl_libdirstem" \
1496 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
1497 rpathdirs="$rpathdirs $dir"
1498 fi
1499 next=
1500 else
1501 case $opt in
1502 -L) next=yes ;;
1503 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
1504 dnl No need to hardcode the standard /usr/lib.
1505 if test "X$dir" != "X/usr/$acl_libdirstem" \
1506 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
1507 rpathdirs="$rpathdirs $dir"
1508 fi
1509 next= ;;
1510 *) next= ;;
1511 esac
1512 fi
1513 done
1514 if test "X$rpathdirs" != "X"; then
1515 if test -n ""$3""; then
1516 dnl libtool is used for linking. Use -R options.
1517 for dir in $rpathdirs; do
1518 $1="${$1}${$1:+ }-R$dir"
1519 done
1520 else
1521 dnl The linker is used for linking directly.
1522 if test -n "$acl_hardcode_libdir_separator"; then
1523 dnl Weird platform: only the last -rpath option counts, the user
1524 dnl must pass all path elements in one option.
1525 alldirs=
1526 for dir in $rpathdirs; do
1527 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
1528 done
1529 acl_save_libdir="$libdir"
1530 libdir="$alldirs"
1531 eval flag=\"$acl_hardcode_libdir_flag_spec\"
1532 libdir="$acl_save_libdir"
1533 $1="$flag"
1534 else
1535 dnl The -rpath options are cumulative.
1536 for dir in $rpathdirs; do
1537 acl_save_libdir="$libdir"
1538 libdir="$dir"
1539 eval flag=\"$acl_hardcode_libdir_flag_spec\"
1540 libdir="$acl_save_libdir"
1541 $1="${$1}${$1:+ }$flag"
1542 done
1543 fi
1544 fi
1545 fi
1546 fi
1547 fi
1548 AC_SUBST([$1])
1549])
1550
1551# lib-prefix.m4 serial 7 (gettext-0.18)
1552dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
1553dnl This file is free software; the Free Software Foundation
1554dnl gives unlimited permission to copy and/or distribute it,
1555dnl with or without modifications, as long as this notice is preserved.
1556
1557dnl From Bruno Haible.
1558
1559dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
1560dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
1561dnl require excessive bracketing.
1562ifdef([AC_HELP_STRING],
1563[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
1564[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
1565
1566dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
1567dnl to access previously installed libraries. The basic assumption is that
1568dnl a user will want packages to use other packages he previously installed
1569dnl with the same --prefix option.
1570dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
1571dnl libraries, but is otherwise very convenient.
1572AC_DEFUN([AC_LIB_PREFIX],
1573[
1574 AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
1575 AC_REQUIRE([AC_PROG_CC])
1576 AC_REQUIRE([AC_CANONICAL_HOST])
1577 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
1578 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
1579 dnl By default, look in $includedir and $libdir.
1580 use_additional=yes
1581 AC_LIB_WITH_FINAL_PREFIX([
1582 eval additional_includedir=\"$includedir\"
1583 eval additional_libdir=\"$libdir\"
1584 ])
1585 AC_LIB_ARG_WITH([lib-prefix],
1586[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
1587 --without-lib-prefix don't search for libraries in includedir and libdir],
1588[
1589 if test "X$withval" = "Xno"; then
1590 use_additional=no
1591 else
1592 if test "X$withval" = "X"; then
1593 AC_LIB_WITH_FINAL_PREFIX([
1594 eval additional_includedir=\"$includedir\"
1595 eval additional_libdir=\"$libdir\"
1596 ])
1597 else
1598 additional_includedir="$withval/include"
1599 additional_libdir="$withval/$acl_libdirstem"
1600 fi
1601 fi
1602])
1603 if test $use_additional = yes; then
1604 dnl Potentially add $additional_includedir to $CPPFLAGS.
1605 dnl But don't add it
1606 dnl 1. if it's the standard /usr/include,
1607 dnl 2. if it's already present in $CPPFLAGS,
1608 dnl 3. if it's /usr/local/include and we are using GCC on Linux,
1609 dnl 4. if it doesn't exist as a directory.
1610 if test "X$additional_includedir" != "X/usr/include"; then
1611 haveit=
1612 for x in $CPPFLAGS; do
1613 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1614 if test "X$x" = "X-I$additional_includedir"; then
1615 haveit=yes
1616 break
1617 fi
1618 done
1619 if test -z "$haveit"; then
1620 if test "X$additional_includedir" = "X/usr/local/include"; then
1621 if test -n "$GCC"; then
1622 case $host_os in
1623 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
1624 esac
1625 fi
1626 fi
1627 if test -z "$haveit"; then
1628 if test -d "$additional_includedir"; then
1629 dnl Really add $additional_includedir to $CPPFLAGS.
1630 CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
1631 fi
1632 fi
1633 fi
1634 fi
1635 dnl Potentially add $additional_libdir to $LDFLAGS.
1636 dnl But don't add it
1637 dnl 1. if it's the standard /usr/lib,
1638 dnl 2. if it's already present in $LDFLAGS,
1639 dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
1640 dnl 4. if it doesn't exist as a directory.
1641 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
1642 haveit=
1643 for x in $LDFLAGS; do
1644 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1645 if test "X$x" = "X-L$additional_libdir"; then
1646 haveit=yes
1647 break
1648 fi
1649 done
1650 if test -z "$haveit"; then
1651 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
1652 if test -n "$GCC"; then
1653 case $host_os in
1654 linux*) haveit=yes;;
1655 esac
1656 fi
1657 fi
1658 if test -z "$haveit"; then
1659 if test -d "$additional_libdir"; then
1660 dnl Really add $additional_libdir to $LDFLAGS.
1661 LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
1662 fi
1663 fi
1664 fi
1665 fi
1666 fi
1667])
1668
1669dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
1670dnl acl_final_exec_prefix, containing the values to which $prefix and
1671dnl $exec_prefix will expand at the end of the configure script.
1672AC_DEFUN([AC_LIB_PREPARE_PREFIX],
1673[
1674 dnl Unfortunately, prefix and exec_prefix get only finally determined
1675 dnl at the end of configure.
1676 if test "X$prefix" = "XNONE"; then
1677 acl_final_prefix="$ac_default_prefix"
1678 else
1679 acl_final_prefix="$prefix"
1680 fi
1681 if test "X$exec_prefix" = "XNONE"; then
1682 acl_final_exec_prefix='${prefix}'
1683 else
1684 acl_final_exec_prefix="$exec_prefix"
1685 fi
1686 acl_save_prefix="$prefix"
1687 prefix="$acl_final_prefix"
1688 eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
1689 prefix="$acl_save_prefix"
1690])
1691
1692dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
1693dnl variables prefix and exec_prefix bound to the values they will have
1694dnl at the end of the configure script.
1695AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
1696[
1697 acl_save_prefix="$prefix"
1698 prefix="$acl_final_prefix"
1699 acl_save_exec_prefix="$exec_prefix"
1700 exec_prefix="$acl_final_exec_prefix"
1701 $1
1702 exec_prefix="$acl_save_exec_prefix"
1703 prefix="$acl_save_prefix"
1704])
1705
1706dnl AC_LIB_PREPARE_MULTILIB creates
1707dnl - a variable acl_libdirstem, containing the basename of the libdir, either
1708dnl "lib" or "lib64" or "lib/64",
1709dnl - a variable acl_libdirstem2, as a secondary possible value for
1710dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
1711dnl "lib/amd64".
1712AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
1713[
1714 dnl There is no formal standard regarding lib and lib64.
1715 dnl On glibc systems, the current practice is that on a system supporting
1716 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
1717 dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
1718 dnl the compiler's default mode by looking at the compiler's library search
1719 dnl path. If at least one of its elements ends in /lib64 or points to a
1720 dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
1721 dnl Otherwise we use the default, namely "lib".
1722 dnl On Solaris systems, the current practice is that on a system supporting
1723 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
1724 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
1725 dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
1726 AC_REQUIRE([AC_CANONICAL_HOST])
1727 acl_libdirstem=lib
1728 acl_libdirstem2=
1729 case "$host_os" in
1730 solaris*)
1731 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
1732 dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
1733 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
1734 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
1735 dnl symlink is missing, so we set acl_libdirstem2 too.
1736 AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
1737 [AC_EGREP_CPP([sixtyfour bits], [
1738#ifdef _LP64
1739sixtyfour bits
1740#endif
1741 ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
1742 ])
1743 if test $gl_cv_solaris_64bit = yes; then
1744 acl_libdirstem=lib/64
1745 case "$host_cpu" in
1746 sparc*) acl_libdirstem2=lib/sparcv9 ;;
1747 i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
1748 esac
1749 fi
1750 ;;
1751 *)
1752 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
1753 if test -n "$searchpath"; then
1754 acl_save_IFS="${IFS= }"; IFS=":"
1755 for searchdir in $searchpath; do
1756 if test -d "$searchdir"; then
1757 case "$searchdir" in
1758 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
1759 */../ | */.. )
1760 # Better ignore directories of this form. They are misleading.
1761 ;;
1762 *) searchdir=`cd "$searchdir" && pwd`
1763 case "$searchdir" in
1764 */lib64 ) acl_libdirstem=lib64 ;;
1765 esac ;;
1766 esac
1767 fi
1768 done
1769 IFS="$acl_save_IFS"
1770 fi
1771 ;;
1772 esac
1773 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
1774])
1775
1776# nls.m4 serial 5 (gettext-0.18)
1777dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
1778dnl Foundation, Inc.
1779dnl This file is free software; the Free Software Foundation
1780dnl gives unlimited permission to copy and/or distribute it,
1781dnl with or without modifications, as long as this notice is preserved.
1782dnl
1783dnl This file can be used in projects which are not available under
1784dnl the GNU General Public License or the GNU Library General Public
1785dnl License but which still want to provide support for the GNU gettext
1786dnl functionality.
1787dnl Please note that the actual code of the GNU gettext library is covered
1788dnl by the GNU Library General Public License, and the rest of the GNU
1789dnl gettext package is covered by the GNU General Public License.
1790dnl They are *not* in the public domain.
1791
1792dnl Authors:
1793dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1794dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1795
1796AC_PREREQ([2.50])
1797
1798AC_DEFUN([AM_NLS],
1799[
1800 AC_MSG_CHECKING([whether NLS is requested])
1801 dnl Default is enabled NLS
1802 AC_ARG_ENABLE([nls],
1803 [ --disable-nls do not use Native Language Support],
1804 USE_NLS=$enableval, USE_NLS=yes)
1805 AC_MSG_RESULT([$USE_NLS])
1806 AC_SUBST([USE_NLS])
1807])
1808
1809# po.m4 serial 24 (gettext-0.19)
1810dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
1811dnl This file is free software; the Free Software Foundation
1812dnl gives unlimited permission to copy and/or distribute it,
1813dnl with or without modifications, as long as this notice is preserved.
1814dnl
1815dnl This file can be used in projects which are not available under
1816dnl the GNU General Public License or the GNU Library General Public
1817dnl License but which still want to provide support for the GNU gettext
1818dnl functionality.
1819dnl Please note that the actual code of the GNU gettext library is covered
1820dnl by the GNU Library General Public License, and the rest of the GNU
1821dnl gettext package is covered by the GNU General Public License.
1822dnl They are *not* in the public domain.
1823
1824dnl Authors:
1825dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1826dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1827
1828AC_PREREQ([2.60])
1829
1830dnl Checks for all prerequisites of the po subdirectory.
1831AC_DEFUN([AM_PO_SUBDIRS],
1832[
1833 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1834 AC_REQUIRE([AC_PROG_INSTALL])dnl
1835 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1836 AC_REQUIRE([AC_PROG_SED])dnl
1837 AC_REQUIRE([AM_NLS])dnl
1838
1839 dnl Release version of the gettext macros. This is used to ensure that
1840 dnl the gettext macros and po/Makefile.in.in are in sync.
1841 AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
1842
1843 dnl Perform the following tests also if --disable-nls has been given,
1844 dnl because they are needed for "make dist" to work.
1845
1846 dnl Search for GNU msgfmt in the PATH.
1847 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
1848 dnl The second test excludes FreeBSD msgfmt.
1849 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
1850 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
1851 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
1852 :)
1853 AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
1854
1855 dnl Test whether it is GNU msgfmt >= 0.15.
1856changequote(,)dnl
1857 case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
1858 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
1859 *) MSGFMT_015=$MSGFMT ;;
1860 esac
1861changequote([,])dnl
1862 AC_SUBST([MSGFMT_015])
1863changequote(,)dnl
1864 case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
1865 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
1866 *) GMSGFMT_015=$GMSGFMT ;;
1867 esac
1868changequote([,])dnl
1869 AC_SUBST([GMSGFMT_015])
1870
1871 dnl Search for GNU xgettext 0.12 or newer in the PATH.
1872 dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
1873 dnl The second test excludes FreeBSD xgettext.
1874 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1875 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
1876 (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
1877 :)
1878 dnl Remove leftover from FreeBSD xgettext call.
1879 rm -f messages.po
1880
1881 dnl Test whether it is GNU xgettext >= 0.15.
1882changequote(,)dnl
1883 case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
1884 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
1885 *) XGETTEXT_015=$XGETTEXT ;;
1886 esac
1887changequote([,])dnl
1888 AC_SUBST([XGETTEXT_015])
1889
1890 dnl Search for GNU msgmerge 0.11 or newer in the PATH.
1891 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
1892 [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
1893
1894 dnl Installation directories.
1895 dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
1896 dnl have to define it here, so that it can be used in po/Makefile.
1897 test -n "$localedir" || localedir='${datadir}/locale'
1898 AC_SUBST([localedir])
1899
1900 dnl Support for AM_XGETTEXT_OPTION.
1901 test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
1902 AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
1903
1904 AC_CONFIG_COMMANDS([po-directories], [[
1905 for ac_file in $CONFIG_FILES; do
1906 # Support "outfile[:infile[:infile...]]"
1907 case "$ac_file" in
1908 *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
1909 esac
1910 # PO directories have a Makefile.in generated from Makefile.in.in.
1911 case "$ac_file" in */Makefile.in)
1912 # Adjust a relative srcdir.
1913 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
1914 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
1915 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
1916 # In autoconf-2.13 it is called $ac_given_srcdir.
1917 # In autoconf-2.50 it is called $srcdir.
1918 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
1919 case "$ac_given_srcdir" in
1920 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
1921 /*) top_srcdir="$ac_given_srcdir" ;;
1922 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
1923 esac
1924 # Treat a directory as a PO directory if and only if it has a
1925 # POTFILES.in file. This allows packages to have multiple PO
1926 # directories under different names or in different locations.
1927 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
1928 rm -f "$ac_dir/POTFILES"
1929 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
1930 gt_tab=`printf '\t'`
1931 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"
1932 POMAKEFILEDEPS="POTFILES.in"
1933 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
1934 # on $ac_dir but don't depend on user-specified configuration
1935 # parameters.
1936 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
1937 # The LINGUAS file contains the set of available languages.
1938 if test -n "$OBSOLETE_ALL_LINGUAS"; then
1939 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
1940 fi
1941 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
1942 # Hide the ALL_LINGUAS assignment from automake < 1.5.
1943 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
1944 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
1945 else
1946 # The set of available languages was given in configure.in.
1947 # Hide the ALL_LINGUAS assignment from automake < 1.5.
1948 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
1949 fi
1950 # Compute POFILES
1951 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
1952 # Compute UPDATEPOFILES
1953 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
1954 # Compute DUMMYPOFILES
1955 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
1956 # Compute GMOFILES
1957 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
1958 case "$ac_given_srcdir" in
1959 .) srcdirpre= ;;
1960 *) srcdirpre='$(srcdir)/' ;;
1961 esac
1962 POFILES=
1963 UPDATEPOFILES=
1964 DUMMYPOFILES=
1965 GMOFILES=
1966 for lang in $ALL_LINGUAS; do
1967 POFILES="$POFILES $srcdirpre$lang.po"
1968 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
1969 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
1970 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
1971 done
1972 # CATALOGS depends on both $ac_dir and the user's LINGUAS
1973 # environment variable.
1974 INST_LINGUAS=
1975 if test -n "$ALL_LINGUAS"; then
1976 for presentlang in $ALL_LINGUAS; do
1977 useit=no
1978 if test "%UNSET%" != "$LINGUAS"; then
1979 desiredlanguages="$LINGUAS"
1980 else
1981 desiredlanguages="$ALL_LINGUAS"
1982 fi
1983 for desiredlang in $desiredlanguages; do
1984 # Use the presentlang catalog if desiredlang is
1985 # a. equal to presentlang, or
1986 # b. a variant of presentlang (because in this case,
1987 # presentlang can be used as a fallback for messages
1988 # which are not translated in the desiredlang catalog).
1989 case "$desiredlang" in
1990 "$presentlang"*) useit=yes;;
1991 esac
1992 done
1993 if test $useit = yes; then
1994 INST_LINGUAS="$INST_LINGUAS $presentlang"
1995 fi
1996 done
1997 fi
1998 CATALOGS=
1999 if test -n "$INST_LINGUAS"; then
2000 for lang in $INST_LINGUAS; do
2001 CATALOGS="$CATALOGS $lang.gmo"
2002 done
2003 fi
2004 test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
2005 sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
2006 for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
2007 if test -f "$f"; then
2008 case "$f" in
2009 *.orig | *.bak | *~) ;;
2010 *) cat "$f" >> "$ac_dir/Makefile" ;;
2011 esac
2012 fi
2013 done
2014 fi
2015 ;;
2016 esac
2017 done]],
2018 [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
2019 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
2020 # from automake < 1.5.
2021 eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
2022 # Capture the value of LINGUAS because we need it to compute CATALOGS.
2023 LINGUAS="${LINGUAS-%UNSET%}"
2024 ])
2025])
2026
2027dnl Postprocesses a Makefile in a directory containing PO files.
2028AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
2029[
2030 # When this code is run, in config.status, two variables have already been
2031 # set:
2032 # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
2033 # - LINGUAS is the value of the environment variable LINGUAS at configure
2034 # time.
2035
2036changequote(,)dnl
2037 # Adjust a relative srcdir.
2038 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
2039 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
2040 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
2041 # In autoconf-2.13 it is called $ac_given_srcdir.
2042 # In autoconf-2.50 it is called $srcdir.
2043 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
2044 case "$ac_given_srcdir" in
2045 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
2046 /*) top_srcdir="$ac_given_srcdir" ;;
2047 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
2048 esac
2049
2050 # Find a way to echo strings without interpreting backslash.
2051 if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
2052 gt_echo='echo'
2053 else
2054 if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
2055 gt_echo='printf %s\n'
2056 else
2057 echo_func () {
2058 cat <<EOT
2059$*
2060EOT
2061 }
2062 gt_echo='echo_func'
2063 fi
2064 fi
2065
2066 # A sed script that extracts the value of VARIABLE from a Makefile.
2067 tab=`printf '\t'`
2068 sed_x_variable='
2069# Test if the hold space is empty.
2070x
2071s/P/P/
2072x
2073ta
2074# Yes it was empty. Look if we have the expected variable definition.
2075/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
2076 # Seen the first line of the variable definition.
2077 s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
2078 ba
2079}
2080bd
2081:a
2082# Here we are processing a line from the variable definition.
2083# Remove comment, more precisely replace it with a space.
2084s/#.*$/ /
2085# See if the line ends in a backslash.
2086tb
2087:b
2088s/\\$//
2089# Print the line, without the trailing backslash.
2090p
2091tc
2092# There was no trailing backslash. The end of the variable definition is
2093# reached. Clear the hold space.
2094s/^.*$//
2095x
2096bd
2097:c
2098# A trailing backslash means that the variable definition continues in the
2099# next line. Put a nonempty string into the hold space to indicate this.
2100s/^.*$/P/
2101x
2102:d
2103'
2104changequote([,])dnl
2105
2106 # Set POTFILES to the value of the Makefile variable POTFILES.
2107 sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
2108 POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
2109 # Compute POTFILES_DEPS as
2110 # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
2111 POTFILES_DEPS=
2112 for file in $POTFILES; do
2113 POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
2114 done
2115 POMAKEFILEDEPS=""
2116
2117 if test -n "$OBSOLETE_ALL_LINGUAS"; then
2118 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
2119 fi
2120 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
2121 # The LINGUAS file contains the set of available languages.
2122 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
2123 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
2124 else
2125 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
2126 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
2127 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
2128 fi
2129 # Hide the ALL_LINGUAS assignment from automake < 1.5.
2130 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
2131 # Compute POFILES
2132 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
2133 # Compute UPDATEPOFILES
2134 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
2135 # Compute DUMMYPOFILES
2136 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
2137 # Compute GMOFILES
2138 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
2139 # Compute PROPERTIESFILES
2140 # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
2141 # Compute CLASSFILES
2142 # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
2143 # Compute QMFILES
2144 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
2145 # Compute MSGFILES
2146 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
2147 # Compute RESOURCESDLLFILES
2148 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
2149 case "$ac_given_srcdir" in
2150 .) srcdirpre= ;;
2151 *) srcdirpre='$(srcdir)/' ;;
2152 esac
2153 POFILES=
2154 UPDATEPOFILES=
2155 DUMMYPOFILES=
2156 GMOFILES=
2157 PROPERTIESFILES=
2158 CLASSFILES=
2159 QMFILES=
2160 MSGFILES=
2161 RESOURCESDLLFILES=
2162 for lang in $ALL_LINGUAS; do
2163 POFILES="$POFILES $srcdirpre$lang.po"
2164 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
2165 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
2166 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
2167 PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
2168 CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
2169 QMFILES="$QMFILES $srcdirpre$lang.qm"
2170 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
2171 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
2172 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/'`
2173 RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
2174 done
2175 # CATALOGS depends on both $ac_dir and the user's LINGUAS
2176 # environment variable.
2177 INST_LINGUAS=
2178 if test -n "$ALL_LINGUAS"; then
2179 for presentlang in $ALL_LINGUAS; do
2180 useit=no
2181 if test "%UNSET%" != "$LINGUAS"; then
2182 desiredlanguages="$LINGUAS"
2183 else
2184 desiredlanguages="$ALL_LINGUAS"
2185 fi
2186 for desiredlang in $desiredlanguages; do
2187 # Use the presentlang catalog if desiredlang is
2188 # a. equal to presentlang, or
2189 # b. a variant of presentlang (because in this case,
2190 # presentlang can be used as a fallback for messages
2191 # which are not translated in the desiredlang catalog).
2192 case "$desiredlang" in
2193 "$presentlang"*) useit=yes;;
2194 esac
2195 done
2196 if test $useit = yes; then
2197 INST_LINGUAS="$INST_LINGUAS $presentlang"
2198 fi
2199 done
2200 fi
2201 CATALOGS=
2202 JAVACATALOGS=
2203 QTCATALOGS=
2204 TCLCATALOGS=
2205 CSHARPCATALOGS=
2206 if test -n "$INST_LINGUAS"; then
2207 for lang in $INST_LINGUAS; do
2208 CATALOGS="$CATALOGS $lang.gmo"
2209 JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
2210 QTCATALOGS="$QTCATALOGS $lang.qm"
2211 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
2212 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
2213 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/'`
2214 CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
2215 done
2216 fi
2217
2218 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"
2219 tab=`printf '\t'`
2220 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
2221 # Add dependencies that cannot be formulated as a simple suffix rule.
2222 for lang in $ALL_LINGUAS; do
2223 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
2224 cat >> "$ac_file.tmp" <<EOF
2225$frobbedlang.msg: $lang.po
2226${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
2227${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
2228EOF
2229 done
2230 fi
2231 if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
2232 # Add dependencies that cannot be formulated as a simple suffix rule.
2233 for lang in $ALL_LINGUAS; do
2234 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/'`
2235 cat >> "$ac_file.tmp" <<EOF
2236$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
2237${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
2238${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
2239EOF
2240 done
2241 fi
2242 if test -n "$POMAKEFILEDEPS"; then
2243 cat >> "$ac_file.tmp" <<EOF
2244Makefile: $POMAKEFILEDEPS
2245EOF
2246 fi
2247 mv "$ac_file.tmp" "$ac_file"
2248])
2249
2250dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
2251AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
2252[
2253 XGETTEXT_EXTRA_OPTIONS=
2254])
2255
2256dnl Registers an option to be passed to xgettext in the po subdirectory.
2257AC_DEFUN([AM_XGETTEXT_OPTION],
2258[
2259 AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
2260 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
2261])
2262
2263# progtest.m4 serial 7 (gettext-0.18.2)
2264dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
2265dnl This file is free software; the Free Software Foundation
2266dnl gives unlimited permission to copy and/or distribute it,
2267dnl with or without modifications, as long as this notice is preserved.
2268dnl
2269dnl This file can be used in projects which are not available under
2270dnl the GNU General Public License or the GNU Library General Public
2271dnl License but which still want to provide support for the GNU gettext
2272dnl functionality.
2273dnl Please note that the actual code of the GNU gettext library is covered
2274dnl by the GNU Library General Public License, and the rest of the GNU
2275dnl gettext package is covered by the GNU General Public License.
2276dnl They are *not* in the public domain.
2277
2278dnl Authors:
2279dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
2280
2281AC_PREREQ([2.50])
2282
2283# Search path for a program which passes the given test.
2284
2285dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
2286dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
2287AC_DEFUN([AM_PATH_PROG_WITH_TEST],
2288[
2289# Prepare PATH_SEPARATOR.
2290# The user is always right.
2291if test "${PATH_SEPARATOR+set}" != set; then
2292 # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
2293 # contains only /bin. Note that ksh looks also at the FPATH variable,
2294 # so we have to set that as well for the test.
2295 PATH_SEPARATOR=:
2296 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2297 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
2298 || PATH_SEPARATOR=';'
2299 }
2300fi
2301
2302# Find out how to test for executable files. Don't use a zero-byte file,
2303# as systems may use methods other than mode bits to determine executability.
2304cat >conf$$.file <<_ASEOF
2305#! /bin/sh
2306exit 0
2307_ASEOF
2308chmod +x conf$$.file
2309if test -x conf$$.file >/dev/null 2>&1; then
2310 ac_executable_p="test -x"
2311else
2312 ac_executable_p="test -f"
2313fi
2314rm -f conf$$.file
2315
2316# Extract the first word of "$2", so it can be a program name with args.
2317set dummy $2; ac_word=[$]2
2318AC_MSG_CHECKING([for $ac_word])
2319AC_CACHE_VAL([ac_cv_path_$1],
2320[case "[$]$1" in
2321 [[\\/]]* | ?:[[\\/]]*)
2322 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
2323 ;;
2324 *)
2325 ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
2326 for ac_dir in ifelse([$5], , $PATH, [$5]); do
2327 IFS="$ac_save_IFS"
2328 test -z "$ac_dir" && ac_dir=.
2329 for ac_exec_ext in '' $ac_executable_extensions; do
2330 if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
2331 echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
2332 if [$3]; then
2333 ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
2334 break 2
2335 fi
2336 fi
2337 done
2338 done
2339 IFS="$ac_save_IFS"
2340dnl If no 4th arg is given, leave the cache variable unset,
2341dnl so AC_PATH_PROGS will keep looking.
2342ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
2343])dnl
2344 ;;
2345esac])dnl
2346$1="$ac_cv_path_$1"
2347if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
2348 AC_MSG_RESULT([$][$1])
2349else
2350 AC_MSG_RESULT([no])
2351fi
2352AC_SUBST([$1])dnl
2353])
2354
23# Copyright (C) 2002-2017 Free Software Foundation, Inc. 2355# Copyright (C) 2002-2017 Free Software Foundation, Inc.
24# 2356#
25# This file is free software; the Free Software Foundation 2357# This file is free software; the Free Software Foundation
diff --git a/scilab/config/ar-lib b/scilab/config/ar-lib
index 463b9ec..92bbe08 100755
--- a/scilab/config/ar-lib
+++ b/scilab/config/ar-lib
@@ -1,10 +1,10 @@
1#! /bin/sh 1#!/bin/sh
2# Wrapper for Microsoft lib.exe 2# Wrapper for Microsoft lib.exe
3 3
4me=ar-lib 4me=ar-lib
5scriptversion=2012-03-01.08; # UTC 5scriptversion=2012-03-01.08; # UTC
6 6
7# Copyright (C) 2010-2014 Free Software Foundation, Inc. 7# Copyright (C) 2010-2017 Free Software Foundation, Inc.
8# Written by Peter Rosin <peda@lysator.liu.se>. 8# Written by Peter Rosin <peda@lysator.liu.se>.
9# 9#
10# This program is free software; you can redistribute it and/or modify 10# This program is free software; you can redistribute it and/or modify
diff --git a/scilab/config/compile b/scilab/config/compile
index a85b723..de0005d 100755
--- a/scilab/config/compile
+++ b/scilab/config/compile
@@ -1,9 +1,9 @@
1#! /bin/sh 1#!/bin/sh
2# Wrapper for compilers which do not understand '-c -o'. 2# Wrapper for compilers which do not understand '-c -o'.
3 3
4scriptversion=2012-10-14.11; # UTC 4scriptversion=2016-01-11.22; # UTC
5 5
6# Copyright (C) 1999-2014 Free Software Foundation, Inc. 6# Copyright (C) 1999-2017 Free Software Foundation, Inc.
7# Written by Tom Tromey <tromey@cygnus.com>. 7# Written by Tom Tromey <tromey@cygnus.com>.
8# 8#
9# This program is free software; you can redistribute it and/or modify 9# This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@ EOF
255 echo "compile $scriptversion" 255 echo "compile $scriptversion"
256 exit $? 256 exit $?
257 ;; 257 ;;
258 cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) 258 cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
259 icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
259 func_cl_wrapper "$@" # Doesn't return... 260 func_cl_wrapper "$@" # Doesn't return...
260 ;; 261 ;;
261esac 262esac
@@ -342,6 +343,6 @@ exit $ret
342# eval: (add-hook 'write-file-hooks 'time-stamp) 343# eval: (add-hook 'write-file-hooks 'time-stamp)
343# time-stamp-start: "scriptversion=" 344# time-stamp-start: "scriptversion="
344# time-stamp-format: "%:y-%02m-%02d.%02H" 345# time-stamp-format: "%:y-%02m-%02d.%02H"
345# time-stamp-time-zone: "UTC" 346# time-stamp-time-zone: "UTC0"
346# time-stamp-end: "; # UTC" 347# time-stamp-end: "; # UTC"
347# End: 348# End:
diff --git a/scilab/config/config.guess b/scilab/config/config.guess
index dbfb978..717b228 100755
--- a/scilab/config/config.guess
+++ b/scilab/config/config.guess
@@ -1,8 +1,8 @@
1#! /bin/sh 1#!/bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright 1992-2015 Free Software Foundation, Inc. 3# Copyright 1992-2017 Free Software Foundation, Inc.
4 4
5timestamp='2015-01-01' 5timestamp='2017-08-08'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-01-01'
27# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. 27# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
28# 28#
29# You can get the latest version of this script from: 29# You can get the latest version of this script from:
30# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 30# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
31# 31#
32# Please send patches to <config-patches@gnu.org>. 32# Please send patches to <config-patches@gnu.org>.
33 33
@@ -50,7 +50,7 @@ version="\
50GNU config.guess ($timestamp) 50GNU config.guess ($timestamp)
51 51
52Originally written by Per Bothner. 52Originally written by Per Bothner.
53Copyright 1992-2015 Free Software Foundation, Inc. 53Copyright 1992-2017 Free Software Foundation, Inc.
54 54
55This is free software; see the source for copying conditions. There is NO 55This is free software; see the source for copying conditions. There is NO
56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
168 # Note: NetBSD doesn't particularly care about the vendor 168 # Note: NetBSD doesn't particularly care about the vendor
169 # portion of the name. We always set it to "unknown". 169 # portion of the name. We always set it to "unknown".
170 sysctl="sysctl -n hw.machine_arch" 170 sysctl="sysctl -n hw.machine_arch"
171 UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ 171 UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
172 /usr/sbin/$sysctl 2>/dev/null || echo unknown)` 172 /sbin/$sysctl 2>/dev/null || \
173 /usr/sbin/$sysctl 2>/dev/null || \
174 echo unknown)`
173 case "${UNAME_MACHINE_ARCH}" in 175 case "${UNAME_MACHINE_ARCH}" in
174 armeb) machine=armeb-unknown ;; 176 armeb) machine=armeb-unknown ;;
175 arm*) machine=arm-unknown ;; 177 arm*) machine=arm-unknown ;;
176 sh3el) machine=shl-unknown ;; 178 sh3el) machine=shl-unknown ;;
177 sh3eb) machine=sh-unknown ;; 179 sh3eb) machine=sh-unknown ;;
178 sh5el) machine=sh5le-unknown ;; 180 sh5el) machine=sh5le-unknown ;;
181 earmv*)
182 arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
183 endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
184 machine=${arch}${endian}-unknown
185 ;;
179 *) machine=${UNAME_MACHINE_ARCH}-unknown ;; 186 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
180 esac 187 esac
181 # The Operating System including object format, if it has switched 188 # The Operating System including object format, if it has switched
182 # to ELF recently, or will in the future. 189 # to ELF recently (or will in the future) and ABI.
183 case "${UNAME_MACHINE_ARCH}" in 190 case "${UNAME_MACHINE_ARCH}" in
191 earm*)
192 os=netbsdelf
193 ;;
184 arm*|i386|m68k|ns32k|sh3*|sparc|vax) 194 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
185 eval $set_cc_for_build 195 eval $set_cc_for_build
186 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ 196 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
197 os=netbsd 207 os=netbsd
198 ;; 208 ;;
199 esac 209 esac
210 # Determine ABI tags.
211 case "${UNAME_MACHINE_ARCH}" in
212 earm*)
213 expr='s/^earmv[0-9]/-eabi/;s/eb$//'
214 abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
215 ;;
216 esac
200 # The OS release 217 # The OS release
201 # Debian GNU/NetBSD machines have a different userland, and 218 # Debian GNU/NetBSD machines have a different userland, and
202 # thus, need a distinct triplet. However, they do not need 219 # thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
207 release='-gnu' 224 release='-gnu'
208 ;; 225 ;;
209 *) 226 *)
210 release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` 227 release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
211 ;; 228 ;;
212 esac 229 esac
213 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: 230 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
214 # contains redundant information, the shorter form: 231 # contains redundant information, the shorter form:
215 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 232 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
216 echo "${machine}-${os}${release}" 233 echo "${machine}-${os}${release}${abi}"
217 exit ;; 234 exit ;;
218 *:Bitrig:*:*) 235 *:Bitrig:*:*)
219 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` 236 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
223 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` 240 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
224 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} 241 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
225 exit ;; 242 exit ;;
243 *:LibertyBSD:*:*)
244 UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
245 echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
246 exit ;;
226 *:ekkoBSD:*:*) 247 *:ekkoBSD:*:*)
227 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} 248 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
228 exit ;; 249 exit ;;
@@ -235,6 +256,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
235 *:MirBSD:*:*) 256 *:MirBSD:*:*)
236 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} 257 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
237 exit ;; 258 exit ;;
259 *:Sortix:*:*)
260 echo ${UNAME_MACHINE}-unknown-sortix
261 exit ;;
262 *:Redox:*:*)
263 echo ${UNAME_MACHINE}-unknown-redox
264 exit ;;
238 alpha:OSF1:*:*) 265 alpha:OSF1:*:*)
239 case $UNAME_RELEASE in 266 case $UNAME_RELEASE in
240 *4.0) 267 *4.0)
@@ -251,42 +278,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
251 ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` 278 ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
252 case "$ALPHA_CPU_TYPE" in 279 case "$ALPHA_CPU_TYPE" in
253 "EV4 (21064)") 280 "EV4 (21064)")
254 UNAME_MACHINE="alpha" ;; 281 UNAME_MACHINE=alpha ;;
255 "EV4.5 (21064)") 282 "EV4.5 (21064)")
256 UNAME_MACHINE="alpha" ;; 283 UNAME_MACHINE=alpha ;;
257 "LCA4 (21066/21068)") 284 "LCA4 (21066/21068)")
258 UNAME_MACHINE="alpha" ;; 285 UNAME_MACHINE=alpha ;;
259 "EV5 (21164)") 286 "EV5 (21164)")
260 UNAME_MACHINE="alphaev5" ;; 287 UNAME_MACHINE=alphaev5 ;;
261 "EV5.6 (21164A)") 288 "EV5.6 (21164A)")
262 UNAME_MACHINE="alphaev56" ;; 289 UNAME_MACHINE=alphaev56 ;;
263 "EV5.6 (21164PC)") 290 "EV5.6 (21164PC)")
264 UNAME_MACHINE="alphapca56" ;; 291 UNAME_MACHINE=alphapca56 ;;
265 "EV5.7 (21164PC)") 292 "EV5.7 (21164PC)")
266 UNAME_MACHINE="alphapca57" ;; 293 UNAME_MACHINE=alphapca57 ;;
267 "EV6 (21264)") 294 "EV6 (21264)")
268 UNAME_MACHINE="alphaev6" ;; 295 UNAME_MACHINE=alphaev6 ;;
269 "EV6.7 (21264A)") 296 "EV6.7 (21264A)")
270 UNAME_MACHINE="alphaev67" ;; 297 UNAME_MACHINE=alphaev67 ;;
271 "EV6.8CB (21264C)") 298 "EV6.8CB (21264C)")
272 UNAME_MACHINE="alphaev68" ;; 299 UNAME_MACHINE=alphaev68 ;;
273 "EV6.8AL (21264B)") 300 "EV6.8AL (21264B)")
274 UNAME_MACHINE="alphaev68" ;; 301 UNAME_MACHINE=alphaev68 ;;
275 "EV6.8CX (21264D)") 302 "EV6.8CX (21264D)")
276 UNAME_MACHINE="alphaev68" ;; 303 UNAME_MACHINE=alphaev68 ;;
277 "EV6.9A (21264/EV69A)") 304 "EV6.9A (21264/EV69A)")
278 UNAME_MACHINE="alphaev69" ;; 305 UNAME_MACHINE=alphaev69 ;;
279 "EV7 (21364)") 306 "EV7 (21364)")
280 UNAME_MACHINE="alphaev7" ;; 307 UNAME_MACHINE=alphaev7 ;;
281 "EV7.9 (21364A)") 308 "EV7.9 (21364A)")
282 UNAME_MACHINE="alphaev79" ;; 309 UNAME_MACHINE=alphaev79 ;;
283 esac 310 esac
284 # A Pn.n version is a patched version. 311 # A Pn.n version is a patched version.
285 # A Vn.n version is a released version. 312 # A Vn.n version is a released version.
286 # A Tn.n version is a released field test version. 313 # A Tn.n version is a released field test version.
287 # A Xn.n version is an unreleased experimental baselevel. 314 # A Xn.n version is an unreleased experimental baselevel.
288 # 1.2 uses "1.2" for uname -r. 315 # 1.2 uses "1.2" for uname -r.
289 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 316 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
290 # Reset EXIT trap before exiting to avoid spurious non-zero exit code. 317 # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
291 exitcode=$? 318 exitcode=$?
292 trap '' 0 319 trap '' 0
@@ -359,16 +386,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
359 exit ;; 386 exit ;;
360 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 387 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
361 eval $set_cc_for_build 388 eval $set_cc_for_build
362 SUN_ARCH="i386" 389 SUN_ARCH=i386
363 # If there is a compiler, see if it is configured for 64-bit objects. 390 # If there is a compiler, see if it is configured for 64-bit objects.
364 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. 391 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
365 # This test works for both compilers. 392 # This test works for both compilers.
366 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 393 if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
367 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ 394 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
368 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 395 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
369 grep IS_64BIT_ARCH >/dev/null 396 grep IS_64BIT_ARCH >/dev/null
370 then 397 then
371 SUN_ARCH="x86_64" 398 SUN_ARCH=x86_64
372 fi 399 fi
373 fi 400 fi
374 echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 401 echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +420,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
393 exit ;; 420 exit ;;
394 sun*:*:4.2BSD:*) 421 sun*:*:4.2BSD:*)
395 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` 422 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
396 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 423 test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
397 case "`/bin/arch`" in 424 case "`/bin/arch`" in
398 sun3) 425 sun3)
399 echo m68k-sun-sunos${UNAME_RELEASE} 426 echo m68k-sun-sunos${UNAME_RELEASE}
@@ -618,13 +645,13 @@ EOF
618 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 645 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
619 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 646 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
620 case "${sc_cpu_version}" in 647 case "${sc_cpu_version}" in
621 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 648 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
622 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 649 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
623 532) # CPU_PA_RISC2_0 650 532) # CPU_PA_RISC2_0
624 case "${sc_kernel_bits}" in 651 case "${sc_kernel_bits}" in
625 32) HP_ARCH="hppa2.0n" ;; 652 32) HP_ARCH=hppa2.0n ;;
626 64) HP_ARCH="hppa2.0w" ;; 653 64) HP_ARCH=hppa2.0w ;;
627 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 654 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
628 esac ;; 655 esac ;;
629 esac 656 esac
630 fi 657 fi
@@ -663,11 +690,11 @@ EOF
663 exit (0); 690 exit (0);
664 } 691 }
665EOF 692EOF
666 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` 693 (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
667 test -z "$HP_ARCH" && HP_ARCH=hppa 694 test -z "$HP_ARCH" && HP_ARCH=hppa
668 fi ;; 695 fi ;;
669 esac 696 esac
670 if [ ${HP_ARCH} = "hppa2.0w" ] 697 if [ ${HP_ARCH} = hppa2.0w ]
671 then 698 then
672 eval $set_cc_for_build 699 eval $set_cc_for_build
673 700
@@ -680,12 +707,12 @@ EOF
680 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess 707 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
681 # => hppa64-hp-hpux11.23 708 # => hppa64-hp-hpux11.23
682 709
683 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | 710 if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
684 grep -q __LP64__ 711 grep -q __LP64__
685 then 712 then
686 HP_ARCH="hppa2.0w" 713 HP_ARCH=hppa2.0w
687 else 714 else
688 HP_ARCH="hppa64" 715 HP_ARCH=hppa64
689 fi 716 fi
690 fi 717 fi
691 echo ${HP_ARCH}-hp-hpux${HPUX_REV} 718 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -790,14 +817,14 @@ EOF
790 echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 817 echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
791 exit ;; 818 exit ;;
792 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 819 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
793 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 820 FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
794 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 821 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
795 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 822 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
796 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 823 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
797 exit ;; 824 exit ;;
798 5000:UNIX_System_V:4.*:*) 825 5000:UNIX_System_V:4.*:*)
799 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 826 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
800 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 827 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
801 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 828 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
802 exit ;; 829 exit ;;
803 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 830 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -813,10 +840,11 @@ EOF
813 UNAME_PROCESSOR=`/usr/bin/uname -p` 840 UNAME_PROCESSOR=`/usr/bin/uname -p`
814 case ${UNAME_PROCESSOR} in 841 case ${UNAME_PROCESSOR} in
815 amd64) 842 amd64)
816 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 843 UNAME_PROCESSOR=x86_64 ;;
817 *) 844 i386)
818 echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 845 UNAME_PROCESSOR=i586 ;;
819 esac 846 esac
847 echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
820 exit ;; 848 exit ;;
821 i*:CYGWIN*:*) 849 i*:CYGWIN*:*)
822 echo ${UNAME_MACHINE}-pc-cygwin 850 echo ${UNAME_MACHINE}-pc-cygwin
@@ -879,7 +907,7 @@ EOF
879 exit ;; 907 exit ;;
880 *:GNU/*:*:*) 908 *:GNU/*:*:*)
881 # other systems with GNU libc and userland 909 # other systems with GNU libc and userland
882 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} 910 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
883 exit ;; 911 exit ;;
884 i*86:Minix:*:*) 912 i*86:Minix:*:*)
885 echo ${UNAME_MACHINE}-pc-minix 913 echo ${UNAME_MACHINE}-pc-minix
@@ -902,7 +930,7 @@ EOF
902 EV68*) UNAME_MACHINE=alphaev68 ;; 930 EV68*) UNAME_MACHINE=alphaev68 ;;
903 esac 931 esac
904 objdump --private-headers /bin/sh | grep -q ld.so.1 932 objdump --private-headers /bin/sh | grep -q ld.so.1
905 if test "$?" = 0 ; then LIBC="gnulibc1" ; fi 933 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
906 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 934 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
907 exit ;; 935 exit ;;
908 arc:Linux:*:* | arceb:Linux:*:*) 936 arc:Linux:*:* | arceb:Linux:*:*)
@@ -933,6 +961,9 @@ EOF
933 crisv32:Linux:*:*) 961 crisv32:Linux:*:*)
934 echo ${UNAME_MACHINE}-axis-linux-${LIBC} 962 echo ${UNAME_MACHINE}-axis-linux-${LIBC}
935 exit ;; 963 exit ;;
964 e2k:Linux:*:*)
965 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
966 exit ;;
936 frv:Linux:*:*) 967 frv:Linux:*:*)
937 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 968 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
938 exit ;; 969 exit ;;
@@ -945,6 +976,9 @@ EOF
945 ia64:Linux:*:*) 976 ia64:Linux:*:*)
946 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 977 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
947 exit ;; 978 exit ;;
979 k1om:Linux:*:*)
980 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
981 exit ;;
948 m32r*:Linux:*:*) 982 m32r*:Linux:*:*)
949 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 983 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
950 exit ;; 984 exit ;;
@@ -970,6 +1004,9 @@ EOF
970 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 1004 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
971 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } 1005 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
972 ;; 1006 ;;
1007 mips64el:Linux:*:*)
1008 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1009 exit ;;
973 openrisc*:Linux:*:*) 1010 openrisc*:Linux:*:*)
974 echo or1k-unknown-linux-${LIBC} 1011 echo or1k-unknown-linux-${LIBC}
975 exit ;; 1012 exit ;;
@@ -1002,6 +1039,9 @@ EOF
1002 ppcle:Linux:*:*) 1039 ppcle:Linux:*:*)
1003 echo powerpcle-unknown-linux-${LIBC} 1040 echo powerpcle-unknown-linux-${LIBC}
1004 exit ;; 1041 exit ;;
1042 riscv32:Linux:*:* | riscv64:Linux:*:*)
1043 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1044 exit ;;
1005 s390:Linux:*:* | s390x:Linux:*:*) 1045 s390:Linux:*:* | s390x:Linux:*:*)
1006 echo ${UNAME_MACHINE}-ibm-linux-${LIBC} 1046 echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
1007 exit ;; 1047 exit ;;
@@ -1021,7 +1061,7 @@ EOF
1021 echo ${UNAME_MACHINE}-dec-linux-${LIBC} 1061 echo ${UNAME_MACHINE}-dec-linux-${LIBC}
1022 exit ;; 1062 exit ;;
1023 x86_64:Linux:*:*) 1063 x86_64:Linux:*:*)
1024 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 1064 echo ${UNAME_MACHINE}-pc-linux-${LIBC}
1025 exit ;; 1065 exit ;;
1026 xtensa*:Linux:*:*) 1066 xtensa*:Linux:*:*)
1027 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 1067 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1100,7 +1140,7 @@ EOF
1100 # uname -m prints for DJGPP always 'pc', but it prints nothing about 1140 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1101 # the processor, so we play safe by assuming i586. 1141 # the processor, so we play safe by assuming i586.
1102 # Note: whatever this is, it MUST be the same as what config.sub 1142 # Note: whatever this is, it MUST be the same as what config.sub
1103 # prints for the "djgpp" host, or else GDB configury will decide that 1143 # prints for the "djgpp" host, or else GDB configure will decide that
1104 # this is a cross-build. 1144 # this is a cross-build.
1105 echo i586-pc-msdosdjgpp 1145 echo i586-pc-msdosdjgpp
1106 exit ;; 1146 exit ;;
@@ -1249,6 +1289,9 @@ EOF
1249 SX-8R:SUPER-UX:*:*) 1289 SX-8R:SUPER-UX:*:*)
1250 echo sx8r-nec-superux${UNAME_RELEASE} 1290 echo sx8r-nec-superux${UNAME_RELEASE}
1251 exit ;; 1291 exit ;;
1292 SX-ACE:SUPER-UX:*:*)
1293 echo sxace-nec-superux${UNAME_RELEASE}
1294 exit ;;
1252 Power*:Rhapsody:*:*) 1295 Power*:Rhapsody:*:*)
1253 echo powerpc-apple-rhapsody${UNAME_RELEASE} 1296 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1254 exit ;; 1297 exit ;;
@@ -1262,16 +1305,23 @@ EOF
1262 UNAME_PROCESSOR=powerpc 1305 UNAME_PROCESSOR=powerpc
1263 fi 1306 fi
1264 if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then 1307 if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1265 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 1308 if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1266 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ 1309 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1267 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 1310 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1268 grep IS_64BIT_ARCH >/dev/null 1311 grep IS_64BIT_ARCH >/dev/null
1269 then 1312 then
1270 case $UNAME_PROCESSOR in 1313 case $UNAME_PROCESSOR in
1271 i386) UNAME_PROCESSOR=x86_64 ;; 1314 i386) UNAME_PROCESSOR=x86_64 ;;
1272 powerpc) UNAME_PROCESSOR=powerpc64 ;; 1315 powerpc) UNAME_PROCESSOR=powerpc64 ;;
1273 esac 1316 esac
1274 fi 1317 fi
1318 # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
1319 if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
1320 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1321 grep IS_PPC >/dev/null
1322 then
1323 UNAME_PROCESSOR=powerpc
1324 fi
1275 fi 1325 fi
1276 elif test "$UNAME_PROCESSOR" = i386 ; then 1326 elif test "$UNAME_PROCESSOR" = i386 ; then
1277 # Avoid executing cc on OS X 10.9, as it ships with a stub 1327 # Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1286,7 +1336,7 @@ EOF
1286 exit ;; 1336 exit ;;
1287 *:procnto*:*:* | *:QNX:[0123456789]*:*) 1337 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1288 UNAME_PROCESSOR=`uname -p` 1338 UNAME_PROCESSOR=`uname -p`
1289 if test "$UNAME_PROCESSOR" = "x86"; then 1339 if test "$UNAME_PROCESSOR" = x86; then
1290 UNAME_PROCESSOR=i386 1340 UNAME_PROCESSOR=i386
1291 UNAME_MACHINE=pc 1341 UNAME_MACHINE=pc
1292 fi 1342 fi
@@ -1295,15 +1345,18 @@ EOF
1295 *:QNX:*:4*) 1345 *:QNX:*:4*)
1296 echo i386-pc-qnx 1346 echo i386-pc-qnx
1297 exit ;; 1347 exit ;;
1298 NEO-?:NONSTOP_KERNEL:*:*) 1348 NEO-*:NONSTOP_KERNEL:*:*)
1299 echo neo-tandem-nsk${UNAME_RELEASE} 1349 echo neo-tandem-nsk${UNAME_RELEASE}
1300 exit ;; 1350 exit ;;
1301 NSE-*:NONSTOP_KERNEL:*:*) 1351 NSE-*:NONSTOP_KERNEL:*:*)
1302 echo nse-tandem-nsk${UNAME_RELEASE} 1352 echo nse-tandem-nsk${UNAME_RELEASE}
1303 exit ;; 1353 exit ;;
1304 NSR-?:NONSTOP_KERNEL:*:*) 1354 NSR-*:NONSTOP_KERNEL:*:*)
1305 echo nsr-tandem-nsk${UNAME_RELEASE} 1355 echo nsr-tandem-nsk${UNAME_RELEASE}
1306 exit ;; 1356 exit ;;
1357 NSX-*:NONSTOP_KERNEL:*:*)
1358 echo nsx-tandem-nsk${UNAME_RELEASE}
1359 exit ;;
1307 *:NonStop-UX:*:*) 1360 *:NonStop-UX:*:*)
1308 echo mips-compaq-nonstopux 1361 echo mips-compaq-nonstopux
1309 exit ;; 1362 exit ;;
@@ -1317,7 +1370,7 @@ EOF
1317 # "uname -m" is not consistent, so use $cputype instead. 386 1370 # "uname -m" is not consistent, so use $cputype instead. 386
1318 # is converted to i386 for consistency with other x86 1371 # is converted to i386 for consistency with other x86
1319 # operating systems. 1372 # operating systems.
1320 if test "$cputype" = "386"; then 1373 if test "$cputype" = 386; then
1321 UNAME_MACHINE=i386 1374 UNAME_MACHINE=i386
1322 else 1375 else
1323 UNAME_MACHINE="$cputype" 1376 UNAME_MACHINE="$cputype"
@@ -1359,7 +1412,7 @@ EOF
1359 echo i386-pc-xenix 1412 echo i386-pc-xenix
1360 exit ;; 1413 exit ;;
1361 i*86:skyos:*:*) 1414 i*86:skyos:*:*)
1362 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' 1415 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
1363 exit ;; 1416 exit ;;
1364 i*86:rdos:*:*) 1417 i*86:rdos:*:*)
1365 echo ${UNAME_MACHINE}-pc-rdos 1418 echo ${UNAME_MACHINE}-pc-rdos
@@ -1370,23 +1423,25 @@ EOF
1370 x86_64:VMkernel:*:*) 1423 x86_64:VMkernel:*:*)
1371 echo ${UNAME_MACHINE}-unknown-esx 1424 echo ${UNAME_MACHINE}-unknown-esx
1372 exit ;; 1425 exit ;;
1426 amd64:Isilon\ OneFS:*:*)
1427 echo x86_64-unknown-onefs
1428 exit ;;
1373esac 1429esac
1374 1430
1375cat >&2 <<EOF 1431cat >&2 <<EOF
1376$0: unable to guess system type 1432$0: unable to guess system type
1377 1433
1378This script, last modified $timestamp, has failed to recognize 1434This script (version $timestamp), has failed to recognize the
1379the operating system you are using. It is advised that you 1435operating system you are using. If your script is old, overwrite *all*
1380download the most up to date version of the config scripts from 1436copies of config.guess and config.sub with the latest versions from:
1381 1437
1382 http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 1438 http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1383and 1439and
1384 http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD 1440 http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1385 1441
1386If the version you run ($0) is already up to date, please 1442If $0 has already been updated, send the following data and any
1387send the following data and any information you think might be 1443information you think might be pertinent to config-patches@gnu.org to
1388pertinent to <config-patches@gnu.org> in order to provide the needed 1444provide the necessary information to handle your system.
1389information to handle your system.
1390 1445
1391config.guess timestamp = $timestamp 1446config.guess timestamp = $timestamp
1392 1447
diff --git a/scilab/config/config.sub b/scilab/config/config.sub
index 6467c95..f4bafc1 100755
--- a/scilab/config/config.sub
+++ b/scilab/config/config.sub
@@ -1,8 +1,8 @@
1#! /bin/sh 1#!/bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright 1992-2015 Free Software Foundation, Inc. 3# Copyright 1992-2017 Free Software Foundation, Inc.
4 4
5timestamp='2015-01-01' 5timestamp='2017-04-02'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-01-01'
33# Otherwise, we print the canonical config type on stdout and succeed. 33# Otherwise, we print the canonical config type on stdout and succeed.
34 34
35# You can get the latest version of this script from: 35# You can get the latest version of this script from:
36# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD 36# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
37 37
38# This file is supposed to be the same for all GNU packages 38# This file is supposed to be the same for all GNU packages
39# and recognize all the CPU types, system types and aliases 39# and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-01-01'
53me=`echo "$0" | sed -e 's,.*/,,'` 53me=`echo "$0" | sed -e 's,.*/,,'`
54 54
55usage="\ 55usage="\
56Usage: $0 [OPTION] CPU-MFR-OPSYS 56Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
57 $0 [OPTION] ALIAS
58 57
59Canonicalize a configuration name. 58Canonicalize a configuration name.
60 59
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
68version="\ 67version="\
69GNU config.sub ($timestamp) 68GNU config.sub ($timestamp)
70 69
71Copyright 1992-2015 Free Software Foundation, Inc. 70Copyright 1992-2017 Free Software Foundation, Inc.
72 71
73This is free software; see the source for copying conditions. There is NO 72This is free software; see the source for copying conditions. There is NO
74warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 73warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
117case $maybe_os in 116case $maybe_os in
118 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ 117 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
119 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ 118 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
120 knetbsd*-gnu* | netbsd*-gnu* | \ 119 knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
121 kopensolaris*-gnu* | \ 120 kopensolaris*-gnu* | cloudabi*-eabi* | \
122 storm-chaos* | os2-emx* | rtmk-nova*) 121 storm-chaos* | os2-emx* | rtmk-nova*)
123 os=-$maybe_os 122 os=-$maybe_os
124 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 123 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -255,15 +254,16 @@ case $basic_machine in
255 | arc | arceb \ 254 | arc | arceb \
256 | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ 255 | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
257 | avr | avr32 \ 256 | avr | avr32 \
257 | ba \
258 | be32 | be64 \ 258 | be32 | be64 \
259 | bfin \ 259 | bfin \
260 | c4x | c8051 | clipper \ 260 | c4x | c8051 | clipper \
261 | d10v | d30v | dlx | dsp16xx \ 261 | d10v | d30v | dlx | dsp16xx \
262 | epiphany \ 262 | e2k | epiphany \
263 | fido | fr30 | frv | ft32 \ 263 | fido | fr30 | frv | ft32 \
264 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ 264 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265 | hexagon \ 265 | hexagon \
266 | i370 | i860 | i960 | ia64 \ 266 | i370 | i860 | i960 | ia16 | ia64 \
267 | ip2k | iq2000 \ 267 | ip2k | iq2000 \
268 | k1om \ 268 | k1om \
269 | le32 | le64 \ 269 | le32 | le64 \
@@ -301,11 +301,12 @@ case $basic_machine in
301 | open8 | or1k | or1knd | or32 \ 301 | open8 | or1k | or1knd | or32 \
302 | pdp10 | pdp11 | pj | pjl \ 302 | pdp10 | pdp11 | pj | pjl \
303 | powerpc | powerpc64 | powerpc64le | powerpcle \ 303 | powerpc | powerpc64 | powerpc64le | powerpcle \
304 | pru \
304 | pyramid \ 305 | pyramid \
305 | riscv32 | riscv64 \ 306 | riscv32 | riscv64 \
306 | rl78 | rx \ 307 | rl78 | rx \
307 | score \ 308 | score \
308 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 309 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
309 | sh64 | sh64le \ 310 | sh64 | sh64le \
310 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ 311 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
311 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ 312 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -314,6 +315,7 @@ case $basic_machine in
314 | ubicom32 \ 315 | ubicom32 \
315 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ 316 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
316 | visium \ 317 | visium \
318 | wasm32 \
317 | we32k \ 319 | we32k \
318 | x86 | xc16x | xstormy16 | xtensa \ 320 | x86 | xc16x | xstormy16 | xtensa \
319 | z8k | z80) 321 | z8k | z80)
@@ -376,17 +378,18 @@ case $basic_machine in
376 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ 378 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
377 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ 379 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
378 | avr-* | avr32-* \ 380 | avr-* | avr32-* \
381 | ba-* \
379 | be32-* | be64-* \ 382 | be32-* | be64-* \
380 | bfin-* | bs2000-* \ 383 | bfin-* | bs2000-* \
381 | c[123]* | c30-* | [cjt]90-* | c4x-* \ 384 | c[123]* | c30-* | [cjt]90-* | c4x-* \
382 | c8051-* | clipper-* | craynv-* | cydra-* \ 385 | c8051-* | clipper-* | craynv-* | cydra-* \
383 | d10v-* | d30v-* | dlx-* \ 386 | d10v-* | d30v-* | dlx-* \
384 | elxsi-* \ 387 | e2k-* | elxsi-* \
385 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ 388 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
386 | h8300-* | h8500-* \ 389 | h8300-* | h8500-* \
387 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 390 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
388 | hexagon-* \ 391 | hexagon-* \
389 | i*86-* | i860-* | i960-* | ia64-* \ 392 | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
390 | ip2k-* | iq2000-* \ 393 | ip2k-* | iq2000-* \
391 | k1om-* \ 394 | k1om-* \
392 | le32-* | le64-* \ 395 | le32-* | le64-* \
@@ -427,13 +430,15 @@ case $basic_machine in
427 | orion-* \ 430 | orion-* \
428 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 431 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
429 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ 432 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
433 | pru-* \
430 | pyramid-* \ 434 | pyramid-* \
435 | riscv32-* | riscv64-* \
431 | rl78-* | romp-* | rs6000-* | rx-* \ 436 | rl78-* | romp-* | rs6000-* | rx-* \
432 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 437 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
433 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 438 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
434 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 439 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
435 | sparclite-* \ 440 | sparclite-* \
436 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ 441 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
437 | tahoe-* \ 442 | tahoe-* \
438 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 443 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
439 | tile*-* \ 444 | tile*-* \
@@ -442,6 +447,7 @@ case $basic_machine in
442 | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ 447 | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
443 | vax-* \ 448 | vax-* \
444 | visium-* \ 449 | visium-* \
450 | wasm32-* \
445 | we32k-* \ 451 | we32k-* \
446 | x86-* | x86_64-* | xc16x-* | xps100-* \ 452 | x86-* | x86_64-* | xc16x-* | xps100-* \
447 | xstormy16-* | xtensa*-* \ 453 | xstormy16-* | xtensa*-* \
@@ -518,6 +524,9 @@ case $basic_machine in
518 basic_machine=i386-pc 524 basic_machine=i386-pc
519 os=-aros 525 os=-aros
520 ;; 526 ;;
527 asmjs)
528 basic_machine=asmjs-unknown
529 ;;
521 aux) 530 aux)
522 basic_machine=m68k-apple 531 basic_machine=m68k-apple
523 os=-aux 532 os=-aux
@@ -638,6 +647,14 @@ case $basic_machine in
638 basic_machine=m68k-bull 647 basic_machine=m68k-bull
639 os=-sysv3 648 os=-sysv3
640 ;; 649 ;;
650 e500v[12])
651 basic_machine=powerpc-unknown
652 os=$os"spe"
653 ;;
654 e500v[12]-*)
655 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
656 os=$os"spe"
657 ;;
641 ebmon29k) 658 ebmon29k)
642 basic_machine=a29k-amd 659 basic_machine=a29k-amd
643 os=-ebmon 660 os=-ebmon
@@ -933,6 +950,9 @@ case $basic_machine in
933 nsr-tandem) 950 nsr-tandem)
934 basic_machine=nsr-tandem 951 basic_machine=nsr-tandem
935 ;; 952 ;;
953 nsx-tandem)
954 basic_machine=nsx-tandem
955 ;;
936 op50n-* | op60c-*) 956 op50n-* | op60c-*)
937 basic_machine=hppa1.1-oki 957 basic_machine=hppa1.1-oki
938 os=-proelf 958 os=-proelf
@@ -1017,7 +1037,7 @@ case $basic_machine in
1017 ppc-* | ppcbe-*) 1037 ppc-* | ppcbe-*)
1018 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 1038 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1019 ;; 1039 ;;
1020 ppcle | powerpclittle | ppc-le | powerpc-little) 1040 ppcle | powerpclittle)
1021 basic_machine=powerpcle-unknown 1041 basic_machine=powerpcle-unknown
1022 ;; 1042 ;;
1023 ppcle-* | powerpclittle-*) 1043 ppcle-* | powerpclittle-*)
@@ -1027,7 +1047,7 @@ case $basic_machine in
1027 ;; 1047 ;;
1028 ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` 1048 ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1029 ;; 1049 ;;
1030 ppc64le | powerpc64little | ppc64-le | powerpc64-little) 1050 ppc64le | powerpc64little)
1031 basic_machine=powerpc64le-unknown 1051 basic_machine=powerpc64le-unknown
1032 ;; 1052 ;;
1033 ppc64le-* | powerpc64little-*) 1053 ppc64le-* | powerpc64little-*)
@@ -1228,6 +1248,9 @@ case $basic_machine in
1228 basic_machine=a29k-wrs 1248 basic_machine=a29k-wrs
1229 os=-vxworks 1249 os=-vxworks
1230 ;; 1250 ;;
1251 wasm32)
1252 basic_machine=wasm32-unknown
1253 ;;
1231 w65*) 1254 w65*)
1232 basic_machine=w65-wdc 1255 basic_machine=w65-wdc
1233 os=-none 1256 os=-none
@@ -1373,18 +1396,18 @@ case $os in
1373 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ 1396 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1374 | -sym* | -kopensolaris* | -plan9* \ 1397 | -sym* | -kopensolaris* | -plan9* \
1375 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 1398 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1376 | -aos* | -aros* \ 1399 | -aos* | -aros* | -cloudabi* | -sortix* \
1377 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1400 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1378 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1401 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1379 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ 1402 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1380 | -bitrig* | -openbsd* | -solidbsd* \ 1403 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
1381 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 1404 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1382 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1405 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1383 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 1406 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1384 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ 1407 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1385 | -chorusos* | -chorusrdb* | -cegcc* \ 1408 | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
1386 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 1409 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1387 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ 1410 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1388 | -linux-newlib* | -linux-musl* | -linux-uclibc* \ 1411 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1389 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ 1412 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1390 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 1413 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1393,7 +1416,8 @@ case $os in
1393 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1416 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1394 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1417 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1395 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 1418 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1396 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) 1419 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1420 | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
1397 # Remember, each alternative MUST END IN *, to match a version number. 1421 # Remember, each alternative MUST END IN *, to match a version number.
1398 ;; 1422 ;;
1399 -qnx*) 1423 -qnx*)
@@ -1525,6 +1549,8 @@ case $os in
1525 ;; 1549 ;;
1526 -nacl*) 1550 -nacl*)
1527 ;; 1551 ;;
1552 -ios)
1553 ;;
1528 -none) 1554 -none)
1529 ;; 1555 ;;
1530 *) 1556 *)
@@ -1620,6 +1646,9 @@ case $basic_machine in
1620 sparc-* | *-sun) 1646 sparc-* | *-sun)
1621 os=-sunos4.1.1 1647 os=-sunos4.1.1
1622 ;; 1648 ;;
1649 pru-*)
1650 os=-elf
1651 ;;
1623 *-be) 1652 *-be)
1624 os=-beos 1653 os=-beos
1625 ;; 1654 ;;
diff --git a/scilab/config/depcomp b/scilab/config/depcomp
index fc98710..30379e2 100755
--- a/scilab/config/depcomp
+++ b/scilab/config/depcomp
@@ -1,9 +1,9 @@
1#! /bin/sh 1#!/bin/sh
2# depcomp - compile a program generating dependencies as side-effects 2# depcomp - compile a program generating dependencies as side-effects
3 3
4scriptversion=2013-05-30.07; # UTC 4scriptversion=2016-01-11.22; # UTC
5 5
6# Copyright (C) 1999-2014 Free Software Foundation, Inc. 6# Copyright (C) 1999-2017 Free Software Foundation, Inc.
7 7
8# This program is free software; you can redistribute it and/or modify 8# This program is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
@@ -786,6 +786,6 @@ exit 0
786# eval: (add-hook 'write-file-hooks 'time-stamp) 786# eval: (add-hook 'write-file-hooks 'time-stamp)
787# time-stamp-start: "scriptversion=" 787# time-stamp-start: "scriptversion="
788# time-stamp-format: "%:y-%02m-%02d.%02H" 788# time-stamp-format: "%:y-%02m-%02d.%02H"
789# time-stamp-time-zone: "UTC" 789# time-stamp-time-zone: "UTC0"
790# time-stamp-end: "; # UTC" 790# time-stamp-end: "; # UTC"
791# End: 791# End:
diff --git a/scilab/config/install-sh b/scilab/config/install-sh
index 0b0fdcb..0360b79 100755
--- a/scilab/config/install-sh
+++ b/scilab/config/install-sh
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2# install - install a program, script, or datafile 2# install - install a program, script, or datafile
3 3
4scriptversion=2013-12-25.23; # UTC 4scriptversion=2016-01-11.22; # UTC
5 5
6# This originates from X11R5 (mit/util/scripts/install.sh), which was 6# This originates from X11R5 (mit/util/scripts/install.sh), which was
7# later released in X11R6 (xc/config/util/install.sh) with the 7# later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@ done
496# eval: (add-hook 'write-file-hooks 'time-stamp) 496# eval: (add-hook 'write-file-hooks 'time-stamp)
497# time-stamp-start: "scriptversion=" 497# time-stamp-start: "scriptversion="
498# time-stamp-format: "%:y-%02m-%02d.%02H" 498# time-stamp-format: "%:y-%02m-%02d.%02H"
499# time-stamp-time-zone: "UTC" 499# time-stamp-time-zone: "UTC0"
500# time-stamp-end: "; # UTC" 500# time-stamp-end: "; # UTC"
501# End: 501# End:
diff --git a/scilab/config/ltmain.sh b/scilab/config/ltmain.sh
index 0f0a2da..30be9c8 100644
--- a/scilab/config/ltmain.sh
+++ b/scilab/config/ltmain.sh
@@ -7272,10 +7272,12 @@ func_mode_link ()
7272 # -tp=* Portland pgcc target processor selection 7272 # -tp=* Portland pgcc target processor selection
7273 # --sysroot=* for sysroot support 7273 # --sysroot=* for sysroot support
7274 # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization 7274 # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
7275 # -specs=* GCC specs files
7275 # -stdlib=* select c++ std lib with clang 7276 # -stdlib=* select c++ std lib with clang
7276 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ 7277 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
7277 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ 7278 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
7278 -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) 7279 -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
7280 -specs=*)
7279 func_quote_for_eval "$arg" 7281 func_quote_for_eval "$arg"
7280 arg=$func_quote_for_eval_result 7282 arg=$func_quote_for_eval_result
7281 func_append compile_command " $arg" 7283 func_append compile_command " $arg"
diff --git a/scilab/config/missing b/scilab/config/missing
index f62bbae..b7e571e 100755
--- a/scilab/config/missing
+++ b/scilab/config/missing
@@ -1,9 +1,9 @@
1#! /bin/sh 1#!/bin/sh
2# Common wrapper for a few potentially missing GNU programs. 2# Common wrapper for a few potentially missing GNU programs.
3 3
4scriptversion=2013-10-28.13; # UTC 4scriptversion=2016-01-11.22; # UTC
5 5
6# Copyright (C) 1996-2014 Free Software Foundation, Inc. 6# Copyright (C) 1996-2017 Free Software Foundation, Inc.
7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. 7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8 8
9# This program is free software; you can redistribute it and/or modify 9# This program is free software; you can redistribute it and/or modify
@@ -210,6 +210,6 @@ exit $st
210# eval: (add-hook 'write-file-hooks 'time-stamp) 210# eval: (add-hook 'write-file-hooks 'time-stamp)
211# time-stamp-start: "scriptversion=" 211# time-stamp-start: "scriptversion="
212# time-stamp-format: "%:y-%02m-%02d.%02H" 212# time-stamp-format: "%:y-%02m-%02d.%02H"
213# time-stamp-time-zone: "UTC" 213# time-stamp-time-zone: "UTC0"
214# time-stamp-end: "; # UTC" 214# time-stamp-end: "; # UTC"
215# End: 215# End:
diff --git a/scilab/config/mkinstalldirs b/scilab/config/mkinstalldirs
index 55d537f..a1c49d4 100755
--- a/scilab/config/mkinstalldirs
+++ b/scilab/config/mkinstalldirs
@@ -1,7 +1,7 @@
1#! /bin/sh 1#!/bin/sh
2# mkinstalldirs --- make directory hierarchy 2# mkinstalldirs --- make directory hierarchy
3 3
4scriptversion=2009-04-28.21; # UTC 4scriptversion=2016-01-11.22; # UTC
5 5
6# Original author: Noah Friedman <friedman@prep.ai.mit.edu> 6# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
7# Created: 1993-05-16 7# Created: 1993-05-16
@@ -157,6 +157,6 @@ exit $errstatus
157# eval: (add-hook 'write-file-hooks 'time-stamp) 157# eval: (add-hook 'write-file-hooks 'time-stamp)
158# time-stamp-start: "scriptversion=" 158# time-stamp-start: "scriptversion="
159# time-stamp-format: "%:y-%02m-%02d.%02H" 159# time-stamp-format: "%:y-%02m-%02d.%02H"
160# time-stamp-time-zone: "UTC" 160# time-stamp-time-zone: "UTC0"
161# time-stamp-end: "; # UTC" 161# time-stamp-end: "; # UTC"
162# End: 162# End:
diff --git a/scilab/configure b/scilab/configure
index 2a76423..59c2312 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -632,6 +632,7 @@ ac_includes_default="\
632# include <unistd.h> 632# include <unistd.h>
633#endif" 633#endif"
634 634
635gt_needs=
635ac_subst_vars='am__EXEEXT_FALSE 636ac_subst_vars='am__EXEEXT_FALSE
636am__EXEEXT_TRUE 637am__EXEEXT_TRUE
637LTLIBOBJS 638LTLIBOBJS
@@ -659,7 +660,6 @@ ac_ct_DUMPBIN
659DUMPBIN 660DUMPBIN
660LD 661LD
661FGREP 662FGREP
662SED
663LIBTOOL 663LIBTOOL
664GRAPHICS_ENABLE 664GRAPHICS_ENABLE
665DEMOTOOLS_ENABLE 665DEMOTOOLS_ENABLE
@@ -745,6 +745,24 @@ FFTW_FALSE
745FFTW_TRUE 745FFTW_TRUE
746FFTW_ENABLE 746FFTW_ENABLE
747FFTW3_LIB 747FFTW3_LIB
748POSUB
749LTLIBINTL
750LIBINTL
751INTLLIBS
752LTLIBICONV
753LIBICONV
754INTL_MACOSX_LIBS
755XGETTEXT_EXTRA_OPTIONS
756MSGMERGE
757XGETTEXT_015
758XGETTEXT
759GMSGFMT_015
760MSGFMT_015
761GMSGFMT
762MSGFMT
763GETTEXT_MACRO_VERSION
764USE_NLS
765SED
748POW_LIB 766POW_LIB
749LIBM 767LIBM
750GUI_ENABLE 768GUI_ENABLE
@@ -960,7 +978,6 @@ infodir
960docdir 978docdir
961oldincludedir 979oldincludedir
962includedir 980includedir
963runstatedir
964localstatedir 981localstatedir
965sharedstatedir 982sharedstatedir
966sysconfdir 983sysconfdir
@@ -986,6 +1003,7 @@ enable_option_checking
986enable_largefile 1003enable_largefile
987with_gnu_ld 1004with_gnu_ld
988enable_relocatable 1005enable_relocatable
1006enable_rpath
989enable_maintainer_mode 1007enable_maintainer_mode
990enable_dependency_tracking 1008enable_dependency_tracking
991enable_silent_rules 1009enable_silent_rules
@@ -1017,6 +1035,9 @@ with_modelica
1017with_jdk 1035with_jdk
1018with_ant 1036with_ant
1019with_emf 1037with_emf
1038enable_nls
1039with_libiconv_prefix
1040with_libintl_prefix
1020with_fftw 1041with_fftw
1021with_fftw_include 1042with_fftw_include
1022with_fftw_library 1043with_fftw_library
@@ -1125,7 +1146,6 @@ datadir='${datarootdir}'
1125sysconfdir='${prefix}/etc' 1146sysconfdir='${prefix}/etc'
1126sharedstatedir='${prefix}/com' 1147sharedstatedir='${prefix}/com'
1127localstatedir='${prefix}/var' 1148localstatedir='${prefix}/var'
1128runstatedir='${localstatedir}/run'
1129includedir='${prefix}/include' 1149includedir='${prefix}/include'
1130oldincludedir='/usr/include' 1150oldincludedir='/usr/include'
1131docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' 1151docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1378,15 +1398,6 @@ do
1378 | -silent | --silent | --silen | --sile | --sil) 1398 | -silent | --silent | --silen | --sile | --sil)
1379 silent=yes ;; 1399 silent=yes ;;
1380 1400
1381 -runstatedir | --runstatedir | --runstatedi | --runstated \
1382 | --runstate | --runstat | --runsta | --runst | --runs \
1383 | --run | --ru | --r)
1384 ac_prev=runstatedir ;;
1385 -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1386 | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1387 | --run=* | --ru=* | --r=*)
1388 runstatedir=$ac_optarg ;;
1389
1390 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1401 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1391 ac_prev=sbindir ;; 1402 ac_prev=sbindir ;;
1392 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ 1403 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1524,7 +1535,7 @@ fi
1524for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1535for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1525 datadir sysconfdir sharedstatedir localstatedir includedir \ 1536 datadir sysconfdir sharedstatedir localstatedir includedir \
1526 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1537 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1527 libdir localedir mandir runstatedir 1538 libdir localedir mandir
1528do 1539do
1529 eval ac_val=\$$ac_var 1540 eval ac_val=\$$ac_var
1530 # Remove trailing slashes. 1541 # Remove trailing slashes.
@@ -1677,7 +1688,6 @@ Fine tuning of the installation directories:
1677 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1688 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1678 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1689 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1679 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1690 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1680 --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
1681 --libdir=DIR object code libraries [EPREFIX/lib] 1691 --libdir=DIR object code libraries [EPREFIX/lib]
1682 --includedir=DIR C header files [PREFIX/include] 1692 --includedir=DIR C header files [PREFIX/include]
1683 --oldincludedir=DIR C header files for non-gcc [/usr/include] 1693 --oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1722,6 +1732,7 @@ Optional Features:
1722 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 1732 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1723 --disable-largefile omit support for large files 1733 --disable-largefile omit support for large files
1724 --enable-relocatable install a package that can be moved in the filesystem 1734 --enable-relocatable install a package that can be moved in the filesystem
1735 --disable-rpath do not hardcode runtime library paths
1725 --enable-maintainer-mode 1736 --enable-maintainer-mode
1726 enable make rules and dependencies not useful (and 1737 enable make rules and dependencies not useful (and
1727 sometimes confusing) to the casual installer 1738 sometimes confusing) to the casual installer
@@ -1751,6 +1762,7 @@ Optional Features:
1751 produces by Swig 1762 produces by Swig
1752 --enable-build-giws Regenerate C/C++ => Java wrappers produces by Giws 1763 --enable-build-giws Regenerate C/C++ => Java wrappers produces by Giws
1753 --enable-build-parser Regenerate code for the parser (Lex & YACC) 1764 --enable-build-parser Regenerate code for the parser (Lex & YACC)
1765 --disable-nls do not use Native Language Support
1754 --disable-build-localization 1766 --disable-build-localization
1755 Disable the localization build 1767 Disable the localization build
1756 1768
@@ -1798,6 +1810,10 @@ Optional Packages:
1798 --with-jdk=DIR use JDK from DIR 1810 --with-jdk=DIR use JDK from DIR
1799 --with-ant=DIR Use ant from DIR 1811 --with-ant=DIR Use ant from DIR
1800 --without-emf disable support for EMF (Windows Metafile) export 1812 --without-emf disable support for EMF (Windows Metafile) export
1813 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
1814 --without-libiconv-prefix don't search for libiconv in includedir and libdir
1815 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
1816 --without-libintl-prefix don't search for libintl in includedir and libdir
1801 --without-fftw Disable the interface to the FFTW 3 library 1817 --without-fftw Disable the interface to the FFTW 3 library
1802 --with-fftw-include=DIR Set the path to the FFTW headers 1818 --with-fftw-include=DIR Set the path to the FFTW headers
1803 --with-fftw-library=DIR Set the path to the FFTW libraries 1819 --with-fftw-library=DIR Set the path to the FFTW libraries
@@ -3176,6 +3192,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
3176 >$cache_file 3192 >$cache_file
3177fi 3193fi
3178 3194
3195gt_needs="$gt_needs "
3179# Check that the precious variables saved in the cache have kept the same 3196# Check that the precious variables saved in the cache have kept the same
3180# value. 3197# value.
3181ac_cache_corrupted=false 3198ac_cache_corrupted=false
@@ -4396,7 +4413,7 @@ else
4396 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4413 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4397 since some C++ compilers masquerading as C compilers 4414 since some C++ compilers masquerading as C compilers
4398 incorrectly reject 9223372036854775807. */ 4415 incorrectly reject 9223372036854775807. */
4399#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 4416#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
4400 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4417 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4401 && LARGE_OFF_T % 2147483647 == 1) 4418 && LARGE_OFF_T % 2147483647 == 1)
4402 ? 1 : -1]; 4419 ? 1 : -1];
@@ -4442,7 +4459,7 @@ else
4442 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4459 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4443 since some C++ compilers masquerading as C compilers 4460 since some C++ compilers masquerading as C compilers
4444 incorrectly reject 9223372036854775807. */ 4461 incorrectly reject 9223372036854775807. */
4445#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 4462#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
4446 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4463 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4447 && LARGE_OFF_T % 2147483647 == 1) 4464 && LARGE_OFF_T % 2147483647 == 1)
4448 ? 1 : -1]; 4465 ? 1 : -1];
@@ -4466,7 +4483,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4466 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4483 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4467 since some C++ compilers masquerading as C compilers 4484 since some C++ compilers masquerading as C compilers
4468 incorrectly reject 9223372036854775807. */ 4485 incorrectly reject 9223372036854775807. */
4469#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 4486#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
4470 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4487 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4471 && LARGE_OFF_T % 2147483647 == 1) 4488 && LARGE_OFF_T % 2147483647 == 1)
4472 ? 1 : -1]; 4489 ? 1 : -1];
@@ -4511,7 +4528,7 @@ else
4511 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4528 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4512 since some C++ compilers masquerading as C compilers 4529 since some C++ compilers masquerading as C compilers
4513 incorrectly reject 9223372036854775807. */ 4530 incorrectly reject 9223372036854775807. */
4514#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 4531#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
4515 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4532 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4516 && LARGE_OFF_T % 2147483647 == 1) 4533 && LARGE_OFF_T % 2147483647 == 1)
4517 ? 1 : -1]; 4534 ? 1 : -1];
@@ -4535,7 +4552,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4535 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4552 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4536 since some C++ compilers masquerading as C compilers 4553 since some C++ compilers masquerading as C compilers
4537 incorrectly reject 9223372036854775807. */ 4554 incorrectly reject 9223372036854775807. */
4538#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 4555#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
4539 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4556 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4540 && LARGE_OFF_T % 2147483647 == 1) 4557 && LARGE_OFF_T % 2147483647 == 1)
4541 ? 1 : -1]; 4558 ? 1 : -1];
@@ -5480,7 +5497,40 @@ cat >>confdefs.h <<_ACEOF
5480_ACEOF 5497_ACEOF
5481 5498
5482 5499
5483AC_LIB_RPATH 5500
5501
5502 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
5503$as_echo_n "checking for shared library run path origin... " >&6; }
5504if ${acl_cv_rpath+:} false; then :
5505 $as_echo_n "(cached) " >&6
5506else
5507
5508 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
5509 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
5510 . ./conftest.sh
5511 rm -f ./conftest.sh
5512 acl_cv_rpath=done
5513
5514fi
5515{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
5516$as_echo "$acl_cv_rpath" >&6; }
5517 wl="$acl_cv_wl"
5518 acl_libext="$acl_cv_libext"
5519 acl_shlibext="$acl_cv_shlibext"
5520 acl_libname_spec="$acl_cv_libname_spec"
5521 acl_library_names_spec="$acl_cv_library_names_spec"
5522 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
5523 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
5524 acl_hardcode_direct="$acl_cv_hardcode_direct"
5525 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
5526 # Check whether --enable-rpath was given.
5527if test "${enable_rpath+set}" = set; then :
5528 enableval=$enable_rpath; :
5529else
5530 enable_rpath=yes
5531fi
5532
5533
5484 5534
5485# If configure detect that timestamp changed, 5535# If configure detect that timestamp changed,
5486# it tries to rebuild configure & makefile which can be a painmaker 5536# it tries to rebuild configure & makefile which can be a painmaker
@@ -11660,7 +11710,7 @@ $as_echo "$ac_java_classpath" >&6; }
11660$as_echo_n "checking to see if the java compiler works... " >&6; } 11710$as_echo_n "checking to see if the java compiler works... " >&6; }
11661 11711
11662 cat << \EOF > conftest.java 11712 cat << \EOF > conftest.java
11663// #line 11663 "configure" 11713// #line 11713 "configure"
11664import java.util.regex.Pattern; 11714import java.util.regex.Pattern;
11665 11715
11666 11716
@@ -11747,7 +11797,7 @@ $as_echo_n "checking type of jvm... " >&6; }
11747 if test "x$ac_java_jvm_name" = "x" ; then 11797 if test "x$ac_java_jvm_name" = "x" ; then
11748 11798
11749 cat << \EOF > conftest.java 11799 cat << \EOF > conftest.java
11750// #line 11750 "configure" 11800// #line 11800 "configure"
11751import java.util.regex.Pattern; 11801import java.util.regex.Pattern;
11752 11802
11753import gnu.java.io.EncodingManager; 11803import gnu.java.io.EncodingManager;
@@ -11831,7 +11881,7 @@ $as_echo_n "checking java API version... " >&6; }
11831 # The class java.nio.charset.Charset is new to 1.4 11881 # The class java.nio.charset.Charset is new to 1.4
11832 11882
11833 cat << \EOF > conftest.java 11883 cat << \EOF > conftest.java
11834// #line 11834 "configure" 11884// #line 11884 "configure"
11835import java.util.regex.Pattern; 11885import java.util.regex.Pattern;
11836 11886
11837import java.nio.charset.Charset; 11887import java.nio.charset.Charset;
@@ -11896,7 +11946,7 @@ EOF
11896 # The class java.lang.StringBuilder is new to 1.5 11946 # The class java.lang.StringBuilder is new to 1.5
11897 11947
11898 cat << \EOF > conftest.java 11948 cat << \EOF > conftest.java
11899// #line 11899 "configure" 11949// #line 11949 "configure"
11900import java.util.regex.Pattern; 11950import java.util.regex.Pattern;
11901 11951
11902import java.lang.StringBuilder; 11952import java.lang.StringBuilder;
@@ -11961,7 +12011,7 @@ EOF
11961 # The class java.util.ArrayDeque is new to 1.6 12011 # The class java.util.ArrayDeque is new to 1.6
11962 12012
11963 cat << \EOF > conftest.java 12013 cat << \EOF > conftest.java
11964// #line 11964 "configure" 12014// #line 12014 "configure"
11965import java.util.regex.Pattern; 12015import java.util.regex.Pattern;
11966 12016
11967import java.util.ArrayDeque; 12017import java.util.ArrayDeque;
@@ -12026,7 +12076,7 @@ EOF
12026 # The class java.nio.file.Path is new to 1.7 12076 # The class java.nio.file.Path is new to 1.7
12027 12077
12028 cat << \EOF > conftest.java 12078 cat << \EOF > conftest.java
12029// #line 12029 "configure" 12079// #line 12079 "configure"
12030import java.util.regex.Pattern; 12080import java.util.regex.Pattern;
12031 12081
12032import java.nio.file.Path; 12082import java.nio.file.Path;
@@ -12091,7 +12141,7 @@ EOF
12091 # The class java.util.stream.DoubleStream is new to 1.8 12141 # The class java.util.stream.DoubleStream is new to 1.8
12092 12142
12093 cat << \EOF > conftest.java 12143 cat << \EOF > conftest.java
12094// #line 12094 "configure" 12144// #line 12144 "configure"
12095import java.util.regex.Pattern; 12145import java.util.regex.Pattern;
12096 12146
12097import java.util.stream.DoubleStream; 12147import java.util.stream.DoubleStream;
@@ -12156,7 +12206,7 @@ EOF
12156 # The class java.lang.ProcessHandle is new to 1.9 12206 # The class java.lang.ProcessHandle is new to 1.9
12157 12207
12158 cat << \EOF > conftest.java 12208 cat << \EOF > conftest.java
12159// #line 12159 "configure" 12209// #line 12209 "configure"
12160import java.util.regex.Pattern; 12210import java.util.regex.Pattern;
12161 12211
12162import java.lang.ProcessHandle; 12212import java.lang.ProcessHandle;
@@ -13654,7 +13704,7 @@ fi
13654 # jgraphx 13704 # jgraphx
13655 13705
13656 cat << \EOF > conftestSharedChecker.java 13706 cat << \EOF > conftestSharedChecker.java
13657// #line 13657 "configure" 13707// #line 13707 "configure"
13658import java.util.regex.Pattern; 13708import java.util.regex.Pattern;
13659import java.io.File; 13709import java.io.File;
13660import java.io.IOException; 13710import java.io.IOException;
@@ -13855,7 +13905,7 @@ $as_echo_n "checking jgraphx... " >&6; }
13855 if test ! -f conftestSharedChecker.class ; then 13905 if test ! -f conftestSharedChecker.class ; then
13856 13906
13857 cat << \EOF > conftestSharedChecker.java 13907 cat << \EOF > conftestSharedChecker.java
13858// #line 13858 "configure" 13908// #line 13908 "configure"
13859import java.util.regex.Pattern; 13909import java.util.regex.Pattern;
13860import java.io.File; 13910import java.io.File;
13861import java.io.IOException; 13911import java.io.IOException;
@@ -14091,7 +14141,7 @@ $as_ech