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