Merge lp:~mitya57/ubuntu/utopic/xkeyboard-config/2.11-1ubuntu1 into lp:ubuntu/utopic/xkeyboard-config
- Utopic (14.10)
- 2.11-1ubuntu1
- Merge into utopic
Proposed by
Dmitry Shachnev
Status: | Merged |
---|---|
Merged at revision: | 88 |
Proposed branch: | lp:~mitya57/ubuntu/utopic/xkeyboard-config/2.11-1ubuntu1 |
Merge into: | lp:ubuntu/utopic/xkeyboard-config |
Diff against target: |
74481 lines (+19743/-18726) 170 files modified
Makefile.am (+1/-1) Makefile.in (+7/-3) NEWS (+3/-0) aclocal.m4 (+55/-2428) compat/Makefile.in (+6/-1) compat/README (+7/-7) compat/accessx (+5/-5) compat/basic (+6/-5) compat/caps (+7/-8) compat/complete (+1/-1) compat/iso9995 (+6/-5) compat/japan (+13/-13) compat/ledcaps (+23/-22) compat/lednum (+23/-22) compat/ledscroll (+23/-22) compat/level5 (+17/-14) compat/misc (+86/-86) compat/mousekeys (+122/-123) compat/olpc (+38/-38) compat/pc (+7/-7) compat/pc98 (+10/-9) compat/xfree86 (+2/-2) compat/xtest (+11/-12) config.guess (+64/-87) config.sub (+16/-14) configure (+88/-126) configure.ac (+1/-1) debian/changelog (+32/-0) debian/control (+1/-1) debian/patches/105_intelligent_keyboard.patch (+7/-7) debian/patches/108_fix_intltool_make_check.diff (+0/-19) debian/patches/bengali_to_bangla.patch (+0/-270) debian/patches/series (+0/-2) docs/Makefile.in (+6/-1) geometry/Makefile.in (+6/-1) geometry/digital_vndr/Makefile.in (+6/-1) geometry/sgi_vndr/Makefile.in (+6/-1) keycodes/Makefile.in (+6/-1) keycodes/digital_vndr/Makefile.in (+6/-1) keycodes/sgi_vndr/Makefile.in (+6/-1) m4/gettext.m4 (+383/-0) m4/iconv.m4 (+214/-0) m4/intlmacosx.m4 (+51/-0) m4/lib-ld.m4 (+110/-0) m4/lib-link.m4 (+774/-0) m4/lib-prefix.m4 (+224/-0) m4/nls.m4 (+32/-0) m4/po.m4 (+449/-0) m4/progtest.m4 (+92/-0) man/Makefile.in (+6/-1) po/bg.po (+687/-661) po/ca.po (+691/-664) po/da.po (+889/-807) po/de.po (+686/-698) po/eo.po (+700/-673) po/es.po (+2779/-2328) po/fr.po (+695/-664) po/hu.po (+693/-663) po/id.po (+2785/-2478) po/nl.po (+693/-667) po/pl.po (+688/-664) po/pt_BR.po (+694/-663) po/ru.po (+740/-713) po/uk.po (+693/-663) po/xkeyboard-config.pot (+680/-656) rules/HDR (+1/-0) rules/Makefile.am (+11/-0) rules/Makefile.in (+17/-1) rules/base.extras.xml.in (+10/-4) rules/base.lists.base.part (+54/-0) rules/base.lists.part (+1/-41) rules/base.ml_s1.part (+1/-0) rules/base.o_s.part (+1/-0) rules/base.xml.in (+51/-17) rules/bin/Makefile.in (+6/-1) rules/compat/Makefile.in (+6/-1) rules/evdev.extras.xml.in (+10/-4) rules/evdev.lists.part (+1/-0) rules/evdev.xml.in (+51/-17) symbols/Makefile.in (+6/-1) symbols/af (+5/-5) symbols/altwin (+15/-12) symbols/am (+2/-2) symbols/apl (+32/-39) symbols/ara (+64/-71) symbols/at (+1/-1) symbols/ba (+4/-4) symbols/bd (+2/-2) symbols/bg (+192/-302) symbols/br (+77/-91) symbols/bt (+2/-2) symbols/bw (+1/-1) symbols/by (+3/-3) symbols/ca (+8/-8) symbols/capslock (+1/-1) symbols/ch (+11/-11) symbols/cn (+9/-23) symbols/ctrl (+40/-17) symbols/cz (+5/-5) symbols/de (+9/-9) symbols/digital_vndr/Makefile.in (+6/-1) symbols/dk (+3/-3) symbols/ee (+2/-2) symbols/es (+2/-2) symbols/fo (+1/-1) symbols/fr (+2/-0) symbols/fujitsu_vndr/Makefile.in (+6/-1) symbols/gb (+8/-8) symbols/ge (+1/-1) symbols/gh (+9/-9) symbols/group (+147/-165) symbols/hp_vndr/Makefile.in (+6/-1) symbols/hr (+4/-4) symbols/hu (+2/-1) symbols/ie (+2/-2) symbols/il (+67/-71) symbols/in (+143/-75) symbols/inet (+107/-105) symbols/ir (+51/-53) symbols/is (+6/-6) symbols/it (+3/-1) symbols/jp (+8/-0) symbols/ke (+5/-5) symbols/keypad (+5/-5) symbols/kh (+3/-3) symbols/kr (+2/-2) symbols/la (+24/-24) symbols/lt (+5/-5) symbols/macintosh_vndr/Makefile.in (+6/-1) symbols/mao (+3/-2) symbols/md (+6/-6) symbols/mk (+1/-1) symbols/mv (+1/-1) symbols/nec_vndr/Makefile.in (+6/-1) symbols/ng (+3/-3) symbols/nl (+3/-1) symbols/no (+4/-4) symbols/nokia_vndr/Makefile.in (+6/-1) symbols/pk (+1/-1) symbols/pl (+6/-5) symbols/pt (+59/-70) symbols/rs (+22/-24) symbols/ru (+19/-19) symbols/se (+2/-2) symbols/sgi_vndr/Makefile.in (+6/-1) symbols/sharp_vndr/Makefile.in (+6/-1) symbols/si (+2/-2) symbols/sk (+5/-5) symbols/sony_vndr/Makefile.in (+6/-1) symbols/srvr_ctrl (+17/-3) symbols/sun_vndr/Makefile.in (+6/-1) symbols/th (+3/-3) symbols/tj (+97/-97) symbols/tm (+1/-1) symbols/ua (+5/-5) symbols/us (+78/-27) symbols/uz (+27/-28) symbols/xfree68_vndr/Makefile.in (+6/-1) symbols/za (+30/-30) types/Makefile.in (+6/-1) types/README (+3/-3) types/basic (+6/-6) types/caps (+15/-12) types/extra (+34/-37) types/iso9995 (+3/-3) types/level5 (+17/-17) types/mousekeys (+3/-3) types/nokia (+2/-1) types/numpad (+4/-4) types/pc (+9/-8) |
To merge this branch: | bzr merge lp:~mitya57/ubuntu/utopic/xkeyboard-config/2.11-1ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Development Team | Pending | ||
Review via email: mp+219358@code.launchpad.net |
Commit message
Description of the change
* Merge with Debian unstable, remaining changes:
- control, rules, xkb-data-
xkb-data-i18n to be used by console-setup.
- xkb-data.
regenerated.
- 105_intelligent
Keyboard K04.
* Dropped bengali_
* Dropped 108_fix_
needed.
I dropped 108_fix_
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile.am' |
2 | --- Makefile.am 2013-12-22 16:37:56 +0000 |
3 | +++ Makefile.am 2014-05-13 12:44:26 +0000 |
4 | @@ -12,7 +12,7 @@ |
5 | |
6 | DISTCLEANFILES=intltool-extract intltool-merge intltool-update |
7 | |
8 | -# ACLOCAL_AMFLAGS = -I m4 |
9 | +ACLOCAL_AMFLAGS = -I m4 |
10 | |
11 | sync-po: |
12 | rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po |
13 | |
14 | === modified file 'Makefile.in' |
15 | --- Makefile.in 2013-12-22 16:37:56 +0000 |
16 | +++ Makefile.in 2014-05-13 12:44:26 +0000 |
17 | @@ -85,7 +85,12 @@ |
18 | ChangeLog NEWS README TODO config.guess config.rpath \ |
19 | config.sub install-sh missing |
20 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
21 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
22 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
23 | + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
24 | + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
25 | + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ |
26 | + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ |
27 | + $(top_srcdir)/configure.ac |
28 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
29 | $(ACLOCAL_M4) |
30 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
31 | @@ -379,6 +384,7 @@ |
32 | intltool-extract.in intltool-merge.in intltool-update.in |
33 | |
34 | DISTCLEANFILES = intltool-extract intltool-merge intltool-update |
35 | +ACLOCAL_AMFLAGS = -I m4 |
36 | all: all-recursive |
37 | |
38 | .SUFFIXES: |
39 | @@ -853,8 +859,6 @@ |
40 | uninstall-am uninstall-pkgconfigDATA |
41 | |
42 | |
43 | -# ACLOCAL_AMFLAGS = -I m4 |
44 | - |
45 | sync-po: |
46 | rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po |
47 | |
48 | |
49 | === modified file 'NEWS' |
50 | --- NEWS 2013-12-29 11:43:52 +0000 |
51 | +++ NEWS 2014-05-13 12:44:26 +0000 |
52 | @@ -1,3 +1,6 @@ |
53 | +2.11 11 bugs fixed |
54 | + Continuing code formatting cleanup |
55 | + Translations updated |
56 | 2.10.1 Critical fix |
57 | 2.10 10+ bugs fixed |
58 | 37 cleanup commits by Benno Schulenberg |
59 | |
60 | === modified file 'aclocal.m4' |
61 | --- aclocal.m4 2013-12-22 16:37:56 +0000 |
62 | +++ aclocal.m4 2014-05-13 12:44:26 +0000 |
63 | @@ -20,734 +20,6 @@ |
64 | If you have problems, you may need to regenerate the build system entirely. |
65 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
66 | |
67 | -# gettext.m4 serial 66 (gettext-0.18.2) |
68 | -dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. |
69 | -dnl This file is free software; the Free Software Foundation |
70 | -dnl gives unlimited permission to copy and/or distribute it, |
71 | -dnl with or without modifications, as long as this notice is preserved. |
72 | -dnl |
73 | -dnl This file can can be used in projects which are not available under |
74 | -dnl the GNU General Public License or the GNU Library General Public |
75 | -dnl License but which still want to provide support for the GNU gettext |
76 | -dnl functionality. |
77 | -dnl Please note that the actual code of the GNU gettext library is covered |
78 | -dnl by the GNU Library General Public License, and the rest of the GNU |
79 | -dnl gettext package package is covered by the GNU General Public License. |
80 | -dnl They are *not* in the public domain. |
81 | - |
82 | -dnl Authors: |
83 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
84 | -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010. |
85 | - |
86 | -dnl Macro to add for using GNU gettext. |
87 | - |
88 | -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). |
89 | -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The |
90 | -dnl default (if it is not specified or empty) is 'no-libtool'. |
91 | -dnl INTLSYMBOL should be 'external' for packages with no intl directory, |
92 | -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. |
93 | -dnl If INTLSYMBOL is 'use-libtool', then a libtool library |
94 | -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, |
95 | -dnl depending on --{enable,disable}-{shared,static} and on the presence of |
96 | -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library |
97 | -dnl $(top_builddir)/intl/libintl.a will be created. |
98 | -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext |
99 | -dnl implementations (in libc or libintl) without the ngettext() function |
100 | -dnl will be ignored. If NEEDSYMBOL is specified and is |
101 | -dnl 'need-formatstring-macros', then GNU gettext implementations that don't |
102 | -dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. |
103 | -dnl INTLDIR is used to find the intl libraries. If empty, |
104 | -dnl the value '$(top_builddir)/intl/' is used. |
105 | -dnl |
106 | -dnl The result of the configuration is one of three cases: |
107 | -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled |
108 | -dnl and used. |
109 | -dnl Catalog format: GNU --> install in $(datadir) |
110 | -dnl Catalog extension: .mo after installation, .gmo in source tree |
111 | -dnl 2) GNU gettext has been found in the system's C library. |
112 | -dnl Catalog format: GNU --> install in $(datadir) |
113 | -dnl Catalog extension: .mo after installation, .gmo in source tree |
114 | -dnl 3) No internationalization, always use English msgid. |
115 | -dnl Catalog format: none |
116 | -dnl Catalog extension: none |
117 | -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. |
118 | -dnl The use of .gmo is historical (it was needed to avoid overwriting the |
119 | -dnl GNU format catalogs when building on a platform with an X/Open gettext), |
120 | -dnl but we keep it in order not to force irrelevant filename changes on the |
121 | -dnl maintainers. |
122 | -dnl |
123 | -AC_DEFUN([AM_GNU_GETTEXT], |
124 | -[ |
125 | - dnl Argument checking. |
126 | - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , |
127 | - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT |
128 | -])])])])]) |
129 | - ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], |
130 | - [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) |
131 | - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , |
132 | - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT |
133 | -])])])]) |
134 | - define([gt_included_intl], |
135 | - ifelse([$1], [external], |
136 | - ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), |
137 | - [yes])) |
138 | - define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) |
139 | - gt_NEEDS_INIT |
140 | - AM_GNU_GETTEXT_NEED([$2]) |
141 | - |
142 | - AC_REQUIRE([AM_PO_SUBDIRS])dnl |
143 | - ifelse(gt_included_intl, yes, [ |
144 | - AC_REQUIRE([AM_INTL_SUBDIR])dnl |
145 | - ]) |
146 | - |
147 | - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. |
148 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
149 | - AC_REQUIRE([AC_LIB_RPATH]) |
150 | - |
151 | - dnl Sometimes libintl requires libiconv, so first search for libiconv. |
152 | - dnl Ideally we would do this search only after the |
153 | - dnl if test "$USE_NLS" = "yes"; then |
154 | - dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then |
155 | - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT |
156 | - dnl the configure script would need to contain the same shell code |
157 | - dnl again, outside any 'if'. There are two solutions: |
158 | - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. |
159 | - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. |
160 | - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not |
161 | - dnl documented, we avoid it. |
162 | - ifelse(gt_included_intl, yes, , [ |
163 | - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) |
164 | - ]) |
165 | - |
166 | - dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. |
167 | - gt_INTL_MACOSX |
168 | - |
169 | - dnl Set USE_NLS. |
170 | - AC_REQUIRE([AM_NLS]) |
171 | - |
172 | - ifelse(gt_included_intl, yes, [ |
173 | - BUILD_INCLUDED_LIBINTL=no |
174 | - USE_INCLUDED_LIBINTL=no |
175 | - ]) |
176 | - LIBINTL= |
177 | - LTLIBINTL= |
178 | - POSUB= |
179 | - |
180 | - dnl Add a version number to the cache macros. |
181 | - case " $gt_needs " in |
182 | - *" need-formatstring-macros "*) gt_api_version=3 ;; |
183 | - *" need-ngettext "*) gt_api_version=2 ;; |
184 | - *) gt_api_version=1 ;; |
185 | - esac |
186 | - gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" |
187 | - gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" |
188 | - |
189 | - dnl If we use NLS figure out what method |
190 | - if test "$USE_NLS" = "yes"; then |
191 | - gt_use_preinstalled_gnugettext=no |
192 | - ifelse(gt_included_intl, yes, [ |
193 | - AC_MSG_CHECKING([whether included gettext is requested]) |
194 | - AC_ARG_WITH([included-gettext], |
195 | - [ --with-included-gettext use the GNU gettext library included here], |
196 | - nls_cv_force_use_gnu_gettext=$withval, |
197 | - nls_cv_force_use_gnu_gettext=no) |
198 | - AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) |
199 | - |
200 | - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" |
201 | - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then |
202 | - ]) |
203 | - dnl User does not insist on using GNU NLS library. Figure out what |
204 | - dnl to use. If GNU gettext is available we use this. Else we have |
205 | - dnl to fall back to GNU NLS library. |
206 | - |
207 | - if test $gt_api_version -ge 3; then |
208 | - gt_revision_test_code=' |
209 | -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
210 | -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) |
211 | -#endif |
212 | -changequote(,)dnl |
213 | -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; |
214 | -changequote([,])dnl |
215 | -' |
216 | - else |
217 | - gt_revision_test_code= |
218 | - fi |
219 | - if test $gt_api_version -ge 2; then |
220 | - gt_expression_test_code=' + * ngettext ("", "", 0)' |
221 | - else |
222 | - gt_expression_test_code= |
223 | - fi |
224 | - |
225 | - AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], |
226 | - [AC_LINK_IFELSE( |
227 | - [AC_LANG_PROGRAM( |
228 | - [[ |
229 | -#include <libintl.h> |
230 | -$gt_revision_test_code |
231 | -extern int _nl_msg_cat_cntr; |
232 | -extern int *_nl_domain_bindings; |
233 | - ]], |
234 | - [[ |
235 | -bindtextdomain ("", ""); |
236 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings |
237 | - ]])], |
238 | - [eval "$gt_func_gnugettext_libc=yes"], |
239 | - [eval "$gt_func_gnugettext_libc=no"])]) |
240 | - |
241 | - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then |
242 | - dnl Sometimes libintl requires libiconv, so first search for libiconv. |
243 | - ifelse(gt_included_intl, yes, , [ |
244 | - AM_ICONV_LINK |
245 | - ]) |
246 | - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL |
247 | - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) |
248 | - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL |
249 | - dnl even if libiconv doesn't exist. |
250 | - AC_LIB_LINKFLAGS_BODY([intl]) |
251 | - AC_CACHE_CHECK([for GNU gettext in libintl], |
252 | - [$gt_func_gnugettext_libintl], |
253 | - [gt_save_CPPFLAGS="$CPPFLAGS" |
254 | - CPPFLAGS="$CPPFLAGS $INCINTL" |
255 | - gt_save_LIBS="$LIBS" |
256 | - LIBS="$LIBS $LIBINTL" |
257 | - dnl Now see whether libintl exists and does not depend on libiconv. |
258 | - AC_LINK_IFELSE( |
259 | - [AC_LANG_PROGRAM( |
260 | - [[ |
261 | -#include <libintl.h> |
262 | -$gt_revision_test_code |
263 | -extern int _nl_msg_cat_cntr; |
264 | -extern |
265 | -#ifdef __cplusplus |
266 | -"C" |
267 | -#endif |
268 | -const char *_nl_expand_alias (const char *); |
269 | - ]], |
270 | - [[ |
271 | -bindtextdomain ("", ""); |
272 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
273 | - ]])], |
274 | - [eval "$gt_func_gnugettext_libintl=yes"], |
275 | - [eval "$gt_func_gnugettext_libintl=no"]) |
276 | - dnl Now see whether libintl exists and depends on libiconv. |
277 | - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then |
278 | - LIBS="$LIBS $LIBICONV" |
279 | - AC_LINK_IFELSE( |
280 | - [AC_LANG_PROGRAM( |
281 | - [[ |
282 | -#include <libintl.h> |
283 | -$gt_revision_test_code |
284 | -extern int _nl_msg_cat_cntr; |
285 | -extern |
286 | -#ifdef __cplusplus |
287 | -"C" |
288 | -#endif |
289 | -const char *_nl_expand_alias (const char *); |
290 | - ]], |
291 | - [[ |
292 | -bindtextdomain ("", ""); |
293 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
294 | - ]])], |
295 | - [LIBINTL="$LIBINTL $LIBICONV" |
296 | - LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
297 | - eval "$gt_func_gnugettext_libintl=yes" |
298 | - ]) |
299 | - fi |
300 | - CPPFLAGS="$gt_save_CPPFLAGS" |
301 | - LIBS="$gt_save_LIBS"]) |
302 | - fi |
303 | - |
304 | - dnl If an already present or preinstalled GNU gettext() is found, |
305 | - dnl use it. But if this macro is used in GNU gettext, and GNU |
306 | - dnl gettext is already preinstalled in libintl, we update this |
307 | - dnl libintl. (Cf. the install rule in intl/Makefile.in.) |
308 | - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ |
309 | - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ |
310 | - && test "$PACKAGE" != gettext-runtime \ |
311 | - && test "$PACKAGE" != gettext-tools; }; then |
312 | - gt_use_preinstalled_gnugettext=yes |
313 | - else |
314 | - dnl Reset the values set by searching for libintl. |
315 | - LIBINTL= |
316 | - LTLIBINTL= |
317 | - INCINTL= |
318 | - fi |
319 | - |
320 | - ifelse(gt_included_intl, yes, [ |
321 | - if test "$gt_use_preinstalled_gnugettext" != "yes"; then |
322 | - dnl GNU gettext is not found in the C library. |
323 | - dnl Fall back on included GNU gettext library. |
324 | - nls_cv_use_gnu_gettext=yes |
325 | - fi |
326 | - fi |
327 | - |
328 | - if test "$nls_cv_use_gnu_gettext" = "yes"; then |
329 | - dnl Mark actions used to generate GNU NLS library. |
330 | - BUILD_INCLUDED_LIBINTL=yes |
331 | - USE_INCLUDED_LIBINTL=yes |
332 | - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" |
333 | - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" |
334 | - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` |
335 | - fi |
336 | - |
337 | - CATOBJEXT= |
338 | - if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
339 | - || test "$nls_cv_use_gnu_gettext" = "yes"; then |
340 | - dnl Mark actions to use GNU gettext tools. |
341 | - CATOBJEXT=.gmo |
342 | - fi |
343 | - ]) |
344 | - |
345 | - if test -n "$INTL_MACOSX_LIBS"; then |
346 | - if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
347 | - || test "$nls_cv_use_gnu_gettext" = "yes"; then |
348 | - dnl Some extra flags are needed during linking. |
349 | - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" |
350 | - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" |
351 | - fi |
352 | - fi |
353 | - |
354 | - if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
355 | - || test "$nls_cv_use_gnu_gettext" = "yes"; then |
356 | - AC_DEFINE([ENABLE_NLS], [1], |
357 | - [Define to 1 if translation of program messages to the user's native language |
358 | - is requested.]) |
359 | - else |
360 | - USE_NLS=no |
361 | - fi |
362 | - fi |
363 | - |
364 | - AC_MSG_CHECKING([whether to use NLS]) |
365 | - AC_MSG_RESULT([$USE_NLS]) |
366 | - if test "$USE_NLS" = "yes"; then |
367 | - AC_MSG_CHECKING([where the gettext function comes from]) |
368 | - if test "$gt_use_preinstalled_gnugettext" = "yes"; then |
369 | - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then |
370 | - gt_source="external libintl" |
371 | - else |
372 | - gt_source="libc" |
373 | - fi |
374 | - else |
375 | - gt_source="included intl directory" |
376 | - fi |
377 | - AC_MSG_RESULT([$gt_source]) |
378 | - fi |
379 | - |
380 | - if test "$USE_NLS" = "yes"; then |
381 | - |
382 | - if test "$gt_use_preinstalled_gnugettext" = "yes"; then |
383 | - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then |
384 | - AC_MSG_CHECKING([how to link with libintl]) |
385 | - AC_MSG_RESULT([$LIBINTL]) |
386 | - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) |
387 | - fi |
388 | - |
389 | - dnl For backward compatibility. Some packages may be using this. |
390 | - AC_DEFINE([HAVE_GETTEXT], [1], |
391 | - [Define if the GNU gettext() function is already present or preinstalled.]) |
392 | - AC_DEFINE([HAVE_DCGETTEXT], [1], |
393 | - [Define if the GNU dcgettext() function is already present or preinstalled.]) |
394 | - fi |
395 | - |
396 | - dnl We need to process the po/ directory. |
397 | - POSUB=po |
398 | - fi |
399 | - |
400 | - ifelse(gt_included_intl, yes, [ |
401 | - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL |
402 | - dnl to 'yes' because some of the testsuite requires it. |
403 | - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then |
404 | - BUILD_INCLUDED_LIBINTL=yes |
405 | - fi |
406 | - |
407 | - dnl Make all variables we use known to autoconf. |
408 | - AC_SUBST([BUILD_INCLUDED_LIBINTL]) |
409 | - AC_SUBST([USE_INCLUDED_LIBINTL]) |
410 | - AC_SUBST([CATOBJEXT]) |
411 | - |
412 | - dnl For backward compatibility. Some configure.ins may be using this. |
413 | - nls_cv_header_intl= |
414 | - nls_cv_header_libgt= |
415 | - |
416 | - dnl For backward compatibility. Some Makefiles may be using this. |
417 | - DATADIRNAME=share |
418 | - AC_SUBST([DATADIRNAME]) |
419 | - |
420 | - dnl For backward compatibility. Some Makefiles may be using this. |
421 | - INSTOBJEXT=.mo |
422 | - AC_SUBST([INSTOBJEXT]) |
423 | - |
424 | - dnl For backward compatibility. Some Makefiles may be using this. |
425 | - GENCAT=gencat |
426 | - AC_SUBST([GENCAT]) |
427 | - |
428 | - dnl For backward compatibility. Some Makefiles may be using this. |
429 | - INTLOBJS= |
430 | - if test "$USE_INCLUDED_LIBINTL" = yes; then |
431 | - INTLOBJS="\$(GETTOBJS)" |
432 | - fi |
433 | - AC_SUBST([INTLOBJS]) |
434 | - |
435 | - dnl Enable libtool support if the surrounding package wishes it. |
436 | - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix |
437 | - AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) |
438 | - ]) |
439 | - |
440 | - dnl For backward compatibility. Some Makefiles may be using this. |
441 | - INTLLIBS="$LIBINTL" |
442 | - AC_SUBST([INTLLIBS]) |
443 | - |
444 | - dnl Make all documented variables known to autoconf. |
445 | - AC_SUBST([LIBINTL]) |
446 | - AC_SUBST([LTLIBINTL]) |
447 | - AC_SUBST([POSUB]) |
448 | -]) |
449 | - |
450 | - |
451 | -dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. |
452 | -m4_define([gt_NEEDS_INIT], |
453 | -[ |
454 | - m4_divert_text([DEFAULTS], [gt_needs=]) |
455 | - m4_define([gt_NEEDS_INIT], []) |
456 | -]) |
457 | - |
458 | - |
459 | -dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) |
460 | -AC_DEFUN([AM_GNU_GETTEXT_NEED], |
461 | -[ |
462 | - m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) |
463 | -]) |
464 | - |
465 | - |
466 | -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) |
467 | -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) |
468 | - |
469 | -# iconv.m4 serial 18 (gettext-0.18.2) |
470 | -dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc. |
471 | -dnl This file is free software; the Free Software Foundation |
472 | -dnl gives unlimited permission to copy and/or distribute it, |
473 | -dnl with or without modifications, as long as this notice is preserved. |
474 | - |
475 | -dnl From Bruno Haible. |
476 | - |
477 | -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], |
478 | -[ |
479 | - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. |
480 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
481 | - AC_REQUIRE([AC_LIB_RPATH]) |
482 | - |
483 | - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV |
484 | - dnl accordingly. |
485 | - AC_LIB_LINKFLAGS_BODY([iconv]) |
486 | -]) |
487 | - |
488 | -AC_DEFUN([AM_ICONV_LINK], |
489 | -[ |
490 | - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and |
491 | - dnl those with the standalone portable GNU libiconv installed). |
492 | - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles |
493 | - |
494 | - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV |
495 | - dnl accordingly. |
496 | - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) |
497 | - |
498 | - dnl Add $INCICONV to CPPFLAGS before performing the following checks, |
499 | - dnl because if the user has installed libiconv and not disabled its use |
500 | - dnl via --without-libiconv-prefix, he wants to use it. The first |
501 | - dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. |
502 | - am_save_CPPFLAGS="$CPPFLAGS" |
503 | - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) |
504 | - |
505 | - AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ |
506 | - am_cv_func_iconv="no, consider installing GNU libiconv" |
507 | - am_cv_lib_iconv=no |
508 | - AC_LINK_IFELSE( |
509 | - [AC_LANG_PROGRAM( |
510 | - [[ |
511 | -#include <stdlib.h> |
512 | -#include <iconv.h> |
513 | - ]], |
514 | - [[iconv_t cd = iconv_open("",""); |
515 | - iconv(cd,NULL,NULL,NULL,NULL); |
516 | - iconv_close(cd);]])], |
517 | - [am_cv_func_iconv=yes]) |
518 | - if test "$am_cv_func_iconv" != yes; then |
519 | - am_save_LIBS="$LIBS" |
520 | - LIBS="$LIBS $LIBICONV" |
521 | - AC_LINK_IFELSE( |
522 | - [AC_LANG_PROGRAM( |
523 | - [[ |
524 | -#include <stdlib.h> |
525 | -#include <iconv.h> |
526 | - ]], |
527 | - [[iconv_t cd = iconv_open("",""); |
528 | - iconv(cd,NULL,NULL,NULL,NULL); |
529 | - iconv_close(cd);]])], |
530 | - [am_cv_lib_iconv=yes] |
531 | - [am_cv_func_iconv=yes]) |
532 | - LIBS="$am_save_LIBS" |
533 | - fi |
534 | - ]) |
535 | - if test "$am_cv_func_iconv" = yes; then |
536 | - AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ |
537 | - dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, |
538 | - dnl Solaris 10. |
539 | - am_save_LIBS="$LIBS" |
540 | - if test $am_cv_lib_iconv = yes; then |
541 | - LIBS="$LIBS $LIBICONV" |
542 | - fi |
543 | - AC_RUN_IFELSE( |
544 | - [AC_LANG_SOURCE([[ |
545 | -#include <iconv.h> |
546 | -#include <string.h> |
547 | -int main () |
548 | -{ |
549 | - int result = 0; |
550 | - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful |
551 | - returns. */ |
552 | - { |
553 | - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); |
554 | - if (cd_utf8_to_88591 != (iconv_t)(-1)) |
555 | - { |
556 | - static const char input[] = "\342\202\254"; /* EURO SIGN */ |
557 | - char buf[10]; |
558 | - const char *inptr = input; |
559 | - size_t inbytesleft = strlen (input); |
560 | - char *outptr = buf; |
561 | - size_t outbytesleft = sizeof (buf); |
562 | - size_t res = iconv (cd_utf8_to_88591, |
563 | - (char **) &inptr, &inbytesleft, |
564 | - &outptr, &outbytesleft); |
565 | - if (res == 0) |
566 | - result |= 1; |
567 | - iconv_close (cd_utf8_to_88591); |
568 | - } |
569 | - } |
570 | - /* Test against Solaris 10 bug: Failures are not distinguishable from |
571 | - successful returns. */ |
572 | - { |
573 | - iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); |
574 | - if (cd_ascii_to_88591 != (iconv_t)(-1)) |
575 | - { |
576 | - static const char input[] = "\263"; |
577 | - char buf[10]; |
578 | - const char *inptr = input; |
579 | - size_t inbytesleft = strlen (input); |
580 | - char *outptr = buf; |
581 | - size_t outbytesleft = sizeof (buf); |
582 | - size_t res = iconv (cd_ascii_to_88591, |
583 | - (char **) &inptr, &inbytesleft, |
584 | - &outptr, &outbytesleft); |
585 | - if (res == 0) |
586 | - result |= 2; |
587 | - iconv_close (cd_ascii_to_88591); |
588 | - } |
589 | - } |
590 | - /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ |
591 | - { |
592 | - iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); |
593 | - if (cd_88591_to_utf8 != (iconv_t)(-1)) |
594 | - { |
595 | - static const char input[] = "\304"; |
596 | - static char buf[2] = { (char)0xDE, (char)0xAD }; |
597 | - const char *inptr = input; |
598 | - size_t inbytesleft = 1; |
599 | - char *outptr = buf; |
600 | - size_t outbytesleft = 1; |
601 | - size_t res = iconv (cd_88591_to_utf8, |
602 | - (char **) &inptr, &inbytesleft, |
603 | - &outptr, &outbytesleft); |
604 | - if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) |
605 | - result |= 4; |
606 | - iconv_close (cd_88591_to_utf8); |
607 | - } |
608 | - } |
609 | -#if 0 /* This bug could be worked around by the caller. */ |
610 | - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ |
611 | - { |
612 | - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); |
613 | - if (cd_88591_to_utf8 != (iconv_t)(-1)) |
614 | - { |
615 | - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; |
616 | - char buf[50]; |
617 | - const char *inptr = input; |
618 | - size_t inbytesleft = strlen (input); |
619 | - char *outptr = buf; |
620 | - size_t outbytesleft = sizeof (buf); |
621 | - size_t res = iconv (cd_88591_to_utf8, |
622 | - (char **) &inptr, &inbytesleft, |
623 | - &outptr, &outbytesleft); |
624 | - if ((int)res > 0) |
625 | - result |= 8; |
626 | - iconv_close (cd_88591_to_utf8); |
627 | - } |
628 | - } |
629 | -#endif |
630 | - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is |
631 | - provided. */ |
632 | - if (/* Try standardized names. */ |
633 | - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) |
634 | - /* Try IRIX, OSF/1 names. */ |
635 | - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) |
636 | - /* Try AIX names. */ |
637 | - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) |
638 | - /* Try HP-UX names. */ |
639 | - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) |
640 | - result |= 16; |
641 | - return result; |
642 | -}]])], |
643 | - [am_cv_func_iconv_works=yes], |
644 | - [am_cv_func_iconv_works=no], |
645 | - [ |
646 | -changequote(,)dnl |
647 | - case "$host_os" in |
648 | - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; |
649 | - *) am_cv_func_iconv_works="guessing yes" ;; |
650 | - esac |
651 | -changequote([,])dnl |
652 | - ]) |
653 | - LIBS="$am_save_LIBS" |
654 | - ]) |
655 | - case "$am_cv_func_iconv_works" in |
656 | - *no) am_func_iconv=no am_cv_lib_iconv=no ;; |
657 | - *) am_func_iconv=yes ;; |
658 | - esac |
659 | - else |
660 | - am_func_iconv=no am_cv_lib_iconv=no |
661 | - fi |
662 | - if test "$am_func_iconv" = yes; then |
663 | - AC_DEFINE([HAVE_ICONV], [1], |
664 | - [Define if you have the iconv() function and it works.]) |
665 | - fi |
666 | - if test "$am_cv_lib_iconv" = yes; then |
667 | - AC_MSG_CHECKING([how to link with libiconv]) |
668 | - AC_MSG_RESULT([$LIBICONV]) |
669 | - else |
670 | - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV |
671 | - dnl either. |
672 | - CPPFLAGS="$am_save_CPPFLAGS" |
673 | - LIBICONV= |
674 | - LTLIBICONV= |
675 | - fi |
676 | - AC_SUBST([LIBICONV]) |
677 | - AC_SUBST([LTLIBICONV]) |
678 | -]) |
679 | - |
680 | -dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to |
681 | -dnl avoid warnings like |
682 | -dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". |
683 | -dnl This is tricky because of the way 'aclocal' is implemented: |
684 | -dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. |
685 | -dnl Otherwise aclocal's initial scan pass would miss the macro definition. |
686 | -dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. |
687 | -dnl Otherwise aclocal would emit many "Use of uninitialized value $1" |
688 | -dnl warnings. |
689 | -m4_define([gl_iconv_AC_DEFUN], |
690 | - m4_version_prereq([2.64], |
691 | - [[AC_DEFUN_ONCE( |
692 | - [$1], [$2])]], |
693 | - [m4_ifdef([gl_00GNULIB], |
694 | - [[AC_DEFUN_ONCE( |
695 | - [$1], [$2])]], |
696 | - [[AC_DEFUN( |
697 | - [$1], [$2])]])])) |
698 | -gl_iconv_AC_DEFUN([AM_ICONV], |
699 | -[ |
700 | - AM_ICONV_LINK |
701 | - if test "$am_cv_func_iconv" = yes; then |
702 | - AC_MSG_CHECKING([for iconv declaration]) |
703 | - AC_CACHE_VAL([am_cv_proto_iconv], [ |
704 | - AC_COMPILE_IFELSE( |
705 | - [AC_LANG_PROGRAM( |
706 | - [[ |
707 | -#include <stdlib.h> |
708 | -#include <iconv.h> |
709 | -extern |
710 | -#ifdef __cplusplus |
711 | -"C" |
712 | -#endif |
713 | -#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) |
714 | -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); |
715 | -#else |
716 | -size_t iconv(); |
717 | -#endif |
718 | - ]], |
719 | - [[]])], |
720 | - [am_cv_proto_iconv_arg1=""], |
721 | - [am_cv_proto_iconv_arg1="const"]) |
722 | - 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);"]) |
723 | - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` |
724 | - AC_MSG_RESULT([ |
725 | - $am_cv_proto_iconv]) |
726 | - AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], |
727 | - [Define as const if the declaration of iconv() needs const.]) |
728 | - dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>. |
729 | - m4_ifdef([gl_ICONV_H_DEFAULTS], |
730 | - [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) |
731 | - if test -n "$am_cv_proto_iconv_arg1"; then |
732 | - ICONV_CONST="const" |
733 | - fi |
734 | - ]) |
735 | - fi |
736 | -]) |
737 | - |
738 | -# intlmacosx.m4 serial 5 (gettext-0.18.2) |
739 | -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. |
740 | -dnl This file is free software; the Free Software Foundation |
741 | -dnl gives unlimited permission to copy and/or distribute it, |
742 | -dnl with or without modifications, as long as this notice is preserved. |
743 | -dnl |
744 | -dnl This file can can be used in projects which are not available under |
745 | -dnl the GNU General Public License or the GNU Library General Public |
746 | -dnl License but which still want to provide support for the GNU gettext |
747 | -dnl functionality. |
748 | -dnl Please note that the actual code of the GNU gettext library is covered |
749 | -dnl by the GNU Library General Public License, and the rest of the GNU |
750 | -dnl gettext package package is covered by the GNU General Public License. |
751 | -dnl They are *not* in the public domain. |
752 | - |
753 | -dnl Checks for special options needed on Mac OS X. |
754 | -dnl Defines INTL_MACOSX_LIBS. |
755 | -AC_DEFUN([gt_INTL_MACOSX], |
756 | -[ |
757 | - dnl Check for API introduced in Mac OS X 10.2. |
758 | - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], |
759 | - [gt_cv_func_CFPreferencesCopyAppValue], |
760 | - [gt_save_LIBS="$LIBS" |
761 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
762 | - AC_LINK_IFELSE( |
763 | - [AC_LANG_PROGRAM( |
764 | - [[#include <CoreFoundation/CFPreferences.h>]], |
765 | - [[CFPreferencesCopyAppValue(NULL, NULL)]])], |
766 | - [gt_cv_func_CFPreferencesCopyAppValue=yes], |
767 | - [gt_cv_func_CFPreferencesCopyAppValue=no]) |
768 | - LIBS="$gt_save_LIBS"]) |
769 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
770 | - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], |
771 | - [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) |
772 | - fi |
773 | - dnl Check for API introduced in Mac OS X 10.3. |
774 | - AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], |
775 | - [gt_save_LIBS="$LIBS" |
776 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
777 | - AC_LINK_IFELSE( |
778 | - [AC_LANG_PROGRAM( |
779 | - [[#include <CoreFoundation/CFLocale.h>]], |
780 | - [[CFLocaleCopyCurrent();]])], |
781 | - [gt_cv_func_CFLocaleCopyCurrent=yes], |
782 | - [gt_cv_func_CFLocaleCopyCurrent=no]) |
783 | - LIBS="$gt_save_LIBS"]) |
784 | - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
785 | - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], |
786 | - [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) |
787 | - fi |
788 | - INTL_MACOSX_LIBS= |
789 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
790 | - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
791 | - fi |
792 | - AC_SUBST([INTL_MACOSX_LIBS]) |
793 | -]) |
794 | - |
795 | |
796 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) |
797 | # serial 42 IT_PROG_INTLTOOL |
798 | @@ -963,1162 +235,6 @@ |
799 | # AC_DEFUN([AC_PROG_INTLTOOL], ...) |
800 | |
801 | |
802 | -# lib-ld.m4 serial 6 |
803 | -dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc. |
804 | -dnl This file is free software; the Free Software Foundation |
805 | -dnl gives unlimited permission to copy and/or distribute it, |
806 | -dnl with or without modifications, as long as this notice is preserved. |
807 | - |
808 | -dnl Subroutines of libtool.m4, |
809 | -dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid |
810 | -dnl collision with libtool.m4. |
811 | - |
812 | -dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. |
813 | -AC_DEFUN([AC_LIB_PROG_LD_GNU], |
814 | -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], |
815 | -[# I'd rather use --version here, but apparently some GNU lds only accept -v. |
816 | -case `$LD -v 2>&1 </dev/null` in |
817 | -*GNU* | *'with BFD'*) |
818 | - acl_cv_prog_gnu_ld=yes |
819 | - ;; |
820 | -*) |
821 | - acl_cv_prog_gnu_ld=no |
822 | - ;; |
823 | -esac]) |
824 | -with_gnu_ld=$acl_cv_prog_gnu_ld |
825 | -]) |
826 | - |
827 | -dnl From libtool-2.4. Sets the variable LD. |
828 | -AC_DEFUN([AC_LIB_PROG_LD], |
829 | -[AC_REQUIRE([AC_PROG_CC])dnl |
830 | -AC_REQUIRE([AC_CANONICAL_HOST])dnl |
831 | - |
832 | -AC_ARG_WITH([gnu-ld], |
833 | - [AS_HELP_STRING([--with-gnu-ld], |
834 | - [assume the C compiler uses GNU ld [default=no]])], |
835 | - [test "$withval" = no || with_gnu_ld=yes], |
836 | - [with_gnu_ld=no])dnl |
837 | - |
838 | -# Prepare PATH_SEPARATOR. |
839 | -# The user is always right. |
840 | -if test "${PATH_SEPARATOR+set}" != set; then |
841 | - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which |
842 | - # contains only /bin. Note that ksh looks also at the FPATH variable, |
843 | - # so we have to set that as well for the test. |
844 | - PATH_SEPARATOR=: |
845 | - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
846 | - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
847 | - || PATH_SEPARATOR=';' |
848 | - } |
849 | -fi |
850 | - |
851 | -ac_prog=ld |
852 | -if test "$GCC" = yes; then |
853 | - # Check if gcc -print-prog-name=ld gives a path. |
854 | - AC_MSG_CHECKING([for ld used by $CC]) |
855 | - case $host in |
856 | - *-*-mingw*) |
857 | - # gcc leaves a trailing carriage return which upsets mingw |
858 | - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; |
859 | - *) |
860 | - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; |
861 | - esac |
862 | - case $ac_prog in |
863 | - # Accept absolute paths. |
864 | - [[\\/]]* | ?:[[\\/]]*) |
865 | - re_direlt='/[[^/]][[^/]]*/\.\./' |
866 | - # Canonicalize the pathname of ld |
867 | - ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` |
868 | - while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do |
869 | - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` |
870 | - done |
871 | - test -z "$LD" && LD="$ac_prog" |
872 | - ;; |
873 | - "") |
874 | - # If it fails, then pretend we aren't using GCC. |
875 | - ac_prog=ld |
876 | - ;; |
877 | - *) |
878 | - # If it is relative, then search for the first ld in PATH. |
879 | - with_gnu_ld=unknown |
880 | - ;; |
881 | - esac |
882 | -elif test "$with_gnu_ld" = yes; then |
883 | - AC_MSG_CHECKING([for GNU ld]) |
884 | -else |
885 | - AC_MSG_CHECKING([for non-GNU ld]) |
886 | -fi |
887 | -AC_CACHE_VAL([acl_cv_path_LD], |
888 | -[if test -z "$LD"; then |
889 | - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
890 | - for ac_dir in $PATH; do |
891 | - IFS="$acl_save_ifs" |
892 | - test -z "$ac_dir" && ac_dir=. |
893 | - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
894 | - acl_cv_path_LD="$ac_dir/$ac_prog" |
895 | - # Check to see if the program is GNU ld. I'd rather use --version, |
896 | - # but apparently some variants of GNU ld only accept -v. |
897 | - # Break only if it was the GNU/non-GNU ld that we prefer. |
898 | - case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in |
899 | - *GNU* | *'with BFD'*) |
900 | - test "$with_gnu_ld" != no && break |
901 | - ;; |
902 | - *) |
903 | - test "$with_gnu_ld" != yes && break |
904 | - ;; |
905 | - esac |
906 | - fi |
907 | - done |
908 | - IFS="$acl_save_ifs" |
909 | -else |
910 | - acl_cv_path_LD="$LD" # Let the user override the test with a path. |
911 | -fi]) |
912 | -LD="$acl_cv_path_LD" |
913 | -if test -n "$LD"; then |
914 | - AC_MSG_RESULT([$LD]) |
915 | -else |
916 | - AC_MSG_RESULT([no]) |
917 | -fi |
918 | -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) |
919 | -AC_LIB_PROG_LD_GNU |
920 | -]) |
921 | - |
922 | -# lib-link.m4 serial 26 (gettext-0.18.2) |
923 | -dnl Copyright (C) 2001-2013 Free Software Foundation, Inc. |
924 | -dnl This file is free software; the Free Software Foundation |
925 | -dnl gives unlimited permission to copy and/or distribute it, |
926 | -dnl with or without modifications, as long as this notice is preserved. |
927 | - |
928 | -dnl From Bruno Haible. |
929 | - |
930 | -AC_PREREQ([2.54]) |
931 | - |
932 | -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and |
933 | -dnl the libraries corresponding to explicit and implicit dependencies. |
934 | -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and |
935 | -dnl augments the CPPFLAGS variable. |
936 | -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname |
937 | -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
938 | -AC_DEFUN([AC_LIB_LINKFLAGS], |
939 | -[ |
940 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
941 | - AC_REQUIRE([AC_LIB_RPATH]) |
942 | - pushdef([Name],[m4_translit([$1],[./+-], [____])]) |
943 | - pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], |
944 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
945 | - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ |
946 | - AC_LIB_LINKFLAGS_BODY([$1], [$2]) |
947 | - ac_cv_lib[]Name[]_libs="$LIB[]NAME" |
948 | - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" |
949 | - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" |
950 | - ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" |
951 | - ]) |
952 | - LIB[]NAME="$ac_cv_lib[]Name[]_libs" |
953 | - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" |
954 | - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" |
955 | - LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" |
956 | - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) |
957 | - AC_SUBST([LIB]NAME) |
958 | - AC_SUBST([LTLIB]NAME) |
959 | - AC_SUBST([LIB]NAME[_PREFIX]) |
960 | - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the |
961 | - dnl results of this search when this library appears as a dependency. |
962 | - HAVE_LIB[]NAME=yes |
963 | - popdef([NAME]) |
964 | - popdef([Name]) |
965 | -]) |
966 | - |
967 | -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) |
968 | -dnl searches for libname and the libraries corresponding to explicit and |
969 | -dnl implicit dependencies, together with the specified include files and |
970 | -dnl the ability to compile and link the specified testcode. The missing-message |
971 | -dnl defaults to 'no' and may contain additional hints for the user. |
972 | -dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} |
973 | -dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and |
974 | -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs |
975 | -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. |
976 | -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname |
977 | -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
978 | -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], |
979 | -[ |
980 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
981 | - AC_REQUIRE([AC_LIB_RPATH]) |
982 | - pushdef([Name],[m4_translit([$1],[./+-], [____])]) |
983 | - pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], |
984 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
985 | - |
986 | - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME |
987 | - dnl accordingly. |
988 | - AC_LIB_LINKFLAGS_BODY([$1], [$2]) |
989 | - |
990 | - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, |
991 | - dnl because if the user has installed lib[]Name and not disabled its use |
992 | - dnl via --without-lib[]Name-prefix, he wants to use it. |
993 | - ac_save_CPPFLAGS="$CPPFLAGS" |
994 | - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) |
995 | - |
996 | - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ |
997 | - ac_save_LIBS="$LIBS" |
998 | - dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, |
999 | - dnl because these -l options might require -L options that are present in |
1000 | - dnl LIBS. -l options benefit only from the -L options listed before it. |
1001 | - dnl Otherwise, add it to the front of LIBS, because it may be a static |
1002 | - dnl library that depends on another static library that is present in LIBS. |
1003 | - dnl Static libraries benefit only from the static libraries listed after |
1004 | - dnl it. |
1005 | - case " $LIB[]NAME" in |
1006 | - *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; |
1007 | - *) LIBS="$LIB[]NAME $LIBS" ;; |
1008 | - esac |
1009 | - AC_LINK_IFELSE( |
1010 | - [AC_LANG_PROGRAM([[$3]], [[$4]])], |
1011 | - [ac_cv_lib[]Name=yes], |
1012 | - [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) |
1013 | - LIBS="$ac_save_LIBS" |
1014 | - ]) |
1015 | - if test "$ac_cv_lib[]Name" = yes; then |
1016 | - HAVE_LIB[]NAME=yes |
1017 | - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) |
1018 | - AC_MSG_CHECKING([how to link with lib[]$1]) |
1019 | - AC_MSG_RESULT([$LIB[]NAME]) |
1020 | - else |
1021 | - HAVE_LIB[]NAME=no |
1022 | - dnl If $LIB[]NAME didn't lead to a usable library, we don't need |
1023 | - dnl $INC[]NAME either. |
1024 | - CPPFLAGS="$ac_save_CPPFLAGS" |
1025 | - LIB[]NAME= |
1026 | - LTLIB[]NAME= |
1027 | - LIB[]NAME[]_PREFIX= |
1028 | - fi |
1029 | - AC_SUBST([HAVE_LIB]NAME) |
1030 | - AC_SUBST([LIB]NAME) |
1031 | - AC_SUBST([LTLIB]NAME) |
1032 | - AC_SUBST([LIB]NAME[_PREFIX]) |
1033 | - popdef([NAME]) |
1034 | - popdef([Name]) |
1035 | -]) |
1036 | - |
1037 | -dnl Determine the platform dependent parameters needed to use rpath: |
1038 | -dnl acl_libext, |
1039 | -dnl acl_shlibext, |
1040 | -dnl acl_libname_spec, |
1041 | -dnl acl_library_names_spec, |
1042 | -dnl acl_hardcode_libdir_flag_spec, |
1043 | -dnl acl_hardcode_libdir_separator, |
1044 | -dnl acl_hardcode_direct, |
1045 | -dnl acl_hardcode_minus_L. |
1046 | -AC_DEFUN([AC_LIB_RPATH], |
1047 | -[ |
1048 | - dnl Tell automake >= 1.10 to complain if config.rpath is missing. |
1049 | - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) |
1050 | - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS |
1051 | - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld |
1052 | - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host |
1053 | - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir |
1054 | - AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ |
1055 | - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ |
1056 | - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh |
1057 | - . ./conftest.sh |
1058 | - rm -f ./conftest.sh |
1059 | - acl_cv_rpath=done |
1060 | - ]) |
1061 | - wl="$acl_cv_wl" |
1062 | - acl_libext="$acl_cv_libext" |
1063 | - acl_shlibext="$acl_cv_shlibext" |
1064 | - acl_libname_spec="$acl_cv_libname_spec" |
1065 | - acl_library_names_spec="$acl_cv_library_names_spec" |
1066 | - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
1067 | - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
1068 | - acl_hardcode_direct="$acl_cv_hardcode_direct" |
1069 | - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" |
1070 | - dnl Determine whether the user wants rpath handling at all. |
1071 | - AC_ARG_ENABLE([rpath], |
1072 | - [ --disable-rpath do not hardcode runtime library paths], |
1073 | - :, enable_rpath=yes) |
1074 | -]) |
1075 | - |
1076 | -dnl AC_LIB_FROMPACKAGE(name, package) |
1077 | -dnl declares that libname comes from the given package. The configure file |
1078 | -dnl will then not have a --with-libname-prefix option but a |
1079 | -dnl --with-package-prefix option. Several libraries can come from the same |
1080 | -dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar |
1081 | -dnl macro call that searches for libname. |
1082 | -AC_DEFUN([AC_LIB_FROMPACKAGE], |
1083 | -[ |
1084 | - pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], |
1085 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1086 | - define([acl_frompackage_]NAME, [$2]) |
1087 | - popdef([NAME]) |
1088 | - pushdef([PACK],[$2]) |
1089 | - pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], |
1090 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1091 | - define([acl_libsinpackage_]PACKUP, |
1092 | - m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) |
1093 | - popdef([PACKUP]) |
1094 | - popdef([PACK]) |
1095 | -]) |
1096 | - |
1097 | -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and |
1098 | -dnl the libraries corresponding to explicit and implicit dependencies. |
1099 | -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. |
1100 | -dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found |
1101 | -dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
1102 | -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
1103 | -[ |
1104 | - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
1105 | - pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], |
1106 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1107 | - pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) |
1108 | - pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], |
1109 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1110 | - pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) |
1111 | - dnl Autoconf >= 2.61 supports dots in --with options. |
1112 | - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) |
1113 | - dnl By default, look in $includedir and $libdir. |
1114 | - use_additional=yes |
1115 | - AC_LIB_WITH_FINAL_PREFIX([ |
1116 | - eval additional_includedir=\"$includedir\" |
1117 | - eval additional_libdir=\"$libdir\" |
1118 | - ]) |
1119 | - AC_ARG_WITH(P_A_C_K[-prefix], |
1120 | -[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib |
1121 | - --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], |
1122 | -[ |
1123 | - if test "X$withval" = "Xno"; then |
1124 | - use_additional=no |
1125 | - else |
1126 | - if test "X$withval" = "X"; then |
1127 | - AC_LIB_WITH_FINAL_PREFIX([ |
1128 | - eval additional_includedir=\"$includedir\" |
1129 | - eval additional_libdir=\"$libdir\" |
1130 | - ]) |
1131 | - else |
1132 | - additional_includedir="$withval/include" |
1133 | - additional_libdir="$withval/$acl_libdirstem" |
1134 | - if test "$acl_libdirstem2" != "$acl_libdirstem" \ |
1135 | - && ! test -d "$withval/$acl_libdirstem"; then |
1136 | - additional_libdir="$withval/$acl_libdirstem2" |
1137 | - fi |
1138 | - fi |
1139 | - fi |
1140 | -]) |
1141 | - dnl Search the library and its dependencies in $additional_libdir and |
1142 | - dnl $LDFLAGS. Using breadth-first-seach. |
1143 | - LIB[]NAME= |
1144 | - LTLIB[]NAME= |
1145 | - INC[]NAME= |
1146 | - LIB[]NAME[]_PREFIX= |
1147 | - dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been |
1148 | - dnl computed. So it has to be reset here. |
1149 | - HAVE_LIB[]NAME= |
1150 | - rpathdirs= |
1151 | - ltrpathdirs= |
1152 | - names_already_handled= |
1153 | - names_next_round='$1 $2' |
1154 | - while test -n "$names_next_round"; do |
1155 | - names_this_round="$names_next_round" |
1156 | - names_next_round= |
1157 | - for name in $names_this_round; do |
1158 | - already_handled= |
1159 | - for n in $names_already_handled; do |
1160 | - if test "$n" = "$name"; then |
1161 | - already_handled=yes |
1162 | - break |
1163 | - fi |
1164 | - done |
1165 | - if test -z "$already_handled"; then |
1166 | - names_already_handled="$names_already_handled $name" |
1167 | - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS |
1168 | - dnl or AC_LIB_HAVE_LINKFLAGS call. |
1169 | - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` |
1170 | - eval value=\"\$HAVE_LIB$uppername\" |
1171 | - if test -n "$value"; then |
1172 | - if test "$value" = yes; then |
1173 | - eval value=\"\$LIB$uppername\" |
1174 | - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" |
1175 | - eval value=\"\$LTLIB$uppername\" |
1176 | - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" |
1177 | - else |
1178 | - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined |
1179 | - dnl that this library doesn't exist. So just drop it. |
1180 | - : |
1181 | - fi |
1182 | - else |
1183 | - dnl Search the library lib$name in $additional_libdir and $LDFLAGS |
1184 | - dnl and the already constructed $LIBNAME/$LTLIBNAME. |
1185 | - found_dir= |
1186 | - found_la= |
1187 | - found_so= |
1188 | - found_a= |
1189 | - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name |
1190 | - if test -n "$acl_shlibext"; then |
1191 | - shrext=".$acl_shlibext" # typically: shrext=.so |
1192 | - else |
1193 | - shrext= |
1194 | - fi |
1195 | - if test $use_additional = yes; then |
1196 | - dir="$additional_libdir" |
1197 | - dnl The same code as in the loop below: |
1198 | - dnl First look for a shared library. |
1199 | - if test -n "$acl_shlibext"; then |
1200 | - if test -f "$dir/$libname$shrext"; then |
1201 | - found_dir="$dir" |
1202 | - found_so="$dir/$libname$shrext" |
1203 | - else |
1204 | - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
1205 | - ver=`(cd "$dir" && \ |
1206 | - for f in "$libname$shrext".*; do echo "$f"; done \ |
1207 | - | sed -e "s,^$libname$shrext\\\\.,," \ |
1208 | - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
1209 | - | sed 1q ) 2>/dev/null` |
1210 | - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
1211 | - found_dir="$dir" |
1212 | - found_so="$dir/$libname$shrext.$ver" |
1213 | - fi |
1214 | - else |
1215 | - eval library_names=\"$acl_library_names_spec\" |
1216 | - for f in $library_names; do |
1217 | - if test -f "$dir/$f"; then |
1218 | - found_dir="$dir" |
1219 | - found_so="$dir/$f" |
1220 | - break |
1221 | - fi |
1222 | - done |
1223 | - fi |
1224 | - fi |
1225 | - fi |
1226 | - dnl Then look for a static library. |
1227 | - if test "X$found_dir" = "X"; then |
1228 | - if test -f "$dir/$libname.$acl_libext"; then |
1229 | - found_dir="$dir" |
1230 | - found_a="$dir/$libname.$acl_libext" |
1231 | - fi |
1232 | - fi |
1233 | - if test "X$found_dir" != "X"; then |
1234 | - if test -f "$dir/$libname.la"; then |
1235 | - found_la="$dir/$libname.la" |
1236 | - fi |
1237 | - fi |
1238 | - fi |
1239 | - if test "X$found_dir" = "X"; then |
1240 | - for x in $LDFLAGS $LTLIB[]NAME; do |
1241 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
1242 | - case "$x" in |
1243 | - -L*) |
1244 | - dir=`echo "X$x" | sed -e 's/^X-L//'` |
1245 | - dnl First look for a shared library. |
1246 | - if test -n "$acl_shlibext"; then |
1247 | - if test -f "$dir/$libname$shrext"; then |
1248 | - found_dir="$dir" |
1249 | - found_so="$dir/$libname$shrext" |
1250 | - else |
1251 | - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
1252 | - ver=`(cd "$dir" && \ |
1253 | - for f in "$libname$shrext".*; do echo "$f"; done \ |
1254 | - | sed -e "s,^$libname$shrext\\\\.,," \ |
1255 | - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
1256 | - | sed 1q ) 2>/dev/null` |
1257 | - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
1258 | - found_dir="$dir" |
1259 | - found_so="$dir/$libname$shrext.$ver" |
1260 | - fi |
1261 | - else |
1262 | - eval library_names=\"$acl_library_names_spec\" |
1263 | - for f in $library_names; do |
1264 | - if test -f "$dir/$f"; then |
1265 | - found_dir="$dir" |
1266 | - found_so="$dir/$f" |
1267 | - break |
1268 | - fi |
1269 | - done |
1270 | - fi |
1271 | - fi |
1272 | - fi |
1273 | - dnl Then look for a static library. |
1274 | - if test "X$found_dir" = "X"; then |
1275 | - if test -f "$dir/$libname.$acl_libext"; then |
1276 | - found_dir="$dir" |
1277 | - found_a="$dir/$libname.$acl_libext" |
1278 | - fi |
1279 | - fi |
1280 | - if test "X$found_dir" != "X"; then |
1281 | - if test -f "$dir/$libname.la"; then |
1282 | - found_la="$dir/$libname.la" |
1283 | - fi |
1284 | - fi |
1285 | - ;; |
1286 | - esac |
1287 | - if test "X$found_dir" != "X"; then |
1288 | - break |
1289 | - fi |
1290 | - done |
1291 | - fi |
1292 | - if test "X$found_dir" != "X"; then |
1293 | - dnl Found the library. |
1294 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" |
1295 | - if test "X$found_so" != "X"; then |
1296 | - dnl Linking with a shared library. We attempt to hardcode its |
1297 | - dnl directory into the executable's runpath, unless it's the |
1298 | - dnl standard /usr/lib. |
1299 | - if test "$enable_rpath" = no \ |
1300 | - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ |
1301 | - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then |
1302 | - dnl No hardcoding is needed. |
1303 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1304 | - else |
1305 | - dnl Use an explicit option to hardcode DIR into the resulting |
1306 | - dnl binary. |
1307 | - dnl Potentially add DIR to ltrpathdirs. |
1308 | - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. |
1309 | - haveit= |
1310 | - for x in $ltrpathdirs; do |
1311 | - if test "X$x" = "X$found_dir"; then |
1312 | - haveit=yes |
1313 | - break |
1314 | - fi |
1315 | - done |
1316 | - if test -z "$haveit"; then |
1317 | - ltrpathdirs="$ltrpathdirs $found_dir" |
1318 | - fi |
1319 | - dnl The hardcoding into $LIBNAME is system dependent. |
1320 | - if test "$acl_hardcode_direct" = yes; then |
1321 | - dnl Using DIR/libNAME.so during linking hardcodes DIR into the |
1322 | - dnl resulting binary. |
1323 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1324 | - else |
1325 | - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
1326 | - dnl Use an explicit option to hardcode DIR into the resulting |
1327 | - dnl binary. |
1328 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1329 | - dnl Potentially add DIR to rpathdirs. |
1330 | - dnl The rpathdirs will be appended to $LIBNAME at the end. |
1331 | - haveit= |
1332 | - for x in $rpathdirs; do |
1333 | - if test "X$x" = "X$found_dir"; then |
1334 | - haveit=yes |
1335 | - break |
1336 | - fi |
1337 | - done |
1338 | - if test -z "$haveit"; then |
1339 | - rpathdirs="$rpathdirs $found_dir" |
1340 | - fi |
1341 | - else |
1342 | - dnl Rely on "-L$found_dir". |
1343 | - dnl But don't add it if it's already contained in the LDFLAGS |
1344 | - dnl or the already constructed $LIBNAME |
1345 | - haveit= |
1346 | - for x in $LDFLAGS $LIB[]NAME; do |
1347 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
1348 | - if test "X$x" = "X-L$found_dir"; then |
1349 | - haveit=yes |
1350 | - break |
1351 | - fi |
1352 | - done |
1353 | - if test -z "$haveit"; then |
1354 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" |
1355 | - fi |
1356 | - if test "$acl_hardcode_minus_L" != no; then |
1357 | - dnl FIXME: Not sure whether we should use |
1358 | - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" |
1359 | - dnl here. |
1360 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
1361 | - else |
1362 | - dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH |
1363 | - dnl here, because this doesn't fit in flags passed to the |
1364 | - dnl compiler. So give up. No hardcoding. This affects only |
1365 | - dnl very old systems. |
1366 | - dnl FIXME: Not sure whether we should use |
1367 | - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" |
1368 | - dnl here. |
1369 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" |
1370 | - fi |
1371 | - fi |
1372 | - fi |
1373 | - fi |
1374 | - else |
1375 | - if test "X$found_a" != "X"; then |
1376 | - dnl Linking with a static library. |
1377 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" |
1378 | - else |
1379 | - dnl We shouldn't come here, but anyway it's good to have a |
1380 | - dnl fallback. |
1381 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" |
1382 | - fi |
1383 | - fi |
1384 | - dnl Assume the include files are nearby. |
1385 | - additional_includedir= |
1386 | - case "$found_dir" in |
1387 | - */$acl_libdirstem | */$acl_libdirstem/) |
1388 | - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` |
1389 | - if test "$name" = '$1'; then |
1390 | - LIB[]NAME[]_PREFIX="$basedir" |
1391 | - fi |
1392 | - additional_includedir="$basedir/include" |
1393 | - ;; |
1394 | - */$acl_libdirstem2 | */$acl_libdirstem2/) |
1395 | - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` |
1396 | - if test "$name" = '$1'; then |
1397 | - LIB[]NAME[]_PREFIX="$basedir" |
1398 | - fi |
1399 | - additional_includedir="$basedir/include" |
1400 | - ;; |
1401 | - esac |
1402 | - if test "X$additional_includedir" != "X"; then |
1403 | - dnl Potentially add $additional_includedir to $INCNAME. |
1404 | - dnl But don't add it |
1405 | - dnl 1. if it's the standard /usr/include, |
1406 | - dnl 2. if it's /usr/local/include and we are using GCC on Linux, |
1407 | - dnl 3. if it's already present in $CPPFLAGS or the already |
1408 | - dnl constructed $INCNAME, |
1409 | - dnl 4. if it doesn't exist as a directory. |
1410 | - if test "X$additional_includedir" != "X/usr/include"; then |
1411 | - haveit= |
1412 | - if test "X$additional_includedir" = "X/usr/local/include"; then |
1413 | - if test -n "$GCC"; then |
1414 | - case $host_os in |
1415 | - linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
1416 | - esac |
1417 | - fi |
1418 | - fi |
1419 | - if test -z "$haveit"; then |
1420 | - for x in $CPPFLAGS $INC[]NAME; do |
1421 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
1422 | - if test "X$x" = "X-I$additional_includedir"; then |
1423 | - haveit=yes |
1424 | - break |
1425 | - fi |
1426 | - done |
1427 | - if test -z "$haveit"; then |
1428 | - if test -d "$additional_includedir"; then |
1429 | - dnl Really add $additional_includedir to $INCNAME. |
1430 | - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" |
1431 | - fi |
1432 | - fi |
1433 | - fi |
1434 | - fi |
1435 | - fi |
1436 | - dnl Look for dependencies. |
1437 | - if test -n "$found_la"; then |
1438 | - dnl Read the .la file. It defines the variables |
1439 | - dnl dlname, library_names, old_library, dependency_libs, current, |
1440 | - dnl age, revision, installed, dlopen, dlpreopen, libdir. |
1441 | - save_libdir="$libdir" |
1442 | - case "$found_la" in |
1443 | - */* | *\\*) . "$found_la" ;; |
1444 | - *) . "./$found_la" ;; |
1445 | - esac |
1446 | - libdir="$save_libdir" |
1447 | - dnl We use only dependency_libs. |
1448 | - for dep in $dependency_libs; do |
1449 | - case "$dep" in |
1450 | - -L*) |
1451 | - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` |
1452 | - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. |
1453 | - dnl But don't add it |
1454 | - dnl 1. if it's the standard /usr/lib, |
1455 | - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, |
1456 | - dnl 3. if it's already present in $LDFLAGS or the already |
1457 | - dnl constructed $LIBNAME, |
1458 | - dnl 4. if it doesn't exist as a directory. |
1459 | - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ |
1460 | - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then |
1461 | - haveit= |
1462 | - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ |
1463 | - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then |
1464 | - if test -n "$GCC"; then |
1465 | - case $host_os in |
1466 | - linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
1467 | - esac |
1468 | - fi |
1469 | - fi |
1470 | - if test -z "$haveit"; then |
1471 | - haveit= |
1472 | - for x in $LDFLAGS $LIB[]NAME; do |
1473 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
1474 | - if test "X$x" = "X-L$additional_libdir"; then |
1475 | - haveit=yes |
1476 | - break |
1477 | - fi |
1478 | - done |
1479 | - if test -z "$haveit"; then |
1480 | - if test -d "$additional_libdir"; then |
1481 | - dnl Really add $additional_libdir to $LIBNAME. |
1482 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" |
1483 | - fi |
1484 | - fi |
1485 | - haveit= |
1486 | - for x in $LDFLAGS $LTLIB[]NAME; do |
1487 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
1488 | - if test "X$x" = "X-L$additional_libdir"; then |
1489 | - haveit=yes |
1490 | - break |
1491 | - fi |
1492 | - done |
1493 | - if test -z "$haveit"; then |
1494 | - if test -d "$additional_libdir"; then |
1495 | - dnl Really add $additional_libdir to $LTLIBNAME. |
1496 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" |
1497 | - fi |
1498 | - fi |
1499 | - fi |
1500 | - fi |
1501 | - ;; |
1502 | - -R*) |
1503 | - dir=`echo "X$dep" | sed -e 's/^X-R//'` |
1504 | - if test "$enable_rpath" != no; then |
1505 | - dnl Potentially add DIR to rpathdirs. |
1506 | - dnl The rpathdirs will be appended to $LIBNAME at the end. |
1507 | - haveit= |
1508 | - for x in $rpathdirs; do |
1509 | - if test "X$x" = "X$dir"; then |
1510 | - haveit=yes |
1511 | - break |
1512 | - fi |
1513 | - done |
1514 | - if test -z "$haveit"; then |
1515 | - rpathdirs="$rpathdirs $dir" |
1516 | - fi |
1517 | - dnl Potentially add DIR to ltrpathdirs. |
1518 | - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. |
1519 | - haveit= |
1520 | - for x in $ltrpathdirs; do |
1521 | - if test "X$x" = "X$dir"; then |
1522 | - haveit=yes |
1523 | - break |
1524 | - fi |
1525 | - done |
1526 | - if test -z "$haveit"; then |
1527 | - ltrpathdirs="$ltrpathdirs $dir" |
1528 | - fi |
1529 | - fi |
1530 | - ;; |
1531 | - -l*) |
1532 | - dnl Handle this in the next round. |
1533 | - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` |
1534 | - ;; |
1535 | - *.la) |
1536 | - dnl Handle this in the next round. Throw away the .la's |
1537 | - dnl directory; it is already contained in a preceding -L |
1538 | - dnl option. |
1539 | - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` |
1540 | - ;; |
1541 | - *) |
1542 | - dnl Most likely an immediate library name. |
1543 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" |
1544 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" |
1545 | - ;; |
1546 | - esac |
1547 | - done |
1548 | - fi |
1549 | - else |
1550 | - dnl Didn't find the library; assume it is in the system directories |
1551 | - dnl known to the linker and runtime loader. (All the system |
1552 | - dnl directories known to the linker should also be known to the |
1553 | - dnl runtime loader, otherwise the system is severely misconfigured.) |
1554 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" |
1555 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" |
1556 | - fi |
1557 | - fi |
1558 | - fi |
1559 | - done |
1560 | - done |
1561 | - if test "X$rpathdirs" != "X"; then |
1562 | - if test -n "$acl_hardcode_libdir_separator"; then |
1563 | - dnl Weird platform: only the last -rpath option counts, the user must |
1564 | - dnl pass all path elements in one option. We can arrange that for a |
1565 | - dnl single library, but not when more than one $LIBNAMEs are used. |
1566 | - alldirs= |
1567 | - for found_dir in $rpathdirs; do |
1568 | - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" |
1569 | - done |
1570 | - dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. |
1571 | - acl_save_libdir="$libdir" |
1572 | - libdir="$alldirs" |
1573 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1574 | - libdir="$acl_save_libdir" |
1575 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" |
1576 | - else |
1577 | - dnl The -rpath options are cumulative. |
1578 | - for found_dir in $rpathdirs; do |
1579 | - acl_save_libdir="$libdir" |
1580 | - libdir="$found_dir" |
1581 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1582 | - libdir="$acl_save_libdir" |
1583 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" |
1584 | - done |
1585 | - fi |
1586 | - fi |
1587 | - if test "X$ltrpathdirs" != "X"; then |
1588 | - dnl When using libtool, the option that works for both libraries and |
1589 | - dnl executables is -R. The -R options are cumulative. |
1590 | - for found_dir in $ltrpathdirs; do |
1591 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" |
1592 | - done |
1593 | - fi |
1594 | - popdef([P_A_C_K]) |
1595 | - popdef([PACKLIBS]) |
1596 | - popdef([PACKUP]) |
1597 | - popdef([PACK]) |
1598 | - popdef([NAME]) |
1599 | -]) |
1600 | - |
1601 | -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, |
1602 | -dnl unless already present in VAR. |
1603 | -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes |
1604 | -dnl contains two or three consecutive elements that belong together. |
1605 | -AC_DEFUN([AC_LIB_APPENDTOVAR], |
1606 | -[ |
1607 | - for element in [$2]; do |
1608 | - haveit= |
1609 | - for x in $[$1]; do |
1610 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
1611 | - if test "X$x" = "X$element"; then |
1612 | - haveit=yes |
1613 | - break |
1614 | - fi |
1615 | - done |
1616 | - if test -z "$haveit"; then |
1617 | - [$1]="${[$1]}${[$1]:+ }$element" |
1618 | - fi |
1619 | - done |
1620 | -]) |
1621 | - |
1622 | -dnl For those cases where a variable contains several -L and -l options |
1623 | -dnl referring to unknown libraries and directories, this macro determines the |
1624 | -dnl necessary additional linker options for the runtime path. |
1625 | -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) |
1626 | -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. |
1627 | -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, |
1628 | -dnl otherwise linking without libtool is assumed. |
1629 | -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], |
1630 | -[ |
1631 | - AC_REQUIRE([AC_LIB_RPATH]) |
1632 | - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
1633 | - $1= |
1634 | - if test "$enable_rpath" != no; then |
1635 | - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
1636 | - dnl Use an explicit option to hardcode directories into the resulting |
1637 | - dnl binary. |
1638 | - rpathdirs= |
1639 | - next= |
1640 | - for opt in $2; do |
1641 | - if test -n "$next"; then |
1642 | - dir="$next" |
1643 | - dnl No need to hardcode the standard /usr/lib. |
1644 | - if test "X$dir" != "X/usr/$acl_libdirstem" \ |
1645 | - && test "X$dir" != "X/usr/$acl_libdirstem2"; then |
1646 | - rpathdirs="$rpathdirs $dir" |
1647 | - fi |
1648 | - next= |
1649 | - else |
1650 | - case $opt in |
1651 | - -L) next=yes ;; |
1652 | - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` |
1653 | - dnl No need to hardcode the standard /usr/lib. |
1654 | - if test "X$dir" != "X/usr/$acl_libdirstem" \ |
1655 | - && test "X$dir" != "X/usr/$acl_libdirstem2"; then |
1656 | - rpathdirs="$rpathdirs $dir" |
1657 | - fi |
1658 | - next= ;; |
1659 | - *) next= ;; |
1660 | - esac |
1661 | - fi |
1662 | - done |
1663 | - if test "X$rpathdirs" != "X"; then |
1664 | - if test -n ""$3""; then |
1665 | - dnl libtool is used for linking. Use -R options. |
1666 | - for dir in $rpathdirs; do |
1667 | - $1="${$1}${$1:+ }-R$dir" |
1668 | - done |
1669 | - else |
1670 | - dnl The linker is used for linking directly. |
1671 | - if test -n "$acl_hardcode_libdir_separator"; then |
1672 | - dnl Weird platform: only the last -rpath option counts, the user |
1673 | - dnl must pass all path elements in one option. |
1674 | - alldirs= |
1675 | - for dir in $rpathdirs; do |
1676 | - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" |
1677 | - done |
1678 | - acl_save_libdir="$libdir" |
1679 | - libdir="$alldirs" |
1680 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1681 | - libdir="$acl_save_libdir" |
1682 | - $1="$flag" |
1683 | - else |
1684 | - dnl The -rpath options are cumulative. |
1685 | - for dir in $rpathdirs; do |
1686 | - acl_save_libdir="$libdir" |
1687 | - libdir="$dir" |
1688 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
1689 | - libdir="$acl_save_libdir" |
1690 | - $1="${$1}${$1:+ }$flag" |
1691 | - done |
1692 | - fi |
1693 | - fi |
1694 | - fi |
1695 | - fi |
1696 | - fi |
1697 | - AC_SUBST([$1]) |
1698 | -]) |
1699 | - |
1700 | -# lib-prefix.m4 serial 7 (gettext-0.18) |
1701 | -dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc. |
1702 | -dnl This file is free software; the Free Software Foundation |
1703 | -dnl gives unlimited permission to copy and/or distribute it, |
1704 | -dnl with or without modifications, as long as this notice is preserved. |
1705 | - |
1706 | -dnl From Bruno Haible. |
1707 | - |
1708 | -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and |
1709 | -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't |
1710 | -dnl require excessive bracketing. |
1711 | -ifdef([AC_HELP_STRING], |
1712 | -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], |
1713 | -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) |
1714 | - |
1715 | -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed |
1716 | -dnl to access previously installed libraries. The basic assumption is that |
1717 | -dnl a user will want packages to use other packages he previously installed |
1718 | -dnl with the same --prefix option. |
1719 | -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate |
1720 | -dnl libraries, but is otherwise very convenient. |
1721 | -AC_DEFUN([AC_LIB_PREFIX], |
1722 | -[ |
1723 | - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) |
1724 | - AC_REQUIRE([AC_PROG_CC]) |
1725 | - AC_REQUIRE([AC_CANONICAL_HOST]) |
1726 | - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
1727 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
1728 | - dnl By default, look in $includedir and $libdir. |
1729 | - use_additional=yes |
1730 | - AC_LIB_WITH_FINAL_PREFIX([ |
1731 | - eval additional_includedir=\"$includedir\" |
1732 | - eval additional_libdir=\"$libdir\" |
1733 | - ]) |
1734 | - AC_LIB_ARG_WITH([lib-prefix], |
1735 | -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib |
1736 | - --without-lib-prefix don't search for libraries in includedir and libdir], |
1737 | -[ |
1738 | - if test "X$withval" = "Xno"; then |
1739 | - use_additional=no |
1740 | - else |
1741 | - if test "X$withval" = "X"; then |
1742 | - AC_LIB_WITH_FINAL_PREFIX([ |
1743 | - eval additional_includedir=\"$includedir\" |
1744 | - eval additional_libdir=\"$libdir\" |
1745 | - ]) |
1746 | - else |
1747 | - additional_includedir="$withval/include" |
1748 | - additional_libdir="$withval/$acl_libdirstem" |
1749 | - fi |
1750 | - fi |
1751 | -]) |
1752 | - if test $use_additional = yes; then |
1753 | - dnl Potentially add $additional_includedir to $CPPFLAGS. |
1754 | - dnl But don't add it |
1755 | - dnl 1. if it's the standard /usr/include, |
1756 | - dnl 2. if it's already present in $CPPFLAGS, |
1757 | - dnl 3. if it's /usr/local/include and we are using GCC on Linux, |
1758 | - dnl 4. if it doesn't exist as a directory. |
1759 | - if test "X$additional_includedir" != "X/usr/include"; then |
1760 | - haveit= |
1761 | - for x in $CPPFLAGS; do |
1762 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
1763 | - if test "X$x" = "X-I$additional_includedir"; then |
1764 | - haveit=yes |
1765 | - break |
1766 | - fi |
1767 | - done |
1768 | - if test -z "$haveit"; then |
1769 | - if test "X$additional_includedir" = "X/usr/local/include"; then |
1770 | - if test -n "$GCC"; then |
1771 | - case $host_os in |
1772 | - linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
1773 | - esac |
1774 | - fi |
1775 | - fi |
1776 | - if test -z "$haveit"; then |
1777 | - if test -d "$additional_includedir"; then |
1778 | - dnl Really add $additional_includedir to $CPPFLAGS. |
1779 | - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" |
1780 | - fi |
1781 | - fi |
1782 | - fi |
1783 | - fi |
1784 | - dnl Potentially add $additional_libdir to $LDFLAGS. |
1785 | - dnl But don't add it |
1786 | - dnl 1. if it's the standard /usr/lib, |
1787 | - dnl 2. if it's already present in $LDFLAGS, |
1788 | - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, |
1789 | - dnl 4. if it doesn't exist as a directory. |
1790 | - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then |
1791 | - haveit= |
1792 | - for x in $LDFLAGS; do |
1793 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
1794 | - if test "X$x" = "X-L$additional_libdir"; then |
1795 | - haveit=yes |
1796 | - break |
1797 | - fi |
1798 | - done |
1799 | - if test -z "$haveit"; then |
1800 | - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then |
1801 | - if test -n "$GCC"; then |
1802 | - case $host_os in |
1803 | - linux*) haveit=yes;; |
1804 | - esac |
1805 | - fi |
1806 | - fi |
1807 | - if test -z "$haveit"; then |
1808 | - if test -d "$additional_libdir"; then |
1809 | - dnl Really add $additional_libdir to $LDFLAGS. |
1810 | - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" |
1811 | - fi |
1812 | - fi |
1813 | - fi |
1814 | - fi |
1815 | - fi |
1816 | -]) |
1817 | - |
1818 | -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, |
1819 | -dnl acl_final_exec_prefix, containing the values to which $prefix and |
1820 | -dnl $exec_prefix will expand at the end of the configure script. |
1821 | -AC_DEFUN([AC_LIB_PREPARE_PREFIX], |
1822 | -[ |
1823 | - dnl Unfortunately, prefix and exec_prefix get only finally determined |
1824 | - dnl at the end of configure. |
1825 | - if test "X$prefix" = "XNONE"; then |
1826 | - acl_final_prefix="$ac_default_prefix" |
1827 | - else |
1828 | - acl_final_prefix="$prefix" |
1829 | - fi |
1830 | - if test "X$exec_prefix" = "XNONE"; then |
1831 | - acl_final_exec_prefix='${prefix}' |
1832 | - else |
1833 | - acl_final_exec_prefix="$exec_prefix" |
1834 | - fi |
1835 | - acl_save_prefix="$prefix" |
1836 | - prefix="$acl_final_prefix" |
1837 | - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" |
1838 | - prefix="$acl_save_prefix" |
1839 | -]) |
1840 | - |
1841 | -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the |
1842 | -dnl variables prefix and exec_prefix bound to the values they will have |
1843 | -dnl at the end of the configure script. |
1844 | -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], |
1845 | -[ |
1846 | - acl_save_prefix="$prefix" |
1847 | - prefix="$acl_final_prefix" |
1848 | - acl_save_exec_prefix="$exec_prefix" |
1849 | - exec_prefix="$acl_final_exec_prefix" |
1850 | - $1 |
1851 | - exec_prefix="$acl_save_exec_prefix" |
1852 | - prefix="$acl_save_prefix" |
1853 | -]) |
1854 | - |
1855 | -dnl AC_LIB_PREPARE_MULTILIB creates |
1856 | -dnl - a variable acl_libdirstem, containing the basename of the libdir, either |
1857 | -dnl "lib" or "lib64" or "lib/64", |
1858 | -dnl - a variable acl_libdirstem2, as a secondary possible value for |
1859 | -dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or |
1860 | -dnl "lib/amd64". |
1861 | -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], |
1862 | -[ |
1863 | - dnl There is no formal standard regarding lib and lib64. |
1864 | - dnl On glibc systems, the current practice is that on a system supporting |
1865 | - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under |
1866 | - dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine |
1867 | - dnl the compiler's default mode by looking at the compiler's library search |
1868 | - dnl path. If at least one of its elements ends in /lib64 or points to a |
1869 | - dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. |
1870 | - dnl Otherwise we use the default, namely "lib". |
1871 | - dnl On Solaris systems, the current practice is that on a system supporting |
1872 | - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under |
1873 | - dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or |
1874 | - dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. |
1875 | - AC_REQUIRE([AC_CANONICAL_HOST]) |
1876 | - acl_libdirstem=lib |
1877 | - acl_libdirstem2= |
1878 | - case "$host_os" in |
1879 | - solaris*) |
1880 | - dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment |
1881 | - dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>. |
1882 | - dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." |
1883 | - dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the |
1884 | - dnl symlink is missing, so we set acl_libdirstem2 too. |
1885 | - AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], |
1886 | - [AC_EGREP_CPP([sixtyfour bits], [ |
1887 | -#ifdef _LP64 |
1888 | -sixtyfour bits |
1889 | -#endif |
1890 | - ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) |
1891 | - ]) |
1892 | - if test $gl_cv_solaris_64bit = yes; then |
1893 | - acl_libdirstem=lib/64 |
1894 | - case "$host_cpu" in |
1895 | - sparc*) acl_libdirstem2=lib/sparcv9 ;; |
1896 | - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; |
1897 | - esac |
1898 | - fi |
1899 | - ;; |
1900 | - *) |
1901 | - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` |
1902 | - if test -n "$searchpath"; then |
1903 | - acl_save_IFS="${IFS= }"; IFS=":" |
1904 | - for searchdir in $searchpath; do |
1905 | - if test -d "$searchdir"; then |
1906 | - case "$searchdir" in |
1907 | - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; |
1908 | - */../ | */.. ) |
1909 | - # Better ignore directories of this form. They are misleading. |
1910 | - ;; |
1911 | - *) searchdir=`cd "$searchdir" && pwd` |
1912 | - case "$searchdir" in |
1913 | - */lib64 ) acl_libdirstem=lib64 ;; |
1914 | - esac ;; |
1915 | - esac |
1916 | - fi |
1917 | - done |
1918 | - IFS="$acl_save_IFS" |
1919 | - fi |
1920 | - ;; |
1921 | - esac |
1922 | - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" |
1923 | -]) |
1924 | - |
1925 | -# nls.m4 serial 5 (gettext-0.18) |
1926 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, |
1927 | -dnl Inc. |
1928 | -dnl This file is free software; the Free Software Foundation |
1929 | -dnl gives unlimited permission to copy and/or distribute it, |
1930 | -dnl with or without modifications, as long as this notice is preserved. |
1931 | -dnl |
1932 | -dnl This file can can be used in projects which are not available under |
1933 | -dnl the GNU General Public License or the GNU Library General Public |
1934 | -dnl License but which still want to provide support for the GNU gettext |
1935 | -dnl functionality. |
1936 | -dnl Please note that the actual code of the GNU gettext library is covered |
1937 | -dnl by the GNU Library General Public License, and the rest of the GNU |
1938 | -dnl gettext package package is covered by the GNU General Public License. |
1939 | -dnl They are *not* in the public domain. |
1940 | - |
1941 | -dnl Authors: |
1942 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
1943 | -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
1944 | - |
1945 | -AC_PREREQ([2.50]) |
1946 | - |
1947 | -AC_DEFUN([AM_NLS], |
1948 | -[ |
1949 | - AC_MSG_CHECKING([whether NLS is requested]) |
1950 | - dnl Default is enabled NLS |
1951 | - AC_ARG_ENABLE([nls], |
1952 | - [ --disable-nls do not use Native Language Support], |
1953 | - USE_NLS=$enableval, USE_NLS=yes) |
1954 | - AC_MSG_RESULT([$USE_NLS]) |
1955 | - AC_SUBST([USE_NLS]) |
1956 | -]) |
1957 | - |
1958 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
1959 | # serial 1 (pkg-config-0.24) |
1960 | # |
1961 | @@ -2319,550 +435,20 @@ |
1962 | m4_popdef([pkg_description]) |
1963 | ]) dnl PKG_NOARCH_INSTALLDIR |
1964 | |
1965 | -# po.m4 serial 20 (gettext-0.18.2) |
1966 | -dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. |
1967 | -dnl This file is free software; the Free Software Foundation |
1968 | -dnl gives unlimited permission to copy and/or distribute it, |
1969 | -dnl with or without modifications, as long as this notice is preserved. |
1970 | -dnl |
1971 | -dnl This file can can be used in projects which are not available under |
1972 | -dnl the GNU General Public License or the GNU Library General Public |
1973 | -dnl License but which still want to provide support for the GNU gettext |
1974 | -dnl functionality. |
1975 | -dnl Please note that the actual code of the GNU gettext library is covered |
1976 | -dnl by the GNU Library General Public License, and the rest of the GNU |
1977 | -dnl gettext package package is covered by the GNU General Public License. |
1978 | -dnl They are *not* in the public domain. |
1979 | - |
1980 | -dnl Authors: |
1981 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
1982 | -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
1983 | - |
1984 | -AC_PREREQ([2.60]) |
1985 | - |
1986 | -dnl Checks for all prerequisites of the po subdirectory. |
1987 | -AC_DEFUN([AM_PO_SUBDIRS], |
1988 | -[ |
1989 | - AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
1990 | - AC_REQUIRE([AC_PROG_INSTALL])dnl |
1991 | - AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
1992 | - AC_REQUIRE([AM_NLS])dnl |
1993 | - |
1994 | - dnl Release version of the gettext macros. This is used to ensure that |
1995 | - dnl the gettext macros and po/Makefile.in.in are in sync. |
1996 | - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) |
1997 | - |
1998 | - dnl Perform the following tests also if --disable-nls has been given, |
1999 | - dnl because they are needed for "make dist" to work. |
2000 | - |
2001 | - dnl Search for GNU msgfmt in the PATH. |
2002 | - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. |
2003 | - dnl The second test excludes FreeBSD msgfmt. |
2004 | - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, |
2005 | - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && |
2006 | - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], |
2007 | - :) |
2008 | - AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) |
2009 | - |
2010 | - dnl Test whether it is GNU msgfmt >= 0.15. |
2011 | -changequote(,)dnl |
2012 | - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in |
2013 | - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; |
2014 | - *) MSGFMT_015=$MSGFMT ;; |
2015 | - esac |
2016 | -changequote([,])dnl |
2017 | - AC_SUBST([MSGFMT_015]) |
2018 | -changequote(,)dnl |
2019 | - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in |
2020 | - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; |
2021 | - *) GMSGFMT_015=$GMSGFMT ;; |
2022 | - esac |
2023 | -changequote([,])dnl |
2024 | - AC_SUBST([GMSGFMT_015]) |
2025 | - |
2026 | - dnl Search for GNU xgettext 0.12 or newer in the PATH. |
2027 | - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. |
2028 | - dnl The second test excludes FreeBSD xgettext. |
2029 | - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, |
2030 | - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && |
2031 | - (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)], |
2032 | - :) |
2033 | - dnl Remove leftover from FreeBSD xgettext call. |
2034 | - rm -f messages.po |
2035 | - |
2036 | - dnl Test whether it is GNU xgettext >= 0.15. |
2037 | -changequote(,)dnl |
2038 | - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in |
2039 | - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; |
2040 | - *) XGETTEXT_015=$XGETTEXT ;; |
2041 | - esac |
2042 | -changequote([,])dnl |
2043 | - AC_SUBST([XGETTEXT_015]) |
2044 | - |
2045 | - dnl Search for GNU msgmerge 0.11 or newer in the PATH. |
2046 | - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, |
2047 | - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) |
2048 | - |
2049 | - dnl Installation directories. |
2050 | - dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we |
2051 | - dnl have to define it here, so that it can be used in po/Makefile. |
2052 | - test -n "$localedir" || localedir='${datadir}/locale' |
2053 | - AC_SUBST([localedir]) |
2054 | - |
2055 | - dnl Support for AM_XGETTEXT_OPTION. |
2056 | - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= |
2057 | - AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) |
2058 | - |
2059 | - AC_CONFIG_COMMANDS([po-directories], [[ |
2060 | - for ac_file in $CONFIG_FILES; do |
2061 | - # Support "outfile[:infile[:infile...]]" |
2062 | - case "$ac_file" in |
2063 | - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; |
2064 | - esac |
2065 | - # PO directories have a Makefile.in generated from Makefile.in.in. |
2066 | - case "$ac_file" in */Makefile.in) |
2067 | - # Adjust a relative srcdir. |
2068 | - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` |
2069 | - ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` |
2070 | - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` |
2071 | - # In autoconf-2.13 it is called $ac_given_srcdir. |
2072 | - # In autoconf-2.50 it is called $srcdir. |
2073 | - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" |
2074 | - case "$ac_given_srcdir" in |
2075 | - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; |
2076 | - /*) top_srcdir="$ac_given_srcdir" ;; |
2077 | - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; |
2078 | - esac |
2079 | - # Treat a directory as a PO directory if and only if it has a |
2080 | - # POTFILES.in file. This allows packages to have multiple PO |
2081 | - # directories under different names or in different locations. |
2082 | - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then |
2083 | - rm -f "$ac_dir/POTFILES" |
2084 | - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" |
2085 | - gt_tab=`printf '\t'` |
2086 | - 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" |
2087 | - POMAKEFILEDEPS="POTFILES.in" |
2088 | - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend |
2089 | - # on $ac_dir but don't depend on user-specified configuration |
2090 | - # parameters. |
2091 | - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then |
2092 | - # The LINGUAS file contains the set of available languages. |
2093 | - if test -n "$OBSOLETE_ALL_LINGUAS"; then |
2094 | - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" |
2095 | - fi |
2096 | - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` |
2097 | - # Hide the ALL_LINGUAS assignment from automake < 1.5. |
2098 | - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' |
2099 | - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" |
2100 | - else |
2101 | - # The set of available languages was given in configure.in. |
2102 | - # Hide the ALL_LINGUAS assignment from automake < 1.5. |
2103 | - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' |
2104 | - fi |
2105 | - # Compute POFILES |
2106 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) |
2107 | - # Compute UPDATEPOFILES |
2108 | - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) |
2109 | - # Compute DUMMYPOFILES |
2110 | - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) |
2111 | - # Compute GMOFILES |
2112 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) |
2113 | - case "$ac_given_srcdir" in |
2114 | - .) srcdirpre= ;; |
2115 | - *) srcdirpre='$(srcdir)/' ;; |
2116 | - esac |
2117 | - POFILES= |
2118 | - UPDATEPOFILES= |
2119 | - DUMMYPOFILES= |
2120 | - GMOFILES= |
2121 | - for lang in $ALL_LINGUAS; do |
2122 | - POFILES="$POFILES $srcdirpre$lang.po" |
2123 | - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" |
2124 | - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" |
2125 | - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" |
2126 | - done |
2127 | - # CATALOGS depends on both $ac_dir and the user's LINGUAS |
2128 | - # environment variable. |
2129 | - INST_LINGUAS= |
2130 | - if test -n "$ALL_LINGUAS"; then |
2131 | - for presentlang in $ALL_LINGUAS; do |
2132 | - useit=no |
2133 | - if test "%UNSET%" != "$LINGUAS"; then |
2134 | - desiredlanguages="$LINGUAS" |
2135 | - else |
2136 | - desiredlanguages="$ALL_LINGUAS" |
2137 | - fi |
2138 | - for desiredlang in $desiredlanguages; do |
2139 | - # Use the presentlang catalog if desiredlang is |
2140 | - # a. equal to presentlang, or |
2141 | - # b. a variant of presentlang (because in this case, |
2142 | - # presentlang can be used as a fallback for messages |
2143 | - # which are not translated in the desiredlang catalog). |
2144 | - case "$desiredlang" in |
2145 | - "$presentlang"*) useit=yes;; |
2146 | - esac |
2147 | - done |
2148 | - if test $useit = yes; then |
2149 | - INST_LINGUAS="$INST_LINGUAS $presentlang" |
2150 | - fi |
2151 | - done |
2152 | - fi |
2153 | - CATALOGS= |
2154 | - if test -n "$INST_LINGUAS"; then |
2155 | - for lang in $INST_LINGUAS; do |
2156 | - CATALOGS="$CATALOGS $lang.gmo" |
2157 | - done |
2158 | - fi |
2159 | - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" |
2160 | - 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" |
2161 | - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do |
2162 | - if test -f "$f"; then |
2163 | - case "$f" in |
2164 | - *.orig | *.bak | *~) ;; |
2165 | - *) cat "$f" >> "$ac_dir/Makefile" ;; |
2166 | - esac |
2167 | - fi |
2168 | - done |
2169 | - fi |
2170 | - ;; |
2171 | - esac |
2172 | - done]], |
2173 | - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute |
2174 | - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it |
2175 | - # from automake < 1.5. |
2176 | - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' |
2177 | - # Capture the value of LINGUAS because we need it to compute CATALOGS. |
2178 | - LINGUAS="${LINGUAS-%UNSET%}" |
2179 | - ]) |
2180 | -]) |
2181 | - |
2182 | -dnl Postprocesses a Makefile in a directory containing PO files. |
2183 | -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], |
2184 | -[ |
2185 | - # When this code is run, in config.status, two variables have already been |
2186 | - # set: |
2187 | - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, |
2188 | - # - LINGUAS is the value of the environment variable LINGUAS at configure |
2189 | - # time. |
2190 | - |
2191 | -changequote(,)dnl |
2192 | - # Adjust a relative srcdir. |
2193 | - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` |
2194 | - ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` |
2195 | - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` |
2196 | - # In autoconf-2.13 it is called $ac_given_srcdir. |
2197 | - # In autoconf-2.50 it is called $srcdir. |
2198 | - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" |
2199 | - case "$ac_given_srcdir" in |
2200 | - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; |
2201 | - /*) top_srcdir="$ac_given_srcdir" ;; |
2202 | - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; |
2203 | - esac |
2204 | - |
2205 | - # Find a way to echo strings without interpreting backslash. |
2206 | - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then |
2207 | - gt_echo='echo' |
2208 | - else |
2209 | - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then |
2210 | - gt_echo='printf %s\n' |
2211 | - else |
2212 | - echo_func () { |
2213 | - cat <<EOT |
2214 | -$* |
2215 | -EOT |
2216 | - } |
2217 | - gt_echo='echo_func' |
2218 | - fi |
2219 | - fi |
2220 | - |
2221 | - # A sed script that extracts the value of VARIABLE from a Makefile. |
2222 | - tab=`printf '\t'` |
2223 | - sed_x_variable=' |
2224 | -# Test if the hold space is empty. |
2225 | -x |
2226 | -s/P/P/ |
2227 | -x |
2228 | -ta |
2229 | -# Yes it was empty. Look if we have the expected variable definition. |
2230 | -/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ |
2231 | - # Seen the first line of the variable definition. |
2232 | - s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// |
2233 | - ba |
2234 | -} |
2235 | -bd |
2236 | -:a |
2237 | -# Here we are processing a line from the variable definition. |
2238 | -# Remove comment, more precisely replace it with a space. |
2239 | -s/#.*$/ / |
2240 | -# See if the line ends in a backslash. |
2241 | -tb |
2242 | -:b |
2243 | -s/\\$// |
2244 | -# Print the line, without the trailing backslash. |
2245 | -p |
2246 | -tc |
2247 | -# There was no trailing backslash. The end of the variable definition is |
2248 | -# reached. Clear the hold space. |
2249 | -s/^.*$// |
2250 | -x |
2251 | -bd |
2252 | -:c |
2253 | -# A trailing backslash means that the variable definition continues in the |
2254 | -# next line. Put a nonempty string into the hold space to indicate this. |
2255 | -s/^.*$/P/ |
2256 | -x |
2257 | -:d |
2258 | -' |
2259 | -changequote([,])dnl |
2260 | - |
2261 | - # Set POTFILES to the value of the Makefile variable POTFILES. |
2262 | - sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'` |
2263 | - POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"` |
2264 | - # Compute POTFILES_DEPS as |
2265 | - # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) |
2266 | - POTFILES_DEPS= |
2267 | - for file in $POTFILES; do |
2268 | - POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file" |
2269 | - done |
2270 | - POMAKEFILEDEPS="" |
2271 | - |
2272 | - if test -n "$OBSOLETE_ALL_LINGUAS"; then |
2273 | - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" |
2274 | - fi |
2275 | - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then |
2276 | - # The LINGUAS file contains the set of available languages. |
2277 | - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` |
2278 | - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" |
2279 | - else |
2280 | - # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. |
2281 | - sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` |
2282 | - ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` |
2283 | - fi |
2284 | - # Hide the ALL_LINGUAS assignment from automake < 1.5. |
2285 | - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' |
2286 | - # Compute POFILES |
2287 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) |
2288 | - # Compute UPDATEPOFILES |
2289 | - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) |
2290 | - # Compute DUMMYPOFILES |
2291 | - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) |
2292 | - # Compute GMOFILES |
2293 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) |
2294 | - # Compute PROPERTIESFILES |
2295 | - # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties) |
2296 | - # Compute CLASSFILES |
2297 | - # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class) |
2298 | - # Compute QMFILES |
2299 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) |
2300 | - # Compute MSGFILES |
2301 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) |
2302 | - # Compute RESOURCESDLLFILES |
2303 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll) |
2304 | - case "$ac_given_srcdir" in |
2305 | - .) srcdirpre= ;; |
2306 | - *) srcdirpre='$(srcdir)/' ;; |
2307 | - esac |
2308 | - POFILES= |
2309 | - UPDATEPOFILES= |
2310 | - DUMMYPOFILES= |
2311 | - GMOFILES= |
2312 | - PROPERTIESFILES= |
2313 | - CLASSFILES= |
2314 | - QMFILES= |
2315 | - MSGFILES= |
2316 | - RESOURCESDLLFILES= |
2317 | - for lang in $ALL_LINGUAS; do |
2318 | - POFILES="$POFILES $srcdirpre$lang.po" |
2319 | - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" |
2320 | - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" |
2321 | - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" |
2322 | - PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties" |
2323 | - CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class" |
2324 | - QMFILES="$QMFILES $srcdirpre$lang.qm" |
2325 | - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` |
2326 | - MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" |
2327 | - 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/'` |
2328 | - RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" |
2329 | - done |
2330 | - # CATALOGS depends on both $ac_dir and the user's LINGUAS |
2331 | - # environment variable. |
2332 | - INST_LINGUAS= |
2333 | - if test -n "$ALL_LINGUAS"; then |
2334 | - for presentlang in $ALL_LINGUAS; do |
2335 | - useit=no |
2336 | - if test "%UNSET%" != "$LINGUAS"; then |
2337 | - desiredlanguages="$LINGUAS" |
2338 | - else |
2339 | - desiredlanguages="$ALL_LINGUAS" |
2340 | - fi |
2341 | - for desiredlang in $desiredlanguages; do |
2342 | - # Use the presentlang catalog if desiredlang is |
2343 | - # a. equal to presentlang, or |
2344 | - # b. a variant of presentlang (because in this case, |
2345 | - # presentlang can be used as a fallback for messages |
2346 | - # which are not translated in the desiredlang catalog). |
2347 | - case "$desiredlang" in |
2348 | - "$presentlang"*) useit=yes;; |
2349 | - esac |
2350 | - done |
2351 | - if test $useit = yes; then |
2352 | - INST_LINGUAS="$INST_LINGUAS $presentlang" |
2353 | - fi |
2354 | - done |
2355 | - fi |
2356 | - CATALOGS= |
2357 | - JAVACATALOGS= |
2358 | - QTCATALOGS= |
2359 | - TCLCATALOGS= |
2360 | - CSHARPCATALOGS= |
2361 | - if test -n "$INST_LINGUAS"; then |
2362 | - for lang in $INST_LINGUAS; do |
2363 | - CATALOGS="$CATALOGS $lang.gmo" |
2364 | - JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties" |
2365 | - QTCATALOGS="$QTCATALOGS $lang.qm" |
2366 | - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` |
2367 | - TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" |
2368 | - 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/'` |
2369 | - CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" |
2370 | - done |
2371 | - fi |
2372 | - |
2373 | - 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" |
2374 | - tab=`printf '\t'` |
2375 | - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then |
2376 | - # Add dependencies that cannot be formulated as a simple suffix rule. |
2377 | - for lang in $ALL_LINGUAS; do |
2378 | - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` |
2379 | - cat >> "$ac_file.tmp" <<EOF |
2380 | -$frobbedlang.msg: $lang.po |
2381 | -${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ |
2382 | -${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } |
2383 | -EOF |
2384 | - done |
2385 | - fi |
2386 | - if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then |
2387 | - # Add dependencies that cannot be formulated as a simple suffix rule. |
2388 | - for lang in $ALL_LINGUAS; do |
2389 | - 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/'` |
2390 | - cat >> "$ac_file.tmp" <<EOF |
2391 | -$frobbedlang/\$(DOMAIN).resources.dll: $lang.po |
2392 | -${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ |
2393 | -${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } |
2394 | -EOF |
2395 | - done |
2396 | - fi |
2397 | - if test -n "$POMAKEFILEDEPS"; then |
2398 | - cat >> "$ac_file.tmp" <<EOF |
2399 | -Makefile: $POMAKEFILEDEPS |
2400 | -EOF |
2401 | - fi |
2402 | - mv "$ac_file.tmp" "$ac_file" |
2403 | -]) |
2404 | - |
2405 | -dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. |
2406 | -AC_DEFUN([AM_XGETTEXT_OPTION_INIT], |
2407 | -[ |
2408 | - XGETTEXT_EXTRA_OPTIONS= |
2409 | -]) |
2410 | - |
2411 | -dnl Registers an option to be passed to xgettext in the po subdirectory. |
2412 | -AC_DEFUN([AM_XGETTEXT_OPTION], |
2413 | -[ |
2414 | - AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) |
2415 | - XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" |
2416 | -]) |
2417 | - |
2418 | -# progtest.m4 serial 7 (gettext-0.18.2) |
2419 | -dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc. |
2420 | -dnl This file is free software; the Free Software Foundation |
2421 | -dnl gives unlimited permission to copy and/or distribute it, |
2422 | -dnl with or without modifications, as long as this notice is preserved. |
2423 | -dnl |
2424 | -dnl This file can can be used in projects which are not available under |
2425 | -dnl the GNU General Public License or the GNU Library General Public |
2426 | -dnl License but which still want to provide support for the GNU gettext |
2427 | -dnl functionality. |
2428 | -dnl Please note that the actual code of the GNU gettext library is covered |
2429 | -dnl by the GNU Library General Public License, and the rest of the GNU |
2430 | -dnl gettext package package is covered by the GNU General Public License. |
2431 | -dnl They are *not* in the public domain. |
2432 | - |
2433 | -dnl Authors: |
2434 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1996. |
2435 | - |
2436 | -AC_PREREQ([2.50]) |
2437 | - |
2438 | -# Search path for a program which passes the given test. |
2439 | - |
2440 | -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, |
2441 | -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) |
2442 | -AC_DEFUN([AM_PATH_PROG_WITH_TEST], |
2443 | -[ |
2444 | -# Prepare PATH_SEPARATOR. |
2445 | -# The user is always right. |
2446 | -if test "${PATH_SEPARATOR+set}" != set; then |
2447 | - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which |
2448 | - # contains only /bin. Note that ksh looks also at the FPATH variable, |
2449 | - # so we have to set that as well for the test. |
2450 | - PATH_SEPARATOR=: |
2451 | - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
2452 | - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
2453 | - || PATH_SEPARATOR=';' |
2454 | - } |
2455 | -fi |
2456 | - |
2457 | -# Find out how to test for executable files. Don't use a zero-byte file, |
2458 | -# as systems may use methods other than mode bits to determine executability. |
2459 | -cat >conf$$.file <<_ASEOF |
2460 | -#! /bin/sh |
2461 | -exit 0 |
2462 | -_ASEOF |
2463 | -chmod +x conf$$.file |
2464 | -if test -x conf$$.file >/dev/null 2>&1; then |
2465 | - ac_executable_p="test -x" |
2466 | -else |
2467 | - ac_executable_p="test -f" |
2468 | -fi |
2469 | -rm -f conf$$.file |
2470 | - |
2471 | -# Extract the first word of "$2", so it can be a program name with args. |
2472 | -set dummy $2; ac_word=[$]2 |
2473 | -AC_MSG_CHECKING([for $ac_word]) |
2474 | -AC_CACHE_VAL([ac_cv_path_$1], |
2475 | -[case "[$]$1" in |
2476 | - [[\\/]]* | ?:[[\\/]]*) |
2477 | - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. |
2478 | - ;; |
2479 | - *) |
2480 | - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR |
2481 | - for ac_dir in ifelse([$5], , $PATH, [$5]); do |
2482 | - IFS="$ac_save_IFS" |
2483 | - test -z "$ac_dir" && ac_dir=. |
2484 | - for ac_exec_ext in '' $ac_executable_extensions; do |
2485 | - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then |
2486 | - echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD |
2487 | - if [$3]; then |
2488 | - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" |
2489 | - break 2 |
2490 | - fi |
2491 | - fi |
2492 | - done |
2493 | - done |
2494 | - IFS="$ac_save_IFS" |
2495 | -dnl If no 4th arg is given, leave the cache variable unset, |
2496 | -dnl so AC_PATH_PROGS will keep looking. |
2497 | -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" |
2498 | -])dnl |
2499 | - ;; |
2500 | -esac])dnl |
2501 | -$1="$ac_cv_path_$1" |
2502 | -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then |
2503 | - AC_MSG_RESULT([$][$1]) |
2504 | -else |
2505 | - AC_MSG_RESULT([no]) |
2506 | -fi |
2507 | -AC_SUBST([$1])dnl |
2508 | -]) |
2509 | + |
2510 | +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
2511 | +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
2512 | +# ------------------------------------------- |
2513 | +# Retrieves the value of the pkg-config variable for the given module. |
2514 | +AC_DEFUN([PKG_CHECK_VAR], |
2515 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
2516 | +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
2517 | + |
2518 | +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
2519 | +AS_VAR_COPY([$1], [pkg_cv_][$1]) |
2520 | + |
2521 | +AS_VAR_IF([$1], [""], [$5], [$4])dnl |
2522 | +])# PKG_CHECK_VAR |
2523 | |
2524 | dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. |
2525 | dnl |
2526 | @@ -5418,6 +3004,38 @@ |
2527 | fi |
2528 | ]) |
2529 | |
2530 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
2531 | +# |
2532 | +# This file is free software; the Free Software Foundation |
2533 | +# gives unlimited permission to copy and/or distribute it, |
2534 | +# with or without modifications, as long as this notice is preserved. |
2535 | + |
2536 | +# AM_PROG_MKDIR_P |
2537 | +# --------------- |
2538 | +# Check for 'mkdir -p'. |
2539 | +AC_DEFUN([AM_PROG_MKDIR_P], |
2540 | +[AC_PREREQ([2.60])dnl |
2541 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
2542 | +dnl FIXME we are no longer going to remove this! adjust warning |
2543 | +dnl FIXME message accordingly. |
2544 | +AC_DIAGNOSE([obsolete], |
2545 | +[$0: this macro is deprecated, and will soon be removed. |
2546 | +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, |
2547 | +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) |
2548 | +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
2549 | +dnl while keeping a definition of mkdir_p for backward compatibility. |
2550 | +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
2551 | +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
2552 | +dnl Makefile.ins that do not define MKDIR_P, so we do our own |
2553 | +dnl adjustment using top_builddir (which is defined more often than |
2554 | +dnl MKDIR_P). |
2555 | +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
2556 | +case $mkdir_p in |
2557 | + [[\\/$]]* | ?:[[\\/]]*) ;; |
2558 | + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
2559 | +esac |
2560 | +]) |
2561 | + |
2562 | # Helper functions for option handling. -*- Autoconf -*- |
2563 | |
2564 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2565 | @@ -5770,3 +3388,12 @@ |
2566 | AC_SUBST([am__untar]) |
2567 | ]) # _AM_PROG_TAR |
2568 | |
2569 | +m4_include([m4/gettext.m4]) |
2570 | +m4_include([m4/iconv.m4]) |
2571 | +m4_include([m4/intlmacosx.m4]) |
2572 | +m4_include([m4/lib-ld.m4]) |
2573 | +m4_include([m4/lib-link.m4]) |
2574 | +m4_include([m4/lib-prefix.m4]) |
2575 | +m4_include([m4/nls.m4]) |
2576 | +m4_include([m4/po.m4]) |
2577 | +m4_include([m4/progtest.m4]) |
2578 | |
2579 | === modified file 'compat/Makefile.in' |
2580 | --- compat/Makefile.in 2013-12-22 16:37:56 +0000 |
2581 | +++ compat/Makefile.in 2014-05-13 12:44:26 +0000 |
2582 | @@ -81,7 +81,12 @@ |
2583 | subdir = compat |
2584 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README |
2585 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2586 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2587 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
2588 | + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
2589 | + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
2590 | + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ |
2591 | + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ |
2592 | + $(top_srcdir)/configure.ac |
2593 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2594 | $(ACLOCAL_M4) |
2595 | mkinstalldirs = $(install_sh) -d |
2596 | |
2597 | === modified file 'compat/README' |
2598 | --- compat/README 2005-10-06 12:01:39 +0000 |
2599 | +++ compat/README 2014-05-13 12:44:26 +0000 |
2600 | @@ -1,7 +1,7 @@ |
2601 | The core protocol interpretation of keyboard modifiers does not include direct |
2602 | support for multiple keyboard groups, so XKB reports the effective keyboard |
2603 | -group to XKB-aware clients using some of reserved bits in the state field of |
2604 | -some core protocol events. This modified state field would not be interpreted |
2605 | +group to XKB-aware clients using some of the reserved bits in the state field |
2606 | +of some core protocol events. This modified state field would not be interpreted |
2607 | correctly by XKB-unaware clients, so XKB provides a group compatibility mapping |
2608 | which remaps the keyboard group into a core modifier mask that has similar |
2609 | effects, when possible. |
2610 | @@ -15,8 +15,8 @@ |
2611 | - The compatibility grab state which is the nearest core-protocol equivalent |
2612 | of the grab state. |
2613 | |
2614 | -Compatibility state are essentially the corresponding XKB states, but with |
2615 | -keyboard group possibly encoded as one or more modifiers. |
2616 | +Compatibility states are essentially the corresponding XKB states, but with |
2617 | +the keyboard group possibly encoded as one or more modifiers. |
2618 | |
2619 | Modifiers that correspond to each keyboard group are described in this |
2620 | group compatibility map. |
2621 | @@ -25,9 +25,9 @@ |
2622 | ---- |
2623 | (*) The implementation of XKB invisibly extends the X library to use the |
2624 | keyboard extension if it is present. That means, clients that use library or |
2625 | -toolkit routines to interpret keyboard events automatically use all of XKB |
2626 | -features; clients that directly interpret the state field of core protocol |
2627 | -events or the keymap direcly may be affected by some of the XKB differences. |
2628 | +toolkit routines to interpret keyboard events automatically use all of XKB's |
2629 | +features; clients that directly interpret the state field of core-protocol |
2630 | +events or the keymap directly may be affected by some of the XKB differences. |
2631 | Thus most clients can take all advantages without modification but it also |
2632 | means that XKB state can be reported to clients that have not explicitly |
2633 | requested the keyboard extension. |
2634 | |
2635 | === modified file 'compat/accessx' |
2636 | --- compat/accessx 2011-04-06 02:41:25 +0000 |
2637 | +++ compat/accessx 2014-05-13 12:44:26 +0000 |
2638 | @@ -1,17 +1,17 @@ |
2639 | default partial xkb_compatibility "basic" { |
2640 | - interpret AccessX_Enable { |
2641 | - action= LockControls(controls=AccessXKeys); |
2642 | + interpret AccessX_Enable { |
2643 | + action= LockControls(controls=AccessXKeys); |
2644 | }; |
2645 | }; |
2646 | |
2647 | partial xkb_compatibility "full" { |
2648 | |
2649 | interpret AccessX_Enable { |
2650 | - action= LockControls(controls=AccessXKeys); |
2651 | + action= LockControls(controls=AccessXKeys); |
2652 | }; |
2653 | |
2654 | - interpret AccessX_Feedback_Enable { |
2655 | - action= LockControls(controls=AccessXFeedback); |
2656 | + interpret AccessX_Feedback_Enable { |
2657 | + action= LockControls(controls=AccessXFeedback); |
2658 | }; |
2659 | |
2660 | interpret RepeatKeys_Enable { |
2661 | |
2662 | === modified file 'compat/basic' |
2663 | --- compat/basic 2011-04-06 02:41:25 +0000 |
2664 | +++ compat/basic 2014-05-13 12:44:26 +0000 |
2665 | @@ -1,10 +1,11 @@ |
2666 | -// Minimal set of symbol interpretations to provide |
2667 | -// reasonable default behavior (Num lock, shift and |
2668 | -// caps lock and mode switch) and set up the |
2669 | +// Minimal set of symbol interpretations to provide |
2670 | +// reasonable default behavior (Num lock, Shift lock, |
2671 | +// Caps lock, and Mode switch) and set up the |
2672 | // automatic updating of common keyboard LEDs. |
2673 | |
2674 | -default xkb_compatibility "basic" { |
2675 | - virtual_modifiers NumLock,AltGr; |
2676 | +default xkb_compatibility "basic" { |
2677 | + |
2678 | + virtual_modifiers NumLock,AltGr; |
2679 | |
2680 | interpret.repeat= False; |
2681 | setMods.clearLocks= True; |
2682 | |
2683 | === modified file 'compat/caps' |
2684 | --- compat/caps 2011-01-28 00:11:58 +0000 |
2685 | +++ compat/caps 2014-05-13 12:44:26 +0000 |
2686 | @@ -1,11 +1,10 @@ |
2687 | -partial xkb_compatibility "caps_lock" { |
2688 | - // Keysym Caps_Lock locks Lock modifier. |
2689 | - // With this, the keysym Caps_Lock can be used without binding the whole |
2690 | - // key to a real modifier. |
2691 | - // This is essential when you don't want to use caps lock on the first |
2692 | - // level. |
2693 | - // This should not have any compatibility issues when used together with |
2694 | - // other layouts which don't utilize this capability. |
2695 | +partial xkb_compatibility "caps_lock" { |
2696 | + // Keysym Caps_Lock locks the Lock modifier. |
2697 | + // With this definition, the keysym Caps_Lock can be used without binding |
2698 | + // the whole key to a real modifier. This is essential when you don't |
2699 | + // want to use Caps_Lock on the first level. |
2700 | + // This should not have any compatibility issues when used together with |
2701 | + // other layouts which don't utilize this capability. |
2702 | interpret Caps_Lock { |
2703 | action = LockMods(modifiers = Lock); |
2704 | }; |
2705 | |
2706 | === modified file 'compat/complete' |
2707 | --- compat/complete 2011-05-24 12:13:34 +0000 |
2708 | +++ compat/complete 2014-05-13 12:44:26 +0000 |
2709 | @@ -1,4 +1,4 @@ |
2710 | -default xkb_compatibility "complete" { |
2711 | +default xkb_compatibility "complete" { |
2712 | include "basic" |
2713 | augment "iso9995" |
2714 | augment "mousekeys" |
2715 | |
2716 | === modified file 'compat/iso9995' |
2717 | --- compat/iso9995 2013-12-22 16:37:56 +0000 |
2718 | +++ compat/iso9995 2014-05-13 12:44:26 +0000 |
2719 | @@ -1,8 +1,9 @@ |
2720 | -// Fairly complete set of symbol interpretations |
2721 | -// to provide reasonable default behavior |
2722 | - |
2723 | -default partial xkb_compatibility "default" { |
2724 | - virtual_modifiers LevelThree,AltGr; |
2725 | +// Fairly complete set of symbol interpretations |
2726 | +// to provide reasonable default behavior. |
2727 | + |
2728 | +default partial xkb_compatibility "default" { |
2729 | + |
2730 | + virtual_modifiers LevelThree,AltGr; |
2731 | |
2732 | interpret.repeat= False; |
2733 | setMods.clearLocks= True; |
2734 | |
2735 | === modified file 'compat/japan' |
2736 | --- compat/japan 2011-04-06 02:41:25 +0000 |
2737 | +++ compat/japan 2014-05-13 12:44:26 +0000 |
2738 | @@ -1,11 +1,11 @@ |
2739 | -// Japanese keyboards need Eisu and Kana shift and |
2740 | -// lock keys, which are typically bound to the |
2741 | -// second shift level for some other modifier key. |
2742 | +// Japanese keyboards need the Eisu and Kana Shift |
2743 | +// and Lock keys, which are typically bound to the |
2744 | +// second shift level of some other modifier key. |
2745 | // These interpretations disable the default |
2746 | // interpretation (which would have these keys set |
2747 | -// the same modifier as the level one symbol). |
2748 | +// to the same modifier as the level one symbol). |
2749 | |
2750 | -default partial xkb_compatibility "japan" { |
2751 | +default partial xkb_compatibility "japan" { |
2752 | |
2753 | interpret.repeat= False; |
2754 | |
2755 | @@ -26,16 +26,16 @@ |
2756 | }; |
2757 | }; |
2758 | |
2759 | -// Some Japanese keyboards have an explict Kana Lock key & matching LED |
2760 | - |
2761 | -partial xkb_compatibility "kana_lock" { |
2762 | - |
2763 | - virtual_modifiers Kana_Lock; |
2764 | +// Some Japanese keyboards have an explict |
2765 | +// Kana Lock key and matching LED. |
2766 | +partial xkb_compatibility "kana_lock" { |
2767 | + |
2768 | + virtual_modifiers Kana_Lock; |
2769 | |
2770 | interpret Kana_Lock+AnyOfOrNone(all) { |
2771 | - virtualModifier= Kana_Lock; |
2772 | - useModMapMods=level1; |
2773 | - action= LockGroup(group=+1); |
2774 | + virtualModifier= Kana_Lock; |
2775 | + useModMapMods=level1; |
2776 | + action= LockGroup(group=+1); |
2777 | }; |
2778 | |
2779 | indicator "Kana" { |
2780 | |
2781 | === modified file 'compat/ledcaps' |
2782 | --- compat/ledcaps 2005-10-06 12:01:39 +0000 |
2783 | +++ compat/ledcaps 2014-05-13 12:44:26 +0000 |
2784 | @@ -1,23 +1,24 @@ |
2785 | -// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state |
2786 | - |
2787 | -default partial xkb_compatibility "caps_lock" { |
2788 | - indicator "Caps Lock" { |
2789 | - !allowExplicit; |
2790 | - whichModState= Locked; |
2791 | - modifiers= Lock; |
2792 | - }; |
2793 | -}; |
2794 | - |
2795 | -partial xkb_compatibility "group_lock" { |
2796 | - indicator "Caps Lock" { |
2797 | - modifiers= None; |
2798 | - groups=All-group1; |
2799 | - }; |
2800 | -}; |
2801 | - |
2802 | -partial xkb_compatibility "shift_lock" { |
2803 | - indicator "Caps Lock" { |
2804 | - whichModState= Locked; |
2805 | - modifiers= Shift; |
2806 | - }; |
2807 | +// Use the Caps Lock LED to show either |
2808 | +// Caps Lock, Group, or Shift Lock state. |
2809 | + |
2810 | +default partial xkb_compatibility "caps_lock" { |
2811 | + indicator "Caps Lock" { |
2812 | + !allowExplicit; |
2813 | + whichModState= Locked; |
2814 | + modifiers= Lock; |
2815 | + }; |
2816 | +}; |
2817 | + |
2818 | +partial xkb_compatibility "group_lock" { |
2819 | + indicator "Caps Lock" { |
2820 | + modifiers= None; |
2821 | + groups=All-group1; |
2822 | + }; |
2823 | +}; |
2824 | + |
2825 | +partial xkb_compatibility "shift_lock" { |
2826 | + indicator "Caps Lock" { |
2827 | + whichModState= Locked; |
2828 | + modifiers= Shift; |
2829 | + }; |
2830 | }; |
2831 | |
2832 | === modified file 'compat/lednum' |
2833 | --- compat/lednum 2005-10-06 12:01:39 +0000 |
2834 | +++ compat/lednum 2014-05-13 12:44:26 +0000 |
2835 | @@ -1,23 +1,24 @@ |
2836 | -// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state |
2837 | - |
2838 | -default partial xkb_compatibility "num_lock" { |
2839 | - indicator "Num Lock" { |
2840 | - !allowExplicit; |
2841 | - whichModState= Locked; |
2842 | - modifiers= NumLock; |
2843 | - }; |
2844 | -}; |
2845 | - |
2846 | -partial xkb_compatibility "group_lock" { |
2847 | - indicator "Num Lock" { |
2848 | - modifiers= None; |
2849 | - groups=All-group1; |
2850 | - }; |
2851 | -}; |
2852 | - |
2853 | -partial xkb_compatibility "shift_lock" { |
2854 | - indicator "Num Lock" { |
2855 | - whichModState= Locked; |
2856 | - modifiers= Shift; |
2857 | - }; |
2858 | +// Use the Num Lock LED to show either |
2859 | +// Num Lock, Group, or Shift Lock state. |
2860 | + |
2861 | +default partial xkb_compatibility "num_lock" { |
2862 | + indicator "Num Lock" { |
2863 | + !allowExplicit; |
2864 | + whichModState= Locked; |
2865 | + modifiers= NumLock; |
2866 | + }; |
2867 | +}; |
2868 | + |
2869 | +partial xkb_compatibility "group_lock" { |
2870 | + indicator "Num Lock" { |
2871 | + modifiers= None; |
2872 | + groups=All-group1; |
2873 | + }; |
2874 | +}; |
2875 | + |
2876 | +partial xkb_compatibility "shift_lock" { |
2877 | + indicator "Num Lock" { |
2878 | + whichModState= Locked; |
2879 | + modifiers= Shift; |
2880 | + }; |
2881 | }; |
2882 | |
2883 | === modified file 'compat/ledscroll' |
2884 | --- compat/ledscroll 2005-10-06 12:01:39 +0000 |
2885 | +++ compat/ledscroll 2014-05-13 12:44:26 +0000 |
2886 | @@ -1,23 +1,24 @@ |
2887 | -// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state |
2888 | - |
2889 | -default partial xkb_compatibility "scroll_lock" { |
2890 | - indicator "Scroll Lock" { |
2891 | - allowExplicit; |
2892 | - whichModState= Locked; |
2893 | - modifiers= ScrollLock; |
2894 | - }; |
2895 | -}; |
2896 | - |
2897 | -partial xkb_compatibility "group_lock" { |
2898 | - indicator "Scroll Lock" { |
2899 | - modifiers= None; |
2900 | - groups=All-group1; |
2901 | - }; |
2902 | -}; |
2903 | - |
2904 | -partial xkb_compatibility "shift_lock" { |
2905 | - indicator "Scroll Lock" { |
2906 | - whichModState= Locked; |
2907 | - modifiers= Shift; |
2908 | - }; |
2909 | +// Use the Scroll Lock LED to show either |
2910 | +// Scroll Lock, Group, or Shift Lock state. |
2911 | + |
2912 | +default partial xkb_compatibility "scroll_lock" { |
2913 | + indicator "Scroll Lock" { |
2914 | + allowExplicit; |
2915 | + whichModState= Locked; |
2916 | + modifiers= ScrollLock; |
2917 | + }; |
2918 | +}; |
2919 | + |
2920 | +partial xkb_compatibility "group_lock" { |
2921 | + indicator "Scroll Lock" { |
2922 | + modifiers= None; |
2923 | + groups=All-group1; |
2924 | + }; |
2925 | +}; |
2926 | + |
2927 | +partial xkb_compatibility "shift_lock" { |
2928 | + indicator "Scroll Lock" { |
2929 | + whichModState= Locked; |
2930 | + modifiers= Shift; |
2931 | + }; |
2932 | }; |
2933 | |
2934 | === modified file 'compat/level5' |
2935 | --- compat/level5 2013-12-29 11:43:52 +0000 |
2936 | +++ compat/level5 2014-05-13 12:44:26 +0000 |
2937 | @@ -1,8 +1,9 @@ |
2938 | -// Fairly complete set of symbol interpretations |
2939 | -// to provide reasonable default behavior |
2940 | - |
2941 | -default partial xkb_compatibility "default" { |
2942 | - virtual_modifiers LevelFive; |
2943 | +// Fairly complete set of symbol interpretations |
2944 | +// to provide reasonable default behavior. |
2945 | + |
2946 | +default partial xkb_compatibility "default" { |
2947 | + |
2948 | + virtual_modifiers LevelFive; |
2949 | |
2950 | interpret.repeat= False; |
2951 | setMods.clearLocks= True; |
2952 | @@ -39,15 +40,17 @@ |
2953 | action= LockMods(modifiers=LevelFive); |
2954 | }; |
2955 | }; |
2956 | -partial xkb_compatibility "level5_lock" { |
2957 | - // This defines a Level5-Lock using the NumLock real modifier in order to |
2958 | - // create arbitrary level-behaviour, which would not be possible with the |
2959 | - // virtual modifier. |
2960 | - // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK |
2961 | - // See also: symbols/level5(lock) |
2962 | - virtual_modifiers NumLock; |
2963 | - |
2964 | + |
2965 | +partial xkb_compatibility "level5_lock" { |
2966 | + // This defines a Level5-Lock using the NumLock real modifier |
2967 | + // in order to create arbitrary level-behaviour, which would |
2968 | + // not be possible with the virtual modifier. |
2969 | + // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK |
2970 | + // See also: symbols/level5(lock) |
2971 | + |
2972 | + virtual_modifiers NumLock; |
2973 | + |
2974 | interpret ISO_Level5_Lock { |
2975 | - action = LockMods(modifiers = NumLock); |
2976 | + action = LockMods(modifiers = NumLock); |
2977 | }; |
2978 | }; |
2979 | |
2980 | === modified file 'compat/misc' |
2981 | --- compat/misc 2011-04-06 02:41:25 +0000 |
2982 | +++ compat/misc 2014-05-13 12:44:26 +0000 |
2983 | @@ -1,122 +1,122 @@ |
2984 | -default partial xkb_compatibility "misc" { |
2985 | - |
2986 | - virtual_modifiers Alt,Meta,Super,Hyper,ScrollLock; |
2987 | - |
2988 | - // Interpretations for some other useful keys |
2989 | +default partial xkb_compatibility "misc" { |
2990 | + |
2991 | + virtual_modifiers Alt,Meta,Super,Hyper,ScrollLock; |
2992 | + |
2993 | + // Interpretations for some other useful keys. |
2994 | |
2995 | interpret Terminate_Server { |
2996 | - action = Terminate(); |
2997 | + action = Terminate(); |
2998 | }; |
2999 | |
3000 | setMods.clearLocks= True; |
3001 | |
3002 | - // Sets the "Alt" virtual modifier |
3003 | - |
3004 | - interpret Alt_L+Any { |
3005 | - //useModMapMods= level1; |
3006 | - virtualModifier= Alt; |
3007 | - action = SetMods(modifiers=modMapMods); |
3008 | - }; |
3009 | - |
3010 | - interpret Alt_L { |
3011 | - action = SetMods(modifiers=Alt); |
3012 | - }; |
3013 | - |
3014 | - interpret Alt_R+Any { |
3015 | - //useModMapMods= level1; |
3016 | - virtualModifier= Alt; |
3017 | - action = SetMods(modifiers=modMapMods); |
3018 | - }; |
3019 | - |
3020 | - interpret Alt_R { |
3021 | - action = SetMods(modifiers=Alt); |
3022 | - }; |
3023 | - |
3024 | - // Sets the "Meta" virtual modifier |
3025 | - |
3026 | - interpret Meta_L+Any { |
3027 | -// useModMapMods= level1; |
3028 | - virtualModifier= Meta; |
3029 | - action = SetMods(modifiers=modMapMods); |
3030 | - }; |
3031 | - |
3032 | - interpret Meta_L { |
3033 | - action = SetMods(modifiers=Meta); |
3034 | - }; |
3035 | - |
3036 | - interpret Meta_R+Any { |
3037 | - //useModMapMods= level1; |
3038 | - virtualModifier= Meta; |
3039 | - action = SetMods(modifiers=modMapMods); |
3040 | - }; |
3041 | - |
3042 | - interpret Meta_R { |
3043 | - action = SetMods(modifiers=Meta); |
3044 | - }; |
3045 | - |
3046 | - // Sets the "Super" virtual modifier |
3047 | - |
3048 | - interpret Super_L+Any { |
3049 | -// useModMapMods= level1; |
3050 | - virtualModifier= Super; |
3051 | - action = SetMods(modifiers=modMapMods); |
3052 | - }; |
3053 | - |
3054 | - interpret Super_L { |
3055 | - action = SetMods(modifiers=Super); |
3056 | - }; |
3057 | - |
3058 | - interpret Super_R+Any { |
3059 | - //useModMapMods= level1; |
3060 | - virtualModifier= Super; |
3061 | - action = SetMods(modifiers=modMapMods); |
3062 | - }; |
3063 | - |
3064 | - interpret Super_R { |
3065 | - action = SetMods(modifiers=Super); |
3066 | - }; |
3067 | - |
3068 | - // Sets the "Hyper" virtual modifier |
3069 | - |
3070 | - interpret Hyper_L+Any { |
3071 | -// useModMapMods= level1; |
3072 | + // Sets the "Alt" virtual modifier. |
3073 | + |
3074 | + interpret Alt_L+Any { |
3075 | + //useModMapMods= level1; |
3076 | + virtualModifier= Alt; |
3077 | + action = SetMods(modifiers=modMapMods); |
3078 | + }; |
3079 | + |
3080 | + interpret Alt_L { |
3081 | + action = SetMods(modifiers=Alt); |
3082 | + }; |
3083 | + |
3084 | + interpret Alt_R+Any { |
3085 | + //useModMapMods= level1; |
3086 | + virtualModifier= Alt; |
3087 | + action = SetMods(modifiers=modMapMods); |
3088 | + }; |
3089 | + |
3090 | + interpret Alt_R { |
3091 | + action = SetMods(modifiers=Alt); |
3092 | + }; |
3093 | + |
3094 | + // Sets the "Meta" virtual modifier. |
3095 | + |
3096 | + interpret Meta_L+Any { |
3097 | + //useModMapMods= level1; |
3098 | + virtualModifier= Meta; |
3099 | + action = SetMods(modifiers=modMapMods); |
3100 | + }; |
3101 | + |
3102 | + interpret Meta_L { |
3103 | + action = SetMods(modifiers=Meta); |
3104 | + }; |
3105 | + |
3106 | + interpret Meta_R+Any { |
3107 | + //useModMapMods= level1; |
3108 | + virtualModifier= Meta; |
3109 | + action = SetMods(modifiers=modMapMods); |
3110 | + }; |
3111 | + |
3112 | + interpret Meta_R { |
3113 | + action = SetMods(modifiers=Meta); |
3114 | + }; |
3115 | + |
3116 | + // Sets the "Super" virtual modifier. |
3117 | + |
3118 | + interpret Super_L+Any { |
3119 | + //useModMapMods= level1; |
3120 | + virtualModifier= Super; |
3121 | + action = SetMods(modifiers=modMapMods); |
3122 | + }; |
3123 | + |
3124 | + interpret Super_L { |
3125 | + action = SetMods(modifiers=Super); |
3126 | + }; |
3127 | + |
3128 | + interpret Super_R+Any { |
3129 | + //useModMapMods= level1; |
3130 | + virtualModifier= Super; |
3131 | + action = SetMods(modifiers=modMapMods); |
3132 | + }; |
3133 | + |
3134 | + interpret Super_R { |
3135 | + action = SetMods(modifiers=Super); |
3136 | + }; |
3137 | + |
3138 | + // Sets the "Hyper" virtual modifier. |
3139 | + |
3140 | + interpret Hyper_L+Any { |
3141 | + //useModMapMods= level1; |
3142 | virtualModifier= Hyper; |
3143 | action = SetMods(modifiers=modMapMods); |
3144 | }; |
3145 | |
3146 | - interpret Hyper_L { |
3147 | + interpret Hyper_L { |
3148 | action = SetMods(modifiers=Hyper); |
3149 | }; |
3150 | |
3151 | - interpret Hyper_R+Any { |
3152 | + interpret Hyper_R+Any { |
3153 | //useModMapMods= level1; |
3154 | virtualModifier= Hyper; |
3155 | action = SetMods(modifiers=modMapMods); |
3156 | }; |
3157 | |
3158 | - interpret Hyper_R { |
3159 | + interpret Hyper_R { |
3160 | action = SetMods(modifiers=Hyper); |
3161 | }; |
3162 | |
3163 | // Sets the "ScrollLock" virtual modifier and |
3164 | // makes it actually lock when pressed. Sets |
3165 | // up a map for the scroll lock indicator. |
3166 | - interpret Scroll_Lock+Any { |
3167 | + interpret Scroll_Lock+Any { |
3168 | virtualModifier= ScrollLock; |
3169 | action = LockMods(modifiers=modMapMods); |
3170 | }; |
3171 | |
3172 | include "ledscroll" |
3173 | - |
3174 | + |
3175 | include "misc(assign_shift_left_action)" |
3176 | }; |
3177 | |
3178 | -partial xkb_compatibility "assign_shift_left_action" { |
3179 | - // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is |
3180 | - // getting bound to the Lock modifier when using |
3181 | - // symbols/shift(both_capslock), creating unwanted behaviour. |
3182 | +partial xkb_compatibility "assign_shift_left_action" { |
3183 | + // Because of the irrevertable modifier mapping in symbols/pc, |
3184 | + // <LFSH> is getting bound to the Lock modifier when using |
3185 | + // symbols/shift(both_capslock), creating unwanted behaviour. |
3186 | // This is a quirk, to circumvent the problem. |
3187 | interpret Shift_L { |
3188 | - action = SetMods(modifiers = Shift); |
3189 | + action = SetMods(modifiers = Shift); |
3190 | }; |
3191 | }; |
3192 | |
3193 | === modified file 'compat/mousekeys' |
3194 | --- compat/mousekeys 2011-04-06 02:41:25 +0000 |
3195 | +++ compat/mousekeys 2014-05-13 12:44:26 +0000 |
3196 | @@ -1,147 +1,147 @@ |
3197 | -// Interpretations for arrow keys and a bunch of other |
3198 | -// common keysyms which make it possible to bind "mouse" |
3199 | -// keys using xmodmap and activate or deactivate them |
3200 | -// from the keyboard. |
3201 | +// Interpretations for arrow keys and a bunch of |
3202 | +// other common keysyms which make it possible to |
3203 | +// bind "mouse" keys using xmodmap and activate or |
3204 | +// deactivate them from the keyboard. |
3205 | |
3206 | default partial xkb_compatibility "mousekeys" { |
3207 | |
3208 | // Keypad actions. |
3209 | - // |
3210 | + |
3211 | interpret.repeat= True; |
3212 | |
3213 | - interpret KP_1 { |
3214 | - action = MovePtr(x=-1,y= +1); |
3215 | - }; |
3216 | - interpret KP_End { |
3217 | - action = MovePtr(x=-1,y= +1); |
3218 | - }; |
3219 | - |
3220 | - interpret KP_2 { |
3221 | - action = MovePtr(x=+0,y= +1); |
3222 | - }; |
3223 | - interpret KP_Down { |
3224 | - action = MovePtr(x=+0,y= +1); |
3225 | - }; |
3226 | - |
3227 | - interpret KP_3 { |
3228 | - action = MovePtr(x=+1,y=+1); |
3229 | - }; |
3230 | - interpret KP_Next { |
3231 | - action = MovePtr(x=+1,y=+1); |
3232 | - }; |
3233 | - |
3234 | - interpret KP_4 { |
3235 | - action = MovePtr(x=-1,y=+0); |
3236 | - }; |
3237 | - interpret KP_Left { |
3238 | - action = MovePtr(x=-1,y=+0); |
3239 | - }; |
3240 | - |
3241 | - interpret KP_6 { |
3242 | - action = MovePtr(x=+1,y=+0); |
3243 | - }; |
3244 | - interpret KP_Right { |
3245 | - action = MovePtr(x=+1,y=+0); |
3246 | - }; |
3247 | - |
3248 | - interpret KP_7 { |
3249 | - action = MovePtr(x=-1,y=-1); |
3250 | - }; |
3251 | - interpret KP_Home { |
3252 | - action = MovePtr(x=-1,y=-1); |
3253 | - }; |
3254 | - |
3255 | - interpret KP_8 { |
3256 | - action = MovePtr(x=+0,y=-1); |
3257 | - }; |
3258 | - interpret KP_Up { |
3259 | - action = MovePtr(x=+0,y=-1); |
3260 | - }; |
3261 | - |
3262 | - interpret KP_9 { |
3263 | - action = MovePtr(x=+1,y=-1); |
3264 | - }; |
3265 | - interpret KP_Prior { |
3266 | - action = MovePtr(x=+1,y=-1); |
3267 | - }; |
3268 | - |
3269 | - interpret KP_5 { |
3270 | - action = PointerButton(button=default); |
3271 | - }; |
3272 | - interpret KP_Begin { |
3273 | - action = PointerButton(button=default); |
3274 | - }; |
3275 | - |
3276 | - interpret KP_F2 { |
3277 | - action = SetPtrDflt(affect=defaultButton,button=1); |
3278 | - }; |
3279 | - interpret KP_Divide { |
3280 | - action = SetPtrDflt(affect=defaultButton,button=1); |
3281 | - }; |
3282 | - |
3283 | - interpret KP_F3 { |
3284 | - action = SetPtrDflt(affect=defaultButton,button=2); |
3285 | - }; |
3286 | - interpret KP_Multiply { |
3287 | - action = SetPtrDflt(affect=defaultButton,button=2); |
3288 | - }; |
3289 | - |
3290 | - interpret KP_F4 { |
3291 | - action = SetPtrDflt(affect=defaultButton,button=3); |
3292 | - }; |
3293 | - interpret KP_Subtract { |
3294 | - action = SetPtrDflt(affect=defaultButton,button=3); |
3295 | - }; |
3296 | - |
3297 | - interpret KP_Separator { |
3298 | - action = PointerButton(button=default,count=2); |
3299 | - }; |
3300 | - interpret KP_Add { |
3301 | - action = PointerButton(button=default,count=2); |
3302 | - }; |
3303 | - |
3304 | - interpret KP_0 { |
3305 | - action = LockPointerButton(button=default,affect=lock); |
3306 | - }; |
3307 | - interpret KP_Insert { |
3308 | - action = LockPointerButton(button=default,affect=lock); |
3309 | - }; |
3310 | - |
3311 | - interpret KP_Decimal { |
3312 | - action = LockPointerButton(button=default,affect=unlock); |
3313 | - }; |
3314 | - interpret KP_Delete { |
3315 | - action = LockPointerButton(button=default,affect=unlock); |
3316 | - }; |
3317 | - |
3318 | - // Additional mappings for Solaris keypad compatibility |
3319 | + interpret KP_1 { |
3320 | + action = MovePtr(x=-1,y= +1); |
3321 | + }; |
3322 | + interpret KP_End { |
3323 | + action = MovePtr(x=-1,y= +1); |
3324 | + }; |
3325 | + |
3326 | + interpret KP_2 { |
3327 | + action = MovePtr(x=+0,y= +1); |
3328 | + }; |
3329 | + interpret KP_Down { |
3330 | + action = MovePtr(x=+0,y= +1); |
3331 | + }; |
3332 | + |
3333 | + interpret KP_3 { |
3334 | + action = MovePtr(x=+1,y=+1); |
3335 | + }; |
3336 | + interpret KP_Next { |
3337 | + action = MovePtr(x=+1,y=+1); |
3338 | + }; |
3339 | + |
3340 | + interpret KP_4 { |
3341 | + action = MovePtr(x=-1,y=+0); |
3342 | + }; |
3343 | + interpret KP_Left { |
3344 | + action = MovePtr(x=-1,y=+0); |
3345 | + }; |
3346 | + |
3347 | + interpret KP_6 { |
3348 | + action = MovePtr(x=+1,y=+0); |
3349 | + }; |
3350 | + interpret KP_Right { |
3351 | + action = MovePtr(x=+1,y=+0); |
3352 | + }; |
3353 | + |
3354 | + interpret KP_7 { |
3355 | + action = MovePtr(x=-1,y=-1); |
3356 | + }; |
3357 | + interpret KP_Home { |
3358 | + action = MovePtr(x=-1,y=-1); |
3359 | + }; |
3360 | + |
3361 | + interpret KP_8 { |
3362 | + action = MovePtr(x=+0,y=-1); |
3363 | + }; |
3364 | + interpret KP_Up { |
3365 | + action = MovePtr(x=+0,y=-1); |
3366 | + }; |
3367 | + |
3368 | + interpret KP_9 { |
3369 | + action = MovePtr(x=+1,y=-1); |
3370 | + }; |
3371 | + interpret KP_Prior { |
3372 | + action = MovePtr(x=+1,y=-1); |
3373 | + }; |
3374 | + |
3375 | + interpret KP_5 { |
3376 | + action = PointerButton(button=default); |
3377 | + }; |
3378 | + interpret KP_Begin { |
3379 | + action = PointerButton(button=default); |
3380 | + }; |
3381 | + |
3382 | + interpret KP_F2 { |
3383 | + action = SetPtrDflt(affect=defaultButton,button=1); |
3384 | + }; |
3385 | + interpret KP_Divide { |
3386 | + action = SetPtrDflt(affect=defaultButton,button=1); |
3387 | + }; |
3388 | + |
3389 | + interpret KP_F3 { |
3390 | + action = SetPtrDflt(affect=defaultButton,button=2); |
3391 | + }; |
3392 | + interpret KP_Multiply { |
3393 | + action = SetPtrDflt(affect=defaultButton,button=2); |
3394 | + }; |
3395 | + |
3396 | + interpret KP_F4 { |
3397 | + action = SetPtrDflt(affect=defaultButton,button=3); |
3398 | + }; |
3399 | + interpret KP_Subtract { |
3400 | + action = SetPtrDflt(affect=defaultButton,button=3); |
3401 | + }; |
3402 | + |
3403 | + interpret KP_Separator { |
3404 | + action = PointerButton(button=default,count=2); |
3405 | + }; |
3406 | + interpret KP_Add { |
3407 | + action = PointerButton(button=default,count=2); |
3408 | + }; |
3409 | + |
3410 | + interpret KP_0 { |
3411 | + action = LockPointerButton(button=default,affect=lock); |
3412 | + }; |
3413 | + interpret KP_Insert { |
3414 | + action = LockPointerButton(button=default,affect=lock); |
3415 | + }; |
3416 | + |
3417 | + interpret KP_Decimal { |
3418 | + action = LockPointerButton(button=default,affect=unlock); |
3419 | + }; |
3420 | + interpret KP_Delete { |
3421 | + action = LockPointerButton(button=default,affect=unlock); |
3422 | + }; |
3423 | + |
3424 | + // Additional mappings for Solaris keypad compatibility. |
3425 | + |
3426 | interpret F25 { // aka KP_Divide |
3427 | - action = SetPtrDflt(affect=defaultButton,button=1); |
3428 | + action = SetPtrDflt(affect=defaultButton,button=1); |
3429 | }; |
3430 | interpret F26 { // aka KP_Multiply |
3431 | - action = SetPtrDflt(affect=defaultButton,button=2); |
3432 | + action = SetPtrDflt(affect=defaultButton,button=2); |
3433 | }; |
3434 | interpret F27 { // aka KP_Home |
3435 | - action = MovePtr(x=-1,y=-1); |
3436 | + action = MovePtr(x=-1,y=-1); |
3437 | }; |
3438 | interpret F29 { // aka KP_Prior |
3439 | - action = MovePtr(x=+1,y=-1); |
3440 | + action = MovePtr(x=+1,y=-1); |
3441 | }; |
3442 | interpret F31 { // aka KP_Begin |
3443 | - action = PointerButton(button=default); |
3444 | + action = PointerButton(button=default); |
3445 | }; |
3446 | interpret F33 { // aka KP_End |
3447 | - action = MovePtr(x=-1,y= +1); |
3448 | + action = MovePtr(x=-1,y= +1); |
3449 | }; |
3450 | interpret F35 { // aka KP_Next |
3451 | - action = MovePtr(x=+1,y=+1); |
3452 | + action = MovePtr(x=+1,y=+1); |
3453 | }; |
3454 | |
3455 | interpret.repeat= False; |
3456 | |
3457 | + // New keysym actions. |
3458 | |
3459 | - // New Keysym Actions. |
3460 | - // |
3461 | interpret Pointer_Button_Dflt { |
3462 | action= PointerButton(button=default); |
3463 | }; |
3464 | @@ -166,7 +166,7 @@ |
3465 | interpret Pointer_DblClick3 { |
3466 | action= PointerButton(button=3,count=2); |
3467 | }; |
3468 | - interpret Pointer_Drag_Dflt { |
3469 | + interpret Pointer_Drag_Dflt { |
3470 | action= LockPointerButton(button=default); |
3471 | }; |
3472 | interpret Pointer_Drag1 { |
3473 | @@ -192,10 +192,9 @@ |
3474 | action= SetPtrDflt(affect=defaultButton,button= -1); |
3475 | }; |
3476 | |
3477 | - |
3478 | // Allow an indicator for MouseKeys. |
3479 | indicator "Mouse Keys" { |
3480 | -// !allowExplicit; |
3481 | + //!allowExplicit; |
3482 | indicatorDrivesKeyboard; |
3483 | controls= MouseKeys; |
3484 | }; |
3485 | |
3486 | === modified file 'compat/olpc' |
3487 | --- compat/olpc 2011-05-24 12:13:34 +0000 |
3488 | +++ compat/olpc 2014-05-13 12:44:26 +0000 |
3489 | @@ -1,51 +1,51 @@ |
3490 | // |
3491 | +// Map the OLPC game keys to virtual modifiers. |
3492 | +// |
3493 | // Created by Bernardo Innocenti <bernie@codewiz.org> |
3494 | // |
3495 | -// Map the OLPC game keys to virtual modifiers |
3496 | -// |
3497 | |
3498 | -default xkb_compatibility "olpc" { |
3499 | +default xkb_compatibility "olpc" { |
3500 | include "complete" |
3501 | |
3502 | virtual_modifiers Square,Cross,Triangle,Circle; |
3503 | |
3504 | - interpret KP_Home+Any { |
3505 | - //useModMapMods= level1; |
3506 | - virtualModifier= Square; |
3507 | - action = SetMods(modifiers=modMapMods); |
3508 | - }; |
3509 | - |
3510 | - interpret KP_Home { |
3511 | - action = SetMods(modifiers=Square); |
3512 | - }; |
3513 | - |
3514 | - interpret KP_Next+Any { |
3515 | - //useModMapMods= level1; |
3516 | - virtualModifier= Cross; |
3517 | - action = SetMods(modifiers=modMapMods); |
3518 | - }; |
3519 | - |
3520 | - interpret KP_Next { |
3521 | - action = SetMods(modifiers=Cross); |
3522 | - }; |
3523 | - |
3524 | - interpret KP_End+Any { |
3525 | - //useModMapMods= level1; |
3526 | - virtualModifier= Circle; |
3527 | - action = SetMods(modifiers=modMapMods); |
3528 | - }; |
3529 | - |
3530 | - interpret KP_End { |
3531 | - action = SetMods(modifiers=Circle); |
3532 | - }; |
3533 | - |
3534 | - interpret KP_Prior+Any { |
3535 | - //useModMapMods= level1; |
3536 | - virtualModifier= Triangle; |
3537 | - action = SetMods(modifiers=modMapMods); |
3538 | + interpret KP_Home+Any { |
3539 | + //useModMapMods= level1; |
3540 | + virtualModifier= Square; |
3541 | + action = SetMods(modifiers=modMapMods); |
3542 | + }; |
3543 | + |
3544 | + interpret KP_Home { |
3545 | + action = SetMods(modifiers=Square); |
3546 | + }; |
3547 | + |
3548 | + interpret KP_Next+Any { |
3549 | + //useModMapMods= level1; |
3550 | + virtualModifier= Cross; |
3551 | + action = SetMods(modifiers=modMapMods); |
3552 | + }; |
3553 | + |
3554 | + interpret KP_Next { |
3555 | + action = SetMods(modifiers=Cross); |
3556 | + }; |
3557 | + |
3558 | + interpret KP_End+Any { |
3559 | + //useModMapMods= level1; |
3560 | + virtualModifier= Circle; |
3561 | + action = SetMods(modifiers=modMapMods); |
3562 | + }; |
3563 | + |
3564 | + interpret KP_End { |
3565 | + action = SetMods(modifiers=Circle); |
3566 | + }; |
3567 | + |
3568 | + interpret KP_Prior+Any { |
3569 | + //useModMapMods= level1; |
3570 | + virtualModifier= Triangle; |
3571 | + action = SetMods(modifiers=modMapMods); |
3572 | }; |
3573 | |
3574 | interpret KP_Prior { |
3575 | - action = SetMods(modifiers=Triangle); |
3576 | + action = SetMods(modifiers=Triangle); |
3577 | }; |
3578 | }; |
3579 | |
3580 | === modified file 'compat/pc' |
3581 | --- compat/pc 2011-04-06 02:41:25 +0000 |
3582 | +++ compat/pc 2014-05-13 12:44:26 +0000 |
3583 | @@ -1,16 +1,16 @@ |
3584 | -default partial xkb_compatibility "pc" { |
3585 | - |
3586 | - // Sets the "Alt" virtual modifier |
3587 | - |
3588 | - virtual_modifiers Alt; |
3589 | +default partial xkb_compatibility "pc" { |
3590 | + |
3591 | + // Sets the "Alt" virtual modifier. |
3592 | + |
3593 | + virtual_modifiers Alt; |
3594 | |
3595 | setMods.clearLocks= True; |
3596 | - interpret Alt_L+Any { |
3597 | + interpret Alt_L+Any { |
3598 | virtualModifier= Alt; |
3599 | action = SetMods(modifiers=modMapMods); |
3600 | }; |
3601 | |
3602 | - interpret Alt_R+Any { |
3603 | + interpret Alt_R+Any { |
3604 | virtualModifier= Alt; |
3605 | action = SetMods(modifiers=modMapMods); |
3606 | }; |
3607 | |
3608 | === modified file 'compat/pc98' |
3609 | --- compat/pc98 2011-04-06 02:41:25 +0000 |
3610 | +++ compat/pc98 2014-05-13 12:44:26 +0000 |
3611 | @@ -1,10 +1,11 @@ |
3612 | -// Minimal set of symbol interpretations to provide |
3613 | -// reasonable default behavior (Num lock, shift and |
3614 | -// caps lock and mode switch) and set up the |
3615 | -// automatic updating of common keyboard LEDs. |
3616 | - |
3617 | -default xkb_compatibility "basic" { |
3618 | - virtual_modifiers NumLock,AltGr; |
3619 | +// Minimal set of symbol interpretations to provide |
3620 | +// reasonable default behavior (Num lock, Shift lock, |
3621 | +// and Mode switch) and set up the automatic updating |
3622 | +// of common keyboard LEDs. |
3623 | + |
3624 | +default xkb_compatibility "basic" { |
3625 | + |
3626 | + virtual_modifiers NumLock,AltGr; |
3627 | |
3628 | interpret.repeat= False; |
3629 | setMods.clearLocks= True; |
3630 | @@ -17,7 +18,7 @@ |
3631 | |
3632 | // interpret Any+Lock { |
3633 | // action= LockMods(modifiers=Lock); |
3634 | -// }; |
3635 | +// }; |
3636 | |
3637 | interpret Num_Lock+Any { |
3638 | virtualModifier= NumLock; |
3639 | @@ -39,7 +40,7 @@ |
3640 | group 4 = AltGr; |
3641 | |
3642 | indicator.allowExplicit= False; |
3643 | - indicator "Caps Lock" { |
3644 | + indicator "Caps Lock" { |
3645 | whichModState= Locked; |
3646 | modifiers= Lock; |
3647 | }; |
3648 | |
3649 | === modified file 'compat/xfree86' |
3650 | --- compat/xfree86 2012-01-20 18:21:03 +0000 |
3651 | +++ compat/xfree86 2014-05-13 12:44:26 +0000 |
3652 | @@ -1,6 +1,6 @@ |
3653 | -// XFree86 special keysyms |
3654 | +// XFree86 special keysyms. |
3655 | |
3656 | -default partial xkb_compatibility "basic" { |
3657 | +default partial xkb_compatibility "basic" { |
3658 | |
3659 | interpret.repeat= True; |
3660 | |
3661 | |
3662 | === modified file 'compat/xtest' |
3663 | --- compat/xtest 2011-04-06 02:41:25 +0000 |
3664 | +++ compat/xtest 2014-05-13 12:44:26 +0000 |
3665 | @@ -1,18 +1,17 @@ |
3666 | -default xkb_compatibility "xtest" { |
3667 | +default xkb_compatibility "xtest" { |
3668 | |
3669 | // Minimal set of symbol interpretations to provide |
3670 | - // reasonable behavior for testing. The X Test |
3671 | - // Suite assumes that it can set any modifier by |
3672 | - // simulating a KeyPress and clear it by simulating |
3673 | - // a KeyRelease. Because of the way that XKB |
3674 | - // implements locking/latching modifiers, this |
3675 | - // approach fails in some cases (typically the |
3676 | - // lock or num lock modifiers). These symbol |
3677 | - // interpretations make all modifier keys just |
3678 | - // set the corresponding modifier so that xtest |
3679 | + // reasonable behavior for testing. |
3680 | + // The X Test Suite assumes that it can set any modifier |
3681 | + // by simulating a KeyPress and clear it by simulating a |
3682 | + // KeyRelease. Because of the way that XKB implements |
3683 | + // locking/latching modifiers, this approach fails in |
3684 | + // some cases (typically the Lock or NumLock modifiers). |
3685 | + // These symbol interpretations make all modifier keys |
3686 | + // just set the corresponding modifier so that xtest |
3687 | // will see the behavior it expects. |
3688 | |
3689 | - virtual_modifiers NumLock,AltGr; |
3690 | + virtual_modifiers NumLock,AltGr; |
3691 | |
3692 | interpret.repeat= False; |
3693 | setMods.clearLocks= True; |
3694 | @@ -43,7 +42,7 @@ |
3695 | group 4 = AltGr; |
3696 | |
3697 | indicator.allowExplicit= False; |
3698 | - indicator "Caps Lock" { |
3699 | + indicator "Caps Lock" { |
3700 | modifiers= Lock; |
3701 | }; |
3702 | indicator "Num Lock" { |
3703 | |
3704 | === modified file 'config.guess' |
3705 | --- config.guess 2013-12-22 16:37:56 +0000 |
3706 | +++ config.guess 2014-05-13 12:44:26 +0000 |
3707 | @@ -1,8 +1,10 @@ |
3708 | #! /bin/sh |
3709 | # Attempt to guess a canonical system name. |
3710 | -# Copyright 1992-2013 Free Software Foundation, Inc. |
3711 | +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3712 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
3713 | +# 2011, 2012, 2013 Free Software Foundation, Inc. |
3714 | |
3715 | -timestamp='2013-06-10' |
3716 | +timestamp='2012-12-29' |
3717 | |
3718 | # This file is free software; you can redistribute it and/or modify it |
3719 | # under the terms of the GNU General Public License as published by |
3720 | @@ -24,7 +26,7 @@ |
3721 | # program. This Exception is an additional permission under section 7 |
3722 | # of the GNU General Public License, version 3 ("GPLv3"). |
3723 | # |
3724 | -# Originally written by Per Bothner. |
3725 | +# Originally written by Per Bothner. |
3726 | # |
3727 | # You can get the latest version of this script from: |
3728 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
3729 | @@ -50,7 +52,9 @@ |
3730 | GNU config.guess ($timestamp) |
3731 | |
3732 | Originally written by Per Bothner. |
3733 | -Copyright 1992-2013 Free Software Foundation, Inc. |
3734 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
3735 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |
3736 | +2012, 2013 Free Software Foundation, Inc. |
3737 | |
3738 | This is free software; see the source for copying conditions. There is NO |
3739 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
3740 | @@ -132,27 +136,6 @@ |
3741 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
3742 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
3743 | |
3744 | -case "${UNAME_SYSTEM}" in |
3745 | -Linux|GNU|GNU/*) |
3746 | - # If the system lacks a compiler, then just pick glibc. |
3747 | - # We could probably try harder. |
3748 | - LIBC=gnu |
3749 | - |
3750 | - eval $set_cc_for_build |
3751 | - cat <<-EOF > $dummy.c |
3752 | - #include <features.h> |
3753 | - #if defined(__UCLIBC__) |
3754 | - LIBC=uclibc |
3755 | - #elif defined(__dietlibc__) |
3756 | - LIBC=dietlibc |
3757 | - #else |
3758 | - LIBC=gnu |
3759 | - #endif |
3760 | - EOF |
3761 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
3762 | - ;; |
3763 | -esac |
3764 | - |
3765 | # Note: order is significant - the case branches are not exclusive. |
3766 | |
3767 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
3768 | @@ -874,21 +857,21 @@ |
3769 | exit ;; |
3770 | *:GNU:*:*) |
3771 | # the GNU system |
3772 | - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
3773 | + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
3774 | exit ;; |
3775 | *:GNU/*:*:*) |
3776 | # other systems with GNU libc and userland |
3777 | - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} |
3778 | + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
3779 | exit ;; |
3780 | i*86:Minix:*:*) |
3781 | echo ${UNAME_MACHINE}-pc-minix |
3782 | exit ;; |
3783 | aarch64:Linux:*:*) |
3784 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3785 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3786 | exit ;; |
3787 | aarch64_be:Linux:*:*) |
3788 | UNAME_MACHINE=aarch64_be |
3789 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3790 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3791 | exit ;; |
3792 | alpha:Linux:*:*) |
3793 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
3794 | @@ -901,54 +884,59 @@ |
3795 | EV68*) UNAME_MACHINE=alphaev68 ;; |
3796 | esac |
3797 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
3798 | - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
3799 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3800 | - exit ;; |
3801 | - arc:Linux:*:* | arceb:Linux:*:*) |
3802 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3803 | + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
3804 | + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
3805 | exit ;; |
3806 | arm*:Linux:*:*) |
3807 | eval $set_cc_for_build |
3808 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
3809 | | grep -q __ARM_EABI__ |
3810 | then |
3811 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3812 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3813 | else |
3814 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
3815 | | grep -q __ARM_PCS_VFP |
3816 | then |
3817 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi |
3818 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
3819 | else |
3820 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf |
3821 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
3822 | fi |
3823 | fi |
3824 | exit ;; |
3825 | avr32*:Linux:*:*) |
3826 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3827 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3828 | exit ;; |
3829 | cris:Linux:*:*) |
3830 | - echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
3831 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
3832 | exit ;; |
3833 | crisv32:Linux:*:*) |
3834 | - echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
3835 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
3836 | exit ;; |
3837 | frv:Linux:*:*) |
3838 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3839 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3840 | exit ;; |
3841 | hexagon:Linux:*:*) |
3842 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3843 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3844 | exit ;; |
3845 | i*86:Linux:*:*) |
3846 | - echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
3847 | + LIBC=gnu |
3848 | + eval $set_cc_for_build |
3849 | + sed 's/^ //' << EOF >$dummy.c |
3850 | + #ifdef __dietlibc__ |
3851 | + LIBC=dietlibc |
3852 | + #endif |
3853 | +EOF |
3854 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
3855 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
3856 | exit ;; |
3857 | ia64:Linux:*:*) |
3858 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3859 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3860 | exit ;; |
3861 | m32r*:Linux:*:*) |
3862 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3863 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3864 | exit ;; |
3865 | m68*:Linux:*:*) |
3866 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3867 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3868 | exit ;; |
3869 | mips:Linux:*:* | mips64:Linux:*:*) |
3870 | eval $set_cc_for_build |
3871 | @@ -967,63 +955,54 @@ |
3872 | #endif |
3873 | EOF |
3874 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
3875 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
3876 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
3877 | ;; |
3878 | - or1k:Linux:*:*) |
3879 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3880 | - exit ;; |
3881 | or32:Linux:*:*) |
3882 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3883 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3884 | exit ;; |
3885 | padre:Linux:*:*) |
3886 | - echo sparc-unknown-linux-${LIBC} |
3887 | + echo sparc-unknown-linux-gnu |
3888 | exit ;; |
3889 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
3890 | - echo hppa64-unknown-linux-${LIBC} |
3891 | + echo hppa64-unknown-linux-gnu |
3892 | exit ;; |
3893 | parisc:Linux:*:* | hppa:Linux:*:*) |
3894 | # Look for CPU level |
3895 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
3896 | - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; |
3897 | - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; |
3898 | - *) echo hppa-unknown-linux-${LIBC} ;; |
3899 | + PA7*) echo hppa1.1-unknown-linux-gnu ;; |
3900 | + PA8*) echo hppa2.0-unknown-linux-gnu ;; |
3901 | + *) echo hppa-unknown-linux-gnu ;; |
3902 | esac |
3903 | exit ;; |
3904 | ppc64:Linux:*:*) |
3905 | - echo powerpc64-unknown-linux-${LIBC} |
3906 | + echo powerpc64-unknown-linux-gnu |
3907 | exit ;; |
3908 | ppc:Linux:*:*) |
3909 | - echo powerpc-unknown-linux-${LIBC} |
3910 | - exit ;; |
3911 | - ppc64le:Linux:*:*) |
3912 | - echo powerpc64le-unknown-linux-${LIBC} |
3913 | - exit ;; |
3914 | - ppcle:Linux:*:*) |
3915 | - echo powerpcle-unknown-linux-${LIBC} |
3916 | + echo powerpc-unknown-linux-gnu |
3917 | exit ;; |
3918 | s390:Linux:*:* | s390x:Linux:*:*) |
3919 | - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} |
3920 | + echo ${UNAME_MACHINE}-ibm-linux |
3921 | exit ;; |
3922 | sh64*:Linux:*:*) |
3923 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3924 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3925 | exit ;; |
3926 | sh*:Linux:*:*) |
3927 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3928 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3929 | exit ;; |
3930 | sparc:Linux:*:* | sparc64:Linux:*:*) |
3931 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3932 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3933 | exit ;; |
3934 | tile*:Linux:*:*) |
3935 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3936 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3937 | exit ;; |
3938 | vax:Linux:*:*) |
3939 | - echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
3940 | + echo ${UNAME_MACHINE}-dec-linux-gnu |
3941 | exit ;; |
3942 | x86_64:Linux:*:*) |
3943 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3944 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3945 | exit ;; |
3946 | xtensa*:Linux:*:*) |
3947 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3948 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
3949 | exit ;; |
3950 | i*86:DYNIX/ptx:4*:*) |
3951 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
3952 | @@ -1256,21 +1235,19 @@ |
3953 | exit ;; |
3954 | *:Darwin:*:*) |
3955 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
3956 | - eval $set_cc_for_build |
3957 | - if test "$UNAME_PROCESSOR" = unknown ; then |
3958 | - UNAME_PROCESSOR=powerpc |
3959 | - fi |
3960 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
3961 | - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
3962 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
3963 | - grep IS_64BIT_ARCH >/dev/null |
3964 | - then |
3965 | - case $UNAME_PROCESSOR in |
3966 | - i386) UNAME_PROCESSOR=x86_64 ;; |
3967 | - powerpc) UNAME_PROCESSOR=powerpc64 ;; |
3968 | - esac |
3969 | - fi |
3970 | - fi |
3971 | + case $UNAME_PROCESSOR in |
3972 | + i386) |
3973 | + eval $set_cc_for_build |
3974 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
3975 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
3976 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
3977 | + grep IS_64BIT_ARCH >/dev/null |
3978 | + then |
3979 | + UNAME_PROCESSOR="x86_64" |
3980 | + fi |
3981 | + fi ;; |
3982 | + unknown) UNAME_PROCESSOR=powerpc ;; |
3983 | + esac |
3984 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
3985 | exit ;; |
3986 | *:procnto*:*:* | *:QNX:[0123456789]*:*) |
3987 | |
3988 | === modified file 'config.sub' |
3989 | --- config.sub 2013-12-22 16:37:56 +0000 |
3990 | +++ config.sub 2014-05-13 12:44:26 +0000 |
3991 | @@ -1,8 +1,10 @@ |
3992 | #! /bin/sh |
3993 | # Configuration validation subroutine script. |
3994 | -# Copyright 1992-2013 Free Software Foundation, Inc. |
3995 | +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
3996 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
3997 | +# 2011, 2012, 2013 Free Software Foundation, Inc. |
3998 | |
3999 | -timestamp='2013-04-24' |
4000 | +timestamp='2012-12-29' |
4001 | |
4002 | # This file is free software; you can redistribute it and/or modify it |
4003 | # under the terms of the GNU General Public License as published by |
4004 | @@ -68,7 +70,9 @@ |
4005 | version="\ |
4006 | GNU config.sub ($timestamp) |
4007 | |
4008 | -Copyright 1992-2013 Free Software Foundation, Inc. |
4009 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4010 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |
4011 | +2012, 2013 Free Software Foundation, Inc. |
4012 | |
4013 | This is free software; see the source for copying conditions. There is NO |
4014 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4015 | @@ -252,7 +256,7 @@ |
4016 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
4017 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
4018 | | am33_2.0 \ |
4019 | - | arc | arceb \ |
4020 | + | arc \ |
4021 | | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ |
4022 | | avr | avr32 \ |
4023 | | be32 | be64 \ |
4024 | @@ -286,17 +290,16 @@ |
4025 | | mipsisa64r2 | mipsisa64r2el \ |
4026 | | mipsisa64sb1 | mipsisa64sb1el \ |
4027 | | mipsisa64sr71k | mipsisa64sr71kel \ |
4028 | - | mipsr5900 | mipsr5900el \ |
4029 | | mipstx39 | mipstx39el \ |
4030 | | mn10200 | mn10300 \ |
4031 | | moxie \ |
4032 | | mt \ |
4033 | | msp430 \ |
4034 | | nds32 | nds32le | nds32be \ |
4035 | - | nios | nios2 | nios2eb | nios2el \ |
4036 | + | nios | nios2 \ |
4037 | | ns16k | ns32k \ |
4038 | | open8 \ |
4039 | - | or1k | or32 \ |
4040 | + | or32 \ |
4041 | | pdp10 | pdp11 | pj | pjl \ |
4042 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4043 | | pyramid \ |
4044 | @@ -366,7 +369,7 @@ |
4045 | | aarch64-* | aarch64_be-* \ |
4046 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
4047 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
4048 | - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
4049 | + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
4050 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
4051 | | avr-* | avr32-* \ |
4052 | | be32-* | be64-* \ |
4053 | @@ -404,13 +407,12 @@ |
4054 | | mipsisa64r2-* | mipsisa64r2el-* \ |
4055 | | mipsisa64sb1-* | mipsisa64sb1el-* \ |
4056 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
4057 | - | mipsr5900-* | mipsr5900el-* \ |
4058 | | mipstx39-* | mipstx39el-* \ |
4059 | | mmix-* \ |
4060 | | mt-* \ |
4061 | | msp430-* \ |
4062 | | nds32-* | nds32le-* | nds32be-* \ |
4063 | - | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
4064 | + | nios-* | nios2-* \ |
4065 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4066 | | open8-* \ |
4067 | | orion-* \ |
4068 | @@ -1352,7 +1354,7 @@ |
4069 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
4070 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
4071 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
4072 | - | -sym* | -kopensolaris* | -plan9* \ |
4073 | + | -sym* | -kopensolaris* \ |
4074 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
4075 | | -aos* | -aros* \ |
4076 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
4077 | @@ -1498,6 +1500,9 @@ |
4078 | -aros*) |
4079 | os=-aros |
4080 | ;; |
4081 | + -kaos*) |
4082 | + os=-kaos |
4083 | + ;; |
4084 | -zvmoe) |
4085 | os=-zvmoe |
4086 | ;; |
4087 | @@ -1589,9 +1594,6 @@ |
4088 | mips*-*) |
4089 | os=-elf |
4090 | ;; |
4091 | - or1k-*) |
4092 | - os=-elf |
4093 | - ;; |
4094 | or32-*) |
4095 | os=-coff |
4096 | ;; |
4097 | |
4098 | === modified file 'configure' |
4099 | --- configure 2013-12-22 16:37:56 +0000 |
4100 | +++ configure 2014-05-13 12:44:26 +0000 |
4101 | @@ -1,6 +1,6 @@ |
4102 | #! /bin/sh |
4103 | # Guess values for system-dependent variables and create Makefiles. |
4104 | -# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.10.1. |
4105 | +# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.11. |
4106 | # |
4107 | # |
4108 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
4109 | @@ -577,8 +577,8 @@ |
4110 | # Identity of this package. |
4111 | PACKAGE_NAME='xkeyboard-config' |
4112 | PACKAGE_TARNAME='xkeyboard-config' |
4113 | -PACKAGE_VERSION='2.10.1' |
4114 | -PACKAGE_STRING='xkeyboard-config 2.10.1' |
4115 | +PACKAGE_VERSION='2.11' |
4116 | +PACKAGE_STRING='xkeyboard-config 2.11' |
4117 | PACKAGE_BUGREPORT='' |
4118 | PACKAGE_URL='' |
4119 | |
4120 | @@ -1334,7 +1334,7 @@ |
4121 | # Omit some internal or obsolete options to make the list less imposing. |
4122 | # This message is too long to be a string in the A/UX 3.1 sh. |
4123 | cat <<_ACEOF |
4124 | -\`configure' configures xkeyboard-config 2.10.1 to adapt to many kinds of systems. |
4125 | +\`configure' configures xkeyboard-config 2.11 to adapt to many kinds of systems. |
4126 | |
4127 | Usage: $0 [OPTION]... [VAR=VALUE]... |
4128 | |
4129 | @@ -1405,7 +1405,7 @@ |
4130 | |
4131 | if test -n "$ac_init_help"; then |
4132 | case $ac_init_help in |
4133 | - short | recursive ) echo "Configuration of xkeyboard-config 2.10.1:";; |
4134 | + short | recursive ) echo "Configuration of xkeyboard-config 2.11:";; |
4135 | esac |
4136 | cat <<\_ACEOF |
4137 | |
4138 | @@ -1434,7 +1434,7 @@ |
4139 | (default: auto) |
4140 | --with-xkb-base=DIR XKB base path [DATADIR/X11/xkb] |
4141 | --with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg) |
4142 | - --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
4143 | + --with-gnu-ld assume the C compiler uses GNU ld default=no |
4144 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
4145 | --without-libiconv-prefix don't search for libiconv in includedir and libdir |
4146 | --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib |
4147 | @@ -1524,7 +1524,7 @@ |
4148 | test -n "$ac_init_help" && exit $ac_status |
4149 | if $ac_init_version; then |
4150 | cat <<\_ACEOF |
4151 | -xkeyboard-config configure 2.10.1 |
4152 | +xkeyboard-config configure 2.11 |
4153 | generated by GNU Autoconf 2.69 |
4154 | |
4155 | Copyright (C) 2012 Free Software Foundation, Inc. |
4156 | @@ -1771,7 +1771,7 @@ |
4157 | This file contains any messages produced by compilers while |
4158 | running configure, to aid debugging if configure makes a mistake. |
4159 | |
4160 | -It was created by xkeyboard-config $as_me 2.10.1, which was |
4161 | +It was created by xkeyboard-config $as_me 2.11, which was |
4162 | generated by GNU Autoconf 2.69. Invocation command line was |
4163 | |
4164 | $ $0 $@ |
4165 | @@ -2636,7 +2636,7 @@ |
4166 | |
4167 | # Define the identity of the package. |
4168 | PACKAGE='xkeyboard-config' |
4169 | - VERSION='2.10.1' |
4170 | + VERSION='2.11' |
4171 | |
4172 | |
4173 | cat >>confdefs.h <<_ACEOF |
4174 | @@ -4990,6 +4990,13 @@ |
4175 | |
4176 | |
4177 | |
4178 | +mkdir_p="$MKDIR_P" |
4179 | +case $mkdir_p in |
4180 | + [\\/$]* | ?:[\\/]*) ;; |
4181 | + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
4182 | +esac |
4183 | + |
4184 | + |
4185 | |
4186 | GETTEXT_MACRO_VERSION=0.18 |
4187 | |
4188 | @@ -4999,14 +5006,15 @@ |
4189 | # Prepare PATH_SEPARATOR. |
4190 | # The user is always right. |
4191 | if test "${PATH_SEPARATOR+set}" != set; then |
4192 | - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which |
4193 | - # contains only /bin. Note that ksh looks also at the FPATH variable, |
4194 | - # so we have to set that as well for the test. |
4195 | - PATH_SEPARATOR=: |
4196 | - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
4197 | - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
4198 | - || PATH_SEPARATOR=';' |
4199 | - } |
4200 | + echo "#! /bin/sh" >conf$$.sh |
4201 | + echo "exit 0" >>conf$$.sh |
4202 | + chmod +x conf$$.sh |
4203 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
4204 | + PATH_SEPARATOR=';' |
4205 | + else |
4206 | + PATH_SEPARATOR=: |
4207 | + fi |
4208 | + rm -f conf$$.sh |
4209 | fi |
4210 | |
4211 | # Find out how to test for executable files. Don't use a zero-byte file, |
4212 | @@ -5121,14 +5129,15 @@ |
4213 | # Prepare PATH_SEPARATOR. |
4214 | # The user is always right. |
4215 | if test "${PATH_SEPARATOR+set}" != set; then |
4216 | - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which |
4217 | - # contains only /bin. Note that ksh looks also at the FPATH variable, |
4218 | - # so we have to set that as well for the test. |
4219 | - PATH_SEPARATOR=: |
4220 | - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
4221 | - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
4222 | - || PATH_SEPARATOR=';' |
4223 | - } |
4224 | + echo "#! /bin/sh" >conf$$.sh |
4225 | + echo "exit 0" >>conf$$.sh |
4226 | + chmod +x conf$$.sh |
4227 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
4228 | + PATH_SEPARATOR=';' |
4229 | + else |
4230 | + PATH_SEPARATOR=: |
4231 | + fi |
4232 | + rm -f conf$$.sh |
4233 | fi |
4234 | |
4235 | # Find out how to test for executable files. Don't use a zero-byte file, |
4236 | @@ -5198,14 +5207,15 @@ |
4237 | # Prepare PATH_SEPARATOR. |
4238 | # The user is always right. |
4239 | if test "${PATH_SEPARATOR+set}" != set; then |
4240 | - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which |
4241 | - # contains only /bin. Note that ksh looks also at the FPATH variable, |
4242 | - # so we have to set that as well for the test. |
4243 | - PATH_SEPARATOR=: |
4244 | - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
4245 | - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
4246 | - || PATH_SEPARATOR=';' |
4247 | - } |
4248 | + echo "#! /bin/sh" >conf$$.sh |
4249 | + echo "exit 0" >>conf$$.sh |
4250 | + chmod +x conf$$.sh |
4251 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
4252 | + PATH_SEPARATOR=';' |
4253 | + else |
4254 | + PATH_SEPARATOR=: |
4255 | + fi |
4256 | + rm -f conf$$.sh |
4257 | fi |
4258 | |
4259 | # Find out how to test for executable files. Don't use a zero-byte file, |
4260 | @@ -5289,7 +5299,6 @@ |
4261 | prefix="$acl_save_prefix" |
4262 | |
4263 | |
4264 | - |
4265 | # Check whether --with-gnu-ld was given. |
4266 | if test "${with_gnu_ld+set}" = set; then : |
4267 | withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes |
4268 | @@ -5300,21 +5309,21 @@ |
4269 | # Prepare PATH_SEPARATOR. |
4270 | # The user is always right. |
4271 | if test "${PATH_SEPARATOR+set}" != set; then |
4272 | - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which |
4273 | - # contains only /bin. Note that ksh looks also at the FPATH variable, |
4274 | - # so we have to set that as well for the test. |
4275 | - PATH_SEPARATOR=: |
4276 | - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
4277 | - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
4278 | - || PATH_SEPARATOR=';' |
4279 | - } |
4280 | + echo "#! /bin/sh" >conf$$.sh |
4281 | + echo "exit 0" >>conf$$.sh |
4282 | + chmod +x conf$$.sh |
4283 | + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
4284 | + PATH_SEPARATOR=';' |
4285 | + else |
4286 | + PATH_SEPARATOR=: |
4287 | + fi |
4288 | + rm -f conf$$.sh |
4289 | fi |
4290 | - |
4291 | ac_prog=ld |
4292 | if test "$GCC" = yes; then |
4293 | # Check if gcc -print-prog-name=ld gives a path. |
4294 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 |
4295 | -$as_echo_n "checking for ld used by $CC... " >&6; } |
4296 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 |
4297 | +$as_echo_n "checking for ld used by GCC... " >&6; } |
4298 | case $host in |
4299 | *-*-mingw*) |
4300 | # gcc leaves a trailing carriage return which upsets mingw |
4301 | @@ -5324,11 +5333,11 @@ |
4302 | esac |
4303 | case $ac_prog in |
4304 | # Accept absolute paths. |
4305 | - [\\/]* | ?:[\\/]*) |
4306 | + [\\/]* | [A-Za-z]:[\\/]*) |
4307 | re_direlt='/[^/][^/]*/\.\./' |
4308 | - # Canonicalize the pathname of ld |
4309 | - ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` |
4310 | - while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do |
4311 | + # Canonicalize the path of ld |
4312 | + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` |
4313 | + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
4314 | ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` |
4315 | done |
4316 | test -z "$LD" && LD="$ac_prog" |
4317 | @@ -5353,26 +5362,23 @@ |
4318 | $as_echo_n "(cached) " >&6 |
4319 | else |
4320 | if test -z "$LD"; then |
4321 | - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
4322 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" |
4323 | for ac_dir in $PATH; do |
4324 | - IFS="$acl_save_ifs" |
4325 | test -z "$ac_dir" && ac_dir=. |
4326 | if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
4327 | acl_cv_path_LD="$ac_dir/$ac_prog" |
4328 | # Check to see if the program is GNU ld. I'd rather use --version, |
4329 | - # but apparently some variants of GNU ld only accept -v. |
4330 | + # but apparently some GNU ld's only accept -v. |
4331 | # Break only if it was the GNU/non-GNU ld that we prefer. |
4332 | - case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in |
4333 | + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in |
4334 | *GNU* | *'with BFD'*) |
4335 | - test "$with_gnu_ld" != no && break |
4336 | - ;; |
4337 | + test "$with_gnu_ld" != no && break ;; |
4338 | *) |
4339 | - test "$with_gnu_ld" != yes && break |
4340 | - ;; |
4341 | + test "$with_gnu_ld" != yes && break ;; |
4342 | esac |
4343 | fi |
4344 | done |
4345 | - IFS="$acl_save_ifs" |
4346 | + IFS="$ac_save_ifs" |
4347 | else |
4348 | acl_cv_path_LD="$LD" # Let the user override the test with a path. |
4349 | fi |
4350 | @@ -5392,14 +5398,12 @@ |
4351 | if ${acl_cv_prog_gnu_ld+:} false; then : |
4352 | $as_echo_n "(cached) " >&6 |
4353 | else |
4354 | - # I'd rather use --version here, but apparently some GNU lds only accept -v. |
4355 | + # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
4356 | case `$LD -v 2>&1 </dev/null` in |
4357 | *GNU* | *'with BFD'*) |
4358 | - acl_cv_prog_gnu_ld=yes |
4359 | - ;; |
4360 | + acl_cv_prog_gnu_ld=yes ;; |
4361 | *) |
4362 | - acl_cv_prog_gnu_ld=no |
4363 | - ;; |
4364 | + acl_cv_prog_gnu_ld=no ;; |
4365 | esac |
4366 | fi |
4367 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 |
4368 | @@ -5850,7 +5854,7 @@ |
4369 | done |
4370 | if test -z "$already_handled"; then |
4371 | names_already_handled="$names_already_handled $name" |
4372 | - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` |
4373 | + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` |
4374 | eval value=\"\$HAVE_LIB$uppername\" |
4375 | if test -n "$value"; then |
4376 | if test "$value" = yes; then |
4377 | @@ -6379,19 +6383,15 @@ |
4378 | else |
4379 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4380 | /* end confdefs.h. */ |
4381 | - |
4382 | #include <libintl.h> |
4383 | $gt_revision_test_code |
4384 | extern int _nl_msg_cat_cntr; |
4385 | extern int *_nl_domain_bindings; |
4386 | - |
4387 | int |
4388 | main () |
4389 | { |
4390 | - |
4391 | bindtextdomain ("", ""); |
4392 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings |
4393 | - |
4394 | ; |
4395 | return 0; |
4396 | } |
4397 | @@ -6449,16 +6449,14 @@ |
4398 | am_cv_lib_iconv=no |
4399 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4400 | /* end confdefs.h. */ |
4401 | - |
4402 | #include <stdlib.h> |
4403 | #include <iconv.h> |
4404 | - |
4405 | int |
4406 | main () |
4407 | { |
4408 | iconv_t cd = iconv_open("",""); |
4409 | - iconv(cd,NULL,NULL,NULL,NULL); |
4410 | - iconv_close(cd); |
4411 | + iconv(cd,NULL,NULL,NULL,NULL); |
4412 | + iconv_close(cd); |
4413 | ; |
4414 | return 0; |
4415 | } |
4416 | @@ -6473,16 +6471,14 @@ |
4417 | LIBS="$LIBS $LIBICONV" |
4418 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4419 | /* end confdefs.h. */ |
4420 | - |
4421 | #include <stdlib.h> |
4422 | #include <iconv.h> |
4423 | - |
4424 | int |
4425 | main () |
4426 | { |
4427 | iconv_t cd = iconv_open("",""); |
4428 | - iconv(cd,NULL,NULL,NULL,NULL); |
4429 | - iconv_close(cd); |
4430 | + iconv(cd,NULL,NULL,NULL,NULL); |
4431 | + iconv_close(cd); |
4432 | ; |
4433 | return 0; |
4434 | } |
4435 | @@ -6506,17 +6502,15 @@ |
4436 | $as_echo_n "(cached) " >&6 |
4437 | else |
4438 | |
4439 | - am_save_LIBS="$LIBS" |
4440 | + am_save_LIBS="$LIBS" |
4441 | if test $am_cv_lib_iconv = yes; then |
4442 | LIBS="$LIBS $LIBICONV" |
4443 | fi |
4444 | if test "$cross_compiling" = yes; then : |
4445 | - |
4446 | - case "$host_os" in |
4447 | + case "$host_os" in |
4448 | aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; |
4449 | *) am_cv_func_iconv_works="guessing yes" ;; |
4450 | esac |
4451 | - |
4452 | else |
4453 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4454 | /* end confdefs.h. */ |
4455 | @@ -6525,7 +6519,6 @@ |
4456 | #include <string.h> |
4457 | int main () |
4458 | { |
4459 | - int result = 0; |
4460 | /* Test against AIX 5.1 bug: Failures are not distinguishable from successful |
4461 | returns. */ |
4462 | { |
4463 | @@ -6542,8 +6535,7 @@ |
4464 | (char **) &inptr, &inbytesleft, |
4465 | &outptr, &outbytesleft); |
4466 | if (res == 0) |
4467 | - result |= 1; |
4468 | - iconv_close (cd_utf8_to_88591); |
4469 | + return 1; |
4470 | } |
4471 | } |
4472 | /* Test against Solaris 10 bug: Failures are not distinguishable from |
4473 | @@ -6562,27 +6554,7 @@ |
4474 | (char **) &inptr, &inbytesleft, |
4475 | &outptr, &outbytesleft); |
4476 | if (res == 0) |
4477 | - result |= 2; |
4478 | - iconv_close (cd_ascii_to_88591); |
4479 | - } |
4480 | - } |
4481 | - /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ |
4482 | - { |
4483 | - iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); |
4484 | - if (cd_88591_to_utf8 != (iconv_t)(-1)) |
4485 | - { |
4486 | - static const char input[] = "\304"; |
4487 | - static char buf[2] = { (char)0xDE, (char)0xAD }; |
4488 | - const char *inptr = input; |
4489 | - size_t inbytesleft = 1; |
4490 | - char *outptr = buf; |
4491 | - size_t outbytesleft = 1; |
4492 | - size_t res = iconv (cd_88591_to_utf8, |
4493 | - (char **) &inptr, &inbytesleft, |
4494 | - &outptr, &outbytesleft); |
4495 | - if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) |
4496 | - result |= 4; |
4497 | - iconv_close (cd_88591_to_utf8); |
4498 | + return 1; |
4499 | } |
4500 | } |
4501 | #if 0 /* This bug could be worked around by the caller. */ |
4502 | @@ -6601,8 +6573,7 @@ |
4503 | (char **) &inptr, &inbytesleft, |
4504 | &outptr, &outbytesleft); |
4505 | if ((int)res > 0) |
4506 | - result |= 8; |
4507 | - iconv_close (cd_88591_to_utf8); |
4508 | + return 1; |
4509 | } |
4510 | } |
4511 | #endif |
4512 | @@ -6616,8 +6587,8 @@ |
4513 | && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) |
4514 | /* Try HP-UX names. */ |
4515 | && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) |
4516 | - result |= 16; |
4517 | - return result; |
4518 | + return 1; |
4519 | + return 0; |
4520 | } |
4521 | _ACEOF |
4522 | if ac_fn_c_try_run "$LINENO"; then : |
4523 | @@ -6734,7 +6705,7 @@ |
4524 | done |
4525 | if test -z "$already_handled"; then |
4526 | names_already_handled="$names_already_handled $name" |
4527 | - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` |
4528 | + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` |
4529 | eval value=\"\$HAVE_LIB$uppername\" |
4530 | if test -n "$value"; then |
4531 | if test "$value" = yes; then |
4532 | @@ -7132,7 +7103,6 @@ |
4533 | LIBS="$LIBS $LIBINTL" |
4534 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4535 | /* end confdefs.h. */ |
4536 | - |
4537 | #include <libintl.h> |
4538 | $gt_revision_test_code |
4539 | extern int _nl_msg_cat_cntr; |
4540 | @@ -7141,14 +7111,11 @@ |
4541 | "C" |
4542 | #endif |
4543 | const char *_nl_expand_alias (const char *); |
4544 | - |
4545 | int |
4546 | main () |
4547 | { |
4548 | - |
4549 | bindtextdomain ("", ""); |
4550 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
4551 | - |
4552 | ; |
4553 | return 0; |
4554 | } |
4555 | @@ -7164,7 +7131,6 @@ |
4556 | LIBS="$LIBS $LIBICONV" |
4557 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4558 | /* end confdefs.h. */ |
4559 | - |
4560 | #include <libintl.h> |
4561 | $gt_revision_test_code |
4562 | extern int _nl_msg_cat_cntr; |
4563 | @@ -7173,22 +7139,19 @@ |
4564 | "C" |
4565 | #endif |
4566 | const char *_nl_expand_alias (const char *); |
4567 | - |
4568 | int |
4569 | main () |
4570 | { |
4571 | - |
4572 | bindtextdomain ("", ""); |
4573 | return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") |
4574 | - |
4575 | ; |
4576 | return 0; |
4577 | } |
4578 | _ACEOF |
4579 | if ac_fn_c_try_link "$LINENO"; then : |
4580 | LIBINTL="$LIBINTL $LIBICONV" |
4581 | - LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
4582 | - eval "$gt_func_gnugettext_libintl=yes" |
4583 | + LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
4584 | + eval "$gt_func_gnugettext_libintl=yes" |
4585 | |
4586 | fi |
4587 | rm -f core conftest.err conftest.$ac_objext \ |
4588 | @@ -7908,7 +7871,7 @@ |
4589 | # report actual input values of CONFIG_FILES etc. instead of their |
4590 | # values after options handling. |
4591 | ac_log=" |
4592 | -This file was extended by xkeyboard-config $as_me 2.10.1, which was |
4593 | +This file was extended by xkeyboard-config $as_me 2.11, which was |
4594 | generated by GNU Autoconf 2.69. Invocation command line was |
4595 | |
4596 | CONFIG_FILES = $CONFIG_FILES |
4597 | @@ -7965,7 +7928,7 @@ |
4598 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4599 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4600 | ac_cs_version="\\ |
4601 | -xkeyboard-config config.status 2.10.1 |
4602 | +xkeyboard-config config.status 2.11 |
4603 | configured by $0, generated by GNU Autoconf 2.69, |
4604 | with options \\"\$ac_cs_config\\" |
4605 | |
4606 | @@ -8653,7 +8616,7 @@ |
4607 | case "$ac_file" in */Makefile.in) |
4608 | # Adjust a relative srcdir. |
4609 | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` |
4610 | - ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` |
4611 | + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" |
4612 | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` |
4613 | # In autoconf-2.13 it is called $ac_given_srcdir. |
4614 | # In autoconf-2.50 it is called $srcdir. |
4615 | @@ -8669,8 +8632,7 @@ |
4616 | if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then |
4617 | rm -f "$ac_dir/POTFILES" |
4618 | test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" |
4619 | - gt_tab=`printf '\t'` |
4620 | - 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" |
4621 | + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" |
4622 | POMAKEFILEDEPS="POTFILES.in" |
4623 | # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend |
4624 | # on $ac_dir but don't depend on user-specified configuration |
4625 | @@ -8681,12 +8643,12 @@ |
4626 | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" |
4627 | fi |
4628 | ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` |
4629 | - # Hide the ALL_LINGUAS assignment from automake < 1.5. |
4630 | + # Hide the ALL_LINGUAS assigment from automake < 1.5. |
4631 | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' |
4632 | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" |
4633 | else |
4634 | # The set of available languages was given in configure.in. |
4635 | - # Hide the ALL_LINGUAS assignment from automake < 1.5. |
4636 | + # Hide the ALL_LINGUAS assigment from automake < 1.5. |
4637 | eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' |
4638 | fi |
4639 | # Compute POFILES |
4640 | |
4641 | === modified file 'configure.ac' |
4642 | --- configure.ac 2013-12-22 16:37:56 +0000 |
4643 | +++ configure.ac 2014-05-13 12:44:26 +0000 |
4644 | @@ -1,4 +1,4 @@ |
4645 | -AC_INIT(xkeyboard-config, 2.10.1) |
4646 | +AC_INIT(xkeyboard-config, 2.11) |
4647 | AC_CONFIG_SRCDIR(rules/base.xml.in) |
4648 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
4649 | AM_MAINTAINER_MODE |
4650 | |
4651 | === modified file 'debian/changelog' |
4652 | --- debian/changelog 2013-12-29 11:43:52 +0000 |
4653 | +++ debian/changelog 2014-05-13 12:44:26 +0000 |
4654 | @@ -1,3 +1,35 @@ |
4655 | +xkeyboard-config (2.11-1ubuntu1) UNRELEASED; urgency=medium |
4656 | + |
4657 | + * Merge with Debian unstable, remaining changes: |
4658 | + - control, rules, xkb-data-i18n.install, xkb-data.install: Split out |
4659 | + xkb-data-i18n to be used by console-setup. |
4660 | + - xkb-data.postinst.in: Remove the xkb cache to make sure it gets |
4661 | + regenerated. |
4662 | + - 105_intelligent_keyboard.patch: Add support for the Intelligent |
4663 | + Keyboard K04. |
4664 | + * Dropped bengali_to_bangla.patch, applied upstream. |
4665 | + * Dropped 108_fix_intltool_make_check.diff, seems to be no longer |
4666 | + needed. |
4667 | + |
4668 | + -- Dmitry Shachnev <mitya57@ubuntu.com> Tue, 13 May 2014 16:15:55 +0400 |
4669 | + |
4670 | +xkeyboard-config (2.11-1) unstable; urgency=medium |
4671 | + |
4672 | + [ Lior Kaplan ] |
4673 | + * New upstream release |
4674 | + + altwin(ctrl_alt_win): Map "win" to Ctrl keys (closes: #678553) |
4675 | + + use the modern language name Bangla instead of Bengali (closes: #731274) |
4676 | + + implemented the new Israeli Standard SI1452 for the il basic layout |
4677 | + (closes: #530820) |
4678 | + |
4679 | + [ Sven Joachim ] |
4680 | + * Mark xkb-data as "Multi-Arch: foreign" (Closes: #677884). |
4681 | + |
4682 | + [ Julien Cristau ] |
4683 | + * Fix grab:debug reference in the xml file. |
4684 | + |
4685 | + -- Julien Cristau <jcristau@debian.org> Tue, 13 May 2014 00:09:58 +0200 |
4686 | + |
4687 | xkeyboard-config (2.10.1-1ubuntu1) trusty; urgency=low |
4688 | |
4689 | [ Dmitry Shachnev ] |
4690 | |
4691 | === modified file 'debian/control' |
4692 | --- debian/control 2013-12-29 11:43:52 +0000 |
4693 | +++ debian/control 2014-05-13 12:44:26 +0000 |
4694 | @@ -23,8 +23,8 @@ |
4695 | Package: xkb-data |
4696 | Depends: ${misc:Depends} |
4697 | Breaks: libx11-6 (<< 2:1.4.3) |
4698 | +Architecture: all |
4699 | Multi-Arch: foreign |
4700 | -Architecture: all |
4701 | Description: X Keyboard Extension (XKB) configuration data |
4702 | This package contains configuration data used by the X Keyboard |
4703 | Extension (XKB), which allows selection of keyboard layouts when |
4704 | |
4705 | === modified file 'debian/patches/105_intelligent_keyboard.patch' |
4706 | --- debian/patches/105_intelligent_keyboard.patch 2013-12-29 11:43:52 +0000 |
4707 | +++ debian/patches/105_intelligent_keyboard.patch 2014-05-13 12:44:26 +0000 |
4708 | @@ -1,6 +1,6 @@ |
4709 | ---- a/rules/base.lists.part |
4710 | -+++ b/rules/base.lists.part |
4711 | -@@ -71,7 +71,8 @@ |
4712 | +--- a/rules/base.lists.base.part |
4713 | ++++ b/rules/base.lists.base.part |
4714 | +@@ -36,7 +36,8 @@ |
4715 | sk1300 sk2500 sk6200 sk7100 \ |
4716 | sven sven303 symplon \ |
4717 | toshiba_s3000 trust trustda \ |
4718 | @@ -8,8 +8,8 @@ |
4719 | + unitekkb1925 yahoo \ |
4720 | + intelligent_keyboard_k04 |
4721 | |
4722 | - // all layouts with 3rd and 4th groups |
4723 | - ! $threelevellayouts = al az \ |
4724 | + ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \ |
4725 | + cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \ |
4726 | --- a/rules/base.xml.in |
4727 | +++ b/rules/base.xml.in |
4728 | @@ -1290,6 +1290,13 @@ |
4729 | @@ -44,10 +44,10 @@ |
4730 | <vendor>htc</vendor> |
4731 | --- a/symbols/inet |
4732 | +++ b/symbols/inet |
4733 | -@@ -1846,6 +1846,31 @@ |
4734 | - include "inet(media_nav_acpi_common)" |
4735 | +@@ -1851,6 +1851,31 @@ |
4736 | }; |
4737 | |
4738 | + |
4739 | +//Intelligent Keyboard K04 |
4740 | +partial alphanumeric_keys |
4741 | +xkb_symbols "intelligent_keyboard_k04" { |
4742 | |
4743 | === removed file 'debian/patches/108_fix_intltool_make_check.diff' |
4744 | --- debian/patches/108_fix_intltool_make_check.diff 2011-05-24 12:13:34 +0000 |
4745 | +++ debian/patches/108_fix_intltool_make_check.diff 1970-01-01 00:00:00 +0000 |
4746 | @@ -1,19 +0,0 @@ |
4747 | -Author: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> |
4748 | -Description: Make ‘make check’ pass in the presence of patches. |
4749 | - |
4750 | -make check in po/ will check for files with translatable strings that are not |
4751 | -listed in POTFILES.in, which is broadly useful to ensure any patches that we |
4752 | -add are translatable. |
4753 | - |
4754 | -However, it picks up quilt's temporary files in .pc, which obviously aren't |
4755 | -listed as translatable. Add this directory to POTFILES.skip so that |
4756 | -make check doesn't get grumpy. |
4757 | -Index: xkb-data/po/POTFILES.skip |
4758 | -=================================================================== |
4759 | ---- xkb-data.orig/po/POTFILES.skip 2011-05-24 13:03:26.986079531 +1000 |
4760 | -+++ xkb-data/po/POTFILES.skip 2011-05-24 13:03:38.846553179 +1000 |
4761 | -@@ -1,2 +1,3 @@ |
4762 | - rules/evdev.xml.in |
4763 | - rules/evdev.extras.xml.in |
4764 | -+.pc |
4765 | - |
4766 | |
4767 | === removed file 'debian/patches/bengali_to_bangla.patch' |
4768 | --- debian/patches/bengali_to_bangla.patch 2013-12-29 11:43:52 +0000 |
4769 | +++ debian/patches/bengali_to_bangla.patch 1970-01-01 00:00:00 +0000 |
4770 | @@ -1,270 +0,0 @@ |
4771 | -Description: Use the modern language name Bangla instead of Bengali |
4772 | -Bug-Ubuntu: https://launchpad.net/bugs/991002 |
4773 | -Forwarded: yes |
4774 | -Bug-Debian: http://bugs.debian.org/731274 |
4775 | -Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> |
4776 | - |
4777 | ---- a/rules/base.xml.in |
4778 | -+++ b/rules/base.xml.in |
4779 | -@@ -1769,9 +1769,9 @@ |
4780 | - <layout> |
4781 | - <configItem> |
4782 | - <name>bd</name> |
4783 | -- <!-- Keyboard indicator for Bengali layouts --> |
4784 | -+ <!-- Keyboard indicator for Bangla layouts --> |
4785 | - <_shortDescription>bn</_shortDescription> |
4786 | -- <_description>Bengali</_description> |
4787 | -+ <_description>Bangla</_description> |
4788 | - <languageList> |
4789 | - <iso639Id>ben</iso639Id> |
4790 | - </languageList> |
4791 | -@@ -1780,7 +1780,7 @@ |
4792 | - <variant> |
4793 | - <configItem> |
4794 | - <name>probhat</name> |
4795 | -- <_description>Bengali (Probhat)</_description> |
4796 | -+ <_description>Bangla (Probhat)</_description> |
4797 | - </configItem> |
4798 | - </variant> |
4799 | - </variantList> |
4800 | -@@ -1796,9 +1796,9 @@ |
4801 | - <variant> |
4802 | - <configItem> |
4803 | - <name>ben</name> |
4804 | -- <!-- Keyboard indicator for Bengali layouts --> |
4805 | -+ <!-- Keyboard indicator for Bangla layouts --> |
4806 | - <_shortDescription>bn</_shortDescription> |
4807 | -- <_description>Bengali (India)</_description> |
4808 | -+ <_description>Bangla (India)</_description> |
4809 | - <languageList> |
4810 | - <iso639Id>ben</iso639Id> |
4811 | - </languageList> |
4812 | -@@ -1807,9 +1807,9 @@ |
4813 | - <variant> |
4814 | - <configItem> |
4815 | - <name>ben_probhat</name> |
4816 | -- <!-- Keyboard indicator for Bengali layouts --> |
4817 | -+ <!-- Keyboard indicator for Bangla layouts --> |
4818 | - <_shortDescription>bn</_shortDescription> |
4819 | -- <_description>Bengali (India, Probhat)</_description> |
4820 | -+ <_description>Bangla (India, Probhat)</_description> |
4821 | - <languageList> |
4822 | - <iso639Id>ben</iso639Id> |
4823 | - </languageList> |
4824 | -@@ -1818,28 +1818,28 @@ |
4825 | - <variant> |
4826 | - <configItem> |
4827 | - <name>ben_baishakhi</name> |
4828 | -- <_description>Bengali (India, Baishakhi)</_description> |
4829 | -+ <_description>Bangla (India, Baishakhi)</_description> |
4830 | - <languageList><iso639Id>ben</iso639Id></languageList> |
4831 | - </configItem> |
4832 | - </variant> |
4833 | - <variant> |
4834 | - <configItem> |
4835 | - <name>ben_bornona</name> |
4836 | -- <_description>Bengali (India, Bornona)</_description> |
4837 | -+ <_description>Bangla (India, Bornona)</_description> |
4838 | - <languageList><iso639Id>ben</iso639Id></languageList> |
4839 | - </configItem> |
4840 | - </variant> |
4841 | - <variant> |
4842 | - <configItem> |
4843 | - <name>ben_gitanjali</name> |
4844 | -- <_description>Bengali (India, Uni Gitanjali)</_description> |
4845 | -+ <_description>Bangla (India, Uni Gitanjali)</_description> |
4846 | - <languageList><iso639Id>ben</iso639Id></languageList> |
4847 | - </configItem> |
4848 | - </variant> |
4849 | - <variant> |
4850 | - <configItem> |
4851 | - <name>ben_inscript</name> |
4852 | -- <_description>Bengali (India, Baishakhi Inscript)</_description> |
4853 | -+ <_description>Bangla (India, Baishakhi Inscript)</_description> |
4854 | - <languageList><iso639Id>ben</iso639Id></languageList> |
4855 | - </configItem> |
4856 | - </variant> |
4857 | ---- a/rules/evdev.xml.in |
4858 | -+++ b/rules/evdev.xml.in |
4859 | -@@ -1769,9 +1769,9 @@ |
4860 | - <layout> |
4861 | - <configItem> |
4862 | - <name>bd</name> |
4863 | -- <!-- Keyboard indicator for Bengali layouts --> |
4864 | -+ <!-- Keyboard indicator for Bangla layouts --> |
4865 | - <_shortDescription>bn</_shortDescription> |
4866 | -- <_description>Bengali</_description> |
4867 | -+ <_description>Bangla</_description> |
4868 | - <languageList> |
4869 | - <iso639Id>ben</iso639Id> |
4870 | - </languageList> |
4871 | -@@ -1780,7 +1780,7 @@ |
4872 | - <variant> |
4873 | - <configItem> |
4874 | - <name>probhat</name> |
4875 | -- <_description>Bengali (Probhat)</_description> |
4876 | -+ <_description>Bangla (Probhat)</_description> |
4877 | - </configItem> |
4878 | - </variant> |
4879 | - </variantList> |
4880 | -@@ -1796,9 +1796,9 @@ |
4881 | - <variant> |
4882 | - <configItem> |
4883 | - <name>ben</name> |
4884 | -- <!-- Keyboard indicator for Bengali layouts --> |
4885 | -+ <!-- Keyboard indicator for Bangla layouts --> |
4886 | - <_shortDescription>bn</_shortDescription> |
4887 | -- <_description>Bengali (India)</_description> |
4888 | -+ <_description>Bangla (India)</_description> |
4889 | - <languageList> |
4890 | - <iso639Id>ben</iso639Id> |
4891 | - </languageList> |
4892 | -@@ -1807,9 +1807,9 @@ |
4893 | - <variant> |
4894 | - <configItem> |
4895 | - <name>ben_probhat</name> |
4896 | -- <!-- Keyboard indicator for Bengali layouts --> |
4897 | -+ <!-- Keyboard indicator for Bangla layouts --> |
4898 | - <_shortDescription>bn</_shortDescription> |
4899 | -- <_description>Bengali (India, Probhat)</_description> |
4900 | -+ <_description>Bangla (India, Probhat)</_description> |
4901 | - <languageList> |
4902 | - <iso639Id>ben</iso639Id> |
4903 | - </languageList> |
4904 | -@@ -1818,28 +1818,28 @@ |
4905 | - <variant> |
4906 | - <configItem> |
4907 | - <name>ben_baishakhi</name> |
4908 | -- <_description>Bengali (India, Baishakhi)</_description> |
4909 | -+ <_description>Bangla (India, Baishakhi)</_description> |
4910 | - <languageList><iso639Id>ben</iso639Id></languageList> |
4911 | - </configItem> |
4912 | - </variant> |
4913 | - <variant> |
4914 | - <configItem> |
4915 | - <name>ben_bornona</name> |
4916 | -- <_description>Bengali (India, Bornona)</_description> |
4917 | -+ <_description>Bangla (India, Bornona)</_description> |
4918 | - <languageList><iso639Id>ben</iso639Id></languageList> |
4919 | - </configItem> |
4920 | - </variant> |
4921 | - <variant> |
4922 | - <configItem> |
4923 | - <name>ben_gitanjali</name> |
4924 | -- <_description>Bengali (India, Uni Gitanjali)</_description> |
4925 | -+ <_description>Bangla (India, Uni Gitanjali)</_description> |
4926 | - <languageList><iso639Id>ben</iso639Id></languageList> |
4927 | - </configItem> |
4928 | - </variant> |
4929 | - <variant> |
4930 | - <configItem> |
4931 | - <name>ben_inscript</name> |
4932 | -- <_description>Bengali (India, Baishakhi Inscript)</_description> |
4933 | -+ <_description>Bangla (India, Baishakhi Inscript)</_description> |
4934 | - <languageList><iso639Id>ben</iso639Id></languageList> |
4935 | - </configItem> |
4936 | - </variant> |
4937 | ---- a/symbols/bd |
4938 | -+++ b/symbols/bd |
4939 | -@@ -16,7 +16,7 @@ |
4940 | - |
4941 | - default partial alphanumeric_keys |
4942 | - xkb_symbols "basic" { |
4943 | -- name[Group1]= "Bengali"; |
4944 | -+ name[Group1]= "Bangla"; |
4945 | - key <ESC> { [ Escape ] }; |
4946 | - |
4947 | - // numbers |
4948 | -@@ -92,5 +92,5 @@ |
4949 | - |
4950 | - xkb_symbols "probhat" { |
4951 | - include "in(ben_probhat)" |
4952 | -- name[Group1]= "Bengali (Probhat)"; |
4953 | -+ name[Group1]= "Bangla (Probhat)"; |
4954 | - }; |
4955 | ---- a/symbols/in |
4956 | -+++ b/symbols/in |
4957 | -@@ -1,6 +1,6 @@ |
4958 | - // This layout includes all Indian layouts, including: |
4959 | - // - Devanagari (Hindi, Marathi, Sanskrit) |
4960 | --// - Bengali |
4961 | -+// - Bangla |
4962 | - // - Gujarati |
4963 | - // - Kannada |
4964 | - // - Malayalam |
4965 | -@@ -12,12 +12,12 @@ |
4966 | - // Links: |
4967 | - // - Indic INSCRIPT keyboard layout diagrams: |
4968 | - // http://java.sun.com/products/jfc/tsc/articles/InputMethod/indiclayout.html |
4969 | --// - Bengali Baishakhi (Bengali layouts): |
4970 | --// - Bengali Baishakhi Inscript (Bengali layouts): |
4971 | --// - Bengali Bornona (Bengali layouts): |
4972 | --// - Uni Gitanjali (Bengali layouts): |
4973 | -+// - Bangla Baishakhi (Bangla layouts): |
4974 | -+// - Bangla Baishakhi Inscript (Bangla layouts): |
4975 | -+// - Bangla Bornona (Bangla layouts): |
4976 | -+// - Uni Gitanjali (Bangla layouts): |
4977 | - // http://nltr.org |
4978 | --// - Ekusheyr Shadhinota (Bengali layouts): |
4979 | -+// - Ekusheyr Shadhinota (Bangla layouts): |
4980 | - // http://ekushey.org/projects/shadhinota/index.html |
4981 | - // - Microsoft Windows XP SP2: Indic Language Standards - an Introduction: |
4982 | - // http://www.bhashaindia.com/MSProducts/XpSp2/Articles/IndicLanguageStandards.aspx |
4983 | -@@ -176,7 +176,7 @@ |
4984 | - |
4985 | - partial alphanumeric_keys |
4986 | - xkb_symbols "ben" { |
4987 | -- name[Group1]= "Bengali (India)"; |
4988 | -+ name[Group1]= "Bangla (India)"; |
4989 | - |
4990 | - // Mainly numbers. |
4991 | - key <AE01> { [ U09E7 ] }; |
4992 | -@@ -244,7 +244,7 @@ |
4993 | - }; |
4994 | - |
4995 | - xkb_symbols "ben_probhat" { |
4996 | -- name[Group1]= "Bengali (India, Probhat)"; |
4997 | -+ name[Group1]= "Bangla (India, Probhat)"; |
4998 | - key <ESC> { [ Escape ] }; |
4999 | - |
5000 | - // numbers |
The diff has been truncated for viewing.