Merge lp:~noskcaj/ubuntu/trusty/libxklavier/5.3 into lp:ubuntu/trusty/libxklavier
- Trusty (14.04)
- 5.3
- Merge into trusty
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp:~noskcaj/ubuntu/trusty/libxklavier/5.3 |
Merge into: | lp:ubuntu/trusty/libxklavier |
Diff against target: |
5767 lines (+1426/-1013) 54 files modified
.pc/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch/libxklavier/Makefile.am (+0/-109) .pc/applied-patches (+0/-1) .pc/revert-default-group-change.patch/libxklavier/xklavier_config_xkb.c (+2/-2) INSTALL (+7/-2) Makefile.in (+86/-38) NEWS (+1/-0) aclocal.m4 (+79/-29) build-aux/config.guess (+147/-118) build-aux/config.sub (+136/-68) build-aux/depcomp (+134/-56) build-aux/install-sh (+18/-11) build-aux/ltmain.sh (+57/-38) build-aux/missing (+4/-49) configure (+169/-84) configure.ac (+2/-2) debian/changelog (+9/-0) debian/libxklavier16.symbols (+2/-1) debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch (+0/-133) debian/patches/revert-default-group-change.patch (+8/-6) debian/patches/series (+0/-1) doc/Makefile.in (+42/-18) doc/reference/Makefile.in (+39/-11) doc/reference/html/ch01.html (+1/-1) doc/reference/html/ch02.html (+1/-1) doc/reference/html/libxklavier-xkl-engine.html (+5/-5) doc/reference/tmpl/xkl_config_item.sgml (+0/-2) doc/reference/tmpl/xkl_config_rec.sgml (+0/-2) doc/reference/tmpl/xkl_config_registry.sgml (+0/-2) doc/reference/tmpl/xkl_engine.sgml (+0/-2) doc/reference/tmpl/xkl_engine_marshal.sgml (+0/-2) doc/reference/tmpl/xklavier.sgml (+0/-2) doc/reference/tmpl/xklavier_private.sgml (+0/-2) doc/reference/tmpl/xklavier_private_xkb.sgml (+0/-2) doc/reference/tmpl/xklavier_private_xmm.sgml (+0/-2) libxklavier.spec (+1/-1) libxklavier/Makefile.am (+12/-6) libxklavier/Makefile.in (+96/-52) libxklavier/libxklavier.public (+1/-0) libxklavier/marshal.list (+1/-1) libxklavier/xkl_config_rec.h (+13/-0) libxklavier/xkl_engine.h (+2/-2) libxklavier/xkl_engine_marshal.c (+18/-18) libxklavier/xkl_engine_marshal.h (+9/-9) libxklavier/xklavier.c (+3/-16) libxklavier/xklavier_config.c (+1/-4) libxklavier/xklavier_config_xkb.c (+2/-2) libxklavier/xklavier_evt.c (+2/-1) libxklavier/xklavier_private.h (+1/-1) libxklavier/xklavier_props.c (+12/-4) m4/libtool.m4 (+208/-57) m4/ltoptions.m4 (+17/-2) m4/ltversion.m4 (+5/-5) tests/Makefile.in (+52/-28) tests/test_gi.py (+21/-2) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/libxklavier/5.3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+206636@code.launchpad.net |
Commit message
Description of the change
New upstream release.
To post a comment you must log in.
Unmerged revisions
- 45. By Jackson Doak
-
Update symbols
- 44. By Jackson Doak
-
* New upstream release.
* Drop 0001-Explicitly-exporting- only-the- symbols- that-are- reall.patch,
fixed upstream
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed directory '.pc/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch' |
2 | === removed directory '.pc/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch/libxklavier' |
3 | === removed file '.pc/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch/libxklavier/Makefile.am' |
4 | --- .pc/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch/libxklavier/Makefile.am 2012-02-22 02:28:16 +0000 |
5 | +++ .pc/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch/libxklavier/Makefile.am 1970-01-01 00:00:00 +0000 |
6 | @@ -1,109 +0,0 @@ |
7 | -if LIBXKBFILE_PRESENT |
8 | - LIBXKBFILE_PRESENT_CFLAG = -DLIBXKBFILE_PRESENT=1 |
9 | - LIBXKBFILE_PRESENT_LDFLAGS = -lxkbfile |
10 | -endif |
11 | - |
12 | -if ENABLE_XKB_SUPPORT |
13 | - ENABLE_XKB_SUPPORT_CFLAG = -DENABLE_XKB_SUPPORT=1 |
14 | -else |
15 | - ENABLE_XKB_SUPPORT_CFLAG = -DDISABLE_XKB_SUPPORT=1 |
16 | -endif |
17 | - |
18 | -if ENABLE_XMODMAP_SUPPORT |
19 | - ENABLE_XMODMAP_SUPPORT_CFLAG = -DENABLE_XMODMAP_SUPPORT=1 |
20 | -else |
21 | - ENABLE_XMODMAP_SUPPORT_CFLAG = -DDISABLE_XMODMAP_SUPPORT=1 |
22 | -endif |
23 | - |
24 | -AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \ |
25 | - -I. -I$(top_srcdir) $(X_CFLAGS) \ |
26 | - $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \ |
27 | - $(LIBXKBFILE_PRESENT_CFLAG) \ |
28 | - $(ENABLE_XKB_SUPPORT_CFLAG) \ |
29 | - $(ENABLE_XMODMAP_SUPPORT_CFLAG) |
30 | - |
31 | -lib_LTLIBRARIES = libxklavier.la |
32 | -noinst_HEADERS = xklavier_private.h xklavier_private_xkb.h xklavier_private_xmm.h |
33 | -xklavier_headers = xkl_engine.h xkl_config_item.h xkl_config_registry.h \ |
34 | - xkl_config_rec.h xkl_engine_marshal.h xklavier.h |
35 | - |
36 | -xklavier_built_headers = xkl-enum-types.h |
37 | -xklavier_built_cfiles = xkl-enum-types.c |
38 | -xklavierincdir = $(includedir)/libxklavier |
39 | -xklavierinc_HEADERS = $(xklavier_headers) $(xklavier_built_headers) |
40 | - |
41 | -libxklavier_la_SOURCES = $(xklavier_built_cfiles) xklavier.c xklavier_evt.c xklavier_config.c xklavier_config_iso.c \ |
42 | - xklavier_xkb.c xklavier_evt_xkb.c xklavier_config_xkb.c xklavier_toplevel.c \ |
43 | - xklavier_xmm.c xklavier_xmm_opts.c xklavier_evt_xmm.c xklavier_config_xmm.c \ |
44 | - xklavier_util.c xklavier_props.c xklavier_dump.c xkl_engine_marshal.c \ |
45 | - $(noinst_HEADERS) $(xklavierinc_HEADERS) |
46 | -libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined |
47 | -libxklavier_la_LIBADD = \ |
48 | - $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \ |
49 | - $(LIBXKBFILE_PRESENT_LDFLAGS) \ |
50 | - $(X_LIBS) -lX11 $(LIBICONV) |
51 | - |
52 | -EXTRA_DIST=marshal.list |
53 | - |
54 | -GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0` |
55 | - |
56 | -xkl_engine_marshal.h: marshal.list |
57 | - $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --header > xkl_engine_marshal.h |
58 | - |
59 | -xkl_engine_marshal.c: xkl_engine_marshal.h |
60 | - $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --body > xkl_engine_marshal.c |
61 | - |
62 | -xkl-enum-types.h: stamp-xkl-enum-types.h |
63 | - @true |
64 | -stamp-xkl-enum-types.h: $(xklavier_headers) |
65 | - (cd $(srcdir) \ |
66 | - && glib-mkenums \ |
67 | - --fhead "#ifndef __XKL_ENUM_TYPES_H__\n#define __XKL_ENUM_TYPES_H__\n" \ |
68 | - --fprod "/* enumerations from \"@filename@\" */\n" \ |
69 | - --vhead "GType @enum_name@_get_type (void);\n#define XKL_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ |
70 | - --ftail "#endif /* __XKL_ENUM_TYPES_H__ */" \ |
71 | - $(xklavier_headers)) > new-xkl-enum-types.h \ |
72 | - && (cmp -s new-xkl-enum-types.h xkl-enum-types.h || cp new-xkl-enum-types.h xkl-enum-types.h) \ |
73 | - && rm -f new-xkl-enum-types.h \ |
74 | - && echo timestamp > $(@F) |
75 | - |
76 | -xkl-enum-types.c: $(xklavier_headers) xkl-enum-types.h |
77 | - (cd $(srcdir) \ |
78 | - && glib-mkenums \ |
79 | - --fhead "#include <libxklavier/xklavier.h>" \ |
80 | - --fprod "\n/* enumerations from \"@filename@\" */" \ |
81 | - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ |
82 | - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ |
83 | - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ |
84 | - $(xklavier_headers)) > new-xkl-enum-types.c \ |
85 | - && cp new-xkl-enum-types.c $(@F) \ |
86 | - && rm -f new-xkl-enum-types.c |
87 | - |
88 | -DISTCLEANFILES=$(xklavier_built_headers) $(xklavier_built_cfiles) stamp-xkl-enum-types.h |
89 | -CLEANFILES= |
90 | - |
91 | -# build intospection typelib |
92 | --include $(INTROSPECTION_MAKEFILE) |
93 | -INTROSPECTION_GIRS = |
94 | -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all |
95 | -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) |
96 | - |
97 | -if HAVE_INTROSPECTION |
98 | -# avoid introspecting private headers |
99 | -introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURCES)) |
100 | - |
101 | -Xkl-1.0.gir: libxklavier.la |
102 | -Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 |
103 | -Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) |
104 | -Xkl_1_0_gir_LIBS = libxklavier.la |
105 | -Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) |
106 | -INTROSPECTION_GIRS += Xkl-1.0.gir |
107 | - |
108 | -girdir = $(datadir)/gir-1.0 |
109 | -gir_DATA = $(INTROSPECTION_GIRS) |
110 | - |
111 | -typelibdir = $(libdir)/girepository-1.0 |
112 | -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) |
113 | - |
114 | -CLEANFILES += $(gir_DATA) $(typelib_DATA) |
115 | -endif |
116 | |
117 | === removed file '.pc/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch/libxklavier/libxklavier.public' |
118 | === modified file '.pc/applied-patches' |
119 | --- .pc/applied-patches 2012-03-21 14:32:39 +0000 |
120 | +++ .pc/applied-patches 2014-02-16 22:04:28 +0000 |
121 | @@ -1,2 +1,1 @@ |
122 | -0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch |
123 | revert-default-group-change.patch |
124 | |
125 | === modified file '.pc/revert-default-group-change.patch/libxklavier/xklavier_config_xkb.c' |
126 | --- .pc/revert-default-group-change.patch/libxklavier/xklavier_config_xkb.c 2012-03-21 14:32:39 +0000 |
127 | +++ .pc/revert-default-group-change.patch/libxklavier/xklavier_config_xkb.c 2014-02-16 22:04:28 +0000 |
128 | @@ -286,7 +286,7 @@ |
129 | |
130 | XSync(display, False); |
131 | /* From this point, ALL errors should be intercepted only by libxklavier */ |
132 | - xkl_engine_priv(engine, criticalSection) = TRUE; |
133 | + xkl_engine_priv(engine, critical_section) = TRUE; |
134 | |
135 | cpid = fork(); |
136 | switch (cpid) { |
137 | @@ -401,7 +401,7 @@ |
138 | } |
139 | XSync(display, False); |
140 | /* Return to normal X error processing */ |
141 | - xkl_engine_priv(engine, criticalSection) = FALSE; |
142 | + xkl_engine_priv(engine, critical_section) = FALSE; |
143 | |
144 | if (activate) |
145 | xkl_config_set_group_by_description(engine, |
146 | |
147 | === modified file 'INSTALL' |
148 | --- INSTALL 2012-02-15 10:50:36 +0000 |
149 | +++ INSTALL 2014-02-16 22:04:28 +0000 |
150 | @@ -1,8 +1,8 @@ |
151 | Installation Instructions |
152 | ************************* |
153 | |
154 | -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, |
155 | -2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
156 | +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, |
157 | +Inc. |
158 | |
159 | Copying and distribution of this file, with or without modification, |
160 | are permitted in any medium without royalty provided the copyright |
161 | @@ -226,6 +226,11 @@ |
162 | |
163 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
164 | |
165 | + HP-UX `make' updates targets which have the same time stamps as |
166 | +their prerequisites, which makes it generally unusable when shipped |
167 | +generated files such as `configure' are involved. Use GNU `make' |
168 | +instead. |
169 | + |
170 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
171 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
172 | a workaround. If GNU CC is not installed, it is therefore recommended |
173 | |
174 | === modified file 'Makefile.in' |
175 | --- Makefile.in 2012-02-15 10:50:36 +0000 |
176 | +++ Makefile.in 2014-02-16 22:04:28 +0000 |
177 | @@ -1,9 +1,9 @@ |
178 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
179 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
180 | # @configure_input@ |
181 | |
182 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
183 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
184 | -# Inc. |
185 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
186 | +# Foundation, Inc. |
187 | # This Makefile.in is free software; the Free Software Foundation |
188 | # gives unlimited permission to copy and/or distribute it, |
189 | # with or without modifications, as long as this notice is preserved. |
190 | @@ -16,6 +16,23 @@ |
191 | @SET_MAKE@ |
192 | |
193 | VPATH = @srcdir@ |
194 | +am__make_dryrun = \ |
195 | + { \ |
196 | + am__dry=no; \ |
197 | + case $$MAKEFLAGS in \ |
198 | + *\\[\ \ ]*) \ |
199 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
200 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
201 | + *) \ |
202 | + for am__flg in $$MAKEFLAGS; do \ |
203 | + case $$am__flg in \ |
204 | + *=*|--*) ;; \ |
205 | + *n*) am__dry=yes; break;; \ |
206 | + esac; \ |
207 | + done;; \ |
208 | + esac; \ |
209 | + test $$am__dry = yes; \ |
210 | + } |
211 | pkgdatadir = $(datadir)/@PACKAGE@ |
212 | pkgincludedir = $(includedir)/@PACKAGE@ |
213 | pkglibdir = $(libdir)/@PACKAGE@ |
214 | @@ -61,11 +78,11 @@ |
215 | CONFIG_HEADER = config.h |
216 | CONFIG_CLEAN_FILES = libxklavier.spec libxklavier.pc |
217 | CONFIG_CLEAN_VPATH_FILES = |
218 | -AM_V_GEN = $(am__v_GEN_$(V)) |
219 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
220 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
221 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
222 | am__v_GEN_0 = @echo " GEN " $@; |
223 | -AM_V_at = $(am__v_at_$(V)) |
224 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
225 | +AM_V_at = $(am__v_at_@AM_V@) |
226 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
227 | am__v_at_0 = @ |
228 | SOURCES = |
229 | DIST_SOURCES = |
230 | @@ -76,6 +93,11 @@ |
231 | install-pdf-recursive install-ps-recursive install-recursive \ |
232 | installcheck-recursive installdirs-recursive pdf-recursive \ |
233 | ps-recursive uninstall-recursive |
234 | +am__can_run_installinfo = \ |
235 | + case $$AM_UPDATE_INFO_DIR in \ |
236 | + n|no|NO) false;; \ |
237 | + *) (install-info --version) >/dev/null 2>&1;; \ |
238 | + esac |
239 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
240 | am__vpath_adj = case $$p in \ |
241 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
242 | @@ -97,6 +119,12 @@ |
243 | am__base_list = \ |
244 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
245 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
246 | +am__uninstall_files_from_dir = { \ |
247 | + test -z "$$files" \ |
248 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
249 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
250 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
251 | + } |
252 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" |
253 | DATA = $(pkgconfig_DATA) |
254 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
255 | @@ -111,9 +139,11 @@ |
256 | distdir = $(PACKAGE)-$(VERSION) |
257 | top_distdir = $(distdir) |
258 | am__remove_distdir = \ |
259 | - { test ! -d "$(distdir)" \ |
260 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
261 | - && rm -fr "$(distdir)"; }; } |
262 | + if test -d "$(distdir)"; then \ |
263 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
264 | + && rm -rf "$(distdir)" \ |
265 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
266 | + else :; fi |
267 | am__relativize = \ |
268 | dir0=`pwd`; \ |
269 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
270 | @@ -142,6 +172,8 @@ |
271 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
272 | GZIP_ENV = --best |
273 | distuninstallcheck_listfiles = find . -type f -print |
274 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
275 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
276 | distcleancheck_listfiles = find . -type f -print |
277 | ACLOCAL = @ACLOCAL@ |
278 | AMTAR = @AMTAR@ |
279 | @@ -318,7 +350,7 @@ |
280 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
281 | |
282 | .SUFFIXES: |
283 | -am--refresh: |
284 | +am--refresh: Makefile |
285 | @: |
286 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
287 | @for dep in $?; do \ |
288 | @@ -354,10 +386,8 @@ |
289 | $(am__aclocal_m4_deps): |
290 | |
291 | config.h: stamp-h1 |
292 | - @if test ! -f $@; then \ |
293 | - rm -f stamp-h1; \ |
294 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
295 | - else :; fi |
296 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
297 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
298 | |
299 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
300 | @rm -f stamp-h1 |
301 | @@ -384,8 +414,11 @@ |
302 | -rm -f libtool config.lt |
303 | install-pkgconfigDATA: $(pkgconfig_DATA) |
304 | @$(NORMAL_INSTALL) |
305 | - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
306 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
307 | + if test -n "$$list"; then \ |
308 | + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ |
309 | + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ |
310 | + fi; \ |
311 | for p in $$list; do \ |
312 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
313 | echo "$$d$$p"; \ |
314 | @@ -399,9 +432,7 @@ |
315 | @$(NORMAL_UNINSTALL) |
316 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
317 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
318 | - test -n "$$files" || exit 0; \ |
319 | - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
320 | - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
321 | + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) |
322 | |
323 | # This directory's subdirectories are mostly independent; you can cd |
324 | # into them and run `make' without going through this Makefile. |
325 | @@ -572,13 +603,10 @@ |
326 | done |
327 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
328 | if test "$$subdir" = .; then :; else \ |
329 | - test -d "$(distdir)/$$subdir" \ |
330 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
331 | - || exit 1; \ |
332 | - fi; \ |
333 | - done |
334 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
335 | - if test "$$subdir" = .; then :; else \ |
336 | + $(am__make_dryrun) \ |
337 | + || test -d "$(distdir)/$$subdir" \ |
338 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
339 | + || exit 1; \ |
340 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
341 | $(am__relativize); \ |
342 | new_distdir=$$reldir; \ |
343 | @@ -609,7 +637,11 @@ |
344 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
345 | $(am__remove_distdir) |
346 | dist-bzip2: distdir |
347 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
348 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
349 | + $(am__remove_distdir) |
350 | + |
351 | +dist-lzip: distdir |
352 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
353 | $(am__remove_distdir) |
354 | |
355 | dist-lzma: distdir |
356 | @@ -617,7 +649,7 @@ |
357 | $(am__remove_distdir) |
358 | |
359 | dist-xz: distdir |
360 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
361 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
362 | $(am__remove_distdir) |
363 | |
364 | dist-tarZ: distdir |
365 | @@ -635,7 +667,7 @@ |
366 | |
367 | dist dist-all: distdir |
368 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
369 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
370 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
371 | $(am__remove_distdir) |
372 | |
373 | # This target untars the dist file and tries a VPATH configuration. Then |
374 | @@ -649,6 +681,8 @@ |
375 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
376 | *.tar.lzma*) \ |
377 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
378 | + *.tar.lz*) \ |
379 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
380 | *.tar.xz*) \ |
381 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
382 | *.tar.Z*) \ |
383 | @@ -658,7 +692,7 @@ |
384 | *.zip*) \ |
385 | unzip $(distdir).zip ;;\ |
386 | esac |
387 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
388 | + chmod -R a-w $(distdir); chmod u+w $(distdir) |
389 | mkdir $(distdir)/_build |
390 | mkdir $(distdir)/_inst |
391 | chmod a-w $(distdir) |
392 | @@ -668,6 +702,7 @@ |
393 | && am__cwd=`pwd` \ |
394 | && $(am__cd) $(distdir)/_build \ |
395 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
396 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
397 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
398 | && $(MAKE) $(AM_MAKEFLAGS) \ |
399 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
400 | @@ -696,8 +731,16 @@ |
401 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
402 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
403 | distuninstallcheck: |
404 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
405 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
406 | + @test -n '$(distuninstallcheck_dir)' || { \ |
407 | + echo 'ERROR: trying to run $@ with an empty' \ |
408 | + '$$(distuninstallcheck_dir)' >&2; \ |
409 | + exit 1; \ |
410 | + }; \ |
411 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
412 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
413 | + exit 1; \ |
414 | + }; \ |
415 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
416 | || { echo "ERROR: files left after uninstall:" ; \ |
417 | if test -n "$(DESTDIR)"; then \ |
418 | echo " (check DESTDIR support)"; \ |
419 | @@ -731,10 +774,15 @@ |
420 | |
421 | installcheck: installcheck-recursive |
422 | install-strip: |
423 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
424 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
425 | - `test -z '$(STRIP)' || \ |
426 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
427 | + if test -z '$(STRIP)'; then \ |
428 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
429 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
430 | + install; \ |
431 | + else \ |
432 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
433 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
434 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
435 | + fi |
436 | mostlyclean-generic: |
437 | |
438 | clean-generic: |
439 | @@ -822,8 +870,8 @@ |
440 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
441 | all all-am am--refresh check check-am clean clean-generic \ |
442 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
443 | - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
444 | - distcheck distclean distclean-generic distclean-hdr \ |
445 | + dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ |
446 | + dist-zip distcheck distclean distclean-generic distclean-hdr \ |
447 | distclean-libtool distclean-tags distcleancheck distdir \ |
448 | distuninstallcheck dvi dvi-am html html-am info info-am \ |
449 | install install-am install-data install-data-am install-dvi \ |
450 | |
451 | === modified file 'NEWS' |
452 | --- NEWS 2012-02-22 02:28:16 +0000 |
453 | +++ NEWS 2014-02-16 22:04:28 +0000 |
454 | @@ -1,3 +1,4 @@ |
455 | +5.3 A number of introspection and build fixes |
456 | 5.2.1 Fixed GIR params for introspection (broken build) |
457 | 5.2 Optional introspection introduced |
458 | Some minor fixes (runtime and build-time) |
459 | |
460 | === modified file 'aclocal.m4' |
461 | --- aclocal.m4 2012-02-15 10:50:36 +0000 |
462 | +++ aclocal.m4 2014-02-16 22:04:28 +0000 |
463 | @@ -1,7 +1,8 @@ |
464 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
465 | +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
466 | |
467 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
468 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
469 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
470 | +# Inc. |
471 | # This file is free software; the Free Software Foundation |
472 | # gives unlimited permission to copy and/or distribute it, |
473 | # with or without modifications, as long as this notice is preserved. |
474 | @@ -177,12 +178,15 @@ |
475 | fi[]dnl |
476 | ])# PKG_CHECK_MODULES |
477 | |
478 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
479 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
480 | +# Foundation, Inc. |
481 | # |
482 | # This file is free software; the Free Software Foundation |
483 | # gives unlimited permission to copy and/or distribute it, |
484 | # with or without modifications, as long as this notice is preserved. |
485 | |
486 | +# serial 1 |
487 | + |
488 | # AM_AUTOMAKE_VERSION(VERSION) |
489 | # ---------------------------- |
490 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
491 | @@ -192,7 +196,7 @@ |
492 | [am__api_version='1.11' |
493 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
494 | dnl require some minimum version. Point them to the right macro. |
495 | -m4_if([$1], [1.11.1], [], |
496 | +m4_if([$1], [1.11.6], [], |
497 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
498 | ]) |
499 | |
500 | @@ -208,19 +212,21 @@ |
501 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
502 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
503 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
504 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
505 | +[AM_AUTOMAKE_VERSION([1.11.6])dnl |
506 | m4_ifndef([AC_AUTOCONF_VERSION], |
507 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
508 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
509 | |
510 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
511 | |
512 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
513 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
514 | # |
515 | # This file is free software; the Free Software Foundation |
516 | # gives unlimited permission to copy and/or distribute it, |
517 | # with or without modifications, as long as this notice is preserved. |
518 | |
519 | +# serial 1 |
520 | + |
521 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
522 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
523 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
524 | @@ -302,14 +308,14 @@ |
525 | Usually this means the macro was only invoked conditionally.]]) |
526 | fi])]) |
527 | |
528 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
529 | -# Free Software Foundation, Inc. |
530 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
531 | +# 2010, 2011 Free Software Foundation, Inc. |
532 | # |
533 | # This file is free software; the Free Software Foundation |
534 | # gives unlimited permission to copy and/or distribute it, |
535 | # with or without modifications, as long as this notice is preserved. |
536 | |
537 | -# serial 10 |
538 | +# serial 12 |
539 | |
540 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
541 | # written in clear, in which case automake, when reading aclocal.m4, |
542 | @@ -349,6 +355,7 @@ |
543 | # instance it was reported that on HP-UX the gcc test will end up |
544 | # making a dummy file named `D' -- because `-MD' means `put the output |
545 | # in D'. |
546 | + rm -rf conftest.dir |
547 | mkdir conftest.dir |
548 | # Copy depcomp to subdir because otherwise we won't find it if we're |
549 | # using a relative directory. |
550 | @@ -413,7 +420,7 @@ |
551 | break |
552 | fi |
553 | ;; |
554 | - msvisualcpp | msvcmsys) |
555 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
556 | # This compiler won't grok `-c -o', but also, the minuso test has |
557 | # not run yet. These depmodes are late enough in the game, and |
558 | # so weak that their functioning should not be impacted. |
559 | @@ -478,10 +485,13 @@ |
560 | if test "x$enable_dependency_tracking" != xno; then |
561 | am_depcomp="$ac_aux_dir/depcomp" |
562 | AMDEPBACKSLASH='\' |
563 | + am__nodep='_no' |
564 | fi |
565 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
566 | AC_SUBST([AMDEPBACKSLASH])dnl |
567 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
568 | +AC_SUBST([am__nodep])dnl |
569 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
570 | ]) |
571 | |
572 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
573 | @@ -703,12 +713,15 @@ |
574 | done |
575 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
576 | |
577 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
578 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
579 | +# Inc. |
580 | # |
581 | # This file is free software; the Free Software Foundation |
582 | # gives unlimited permission to copy and/or distribute it, |
583 | # with or without modifications, as long as this notice is preserved. |
584 | |
585 | +# serial 1 |
586 | + |
587 | # AM_PROG_INSTALL_SH |
588 | # ------------------ |
589 | # Define $install_sh. |
590 | @@ -748,8 +761,8 @@ |
591 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
592 | # From Jim Meyering |
593 | |
594 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
595 | -# Free Software Foundation, Inc. |
596 | +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
597 | +# 2011 Free Software Foundation, Inc. |
598 | # |
599 | # This file is free software; the Free Software Foundation |
600 | # gives unlimited permission to copy and/or distribute it, |
601 | @@ -769,7 +782,7 @@ |
602 | [disable], [m4_define([am_maintainer_other], [enable])], |
603 | [m4_define([am_maintainer_other], [enable]) |
604 | m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
605 | -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) |
606 | +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
607 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
608 | AC_ARG_ENABLE([maintainer-mode], |
609 | [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
610 | @@ -880,12 +893,15 @@ |
611 | fi |
612 | ]) |
613 | |
614 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
615 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
616 | +# Inc. |
617 | # |
618 | # This file is free software; the Free Software Foundation |
619 | # gives unlimited permission to copy and/or distribute it, |
620 | # with or without modifications, as long as this notice is preserved. |
621 | |
622 | +# serial 1 |
623 | + |
624 | # AM_PROG_MKDIR_P |
625 | # --------------- |
626 | # Check for `mkdir -p'. |
627 | @@ -908,13 +924,14 @@ |
628 | |
629 | # Helper functions for option handling. -*- Autoconf -*- |
630 | |
631 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
632 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
633 | +# Foundation, Inc. |
634 | # |
635 | # This file is free software; the Free Software Foundation |
636 | # gives unlimited permission to copy and/or distribute it, |
637 | # with or without modifications, as long as this notice is preserved. |
638 | |
639 | -# serial 4 |
640 | +# serial 5 |
641 | |
642 | # _AM_MANGLE_OPTION(NAME) |
643 | # ----------------------- |
644 | @@ -922,13 +939,13 @@ |
645 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
646 | |
647 | # _AM_SET_OPTION(NAME) |
648 | -# ------------------------------ |
649 | +# -------------------- |
650 | # Set option NAME. Presently that only means defining a flag for this option. |
651 | AC_DEFUN([_AM_SET_OPTION], |
652 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
653 | |
654 | # _AM_SET_OPTIONS(OPTIONS) |
655 | -# ---------------------------------- |
656 | +# ------------------------ |
657 | # OPTIONS is a space-separated list of Automake options. |
658 | AC_DEFUN([_AM_SET_OPTIONS], |
659 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
660 | @@ -1004,13 +1021,13 @@ |
661 | fi |
662 | AC_MSG_RESULT(yes)]) |
663 | |
664 | -# Copyright (C) 2009 Free Software Foundation, Inc. |
665 | +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. |
666 | # |
667 | # This file is free software; the Free Software Foundation |
668 | # gives unlimited permission to copy and/or distribute it, |
669 | # with or without modifications, as long as this notice is preserved. |
670 | |
671 | -# serial 1 |
672 | +# serial 2 |
673 | |
674 | # AM_SILENT_RULES([DEFAULT]) |
675 | # -------------------------- |
676 | @@ -1025,18 +1042,50 @@ |
677 | no) AM_DEFAULT_VERBOSITY=1;; |
678 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
679 | esac |
680 | +dnl |
681 | +dnl A few `make' implementations (e.g., NonStop OS and NextStep) |
682 | +dnl do not support nested variable expansions. |
683 | +dnl See automake bug#9928 and bug#10237. |
684 | +am_make=${MAKE-make} |
685 | +AC_CACHE_CHECK([whether $am_make supports nested variables], |
686 | + [am_cv_make_support_nested_variables], |
687 | + [if AS_ECHO([['TRUE=$(BAR$(V)) |
688 | +BAR0=false |
689 | +BAR1=true |
690 | +V=1 |
691 | +am__doit: |
692 | + @$(TRUE) |
693 | +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then |
694 | + am_cv_make_support_nested_variables=yes |
695 | +else |
696 | + am_cv_make_support_nested_variables=no |
697 | +fi]) |
698 | +if test $am_cv_make_support_nested_variables = yes; then |
699 | + dnl Using `$V' instead of `$(V)' breaks IRIX make. |
700 | + AM_V='$(V)' |
701 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
702 | +else |
703 | + AM_V=$AM_DEFAULT_VERBOSITY |
704 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
705 | +fi |
706 | +AC_SUBST([AM_V])dnl |
707 | +AM_SUBST_NOTMAKE([AM_V])dnl |
708 | +AC_SUBST([AM_DEFAULT_V])dnl |
709 | +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
710 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
711 | AM_BACKSLASH='\' |
712 | AC_SUBST([AM_BACKSLASH])dnl |
713 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
714 | ]) |
715 | |
716 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
717 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
718 | # |
719 | # This file is free software; the Free Software Foundation |
720 | # gives unlimited permission to copy and/or distribute it, |
721 | # with or without modifications, as long as this notice is preserved. |
722 | |
723 | +# serial 1 |
724 | + |
725 | # AM_PROG_INSTALL_STRIP |
726 | # --------------------- |
727 | # One issue with vendor `install' (even GNU) is that you can't |
728 | @@ -1059,13 +1108,13 @@ |
729 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
730 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
731 | |
732 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
733 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
734 | # |
735 | # This file is free software; the Free Software Foundation |
736 | # gives unlimited permission to copy and/or distribute it, |
737 | # with or without modifications, as long as this notice is preserved. |
738 | |
739 | -# serial 2 |
740 | +# serial 3 |
741 | |
742 | # _AM_SUBST_NOTMAKE(VARIABLE) |
743 | # --------------------------- |
744 | @@ -1074,13 +1123,13 @@ |
745 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
746 | |
747 | # AM_SUBST_NOTMAKE(VARIABLE) |
748 | -# --------------------------- |
749 | +# -------------------------- |
750 | # Public sister of _AM_SUBST_NOTMAKE. |
751 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
752 | |
753 | # Check how to create a tarball. -*- Autoconf -*- |
754 | |
755 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
756 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
757 | # |
758 | # This file is free software; the Free Software Foundation |
759 | # gives unlimited permission to copy and/or distribute it, |
760 | @@ -1102,10 +1151,11 @@ |
761 | # a tarball read from stdin. |
762 | # $(am__untar) < result.tar |
763 | AC_DEFUN([_AM_PROG_TAR], |
764 | -[# Always define AMTAR for backward compatibility. |
765 | -AM_MISSING_PROG([AMTAR], [tar]) |
766 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
767 | +# in the wild :-( We should find a proper way to deprecate it ... |
768 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
769 | m4_if([$1], [v7], |
770 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
771 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
772 | [m4_case([$1], [ustar],, [pax],, |
773 | [m4_fatal([Unknown tar format])]) |
774 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
775 | |
776 | === modified file 'build-aux/config.guess' |
777 | --- build-aux/config.guess 2012-02-15 10:50:36 +0000 |
778 | +++ build-aux/config.guess 2014-02-16 22:04:28 +0000 |
779 | @@ -1,10 +1,10 @@ |
780 | #! /bin/sh |
781 | # Attempt to guess a canonical system name. |
782 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
783 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
784 | -# Free Software Foundation, Inc. |
785 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
786 | +# 2011, 2012 Free Software Foundation, Inc. |
787 | |
788 | -timestamp='2009-11-20' |
789 | +timestamp='2012-02-10' |
790 | |
791 | # This file is free software; you can redistribute it and/or modify it |
792 | # under the terms of the GNU General Public License as published by |
793 | @@ -17,9 +17,7 @@ |
794 | # General Public License for more details. |
795 | # |
796 | # You should have received a copy of the GNU General Public License |
797 | -# along with this program; if not, write to the Free Software |
798 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
799 | -# 02110-1301, USA. |
800 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
801 | # |
802 | # As a special exception to the GNU General Public License, if you |
803 | # distribute this file as part of a program that contains a |
804 | @@ -56,8 +54,9 @@ |
805 | GNU config.guess ($timestamp) |
806 | |
807 | Originally written by Per Bothner. |
808 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
809 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
810 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
811 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
812 | +Free Software Foundation, Inc. |
813 | |
814 | This is free software; see the source for copying conditions. There is NO |
815 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
816 | @@ -144,7 +143,7 @@ |
817 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
818 | *:NetBSD:*:*) |
819 | # NetBSD (nbsd) targets should (where applicable) match one or |
820 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
821 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
822 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
823 | # switched to ELF, *-*-netbsd* would select the old |
824 | # object file format. This provides both forward |
825 | @@ -180,7 +179,7 @@ |
826 | fi |
827 | ;; |
828 | *) |
829 | - os=netbsd |
830 | + os=netbsd |
831 | ;; |
832 | esac |
833 | # The OS release |
834 | @@ -223,7 +222,7 @@ |
835 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
836 | ;; |
837 | *5.*) |
838 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
839 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
840 | ;; |
841 | esac |
842 | # According to Compaq, /usr/sbin/psrinfo has been available on |
843 | @@ -269,7 +268,10 @@ |
844 | # A Xn.n version is an unreleased experimental baselevel. |
845 | # 1.2 uses "1.2" for uname -r. |
846 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
847 | - exit ;; |
848 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
849 | + exitcode=$? |
850 | + trap '' 0 |
851 | + exit $exitcode ;; |
852 | Alpha\ *:Windows_NT*:*) |
853 | # How do we know it's Interix rather than the generic POSIX subsystem? |
854 | # Should we change UNAME_MACHINE based on the output of uname instead |
855 | @@ -295,7 +297,7 @@ |
856 | echo s390-ibm-zvmoe |
857 | exit ;; |
858 | *:OS400:*:*) |
859 | - echo powerpc-ibm-os400 |
860 | + echo powerpc-ibm-os400 |
861 | exit ;; |
862 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
863 | echo arm-acorn-riscix${UNAME_RELEASE} |
864 | @@ -394,23 +396,23 @@ |
865 | # MiNT. But MiNT is downward compatible to TOS, so this should |
866 | # be no problem. |
867 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
868 | - echo m68k-atari-mint${UNAME_RELEASE} |
869 | + echo m68k-atari-mint${UNAME_RELEASE} |
870 | exit ;; |
871 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
872 | echo m68k-atari-mint${UNAME_RELEASE} |
873 | - exit ;; |
874 | + exit ;; |
875 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
876 | - echo m68k-atari-mint${UNAME_RELEASE} |
877 | + echo m68k-atari-mint${UNAME_RELEASE} |
878 | exit ;; |
879 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
880 | - echo m68k-milan-mint${UNAME_RELEASE} |
881 | - exit ;; |
882 | + echo m68k-milan-mint${UNAME_RELEASE} |
883 | + exit ;; |
884 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
885 | - echo m68k-hades-mint${UNAME_RELEASE} |
886 | - exit ;; |
887 | + echo m68k-hades-mint${UNAME_RELEASE} |
888 | + exit ;; |
889 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
890 | - echo m68k-unknown-mint${UNAME_RELEASE} |
891 | - exit ;; |
892 | + echo m68k-unknown-mint${UNAME_RELEASE} |
893 | + exit ;; |
894 | m68k:machten:*:*) |
895 | echo m68k-apple-machten${UNAME_RELEASE} |
896 | exit ;; |
897 | @@ -480,8 +482,8 @@ |
898 | echo m88k-motorola-sysv3 |
899 | exit ;; |
900 | AViiON:dgux:*:*) |
901 | - # DG/UX returns AViiON for all architectures |
902 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
903 | + # DG/UX returns AViiON for all architectures |
904 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
905 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
906 | then |
907 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
908 | @@ -494,7 +496,7 @@ |
909 | else |
910 | echo i586-dg-dgux${UNAME_RELEASE} |
911 | fi |
912 | - exit ;; |
913 | + exit ;; |
914 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
915 | echo m88k-dolphin-sysv3 |
916 | exit ;; |
917 | @@ -551,7 +553,7 @@ |
918 | echo rs6000-ibm-aix3.2 |
919 | fi |
920 | exit ;; |
921 | - *:AIX:*:[456]) |
922 | + *:AIX:*:[4567]) |
923 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
924 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
925 | IBM_ARCH=rs6000 |
926 | @@ -594,52 +596,52 @@ |
927 | 9000/[678][0-9][0-9]) |
928 | if [ -x /usr/bin/getconf ]; then |
929 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
930 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
931 | - case "${sc_cpu_version}" in |
932 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
933 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
934 | - 532) # CPU_PA_RISC2_0 |
935 | - case "${sc_kernel_bits}" in |
936 | - 32) HP_ARCH="hppa2.0n" ;; |
937 | - 64) HP_ARCH="hppa2.0w" ;; |
938 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
939 | + case "${sc_cpu_version}" in |
940 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
941 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
942 | + 532) # CPU_PA_RISC2_0 |
943 | + case "${sc_kernel_bits}" in |
944 | + 32) HP_ARCH="hppa2.0n" ;; |
945 | + 64) HP_ARCH="hppa2.0w" ;; |
946 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
947 | - esac ;; |
948 | - esac |
949 | + esac ;; |
950 | + esac |
951 | fi |
952 | if [ "${HP_ARCH}" = "" ]; then |
953 | eval $set_cc_for_build |
954 | - sed 's/^ //' << EOF >$dummy.c |
955 | - |
956 | - #define _HPUX_SOURCE |
957 | - #include <stdlib.h> |
958 | - #include <unistd.h> |
959 | - |
960 | - int main () |
961 | - { |
962 | - #if defined(_SC_KERNEL_BITS) |
963 | - long bits = sysconf(_SC_KERNEL_BITS); |
964 | - #endif |
965 | - long cpu = sysconf (_SC_CPU_VERSION); |
966 | - |
967 | - switch (cpu) |
968 | - { |
969 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
970 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
971 | - case CPU_PA_RISC2_0: |
972 | - #if defined(_SC_KERNEL_BITS) |
973 | - switch (bits) |
974 | - { |
975 | - case 64: puts ("hppa2.0w"); break; |
976 | - case 32: puts ("hppa2.0n"); break; |
977 | - default: puts ("hppa2.0"); break; |
978 | - } break; |
979 | - #else /* !defined(_SC_KERNEL_BITS) */ |
980 | - puts ("hppa2.0"); break; |
981 | - #endif |
982 | - default: puts ("hppa1.0"); break; |
983 | - } |
984 | - exit (0); |
985 | - } |
986 | + sed 's/^ //' << EOF >$dummy.c |
987 | + |
988 | + #define _HPUX_SOURCE |
989 | + #include <stdlib.h> |
990 | + #include <unistd.h> |
991 | + |
992 | + int main () |
993 | + { |
994 | + #if defined(_SC_KERNEL_BITS) |
995 | + long bits = sysconf(_SC_KERNEL_BITS); |
996 | + #endif |
997 | + long cpu = sysconf (_SC_CPU_VERSION); |
998 | + |
999 | + switch (cpu) |
1000 | + { |
1001 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
1002 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
1003 | + case CPU_PA_RISC2_0: |
1004 | + #if defined(_SC_KERNEL_BITS) |
1005 | + switch (bits) |
1006 | + { |
1007 | + case 64: puts ("hppa2.0w"); break; |
1008 | + case 32: puts ("hppa2.0n"); break; |
1009 | + default: puts ("hppa2.0"); break; |
1010 | + } break; |
1011 | + #else /* !defined(_SC_KERNEL_BITS) */ |
1012 | + puts ("hppa2.0"); break; |
1013 | + #endif |
1014 | + default: puts ("hppa1.0"); break; |
1015 | + } |
1016 | + exit (0); |
1017 | + } |
1018 | EOF |
1019 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
1020 | test -z "$HP_ARCH" && HP_ARCH=hppa |
1021 | @@ -730,22 +732,22 @@ |
1022 | exit ;; |
1023 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
1024 | echo c1-convex-bsd |
1025 | - exit ;; |
1026 | + exit ;; |
1027 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
1028 | if getsysinfo -f scalar_acc |
1029 | then echo c32-convex-bsd |
1030 | else echo c2-convex-bsd |
1031 | fi |
1032 | - exit ;; |
1033 | + exit ;; |
1034 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
1035 | echo c34-convex-bsd |
1036 | - exit ;; |
1037 | + exit ;; |
1038 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
1039 | echo c38-convex-bsd |
1040 | - exit ;; |
1041 | + exit ;; |
1042 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
1043 | echo c4-convex-bsd |
1044 | - exit ;; |
1045 | + exit ;; |
1046 | CRAY*Y-MP:*:*:*) |
1047 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
1048 | exit ;; |
1049 | @@ -769,14 +771,14 @@ |
1050 | exit ;; |
1051 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
1052 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
1053 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
1054 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
1055 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1056 | - exit ;; |
1057 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
1058 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
1059 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1060 | + exit ;; |
1061 | 5000:UNIX_System_V:4.*:*) |
1062 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
1063 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
1064 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1065 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
1066 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
1067 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1068 | exit ;; |
1069 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
1070 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
1071 | @@ -788,13 +790,12 @@ |
1072 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
1073 | exit ;; |
1074 | *:FreeBSD:*:*) |
1075 | - case ${UNAME_MACHINE} in |
1076 | - pc98) |
1077 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1078 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
1079 | + case ${UNAME_PROCESSOR} in |
1080 | amd64) |
1081 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1082 | *) |
1083 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1084 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1085 | esac |
1086 | exit ;; |
1087 | i*:CYGWIN*:*) |
1088 | @@ -803,15 +804,18 @@ |
1089 | *:MINGW*:*) |
1090 | echo ${UNAME_MACHINE}-pc-mingw32 |
1091 | exit ;; |
1092 | + i*:MSYS*:*) |
1093 | + echo ${UNAME_MACHINE}-pc-msys |
1094 | + exit ;; |
1095 | i*:windows32*:*) |
1096 | - # uname -m includes "-pc" on this system. |
1097 | - echo ${UNAME_MACHINE}-mingw32 |
1098 | + # uname -m includes "-pc" on this system. |
1099 | + echo ${UNAME_MACHINE}-mingw32 |
1100 | exit ;; |
1101 | i*:PW*:*) |
1102 | echo ${UNAME_MACHINE}-pc-pw32 |
1103 | exit ;; |
1104 | *:Interix*:*) |
1105 | - case ${UNAME_MACHINE} in |
1106 | + case ${UNAME_MACHINE} in |
1107 | x86) |
1108 | echo i586-pc-interix${UNAME_RELEASE} |
1109 | exit ;; |
1110 | @@ -857,6 +861,13 @@ |
1111 | i*86:Minix:*:*) |
1112 | echo ${UNAME_MACHINE}-pc-minix |
1113 | exit ;; |
1114 | + aarch64:Linux:*:*) |
1115 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1116 | + exit ;; |
1117 | + aarch64_be:Linux:*:*) |
1118 | + UNAME_MACHINE=aarch64_be |
1119 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1120 | + exit ;; |
1121 | alpha:Linux:*:*) |
1122 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1123 | EV5) UNAME_MACHINE=alphaev5 ;; |
1124 | @@ -866,7 +877,7 @@ |
1125 | EV6) UNAME_MACHINE=alphaev6 ;; |
1126 | EV67) UNAME_MACHINE=alphaev67 ;; |
1127 | EV68*) UNAME_MACHINE=alphaev68 ;; |
1128 | - esac |
1129 | + esac |
1130 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
1131 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
1132 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
1133 | @@ -878,20 +889,29 @@ |
1134 | then |
1135 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1136 | else |
1137 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
1138 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
1139 | + | grep -q __ARM_PCS_VFP |
1140 | + then |
1141 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
1142 | + else |
1143 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
1144 | + fi |
1145 | fi |
1146 | exit ;; |
1147 | avr32*:Linux:*:*) |
1148 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1149 | exit ;; |
1150 | cris:Linux:*:*) |
1151 | - echo cris-axis-linux-gnu |
1152 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1153 | exit ;; |
1154 | crisv32:Linux:*:*) |
1155 | - echo crisv32-axis-linux-gnu |
1156 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1157 | exit ;; |
1158 | frv:Linux:*:*) |
1159 | - echo frv-unknown-linux-gnu |
1160 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1161 | + exit ;; |
1162 | + hexagon:Linux:*:*) |
1163 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1164 | exit ;; |
1165 | i*86:Linux:*:*) |
1166 | LIBC=gnu |
1167 | @@ -933,7 +953,7 @@ |
1168 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
1169 | ;; |
1170 | or32:Linux:*:*) |
1171 | - echo or32-unknown-linux-gnu |
1172 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1173 | exit ;; |
1174 | padre:Linux:*:*) |
1175 | echo sparc-unknown-linux-gnu |
1176 | @@ -959,7 +979,7 @@ |
1177 | echo ${UNAME_MACHINE}-ibm-linux |
1178 | exit ;; |
1179 | sh64*:Linux:*:*) |
1180 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1181 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1182 | exit ;; |
1183 | sh*:Linux:*:*) |
1184 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1185 | @@ -967,14 +987,17 @@ |
1186 | sparc:Linux:*:* | sparc64:Linux:*:*) |
1187 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1188 | exit ;; |
1189 | + tile*:Linux:*:*) |
1190 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1191 | + exit ;; |
1192 | vax:Linux:*:*) |
1193 | echo ${UNAME_MACHINE}-dec-linux-gnu |
1194 | exit ;; |
1195 | x86_64:Linux:*:*) |
1196 | - echo x86_64-unknown-linux-gnu |
1197 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1198 | exit ;; |
1199 | xtensa*:Linux:*:*) |
1200 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1201 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1202 | exit ;; |
1203 | i*86:DYNIX/ptx:4*:*) |
1204 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1205 | @@ -983,11 +1006,11 @@ |
1206 | echo i386-sequent-sysv4 |
1207 | exit ;; |
1208 | i*86:UNIX_SV:4.2MP:2.*) |
1209 | - # Unixware is an offshoot of SVR4, but it has its own version |
1210 | - # number series starting with 2... |
1211 | - # I am not positive that other SVR4 systems won't match this, |
1212 | + # Unixware is an offshoot of SVR4, but it has its own version |
1213 | + # number series starting with 2... |
1214 | + # I am not positive that other SVR4 systems won't match this, |
1215 | # I just have to hope. -- rms. |
1216 | - # Use sysv4.2uw... so that sysv4* matches it. |
1217 | + # Use sysv4.2uw... so that sysv4* matches it. |
1218 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
1219 | exit ;; |
1220 | i*86:OS/2:*:*) |
1221 | @@ -1019,7 +1042,7 @@ |
1222 | fi |
1223 | exit ;; |
1224 | i*86:*:5:[678]*) |
1225 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1226 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1227 | case `/bin/uname -X | grep "^Machine"` in |
1228 | *486*) UNAME_MACHINE=i486 ;; |
1229 | *Pentium) UNAME_MACHINE=i586 ;; |
1230 | @@ -1047,13 +1070,13 @@ |
1231 | exit ;; |
1232 | pc:*:*:*) |
1233 | # Left here for compatibility: |
1234 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1235 | - # the processor, so we play safe by assuming i586. |
1236 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1237 | + # the processor, so we play safe by assuming i586. |
1238 | # Note: whatever this is, it MUST be the same as what config.sub |
1239 | # prints for the "djgpp" host, or else GDB configury will decide that |
1240 | # this is a cross-build. |
1241 | echo i586-pc-msdosdjgpp |
1242 | - exit ;; |
1243 | + exit ;; |
1244 | Intel:Mach:3*:*) |
1245 | echo i386-pc-mach3 |
1246 | exit ;; |
1247 | @@ -1088,8 +1111,8 @@ |
1248 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1249 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
1250 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1251 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1252 | - && { echo i486-ncr-sysv4; exit; } ;; |
1253 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1254 | + && { echo i486-ncr-sysv4; exit; } ;; |
1255 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
1256 | OS_REL='.3' |
1257 | test -r /etc/.relid \ |
1258 | @@ -1132,10 +1155,10 @@ |
1259 | echo ns32k-sni-sysv |
1260 | fi |
1261 | exit ;; |
1262 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1263 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
1264 | - echo i586-unisys-sysv4 |
1265 | - exit ;; |
1266 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1267 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
1268 | + echo i586-unisys-sysv4 |
1269 | + exit ;; |
1270 | *:UNIX_System_V:4*:FTX*) |
1271 | # From Gerald Hewes <hewes@openmarket.com>. |
1272 | # How about differentiating between stratus architectures? -djm |
1273 | @@ -1161,11 +1184,11 @@ |
1274 | exit ;; |
1275 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1276 | if [ -d /usr/nec ]; then |
1277 | - echo mips-nec-sysv${UNAME_RELEASE} |
1278 | + echo mips-nec-sysv${UNAME_RELEASE} |
1279 | else |
1280 | - echo mips-unknown-sysv${UNAME_RELEASE} |
1281 | + echo mips-unknown-sysv${UNAME_RELEASE} |
1282 | fi |
1283 | - exit ;; |
1284 | + exit ;; |
1285 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1286 | echo powerpc-be-beos |
1287 | exit ;; |
1288 | @@ -1230,6 +1253,9 @@ |
1289 | *:QNX:*:4*) |
1290 | echo i386-pc-qnx |
1291 | exit ;; |
1292 | + NEO-?:NONSTOP_KERNEL:*:*) |
1293 | + echo neo-tandem-nsk${UNAME_RELEASE} |
1294 | + exit ;; |
1295 | NSE-?:NONSTOP_KERNEL:*:*) |
1296 | echo nse-tandem-nsk${UNAME_RELEASE} |
1297 | exit ;; |
1298 | @@ -1275,13 +1301,13 @@ |
1299 | echo pdp10-unknown-its |
1300 | exit ;; |
1301 | SEI:*:*:SEIUX) |
1302 | - echo mips-sei-seiux${UNAME_RELEASE} |
1303 | + echo mips-sei-seiux${UNAME_RELEASE} |
1304 | exit ;; |
1305 | *:DragonFly:*:*) |
1306 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
1307 | exit ;; |
1308 | *:*VMS:*:*) |
1309 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1310 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1311 | case "${UNAME_MACHINE}" in |
1312 | A*) echo alpha-dec-vms ; exit ;; |
1313 | I*) echo ia64-dec-vms ; exit ;; |
1314 | @@ -1299,6 +1325,9 @@ |
1315 | i*86:AROS:*:*) |
1316 | echo ${UNAME_MACHINE}-pc-aros |
1317 | exit ;; |
1318 | + x86_64:VMkernel:*:*) |
1319 | + echo ${UNAME_MACHINE}-unknown-esx |
1320 | + exit ;; |
1321 | esac |
1322 | |
1323 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
1324 | @@ -1321,11 +1350,11 @@ |
1325 | #include <sys/param.h> |
1326 | printf ("m68k-sony-newsos%s\n", |
1327 | #ifdef NEWSOS4 |
1328 | - "4" |
1329 | + "4" |
1330 | #else |
1331 | - "" |
1332 | + "" |
1333 | #endif |
1334 | - ); exit (0); |
1335 | + ); exit (0); |
1336 | #endif |
1337 | #endif |
1338 | |
1339 | |
1340 | === modified file 'build-aux/config.sub' |
1341 | --- build-aux/config.sub 2012-02-15 10:50:36 +0000 |
1342 | +++ build-aux/config.sub 2014-02-16 22:04:28 +0000 |
1343 | @@ -1,10 +1,10 @@ |
1344 | #! /bin/sh |
1345 | # Configuration validation subroutine script. |
1346 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1347 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
1348 | -# Free Software Foundation, Inc. |
1349 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1350 | +# 2011, 2012 Free Software Foundation, Inc. |
1351 | |
1352 | -timestamp='2009-11-20' |
1353 | +timestamp='2012-02-10' |
1354 | |
1355 | # This file is (in principle) common to ALL GNU software. |
1356 | # The presence of a machine in this file suggests that SOME GNU software |
1357 | @@ -21,9 +21,7 @@ |
1358 | # GNU General Public License for more details. |
1359 | # |
1360 | # You should have received a copy of the GNU General Public License |
1361 | -# along with this program; if not, write to the Free Software |
1362 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
1363 | -# 02110-1301, USA. |
1364 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
1365 | # |
1366 | # As a special exception to the GNU General Public License, if you |
1367 | # distribute this file as part of a program that contains a |
1368 | @@ -75,8 +73,9 @@ |
1369 | version="\ |
1370 | GNU config.sub ($timestamp) |
1371 | |
1372 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
1373 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
1374 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1375 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1376 | +Free Software Foundation, Inc. |
1377 | |
1378 | This is free software; see the source for copying conditions. There is NO |
1379 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1380 | @@ -123,13 +122,18 @@ |
1381 | # Here we must recognize all the valid KERNEL-OS combinations. |
1382 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1383 | case $maybe_os in |
1384 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
1385 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
1386 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1387 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1388 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
1389 | kopensolaris*-gnu* | \ |
1390 | storm-chaos* | os2-emx* | rtmk-nova*) |
1391 | os=-$maybe_os |
1392 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
1393 | ;; |
1394 | + android-linux) |
1395 | + os=-linux-android |
1396 | + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
1397 | + ;; |
1398 | *) |
1399 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
1400 | if [ $basic_machine != $1 ] |
1401 | @@ -156,8 +160,8 @@ |
1402 | os= |
1403 | basic_machine=$1 |
1404 | ;; |
1405 | - -bluegene*) |
1406 | - os=-cnk |
1407 | + -bluegene*) |
1408 | + os=-cnk |
1409 | ;; |
1410 | -sim | -cisco | -oki | -wec | -winbond) |
1411 | os= |
1412 | @@ -173,10 +177,10 @@ |
1413 | os=-chorusos |
1414 | basic_machine=$1 |
1415 | ;; |
1416 | - -chorusrdb) |
1417 | - os=-chorusrdb |
1418 | + -chorusrdb) |
1419 | + os=-chorusrdb |
1420 | basic_machine=$1 |
1421 | - ;; |
1422 | + ;; |
1423 | -hiux*) |
1424 | os=-hiuxwe2 |
1425 | ;; |
1426 | @@ -245,17 +249,22 @@ |
1427 | # Some are omitted here because they have special meanings below. |
1428 | 1750a | 580 \ |
1429 | | a29k \ |
1430 | + | aarch64 | aarch64_be \ |
1431 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
1432 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
1433 | | am33_2.0 \ |
1434 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
1435 | + | be32 | be64 \ |
1436 | | bfin \ |
1437 | | c4x | clipper \ |
1438 | | d10v | d30v | dlx | dsp16xx \ |
1439 | + | epiphany \ |
1440 | | fido | fr30 | frv \ |
1441 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
1442 | + | hexagon \ |
1443 | | i370 | i860 | i960 | ia64 \ |
1444 | | ip2k | iq2000 \ |
1445 | + | le32 | le64 \ |
1446 | | lm32 \ |
1447 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1448 | | maxq | mb | microblaze | mcore | mep | metag \ |
1449 | @@ -281,29 +290,39 @@ |
1450 | | moxie \ |
1451 | | mt \ |
1452 | | msp430 \ |
1453 | + | nds32 | nds32le | nds32be \ |
1454 | | nios | nios2 \ |
1455 | | ns16k | ns32k \ |
1456 | + | open8 \ |
1457 | | or32 \ |
1458 | | pdp10 | pdp11 | pj | pjl \ |
1459 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
1460 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
1461 | | pyramid \ |
1462 | - | rx \ |
1463 | + | rl78 | rx \ |
1464 | | score \ |
1465 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
1466 | | sh64 | sh64le \ |
1467 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
1468 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
1469 | - | spu | strongarm \ |
1470 | - | tahoe | thumb | tic4x | tic80 | tron \ |
1471 | + | spu \ |
1472 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
1473 | | ubicom32 \ |
1474 | - | v850 | v850e \ |
1475 | + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
1476 | | we32k \ |
1477 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
1478 | + | x86 | xc16x | xstormy16 | xtensa \ |
1479 | | z8k | z80) |
1480 | basic_machine=$basic_machine-unknown |
1481 | ;; |
1482 | - m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
1483 | - # Motorola 68HC11/12. |
1484 | + c54x) |
1485 | + basic_machine=tic54x-unknown |
1486 | + ;; |
1487 | + c55x) |
1488 | + basic_machine=tic55x-unknown |
1489 | + ;; |
1490 | + c6x) |
1491 | + basic_machine=tic6x-unknown |
1492 | + ;; |
1493 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
1494 | basic_machine=$basic_machine-unknown |
1495 | os=-none |
1496 | ;; |
1497 | @@ -313,6 +332,21 @@ |
1498 | basic_machine=mt-unknown |
1499 | ;; |
1500 | |
1501 | + strongarm | thumb | xscale) |
1502 | + basic_machine=arm-unknown |
1503 | + ;; |
1504 | + xgate) |
1505 | + basic_machine=$basic_machine-unknown |
1506 | + os=-none |
1507 | + ;; |
1508 | + xscaleeb) |
1509 | + basic_machine=armeb-unknown |
1510 | + ;; |
1511 | + |
1512 | + xscaleel) |
1513 | + basic_machine=armel-unknown |
1514 | + ;; |
1515 | + |
1516 | # We use `pc' rather than `unknown' |
1517 | # because (1) that's what they normally are, and |
1518 | # (2) the word "unknown" tends to confuse beginning users. |
1519 | @@ -327,21 +361,25 @@ |
1520 | # Recognize the basic CPU types with company name. |
1521 | 580-* \ |
1522 | | a29k-* \ |
1523 | + | aarch64-* | aarch64_be-* \ |
1524 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
1525 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
1526 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
1527 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
1528 | | avr-* | avr32-* \ |
1529 | + | be32-* | be64-* \ |
1530 | | bfin-* | bs2000-* \ |
1531 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
1532 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
1533 | | clipper-* | craynv-* | cydra-* \ |
1534 | | d10v-* | d30v-* | dlx-* \ |
1535 | | elxsi-* \ |
1536 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
1537 | | h8300-* | h8500-* \ |
1538 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
1539 | + | hexagon-* \ |
1540 | | i*86-* | i860-* | i960-* | ia64-* \ |
1541 | | ip2k-* | iq2000-* \ |
1542 | + | le32-* | le64-* \ |
1543 | | lm32-* \ |
1544 | | m32c-* | m32r-* | m32rle-* \ |
1545 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
1546 | @@ -367,25 +405,29 @@ |
1547 | | mmix-* \ |
1548 | | mt-* \ |
1549 | | msp430-* \ |
1550 | + | nds32-* | nds32le-* | nds32be-* \ |
1551 | | nios-* | nios2-* \ |
1552 | | none-* | np1-* | ns16k-* | ns32k-* \ |
1553 | + | open8-* \ |
1554 | | orion-* \ |
1555 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
1556 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
1557 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
1558 | | pyramid-* \ |
1559 | - | romp-* | rs6000-* | rx-* \ |
1560 | + | rl78-* | romp-* | rs6000-* | rx-* \ |
1561 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
1562 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
1563 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
1564 | | sparclite-* \ |
1565 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
1566 | - | tahoe-* | thumb-* \ |
1567 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
1568 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
1569 | + | tahoe-* \ |
1570 | + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
1571 | + | tile*-* \ |
1572 | | tron-* \ |
1573 | | ubicom32-* \ |
1574 | - | v850-* | v850e-* | vax-* \ |
1575 | + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
1576 | + | vax-* \ |
1577 | | we32k-* \ |
1578 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
1579 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
1580 | | xstormy16-* | xtensa*-* \ |
1581 | | ymp-* \ |
1582 | | z8k-* | z80-*) |
1583 | @@ -410,7 +452,7 @@ |
1584 | basic_machine=a29k-amd |
1585 | os=-udi |
1586 | ;; |
1587 | - abacus) |
1588 | + abacus) |
1589 | basic_machine=abacus-unknown |
1590 | ;; |
1591 | adobe68k) |
1592 | @@ -480,11 +522,20 @@ |
1593 | basic_machine=powerpc-ibm |
1594 | os=-cnk |
1595 | ;; |
1596 | + c54x-*) |
1597 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1598 | + ;; |
1599 | + c55x-*) |
1600 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1601 | + ;; |
1602 | + c6x-*) |
1603 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1604 | + ;; |
1605 | c90) |
1606 | basic_machine=c90-cray |
1607 | os=-unicos |
1608 | ;; |
1609 | - cegcc) |
1610 | + cegcc) |
1611 | basic_machine=arm-unknown |
1612 | os=-cegcc |
1613 | ;; |
1614 | @@ -516,7 +567,7 @@ |
1615 | basic_machine=craynv-cray |
1616 | os=-unicosmp |
1617 | ;; |
1618 | - cr16) |
1619 | + cr16 | cr16-*) |
1620 | basic_machine=cr16-unknown |
1621 | os=-elf |
1622 | ;; |
1623 | @@ -674,7 +725,6 @@ |
1624 | i370-ibm* | ibm*) |
1625 | basic_machine=i370-ibm |
1626 | ;; |
1627 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
1628 | i*86v32) |
1629 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
1630 | os=-sysv32 |
1631 | @@ -732,7 +782,7 @@ |
1632 | basic_machine=ns32k-utek |
1633 | os=-sysv |
1634 | ;; |
1635 | - microblaze) |
1636 | + microblaze) |
1637 | basic_machine=microblaze-xilinx |
1638 | ;; |
1639 | mingw32) |
1640 | @@ -771,10 +821,18 @@ |
1641 | ms1-*) |
1642 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
1643 | ;; |
1644 | + msys) |
1645 | + basic_machine=i386-pc |
1646 | + os=-msys |
1647 | + ;; |
1648 | mvs) |
1649 | basic_machine=i370-ibm |
1650 | os=-mvs |
1651 | ;; |
1652 | + nacl) |
1653 | + basic_machine=le32-unknown |
1654 | + os=-nacl |
1655 | + ;; |
1656 | ncr3000) |
1657 | basic_machine=i486-ncr |
1658 | os=-sysv4 |
1659 | @@ -839,6 +897,12 @@ |
1660 | np1) |
1661 | basic_machine=np1-gould |
1662 | ;; |
1663 | + neo-tandem) |
1664 | + basic_machine=neo-tandem |
1665 | + ;; |
1666 | + nse-tandem) |
1667 | + basic_machine=nse-tandem |
1668 | + ;; |
1669 | nsr-tandem) |
1670 | basic_machine=nsr-tandem |
1671 | ;; |
1672 | @@ -921,9 +985,10 @@ |
1673 | ;; |
1674 | power) basic_machine=power-ibm |
1675 | ;; |
1676 | - ppc) basic_machine=powerpc-unknown |
1677 | + ppc | ppcbe) basic_machine=powerpc-unknown |
1678 | ;; |
1679 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
1680 | + ppc-* | ppcbe-*) |
1681 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
1682 | ;; |
1683 | ppcle | powerpclittle | ppc-le | powerpc-little) |
1684 | basic_machine=powerpcle-unknown |
1685 | @@ -1017,6 +1082,9 @@ |
1686 | basic_machine=i860-stratus |
1687 | os=-sysv4 |
1688 | ;; |
1689 | + strongarm-* | thumb-*) |
1690 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
1691 | + ;; |
1692 | sun2) |
1693 | basic_machine=m68000-sun |
1694 | ;; |
1695 | @@ -1073,20 +1141,8 @@ |
1696 | basic_machine=t90-cray |
1697 | os=-unicos |
1698 | ;; |
1699 | - tic54x | c54x*) |
1700 | - basic_machine=tic54x-unknown |
1701 | - os=-coff |
1702 | - ;; |
1703 | - tic55x | c55x*) |
1704 | - basic_machine=tic55x-unknown |
1705 | - os=-coff |
1706 | - ;; |
1707 | - tic6x | c6x*) |
1708 | - basic_machine=tic6x-unknown |
1709 | - os=-coff |
1710 | - ;; |
1711 | tile*) |
1712 | - basic_machine=tile-unknown |
1713 | + basic_machine=$basic_machine-unknown |
1714 | os=-linux-gnu |
1715 | ;; |
1716 | tx39) |
1717 | @@ -1156,6 +1212,9 @@ |
1718 | xps | xps100) |
1719 | basic_machine=xps100-honeywell |
1720 | ;; |
1721 | + xscale-* | xscalee[bl]-*) |
1722 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
1723 | + ;; |
1724 | ymp) |
1725 | basic_machine=ymp-cray |
1726 | os=-unicos |
1727 | @@ -1253,11 +1312,11 @@ |
1728 | if [ x"$os" != x"" ] |
1729 | then |
1730 | case $os in |
1731 | - # First match some system type aliases |
1732 | - # that might get confused with valid system types. |
1733 | + # First match some system type aliases |
1734 | + # that might get confused with valid system types. |
1735 | # -solaris* is a basic system type, with this one exception. |
1736 | - -auroraux) |
1737 | - os=-auroraux |
1738 | + -auroraux) |
1739 | + os=-auroraux |
1740 | ;; |
1741 | -solaris1 | -solaris1.*) |
1742 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
1743 | @@ -1293,8 +1352,9 @@ |
1744 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
1745 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1746 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1747 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1748 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
1749 | + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1750 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
1751 | + | -linux-newlib* | -linux-uclibc* \ |
1752 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1753 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1754 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1755 | @@ -1341,7 +1401,7 @@ |
1756 | -opened*) |
1757 | os=-openedition |
1758 | ;; |
1759 | - -os400*) |
1760 | + -os400*) |
1761 | os=-os400 |
1762 | ;; |
1763 | -wince*) |
1764 | @@ -1390,7 +1450,7 @@ |
1765 | -sinix*) |
1766 | os=-sysv4 |
1767 | ;; |
1768 | - -tpf*) |
1769 | + -tpf*) |
1770 | os=-tpf |
1771 | ;; |
1772 | -triton*) |
1773 | @@ -1435,6 +1495,8 @@ |
1774 | -dicos*) |
1775 | os=-dicos |
1776 | ;; |
1777 | + -nacl*) |
1778 | + ;; |
1779 | -none) |
1780 | ;; |
1781 | *) |
1782 | @@ -1457,10 +1519,10 @@ |
1783 | # system, and we'll never get to this point. |
1784 | |
1785 | case $basic_machine in |
1786 | - score-*) |
1787 | + score-*) |
1788 | os=-elf |
1789 | ;; |
1790 | - spu-*) |
1791 | + spu-*) |
1792 | os=-elf |
1793 | ;; |
1794 | *-acorn) |
1795 | @@ -1472,8 +1534,17 @@ |
1796 | arm*-semi) |
1797 | os=-aout |
1798 | ;; |
1799 | - c4x-* | tic4x-*) |
1800 | - os=-coff |
1801 | + c4x-* | tic4x-*) |
1802 | + os=-coff |
1803 | + ;; |
1804 | + tic54x-*) |
1805 | + os=-coff |
1806 | + ;; |
1807 | + tic55x-*) |
1808 | + os=-coff |
1809 | + ;; |
1810 | + tic6x-*) |
1811 | + os=-coff |
1812 | ;; |
1813 | # This must come before the *-dec entry. |
1814 | pdp10-*) |
1815 | @@ -1493,14 +1564,11 @@ |
1816 | ;; |
1817 | m68000-sun) |
1818 | os=-sunos3 |
1819 | - # This also exists in the configure program, but was not the |
1820 | - # default. |
1821 | - # os=-sunos4 |
1822 | ;; |
1823 | m68*-cisco) |
1824 | os=-aout |
1825 | ;; |
1826 | - mep-*) |
1827 | + mep-*) |
1828 | os=-elf |
1829 | ;; |
1830 | mips*-cisco) |
1831 | @@ -1527,7 +1595,7 @@ |
1832 | *-ibm) |
1833 | os=-aix |
1834 | ;; |
1835 | - *-knuth) |
1836 | + *-knuth) |
1837 | os=-mmixware |
1838 | ;; |
1839 | *-wec) |
1840 | |
1841 | === modified file 'build-aux/depcomp' |
1842 | --- build-aux/depcomp 2012-02-15 10:50:36 +0000 |
1843 | +++ build-aux/depcomp 2014-02-16 22:04:28 +0000 |
1844 | @@ -1,10 +1,10 @@ |
1845 | #! /bin/sh |
1846 | # depcomp - compile a program generating dependencies as side-effects |
1847 | |
1848 | -scriptversion=2009-04-28.21; # UTC |
1849 | +scriptversion=2012-03-27.16; # UTC |
1850 | |
1851 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free |
1852 | -# Software Foundation, Inc. |
1853 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, |
1854 | +# 2011, 2012 Free Software Foundation, Inc. |
1855 | |
1856 | # This program is free software; you can redistribute it and/or modify |
1857 | # it under the terms of the GNU General Public License as published by |
1858 | @@ -28,7 +28,7 @@ |
1859 | |
1860 | case $1 in |
1861 | '') |
1862 | - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 |
1863 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1864 | exit 1; |
1865 | ;; |
1866 | -h | --h*) |
1867 | @@ -40,11 +40,11 @@ |
1868 | |
1869 | Environment variables: |
1870 | depmode Dependency tracking mode. |
1871 | - source Source file read by `PROGRAMS ARGS'. |
1872 | - object Object file output by `PROGRAMS ARGS'. |
1873 | + source Source file read by 'PROGRAMS ARGS'. |
1874 | + object Object file output by 'PROGRAMS ARGS'. |
1875 | DEPDIR directory where to store dependencies. |
1876 | depfile Dependency file to output. |
1877 | - tmpdepfile Temporary file to use when outputing dependencies. |
1878 | + tmpdepfile Temporary file to use when outputting dependencies. |
1879 | libtool Whether libtool is used (yes/no). |
1880 | |
1881 | Report bugs to <bug-automake@gnu.org>. |
1882 | @@ -57,6 +57,12 @@ |
1883 | ;; |
1884 | esac |
1885 | |
1886 | +# A tabulation character. |
1887 | +tab=' ' |
1888 | +# A newline character. |
1889 | +nl=' |
1890 | +' |
1891 | + |
1892 | if test -z "$depmode" || test -z "$source" || test -z "$object"; then |
1893 | echo "depcomp: Variables source, object and depmode must be set" 1>&2 |
1894 | exit 1 |
1895 | @@ -90,10 +96,24 @@ |
1896 | # This is just like msvisualcpp but w/o cygpath translation. |
1897 | # Just convert the backslash-escaped backslashes to single forward |
1898 | # slashes to satisfy depend.m4 |
1899 | - cygpath_u="sed s,\\\\\\\\,/,g" |
1900 | + cygpath_u='sed s,\\\\,/,g' |
1901 | depmode=msvisualcpp |
1902 | fi |
1903 | |
1904 | +if test "$depmode" = msvc7msys; then |
1905 | + # This is just like msvc7 but w/o cygpath translation. |
1906 | + # Just convert the backslash-escaped backslashes to single forward |
1907 | + # slashes to satisfy depend.m4 |
1908 | + cygpath_u='sed s,\\\\,/,g' |
1909 | + depmode=msvc7 |
1910 | +fi |
1911 | + |
1912 | +if test "$depmode" = xlc; then |
1913 | + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. |
1914 | + gccflag=-qmakedep=gcc,-MF |
1915 | + depmode=gcc |
1916 | +fi |
1917 | + |
1918 | case "$depmode" in |
1919 | gcc3) |
1920 | ## gcc 3 implements dependency tracking that does exactly what |
1921 | @@ -148,20 +168,21 @@ |
1922 | ## The second -e expression handles DOS-style file names with drive letters. |
1923 | sed -e 's/^[^:]*: / /' \ |
1924 | -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" |
1925 | -## This next piece of magic avoids the `deleted header file' problem. |
1926 | +## This next piece of magic avoids the "deleted header file" problem. |
1927 | ## The problem is that when a header file which appears in a .P file |
1928 | ## is deleted, the dependency causes make to die (because there is |
1929 | ## typically no way to rebuild the header). We avoid this by adding |
1930 | ## dummy dependencies for each header file. Too bad gcc doesn't do |
1931 | ## this for us directly. |
1932 | - tr ' ' ' |
1933 | -' < "$tmpdepfile" | |
1934 | -## Some versions of gcc put a space before the `:'. On the theory |
1935 | + tr ' ' "$nl" < "$tmpdepfile" | |
1936 | +## Some versions of gcc put a space before the ':'. On the theory |
1937 | ## that the space means something, we add a space to the output as |
1938 | -## well. |
1939 | +## well. hp depmode also adds that space, but also prefixes the VPATH |
1940 | +## to the object. Take care to not repeat it in the output. |
1941 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1942 | ## correctly. Breaking it into two sed invocations is a workaround. |
1943 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
1944 | + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
1945 | + | sed -e 's/$/ :/' >> "$depfile" |
1946 | rm -f "$tmpdepfile" |
1947 | ;; |
1948 | |
1949 | @@ -193,18 +214,15 @@ |
1950 | # clever and replace this with sed code, as IRIX sed won't handle |
1951 | # lines with more than a fixed number of characters (4096 in |
1952 | # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; |
1953 | - # the IRIX cc adds comments like `#:fec' to the end of the |
1954 | + # the IRIX cc adds comments like '#:fec' to the end of the |
1955 | # dependency line. |
1956 | - tr ' ' ' |
1957 | -' < "$tmpdepfile" \ |
1958 | + tr ' ' "$nl" < "$tmpdepfile" \ |
1959 | | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ |
1960 | - tr ' |
1961 | -' ' ' >> "$depfile" |
1962 | + tr "$nl" ' ' >> "$depfile" |
1963 | echo >> "$depfile" |
1964 | |
1965 | # The second pass generates a dummy entry for each header file. |
1966 | - tr ' ' ' |
1967 | -' < "$tmpdepfile" \ |
1968 | + tr ' ' "$nl" < "$tmpdepfile" \ |
1969 | | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
1970 | >> "$depfile" |
1971 | else |
1972 | @@ -216,10 +234,17 @@ |
1973 | rm -f "$tmpdepfile" |
1974 | ;; |
1975 | |
1976 | +xlc) |
1977 | + # This case exists only to let depend.m4 do its work. It works by |
1978 | + # looking at the text of this script. This case will never be run, |
1979 | + # since it is checked for above. |
1980 | + exit 1 |
1981 | + ;; |
1982 | + |
1983 | aix) |
1984 | # The C for AIX Compiler uses -M and outputs the dependencies |
1985 | # in a .u file. In older versions, this file always lives in the |
1986 | - # current directory. Also, the AIX compiler puts `$object:' at the |
1987 | + # current directory. Also, the AIX compiler puts '$object:' at the |
1988 | # start of each line; $object doesn't have directory information. |
1989 | # Version 6 uses the directory in both cases. |
1990 | dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
1991 | @@ -249,12 +274,11 @@ |
1992 | test -f "$tmpdepfile" && break |
1993 | done |
1994 | if test -f "$tmpdepfile"; then |
1995 | - # Each line is of the form `foo.o: dependent.h'. |
1996 | + # Each line is of the form 'foo.o: dependent.h'. |
1997 | # Do two passes, one to just change these to |
1998 | - # `$object: dependent.h' and one to simply `dependent.h:'. |
1999 | + # '$object: dependent.h' and one to simply 'dependent.h:'. |
2000 | sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
2001 | - # That's a tab and a space in the []. |
2002 | - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
2003 | + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
2004 | else |
2005 | # The sourcefile does not contain any dependencies, so just |
2006 | # store a dummy comment line, to avoid errors with the Makefile |
2007 | @@ -265,23 +289,26 @@ |
2008 | ;; |
2009 | |
2010 | icc) |
2011 | - # Intel's C compiler understands `-MD -MF file'. However on |
2012 | - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c |
2013 | + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. |
2014 | + # However on |
2015 | + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c |
2016 | # ICC 7.0 will fill foo.d with something like |
2017 | # foo.o: sub/foo.c |
2018 | # foo.o: sub/foo.h |
2019 | - # which is wrong. We want: |
2020 | + # which is wrong. We want |
2021 | # sub/foo.o: sub/foo.c |
2022 | # sub/foo.o: sub/foo.h |
2023 | # sub/foo.c: |
2024 | # sub/foo.h: |
2025 | # ICC 7.1 will output |
2026 | # foo.o: sub/foo.c sub/foo.h |
2027 | - # and will wrap long lines using \ : |
2028 | + # and will wrap long lines using '\': |
2029 | # foo.o: sub/foo.c ... \ |
2030 | # sub/foo.h ... \ |
2031 | # ... |
2032 | - |
2033 | + # tcc 0.9.26 (FIXME still under development at the moment of writing) |
2034 | + # will emit a similar output, but also prepend the continuation lines |
2035 | + # with horizontal tabulation characters. |
2036 | "$@" -MD -MF "$tmpdepfile" |
2037 | stat=$? |
2038 | if test $stat -eq 0; then : |
2039 | @@ -290,15 +317,21 @@ |
2040 | exit $stat |
2041 | fi |
2042 | rm -f "$depfile" |
2043 | - # Each line is of the form `foo.o: dependent.h', |
2044 | - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. |
2045 | + # Each line is of the form 'foo.o: dependent.h', |
2046 | + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. |
2047 | # Do two passes, one to just change these to |
2048 | - # `$object: dependent.h' and one to simply `dependent.h:'. |
2049 | - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" |
2050 | - # Some versions of the HPUX 10.20 sed can't process this invocation |
2051 | - # correctly. Breaking it into two sed invocations is a workaround. |
2052 | - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | |
2053 | - sed -e 's/$/ :/' >> "$depfile" |
2054 | + # '$object: dependent.h' and one to simply 'dependent.h:'. |
2055 | + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ |
2056 | + < "$tmpdepfile" > "$depfile" |
2057 | + sed ' |
2058 | + s/[ '"$tab"'][ '"$tab"']*/ /g |
2059 | + s/^ *// |
2060 | + s/ *\\*$// |
2061 | + s/^[^:]*: *// |
2062 | + /^$/d |
2063 | + /:$/d |
2064 | + s/$/ :/ |
2065 | + ' < "$tmpdepfile" >> "$depfile" |
2066 | rm -f "$tmpdepfile" |
2067 | ;; |
2068 | |
2069 | @@ -334,7 +367,7 @@ |
2070 | done |
2071 | if test -f "$tmpdepfile"; then |
2072 | sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" |
2073 | - # Add `dependent.h:' lines. |
2074 | + # Add 'dependent.h:' lines. |
2075 | sed -ne '2,${ |
2076 | s/^ *// |
2077 | s/ \\*$// |
2078 | @@ -349,9 +382,9 @@ |
2079 | |
2080 | tru64) |
2081 | # The Tru64 compiler uses -MD to generate dependencies as a side |
2082 | - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. |
2083 | + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
2084 | # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
2085 | - # dependencies in `foo.d' instead, so we check for that too. |
2086 | + # dependencies in 'foo.d' instead, so we check for that too. |
2087 | # Subdirectories are respected. |
2088 | dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
2089 | test "x$dir" = "x$object" && dir= |
2090 | @@ -397,14 +430,59 @@ |
2091 | done |
2092 | if test -f "$tmpdepfile"; then |
2093 | sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
2094 | - # That's a tab and a space in the []. |
2095 | - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
2096 | + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
2097 | else |
2098 | echo "#dummy" > "$depfile" |
2099 | fi |
2100 | rm -f "$tmpdepfile" |
2101 | ;; |
2102 | |
2103 | +msvc7) |
2104 | + if test "$libtool" = yes; then |
2105 | + showIncludes=-Wc,-showIncludes |
2106 | + else |
2107 | + showIncludes=-showIncludes |
2108 | + fi |
2109 | + "$@" $showIncludes > "$tmpdepfile" |
2110 | + stat=$? |
2111 | + grep -v '^Note: including file: ' "$tmpdepfile" |
2112 | + if test "$stat" = 0; then : |
2113 | + else |
2114 | + rm -f "$tmpdepfile" |
2115 | + exit $stat |
2116 | + fi |
2117 | + rm -f "$depfile" |
2118 | + echo "$object : \\" > "$depfile" |
2119 | + # The first sed program below extracts the file names and escapes |
2120 | + # backslashes for cygpath. The second sed program outputs the file |
2121 | + # name when reading, but also accumulates all include files in the |
2122 | + # hold buffer in order to output them again at the end. This only |
2123 | + # works with sed implementations that can handle large buffers. |
2124 | + sed < "$tmpdepfile" -n ' |
2125 | +/^Note: including file: *\(.*\)/ { |
2126 | + s//\1/ |
2127 | + s/\\/\\\\/g |
2128 | + p |
2129 | +}' | $cygpath_u | sort -u | sed -n ' |
2130 | +s/ /\\ /g |
2131 | +s/\(.*\)/'"$tab"'\1 \\/p |
2132 | +s/.\(.*\) \\/\1:/ |
2133 | +H |
2134 | +$ { |
2135 | + s/.*/'"$tab"'/ |
2136 | + G |
2137 | + p |
2138 | +}' >> "$depfile" |
2139 | + rm -f "$tmpdepfile" |
2140 | + ;; |
2141 | + |
2142 | +msvc7msys) |
2143 | + # This case exists only to let depend.m4 do its work. It works by |
2144 | + # looking at the text of this script. This case will never be run, |
2145 | + # since it is checked for above. |
2146 | + exit 1 |
2147 | + ;; |
2148 | + |
2149 | #nosideeffect) |
2150 | # This comment above is used by automake to tell side-effect |
2151 | # dependency tracking mechanisms from slower ones. |
2152 | @@ -422,7 +500,7 @@ |
2153 | shift |
2154 | fi |
2155 | |
2156 | - # Remove `-o $object'. |
2157 | + # Remove '-o $object'. |
2158 | IFS=" " |
2159 | for arg |
2160 | do |
2161 | @@ -442,15 +520,14 @@ |
2162 | done |
2163 | |
2164 | test -z "$dashmflag" && dashmflag=-M |
2165 | - # Require at least two characters before searching for `:' |
2166 | + # Require at least two characters before searching for ':' |
2167 | # in the target name. This is to cope with DOS-style filenames: |
2168 | - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. |
2169 | + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. |
2170 | "$@" $dashmflag | |
2171 | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" |
2172 | + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" |
2173 | rm -f "$depfile" |
2174 | cat < "$tmpdepfile" > "$depfile" |
2175 | - tr ' ' ' |
2176 | -' < "$tmpdepfile" | \ |
2177 | + tr ' ' "$nl" < "$tmpdepfile" | \ |
2178 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
2179 | ## correctly. Breaking it into two sed invocations is a workaround. |
2180 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
2181 | @@ -503,9 +580,10 @@ |
2182 | touch "$tmpdepfile" |
2183 | ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" |
2184 | rm -f "$depfile" |
2185 | - cat < "$tmpdepfile" > "$depfile" |
2186 | - sed '1,2d' "$tmpdepfile" | tr ' ' ' |
2187 | -' | \ |
2188 | + # makedepend may prepend the VPATH from the source file name to the object. |
2189 | + # No need to regex-escape $object, excess matching of '.' is harmless. |
2190 | + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
2191 | + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ |
2192 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
2193 | ## correctly. Breaking it into two sed invocations is a workaround. |
2194 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
2195 | @@ -525,7 +603,7 @@ |
2196 | shift |
2197 | fi |
2198 | |
2199 | - # Remove `-o $object'. |
2200 | + # Remove '-o $object'. |
2201 | IFS=" " |
2202 | for arg |
2203 | do |
2204 | @@ -594,8 +672,8 @@ |
2205 | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" |
2206 | rm -f "$depfile" |
2207 | echo "$object : \\" > "$depfile" |
2208 | - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" |
2209 | - echo " " >> "$depfile" |
2210 | + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" |
2211 | + echo "$tab" >> "$depfile" |
2212 | sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" |
2213 | rm -f "$tmpdepfile" |
2214 | ;; |
2215 | |
2216 | === modified file 'build-aux/install-sh' |
2217 | --- build-aux/install-sh 2012-02-15 10:50:36 +0000 |
2218 | +++ build-aux/install-sh 2014-02-16 22:04:28 +0000 |
2219 | @@ -1,7 +1,7 @@ |
2220 | #!/bin/sh |
2221 | # install - install a program, script, or datafile |
2222 | |
2223 | -scriptversion=2009-04-28.21; # UTC |
2224 | +scriptversion=2011-01-19.21; # UTC |
2225 | |
2226 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
2227 | # later released in X11R6 (xc/config/util/install.sh) with the |
2228 | @@ -156,6 +156,10 @@ |
2229 | -s) stripcmd=$stripprog;; |
2230 | |
2231 | -t) dst_arg=$2 |
2232 | + # Protect names problematic for `test' and other utilities. |
2233 | + case $dst_arg in |
2234 | + -* | [=\(\)!]) dst_arg=./$dst_arg;; |
2235 | + esac |
2236 | shift;; |
2237 | |
2238 | -T) no_target_directory=true;; |
2239 | @@ -186,6 +190,10 @@ |
2240 | fi |
2241 | shift # arg |
2242 | dst_arg=$arg |
2243 | + # Protect names problematic for `test' and other utilities. |
2244 | + case $dst_arg in |
2245 | + -* | [=\(\)!]) dst_arg=./$dst_arg;; |
2246 | + esac |
2247 | done |
2248 | fi |
2249 | |
2250 | @@ -200,7 +208,11 @@ |
2251 | fi |
2252 | |
2253 | if test -z "$dir_arg"; then |
2254 | - trap '(exit $?); exit' 1 2 13 15 |
2255 | + do_exit='(exit $ret); exit $ret' |
2256 | + trap "ret=129; $do_exit" 1 |
2257 | + trap "ret=130; $do_exit" 2 |
2258 | + trap "ret=141; $do_exit" 13 |
2259 | + trap "ret=143; $do_exit" 15 |
2260 | |
2261 | # Set umask so as not to create temps with too-generous modes. |
2262 | # However, 'strip' requires both read and write access to temps. |
2263 | @@ -228,9 +240,9 @@ |
2264 | |
2265 | for src |
2266 | do |
2267 | - # Protect names starting with `-'. |
2268 | + # Protect names problematic for `test' and other utilities. |
2269 | case $src in |
2270 | - -*) src=./$src;; |
2271 | + -* | [=\(\)!]) src=./$src;; |
2272 | esac |
2273 | |
2274 | if test -n "$dir_arg"; then |
2275 | @@ -252,12 +264,7 @@ |
2276 | echo "$0: no destination specified." >&2 |
2277 | exit 1 |
2278 | fi |
2279 | - |
2280 | dst=$dst_arg |
2281 | - # Protect names starting with `-'. |
2282 | - case $dst in |
2283 | - -*) dst=./$dst;; |
2284 | - esac |
2285 | |
2286 | # If destination is a directory, append the input filename; won't work |
2287 | # if double slashes aren't ignored. |
2288 | @@ -385,7 +392,7 @@ |
2289 | |
2290 | case $dstdir in |
2291 | /*) prefix='/';; |
2292 | - -*) prefix='./';; |
2293 | + [-=\(\)!]*) prefix='./';; |
2294 | *) prefix='';; |
2295 | esac |
2296 | |
2297 | @@ -403,7 +410,7 @@ |
2298 | |
2299 | for d |
2300 | do |
2301 | - test -z "$d" && continue |
2302 | + test X"$d" = X && continue |
2303 | |
2304 | prefix=$prefix$d |
2305 | if test -d "$prefix"; then |
2306 | |
2307 | === modified file 'build-aux/ltmain.sh' (properties changed: +x to -x) |
2308 | --- build-aux/ltmain.sh 2012-02-15 10:50:36 +0000 |
2309 | +++ build-aux/ltmain.sh 2014-02-16 22:04:28 +0000 |
2310 | @@ -1,9 +1,9 @@ |
2311 | |
2312 | -# libtool (GNU libtool) 2.4 |
2313 | +# libtool (GNU libtool) 2.4.2 |
2314 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
2315 | |
2316 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
2317 | -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
2318 | +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
2319 | # This is free software; see the source for copying conditions. There is NO |
2320 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
2321 | |
2322 | @@ -41,6 +41,7 @@ |
2323 | # --quiet, --silent don't print informational messages |
2324 | # --no-quiet, --no-silent |
2325 | # print informational messages (default) |
2326 | +# --no-warn don't display warning messages |
2327 | # --tag=TAG use configuration variables from tag TAG |
2328 | # -v, --verbose print more informational messages than default |
2329 | # --no-verbose don't print the extra informational messages |
2330 | @@ -69,7 +70,7 @@ |
2331 | # compiler: $LTCC |
2332 | # compiler flags: $LTCFLAGS |
2333 | # linker: $LD (gnu? $with_gnu_ld) |
2334 | -# $progname: (GNU libtool) 2.4 |
2335 | +# $progname: (GNU libtool) 2.4.2 |
2336 | # automake: $automake_version |
2337 | # autoconf: $autoconf_version |
2338 | # |
2339 | @@ -79,9 +80,9 @@ |
2340 | |
2341 | PROGRAM=libtool |
2342 | PACKAGE=libtool |
2343 | -VERSION=2.4 |
2344 | +VERSION=2.4.2 |
2345 | TIMESTAMP="" |
2346 | -package_revision=1.3293 |
2347 | +package_revision=1.3337 |
2348 | |
2349 | # Be Bourne compatible |
2350 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
2351 | @@ -136,15 +137,10 @@ |
2352 | |
2353 | : ${CP="cp -f"} |
2354 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
2355 | -: ${EGREP="/bin/grep -E"} |
2356 | -: ${FGREP="/bin/grep -F"} |
2357 | -: ${GREP="/bin/grep"} |
2358 | -: ${LN_S="ln -s"} |
2359 | : ${MAKE="make"} |
2360 | : ${MKDIR="mkdir"} |
2361 | : ${MV="mv -f"} |
2362 | : ${RM="rm -f"} |
2363 | -: ${SED="/bin/sed"} |
2364 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
2365 | : ${Xsed="$SED -e 1s/^X//"} |
2366 | |
2367 | @@ -387,7 +383,7 @@ |
2368 | ;; |
2369 | *) |
2370 | save_IFS="$IFS" |
2371 | - IFS=: |
2372 | + IFS=${PATH_SEPARATOR-:} |
2373 | for progdir in $PATH; do |
2374 | IFS="$save_IFS" |
2375 | test -x "$progdir/$progname" && break |
2376 | @@ -771,8 +767,8 @@ |
2377 | s*\$LTCFLAGS*'"$LTCFLAGS"'* |
2378 | s*\$LD*'"$LD"'* |
2379 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ |
2380 | - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ |
2381 | - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ |
2382 | + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ |
2383 | + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ |
2384 | p |
2385 | d |
2386 | } |
2387 | @@ -1052,6 +1048,7 @@ |
2388 | opt_help=false |
2389 | opt_help_all=false |
2390 | opt_silent=: |
2391 | +opt_warning=: |
2392 | opt_verbose=: |
2393 | opt_silent=false |
2394 | opt_verbose=false |
2395 | @@ -1120,6 +1117,10 @@ |
2396 | opt_silent=false |
2397 | func_append preserve_args " $opt" |
2398 | ;; |
2399 | + --no-warning|--no-warn) |
2400 | + opt_warning=false |
2401 | +func_append preserve_args " $opt" |
2402 | + ;; |
2403 | --no-verbose) |
2404 | opt_verbose=false |
2405 | func_append preserve_args " $opt" |
2406 | @@ -2059,7 +2060,7 @@ |
2407 | *.[cCFSifmso] | \ |
2408 | *.ada | *.adb | *.ads | *.asm | \ |
2409 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ |
2410 | - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) |
2411 | + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) |
2412 | func_xform "$libobj" |
2413 | libobj=$func_xform_result |
2414 | ;; |
2415 | @@ -3201,11 +3202,13 @@ |
2416 | |
2417 | # Set up the ranlib parameters. |
2418 | oldlib="$destdir/$name" |
2419 | + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 |
2420 | + tool_oldlib=$func_to_tool_file_result |
2421 | |
2422 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' |
2423 | |
2424 | if test -n "$stripme" && test -n "$old_striplib"; then |
2425 | - func_show_eval "$old_striplib $oldlib" 'exit $?' |
2426 | + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' |
2427 | fi |
2428 | |
2429 | # Do each command in the postinstall commands. |
2430 | @@ -3470,7 +3473,7 @@ |
2431 | # linked before any other PIC object. But we must not use |
2432 | # pic_flag when linking with -static. The problem exists in |
2433 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. |
2434 | - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
2435 | + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
2436 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; |
2437 | *-*-hpux*) |
2438 | pic_flag_for_symtable=" $pic_flag" ;; |
2439 | @@ -3982,14 +3985,17 @@ |
2440 | # launches target application with the remaining arguments. |
2441 | func_exec_program () |
2442 | { |
2443 | - for lt_wr_arg |
2444 | - do |
2445 | - case \$lt_wr_arg in |
2446 | - --lt-*) ;; |
2447 | - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
2448 | - esac |
2449 | - shift |
2450 | - done |
2451 | + case \" \$* \" in |
2452 | + *\\ --lt-*) |
2453 | + for lt_wr_arg |
2454 | + do |
2455 | + case \$lt_wr_arg in |
2456 | + --lt-*) ;; |
2457 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
2458 | + esac |
2459 | + shift |
2460 | + done ;; |
2461 | + esac |
2462 | func_exec_program_core \${1+\"\$@\"} |
2463 | } |
2464 | |
2465 | @@ -5057,9 +5063,15 @@ |
2466 | { |
2467 | EOF |
2468 | func_emit_wrapper yes | |
2469 | - $SED -e 's/\([\\"]\)/\\\1/g' \ |
2470 | - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' |
2471 | - |
2472 | + $SED -n -e ' |
2473 | +s/^\(.\{79\}\)\(..*\)/\1\ |
2474 | +\2/ |
2475 | +h |
2476 | +s/\([\\"]\)/\\\1/g |
2477 | +s/$/\\n/ |
2478 | +s/\([^\n]*\).*/ fputs ("\1", f);/p |
2479 | +g |
2480 | +D' |
2481 | cat <<"EOF" |
2482 | } |
2483 | EOF |
2484 | @@ -5643,7 +5655,8 @@ |
2485 | continue |
2486 | ;; |
2487 | |
2488 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
2489 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
2490 | + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
2491 | func_append compiler_flags " $arg" |
2492 | func_append compile_command " $arg" |
2493 | func_append finalize_command " $arg" |
2494 | @@ -6147,7 +6160,8 @@ |
2495 | lib= |
2496 | found=no |
2497 | case $deplib in |
2498 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
2499 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
2500 | + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
2501 | if test "$linkmode,$pass" = "prog,link"; then |
2502 | compile_deplibs="$deplib $compile_deplibs" |
2503 | finalize_deplibs="$deplib $finalize_deplibs" |
2504 | @@ -6831,7 +6845,7 @@ |
2505 | test "$hardcode_direct_absolute" = no; then |
2506 | add="$dir/$linklib" |
2507 | elif test "$hardcode_minus_L" = yes; then |
2508 | - add_dir="-L$dir" |
2509 | + add_dir="-L$absdir" |
2510 | # Try looking first in the location we're being installed to. |
2511 | if test -n "$inst_prefix_dir"; then |
2512 | case $libdir in |
2513 | @@ -7316,6 +7330,7 @@ |
2514 | # which has an extra 1 added just for fun |
2515 | # |
2516 | case $version_type in |
2517 | + # correct linux to gnu/linux during the next big refactor |
2518 | darwin|linux|osf|windows|none) |
2519 | func_arith $number_major + $number_minor |
2520 | current=$func_arith_result |
2521 | @@ -7432,7 +7447,7 @@ |
2522 | versuffix="$major.$revision" |
2523 | ;; |
2524 | |
2525 | - linux) |
2526 | + linux) # correct to gnu/linux during the next big refactor |
2527 | func_arith $current - $age |
2528 | major=.$func_arith_result |
2529 | versuffix="$major.$age.$revision" |
2530 | @@ -8020,6 +8035,11 @@ |
2531 | |
2532 | # Test again, we may have decided not to build it any more |
2533 | if test "$build_libtool_libs" = yes; then |
2534 | + # Remove ${wl} instances when linking with ld. |
2535 | + # FIXME: should test the right _cmds variable. |
2536 | + case $archive_cmds in |
2537 | + *\$LD\ *) wl= ;; |
2538 | + esac |
2539 | if test "$hardcode_into_libs" = yes; then |
2540 | # Hardcode the library paths |
2541 | hardcode_libdirs= |
2542 | @@ -8050,7 +8070,7 @@ |
2543 | elif test -n "$runpath_var"; then |
2544 | case "$perm_rpath " in |
2545 | *" $libdir "*) ;; |
2546 | - *) func_apped perm_rpath " $libdir" ;; |
2547 | + *) func_append perm_rpath " $libdir" ;; |
2548 | esac |
2549 | fi |
2550 | done |
2551 | @@ -8058,11 +8078,7 @@ |
2552 | if test -n "$hardcode_libdir_separator" && |
2553 | test -n "$hardcode_libdirs"; then |
2554 | libdir="$hardcode_libdirs" |
2555 | - if test -n "$hardcode_libdir_flag_spec_ld"; then |
2556 | - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
2557 | - else |
2558 | - eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
2559 | - fi |
2560 | + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
2561 | fi |
2562 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
2563 | # We should set the runpath_var. |
2564 | @@ -9152,6 +9168,8 @@ |
2565 | esac |
2566 | done |
2567 | fi |
2568 | + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 |
2569 | + tool_oldlib=$func_to_tool_file_result |
2570 | eval cmds=\"$old_archive_cmds\" |
2571 | |
2572 | func_len " $cmds" |
2573 | @@ -9261,7 +9279,8 @@ |
2574 | *.la) |
2575 | func_basename "$deplib" |
2576 | name="$func_basename_result" |
2577 | - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
2578 | + func_resolve_sysroot "$deplib" |
2579 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
2580 | test -z "$libdir" && \ |
2581 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
2582 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
2583 | |
2584 | === modified file 'build-aux/missing' |
2585 | --- build-aux/missing 2012-02-15 10:50:36 +0000 |
2586 | +++ build-aux/missing 2014-02-16 22:04:28 +0000 |
2587 | @@ -1,10 +1,10 @@ |
2588 | #! /bin/sh |
2589 | # Common stub for a few missing GNU programs while installing. |
2590 | |
2591 | -scriptversion=2009-04-28.21; # UTC |
2592 | +scriptversion=2012-01-06.13; # UTC |
2593 | |
2594 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, |
2595 | -# 2008, 2009 Free Software Foundation, Inc. |
2596 | +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. |
2597 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
2598 | |
2599 | # This program is free software; you can redistribute it and/or modify |
2600 | @@ -84,7 +84,6 @@ |
2601 | help2man touch the output file |
2602 | lex create \`lex.yy.c', if possible, from existing .c |
2603 | makeinfo touch the output file |
2604 | - tar try tar, gnutar, gtar, then tar without non-portable flags |
2605 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] |
2606 | |
2607 | Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and |
2608 | @@ -122,15 +121,6 @@ |
2609 | # Not GNU programs, they don't have --version. |
2610 | ;; |
2611 | |
2612 | - tar*) |
2613 | - if test -n "$run"; then |
2614 | - echo 1>&2 "ERROR: \`tar' requires --run" |
2615 | - exit 1 |
2616 | - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then |
2617 | - exit 1 |
2618 | - fi |
2619 | - ;; |
2620 | - |
2621 | *) |
2622 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
2623 | # We have it, but it failed. |
2624 | @@ -226,7 +216,7 @@ |
2625 | \`Bison' from any GNU archive site." |
2626 | rm -f y.tab.c y.tab.h |
2627 | if test $# -ne 1; then |
2628 | - eval LASTARG="\${$#}" |
2629 | + eval LASTARG=\${$#} |
2630 | case $LASTARG in |
2631 | *.y) |
2632 | SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` |
2633 | @@ -256,7 +246,7 @@ |
2634 | \`Flex' from any GNU archive site." |
2635 | rm -f lex.yy.c |
2636 | if test $# -ne 1; then |
2637 | - eval LASTARG="\${$#}" |
2638 | + eval LASTARG=\${$#} |
2639 | case $LASTARG in |
2640 | *.l) |
2641 | SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` |
2642 | @@ -318,41 +308,6 @@ |
2643 | touch $file |
2644 | ;; |
2645 | |
2646 | - tar*) |
2647 | - shift |
2648 | - |
2649 | - # We have already tried tar in the generic part. |
2650 | - # Look for gnutar/gtar before invocation to avoid ugly error |
2651 | - # messages. |
2652 | - if (gnutar --version > /dev/null 2>&1); then |
2653 | - gnutar "$@" && exit 0 |
2654 | - fi |
2655 | - if (gtar --version > /dev/null 2>&1); then |
2656 | - gtar "$@" && exit 0 |
2657 | - fi |
2658 | - firstarg="$1" |
2659 | - if shift; then |
2660 | - case $firstarg in |
2661 | - *o*) |
2662 | - firstarg=`echo "$firstarg" | sed s/o//` |
2663 | - tar "$firstarg" "$@" && exit 0 |
2664 | - ;; |
2665 | - esac |
2666 | - case $firstarg in |
2667 | - *h*) |
2668 | - firstarg=`echo "$firstarg" | sed s/h//` |
2669 | - tar "$firstarg" "$@" && exit 0 |
2670 | - ;; |
2671 | - esac |
2672 | - fi |
2673 | - |
2674 | - echo 1>&2 "\ |
2675 | -WARNING: I can't seem to be able to run \`tar' with the given arguments. |
2676 | - You may want to install GNU tar or Free paxutils, or check the |
2677 | - command line arguments." |
2678 | - exit 1 |
2679 | - ;; |
2680 | - |
2681 | *) |
2682 | echo 1>&2 "\ |
2683 | WARNING: \`$1' is needed, and is $msg. |
2684 | |
2685 | === modified file 'configure' |
2686 | --- configure 2012-02-22 02:28:16 +0000 |
2687 | +++ configure 2014-02-16 22:04:28 +0000 |
2688 | @@ -1,6 +1,6 @@ |
2689 | #! /bin/sh |
2690 | # Guess values for system-dependent variables and create Makefiles. |
2691 | -# Generated by GNU Autoconf 2.68 for libxklavier 5.2.1. |
2692 | +# Generated by GNU Autoconf 2.68 for libxklavier 5.3. |
2693 | # |
2694 | # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=libxklavier>. |
2695 | # |
2696 | @@ -571,8 +571,8 @@ |
2697 | # Identity of this package. |
2698 | PACKAGE_NAME='libxklavier' |
2699 | PACKAGE_TARNAME='libxklavier' |
2700 | -PACKAGE_VERSION='5.2.1' |
2701 | -PACKAGE_STRING='libxklavier 5.2.1' |
2702 | +PACKAGE_VERSION='5.3' |
2703 | +PACKAGE_STRING='libxklavier 5.3' |
2704 | PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=libxklavier' |
2705 | PACKAGE_URL='' |
2706 | |
2707 | @@ -713,6 +713,7 @@ |
2708 | am__fastdepCC_FALSE |
2709 | am__fastdepCC_TRUE |
2710 | CCDEPMODE |
2711 | +am__nodep |
2712 | AMDEPBACKSLASH |
2713 | AMDEP_FALSE |
2714 | AMDEP_TRUE |
2715 | @@ -729,6 +730,8 @@ |
2716 | VERSION_INFO |
2717 | AM_BACKSLASH |
2718 | AM_DEFAULT_VERBOSITY |
2719 | +AM_DEFAULT_V |
2720 | +AM_V |
2721 | MAINT |
2722 | MAINTAINER_MODE_FALSE |
2723 | MAINTAINER_MODE_TRUE |
2724 | @@ -1387,7 +1390,7 @@ |
2725 | # Omit some internal or obsolete options to make the list less imposing. |
2726 | # This message is too long to be a string in the A/UX 3.1 sh. |
2727 | cat <<_ACEOF |
2728 | -\`configure' configures libxklavier 5.2.1 to adapt to many kinds of systems. |
2729 | +\`configure' configures libxklavier 5.3 to adapt to many kinds of systems. |
2730 | |
2731 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2732 | |
2733 | @@ -1457,7 +1460,7 @@ |
2734 | |
2735 | if test -n "$ac_init_help"; then |
2736 | case $ac_init_help in |
2737 | - short | recursive ) echo "Configuration of libxklavier 5.2.1:";; |
2738 | + short | recursive ) echo "Configuration of libxklavier 5.3:";; |
2739 | esac |
2740 | cat <<\_ACEOF |
2741 | |
2742 | @@ -1492,7 +1495,7 @@ |
2743 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
2744 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
2745 | --without-libiconv-prefix don't search for libiconv in includedir and libdir |
2746 | - --with-pic try to use only PIC/non-PIC objects [default=use |
2747 | + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
2748 | both] |
2749 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
2750 | --with-sysroot=DIR Search for dependent libraries within DIR |
2751 | @@ -1600,7 +1603,7 @@ |
2752 | test -n "$ac_init_help" && exit $ac_status |
2753 | if $ac_init_version; then |
2754 | cat <<\_ACEOF |
2755 | -libxklavier configure 5.2.1 |
2756 | +libxklavier configure 5.3 |
2757 | generated by GNU Autoconf 2.68 |
2758 | |
2759 | Copyright (C) 2010 Free Software Foundation, Inc. |
2760 | @@ -1969,7 +1972,7 @@ |
2761 | This file contains any messages produced by compilers while |
2762 | running configure, to aid debugging if configure makes a mistake. |
2763 | |
2764 | -It was created by libxklavier $as_me 5.2.1, which was |
2765 | +It was created by libxklavier $as_me 5.3, which was |
2766 | generated by GNU Autoconf 2.68. Invocation command line was |
2767 | |
2768 | $ $0 $@ |
2769 | @@ -2791,7 +2794,7 @@ |
2770 | |
2771 | # Define the identity of the package. |
2772 | PACKAGE='libxklavier' |
2773 | - VERSION='5.2.1' |
2774 | + VERSION='5.3' |
2775 | |
2776 | |
2777 | cat >>confdefs.h <<_ACEOF |
2778 | @@ -2821,19 +2824,19 @@ |
2779 | |
2780 | # We need awk for the "check" target. The system "awk" is bad on |
2781 | # some platforms. |
2782 | -# Always define AMTAR for backward compatibility. |
2783 | - |
2784 | -AMTAR=${AMTAR-"${am_missing_run}tar"} |
2785 | - |
2786 | -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' |
2787 | - |
2788 | - |
2789 | - |
2790 | - |
2791 | - |
2792 | - |
2793 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 |
2794 | -$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } |
2795 | +# Always define AMTAR for backward compatibility. Yes, it's still used |
2796 | +# in the wild :-( We should find a proper way to deprecate it ... |
2797 | +AMTAR='$${TAR-tar}' |
2798 | + |
2799 | +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
2800 | + |
2801 | + |
2802 | + |
2803 | + |
2804 | + |
2805 | + |
2806 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
2807 | +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
2808 | # Check whether --enable-maintainer-mode was given. |
2809 | if test "${enable_maintainer_mode+set}" = set; then : |
2810 | enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval |
2811 | @@ -2868,10 +2871,37 @@ |
2812 | no) AM_DEFAULT_VERBOSITY=1;; |
2813 | *) AM_DEFAULT_VERBOSITY=0;; |
2814 | esac |
2815 | +am_make=${MAKE-make} |
2816 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
2817 | +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } |
2818 | +if ${am_cv_make_support_nested_variables+:} false; then : |
2819 | + $as_echo_n "(cached) " >&6 |
2820 | +else |
2821 | + if $as_echo 'TRUE=$(BAR$(V)) |
2822 | +BAR0=false |
2823 | +BAR1=true |
2824 | +V=1 |
2825 | +am__doit: |
2826 | + @$(TRUE) |
2827 | +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then |
2828 | + am_cv_make_support_nested_variables=yes |
2829 | +else |
2830 | + am_cv_make_support_nested_variables=no |
2831 | +fi |
2832 | +fi |
2833 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 |
2834 | +$as_echo "$am_cv_make_support_nested_variables" >&6; } |
2835 | +if test $am_cv_make_support_nested_variables = yes; then |
2836 | + AM_V='$(V)' |
2837 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
2838 | +else |
2839 | + AM_V=$AM_DEFAULT_VERBOSITY |
2840 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
2841 | +fi |
2842 | AM_BACKSLASH='\' |
2843 | |
2844 | |
2845 | -VERSION_INFO=18:0:2 |
2846 | +VERSION_INFO=19:0:3 |
2847 | |
2848 | |
2849 | # Check for programs |
2850 | @@ -3716,6 +3746,7 @@ |
2851 | if test "x$enable_dependency_tracking" != xno; then |
2852 | am_depcomp="$ac_aux_dir/depcomp" |
2853 | AMDEPBACKSLASH='\' |
2854 | + am__nodep='_no' |
2855 | fi |
2856 | if test "x$enable_dependency_tracking" != xno; then |
2857 | AMDEP_TRUE= |
2858 | @@ -3740,6 +3771,7 @@ |
2859 | # instance it was reported that on HP-UX the gcc test will end up |
2860 | # making a dummy file named `D' -- because `-MD' means `put the output |
2861 | # in D'. |
2862 | + rm -rf conftest.dir |
2863 | mkdir conftest.dir |
2864 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2865 | # using a relative directory. |
2866 | @@ -3799,7 +3831,7 @@ |
2867 | break |
2868 | fi |
2869 | ;; |
2870 | - msvisualcpp | msvcmsys) |
2871 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2872 | # This compiler won't grok `-c -o', but also, the minuso test has |
2873 | # not run yet. These depmodes are late enough in the game, and |
2874 | # so weak that their functioning should not be impacted. |
2875 | @@ -4812,8 +4844,8 @@ |
2876 | |
2877 | |
2878 | |
2879 | -macro_version='2.4' |
2880 | -macro_revision='1.3293' |
2881 | +macro_version='2.4.2' |
2882 | +macro_revision='1.3337' |
2883 | |
2884 | |
2885 | |
2886 | @@ -5587,6 +5619,11 @@ |
2887 | lt_cv_sys_max_cmd_len=196608 |
2888 | ;; |
2889 | |
2890 | + os2*) |
2891 | + # The test takes a long time on OS/2. |
2892 | + lt_cv_sys_max_cmd_len=8192 |
2893 | + ;; |
2894 | + |
2895 | osf*) |
2896 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2897 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2898 | @@ -5626,7 +5663,7 @@ |
2899 | # If test is not a shell built-in, we'll probably end up computing a |
2900 | # maximum length that is only half of the actual maximum length, but |
2901 | # we can't tell. |
2902 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
2903 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2904 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2905 | test $i != 17 # 1/2 MB should be enough |
2906 | do |
2907 | @@ -6055,7 +6092,7 @@ |
2908 | lt_cv_deplibs_check_method=pass_all |
2909 | ;; |
2910 | |
2911 | -# This must be Linux ELF. |
2912 | +# This must be glibc/ELF. |
2913 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2914 | lt_cv_deplibs_check_method=pass_all |
2915 | ;; |
2916 | @@ -6695,13 +6732,13 @@ |
2917 | if test -n "$RANLIB"; then |
2918 | case $host_os in |
2919 | openbsd*) |
2920 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
2921 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
2922 | ;; |
2923 | *) |
2924 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
2925 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
2926 | ;; |
2927 | esac |
2928 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2929 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
2930 | fi |
2931 | |
2932 | case $host_os in |
2933 | @@ -6848,6 +6885,7 @@ |
2934 | # which start with @ or ?. |
2935 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
2936 | " {last_section=section; section=\$ 3};"\ |
2937 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
2938 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
2939 | " \$ 0!~/External *\|/{next};"\ |
2940 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
2941 | @@ -7236,7 +7274,7 @@ |
2942 | CFLAGS="$SAVE_CFLAGS" |
2943 | fi |
2944 | ;; |
2945 | -sparc*-*solaris*) |
2946 | +*-*solaris*) |
2947 | # Find out which ABI we are using. |
2948 | echo 'int i;' > conftest.$ac_ext |
2949 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
2950 | @@ -7247,7 +7285,20 @@ |
2951 | case `/usr/bin/file conftest.o` in |
2952 | *64-bit*) |
2953 | case $lt_cv_prog_gnu_ld in |
2954 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
2955 | + yes*) |
2956 | + case $host in |
2957 | + i?86-*-solaris*) |
2958 | + LD="${LD-ld} -m elf_x86_64" |
2959 | + ;; |
2960 | + sparc*-*-solaris*) |
2961 | + LD="${LD-ld} -m elf64_sparc" |
2962 | + ;; |
2963 | + esac |
2964 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
2965 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
2966 | + LD="${LD-ld}_sol2" |
2967 | + fi |
2968 | + ;; |
2969 | *) |
2970 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
2971 | LD="${LD-ld} -64" |
2972 | @@ -7887,7 +7938,13 @@ |
2973 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
2974 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
2975 | _lt_result=$? |
2976 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
2977 | + # If there is a non-empty error log, and "single_module" |
2978 | + # appears in it, assume the flag caused a linker warning |
2979 | + if test -s conftest.err && $GREP single_module conftest.err; then |
2980 | + cat conftest.err >&5 |
2981 | + # Otherwise, if the output was created with a 0 exit code from |
2982 | + # the compiler, it worked. |
2983 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
2984 | lt_cv_apple_cc_single_mod=yes |
2985 | else |
2986 | cat conftest.err >&5 |
2987 | @@ -7898,6 +7955,7 @@ |
2988 | fi |
2989 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 |
2990 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
2991 | + |
2992 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
2993 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
2994 | if ${lt_cv_ld_exported_symbols_list+:} false; then : |
2995 | @@ -7930,6 +7988,7 @@ |
2996 | fi |
2997 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
2998 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
2999 | + |
3000 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
3001 | $as_echo_n "checking for -force_load linker flag... " >&6; } |
3002 | if ${lt_cv_ld_force_load+:} false; then : |
3003 | @@ -7951,7 +8010,9 @@ |
3004 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
3005 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
3006 | _lt_result=$? |
3007 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
3008 | + if test -s conftest.err && $GREP force_load conftest.err; then |
3009 | + cat conftest.err >&5 |
3010 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
3011 | lt_cv_ld_force_load=yes |
3012 | else |
3013 | cat conftest.err >&5 |
3014 | @@ -8356,7 +8417,22 @@ |
3015 | |
3016 | # Check whether --with-pic was given. |
3017 | if test "${with_pic+set}" = set; then : |
3018 | - withval=$with_pic; pic_mode="$withval" |
3019 | + withval=$with_pic; lt_p=${PACKAGE-default} |
3020 | + case $withval in |
3021 | + yes|no) pic_mode=$withval ;; |
3022 | + *) |
3023 | + pic_mode=default |
3024 | + # Look at the argument we got. We use all the common list separators. |
3025 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
3026 | + for lt_pkg in $withval; do |
3027 | + IFS="$lt_save_ifs" |
3028 | + if test "X$lt_pkg" = "X$lt_p"; then |
3029 | + pic_mode=yes |
3030 | + fi |
3031 | + done |
3032 | + IFS="$lt_save_ifs" |
3033 | + ;; |
3034 | + esac |
3035 | else |
3036 | pic_mode=default |
3037 | fi |
3038 | @@ -8434,6 +8510,10 @@ |
3039 | |
3040 | |
3041 | |
3042 | + |
3043 | + |
3044 | + |
3045 | + |
3046 | test -z "$LN_S" && LN_S="ln -s" |
3047 | |
3048 | |
3049 | @@ -8893,7 +8973,9 @@ |
3050 | case $cc_basename in |
3051 | nvcc*) # Cuda Compiler Driver 2.2 |
3052 | lt_prog_compiler_wl='-Xlinker ' |
3053 | - lt_prog_compiler_pic='-Xcompiler -fPIC' |
3054 | + if test -n "$lt_prog_compiler_pic"; then |
3055 | + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" |
3056 | + fi |
3057 | ;; |
3058 | esac |
3059 | else |
3060 | @@ -8984,18 +9066,33 @@ |
3061 | ;; |
3062 | *) |
3063 | case `$CC -V 2>&1 | sed 5q` in |
3064 | - *Sun\ F* | *Sun*Fortran*) |
3065 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) |
3066 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3067 | lt_prog_compiler_pic='-KPIC' |
3068 | lt_prog_compiler_static='-Bstatic' |
3069 | lt_prog_compiler_wl='' |
3070 | ;; |
3071 | + *Sun\ F* | *Sun*Fortran*) |
3072 | + lt_prog_compiler_pic='-KPIC' |
3073 | + lt_prog_compiler_static='-Bstatic' |
3074 | + lt_prog_compiler_wl='-Qoption ld ' |
3075 | + ;; |
3076 | *Sun\ C*) |
3077 | # Sun C 5.9 |
3078 | lt_prog_compiler_pic='-KPIC' |
3079 | lt_prog_compiler_static='-Bstatic' |
3080 | lt_prog_compiler_wl='-Wl,' |
3081 | ;; |
3082 | + *Intel*\ [CF]*Compiler*) |
3083 | + lt_prog_compiler_wl='-Wl,' |
3084 | + lt_prog_compiler_pic='-fPIC' |
3085 | + lt_prog_compiler_static='-static' |
3086 | + ;; |
3087 | + *Portland\ Group*) |
3088 | + lt_prog_compiler_wl='-Wl,' |
3089 | + lt_prog_compiler_pic='-fpic' |
3090 | + lt_prog_compiler_static='-Bstatic' |
3091 | + ;; |
3092 | esac |
3093 | ;; |
3094 | esac |
3095 | @@ -9357,7 +9454,6 @@ |
3096 | hardcode_direct=no |
3097 | hardcode_direct_absolute=no |
3098 | hardcode_libdir_flag_spec= |
3099 | - hardcode_libdir_flag_spec_ld= |
3100 | hardcode_libdir_separator= |
3101 | hardcode_minus_L=no |
3102 | hardcode_shlibpath_var=unsupported |
3103 | @@ -9607,8 +9703,7 @@ |
3104 | xlf* | bgf* | bgxlf* | mpixlf*) |
3105 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
3106 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
3107 | - hardcode_libdir_flag_spec= |
3108 | - hardcode_libdir_flag_spec_ld='-rpath $libdir' |
3109 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3110 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
3111 | if test "x$supports_anon_versioning" = xyes; then |
3112 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
3113 | @@ -9987,6 +10082,7 @@ |
3114 | # The linker will not automatically build a static lib if we build a DLL. |
3115 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
3116 | enable_shared_with_static_runtimes=yes |
3117 | + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
3118 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
3119 | # Don't use ranlib |
3120 | old_postinstall_cmds='chmod 644 $oldlib' |
3121 | @@ -10032,6 +10128,7 @@ |
3122 | hardcode_shlibpath_var=unsupported |
3123 | if test "$lt_cv_ld_force_load" = "yes"; then |
3124 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
3125 | + |
3126 | else |
3127 | whole_archive_flag_spec='' |
3128 | fi |
3129 | @@ -10060,10 +10157,6 @@ |
3130 | hardcode_shlibpath_var=no |
3131 | ;; |
3132 | |
3133 | - freebsd1*) |
3134 | - ld_shlibs=no |
3135 | - ;; |
3136 | - |
3137 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
3138 | # support. Future versions do this automatically, but an explicit c++rt0.o |
3139 | # does not break anything, and helps significantly (at the cost of a little |
3140 | @@ -10076,7 +10169,7 @@ |
3141 | ;; |
3142 | |
3143 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
3144 | - freebsd2*) |
3145 | + freebsd2.*) |
3146 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
3147 | hardcode_direct=yes |
3148 | hardcode_minus_L=yes |
3149 | @@ -10115,7 +10208,6 @@ |
3150 | fi |
3151 | if test "$with_gnu_ld" = no; then |
3152 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
3153 | - hardcode_libdir_flag_spec_ld='+b $libdir' |
3154 | hardcode_libdir_separator=: |
3155 | hardcode_direct=yes |
3156 | hardcode_direct_absolute=yes |
3157 | @@ -10739,11 +10831,6 @@ |
3158 | |
3159 | |
3160 | |
3161 | - |
3162 | - |
3163 | - |
3164 | - |
3165 | - |
3166 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
3167 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
3168 | |
3169 | @@ -10833,7 +10920,7 @@ |
3170 | |
3171 | case $host_os in |
3172 | aix3*) |
3173 | - version_type=linux |
3174 | + version_type=linux # correct to gnu/linux during the next big refactor |
3175 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
3176 | shlibpath_var=LIBPATH |
3177 | |
3178 | @@ -10842,7 +10929,7 @@ |
3179 | ;; |
3180 | |
3181 | aix[4-9]*) |
3182 | - version_type=linux |
3183 | + version_type=linux # correct to gnu/linux during the next big refactor |
3184 | need_lib_prefix=no |
3185 | need_version=no |
3186 | hardcode_into_libs=yes |
3187 | @@ -10907,7 +10994,7 @@ |
3188 | ;; |
3189 | |
3190 | bsdi[45]*) |
3191 | - version_type=linux |
3192 | + version_type=linux # correct to gnu/linux during the next big refactor |
3193 | need_version=no |
3194 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3195 | soname_spec='${libname}${release}${shared_ext}$major' |
3196 | @@ -11046,7 +11133,7 @@ |
3197 | ;; |
3198 | |
3199 | dgux*) |
3200 | - version_type=linux |
3201 | + version_type=linux # correct to gnu/linux during the next big refactor |
3202 | need_lib_prefix=no |
3203 | need_version=no |
3204 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
3205 | @@ -11054,10 +11141,6 @@ |
3206 | shlibpath_var=LD_LIBRARY_PATH |
3207 | ;; |
3208 | |
3209 | -freebsd1*) |
3210 | - dynamic_linker=no |
3211 | - ;; |
3212 | - |
3213 | freebsd* | dragonfly*) |
3214 | # DragonFly does not have aout. When/if they implement a new |
3215 | # versioning mechanism, adjust this. |
3216 | @@ -11065,7 +11148,7 @@ |
3217 | objformat=`/usr/bin/objformat` |
3218 | else |
3219 | case $host_os in |
3220 | - freebsd[123]*) objformat=aout ;; |
3221 | + freebsd[23].*) objformat=aout ;; |
3222 | *) objformat=elf ;; |
3223 | esac |
3224 | fi |
3225 | @@ -11083,7 +11166,7 @@ |
3226 | esac |
3227 | shlibpath_var=LD_LIBRARY_PATH |
3228 | case $host_os in |
3229 | - freebsd2*) |
3230 | + freebsd2.*) |
3231 | shlibpath_overrides_runpath=yes |
3232 | ;; |
3233 | freebsd3.[01]* | freebsdelf3.[01]*) |
3234 | @@ -11103,17 +11186,18 @@ |
3235 | ;; |
3236 | |
3237 | gnu*) |
3238 | - version_type=linux |
3239 | + version_type=linux # correct to gnu/linux during the next big refactor |
3240 | need_lib_prefix=no |
3241 | need_version=no |
3242 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3243 | soname_spec='${libname}${release}${shared_ext}$major' |
3244 | shlibpath_var=LD_LIBRARY_PATH |
3245 | + shlibpath_overrides_runpath=no |
3246 | hardcode_into_libs=yes |
3247 | ;; |
3248 | |
3249 | haiku*) |
3250 | - version_type=linux |
3251 | + version_type=linux # correct to gnu/linux during the next big refactor |
3252 | need_lib_prefix=no |
3253 | need_version=no |
3254 | dynamic_linker="$host_os runtime_loader" |
3255 | @@ -11174,7 +11258,7 @@ |
3256 | ;; |
3257 | |
3258 | interix[3-9]*) |
3259 | - version_type=linux |
3260 | + version_type=linux # correct to gnu/linux during the next big refactor |
3261 | need_lib_prefix=no |
3262 | need_version=no |
3263 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3264 | @@ -11190,7 +11274,7 @@ |
3265 | nonstopux*) version_type=nonstopux ;; |
3266 | *) |
3267 | if test "$lt_cv_prog_gnu_ld" = yes; then |
3268 | - version_type=linux |
3269 | + version_type=linux # correct to gnu/linux during the next big refactor |
3270 | else |
3271 | version_type=irix |
3272 | fi ;; |
3273 | @@ -11227,9 +11311,9 @@ |
3274 | dynamic_linker=no |
3275 | ;; |
3276 | |
3277 | -# This must be Linux ELF. |
3278 | +# This must be glibc/ELF. |
3279 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3280 | - version_type=linux |
3281 | + version_type=linux # correct to gnu/linux during the next big refactor |
3282 | need_lib_prefix=no |
3283 | need_version=no |
3284 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3285 | @@ -11315,7 +11399,7 @@ |
3286 | ;; |
3287 | |
3288 | newsos6) |
3289 | - version_type=linux |
3290 | + version_type=linux # correct to gnu/linux during the next big refactor |
3291 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3292 | shlibpath_var=LD_LIBRARY_PATH |
3293 | shlibpath_overrides_runpath=yes |
3294 | @@ -11384,7 +11468,7 @@ |
3295 | ;; |
3296 | |
3297 | solaris*) |
3298 | - version_type=linux |
3299 | + version_type=linux # correct to gnu/linux during the next big refactor |
3300 | need_lib_prefix=no |
3301 | need_version=no |
3302 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3303 | @@ -11409,7 +11493,7 @@ |
3304 | ;; |
3305 | |
3306 | sysv4 | sysv4.3*) |
3307 | - version_type=linux |
3308 | + version_type=linux # correct to gnu/linux during the next big refactor |
3309 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3310 | soname_spec='${libname}${release}${shared_ext}$major' |
3311 | shlibpath_var=LD_LIBRARY_PATH |
3312 | @@ -11433,7 +11517,7 @@ |
3313 | |
3314 | sysv4*MP*) |
3315 | if test -d /usr/nec ;then |
3316 | - version_type=linux |
3317 | + version_type=linux # correct to gnu/linux during the next big refactor |
3318 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
3319 | soname_spec='$libname${shared_ext}.$major' |
3320 | shlibpath_var=LD_LIBRARY_PATH |
3321 | @@ -11464,7 +11548,7 @@ |
3322 | |
3323 | tpf*) |
3324 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
3325 | - version_type=linux |
3326 | + version_type=linux # correct to gnu/linux during the next big refactor |
3327 | need_lib_prefix=no |
3328 | need_version=no |
3329 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3330 | @@ -11474,7 +11558,7 @@ |
3331 | ;; |
3332 | |
3333 | uts4*) |
3334 | - version_type=linux |
3335 | + version_type=linux # correct to gnu/linux during the next big refactor |
3336 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3337 | soname_spec='${libname}${release}${shared_ext}$major' |
3338 | shlibpath_var=LD_LIBRARY_PATH |
3339 | @@ -12256,6 +12340,8 @@ |
3340 | |
3341 | |
3342 | |
3343 | + |
3344 | + |
3345 | ac_config_commands="$ac_config_commands libtool" |
3346 | |
3347 | |
3348 | @@ -15341,7 +15427,7 @@ |
3349 | # report actual input values of CONFIG_FILES etc. instead of their |
3350 | # values after options handling. |
3351 | ac_log=" |
3352 | -This file was extended by libxklavier $as_me 5.2.1, which was |
3353 | +This file was extended by libxklavier $as_me 5.3, which was |
3354 | generated by GNU Autoconf 2.68. Invocation command line was |
3355 | |
3356 | CONFIG_FILES = $CONFIG_FILES |
3357 | @@ -15407,7 +15493,7 @@ |
3358 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
3359 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
3360 | ac_cs_version="\\ |
3361 | -libxklavier config.status 5.2.1 |
3362 | +libxklavier config.status 5.3 |
3363 | configured by $0, generated by GNU Autoconf 2.68, |
3364 | with options \\"\$ac_cs_config\\" |
3365 | |
3366 | @@ -15544,6 +15630,7 @@ |
3367 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
3368 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
3369 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
3370 | +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' |
3371 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' |
3372 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' |
3373 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' |
3374 | @@ -15626,7 +15713,6 @@ |
3375 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' |
3376 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' |
3377 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' |
3378 | -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' |
3379 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' |
3380 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' |
3381 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' |
3382 | @@ -15682,6 +15768,7 @@ |
3383 | # Quote evaled strings. |
3384 | for var in SHELL \ |
3385 | ECHO \ |
3386 | +PATH_SEPARATOR \ |
3387 | SED \ |
3388 | GREP \ |
3389 | EGREP \ |
3390 | @@ -15732,7 +15819,6 @@ |
3391 | allow_undefined_flag \ |
3392 | no_undefined_flag \ |
3393 | hardcode_libdir_flag_spec \ |
3394 | -hardcode_libdir_flag_spec_ld \ |
3395 | hardcode_libdir_separator \ |
3396 | exclude_expsyms \ |
3397 | include_expsyms \ |
3398 | @@ -16542,8 +16628,8 @@ |
3399 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3400 | # |
3401 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3402 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
3403 | -# Inc. |
3404 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3405 | +# Foundation, Inc. |
3406 | # Written by Gordon Matzigkeit, 1996 |
3407 | # |
3408 | # This file is part of GNU Libtool. |
3409 | @@ -16597,6 +16683,9 @@ |
3410 | # An echo program that protects backslashes. |
3411 | ECHO=$lt_ECHO |
3412 | |
3413 | +# The PATH separator for the build system. |
3414 | +PATH_SEPARATOR=$lt_PATH_SEPARATOR |
3415 | + |
3416 | # The host system. |
3417 | host_alias=$host_alias |
3418 | host=$host |
3419 | @@ -16898,10 +16987,6 @@ |
3420 | # This must work even if \$libdir does not exist |
3421 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec |
3422 | |
3423 | -# If ld is used when linking, flag to hardcode \$libdir into a binary |
3424 | -# during linking. This must work even if \$libdir does not exist. |
3425 | -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld |
3426 | - |
3427 | # Whether we need a single "-rpath" flag with a separated argument. |
3428 | hardcode_libdir_separator=$lt_hardcode_libdir_separator |
3429 | |
3430 | |
3431 | === modified file 'configure.ac' |
3432 | --- configure.ac 2012-02-22 02:28:16 +0000 |
3433 | +++ configure.ac 2014-02-16 22:04:28 +0000 |
3434 | @@ -1,7 +1,7 @@ |
3435 | AC_PREREQ([2.63]) |
3436 | |
3437 | AC_INIT([libxklavier], |
3438 | - [5.2.1], |
3439 | + [5.3], |
3440 | [http://bugs.freedesktop.org/enter_bug.cgi?product=libxklavier], |
3441 | [libxklavier]) |
3442 | |
3443 | @@ -20,7 +20,7 @@ |
3444 | |
3445 | dnl for DLL |
3446 | dnl http://sources.redhat.com/autobook/autobook/autobook_91.html |
3447 | -VERSION_INFO=18:0:2 |
3448 | +VERSION_INFO=19:0:3 |
3449 | AC_SUBST(VERSION_INFO) |
3450 | |
3451 | # Check for programs |
3452 | |
3453 | === modified file 'debian/changelog' |
3454 | --- debian/changelog 2012-10-05 10:47:22 +0000 |
3455 | +++ debian/changelog 2014-02-16 22:04:28 +0000 |
3456 | @@ -1,3 +1,12 @@ |
3457 | +libxklavier (5.3-0ubuntu1) trusty; urgency=medium |
3458 | + |
3459 | + * New upstream release. |
3460 | + * Drop 0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch, |
3461 | + fixed upstream |
3462 | + * Update symbols |
3463 | + |
3464 | + -- Jackson Doak <noskcaj@ubuntu.com> Mon, 17 Feb 2014 08:05:02 +1100 |
3465 | + |
3466 | libxklavier (5.2.1-1ubuntu2) quantal; urgency=low |
3467 | |
3468 | * Rebuild for new armel compiler default of ARMv5t. |
3469 | |
3470 | === modified file 'debian/libxklavier16.symbols' |
3471 | --- debian/libxklavier16.symbols 2012-02-22 02:28:16 +0000 |
3472 | +++ debian/libxklavier16.symbols 2014-02-16 22:04:28 +0000 |
3473 | @@ -15,6 +15,7 @@ |
3474 | xkl_config_rec_new@Base 5.0 |
3475 | xkl_config_rec_reset@Base 5.0 |
3476 | xkl_config_rec_set_layouts@Base 5.1 |
3477 | + xkl_config_rec_set_model@Base 5.3 |
3478 | xkl_config_rec_set_options@Base 5.1 |
3479 | xkl_config_rec_set_to_root_window_property@Base 5.0 |
3480 | xkl_config_rec_set_variants@Base 5.1 |
3481 | @@ -39,7 +40,7 @@ |
3482 | xkl_config_registry_search_by_pattern@Base 5.1 |
3483 | xkl_default_log_appender@Base 5.0 |
3484 | xkl_engine_INT__LONG_LONG@Base 5.0 |
3485 | - xkl_engine_VOID__FLAGS_INT_BOOLEAN@Base 5.0 |
3486 | +#MISSING: 5.3-0ubuntu1# xkl_engine_VOID__FLAGS_INT_BOOLEAN@Base 5.0 |
3487 | xkl_engine_allow_one_switch_to_secondary_group@Base 5.0 |
3488 | xkl_engine_backup_names_prop@Base 5.0 |
3489 | xkl_engine_delete_state@Base 5.0 |
3490 | |
3491 | === removed file 'debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch' |
3492 | --- debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch 2012-02-22 02:28:16 +0000 |
3493 | +++ debian/patches/0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch 1970-01-01 00:00:00 +0000 |
3494 | @@ -1,133 +0,0 @@ |
3495 | -From 28cb7b7e1bdf2213c4b980d52b03dd5762f39214 Mon Sep 17 00:00:00 2001 |
3496 | -From: "Sergey V. Udaltsov" <svu@gnome.org> |
3497 | -Date: Tue, 21 Feb 2012 21:44:06 +0000 |
3498 | -Subject: [PATCH] Explicitly exporting only the symbols that are really |
3499 | - required |
3500 | - |
3501 | -https://bugs.freedesktop.org/show_bug.cgi?id=46416 |
3502 | ---- |
3503 | - libxklavier/Makefile.am | 4 +- |
3504 | - libxklavier/libxklavier.public | 91 ++++++++++++++++++++++++++++++++++++++++ |
3505 | - 2 files changed, 93 insertions(+), 2 deletions(-) |
3506 | - create mode 100644 libxklavier/libxklavier.public |
3507 | - |
3508 | -diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am |
3509 | -index c53ff6d..63c5d8d 100644 |
3510 | ---- a/libxklavier/Makefile.am |
3511 | -+++ b/libxklavier/Makefile.am |
3512 | -@@ -37,13 +37,13 @@ libxklavier_la_SOURCES = $(xklavier_built_cfiles) xklavier.c xklavier_evt.c xkla |
3513 | - xklavier_xmm.c xklavier_xmm_opts.c xklavier_evt_xmm.c xklavier_config_xmm.c \ |
3514 | - xklavier_util.c xklavier_props.c xklavier_dump.c xkl_engine_marshal.c \ |
3515 | - $(noinst_HEADERS) $(xklavierinc_HEADERS) |
3516 | --libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined |
3517 | -+libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined -export-symbols $(srcdir)/libxklavier.public |
3518 | - libxklavier_la_LIBADD = \ |
3519 | - $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \ |
3520 | - $(LIBXKBFILE_PRESENT_LDFLAGS) \ |
3521 | - $(X_LIBS) -lX11 $(LIBICONV) |
3522 | - |
3523 | --EXTRA_DIST=marshal.list |
3524 | -+EXTRA_DIST=marshal.list libxklavier.public |
3525 | - |
3526 | - GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0` |
3527 | - |
3528 | -diff --git a/libxklavier/libxklavier.public b/libxklavier/libxklavier.public |
3529 | -new file mode 100644 |
3530 | -index 0000000..ae5c5b8 |
3531 | ---- /dev/null |
3532 | -+++ b/libxklavier/libxklavier.public |
3533 | -@@ -0,0 +1,91 @@ |
3534 | -+xkl_config_item_get_type |
3535 | -+xkl_config_item_new |
3536 | -+xkl_config_item_set_description |
3537 | -+xkl_config_item_set_name |
3538 | -+xkl_config_item_set_short_description |
3539 | -+xkl_config_rec_activate |
3540 | -+xkl_config_rec_dump |
3541 | -+xkl_config_rec_equals |
3542 | -+xkl_config_rec_get_from_backup |
3543 | -+xkl_config_rec_get_from_root_window_property |
3544 | -+xkl_config_rec_get_from_server |
3545 | -+xkl_config_rec_get_type |
3546 | -+xkl_config_rec_new |
3547 | -+xkl_config_rec_reset |
3548 | -+xkl_config_rec_set_layouts |
3549 | -+xkl_config_rec_set_options |
3550 | -+xkl_config_rec_set_to_root_window_property |
3551 | -+xkl_config_rec_set_variants |
3552 | -+xkl_config_rec_write_to_file |
3553 | -+xkl_config_registry_find_layout |
3554 | -+xkl_config_registry_find_model |
3555 | -+xkl_config_registry_find_option |
3556 | -+xkl_config_registry_find_option_group |
3557 | -+xkl_config_registry_find_variant |
3558 | -+xkl_config_registry_foreach_country |
3559 | -+xkl_config_registry_foreach_country_variant |
3560 | -+xkl_config_registry_foreach_language |
3561 | -+xkl_config_registry_foreach_language_variant |
3562 | -+xkl_config_registry_foreach_layout |
3563 | -+xkl_config_registry_foreach_layout_variant |
3564 | -+xkl_config_registry_foreach_model |
3565 | -+xkl_config_registry_foreach_option |
3566 | -+xkl_config_registry_foreach_option_group |
3567 | -+xkl_config_registry_get_instance |
3568 | -+xkl_config_registry_get_type |
3569 | -+xkl_config_registry_load |
3570 | -+xkl_config_registry_search_by_pattern |
3571 | -+_xkl_debug |
3572 | -+xkl_default_log_appender |
3573 | -+xkl_engine_allow_one_switch_to_secondary_group |
3574 | -+xkl_engine_backup_names_prop |
3575 | -+xkl_engine_delete_state |
3576 | -+xkl_engine_features_get_type |
3577 | -+xkl_engine_filter_events |
3578 | -+xkl_engine_get_backend_name |
3579 | -+xkl_engine_get_current_state |
3580 | -+xkl_engine_get_current_window |
3581 | -+xkl_engine_get_current_window_group |
3582 | -+xkl_engine_get_default_group |
3583 | -+xkl_engine_get_features |
3584 | -+xkl_engine_get_groups_names |
3585 | -+xkl_engine_get_indicators_handling |
3586 | -+xkl_engine_get_indicators_names |
3587 | -+xkl_engine_get_instance |
3588 | -+xkl_engine_get_max_num_groups |
3589 | -+xkl_engine_get_next_group |
3590 | -+xkl_engine_get_num_groups |
3591 | -+xkl_engine_get_prev_group |
3592 | -+xkl_engine_get_secondary_groups_mask |
3593 | -+xkl_engine_get_state |
3594 | -+xkl_engine_get_type |
3595 | -+xkl_engine_get_window_title |
3596 | -+xkl_engine_grab_key |
3597 | -+xkl_engine_INT__LONG_LONG |
3598 | -+xkl_engine_is_group_per_toplevel_window |
3599 | -+xkl_engine_is_window_from_same_toplevel_window |
3600 | -+xkl_engine_is_window_transparent |
3601 | -+xkl_engine_listen_modes_get_type |
3602 | -+xkl_engine_lock_group |
3603 | -+xkl_engine_pause_listen |
3604 | -+xkl_engine_resume_listen |
3605 | -+xkl_engine_save_state |
3606 | -+xkl_engine_set_default_group |
3607 | -+xkl_engine_set_group_per_toplevel_window |
3608 | -+xkl_engine_set_indicators_handling |
3609 | -+xkl_engine_set_secondary_groups_mask |
3610 | -+xkl_engine_set_window_transparent |
3611 | -+xkl_engine_start_listen |
3612 | -+xkl_engine_state_change_get_type |
3613 | -+xkl_engine_stop_listen |
3614 | -+xkl_engine_ungrab_key |
3615 | -+xkl_engine_VOID__FLAGS_INT_BOOLEAN |
3616 | -+xkl_get_country_name |
3617 | -+xkl_get_language_name |
3618 | -+xkl_get_last_error |
3619 | -+xkl_restore_names_prop |
3620 | -+xkl_set_debug_level |
3621 | -+xkl_set_log_appender |
3622 | -+xkl_state_get_type |
3623 | -+xkl_xkb_config_native_cleanup |
3624 | -+xkl_xkb_config_native_prepare |
3625 | --- |
3626 | -1.7.9.1 |
3627 | - |
3628 | |
3629 | === modified file 'debian/patches/revert-default-group-change.patch' |
3630 | --- debian/patches/revert-default-group-change.patch 2012-03-21 14:32:39 +0000 |
3631 | +++ debian/patches/revert-default-group-change.patch 2014-02-16 22:04:28 +0000 |
3632 | @@ -1,10 +1,12 @@ |
3633 | -Index: libxklavier-5.2.1/libxklavier/xklavier_config_xkb.c |
3634 | -=================================================================== |
3635 | ---- libxklavier-5.2.1.orig/libxklavier/xklavier_config_xkb.c 2012-01-13 19:51:30.000000000 -0500 |
3636 | -+++ libxklavier-5.2.1/libxklavier/xklavier_config_xkb.c 2012-03-21 14:09:57.773226914 -0400 |
3637 | -@@ -403,10 +403,6 @@ |
3638 | +--- |
3639 | + libxklavier/xklavier_config_xkb.c | 4 ---- |
3640 | + 1 file changed, 4 deletions(-) |
3641 | + |
3642 | +--- a/libxklavier/xklavier_config_xkb.c |
3643 | ++++ b/libxklavier/xklavier_config_xkb.c |
3644 | +@@ -403,10 +403,6 @@ xkl_config_get_keyboard(XklEngine * engi |
3645 | /* Return to normal X error processing */ |
3646 | - xkl_engine_priv(engine, criticalSection) = FALSE; |
3647 | + xkl_engine_priv(engine, critical_section) = FALSE; |
3648 | |
3649 | - if (activate) |
3650 | - xkl_config_set_group_by_description(engine, |
3651 | |
3652 | === modified file 'debian/patches/series' |
3653 | --- debian/patches/series 2012-03-21 14:32:39 +0000 |
3654 | +++ debian/patches/series 2014-02-16 22:04:28 +0000 |
3655 | @@ -1,2 +1,1 @@ |
3656 | -0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch |
3657 | revert-default-group-change.patch |
3658 | |
3659 | === modified file 'doc/Makefile.in' |
3660 | --- doc/Makefile.in 2012-02-15 10:50:36 +0000 |
3661 | +++ doc/Makefile.in 2014-02-16 22:04:28 +0000 |
3662 | @@ -1,9 +1,9 @@ |
3663 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3664 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
3665 | # @configure_input@ |
3666 | |
3667 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3668 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3669 | -# Inc. |
3670 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3671 | +# Foundation, Inc. |
3672 | # This Makefile.in is free software; the Free Software Foundation |
3673 | # gives unlimited permission to copy and/or distribute it, |
3674 | # with or without modifications, as long as this notice is preserved. |
3675 | @@ -15,6 +15,23 @@ |
3676 | |
3677 | @SET_MAKE@ |
3678 | VPATH = @srcdir@ |
3679 | +am__make_dryrun = \ |
3680 | + { \ |
3681 | + am__dry=no; \ |
3682 | + case $$MAKEFLAGS in \ |
3683 | + *\\[\ \ ]*) \ |
3684 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3685 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3686 | + *) \ |
3687 | + for am__flg in $$MAKEFLAGS; do \ |
3688 | + case $$am__flg in \ |
3689 | + *=*|--*) ;; \ |
3690 | + *n*) am__dry=yes; break;; \ |
3691 | + esac; \ |
3692 | + done;; \ |
3693 | + esac; \ |
3694 | + test $$am__dry = yes; \ |
3695 | + } |
3696 | pkgdatadir = $(datadir)/@PACKAGE@ |
3697 | pkgincludedir = $(includedir)/@PACKAGE@ |
3698 | pkglibdir = $(libdir)/@PACKAGE@ |
3699 | @@ -52,11 +69,11 @@ |
3700 | CONFIG_HEADER = $(top_builddir)/config.h |
3701 | CONFIG_CLEAN_FILES = |
3702 | CONFIG_CLEAN_VPATH_FILES = |
3703 | -AM_V_GEN = $(am__v_GEN_$(V)) |
3704 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
3705 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
3706 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
3707 | am__v_GEN_0 = @echo " GEN " $@; |
3708 | -AM_V_at = $(am__v_at_$(V)) |
3709 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
3710 | +AM_V_at = $(am__v_at_@AM_V@) |
3711 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
3712 | am__v_at_0 = @ |
3713 | SOURCES = |
3714 | DIST_SOURCES = |
3715 | @@ -67,6 +84,11 @@ |
3716 | install-pdf-recursive install-ps-recursive install-recursive \ |
3717 | installcheck-recursive installdirs-recursive pdf-recursive \ |
3718 | ps-recursive uninstall-recursive |
3719 | +am__can_run_installinfo = \ |
3720 | + case $$AM_UPDATE_INFO_DIR in \ |
3721 | + n|no|NO) false;; \ |
3722 | + *) (install-info --version) >/dev/null 2>&1;; \ |
3723 | + esac |
3724 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
3725 | distclean-recursive maintainer-clean-recursive |
3726 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
3727 | @@ -469,13 +491,10 @@ |
3728 | done |
3729 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
3730 | if test "$$subdir" = .; then :; else \ |
3731 | - test -d "$(distdir)/$$subdir" \ |
3732 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
3733 | - || exit 1; \ |
3734 | - fi; \ |
3735 | - done |
3736 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
3737 | - if test "$$subdir" = .; then :; else \ |
3738 | + $(am__make_dryrun) \ |
3739 | + || test -d "$(distdir)/$$subdir" \ |
3740 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
3741 | + || exit 1; \ |
3742 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
3743 | $(am__relativize); \ |
3744 | new_distdir=$$reldir; \ |
3745 | @@ -510,10 +529,15 @@ |
3746 | |
3747 | installcheck: installcheck-recursive |
3748 | install-strip: |
3749 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3750 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3751 | - `test -z '$(STRIP)' || \ |
3752 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3753 | + if test -z '$(STRIP)'; then \ |
3754 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3755 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3756 | + install; \ |
3757 | + else \ |
3758 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3759 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3760 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3761 | + fi |
3762 | mostlyclean-generic: |
3763 | |
3764 | clean-generic: |
3765 | |
3766 | === modified file 'doc/reference/Makefile.in' |
3767 | --- doc/reference/Makefile.in 2012-02-15 10:50:36 +0000 |
3768 | +++ doc/reference/Makefile.in 2014-02-16 22:04:28 +0000 |
3769 | @@ -1,9 +1,9 @@ |
3770 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3771 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
3772 | # @configure_input@ |
3773 | |
3774 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3775 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3776 | -# Inc. |
3777 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3778 | +# Foundation, Inc. |
3779 | # This Makefile.in is free software; the Free Software Foundation |
3780 | # gives unlimited permission to copy and/or distribute it, |
3781 | # with or without modifications, as long as this notice is preserved. |
3782 | @@ -21,6 +21,23 @@ |
3783 | # Everything below here is generic # |
3784 | #################################### |
3785 | VPATH = @srcdir@ |
3786 | +am__make_dryrun = \ |
3787 | + { \ |
3788 | + am__dry=no; \ |
3789 | + case $$MAKEFLAGS in \ |
3790 | + *\\[\ \ ]*) \ |
3791 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3792 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3793 | + *) \ |
3794 | + for am__flg in $$MAKEFLAGS; do \ |
3795 | + case $$am__flg in \ |
3796 | + *=*|--*) ;; \ |
3797 | + *n*) am__dry=yes; break;; \ |
3798 | + esac; \ |
3799 | + done;; \ |
3800 | + esac; \ |
3801 | + test $$am__dry = yes; \ |
3802 | + } |
3803 | pkgdatadir = $(datadir)/@PACKAGE@ |
3804 | pkgincludedir = $(includedir)/@PACKAGE@ |
3805 | pkglibdir = $(libdir)/@PACKAGE@ |
3806 | @@ -59,14 +76,19 @@ |
3807 | CONFIG_HEADER = $(top_builddir)/config.h |
3808 | CONFIG_CLEAN_FILES = |
3809 | CONFIG_CLEAN_VPATH_FILES = |
3810 | -AM_V_GEN = $(am__v_GEN_$(V)) |
3811 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
3812 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
3813 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
3814 | am__v_GEN_0 = @echo " GEN " $@; |
3815 | -AM_V_at = $(am__v_at_$(V)) |
3816 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
3817 | +AM_V_at = $(am__v_at_@AM_V@) |
3818 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
3819 | am__v_at_0 = @ |
3820 | SOURCES = |
3821 | DIST_SOURCES = |
3822 | +am__can_run_installinfo = \ |
3823 | + case $$AM_UPDATE_INFO_DIR in \ |
3824 | + n|no|NO) false;; \ |
3825 | + *) (install-info --version) >/dev/null 2>&1;; \ |
3826 | + esac |
3827 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3828 | ACLOCAL = @ACLOCAL@ |
3829 | AMTAR = @AMTAR@ |
3830 | @@ -369,6 +391,7 @@ |
3831 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ |
3832 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ |
3833 | esac; |
3834 | +$(top_srcdir)/gtk-doc.make: |
3835 | |
3836 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
3837 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
3838 | @@ -438,10 +461,15 @@ |
3839 | |
3840 | installcheck: installcheck-am |
3841 | install-strip: |
3842 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3843 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3844 | - `test -z '$(STRIP)' || \ |
3845 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3846 | + if test -z '$(STRIP)'; then \ |
3847 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3848 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3849 | + install; \ |
3850 | + else \ |
3851 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3852 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3853 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3854 | + fi |
3855 | mostlyclean-generic: |
3856 | |
3857 | clean-generic: |
3858 | |
3859 | === modified file 'doc/reference/html/ch01.html' |
3860 | --- doc/reference/html/ch01.html 2012-02-15 10:50:36 +0000 |
3861 | +++ doc/reference/html/ch01.html 2014-02-16 22:04:28 +0000 |
3862 | @@ -21,7 +21,7 @@ |
3863 | </tr></table> |
3864 | <div class="chapter"> |
3865 | <div class="titlepage"><div><div><h2 class="title"> |
3866 | -<a name="id372735"></a>Libxklavier Objects</h2></div></div></div> |
3867 | +<a name="id554547"></a>Libxklavier Objects</h2></div></div></div> |
3868 | <div class="toc"><dl> |
3869 | <dt> |
3870 | <span class="refentrytitle"><a href="libxklavier-xkl-engine.html">XklEngine</a></span><span class="refpurpose"></span> |
3871 | |
3872 | === modified file 'doc/reference/html/ch02.html' |
3873 | --- doc/reference/html/ch02.html 2012-02-15 10:50:36 +0000 |
3874 | +++ doc/reference/html/ch02.html 2014-02-16 22:04:28 +0000 |
3875 | @@ -21,7 +21,7 @@ |
3876 | </tr></table> |
3877 | <div class="chapter"> |
3878 | <div class="titlepage"><div><div><h2 class="title"> |
3879 | -<a name="id372935"></a>Libxklavier Utilities</h2></div></div></div> |
3880 | +<a name="id554748"></a>Libxklavier Utilities</h2></div></div></div> |
3881 | <div class="toc"><dl><dt> |
3882 | <span class="refentrytitle"><a href="libxklavier-xklavier.html">xklavier</a></span><span class="refpurpose"></span> |
3883 | </dt></dl></div> |
3884 | |
3885 | === modified file 'doc/reference/html/libxklavier-xkl-engine.html' |
3886 | --- doc/reference/html/libxklavier-xkl-engine.html 2012-02-15 10:50:36 +0000 |
3887 | +++ doc/reference/html/libxklavier-xkl-engine.html 2014-02-16 22:04:28 +0000 |
3888 | @@ -255,11 +255,11 @@ |
3889 | <hr> |
3890 | <div class="refsect2"> |
3891 | <a name="XklEngine-X-state-changed"></a><h3>The <code class="literal">"X-state-changed"</code> signal</h3> |
3892 | -<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="libxklavier-xkl-engine.html#XklEngine"><span class="type">XklEngine</span></a> *xklengine, |
3893 | - <span class="type">XklEngineStateChangeType</span> arg1, |
3894 | - <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> arg2, |
3895 | - <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> arg3, |
3896 | - <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre> |
3897 | +<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="libxklavier-xkl-engine.html#XklEngine"><span class="type">XklEngine</span></a> *xklengine, |
3898 | + <a class="link" href="libxklavier-xkl-engine.html#XklEngineStateChange" title="enum XklEngineStateChange"><span class="type">XklEngineStateChange</span></a> arg1, |
3899 | + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> arg2, |
3900 | + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> arg3, |
3901 | + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre> |
3902 | <p> |
3903 | </p> |
3904 | <div class="variablelist"><table border="0"> |
3905 | |
3906 | === modified file 'doc/reference/tmpl/xkl_config_item.sgml' |
3907 | --- doc/reference/tmpl/xkl_config_item.sgml 2012-02-15 10:50:36 +0000 |
3908 | +++ doc/reference/tmpl/xkl_config_item.sgml 2014-02-16 22:04:28 +0000 |
3909 | @@ -9,13 +9,11 @@ |
3910 | |
3911 | </para> |
3912 | |
3913 | - |
3914 | <!-- ##### SECTION See_Also ##### --> |
3915 | <para> |
3916 | |
3917 | </para> |
3918 | |
3919 | - |
3920 | <!-- ##### SECTION Stability_Level ##### --> |
3921 | |
3922 | |
3923 | |
3924 | === modified file 'doc/reference/tmpl/xkl_config_rec.sgml' |
3925 | --- doc/reference/tmpl/xkl_config_rec.sgml 2012-02-15 10:50:36 +0000 |
3926 | +++ doc/reference/tmpl/xkl_config_rec.sgml 2014-02-16 22:04:28 +0000 |
3927 | @@ -9,13 +9,11 @@ |
3928 | |
3929 | </para> |
3930 | |
3931 | - |
3932 | <!-- ##### SECTION See_Also ##### --> |
3933 | <para> |
3934 | |
3935 | </para> |
3936 | |
3937 | - |
3938 | <!-- ##### SECTION Stability_Level ##### --> |
3939 | |
3940 | |
3941 | |
3942 | === modified file 'doc/reference/tmpl/xkl_config_registry.sgml' |
3943 | --- doc/reference/tmpl/xkl_config_registry.sgml 2012-02-15 10:50:36 +0000 |
3944 | +++ doc/reference/tmpl/xkl_config_registry.sgml 2014-02-16 22:04:28 +0000 |
3945 | @@ -9,13 +9,11 @@ |
3946 | |
3947 | </para> |
3948 | |
3949 | - |
3950 | <!-- ##### SECTION See_Also ##### --> |
3951 | <para> |
3952 | |
3953 | </para> |
3954 | |
3955 | - |
3956 | <!-- ##### SECTION Stability_Level ##### --> |
3957 | |
3958 | |
3959 | |
3960 | === modified file 'doc/reference/tmpl/xkl_engine.sgml' |
3961 | --- doc/reference/tmpl/xkl_engine.sgml 2012-02-15 10:50:36 +0000 |
3962 | +++ doc/reference/tmpl/xkl_engine.sgml 2014-02-16 22:04:28 +0000 |
3963 | @@ -9,13 +9,11 @@ |
3964 | |
3965 | </para> |
3966 | |
3967 | - |
3968 | <!-- ##### SECTION See_Also ##### --> |
3969 | <para> |
3970 | |
3971 | </para> |
3972 | |
3973 | - |
3974 | <!-- ##### SECTION Stability_Level ##### --> |
3975 | |
3976 | |
3977 | |
3978 | === modified file 'doc/reference/tmpl/xkl_engine_marshal.sgml' |
3979 | --- doc/reference/tmpl/xkl_engine_marshal.sgml 2012-02-15 10:50:36 +0000 |
3980 | +++ doc/reference/tmpl/xkl_engine_marshal.sgml 2014-02-16 22:04:28 +0000 |
3981 | @@ -9,13 +9,11 @@ |
3982 | |
3983 | </para> |
3984 | |
3985 | - |
3986 | <!-- ##### SECTION See_Also ##### --> |
3987 | <para> |
3988 | |
3989 | </para> |
3990 | |
3991 | - |
3992 | <!-- ##### SECTION Stability_Level ##### --> |
3993 | |
3994 | |
3995 | |
3996 | === modified file 'doc/reference/tmpl/xklavier.sgml' |
3997 | --- doc/reference/tmpl/xklavier.sgml 2012-02-15 10:50:36 +0000 |
3998 | +++ doc/reference/tmpl/xklavier.sgml 2014-02-16 22:04:28 +0000 |
3999 | @@ -9,13 +9,11 @@ |
4000 | |
4001 | </para> |
4002 | |
4003 | - |
4004 | <!-- ##### SECTION See_Also ##### --> |
4005 | <para> |
4006 | |
4007 | </para> |
4008 | |
4009 | - |
4010 | <!-- ##### SECTION Stability_Level ##### --> |
4011 | |
4012 | |
4013 | |
4014 | === modified file 'doc/reference/tmpl/xklavier_private.sgml' |
4015 | --- doc/reference/tmpl/xklavier_private.sgml 2012-02-15 10:50:36 +0000 |
4016 | +++ doc/reference/tmpl/xklavier_private.sgml 2014-02-16 22:04:28 +0000 |
4017 | @@ -9,13 +9,11 @@ |
4018 | |
4019 | </para> |
4020 | |
4021 | - |
4022 | <!-- ##### SECTION See_Also ##### --> |
4023 | <para> |
4024 | |
4025 | </para> |
4026 | |
4027 | - |
4028 | <!-- ##### SECTION Stability_Level ##### --> |
4029 | |
4030 | |
4031 | |
4032 | === modified file 'doc/reference/tmpl/xklavier_private_xkb.sgml' |
4033 | --- doc/reference/tmpl/xklavier_private_xkb.sgml 2012-02-15 10:50:36 +0000 |
4034 | +++ doc/reference/tmpl/xklavier_private_xkb.sgml 2014-02-16 22:04:28 +0000 |
4035 | @@ -9,13 +9,11 @@ |
4036 | |
4037 | </para> |
4038 | |
4039 | - |
4040 | <!-- ##### SECTION See_Also ##### --> |
4041 | <para> |
4042 | |
4043 | </para> |
4044 | |
4045 | - |
4046 | <!-- ##### SECTION Stability_Level ##### --> |
4047 | |
4048 | |
4049 | |
4050 | === modified file 'doc/reference/tmpl/xklavier_private_xmm.sgml' |
4051 | --- doc/reference/tmpl/xklavier_private_xmm.sgml 2012-02-15 10:50:36 +0000 |
4052 | +++ doc/reference/tmpl/xklavier_private_xmm.sgml 2014-02-16 22:04:28 +0000 |
4053 | @@ -9,13 +9,11 @@ |
4054 | |
4055 | </para> |
4056 | |
4057 | - |
4058 | <!-- ##### SECTION See_Also ##### --> |
4059 | <para> |
4060 | |
4061 | </para> |
4062 | |
4063 | - |
4064 | <!-- ##### SECTION Stability_Level ##### --> |
4065 | |
4066 | |
4067 | |
4068 | === modified file 'libxklavier.spec' |
4069 | --- libxklavier.spec 2012-02-22 02:28:16 +0000 |
4070 | +++ libxklavier.spec 2014-02-16 22:04:28 +0000 |
4071 | @@ -1,6 +1,6 @@ |
4072 | Name: libxklavier |
4073 | Summary: libXklavier library |
4074 | -Version: 5.2.1 |
4075 | +Version: 5.3 |
4076 | Release: 1 |
4077 | License: LGPL |
4078 | Group: Development/Libraries |
4079 | |
4080 | === modified file 'libxklavier/Makefile.am' |
4081 | --- libxklavier/Makefile.am 2012-02-22 02:28:16 +0000 |
4082 | +++ libxklavier/Makefile.am 2014-02-16 22:04:28 +0000 |
4083 | @@ -27,6 +27,8 @@ |
4084 | xklavier_headers = xkl_engine.h xkl_config_item.h xkl_config_registry.h \ |
4085 | xkl_config_rec.h xkl_engine_marshal.h xklavier.h |
4086 | |
4087 | +BUILT_SOURCES = $(xklavier_built_headers) $(xklavier_built_cfiles) |
4088 | + |
4089 | xklavier_built_headers = xkl-enum-types.h |
4090 | xklavier_built_cfiles = xkl-enum-types.c |
4091 | xklavierincdir = $(includedir)/libxklavier |
4092 | @@ -45,13 +47,13 @@ |
4093 | |
4094 | EXTRA_DIST=marshal.list libxklavier.public |
4095 | |
4096 | -GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0` |
4097 | +GLIB_GENMARSHAL = `$(PKG_CONFIG) --variable=glib_genmarshal glib-2.0` |
4098 | |
4099 | xkl_engine_marshal.h: marshal.list |
4100 | - $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --header > xkl_engine_marshal.h |
4101 | + $(GLIB_GENMARSHAL) --prefix=xkl_engine $(srcdir)/marshal.list --header > xkl_engine_marshal.h |
4102 | |
4103 | xkl_engine_marshal.c: xkl_engine_marshal.h |
4104 | - $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --body > xkl_engine_marshal.c |
4105 | + $(GLIB_GENMARSHAL) --prefix=xkl_engine $(srcdir)/marshal.list --body > xkl_engine_marshal.c |
4106 | |
4107 | xkl-enum-types.h: stamp-xkl-enum-types.h |
4108 | @true |
4109 | @@ -79,7 +81,11 @@ |
4110 | && cp new-xkl-enum-types.c $(@F) \ |
4111 | && rm -f new-xkl-enum-types.c |
4112 | |
4113 | -DISTCLEANFILES=$(xklavier_built_headers) $(xklavier_built_cfiles) stamp-xkl-enum-types.h |
4114 | +DISTCLEANFILES=$(xklavier_built_headers) \ |
4115 | + $(xklavier_built_cfiles) \ |
4116 | + stamp-xkl-enum-types.h \ |
4117 | + xkl_engine_marshal.c \ |
4118 | + xkl_engine_marshal.h |
4119 | CLEANFILES= |
4120 | |
4121 | # build intospection typelib |
4122 | @@ -90,11 +96,11 @@ |
4123 | |
4124 | if HAVE_INTROSPECTION |
4125 | # avoid introspecting private headers |
4126 | -introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURCES)) |
4127 | +introspection_sources = $(xklavier_headers) $(xklavier_built_headers) $(filter %.c, $(libxklavier_la_SOURCES)) |
4128 | |
4129 | Xkl-1.0.gir: libxklavier.la |
4130 | Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 |
4131 | -Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) |
4132 | +Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) |
4133 | Xkl_1_0_gir_LIBS = libxklavier.la |
4134 | Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) |
4135 | INTROSPECTION_GIRS += Xkl-1.0.gir |
4136 | |
4137 | === modified file 'libxklavier/Makefile.in' |
4138 | --- libxklavier/Makefile.in 2012-02-22 02:28:16 +0000 |
4139 | +++ libxklavier/Makefile.in 2014-02-16 22:04:28 +0000 |
4140 | @@ -1,9 +1,9 @@ |
4141 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
4142 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
4143 | # @configure_input@ |
4144 | |
4145 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4146 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
4147 | -# Inc. |
4148 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4149 | +# Foundation, Inc. |
4150 | # This Makefile.in is free software; the Free Software Foundation |
4151 | # gives unlimited permission to copy and/or distribute it, |
4152 | # with or without modifications, as long as this notice is preserved. |
4153 | @@ -18,6 +18,23 @@ |
4154 | |
4155 | |
4156 | VPATH = @srcdir@ |
4157 | +am__make_dryrun = \ |
4158 | + { \ |
4159 | + am__dry=no; \ |
4160 | + case $$MAKEFLAGS in \ |
4161 | + *\\[\ \ ]*) \ |
4162 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4163 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4164 | + *) \ |
4165 | + for am__flg in $$MAKEFLAGS; do \ |
4166 | + case $$am__flg in \ |
4167 | + *=*|--*) ;; \ |
4168 | + *n*) am__dry=yes; break;; \ |
4169 | + esac; \ |
4170 | + done;; \ |
4171 | + esac; \ |
4172 | + test $$am__dry = yes; \ |
4173 | + } |
4174 | pkgdatadir = $(datadir)/@PACKAGE@ |
4175 | pkgincludedir = $(includedir)/@PACKAGE@ |
4176 | pkglibdir = $(libdir)/@PACKAGE@ |
4177 | @@ -79,6 +96,12 @@ |
4178 | am__base_list = \ |
4179 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
4180 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
4181 | +am__uninstall_files_from_dir = { \ |
4182 | + test -z "$$files" \ |
4183 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
4184 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
4185 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
4186 | + } |
4187 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ |
4188 | "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(xklavierincdir)" |
4189 | LTLIBRARIES = $(lib_LTLIBRARIES) |
4190 | @@ -98,8 +121,8 @@ |
4191 | xklavier_props.lo xklavier_dump.lo xkl_engine_marshal.lo \ |
4192 | $(am__objects_2) $(am__objects_3) |
4193 | libxklavier_la_OBJECTS = $(am_libxklavier_la_OBJECTS) |
4194 | -AM_V_lt = $(am__v_lt_$(V)) |
4195 | -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) |
4196 | +AM_V_lt = $(am__v_lt_@AM_V@) |
4197 | +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
4198 | am__v_lt_0 = --silent |
4199 | libxklavier_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
4200 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
4201 | @@ -115,24 +138,29 @@ |
4202 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ |
4203 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ |
4204 | $(AM_CFLAGS) $(CFLAGS) |
4205 | -AM_V_CC = $(am__v_CC_$(V)) |
4206 | -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) |
4207 | +AM_V_CC = $(am__v_CC_@AM_V@) |
4208 | +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
4209 | am__v_CC_0 = @echo " CC " $@; |
4210 | -AM_V_at = $(am__v_at_$(V)) |
4211 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
4212 | +AM_V_at = $(am__v_at_@AM_V@) |
4213 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
4214 | am__v_at_0 = @ |
4215 | CCLD = $(CC) |
4216 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
4217 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
4218 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
4219 | -AM_V_CCLD = $(am__v_CCLD_$(V)) |
4220 | -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) |
4221 | +AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
4222 | +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
4223 | am__v_CCLD_0 = @echo " CCLD " $@; |
4224 | -AM_V_GEN = $(am__v_GEN_$(V)) |
4225 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
4226 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
4227 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
4228 | am__v_GEN_0 = @echo " GEN " $@; |
4229 | SOURCES = $(libxklavier_la_SOURCES) |
4230 | DIST_SOURCES = $(libxklavier_la_SOURCES) |
4231 | +am__can_run_installinfo = \ |
4232 | + case $$AM_UPDATE_INFO_DIR in \ |
4233 | + n|no|NO) false;; \ |
4234 | + *) (install-info --version) >/dev/null 2>&1;; \ |
4235 | + esac |
4236 | DATA = $(gir_DATA) $(typelib_DATA) |
4237 | HEADERS = $(noinst_HEADERS) $(xklavierinc_HEADERS) |
4238 | ETAGS = etags |
4239 | @@ -316,6 +344,7 @@ |
4240 | xklavier_headers = xkl_engine.h xkl_config_item.h xkl_config_registry.h \ |
4241 | xkl_config_rec.h xkl_engine_marshal.h xklavier.h |
4242 | |
4243 | +BUILT_SOURCES = $(xklavier_built_headers) $(xklavier_built_cfiles) |
4244 | xklavier_built_headers = xkl-enum-types.h |
4245 | xklavier_built_cfiles = xkl-enum-types.c |
4246 | xklavierincdir = $(includedir)/libxklavier |
4247 | @@ -326,31 +355,37 @@ |
4248 | xklavier_util.c xklavier_props.c xklavier_dump.c xkl_engine_marshal.c \ |
4249 | $(noinst_HEADERS) $(xklavierinc_HEADERS) |
4250 | |
4251 | -libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined |
4252 | +libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined -export-symbols $(srcdir)/libxklavier.public |
4253 | libxklavier_la_LIBADD = \ |
4254 | $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \ |
4255 | $(LIBXKBFILE_PRESENT_LDFLAGS) \ |
4256 | $(X_LIBS) -lX11 $(LIBICONV) |
4257 | |
4258 | -EXTRA_DIST = marshal.list |
4259 | -GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0` |
4260 | -DISTCLEANFILES = $(xklavier_built_headers) $(xklavier_built_cfiles) stamp-xkl-enum-types.h |
4261 | +EXTRA_DIST = marshal.list libxklavier.public |
4262 | +GLIB_GENMARSHAL = `$(PKG_CONFIG) --variable=glib_genmarshal glib-2.0` |
4263 | +DISTCLEANFILES = $(xklavier_built_headers) \ |
4264 | + $(xklavier_built_cfiles) \ |
4265 | + stamp-xkl-enum-types.h \ |
4266 | + xkl_engine_marshal.c \ |
4267 | + xkl_engine_marshal.h |
4268 | + |
4269 | CLEANFILES = $(am__append_2) |
4270 | INTROSPECTION_GIRS = $(am__append_1) |
4271 | INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all |
4272 | INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) |
4273 | |
4274 | # avoid introspecting private headers |
4275 | -@HAVE_INTROSPECTION_TRUE@introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURCES)) |
4276 | +@HAVE_INTROSPECTION_TRUE@introspection_sources = $(xklavier_headers) $(xklavier_built_headers) $(filter %.c, $(libxklavier_la_SOURCES)) |
4277 | @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 |
4278 | -@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) |
4279 | +@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) |
4280 | @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_LIBS = libxklavier.la |
4281 | @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) |
4282 | @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 |
4283 | @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) |
4284 | @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 |
4285 | @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) |
4286 | -all: all-am |
4287 | +all: $(BUILT_SOURCES) |
4288 | + $(MAKE) $(AM_MAKEFLAGS) all-am |
4289 | |
4290 | .SUFFIXES: |
4291 | .SUFFIXES: .c .lo .o .obj |
4292 | @@ -386,7 +421,6 @@ |
4293 | $(am__aclocal_m4_deps): |
4294 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
4295 | @$(NORMAL_INSTALL) |
4296 | - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
4297 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
4298 | list2=; for p in $$list; do \ |
4299 | if test -f $$p; then \ |
4300 | @@ -394,6 +428,8 @@ |
4301 | else :; fi; \ |
4302 | done; \ |
4303 | test -z "$$list2" || { \ |
4304 | + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ |
4305 | + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ |
4306 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ |
4307 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ |
4308 | } |
4309 | @@ -415,7 +451,7 @@ |
4310 | echo "rm -f \"$${dir}/so_locations\""; \ |
4311 | rm -f "$${dir}/so_locations"; \ |
4312 | done |
4313 | -libxklavier.la: $(libxklavier_la_OBJECTS) $(libxklavier_la_DEPENDENCIES) |
4314 | +libxklavier.la: $(libxklavier_la_OBJECTS) $(libxklavier_la_DEPENDENCIES) $(EXTRA_libxklavier_la_DEPENDENCIES) |
4315 | $(AM_V_CCLD)$(libxklavier_la_LINK) -rpath $(libdir) $(libxklavier_la_OBJECTS) $(libxklavier_la_LIBADD) $(LIBS) |
4316 | |
4317 | mostlyclean-compile: |
4318 | @@ -445,26 +481,23 @@ |
4319 | .c.o: |
4320 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
4321 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
4322 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
4323 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
4324 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
4325 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
4326 | -@am__fastdepCC_FALSE@ $(COMPILE) -c $< |
4327 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< |
4328 | |
4329 | .c.obj: |
4330 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
4331 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
4332 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
4333 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
4334 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
4335 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
4336 | -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` |
4337 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` |
4338 | |
4339 | .c.lo: |
4340 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
4341 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
4342 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
4343 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
4344 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
4345 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
4346 | -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
4347 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
4348 | |
4349 | mostlyclean-libtool: |
4350 | -rm -f *.lo |
4351 | @@ -473,8 +506,11 @@ |
4352 | -rm -rf .libs _libs |
4353 | install-girDATA: $(gir_DATA) |
4354 | @$(NORMAL_INSTALL) |
4355 | - test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)" |
4356 | @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ |
4357 | + if test -n "$$list"; then \ |
4358 | + echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ |
4359 | + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ |
4360 | + fi; \ |
4361 | for p in $$list; do \ |
4362 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
4363 | echo "$$d$$p"; \ |
4364 | @@ -488,13 +524,14 @@ |
4365 | @$(NORMAL_UNINSTALL) |
4366 | @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ |
4367 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
4368 | - test -n "$$files" || exit 0; \ |
4369 | - echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \ |
4370 | - cd "$(DESTDIR)$(girdir)" && rm -f $$files |
4371 | + dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) |
4372 | install-typelibDATA: $(typelib_DATA) |
4373 | @$(NORMAL_INSTALL) |
4374 | - test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)" |
4375 | @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ |
4376 | + if test -n "$$list"; then \ |
4377 | + echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \ |
4378 | + $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \ |
4379 | + fi; \ |
4380 | for p in $$list; do \ |
4381 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
4382 | echo "$$d$$p"; \ |
4383 | @@ -508,13 +545,14 @@ |
4384 | @$(NORMAL_UNINSTALL) |
4385 | @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ |
4386 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
4387 | - test -n "$$files" || exit 0; \ |
4388 | - echo " ( cd '$(DESTDIR)$(typelibdir)' && rm -f" $$files ")"; \ |
4389 | - cd "$(DESTDIR)$(typelibdir)" && rm -f $$files |
4390 | + dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir) |
4391 | install-xklavierincHEADERS: $(xklavierinc_HEADERS) |
4392 | @$(NORMAL_INSTALL) |
4393 | - test -z "$(xklavierincdir)" || $(MKDIR_P) "$(DESTDIR)$(xklavierincdir)" |
4394 | @list='$(xklavierinc_HEADERS)'; test -n "$(xklavierincdir)" || list=; \ |
4395 | + if test -n "$$list"; then \ |
4396 | + echo " $(MKDIR_P) '$(DESTDIR)$(xklavierincdir)'"; \ |
4397 | + $(MKDIR_P) "$(DESTDIR)$(xklavierincdir)" || exit 1; \ |
4398 | + fi; \ |
4399 | for p in $$list; do \ |
4400 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
4401 | echo "$$d$$p"; \ |
4402 | @@ -528,9 +566,7 @@ |
4403 | @$(NORMAL_UNINSTALL) |
4404 | @list='$(xklavierinc_HEADERS)'; test -n "$(xklavierincdir)" || list=; \ |
4405 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
4406 | - test -n "$$files" || exit 0; \ |
4407 | - echo " ( cd '$(DESTDIR)$(xklavierincdir)' && rm -f" $$files ")"; \ |
4408 | - cd "$(DESTDIR)$(xklavierincdir)" && rm -f $$files |
4409 | + dir='$(DESTDIR)$(xklavierincdir)'; $(am__uninstall_files_from_dir) |
4410 | |
4411 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
4412 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
4413 | @@ -615,13 +651,15 @@ |
4414 | fi; \ |
4415 | done |
4416 | check-am: all-am |
4417 | -check: check-am |
4418 | +check: $(BUILT_SOURCES) |
4419 | + $(MAKE) $(AM_MAKEFLAGS) check-am |
4420 | all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) |
4421 | installdirs: |
4422 | for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(xklavierincdir)"; do \ |
4423 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
4424 | done |
4425 | -install: install-am |
4426 | +install: $(BUILT_SOURCES) |
4427 | + $(MAKE) $(AM_MAKEFLAGS) install-am |
4428 | install-exec: install-exec-am |
4429 | install-data: install-data-am |
4430 | uninstall: uninstall-am |
4431 | @@ -631,10 +669,15 @@ |
4432 | |
4433 | installcheck: installcheck-am |
4434 | install-strip: |
4435 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4436 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4437 | - `test -z '$(STRIP)' || \ |
4438 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
4439 | + if test -z '$(STRIP)'; then \ |
4440 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4441 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4442 | + install; \ |
4443 | + else \ |
4444 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4445 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4446 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
4447 | + fi |
4448 | mostlyclean-generic: |
4449 | |
4450 | clean-generic: |
4451 | @@ -648,6 +691,7 @@ |
4452 | maintainer-clean-generic: |
4453 | @echo "This command is intended for maintainers to use" |
4454 | @echo "it deletes files that may require special tools to rebuild." |
4455 | + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) |
4456 | clean: clean-am |
4457 | |
4458 | clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ |
4459 | @@ -721,7 +765,7 @@ |
4460 | uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ |
4461 | uninstall-typelibDATA uninstall-xklavierincHEADERS |
4462 | |
4463 | -.MAKE: install-am install-strip |
4464 | +.MAKE: all check install install-am install-strip |
4465 | |
4466 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ |
4467 | clean-libLTLIBRARIES clean-libtool ctags distclean \ |
4468 | @@ -741,10 +785,10 @@ |
4469 | |
4470 | |
4471 | xkl_engine_marshal.h: marshal.list |
4472 | - $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --header > xkl_engine_marshal.h |
4473 | + $(GLIB_GENMARSHAL) --prefix=xkl_engine $(srcdir)/marshal.list --header > xkl_engine_marshal.h |
4474 | |
4475 | xkl_engine_marshal.c: xkl_engine_marshal.h |
4476 | - $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --body > xkl_engine_marshal.c |
4477 | + $(GLIB_GENMARSHAL) --prefix=xkl_engine $(srcdir)/marshal.list --body > xkl_engine_marshal.c |
4478 | |
4479 | xkl-enum-types.h: stamp-xkl-enum-types.h |
4480 | @true |
4481 | |
4482 | === modified file 'libxklavier/libxklavier.public' |
4483 | --- libxklavier/libxklavier.public 2012-02-22 02:28:16 +0000 |
4484 | +++ libxklavier/libxklavier.public 2014-02-16 22:04:28 +0000 |
4485 | @@ -16,6 +16,7 @@ |
4486 | xkl_config_rec_set_options |
4487 | xkl_config_rec_set_to_root_window_property |
4488 | xkl_config_rec_set_variants |
4489 | +xkl_config_rec_set_model |
4490 | xkl_config_rec_write_to_file |
4491 | xkl_config_registry_find_layout |
4492 | xkl_config_registry_find_model |
4493 | |
4494 | === modified file 'libxklavier/marshal.list' |
4495 | --- libxklavier/marshal.list 2006-07-10 11:18:50 +0000 |
4496 | +++ libxklavier/marshal.list 2014-02-16 22:04:28 +0000 |
4497 | @@ -1,3 +1,3 @@ |
4498 | VOID:VOID |
4499 | INT:LONG,LONG |
4500 | -VOID:FLAGS,INT,BOOLEAN |
4501 | +VOID:ENUM,INT,BOOLEAN |
4502 | |
4503 | === modified file 'libxklavier/xkl_config_rec.h' |
4504 | --- libxklavier/xkl_config_rec.h 2012-02-15 10:50:36 +0000 |
4505 | +++ libxklavier/xkl_config_rec.h 2014-02-16 22:04:28 +0000 |
4506 | @@ -281,6 +281,19 @@ |
4507 | extern void xkl_config_rec_set_options(XklConfigRec * data, |
4508 | const gchar ** new_options); |
4509 | |
4510 | +/** |
4511 | + * xkl_config_rec_set_model: |
4512 | + * @data: record to change |
4513 | + * @new_model: (transfer none): new keyboard name. |
4514 | + * |
4515 | + * Sets a new model. |
4516 | + * |
4517 | + * Frees the previous model. This is primarily useful for bindings, in C |
4518 | + * you can manipulate the @model record member directly. |
4519 | + */ |
4520 | + extern void xkl_config_rec_set_model(XklConfigRec * data, |
4521 | + const gchar * new_model); |
4522 | + |
4523 | #ifdef __cplusplus |
4524 | } |
4525 | #endif /* __cplusplus */ |
4526 | |
4527 | === modified file 'libxklavier/xkl_engine.h' |
4528 | --- libxklavier/xkl_engine.h 2012-02-15 10:50:36 +0000 |
4529 | +++ libxklavier/xkl_engine.h 2014-02-16 22:04:28 +0000 |
4530 | @@ -59,7 +59,7 @@ |
4531 | * xkl_start_listen(engine,XKLL_MANAGE_LAYOUTS); |
4532 | * @XKLF_DEVICE_DISCOVERY: Backend supports device discovery, can notify |
4533 | */ |
4534 | - typedef enum { |
4535 | + typedef enum { /*< flags >*/ |
4536 | XKLF_CAN_TOGGLE_INDICATORS = 1 << 0, |
4537 | XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 1 << 1, |
4538 | XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 1 << 2, |
4539 | @@ -297,7 +297,7 @@ |
4540 | /** |
4541 | * xkl_engine_filter_events: |
4542 | * @engine: the engine |
4543 | - * @evt: delivered X event |
4544 | + * @evt: (skip): delivered X event |
4545 | * |
4546 | * Processes X events. Should be included into the main event cycle of an |
4547 | * application. One of the most important functions. |
4548 | |
4549 | === modified file 'libxklavier/xkl_engine_marshal.c' |
4550 | --- libxklavier/xkl_engine_marshal.c 2011-02-25 10:23:49 +0000 |
4551 | +++ libxklavier/xkl_engine_marshal.c 2014-02-16 22:04:28 +0000 |
4552 | @@ -4,7 +4,7 @@ |
4553 | |
4554 | #ifdef G_ENABLE_DEBUG |
4555 | #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) |
4556 | -#define g_marshal_value_peek_char(v) g_value_get_char (v) |
4557 | +#define g_marshal_value_peek_char(v) g_value_get_schar (v) |
4558 | #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) |
4559 | #define g_marshal_value_peek_int(v) g_value_get_int (v) |
4560 | #define g_marshal_value_peek_uint(v) g_value_get_uint (v) |
4561 | @@ -49,9 +49,9 @@ |
4562 | #endif /* !G_ENABLE_DEBUG */ |
4563 | |
4564 | |
4565 | -/* VOID:VOID (marshal.list:1) */ |
4566 | +/* VOID:VOID (./marshal.list:1) */ |
4567 | |
4568 | -/* INT:LONG,LONG (marshal.list:2) */ |
4569 | +/* INT:LONG,LONG (./marshal.list:2) */ |
4570 | void |
4571 | xkl_engine_INT__LONG_LONG (GClosure *closure, |
4572 | GValue *return_value G_GNUC_UNUSED, |
4573 | @@ -92,21 +92,21 @@ |
4574 | g_value_set_int (return_value, v_return); |
4575 | } |
4576 | |
4577 | -/* VOID:FLAGS,INT,BOOLEAN (marshal.list:3) */ |
4578 | +/* VOID:ENUM,INT,BOOLEAN (./marshal.list:3) */ |
4579 | void |
4580 | -xkl_engine_VOID__FLAGS_INT_BOOLEAN (GClosure *closure, |
4581 | - GValue *return_value G_GNUC_UNUSED, |
4582 | - guint n_param_values, |
4583 | - const GValue *param_values, |
4584 | - gpointer invocation_hint G_GNUC_UNUSED, |
4585 | - gpointer marshal_data) |
4586 | +xkl_engine_VOID__ENUM_INT_BOOLEAN (GClosure *closure, |
4587 | + GValue *return_value G_GNUC_UNUSED, |
4588 | + guint n_param_values, |
4589 | + const GValue *param_values, |
4590 | + gpointer invocation_hint G_GNUC_UNUSED, |
4591 | + gpointer marshal_data) |
4592 | { |
4593 | - typedef void (*GMarshalFunc_VOID__FLAGS_INT_BOOLEAN) (gpointer data1, |
4594 | - guint arg_1, |
4595 | - gint arg_2, |
4596 | - gboolean arg_3, |
4597 | - gpointer data2); |
4598 | - register GMarshalFunc_VOID__FLAGS_INT_BOOLEAN callback; |
4599 | + typedef void (*GMarshalFunc_VOID__ENUM_INT_BOOLEAN) (gpointer data1, |
4600 | + gint arg_1, |
4601 | + gint arg_2, |
4602 | + gboolean arg_3, |
4603 | + gpointer data2); |
4604 | + register GMarshalFunc_VOID__ENUM_INT_BOOLEAN callback; |
4605 | register GCClosure *cc = (GCClosure*) closure; |
4606 | register gpointer data1, data2; |
4607 | |
4608 | @@ -122,10 +122,10 @@ |
4609 | data1 = g_value_peek_pointer (param_values + 0); |
4610 | data2 = closure->data; |
4611 | } |
4612 | - callback = (GMarshalFunc_VOID__FLAGS_INT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); |
4613 | + callback = (GMarshalFunc_VOID__ENUM_INT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); |
4614 | |
4615 | callback (data1, |
4616 | - g_marshal_value_peek_flags (param_values + 1), |
4617 | + g_marshal_value_peek_enum (param_values + 1), |
4618 | g_marshal_value_peek_int (param_values + 2), |
4619 | g_marshal_value_peek_boolean (param_values + 3), |
4620 | data2); |
4621 | |
4622 | === modified file 'libxklavier/xkl_engine_marshal.h' |
4623 | --- libxklavier/xkl_engine_marshal.h 2011-02-25 10:23:49 +0000 |
4624 | +++ libxklavier/xkl_engine_marshal.h 2014-02-16 22:04:28 +0000 |
4625 | @@ -6,10 +6,10 @@ |
4626 | |
4627 | G_BEGIN_DECLS |
4628 | |
4629 | -/* VOID:VOID (marshal.list:1) */ |
4630 | +/* VOID:VOID (./marshal.list:1) */ |
4631 | #define xkl_engine_VOID__VOID g_cclosure_marshal_VOID__VOID |
4632 | |
4633 | -/* INT:LONG,LONG (marshal.list:2) */ |
4634 | +/* INT:LONG,LONG (./marshal.list:2) */ |
4635 | extern void xkl_engine_INT__LONG_LONG (GClosure *closure, |
4636 | GValue *return_value, |
4637 | guint n_param_values, |
4638 | @@ -17,13 +17,13 @@ |
4639 | gpointer invocation_hint, |
4640 | gpointer marshal_data); |
4641 | |
4642 | -/* VOID:FLAGS,INT,BOOLEAN (marshal.list:3) */ |
4643 | -extern void xkl_engine_VOID__FLAGS_INT_BOOLEAN (GClosure *closure, |
4644 | - GValue *return_value, |
4645 | - guint n_param_values, |
4646 | - const GValue *param_values, |
4647 | - gpointer invocation_hint, |
4648 | - gpointer marshal_data); |
4649 | +/* VOID:ENUM,INT,BOOLEAN (./marshal.list:3) */ |
4650 | +extern void xkl_engine_VOID__ENUM_INT_BOOLEAN (GClosure *closure, |
4651 | + GValue *return_value, |
4652 | + guint n_param_values, |
4653 | + const GValue *param_values, |
4654 | + gpointer invocation_hint, |
4655 | + gpointer marshal_data); |
4656 | |
4657 | G_END_DECLS |
4658 | |
4659 | |
4660 | === modified file 'libxklavier/xklavier.c' |
4661 | --- libxklavier/xklavier.c 2012-02-15 10:50:36 +0000 |
4662 | +++ libxklavier/xklavier.c 2014-02-16 22:04:28 +0000 |
4663 | @@ -649,9 +649,7 @@ |
4664 | |
4665 | { |
4666 | /* Invoke parent constructor. */ |
4667 | - XklEngineClass *klass; |
4668 | - klass = |
4669 | - XKL_ENGINE_CLASS(g_type_class_peek(XKL_TYPE_ENGINE)); |
4670 | + g_type_class_peek(XKL_TYPE_ENGINE); |
4671 | obj = |
4672 | parent_class->constructor(type, n_construct_properties, |
4673 | construct_properties); |
4674 | @@ -806,12 +804,6 @@ |
4675 | static void |
4676 | xkl_engine_class_init(XklEngineClass * klass) |
4677 | { |
4678 | - static GEnumValue state_change_values[] = { |
4679 | - {GROUP_CHANGED, "GROUP_CHANGED", NULL}, |
4680 | - {INDICATORS_CHANGED, "INDICATORS_CHANGED", NULL}, |
4681 | - {0, NULL, NULL} |
4682 | - }; |
4683 | - |
4684 | GObjectClass *object_class; |
4685 | GParamSpec *display_param_spec; |
4686 | GParamSpec *backend_name_param_spec; |
4687 | @@ -821,7 +813,6 @@ |
4688 | GParamSpec *default_group_param_spec; |
4689 | GParamSpec *secondary_groups_mask_param_spec; |
4690 | GParamSpec *indicators_handling_param_spec; |
4691 | - GType state_change_type; |
4692 | |
4693 | const gchar *sdl; |
4694 | |
4695 | @@ -845,10 +836,6 @@ |
4696 | NULL, |
4697 | G_PARAM_READABLE); |
4698 | |
4699 | - state_change_type = |
4700 | - g_enum_register_static("XklEngineStateChangeType", |
4701 | - state_change_values); |
4702 | - |
4703 | features_param_spec = g_param_spec_flags("features", |
4704 | "Features", |
4705 | "Backend features", |
4706 | @@ -925,8 +912,8 @@ |
4707 | G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(XklEngineClass, |
4708 | state_notify), |
4709 | NULL, NULL, |
4710 | - xkl_engine_VOID__FLAGS_INT_BOOLEAN, |
4711 | - G_TYPE_NONE, 3, state_change_type, G_TYPE_INT, |
4712 | + xkl_engine_VOID__ENUM_INT_BOOLEAN, |
4713 | + G_TYPE_NONE, 3, XKL_TYPE_ENGINE_STATE_CHANGE, G_TYPE_INT, |
4714 | G_TYPE_BOOLEAN); |
4715 | |
4716 | /* static stuff initialized */ |
4717 | |
4718 | === modified file 'libxklavier/xklavier_config.c' |
4719 | --- libxklavier/xklavier_config.c 2012-02-15 10:50:36 +0000 |
4720 | +++ libxklavier/xklavier_config.c 2014-02-16 22:04:28 +0000 |
4721 | @@ -1062,10 +1062,7 @@ |
4722 | XklConfigRegistry *config; |
4723 | XklEngine *engine; { |
4724 | /* Invoke parent constructor. */ |
4725 | - XklConfigRegistryClass *klass; |
4726 | - klass = |
4727 | - XKL_CONFIG_REGISTRY_CLASS(g_type_class_peek |
4728 | - (XKL_TYPE_CONFIG_REGISTRY)); |
4729 | + g_type_class_peek(XKL_TYPE_CONFIG_REGISTRY); |
4730 | obj = |
4731 | parent_class->constructor(type, |
4732 | n_construct_properties, |
4733 | |
4734 | === modified file 'libxklavier/xklavier_config_xkb.c' |
4735 | --- libxklavier/xklavier_config_xkb.c 2012-03-21 14:32:39 +0000 |
4736 | +++ libxklavier/xklavier_config_xkb.c 2014-02-16 22:04:28 +0000 |
4737 | @@ -286,7 +286,7 @@ |
4738 | |
4739 | XSync(display, False); |
4740 | /* From this point, ALL errors should be intercepted only by libxklavier */ |
4741 | - xkl_engine_priv(engine, criticalSection) = TRUE; |
4742 | + xkl_engine_priv(engine, critical_section) = TRUE; |
4743 | |
4744 | cpid = fork(); |
4745 | switch (cpid) { |
4746 | @@ -401,7 +401,7 @@ |
4747 | } |
4748 | XSync(display, False); |
4749 | /* Return to normal X error processing */ |
4750 | - xkl_engine_priv(engine, criticalSection) = FALSE; |
4751 | + xkl_engine_priv(engine, critical_section) = FALSE; |
4752 | |
4753 | xkl_debug(160, |
4754 | "Unlinking the temporary xkb file %s\n", |
4755 | |
4756 | === modified file 'libxklavier/xklavier_evt.c' |
4757 | --- libxklavier/xklavier_evt.c 2011-05-17 10:32:55 +0000 |
4758 | +++ libxklavier/xklavier_evt.c 2014-02-16 22:04:28 +0000 |
4759 | @@ -498,6 +498,7 @@ |
4760 | case BadAccess: |
4761 | case BadDrawable: |
4762 | case BadWindow: |
4763 | + case BadMatch: |
4764 | { |
4765 | XGetErrorText(evt->display, evt->error_code, buf, |
4766 | sizeof(buf)); |
4767 | @@ -536,7 +537,7 @@ |
4768 | (int) evt->error_code, buf, |
4769 | (int) evt->request_code, (int) evt->minor_code); |
4770 | if (engine != NULL) |
4771 | - if (!xkl_engine_priv(engine, criticalSection)) |
4772 | + if (!xkl_engine_priv(engine, critical_section)) |
4773 | (*xkl_engine_priv |
4774 | (engine, default_error_handler)) |
4775 | (dpy, evt); |
4776 | |
4777 | === modified file 'libxklavier/xklavier_private.h' |
4778 | --- libxklavier/xklavier_private.h 2012-02-15 10:50:36 +0000 |
4779 | +++ libxklavier/xklavier_private.h 2014-02-16 22:04:28 +0000 |
4780 | @@ -77,7 +77,7 @@ |
4781 | |
4782 | XklState curr_state; |
4783 | |
4784 | - gboolean criticalSection; |
4785 | + gboolean critical_section; |
4786 | |
4787 | Atom atoms[TOTAL_ATOMS]; |
4788 | |
4789 | |
4790 | === modified file 'libxklavier/xklavier_props.c' |
4791 | --- libxklavier/xklavier_props.c 2012-02-15 10:50:36 +0000 |
4792 | +++ libxklavier/xklavier_props.c 2014-02-16 22:04:28 +0000 |
4793 | @@ -215,6 +215,14 @@ |
4794 | } |
4795 | |
4796 | void |
4797 | +xkl_config_rec_set_model(XklConfigRec * data, |
4798 | + const gchar * new_model) |
4799 | +{ |
4800 | + g_free (data->model); |
4801 | + data->model = g_strdup (new_model); |
4802 | +} |
4803 | + |
4804 | +void |
4805 | xkl_config_rec_init(XklConfigRec * data) |
4806 | { |
4807 | /* clear the structure VarDefsPtr... */ |
4808 | @@ -453,7 +461,7 @@ |
4809 | gchar * rules_file, |
4810 | XklEngine * engine) |
4811 | { |
4812 | - gint len, rv; |
4813 | + gint len; |
4814 | gchar *pval; |
4815 | gchar *next; |
4816 | gchar *all_layouts = xkl_config_rec_merge_layouts(data); |
4817 | @@ -529,7 +537,7 @@ |
4818 | } |
4819 | |
4820 | display = xkl_engine_get_display(engine); |
4821 | - rv = XChangeProperty(display, xkl_engine_priv(engine, root_window), |
4822 | + XChangeProperty(display, xkl_engine_priv(engine, root_window), |
4823 | rules_atom, XA_STRING, 8, PropModeReplace, |
4824 | (unsigned char *) pval, len); |
4825 | XSync(display, False); |
4826 | @@ -537,8 +545,8 @@ |
4827 | for (i = len - 1; --i >= 0;) |
4828 | if (pval[i] == '\0') |
4829 | pval[i] = '?'; |
4830 | - XklDebug(150, "Stored [%s] of length %d to [%s] of %X: %d\n", pval, |
4831 | - len, propName, _xklRootWindow, rv); |
4832 | + XklDebug(150, "Stored [%s] of length %d to [%s] of %X\n", pval, |
4833 | + len, propName, _xklRootWindow); |
4834 | #endif |
4835 | if (all_layouts != NULL) |
4836 | g_free(all_layouts); |
4837 | |
4838 | === modified file 'm4/libtool.m4' |
4839 | --- m4/libtool.m4 2012-02-15 10:50:36 +0000 |
4840 | +++ m4/libtool.m4 2014-02-16 22:04:28 +0000 |
4841 | @@ -1,8 +1,8 @@ |
4842 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
4843 | # |
4844 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
4845 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
4846 | -# Inc. |
4847 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4848 | +# Foundation, Inc. |
4849 | # Written by Gordon Matzigkeit, 1996 |
4850 | # |
4851 | # This file is free software; the Free Software Foundation gives |
4852 | @@ -11,8 +11,8 @@ |
4853 | |
4854 | m4_define([_LT_COPYING], [dnl |
4855 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
4856 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
4857 | -# Inc. |
4858 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4859 | +# Foundation, Inc. |
4860 | # Written by Gordon Matzigkeit, 1996 |
4861 | # |
4862 | # This file is part of GNU Libtool. |
4863 | @@ -146,6 +146,8 @@ |
4864 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
4865 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
4866 | |
4867 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
4868 | +dnl |
4869 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
4870 | _LT_DECL([], [host], [0])dnl |
4871 | _LT_DECL([], [host_os], [0])dnl |
4872 | @@ -637,7 +639,7 @@ |
4873 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
4874 | configured by $[0], generated by m4_PACKAGE_STRING. |
4875 | |
4876 | -Copyright (C) 2010 Free Software Foundation, Inc. |
4877 | +Copyright (C) 2011 Free Software Foundation, Inc. |
4878 | This config.lt script is free software; the Free Software Foundation |
4879 | gives unlimited permision to copy, distribute and modify it." |
4880 | |
4881 | @@ -801,6 +803,7 @@ |
4882 | m4_case([$1], |
4883 | [C], [_LT_LANG(C)], |
4884 | [C++], [_LT_LANG(CXX)], |
4885 | + [Go], [_LT_LANG(GO)], |
4886 | [Java], [_LT_LANG(GCJ)], |
4887 | [Fortran 77], [_LT_LANG(F77)], |
4888 | [Fortran], [_LT_LANG(FC)], |
4889 | @@ -822,6 +825,31 @@ |
4890 | ])# _LT_LANG |
4891 | |
4892 | |
4893 | +m4_ifndef([AC_PROG_GO], [ |
4894 | +############################################################ |
4895 | +# NOTE: This macro has been submitted for inclusion into # |
4896 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
4897 | +# a released version of Autoconf we should remove this # |
4898 | +# macro and use it instead. # |
4899 | +############################################################ |
4900 | +m4_defun([AC_PROG_GO], |
4901 | +[AC_LANG_PUSH(Go)dnl |
4902 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
4903 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
4904 | +_AC_ARG_VAR_LDFLAGS()dnl |
4905 | +AC_CHECK_TOOL(GOC, gccgo) |
4906 | +if test -z "$GOC"; then |
4907 | + if test -n "$ac_tool_prefix"; then |
4908 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
4909 | + fi |
4910 | +fi |
4911 | +if test -z "$GOC"; then |
4912 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
4913 | +fi |
4914 | +])#m4_defun |
4915 | +])#m4_ifndef |
4916 | + |
4917 | + |
4918 | # _LT_LANG_DEFAULT_CONFIG |
4919 | # ----------------------- |
4920 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
4921 | @@ -852,6 +880,10 @@ |
4922 | m4_ifdef([LT_PROG_GCJ], |
4923 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
4924 | |
4925 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
4926 | + [LT_LANG(GO)], |
4927 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
4928 | + |
4929 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
4930 | [LT_LANG(RC)], |
4931 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
4932 | @@ -954,7 +986,13 @@ |
4933 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
4934 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
4935 | _lt_result=$? |
4936 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
4937 | + # If there is a non-empty error log, and "single_module" |
4938 | + # appears in it, assume the flag caused a linker warning |
4939 | + if test -s conftest.err && $GREP single_module conftest.err; then |
4940 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
4941 | + # Otherwise, if the output was created with a 0 exit code from |
4942 | + # the compiler, it worked. |
4943 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
4944 | lt_cv_apple_cc_single_mod=yes |
4945 | else |
4946 | cat conftest.err >&AS_MESSAGE_LOG_FD |
4947 | @@ -962,6 +1000,7 @@ |
4948 | rm -rf libconftest.dylib* |
4949 | rm -f conftest.* |
4950 | fi]) |
4951 | + |
4952 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
4953 | [lt_cv_ld_exported_symbols_list], |
4954 | [lt_cv_ld_exported_symbols_list=no |
4955 | @@ -973,6 +1012,7 @@ |
4956 | [lt_cv_ld_exported_symbols_list=no]) |
4957 | LDFLAGS="$save_LDFLAGS" |
4958 | ]) |
4959 | + |
4960 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
4961 | [lt_cv_ld_force_load=no |
4962 | cat > conftest.c << _LT_EOF |
4963 | @@ -990,7 +1030,9 @@ |
4964 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
4965 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
4966 | _lt_result=$? |
4967 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
4968 | + if test -s conftest.err && $GREP force_load conftest.err; then |
4969 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
4970 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
4971 | lt_cv_ld_force_load=yes |
4972 | else |
4973 | cat conftest.err >&AS_MESSAGE_LOG_FD |
4974 | @@ -1035,8 +1077,8 @@ |
4975 | ]) |
4976 | |
4977 | |
4978 | -# _LT_DARWIN_LINKER_FEATURES |
4979 | -# -------------------------- |
4980 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
4981 | +# --------------------------------- |
4982 | # Checks for linker and compiler features on darwin |
4983 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
4984 | [ |
4985 | @@ -1047,6 +1089,8 @@ |
4986 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4987 | if test "$lt_cv_ld_force_load" = "yes"; then |
4988 | _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
4989 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
4990 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
4991 | else |
4992 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
4993 | fi |
4994 | @@ -1330,14 +1374,27 @@ |
4995 | CFLAGS="$SAVE_CFLAGS" |
4996 | fi |
4997 | ;; |
4998 | -sparc*-*solaris*) |
4999 | +*-*solaris*) |
5000 | # Find out which ABI we are using. |
The diff has been truncated for viewing.
Thanks. Uploaded.