Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-power/upstream into lp:~ubuntu-desktop/indicator-power/ubuntu
- Precise (12.04)
- upstream
- Merge into ubuntu
Proposed by
Ted Gould
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 93 | ||||||||||||||||
Proposed branch: | lp:~indicator-applet-developers/ubuntu/precise/indicator-power/upstream | ||||||||||||||||
Merge into: | lp:~ubuntu-desktop/indicator-power/ubuntu | ||||||||||||||||
Diff against target: |
5267 lines (+2298/-614) 24 files modified
AUTHORS (+3/-0) ChangeLog (+124/-0) Makefile.am (+41/-18) Makefile.in (+148/-92) aclocal.m4 (+79/-29) build-aux/compile (+183/-16) build-aux/depcomp (+66/-8) build-aux/install-sh (+18/-11) build-aux/ltmain.sh (+57/-38) build-aux/missing (+4/-49) configure (+479/-104) configure.ac (+13/-1) data/Makefile.am (+17/-0) data/Makefile.in (+442/-0) data/com.canonical.indicator.power.gschema.xml (+11/-1) data/com.canonical.indicator.power.gschema.xml.in (+11/-1) debian/changelog (+8/-0) m4/gcov.m4 (+83/-0) m4/intltool.m4 (+40/-21) m4/libtool.m4 (+207/-57) m4/ltoptions.m4 (+17/-2) m4/ltversion.m4 (+5/-5) po/Makefile.in.in (+9/-4) src/indicator-power.c (+233/-157) |
||||||||||||||||
To merge this branch: | bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-power/upstream | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Pending | ||
Review via email: mp+93095@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'AUTHORS' | |||
2 | --- AUTHORS 2011-09-23 17:03:11 +0000 | |||
3 | +++ AUTHORS 2012-02-14 22:32:23 +0000 | |||
4 | @@ -1,9 +1,12 @@ | |||
5 | 1 | # Generated by Makefile. Do not edit. | 1 | # Generated by Makefile. Do not edit. |
6 | 2 | 2 | ||
7 | 3 | Allan LeSage | ||
8 | 4 | Charles Kerr | ||
9 | 3 | Gabor Kelemen | 5 | Gabor Kelemen |
10 | 4 | Javier Jardon | 6 | Javier Jardon |
11 | 5 | Javier Jardón | 7 | Javier Jardón |
12 | 6 | Ken VanDine | 8 | Ken VanDine |
13 | 7 | ken.vandine@canonical.com | 9 | ken.vandine@canonical.com |
14 | 10 | Marco Trevisan (Treviño) | ||
15 | 8 | Michael Terry | 11 | Michael Terry |
16 | 9 | Ted Gould | 12 | Ted Gould |
17 | 10 | 13 | ||
18 | === modified file 'ChangeLog' | |||
19 | --- ChangeLog 2011-10-24 15:07:53 +0000 | |||
20 | +++ ChangeLog 2012-02-14 22:32:23 +0000 | |||
21 | @@ -1,5 +1,129 @@ | |||
22 | 1 | # Generated by Makefile. Do not edit. | 1 | # Generated by Makefile. Do not edit. |
23 | 2 | 2 | ||
24 | 3 | 2012-02-14 Ted Gould <ted@gould.cx> | ||
25 | 4 | |||
26 | 5 | 1.90 | ||
27 | 6 | |||
28 | 7 | 2012-02-14 Ted Gould <ted@gould.cx> | ||
29 | 8 | |||
30 | 9 | Fixing distcheck | ||
31 | 10 | |||
32 | 11 | 2012-02-14 Ted Gould <ted@gould.cx> | ||
33 | 12 | |||
34 | 13 | Make data have it's own makefile so the GSettings rules work properly on distcheck | ||
35 | 14 | |||
36 | 15 | 2012-02-14 Ted Gould <ted@gould.cx> | ||
37 | 16 | |||
38 | 17 | Style and performance fixes | ||
39 | 18 | |||
40 | 19 | 2012-02-14 Javier Jardón <javier.jardon@codethink.co.uk> | ||
41 | 20 | |||
42 | 21 | Use G_GNUC_CONST for indicator_power_get_type() to improve performance | ||
43 | 22 | |||
44 | 23 | 2012-02-14 Javier Jardón <javier.jardon@codethink.co.uk> | ||
45 | 24 | |||
46 | 25 | Code style fixes | ||
47 | 26 | |||
48 | 27 | 2012-02-13 Charles Kerr <charles.kerr@canonical.com> | ||
49 | 28 | |||
50 | 29 | add icon-policy from branch lp:~charlesk/indicator-power/icon-policy | ||
51 | 30 | |||
52 | 31 | 2012-02-13 Charles Kerr <charles.kerr@canonical.com> | ||
53 | 32 | |||
54 | 33 | ensure that we don't have a reference to the proxy or proxy_cancel fields in indicator_power_dispose(). | ||
55 | 34 | |||
56 | 35 | 2012-02-13 Charles Kerr <charles.kerr@canonical.com> | ||
57 | 36 | |||
58 | 37 | move POWER_INDICATOR_ICON_POLICY_* enum to the top of the file | ||
59 | 38 | |||
60 | 39 | 2012-02-13 Charles Kerr <charles.kerr@canonical.com> | ||
61 | 40 | |||
62 | 41 | remove unncessary private field 'visible' | ||
63 | 42 | |||
64 | 43 | 2012-02-13 Charles Kerr <charles.kerr@canonical.com> | ||
65 | 44 | |||
66 | 45 | consistent use of ICON_POLICY_KEY | ||
67 | 46 | |||
68 | 47 | 2012-02-13 Charles Kerr <charles.kerr@canonical.com> | ||
69 | 48 | |||
70 | 49 | remove unnecessary G_OBJECT() cast | ||
71 | 50 | |||
72 | 51 | 2012-02-13 Charles Kerr <charles.kerr@canonical.com> | ||
73 | 52 | |||
74 | 53 | make prototypes for update_visibility() and should_be_visible() align with the neighboring forward declarations | ||
75 | 54 | |||
76 | 55 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
77 | 56 | |||
78 | 57 | add support for icon-policy setting | ||
79 | 58 | |||
80 | 59 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
81 | 60 | |||
82 | 61 | create the menu at init time s.t. we don't have to keep checking to see if it exists | ||
83 | 62 | |||
84 | 63 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
85 | 64 | |||
86 | 65 | use g_settings_bind() for the show-time checkbox | ||
87 | 66 | |||
88 | 67 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
89 | 68 | |||
90 | 69 | better error reporting if g_spawn_command_line_async() fails | ||
91 | 70 | |||
92 | 71 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
93 | 72 | |||
94 | 73 | remove redundant #include of glib.h | ||
95 | 74 | |||
96 | 75 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
97 | 76 | |||
98 | 77 | use g_clear_object() on the proxy_cancel field | ||
99 | 78 | |||
100 | 79 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
101 | 80 | |||
102 | 81 | remove unnecessary Priv struct -- the =entire class= is private | ||
103 | 82 | |||
104 | 83 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
105 | 84 | |||
106 | 85 | remove unused struct names | ||
107 | 86 | |||
108 | 87 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
109 | 88 | |||
110 | 89 | group the indicator_power lifecycle funcs together | ||
111 | 90 | |||
112 | 91 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
113 | 92 | |||
114 | 93 | unref+clear Priv's variant fields in _dispose() | ||
115 | 94 | |||
116 | 95 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
117 | 96 | |||
118 | 97 | don't leak priv->settings | ||
119 | 98 | |||
120 | 99 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
121 | 100 | |||
122 | 101 | don't leak priv->accessible_desc | ||
123 | 102 | |||
124 | 103 | 2012-02-01 Charles Kerr <charles.kerr@canonical.com> | ||
125 | 104 | |||
126 | 105 | remove redundant prototypes | ||
127 | 106 | |||
128 | 107 | 2012-02-10 Ted Gould <ted@gould.cx> | ||
129 | 108 | |||
130 | 109 | Support building coverage targets | ||
131 | 110 | |||
132 | 111 | 2011-12-06 Allan LeSage <allanlesage@gmail.com> | ||
133 | 112 | |||
134 | 113 | Added coverage reporting via gcov config and targets. | ||
135 | 114 | |||
136 | 115 | 2011-11-30 Marco Trevisan (Treviño) <mail@3v1n0.net> | ||
137 | 116 | |||
138 | 117 | Add name-hint. | ||
139 | 118 | |||
140 | 119 | Using the defined PACKAGE_NAME value. | ||
141 | 120 | |||
142 | 121 | 2011-11-08 Marco Trevisan (Treviño) <mail@3v1n0.net> | ||
143 | 122 | |||
144 | 123 | Add name-hint. | ||
145 | 124 | |||
146 | 125 | Using the defined PACKAGE_NAME value. | ||
147 | 126 | |||
148 | 3 | 2011-10-13 Javier Jardón <javier.jardon@codethink.co.uk> | 127 | 2011-10-13 Javier Jardón <javier.jardon@codethink.co.uk> |
149 | 4 | 128 | ||
150 | 5 | 0.10 | 129 | 0.10 |
151 | 6 | 130 | ||
152 | === modified file 'Makefile.am' | |||
153 | --- Makefile.am 2011-08-25 17:46:15 +0000 | |||
154 | +++ Makefile.am 2012-02-14 22:32:23 +0000 | |||
155 | @@ -1,13 +1,8 @@ | |||
156 | 1 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | 1 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
157 | 2 | 2 | ||
166 | 3 | SUBDIRS = po | 3 | SUBDIRS = \ |
167 | 4 | 4 | po \ | |
168 | 5 | gsettings_in_file = data/com.canonical.indicator.power.gschema.xml.in | 5 | data |
161 | 6 | gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) | ||
162 | 7 | |||
163 | 8 | @INTLTOOL_XML_NOMERGE_RULE@ | ||
164 | 9 | |||
165 | 10 | @GSETTINGS_RULES@ | ||
169 | 11 | 6 | ||
170 | 12 | ################### | 7 | ################### |
171 | 13 | # Indicator Stuff | 8 | # Indicator Stuff |
172 | @@ -20,12 +15,14 @@ | |||
173 | 20 | libpower_la_CFLAGS = \ | 15 | libpower_la_CFLAGS = \ |
174 | 21 | $(UPOWER_CFLAGS) \ | 16 | $(UPOWER_CFLAGS) \ |
175 | 22 | $(INDICATOR_CFLAGS) \ | 17 | $(INDICATOR_CFLAGS) \ |
176 | 18 | $(COVERAGE_CFLAGS) \ | ||
177 | 23 | -Wall -Werror \ | 19 | -Wall -Werror \ |
178 | 24 | -DG_LOG_DOMAIN=\"Indicator-Power\" | 20 | -DG_LOG_DOMAIN=\"Indicator-Power\" |
179 | 25 | libpower_la_LIBADD = \ | 21 | libpower_la_LIBADD = \ |
180 | 26 | $(UPOWER_LIBS) \ | 22 | $(UPOWER_LIBS) \ |
181 | 27 | $(INDICATOR_LIBS) | 23 | $(INDICATOR_LIBS) |
182 | 28 | libpower_la_LDFLAGS = \ | 24 | libpower_la_LDFLAGS = \ |
183 | 25 | $(COVERAGE_LDFLAGS) \ | ||
184 | 29 | -module \ | 26 | -module \ |
185 | 30 | -avoid-version | 27 | -avoid-version |
186 | 31 | 28 | ||
187 | @@ -34,16 +31,6 @@ | |||
188 | 34 | dist_noinst_SCRIPTS = \ | 31 | dist_noinst_SCRIPTS = \ |
189 | 35 | autogen.sh | 32 | autogen.sh |
190 | 36 | 33 | ||
191 | 37 | dist_noinst_DATA = \ | ||
192 | 38 | data/com.canonical.indicator.power.gschema.xml \ | ||
193 | 39 | $(gsettings_in_file) | ||
194 | 40 | |||
195 | 41 | CLEANFILES = \ | ||
196 | 42 | $(gsettings_SCHEMAS) | ||
197 | 43 | |||
198 | 44 | MAINTAINERCLEANFILES = \ | ||
199 | 45 | $(gsettings_SCHEMAS:.xml=.valid) | ||
200 | 46 | |||
201 | 47 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall | 34 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall |
202 | 48 | 35 | ||
203 | 49 | ############################################################ | 36 | ############################################################ |
204 | @@ -73,3 +60,39 @@ | |||
205 | 73 | else \ | 60 | else \ |
206 | 74 | echo Failed to generate AUTHORS: not a branch >&2; \ | 61 | echo Failed to generate AUTHORS: not a branch >&2; \ |
207 | 75 | fi | 62 | fi |
208 | 63 | |||
209 | 64 | |||
210 | 65 | # Coverage targets | ||
211 | 66 | |||
212 | 67 | .PHONY: clean-gcda | ||
213 | 68 | clean-gcda: | ||
214 | 69 | @echo Removing old coverage results | ||
215 | 70 | -find -name '*.gcda' -print | xargs -r rm | ||
216 | 71 | |||
217 | 72 | .PHONY: coverage-html generate-coverage-html clean-coverage-html | ||
218 | 73 | coverage-html: clean-gcda | ||
219 | 74 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
220 | 75 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | ||
221 | 76 | |||
222 | 77 | generate-coverage-html: | ||
223 | 78 | @echo Collecting coverage data | ||
224 | 79 | $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | ||
225 | 80 | LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | ||
226 | 81 | |||
227 | 82 | clean-coverage-html: clean-gcda | ||
228 | 83 | -$(LCOV) --directory $(top_builddir) -z | ||
229 | 84 | -rm -rf coverage.info coveragereport | ||
230 | 85 | |||
231 | 86 | .PHONY: coverage-xml generate-coverage-xml clean-coverage-xml | ||
232 | 87 | coverage-xml: clean-gcda | ||
233 | 88 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
234 | 89 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml | ||
235 | 90 | |||
236 | 91 | generate-coverage-xml: | ||
237 | 92 | @echo Generating coverage XML report | ||
238 | 93 | $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | ||
239 | 94 | |||
240 | 95 | clean-coverage-xml: clean-gcda | ||
241 | 96 | -rm -rf $(top_builddir)/coverage.xml | ||
242 | 97 | |||
243 | 98 | clean-local: clean-coverage-html clean-coverage-xml | ||
244 | 76 | 99 | ||
245 | === modified file 'Makefile.in' | |||
246 | --- Makefile.in 2011-09-23 17:03:11 +0000 | |||
247 | +++ Makefile.in 2012-02-14 22:32:23 +0000 | |||
248 | @@ -1,9 +1,9 @@ | |||
250 | 1 | # Makefile.in generated by automake 1.11.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. |
251 | 2 | # @configure_input@ | 2 | # @configure_input@ |
252 | 3 | 3 | ||
253 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
256 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
257 | 6 | # Inc. | 6 | # Foundation, Inc. |
258 | 7 | # This Makefile.in is free software; the Free Software Foundation | 7 | # This Makefile.in is free software; the Free Software Foundation |
259 | 8 | # gives unlimited permission to copy and/or distribute it, | 8 | # gives unlimited permission to copy and/or distribute it, |
260 | 9 | # with or without modifications, as long as this notice is preserved. | 9 | # with or without modifications, as long as this notice is preserved. |
261 | @@ -16,7 +16,6 @@ | |||
262 | 16 | @SET_MAKE@ | 16 | @SET_MAKE@ |
263 | 17 | 17 | ||
264 | 18 | 18 | ||
265 | 19 | |||
266 | 20 | VPATH = @srcdir@ | 19 | VPATH = @srcdir@ |
267 | 21 | pkgdatadir = $(datadir)/@PACKAGE@ | 20 | pkgdatadir = $(datadir)/@PACKAGE@ |
268 | 22 | pkgincludedir = $(includedir)/@PACKAGE@ | 21 | pkgincludedir = $(includedir)/@PACKAGE@ |
269 | @@ -37,13 +36,12 @@ | |||
270 | 37 | build_triplet = @build@ | 36 | build_triplet = @build@ |
271 | 38 | host_triplet = @host@ | 37 | host_triplet = @host@ |
272 | 39 | subdir = . | 38 | subdir = . |
280 | 40 | DIST_COMMON = $(am__configure_deps) $(dist_noinst_DATA) \ | 39 | DIST_COMMON = $(am__configure_deps) $(dist_noinst_SCRIPTS) \ |
281 | 41 | $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \ | 40 | $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
282 | 42 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | 41 | $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \ |
283 | 43 | $(top_srcdir)/configure ABOUT-NLS COPYING build-aux/compile \ | 42 | COPYING build-aux/compile build-aux/config.guess \ |
284 | 44 | build-aux/config.guess build-aux/config.rpath \ | 43 | build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ |
285 | 45 | build-aux/config.sub build-aux/depcomp build-aux/install-sh \ | 44 | build-aux/install-sh build-aux/ltmain.sh build-aux/missing |
279 | 46 | build-aux/ltmain.sh build-aux/missing | ||
286 | 47 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 45 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
287 | 48 | am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ | 46 | am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
288 | 49 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ | 47 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
289 | @@ -53,7 +51,7 @@ | |||
290 | 53 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 51 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
291 | 54 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ | 52 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ |
292 | 55 | $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ | 53 | $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ |
294 | 56 | $(top_srcdir)/configure.ac | 54 | $(top_srcdir)/m4/gcov.m4 $(top_srcdir)/configure.ac |
295 | 57 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 55 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
296 | 58 | $(ACLOCAL_M4) | 56 | $(ACLOCAL_M4) |
297 | 59 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | 57 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
298 | @@ -83,6 +81,12 @@ | |||
299 | 83 | am__base_list = \ | 81 | am__base_list = \ |
300 | 84 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | 82 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
301 | 85 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | 83 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
302 | 84 | am__uninstall_files_from_dir = { \ | ||
303 | 85 | test -z "$$files" \ | ||
304 | 86 | || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
305 | 87 | || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
306 | 88 | $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
307 | 89 | } | ||
308 | 86 | am__installdirs = "$(DESTDIR)$(powerlibdir)" | 90 | am__installdirs = "$(DESTDIR)$(powerlibdir)" |
309 | 87 | LTLIBRARIES = $(powerlib_LTLIBRARIES) | 91 | LTLIBRARIES = $(powerlib_LTLIBRARIES) |
310 | 88 | am__DEPENDENCIES_1 = | 92 | am__DEPENDENCIES_1 = |
311 | @@ -90,8 +94,8 @@ | |||
312 | 90 | am__dirstamp = $(am__leading_dot)dirstamp | 94 | am__dirstamp = $(am__leading_dot)dirstamp |
313 | 91 | am_libpower_la_OBJECTS = src/libpower_la-indicator-power.lo | 95 | am_libpower_la_OBJECTS = src/libpower_la-indicator-power.lo |
314 | 92 | libpower_la_OBJECTS = $(am_libpower_la_OBJECTS) | 96 | libpower_la_OBJECTS = $(am_libpower_la_OBJECTS) |
317 | 93 | AM_V_lt = $(am__v_lt_$(V)) | 97 | AM_V_lt = $(am__v_lt_@AM_V@) |
318 | 94 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | 98 | am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
319 | 95 | am__v_lt_0 = --silent | 99 | am__v_lt_0 = --silent |
320 | 96 | libpower_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | 100 | libpower_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
321 | 97 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpower_la_CFLAGS) \ | 101 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpower_la_CFLAGS) \ |
322 | @@ -107,21 +111,21 @@ | |||
323 | 107 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ | 111 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ |
324 | 108 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | 112 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ |
325 | 109 | $(AM_CFLAGS) $(CFLAGS) | 113 | $(AM_CFLAGS) $(CFLAGS) |
328 | 110 | AM_V_CC = $(am__v_CC_$(V)) | 114 | AM_V_CC = $(am__v_CC_@AM_V@) |
329 | 111 | am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) | 115 | am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
330 | 112 | am__v_CC_0 = @echo " CC " $@; | 116 | am__v_CC_0 = @echo " CC " $@; |
333 | 113 | AM_V_at = $(am__v_at_$(V)) | 117 | AM_V_at = $(am__v_at_@AM_V@) |
334 | 114 | am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | 118 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
335 | 115 | am__v_at_0 = @ | 119 | am__v_at_0 = @ |
336 | 116 | CCLD = $(CC) | 120 | CCLD = $(CC) |
337 | 117 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | 121 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
338 | 118 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | 122 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
339 | 119 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | 123 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
342 | 120 | AM_V_CCLD = $(am__v_CCLD_$(V)) | 124 | AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
343 | 121 | am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) | 125 | am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
344 | 122 | am__v_CCLD_0 = @echo " CCLD " $@; | 126 | am__v_CCLD_0 = @echo " CCLD " $@; |
347 | 123 | AM_V_GEN = $(am__v_GEN_$(V)) | 127 | AM_V_GEN = $(am__v_GEN_@AM_V@) |
348 | 124 | am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | 128 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
349 | 125 | am__v_GEN_0 = @echo " GEN " $@; | 129 | am__v_GEN_0 = @echo " GEN " $@; |
350 | 126 | SOURCES = $(libpower_la_SOURCES) | 130 | SOURCES = $(libpower_la_SOURCES) |
351 | 127 | DIST_SOURCES = $(libpower_la_SOURCES) | 131 | DIST_SOURCES = $(libpower_la_SOURCES) |
352 | @@ -132,7 +136,6 @@ | |||
353 | 132 | install-pdf-recursive install-ps-recursive install-recursive \ | 136 | install-pdf-recursive install-ps-recursive install-recursive \ |
354 | 133 | installcheck-recursive installdirs-recursive pdf-recursive \ | 137 | installcheck-recursive installdirs-recursive pdf-recursive \ |
355 | 134 | ps-recursive uninstall-recursive | 138 | ps-recursive uninstall-recursive |
356 | 135 | DATA = $(dist_noinst_DATA) | ||
357 | 136 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | 139 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
358 | 137 | distclean-recursive maintainer-clean-recursive | 140 | distclean-recursive maintainer-clean-recursive |
359 | 138 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | 141 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
360 | @@ -145,9 +148,11 @@ | |||
361 | 145 | distdir = $(PACKAGE)-$(VERSION) | 148 | distdir = $(PACKAGE)-$(VERSION) |
362 | 146 | top_distdir = $(distdir) | 149 | top_distdir = $(distdir) |
363 | 147 | am__remove_distdir = \ | 150 | am__remove_distdir = \ |
367 | 148 | { test ! -d "$(distdir)" \ | 151 | if test -d "$(distdir)"; then \ |
368 | 149 | || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ | 152 | find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
369 | 150 | && rm -fr "$(distdir)"; }; } | 153 | && rm -rf "$(distdir)" \ |
370 | 154 | || { sleep 5 && rm -rf "$(distdir)"; }; \ | ||
371 | 155 | else :; fi | ||
372 | 151 | am__relativize = \ | 156 | am__relativize = \ |
373 | 152 | dir0=`pwd`; \ | 157 | dir0=`pwd`; \ |
374 | 153 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | 158 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
375 | @@ -176,6 +181,8 @@ | |||
376 | 176 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz | 181 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz |
377 | 177 | GZIP_ENV = --best | 182 | GZIP_ENV = --best |
378 | 178 | distuninstallcheck_listfiles = find . -type f -print | 183 | distuninstallcheck_listfiles = find . -type f -print |
379 | 184 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | ||
380 | 185 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | ||
381 | 179 | distcleancheck_listfiles = find . -type f -print | 186 | distcleancheck_listfiles = find . -type f -print |
382 | 180 | ACLOCAL = @ACLOCAL@ | 187 | ACLOCAL = @ACLOCAL@ |
383 | 181 | ALL_LINGUAS = @ALL_LINGUAS@ | 188 | ALL_LINGUAS = @ALL_LINGUAS@ |
384 | @@ -189,6 +196,9 @@ | |||
385 | 189 | CC = @CC@ | 196 | CC = @CC@ |
386 | 190 | CCDEPMODE = @CCDEPMODE@ | 197 | CCDEPMODE = @CCDEPMODE@ |
387 | 191 | CFLAGS = @CFLAGS@ | 198 | CFLAGS = @CFLAGS@ |
388 | 199 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
389 | 200 | COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ | ||
390 | 201 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
391 | 192 | CPP = @CPP@ | 202 | CPP = @CPP@ |
392 | 193 | CPPFLAGS = @CPPFLAGS@ | 203 | CPPFLAGS = @CPPFLAGS@ |
393 | 194 | CYGPATH_W = @CYGPATH_W@ | 204 | CYGPATH_W = @CYGPATH_W@ |
394 | @@ -204,6 +214,8 @@ | |||
395 | 204 | EGREP = @EGREP@ | 214 | EGREP = @EGREP@ |
396 | 205 | EXEEXT = @EXEEXT@ | 215 | EXEEXT = @EXEEXT@ |
397 | 206 | FGREP = @FGREP@ | 216 | FGREP = @FGREP@ |
398 | 217 | GCOVR = @GCOVR@ | ||
399 | 218 | GENHTML = @GENHTML@ | ||
400 | 207 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ | 219 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
401 | 208 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 220 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
402 | 209 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 221 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
403 | @@ -227,7 +239,12 @@ | |||
404 | 227 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ | 239 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
405 | 228 | INTLTOOL_PERL = @INTLTOOL_PERL@ | 240 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
406 | 229 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ | 241 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
407 | 242 | INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ | ||
408 | 243 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | ||
409 | 244 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | ||
410 | 245 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | ||
411 | 230 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ | 246 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
412 | 247 | LCOV = @LCOV@ | ||
413 | 231 | LD = @LD@ | 248 | LD = @LD@ |
414 | 232 | LDFLAGS = @LDFLAGS@ | 249 | LDFLAGS = @LDFLAGS@ |
415 | 233 | LIBICONV = @LIBICONV@ | 250 | LIBICONV = @LIBICONV@ |
416 | @@ -269,6 +286,7 @@ | |||
417 | 269 | SED = @SED@ | 286 | SED = @SED@ |
418 | 270 | SET_MAKE = @SET_MAKE@ | 287 | SET_MAKE = @SET_MAKE@ |
419 | 271 | SHELL = @SHELL@ | 288 | SHELL = @SHELL@ |
420 | 289 | SHTOOL = @SHTOOL@ | ||
421 | 272 | STRIP = @STRIP@ | 290 | STRIP = @STRIP@ |
422 | 273 | UPOWER_CFLAGS = @UPOWER_CFLAGS@ | 291 | UPOWER_CFLAGS = @UPOWER_CFLAGS@ |
423 | 274 | UPOWER_LIBS = @UPOWER_LIBS@ | 292 | UPOWER_LIBS = @UPOWER_LIBS@ |
424 | @@ -311,6 +329,8 @@ | |||
425 | 311 | includedir = @includedir@ | 329 | includedir = @includedir@ |
426 | 312 | infodir = @infodir@ | 330 | infodir = @infodir@ |
427 | 313 | install_sh = @install_sh@ | 331 | install_sh = @install_sh@ |
428 | 332 | intltool__v_merge_options_ = @intltool__v_merge_options_@ | ||
429 | 333 | intltool__v_merge_options_0 = @intltool__v_merge_options_0@ | ||
430 | 314 | libdir = @libdir@ | 334 | libdir = @libdir@ |
431 | 315 | libexecdir = @libexecdir@ | 335 | libexecdir = @libexecdir@ |
432 | 316 | localedir = @localedir@ | 336 | localedir = @localedir@ |
433 | @@ -331,9 +351,10 @@ | |||
434 | 331 | top_builddir = @top_builddir@ | 351 | top_builddir = @top_builddir@ |
435 | 332 | top_srcdir = @top_srcdir@ | 352 | top_srcdir = @top_srcdir@ |
436 | 333 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | 353 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
440 | 334 | SUBDIRS = po | 354 | SUBDIRS = \ |
441 | 335 | gsettings_in_file = data/com.canonical.indicator.power.gschema.xml.in | 355 | po \ |
442 | 336 | gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) | 356 | data |
443 | 357 | |||
444 | 337 | 358 | ||
445 | 338 | ################### | 359 | ################### |
446 | 339 | # Indicator Stuff | 360 | # Indicator Stuff |
447 | @@ -346,6 +367,7 @@ | |||
448 | 346 | libpower_la_CFLAGS = \ | 367 | libpower_la_CFLAGS = \ |
449 | 347 | $(UPOWER_CFLAGS) \ | 368 | $(UPOWER_CFLAGS) \ |
450 | 348 | $(INDICATOR_CFLAGS) \ | 369 | $(INDICATOR_CFLAGS) \ |
451 | 370 | $(COVERAGE_CFLAGS) \ | ||
452 | 349 | -Wall -Werror \ | 371 | -Wall -Werror \ |
453 | 350 | -DG_LOG_DOMAIN=\"Indicator-Power\" | 372 | -DG_LOG_DOMAIN=\"Indicator-Power\" |
454 | 351 | 373 | ||
455 | @@ -354,6 +376,7 @@ | |||
456 | 354 | $(INDICATOR_LIBS) | 376 | $(INDICATOR_LIBS) |
457 | 355 | 377 | ||
458 | 356 | libpower_la_LDFLAGS = \ | 378 | libpower_la_LDFLAGS = \ |
459 | 379 | $(COVERAGE_LDFLAGS) \ | ||
460 | 357 | -module \ | 380 | -module \ |
461 | 358 | -avoid-version | 381 | -avoid-version |
462 | 359 | 382 | ||
463 | @@ -362,23 +385,13 @@ | |||
464 | 362 | dist_noinst_SCRIPTS = \ | 385 | dist_noinst_SCRIPTS = \ |
465 | 363 | autogen.sh | 386 | autogen.sh |
466 | 364 | 387 | ||
467 | 365 | dist_noinst_DATA = \ | ||
468 | 366 | data/com.canonical.indicator.power.gschema.xml \ | ||
469 | 367 | $(gsettings_in_file) | ||
470 | 368 | |||
471 | 369 | CLEANFILES = \ | ||
472 | 370 | $(gsettings_SCHEMAS) | ||
473 | 371 | |||
474 | 372 | MAINTAINERCLEANFILES = \ | ||
475 | 373 | $(gsettings_SCHEMAS:.xml=.valid) | ||
476 | 374 | |||
477 | 375 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall | 388 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall |
478 | 376 | all: config.h | 389 | all: config.h |
479 | 377 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | 390 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
480 | 378 | 391 | ||
481 | 379 | .SUFFIXES: | 392 | .SUFFIXES: |
482 | 380 | .SUFFIXES: .c .lo .o .obj | 393 | .SUFFIXES: .c .lo .o .obj |
484 | 381 | am--refresh: | 394 | am--refresh: Makefile |
485 | 382 | @: | 395 | @: |
486 | 383 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | 396 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
487 | 384 | @for dep in $?; do \ | 397 | @for dep in $?; do \ |
488 | @@ -414,10 +427,8 @@ | |||
489 | 414 | $(am__aclocal_m4_deps): | 427 | $(am__aclocal_m4_deps): |
490 | 415 | 428 | ||
491 | 416 | config.h: stamp-h1 | 429 | config.h: stamp-h1 |
496 | 417 | @if test ! -f $@; then \ | 430 | @if test ! -f $@; then rm -f stamp-h1; else :; fi |
497 | 418 | rm -f stamp-h1; \ | 431 | @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
494 | 419 | $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ | ||
495 | 420 | else :; fi | ||
498 | 421 | 432 | ||
499 | 422 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | 433 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
500 | 423 | @rm -f stamp-h1 | 434 | @rm -f stamp-h1 |
501 | @@ -468,7 +479,7 @@ | |||
502 | 468 | @: > src/$(DEPDIR)/$(am__dirstamp) | 479 | @: > src/$(DEPDIR)/$(am__dirstamp) |
503 | 469 | src/libpower_la-indicator-power.lo: src/$(am__dirstamp) \ | 480 | src/libpower_la-indicator-power.lo: src/$(am__dirstamp) \ |
504 | 470 | src/$(DEPDIR)/$(am__dirstamp) | 481 | src/$(DEPDIR)/$(am__dirstamp) |
506 | 471 | libpower.la: $(libpower_la_OBJECTS) $(libpower_la_DEPENDENCIES) | 482 | libpower.la: $(libpower_la_OBJECTS) $(libpower_la_DEPENDENCIES) $(EXTRA_libpower_la_DEPENDENCIES) |
507 | 472 | $(AM_V_CCLD)$(libpower_la_LINK) -rpath $(powerlibdir) $(libpower_la_OBJECTS) $(libpower_la_LIBADD) $(LIBS) | 483 | $(AM_V_CCLD)$(libpower_la_LINK) -rpath $(powerlibdir) $(libpower_la_OBJECTS) $(libpower_la_LIBADD) $(LIBS) |
508 | 473 | 484 | ||
509 | 474 | mostlyclean-compile: | 485 | mostlyclean-compile: |
510 | @@ -485,36 +496,32 @@ | |||
511 | 485 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ | 496 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ |
512 | 486 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ | 497 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ |
513 | 487 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po | 498 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po |
516 | 488 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | 499 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
515 | 489 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
517 | 490 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 500 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
519 | 491 | @am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< | 501 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
520 | 492 | 502 | ||
521 | 493 | .c.obj: | 503 | .c.obj: |
522 | 494 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ | 504 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ |
523 | 495 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ | 505 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ |
524 | 496 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po | 506 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po |
527 | 497 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | 507 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
526 | 498 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
528 | 499 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 508 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
530 | 500 | @am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | 509 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
531 | 501 | 510 | ||
532 | 502 | .c.lo: | 511 | .c.lo: |
533 | 503 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ | 512 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ |
534 | 504 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ | 513 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ |
535 | 505 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo | 514 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo |
538 | 506 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | 515 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
537 | 507 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
539 | 508 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 516 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
541 | 509 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | 517 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
542 | 510 | 518 | ||
543 | 511 | src/libpower_la-indicator-power.lo: src/indicator-power.c | 519 | src/libpower_la-indicator-power.lo: src/indicator-power.c |
544 | 512 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpower_la_CFLAGS) $(CFLAGS) -MT src/libpower_la-indicator-power.lo -MD -MP -MF src/$(DEPDIR)/libpower_la-indicator-power.Tpo -c -o src/libpower_la-indicator-power.lo `test -f 'src/indicator-power.c' || echo '$(srcdir)/'`src/indicator-power.c | 520 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpower_la_CFLAGS) $(CFLAGS) -MT src/libpower_la-indicator-power.lo -MD -MP -MF src/$(DEPDIR)/libpower_la-indicator-power.Tpo -c -o src/libpower_la-indicator-power.lo `test -f 'src/indicator-power.c' || echo '$(srcdir)/'`src/indicator-power.c |
545 | 513 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/libpower_la-indicator-power.Tpo src/$(DEPDIR)/libpower_la-indicator-power.Plo | 521 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/libpower_la-indicator-power.Tpo src/$(DEPDIR)/libpower_la-indicator-power.Plo |
548 | 514 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | 522 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/indicator-power.c' object='src/libpower_la-indicator-power.lo' libtool=yes @AMDEPBACKSLASH@ |
547 | 515 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/indicator-power.c' object='src/libpower_la-indicator-power.lo' libtool=yes @AMDEPBACKSLASH@ | ||
549 | 516 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 523 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
551 | 517 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpower_la_CFLAGS) $(CFLAGS) -c -o src/libpower_la-indicator-power.lo `test -f 'src/indicator-power.c' || echo '$(srcdir)/'`src/indicator-power.c | 524 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpower_la_CFLAGS) $(CFLAGS) -c -o src/libpower_la-indicator-power.lo `test -f 'src/indicator-power.c' || echo '$(srcdir)/'`src/indicator-power.c |
552 | 518 | 525 | ||
553 | 519 | mostlyclean-libtool: | 526 | mostlyclean-libtool: |
554 | 520 | -rm -f *.lo | 527 | -rm -f *.lo |
555 | @@ -736,14 +743,18 @@ | |||
556 | 736 | $(am__remove_distdir) | 743 | $(am__remove_distdir) |
557 | 737 | 744 | ||
558 | 738 | dist-bzip2: distdir | 745 | dist-bzip2: distdir |
560 | 739 | tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 | 746 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
561 | 747 | $(am__remove_distdir) | ||
562 | 748 | |||
563 | 749 | dist-lzip: distdir | ||
564 | 750 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz | ||
565 | 740 | $(am__remove_distdir) | 751 | $(am__remove_distdir) |
566 | 741 | 752 | ||
567 | 742 | dist-lzma: distdir | 753 | dist-lzma: distdir |
568 | 743 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma | 754 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
569 | 744 | $(am__remove_distdir) | 755 | $(am__remove_distdir) |
570 | 745 | dist-xz: distdir | 756 | dist-xz: distdir |
572 | 746 | tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz | 757 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
573 | 747 | $(am__remove_distdir) | 758 | $(am__remove_distdir) |
574 | 748 | 759 | ||
575 | 749 | dist-tarZ: distdir | 760 | dist-tarZ: distdir |
576 | @@ -761,7 +772,7 @@ | |||
577 | 761 | 772 | ||
578 | 762 | dist dist-all: distdir | 773 | dist dist-all: distdir |
579 | 763 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 774 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
581 | 764 | tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz | 775 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
582 | 765 | $(am__remove_distdir) | 776 | $(am__remove_distdir) |
583 | 766 | 777 | ||
584 | 767 | # This target untars the dist file and tries a VPATH configuration. Then | 778 | # This target untars the dist file and tries a VPATH configuration. Then |
585 | @@ -775,6 +786,8 @@ | |||
586 | 775 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ | 786 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
587 | 776 | *.tar.lzma*) \ | 787 | *.tar.lzma*) \ |
588 | 777 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ | 788 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
589 | 789 | *.tar.lz*) \ | ||
590 | 790 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ | ||
591 | 778 | *.tar.xz*) \ | 791 | *.tar.xz*) \ |
592 | 779 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ | 792 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
593 | 780 | *.tar.Z*) \ | 793 | *.tar.Z*) \ |
594 | @@ -794,6 +807,7 @@ | |||
595 | 794 | && am__cwd=`pwd` \ | 807 | && am__cwd=`pwd` \ |
596 | 795 | && $(am__cd) $(distdir)/_build \ | 808 | && $(am__cd) $(distdir)/_build \ |
597 | 796 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | 809 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
598 | 810 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ | ||
599 | 797 | $(DISTCHECK_CONFIGURE_FLAGS) \ | 811 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
600 | 798 | && $(MAKE) $(AM_MAKEFLAGS) \ | 812 | && $(MAKE) $(AM_MAKEFLAGS) \ |
601 | 799 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ | 813 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
602 | @@ -822,8 +836,16 @@ | |||
603 | 822 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | 836 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
604 | 823 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | 837 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
605 | 824 | distuninstallcheck: | 838 | distuninstallcheck: |
608 | 825 | @$(am__cd) '$(distuninstallcheck_dir)' \ | 839 | @test -n '$(distuninstallcheck_dir)' || { \ |
609 | 826 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ | 840 | echo 'ERROR: trying to run $@ with an empty' \ |
610 | 841 | '$$(distuninstallcheck_dir)' >&2; \ | ||
611 | 842 | exit 1; \ | ||
612 | 843 | }; \ | ||
613 | 844 | $(am__cd) '$(distuninstallcheck_dir)' || { \ | ||
614 | 845 | echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ | ||
615 | 846 | exit 1; \ | ||
616 | 847 | }; \ | ||
617 | 848 | test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ | ||
618 | 827 | || { echo "ERROR: files left after uninstall:" ; \ | 849 | || { echo "ERROR: files left after uninstall:" ; \ |
619 | 828 | if test -n "$(DESTDIR)"; then \ | 850 | if test -n "$(DESTDIR)"; then \ |
620 | 829 | echo " (check DESTDIR support)"; \ | 851 | echo " (check DESTDIR support)"; \ |
621 | @@ -841,7 +863,7 @@ | |||
622 | 841 | exit 1; } >&2 | 863 | exit 1; } >&2 |
623 | 842 | check-am: all-am | 864 | check-am: all-am |
624 | 843 | check: check-recursive | 865 | check: check-recursive |
626 | 844 | all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) config.h | 866 | all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) config.h |
627 | 845 | installdirs: installdirs-recursive | 867 | installdirs: installdirs-recursive |
628 | 846 | installdirs-am: | 868 | installdirs-am: |
629 | 847 | for dir in "$(DESTDIR)$(powerlibdir)"; do \ | 869 | for dir in "$(DESTDIR)$(powerlibdir)"; do \ |
630 | @@ -857,14 +879,18 @@ | |||
631 | 857 | 879 | ||
632 | 858 | installcheck: installcheck-recursive | 880 | installcheck: installcheck-recursive |
633 | 859 | install-strip: | 881 | install-strip: |
638 | 860 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | 882 | if test -z '$(STRIP)'; then \ |
639 | 861 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | 883 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
640 | 862 | `test -z '$(STRIP)' || \ | 884 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
641 | 863 | echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | 885 | install; \ |
642 | 886 | else \ | ||
643 | 887 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
644 | 888 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
645 | 889 | "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
646 | 890 | fi | ||
647 | 864 | mostlyclean-generic: | 891 | mostlyclean-generic: |
648 | 865 | 892 | ||
649 | 866 | clean-generic: | 893 | clean-generic: |
650 | 867 | -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) | ||
651 | 868 | 894 | ||
652 | 869 | distclean-generic: | 895 | distclean-generic: |
653 | 870 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | 896 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
654 | @@ -875,11 +901,10 @@ | |||
655 | 875 | maintainer-clean-generic: | 901 | maintainer-clean-generic: |
656 | 876 | @echo "This command is intended for maintainers to use" | 902 | @echo "This command is intended for maintainers to use" |
657 | 877 | @echo "it deletes files that may require special tools to rebuild." | 903 | @echo "it deletes files that may require special tools to rebuild." |
658 | 878 | -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) | ||
659 | 879 | clean: clean-recursive | 904 | clean: clean-recursive |
660 | 880 | 905 | ||
663 | 881 | clean-am: clean-generic clean-libtool clean-powerlibLTLIBRARIES \ | 906 | clean-am: clean-generic clean-libtool clean-local \ |
664 | 882 | mostlyclean-am | 907 | clean-powerlibLTLIBRARIES mostlyclean-am |
665 | 883 | 908 | ||
666 | 884 | distclean: distclean-recursive | 909 | distclean: distclean-recursive |
667 | 885 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | 910 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
668 | @@ -955,27 +980,23 @@ | |||
669 | 955 | 980 | ||
670 | 956 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 981 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
671 | 957 | all all-am am--refresh check check-am clean clean-generic \ | 982 | all all-am am--refresh check check-am clean clean-generic \ |
693 | 958 | clean-libtool clean-powerlibLTLIBRARIES ctags ctags-recursive \ | 983 | clean-libtool clean-local clean-powerlibLTLIBRARIES ctags \ |
694 | 959 | dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \ | 984 | ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ |
695 | 960 | dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ | 985 | dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
696 | 961 | distclean-compile distclean-generic distclean-hdr \ | 986 | distcheck distclean distclean-compile distclean-generic \ |
697 | 962 | distclean-libtool distclean-tags distcleancheck distdir \ | 987 | distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
698 | 963 | distuninstallcheck dvi dvi-am html html-am info info-am \ | 988 | distdir distuninstallcheck dvi dvi-am html html-am info \ |
699 | 964 | install install-am install-data install-data-am install-dvi \ | 989 | info-am install install-am install-data install-data-am \ |
700 | 965 | install-dvi-am install-exec install-exec-am install-html \ | 990 | install-dvi install-dvi-am install-exec install-exec-am \ |
701 | 966 | install-html-am install-info install-info-am install-man \ | 991 | install-html install-html-am install-info install-info-am \ |
702 | 967 | install-pdf install-pdf-am install-powerlibLTLIBRARIES \ | 992 | install-man install-pdf install-pdf-am \ |
703 | 968 | install-ps install-ps-am install-strip installcheck \ | 993 | install-powerlibLTLIBRARIES install-ps install-ps-am \ |
704 | 969 | installcheck-am installdirs installdirs-am maintainer-clean \ | 994 | install-strip installcheck installcheck-am installdirs \ |
705 | 970 | maintainer-clean-generic mostlyclean mostlyclean-compile \ | 995 | installdirs-am maintainer-clean maintainer-clean-generic \ |
706 | 971 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | 996 | mostlyclean mostlyclean-compile mostlyclean-generic \ |
707 | 972 | tags tags-recursive uninstall uninstall-am \ | 997 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
708 | 973 | uninstall-powerlibLTLIBRARIES | 998 | uninstall uninstall-am uninstall-powerlibLTLIBRARIES |
709 | 974 | 999 | ||
689 | 975 | |||
690 | 976 | @INTLTOOL_XML_NOMERGE_RULE@ | ||
691 | 977 | |||
692 | 978 | @GSETTINGS_RULES@ | ||
710 | 979 | 1000 | ||
711 | 980 | ############################################################ | 1001 | ############################################################ |
712 | 981 | 1002 | ||
713 | @@ -1005,6 +1026,41 @@ | |||
714 | 1005 | echo Failed to generate AUTHORS: not a branch >&2; \ | 1026 | echo Failed to generate AUTHORS: not a branch >&2; \ |
715 | 1006 | fi | 1027 | fi |
716 | 1007 | 1028 | ||
717 | 1029 | # Coverage targets | ||
718 | 1030 | |||
719 | 1031 | .PHONY: clean-gcda | ||
720 | 1032 | clean-gcda: | ||
721 | 1033 | @echo Removing old coverage results | ||
722 | 1034 | -find -name '*.gcda' -print | xargs -r rm | ||
723 | 1035 | |||
724 | 1036 | .PHONY: coverage-html generate-coverage-html clean-coverage-html | ||
725 | 1037 | coverage-html: clean-gcda | ||
726 | 1038 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
727 | 1039 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | ||
728 | 1040 | |||
729 | 1041 | generate-coverage-html: | ||
730 | 1042 | @echo Collecting coverage data | ||
731 | 1043 | $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | ||
732 | 1044 | LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | ||
733 | 1045 | |||
734 | 1046 | clean-coverage-html: clean-gcda | ||
735 | 1047 | -$(LCOV) --directory $(top_builddir) -z | ||
736 | 1048 | -rm -rf coverage.info coveragereport | ||
737 | 1049 | |||
738 | 1050 | .PHONY: coverage-xml generate-coverage-xml clean-coverage-xml | ||
739 | 1051 | coverage-xml: clean-gcda | ||
740 | 1052 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
741 | 1053 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml | ||
742 | 1054 | |||
743 | 1055 | generate-coverage-xml: | ||
744 | 1056 | @echo Generating coverage XML report | ||
745 | 1057 | $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | ||
746 | 1058 | |||
747 | 1059 | clean-coverage-xml: clean-gcda | ||
748 | 1060 | -rm -rf $(top_builddir)/coverage.xml | ||
749 | 1061 | |||
750 | 1062 | clean-local: clean-coverage-html clean-coverage-xml | ||
751 | 1063 | |||
752 | 1008 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 1064 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
753 | 1009 | # Otherwise a system limit (for SysV at least) may be exceeded. | 1065 | # Otherwise a system limit (for SysV at least) may be exceeded. |
754 | 1010 | .NOEXPORT: | 1066 | .NOEXPORT: |
755 | 1011 | 1067 | ||
756 | === modified file 'aclocal.m4' | |||
757 | --- aclocal.m4 2011-08-23 16:44:57 +0000 | |||
758 | +++ aclocal.m4 2012-02-14 22:32:23 +0000 | |||
759 | @@ -1,7 +1,8 @@ | |||
761 | 1 | # generated automatically by aclocal 1.11.1 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
762 | 2 | 2 | ||
763 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
765 | 4 | # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 4 | # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
766 | 5 | # Inc. | ||
767 | 5 | # This file is free software; the Free Software Foundation | 6 | # This file is free software; the Free Software Foundation |
768 | 6 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
769 | 7 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
770 | @@ -263,12 +264,15 @@ | |||
771 | 263 | fi[]dnl | 264 | fi[]dnl |
772 | 264 | ])# PKG_CHECK_MODULES | 265 | ])# PKG_CHECK_MODULES |
773 | 265 | 266 | ||
775 | 266 | # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 267 | # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
776 | 268 | # Foundation, Inc. | ||
777 | 267 | # | 269 | # |
778 | 268 | # This file is free software; the Free Software Foundation | 270 | # This file is free software; the Free Software Foundation |
779 | 269 | # gives unlimited permission to copy and/or distribute it, | 271 | # gives unlimited permission to copy and/or distribute it, |
780 | 270 | # with or without modifications, as long as this notice is preserved. | 272 | # with or without modifications, as long as this notice is preserved. |
781 | 271 | 273 | ||
782 | 274 | # serial 1 | ||
783 | 275 | |||
784 | 272 | # AM_AUTOMAKE_VERSION(VERSION) | 276 | # AM_AUTOMAKE_VERSION(VERSION) |
785 | 273 | # ---------------------------- | 277 | # ---------------------------- |
786 | 274 | # Automake X.Y traces this macro to ensure aclocal.m4 has been | 278 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
787 | @@ -278,7 +282,7 @@ | |||
788 | 278 | [am__api_version='1.11' | 282 | [am__api_version='1.11' |
789 | 279 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 283 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
790 | 280 | dnl require some minimum version. Point them to the right macro. | 284 | dnl require some minimum version. Point them to the right macro. |
792 | 281 | m4_if([$1], [1.11.1], [], | 285 | m4_if([$1], [1.11.3], [], |
793 | 282 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 286 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
794 | 283 | ]) | 287 | ]) |
795 | 284 | 288 | ||
796 | @@ -294,19 +298,21 @@ | |||
797 | 294 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 298 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
798 | 295 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | 299 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
799 | 296 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 300 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
801 | 297 | [AM_AUTOMAKE_VERSION([1.11.1])dnl | 301 | [AM_AUTOMAKE_VERSION([1.11.3])dnl |
802 | 298 | m4_ifndef([AC_AUTOCONF_VERSION], | 302 | m4_ifndef([AC_AUTOCONF_VERSION], |
803 | 299 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 303 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
804 | 300 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | 304 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
805 | 301 | 305 | ||
806 | 302 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 306 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
807 | 303 | 307 | ||
809 | 304 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | 308 | # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
810 | 305 | # | 309 | # |
811 | 306 | # This file is free software; the Free Software Foundation | 310 | # This file is free software; the Free Software Foundation |
812 | 307 | # gives unlimited permission to copy and/or distribute it, | 311 | # gives unlimited permission to copy and/or distribute it, |
813 | 308 | # with or without modifications, as long as this notice is preserved. | 312 | # with or without modifications, as long as this notice is preserved. |
814 | 309 | 313 | ||
815 | 314 | # serial 1 | ||
816 | 315 | |||
817 | 310 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | 316 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
818 | 311 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to | 317 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
819 | 312 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. | 318 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
820 | @@ -388,14 +394,14 @@ | |||
821 | 388 | Usually this means the macro was only invoked conditionally.]]) | 394 | Usually this means the macro was only invoked conditionally.]]) |
822 | 389 | fi])]) | 395 | fi])]) |
823 | 390 | 396 | ||
826 | 391 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 | 397 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
827 | 392 | # Free Software Foundation, Inc. | 398 | # 2010, 2011 Free Software Foundation, Inc. |
828 | 393 | # | 399 | # |
829 | 394 | # This file is free software; the Free Software Foundation | 400 | # This file is free software; the Free Software Foundation |
830 | 395 | # gives unlimited permission to copy and/or distribute it, | 401 | # gives unlimited permission to copy and/or distribute it, |
831 | 396 | # with or without modifications, as long as this notice is preserved. | 402 | # with or without modifications, as long as this notice is preserved. |
832 | 397 | 403 | ||
834 | 398 | # serial 10 | 404 | # serial 12 |
835 | 399 | 405 | ||
836 | 400 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | 406 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
837 | 401 | # written in clear, in which case automake, when reading aclocal.m4, | 407 | # written in clear, in which case automake, when reading aclocal.m4, |
838 | @@ -435,6 +441,7 @@ | |||
839 | 435 | # instance it was reported that on HP-UX the gcc test will end up | 441 | # instance it was reported that on HP-UX the gcc test will end up |
840 | 436 | # making a dummy file named `D' -- because `-MD' means `put the output | 442 | # making a dummy file named `D' -- because `-MD' means `put the output |
841 | 437 | # in D'. | 443 | # in D'. |
842 | 444 | rm -rf conftest.dir | ||
843 | 438 | mkdir conftest.dir | 445 | mkdir conftest.dir |
844 | 439 | # Copy depcomp to subdir because otherwise we won't find it if we're | 446 | # Copy depcomp to subdir because otherwise we won't find it if we're |
845 | 440 | # using a relative directory. | 447 | # using a relative directory. |
846 | @@ -499,7 +506,7 @@ | |||
847 | 499 | break | 506 | break |
848 | 500 | fi | 507 | fi |
849 | 501 | ;; | 508 | ;; |
851 | 502 | msvisualcpp | msvcmsys) | 509 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
852 | 503 | # This compiler won't grok `-c -o', but also, the minuso test has | 510 | # This compiler won't grok `-c -o', but also, the minuso test has |
853 | 504 | # not run yet. These depmodes are late enough in the game, and | 511 | # not run yet. These depmodes are late enough in the game, and |
854 | 505 | # so weak that their functioning should not be impacted. | 512 | # so weak that their functioning should not be impacted. |
855 | @@ -564,10 +571,13 @@ | |||
856 | 564 | if test "x$enable_dependency_tracking" != xno; then | 571 | if test "x$enable_dependency_tracking" != xno; then |
857 | 565 | am_depcomp="$ac_aux_dir/depcomp" | 572 | am_depcomp="$ac_aux_dir/depcomp" |
858 | 566 | AMDEPBACKSLASH='\' | 573 | AMDEPBACKSLASH='\' |
859 | 574 | am__nodep='_no' | ||
860 | 567 | fi | 575 | fi |
861 | 568 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | 576 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
862 | 569 | AC_SUBST([AMDEPBACKSLASH])dnl | 577 | AC_SUBST([AMDEPBACKSLASH])dnl |
863 | 570 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl | 578 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
864 | 579 | AC_SUBST([am__nodep])dnl | ||
865 | 580 | _AM_SUBST_NOTMAKE([am__nodep])dnl | ||
866 | 571 | ]) | 581 | ]) |
867 | 572 | 582 | ||
868 | 573 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 583 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
869 | @@ -789,12 +799,15 @@ | |||
870 | 789 | done | 799 | done |
871 | 790 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | 800 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
872 | 791 | 801 | ||
874 | 792 | # Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. | 802 | # Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
875 | 803 | # Inc. | ||
876 | 793 | # | 804 | # |
877 | 794 | # This file is free software; the Free Software Foundation | 805 | # This file is free software; the Free Software Foundation |
878 | 795 | # gives unlimited permission to copy and/or distribute it, | 806 | # gives unlimited permission to copy and/or distribute it, |
879 | 796 | # with or without modifications, as long as this notice is preserved. | 807 | # with or without modifications, as long as this notice is preserved. |
880 | 797 | 808 | ||
881 | 809 | # serial 1 | ||
882 | 810 | |||
883 | 798 | # AM_PROG_INSTALL_SH | 811 | # AM_PROG_INSTALL_SH |
884 | 799 | # ------------------ | 812 | # ------------------ |
885 | 800 | # Define $install_sh. | 813 | # Define $install_sh. |
886 | @@ -834,8 +847,8 @@ | |||
887 | 834 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | 847 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
888 | 835 | # From Jim Meyering | 848 | # From Jim Meyering |
889 | 836 | 849 | ||
892 | 837 | # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | 850 | # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
893 | 838 | # Free Software Foundation, Inc. | 851 | # 2011 Free Software Foundation, Inc. |
894 | 839 | # | 852 | # |
895 | 840 | # This file is free software; the Free Software Foundation | 853 | # This file is free software; the Free Software Foundation |
896 | 841 | # gives unlimited permission to copy and/or distribute it, | 854 | # gives unlimited permission to copy and/or distribute it, |
897 | @@ -855,7 +868,7 @@ | |||
898 | 855 | [disable], [m4_define([am_maintainer_other], [enable])], | 868 | [disable], [m4_define([am_maintainer_other], [enable])], |
899 | 856 | [m4_define([am_maintainer_other], [enable]) | 869 | [m4_define([am_maintainer_other], [enable]) |
900 | 857 | m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) | 870 | m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
902 | 858 | AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) | 871 | AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
903 | 859 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed | 872 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
904 | 860 | AC_ARG_ENABLE([maintainer-mode], | 873 | AC_ARG_ENABLE([maintainer-mode], |
905 | 861 | [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful | 874 | [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
906 | @@ -1001,12 +1014,15 @@ | |||
907 | 1001 | fi | 1014 | fi |
908 | 1002 | ]) | 1015 | ]) |
909 | 1003 | 1016 | ||
911 | 1004 | # Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | 1017 | # Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
912 | 1018 | # Inc. | ||
913 | 1005 | # | 1019 | # |
914 | 1006 | # This file is free software; the Free Software Foundation | 1020 | # This file is free software; the Free Software Foundation |
915 | 1007 | # gives unlimited permission to copy and/or distribute it, | 1021 | # gives unlimited permission to copy and/or distribute it, |
916 | 1008 | # with or without modifications, as long as this notice is preserved. | 1022 | # with or without modifications, as long as this notice is preserved. |
917 | 1009 | 1023 | ||
918 | 1024 | # serial 1 | ||
919 | 1025 | |||
920 | 1010 | # AM_PROG_MKDIR_P | 1026 | # AM_PROG_MKDIR_P |
921 | 1011 | # --------------- | 1027 | # --------------- |
922 | 1012 | # Check for `mkdir -p'. | 1028 | # Check for `mkdir -p'. |
923 | @@ -1029,13 +1045,14 @@ | |||
924 | 1029 | 1045 | ||
925 | 1030 | # Helper functions for option handling. -*- Autoconf -*- | 1046 | # Helper functions for option handling. -*- Autoconf -*- |
926 | 1031 | 1047 | ||
928 | 1032 | # Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. | 1048 | # Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
929 | 1049 | # Foundation, Inc. | ||
930 | 1033 | # | 1050 | # |
931 | 1034 | # This file is free software; the Free Software Foundation | 1051 | # This file is free software; the Free Software Foundation |
932 | 1035 | # gives unlimited permission to copy and/or distribute it, | 1052 | # gives unlimited permission to copy and/or distribute it, |
933 | 1036 | # with or without modifications, as long as this notice is preserved. | 1053 | # with or without modifications, as long as this notice is preserved. |
934 | 1037 | 1054 | ||
936 | 1038 | # serial 4 | 1055 | # serial 5 |
937 | 1039 | 1056 | ||
938 | 1040 | # _AM_MANGLE_OPTION(NAME) | 1057 | # _AM_MANGLE_OPTION(NAME) |
939 | 1041 | # ----------------------- | 1058 | # ----------------------- |
940 | @@ -1043,13 +1060,13 @@ | |||
941 | 1043 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | 1060 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
942 | 1044 | 1061 | ||
943 | 1045 | # _AM_SET_OPTION(NAME) | 1062 | # _AM_SET_OPTION(NAME) |
945 | 1046 | # ------------------------------ | 1063 | # -------------------- |
946 | 1047 | # Set option NAME. Presently that only means defining a flag for this option. | 1064 | # Set option NAME. Presently that only means defining a flag for this option. |
947 | 1048 | AC_DEFUN([_AM_SET_OPTION], | 1065 | AC_DEFUN([_AM_SET_OPTION], |
948 | 1049 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) | 1066 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
949 | 1050 | 1067 | ||
950 | 1051 | # _AM_SET_OPTIONS(OPTIONS) | 1068 | # _AM_SET_OPTIONS(OPTIONS) |
952 | 1052 | # ---------------------------------- | 1069 | # ------------------------ |
953 | 1053 | # OPTIONS is a space-separated list of Automake options. | 1070 | # OPTIONS is a space-separated list of Automake options. |
954 | 1054 | AC_DEFUN([_AM_SET_OPTIONS], | 1071 | AC_DEFUN([_AM_SET_OPTIONS], |
955 | 1055 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | 1072 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
956 | @@ -1125,13 +1142,13 @@ | |||
957 | 1125 | fi | 1142 | fi |
958 | 1126 | AC_MSG_RESULT(yes)]) | 1143 | AC_MSG_RESULT(yes)]) |
959 | 1127 | 1144 | ||
961 | 1128 | # Copyright (C) 2009 Free Software Foundation, Inc. | 1145 | # Copyright (C) 2009, 2011 Free Software Foundation, Inc. |
962 | 1129 | # | 1146 | # |
963 | 1130 | # This file is free software; the Free Software Foundation | 1147 | # This file is free software; the Free Software Foundation |
964 | 1131 | # gives unlimited permission to copy and/or distribute it, | 1148 | # gives unlimited permission to copy and/or distribute it, |
965 | 1132 | # with or without modifications, as long as this notice is preserved. | 1149 | # with or without modifications, as long as this notice is preserved. |
966 | 1133 | 1150 | ||
968 | 1134 | # serial 1 | 1151 | # serial 2 |
969 | 1135 | 1152 | ||
970 | 1136 | # AM_SILENT_RULES([DEFAULT]) | 1153 | # AM_SILENT_RULES([DEFAULT]) |
971 | 1137 | # -------------------------- | 1154 | # -------------------------- |
972 | @@ -1146,18 +1163,50 @@ | |||
973 | 1146 | no) AM_DEFAULT_VERBOSITY=1;; | 1163 | no) AM_DEFAULT_VERBOSITY=1;; |
974 | 1147 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; | 1164 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
975 | 1148 | esac | 1165 | esac |
976 | 1166 | dnl | ||
977 | 1167 | dnl A few `make' implementations (e.g., NonStop OS and NextStep) | ||
978 | 1168 | dnl do not support nested variable expansions. | ||
979 | 1169 | dnl See automake bug#9928 and bug#10237. | ||
980 | 1170 | am_make=${MAKE-make} | ||
981 | 1171 | AC_CACHE_CHECK([whether $am_make supports nested variables], | ||
982 | 1172 | [am_cv_make_support_nested_variables], | ||
983 | 1173 | [if AS_ECHO([['TRUE=$(BAR$(V)) | ||
984 | 1174 | BAR0=false | ||
985 | 1175 | BAR1=true | ||
986 | 1176 | V=1 | ||
987 | 1177 | am__doit: | ||
988 | 1178 | @$(TRUE) | ||
989 | 1179 | .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then | ||
990 | 1180 | am_cv_make_support_nested_variables=yes | ||
991 | 1181 | else | ||
992 | 1182 | am_cv_make_support_nested_variables=no | ||
993 | 1183 | fi]) | ||
994 | 1184 | if test $am_cv_make_support_nested_variables = yes; then | ||
995 | 1185 | dnl Using `$V' instead of `$(V)' breaks IRIX make. | ||
996 | 1186 | AM_V='$(V)' | ||
997 | 1187 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
998 | 1188 | else | ||
999 | 1189 | AM_V=$AM_DEFAULT_VERBOSITY | ||
1000 | 1190 | AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
1001 | 1191 | fi | ||
1002 | 1192 | AC_SUBST([AM_V])dnl | ||
1003 | 1193 | AM_SUBST_NOTMAKE([AM_V])dnl | ||
1004 | 1194 | AC_SUBST([AM_DEFAULT_V])dnl | ||
1005 | 1195 | AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl | ||
1006 | 1149 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl | 1196 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
1007 | 1150 | AM_BACKSLASH='\' | 1197 | AM_BACKSLASH='\' |
1008 | 1151 | AC_SUBST([AM_BACKSLASH])dnl | 1198 | AC_SUBST([AM_BACKSLASH])dnl |
1009 | 1152 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | 1199 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
1010 | 1153 | ]) | 1200 | ]) |
1011 | 1154 | 1201 | ||
1013 | 1155 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | 1202 | # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1014 | 1156 | # | 1203 | # |
1015 | 1157 | # This file is free software; the Free Software Foundation | 1204 | # This file is free software; the Free Software Foundation |
1016 | 1158 | # gives unlimited permission to copy and/or distribute it, | 1205 | # gives unlimited permission to copy and/or distribute it, |
1017 | 1159 | # with or without modifications, as long as this notice is preserved. | 1206 | # with or without modifications, as long as this notice is preserved. |
1018 | 1160 | 1207 | ||
1019 | 1208 | # serial 1 | ||
1020 | 1209 | |||
1021 | 1161 | # AM_PROG_INSTALL_STRIP | 1210 | # AM_PROG_INSTALL_STRIP |
1022 | 1162 | # --------------------- | 1211 | # --------------------- |
1023 | 1163 | # One issue with vendor `install' (even GNU) is that you can't | 1212 | # One issue with vendor `install' (even GNU) is that you can't |
1024 | @@ -1180,13 +1229,13 @@ | |||
1025 | 1180 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | 1229 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1026 | 1181 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | 1230 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1027 | 1182 | 1231 | ||
1029 | 1183 | # Copyright (C) 2006, 2008 Free Software Foundation, Inc. | 1232 | # Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
1030 | 1184 | # | 1233 | # |
1031 | 1185 | # This file is free software; the Free Software Foundation | 1234 | # This file is free software; the Free Software Foundation |
1032 | 1186 | # gives unlimited permission to copy and/or distribute it, | 1235 | # gives unlimited permission to copy and/or distribute it, |
1033 | 1187 | # with or without modifications, as long as this notice is preserved. | 1236 | # with or without modifications, as long as this notice is preserved. |
1034 | 1188 | 1237 | ||
1036 | 1189 | # serial 2 | 1238 | # serial 3 |
1037 | 1190 | 1239 | ||
1038 | 1191 | # _AM_SUBST_NOTMAKE(VARIABLE) | 1240 | # _AM_SUBST_NOTMAKE(VARIABLE) |
1039 | 1192 | # --------------------------- | 1241 | # --------------------------- |
1040 | @@ -1195,13 +1244,13 @@ | |||
1041 | 1195 | AC_DEFUN([_AM_SUBST_NOTMAKE]) | 1244 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
1042 | 1196 | 1245 | ||
1043 | 1197 | # AM_SUBST_NOTMAKE(VARIABLE) | 1246 | # AM_SUBST_NOTMAKE(VARIABLE) |
1045 | 1198 | # --------------------------- | 1247 | # -------------------------- |
1046 | 1199 | # Public sister of _AM_SUBST_NOTMAKE. | 1248 | # Public sister of _AM_SUBST_NOTMAKE. |
1047 | 1200 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | 1249 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
1048 | 1201 | 1250 | ||
1049 | 1202 | # Check how to create a tarball. -*- Autoconf -*- | 1251 | # Check how to create a tarball. -*- Autoconf -*- |
1050 | 1203 | 1252 | ||
1052 | 1204 | # Copyright (C) 2004, 2005 Free Software Foundation, Inc. | 1253 | # Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
1053 | 1205 | # | 1254 | # |
1054 | 1206 | # This file is free software; the Free Software Foundation | 1255 | # This file is free software; the Free Software Foundation |
1055 | 1207 | # gives unlimited permission to copy and/or distribute it, | 1256 | # gives unlimited permission to copy and/or distribute it, |
1056 | @@ -1223,10 +1272,11 @@ | |||
1057 | 1223 | # a tarball read from stdin. | 1272 | # a tarball read from stdin. |
1058 | 1224 | # $(am__untar) < result.tar | 1273 | # $(am__untar) < result.tar |
1059 | 1225 | AC_DEFUN([_AM_PROG_TAR], | 1274 | AC_DEFUN([_AM_PROG_TAR], |
1062 | 1226 | [# Always define AMTAR for backward compatibility. | 1275 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
1063 | 1227 | AM_MISSING_PROG([AMTAR], [tar]) | 1276 | # in the wild :-( We should find a proper way to deprecate it ... |
1064 | 1277 | AC_SUBST([AMTAR], ['$${TAR-tar}']) | ||
1065 | 1228 | m4_if([$1], [v7], | 1278 | m4_if([$1], [v7], |
1067 | 1229 | [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], | 1279 | [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1068 | 1230 | [m4_case([$1], [ustar],, [pax],, | 1280 | [m4_case([$1], [ustar],, [pax],, |
1069 | 1231 | [m4_fatal([Unknown tar format])]) | 1281 | [m4_fatal([Unknown tar format])]) |
1070 | 1232 | AC_MSG_CHECKING([how to create a $1 tar archive]) | 1282 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
1071 | 1233 | 1283 | ||
1072 | === modified file 'build-aux/compile' | |||
1073 | --- build-aux/compile 2011-07-07 18:12:06 +0000 | |||
1074 | +++ build-aux/compile 2012-02-14 22:32:23 +0000 | |||
1075 | @@ -1,10 +1,10 @@ | |||
1076 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1083 | 2 | # Wrapper for compilers which do not understand `-c -o'. | 2 | # Wrapper for compilers which do not understand '-c -o'. |
1084 | 3 | 3 | ||
1085 | 4 | scriptversion=2009-10-06.20; # UTC | 4 | scriptversion=2012-01-04.17; # UTC |
1086 | 5 | 5 | ||
1087 | 6 | # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software | 6 | # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free |
1088 | 7 | # Foundation, Inc. | 7 | # Software Foundation, Inc. |
1089 | 8 | # Written by Tom Tromey <tromey@cygnus.com>. | 8 | # Written by Tom Tromey <tromey@cygnus.com>. |
1090 | 9 | # | 9 | # |
1091 | 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 |
1092 | @@ -29,21 +29,186 @@ | |||
1093 | 29 | # bugs to <bug-automake@gnu.org> or send patches to | 29 | # bugs to <bug-automake@gnu.org> or send patches to |
1094 | 30 | # <automake-patches@gnu.org>. | 30 | # <automake-patches@gnu.org>. |
1095 | 31 | 31 | ||
1096 | 32 | nl=' | ||
1097 | 33 | ' | ||
1098 | 34 | |||
1099 | 35 | # We need space, tab and new line, in precisely that order. Quoting is | ||
1100 | 36 | # there to prevent tools from complaining about whitespace usage. | ||
1101 | 37 | IFS=" "" $nl" | ||
1102 | 38 | |||
1103 | 39 | file_conv= | ||
1104 | 40 | |||
1105 | 41 | # func_file_conv build_file lazy | ||
1106 | 42 | # Convert a $build file to $host form and store it in $file | ||
1107 | 43 | # Currently only supports Windows hosts. If the determined conversion | ||
1108 | 44 | # type is listed in (the comma separated) LAZY, no conversion will | ||
1109 | 45 | # take place. | ||
1110 | 46 | func_file_conv () | ||
1111 | 47 | { | ||
1112 | 48 | file=$1 | ||
1113 | 49 | case $file in | ||
1114 | 50 | / | /[!/]*) # absolute file, and not a UNC file | ||
1115 | 51 | if test -z "$file_conv"; then | ||
1116 | 52 | # lazily determine how to convert abs files | ||
1117 | 53 | case `uname -s` in | ||
1118 | 54 | MINGW*) | ||
1119 | 55 | file_conv=mingw | ||
1120 | 56 | ;; | ||
1121 | 57 | CYGWIN*) | ||
1122 | 58 | file_conv=cygwin | ||
1123 | 59 | ;; | ||
1124 | 60 | *) | ||
1125 | 61 | file_conv=wine | ||
1126 | 62 | ;; | ||
1127 | 63 | esac | ||
1128 | 64 | fi | ||
1129 | 65 | case $file_conv/,$2, in | ||
1130 | 66 | *,$file_conv,*) | ||
1131 | 67 | ;; | ||
1132 | 68 | mingw/*) | ||
1133 | 69 | file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` | ||
1134 | 70 | ;; | ||
1135 | 71 | cygwin/*) | ||
1136 | 72 | file=`cygpath -m "$file" || echo "$file"` | ||
1137 | 73 | ;; | ||
1138 | 74 | wine/*) | ||
1139 | 75 | file=`winepath -w "$file" || echo "$file"` | ||
1140 | 76 | ;; | ||
1141 | 77 | esac | ||
1142 | 78 | ;; | ||
1143 | 79 | esac | ||
1144 | 80 | } | ||
1145 | 81 | |||
1146 | 82 | # func_cl_wrapper cl arg... | ||
1147 | 83 | # Adjust compile command to suit cl | ||
1148 | 84 | func_cl_wrapper () | ||
1149 | 85 | { | ||
1150 | 86 | # Assume a capable shell | ||
1151 | 87 | lib_path= | ||
1152 | 88 | shared=: | ||
1153 | 89 | linker_opts= | ||
1154 | 90 | for arg | ||
1155 | 91 | do | ||
1156 | 92 | if test -n "$eat"; then | ||
1157 | 93 | eat= | ||
1158 | 94 | else | ||
1159 | 95 | case $1 in | ||
1160 | 96 | -o) | ||
1161 | 97 | # configure might choose to run compile as 'compile cc -o foo foo.c'. | ||
1162 | 98 | eat=1 | ||
1163 | 99 | case $2 in | ||
1164 | 100 | *.o | *.[oO][bB][jJ]) | ||
1165 | 101 | func_file_conv "$2" | ||
1166 | 102 | set x "$@" -Fo"$file" | ||
1167 | 103 | shift | ||
1168 | 104 | ;; | ||
1169 | 105 | *) | ||
1170 | 106 | func_file_conv "$2" | ||
1171 | 107 | set x "$@" -Fe"$file" | ||
1172 | 108 | shift | ||
1173 | 109 | ;; | ||
1174 | 110 | esac | ||
1175 | 111 | ;; | ||
1176 | 112 | -I*) | ||
1177 | 113 | func_file_conv "${1#-I}" mingw | ||
1178 | 114 | set x "$@" -I"$file" | ||
1179 | 115 | shift | ||
1180 | 116 | ;; | ||
1181 | 117 | -l*) | ||
1182 | 118 | lib=${1#-l} | ||
1183 | 119 | found=no | ||
1184 | 120 | save_IFS=$IFS | ||
1185 | 121 | IFS=';' | ||
1186 | 122 | for dir in $lib_path $LIB | ||
1187 | 123 | do | ||
1188 | 124 | IFS=$save_IFS | ||
1189 | 125 | if $shared && test -f "$dir/$lib.dll.lib"; then | ||
1190 | 126 | found=yes | ||
1191 | 127 | set x "$@" "$dir/$lib.dll.lib" | ||
1192 | 128 | break | ||
1193 | 129 | fi | ||
1194 | 130 | if test -f "$dir/$lib.lib"; then | ||
1195 | 131 | found=yes | ||
1196 | 132 | set x "$@" "$dir/$lib.lib" | ||
1197 | 133 | break | ||
1198 | 134 | fi | ||
1199 | 135 | done | ||
1200 | 136 | IFS=$save_IFS | ||
1201 | 137 | |||
1202 | 138 | test "$found" != yes && set x "$@" "$lib.lib" | ||
1203 | 139 | shift | ||
1204 | 140 | ;; | ||
1205 | 141 | -L*) | ||
1206 | 142 | func_file_conv "${1#-L}" | ||
1207 | 143 | if test -z "$lib_path"; then | ||
1208 | 144 | lib_path=$file | ||
1209 | 145 | else | ||
1210 | 146 | lib_path="$lib_path;$file" | ||
1211 | 147 | fi | ||
1212 | 148 | linker_opts="$linker_opts -LIBPATH:$file" | ||
1213 | 149 | ;; | ||
1214 | 150 | -static) | ||
1215 | 151 | shared=false | ||
1216 | 152 | ;; | ||
1217 | 153 | -Wl,*) | ||
1218 | 154 | arg=${1#-Wl,} | ||
1219 | 155 | save_ifs="$IFS"; IFS=',' | ||
1220 | 156 | for flag in $arg; do | ||
1221 | 157 | IFS="$save_ifs" | ||
1222 | 158 | linker_opts="$linker_opts $flag" | ||
1223 | 159 | done | ||
1224 | 160 | IFS="$save_ifs" | ||
1225 | 161 | ;; | ||
1226 | 162 | -Xlinker) | ||
1227 | 163 | eat=1 | ||
1228 | 164 | linker_opts="$linker_opts $2" | ||
1229 | 165 | ;; | ||
1230 | 166 | -*) | ||
1231 | 167 | set x "$@" "$1" | ||
1232 | 168 | shift | ||
1233 | 169 | ;; | ||
1234 | 170 | *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) | ||
1235 | 171 | func_file_conv "$1" | ||
1236 | 172 | set x "$@" -Tp"$file" | ||
1237 | 173 | shift | ||
1238 | 174 | ;; | ||
1239 | 175 | *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) | ||
1240 | 176 | func_file_conv "$1" mingw | ||
1241 | 177 | set x "$@" "$file" | ||
1242 | 178 | shift | ||
1243 | 179 | ;; | ||
1244 | 180 | *) | ||
1245 | 181 | set x "$@" "$1" | ||
1246 | 182 | shift | ||
1247 | 183 | ;; | ||
1248 | 184 | esac | ||
1249 | 185 | fi | ||
1250 | 186 | shift | ||
1251 | 187 | done | ||
1252 | 188 | if test -n "$linker_opts"; then | ||
1253 | 189 | linker_opts="-link$linker_opts" | ||
1254 | 190 | fi | ||
1255 | 191 | exec "$@" $linker_opts | ||
1256 | 192 | exit 1 | ||
1257 | 193 | } | ||
1258 | 194 | |||
1259 | 195 | eat= | ||
1260 | 196 | |||
1261 | 32 | case $1 in | 197 | case $1 in |
1262 | 33 | '') | 198 | '') |
1264 | 34 | echo "$0: No command. Try \`$0 --help' for more information." 1>&2 | 199 | echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1265 | 35 | exit 1; | 200 | exit 1; |
1266 | 36 | ;; | 201 | ;; |
1267 | 37 | -h | --h*) | 202 | -h | --h*) |
1268 | 38 | cat <<\EOF | 203 | cat <<\EOF |
1269 | 39 | Usage: compile [--help] [--version] PROGRAM [ARGS] | 204 | Usage: compile [--help] [--version] PROGRAM [ARGS] |
1270 | 40 | 205 | ||
1273 | 41 | Wrapper for compilers which do not understand `-c -o'. | 206 | Wrapper for compilers which do not understand '-c -o'. |
1274 | 42 | Remove `-o dest.o' from ARGS, run PROGRAM with the remaining | 207 | Remove '-o dest.o' from ARGS, run PROGRAM with the remaining |
1275 | 43 | arguments, and rename the output as expected. | 208 | arguments, and rename the output as expected. |
1276 | 44 | 209 | ||
1277 | 45 | If you are trying to build a whole package this is not the | 210 | If you are trying to build a whole package this is not the |
1279 | 46 | right script to run: please start by reading the file `INSTALL'. | 211 | right script to run: please start by reading the file 'INSTALL'. |
1280 | 47 | 212 | ||
1281 | 48 | Report bugs to <bug-automake@gnu.org>. | 213 | Report bugs to <bug-automake@gnu.org>. |
1282 | 49 | EOF | 214 | EOF |
1283 | @@ -53,11 +218,13 @@ | |||
1284 | 53 | echo "compile $scriptversion" | 218 | echo "compile $scriptversion" |
1285 | 54 | exit $? | 219 | exit $? |
1286 | 55 | ;; | 220 | ;; |
1287 | 221 | cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) | ||
1288 | 222 | func_cl_wrapper "$@" # Doesn't return... | ||
1289 | 223 | ;; | ||
1290 | 56 | esac | 224 | esac |
1291 | 57 | 225 | ||
1292 | 58 | ofile= | 226 | ofile= |
1293 | 59 | cfile= | 227 | cfile= |
1294 | 60 | eat= | ||
1295 | 61 | 228 | ||
1296 | 62 | for arg | 229 | for arg |
1297 | 63 | do | 230 | do |
1298 | @@ -66,8 +233,8 @@ | |||
1299 | 66 | else | 233 | else |
1300 | 67 | case $1 in | 234 | case $1 in |
1301 | 68 | -o) | 235 | -o) |
1304 | 69 | # configure might choose to run compile as `compile cc -o foo foo.c'. | 236 | # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1305 | 70 | # So we strip `-o arg' only if arg is an object. | 237 | # So we strip '-o arg' only if arg is an object. |
1306 | 71 | eat=1 | 238 | eat=1 |
1307 | 72 | case $2 in | 239 | case $2 in |
1308 | 73 | *.o | *.obj) | 240 | *.o | *.obj) |
1309 | @@ -94,10 +261,10 @@ | |||
1310 | 94 | done | 261 | done |
1311 | 95 | 262 | ||
1312 | 96 | if test -z "$ofile" || test -z "$cfile"; then | 263 | if test -z "$ofile" || test -z "$cfile"; then |
1314 | 97 | # If no `-o' option was seen then we might have been invoked from a | 264 | # If no '-o' option was seen then we might have been invoked from a |
1315 | 98 | # pattern rule where we don't need one. That is ok -- this is a | 265 | # pattern rule where we don't need one. That is ok -- this is a |
1316 | 99 | # normal compilation that the losing compiler can handle. If no | 266 | # normal compilation that the losing compiler can handle. If no |
1318 | 100 | # `.c' file was seen then we are probably linking. That is also | 267 | # '.c' file was seen then we are probably linking. That is also |
1319 | 101 | # ok. | 268 | # ok. |
1320 | 102 | exec "$@" | 269 | exec "$@" |
1321 | 103 | fi | 270 | fi |
1322 | @@ -106,7 +273,7 @@ | |||
1323 | 106 | cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` | 273 | cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` |
1324 | 107 | 274 | ||
1325 | 108 | # Create the lock directory. | 275 | # Create the lock directory. |
1327 | 109 | # Note: use `[/\\:.-]' here to ensure that we don't use the same name | 276 | # Note: use '[/\\:.-]' here to ensure that we don't use the same name |
1328 | 110 | # that we are using for the .o file. Also, base the name on the expected | 277 | # that we are using for the .o file. Also, base the name on the expected |
1329 | 111 | # object file name, since that is what matters with a parallel build. | 278 | # object file name, since that is what matters with a parallel build. |
1330 | 112 | lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d | 279 | lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |
1331 | 113 | 280 | ||
1332 | === modified file 'build-aux/depcomp' | |||
1333 | --- build-aux/depcomp 2011-07-07 18:12:06 +0000 | |||
1334 | +++ build-aux/depcomp 2012-02-14 22:32:23 +0000 | |||
1335 | @@ -1,10 +1,10 @@ | |||
1336 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1337 | 2 | # depcomp - compile a program generating dependencies as side-effects | 2 | # depcomp - compile a program generating dependencies as side-effects |
1338 | 3 | 3 | ||
1340 | 4 | scriptversion=2009-04-28.21; # UTC | 4 | scriptversion=2011-12-04.11; # UTC |
1341 | 5 | 5 | ||
1344 | 6 | # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free | 6 | # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, |
1345 | 7 | # Software Foundation, Inc. | 7 | # 2011 Free Software Foundation, Inc. |
1346 | 8 | 8 | ||
1347 | 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 |
1348 | 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 |
1349 | @@ -44,7 +44,7 @@ | |||
1350 | 44 | object Object file output by `PROGRAMS ARGS'. | 44 | object Object file output by `PROGRAMS ARGS'. |
1351 | 45 | DEPDIR directory where to store dependencies. | 45 | DEPDIR directory where to store dependencies. |
1352 | 46 | depfile Dependency file to output. | 46 | depfile Dependency file to output. |
1354 | 47 | tmpdepfile Temporary file to use when outputing dependencies. | 47 | tmpdepfile Temporary file to use when outputting dependencies. |
1355 | 48 | libtool Whether libtool is used (yes/no). | 48 | libtool Whether libtool is used (yes/no). |
1356 | 49 | 49 | ||
1357 | 50 | Report bugs to <bug-automake@gnu.org>. | 50 | Report bugs to <bug-automake@gnu.org>. |
1358 | @@ -90,10 +90,18 @@ | |||
1359 | 90 | # This is just like msvisualcpp but w/o cygpath translation. | 90 | # This is just like msvisualcpp but w/o cygpath translation. |
1360 | 91 | # Just convert the backslash-escaped backslashes to single forward | 91 | # Just convert the backslash-escaped backslashes to single forward |
1361 | 92 | # slashes to satisfy depend.m4 | 92 | # slashes to satisfy depend.m4 |
1363 | 93 | cygpath_u="sed s,\\\\\\\\,/,g" | 93 | cygpath_u='sed s,\\\\,/,g' |
1364 | 94 | depmode=msvisualcpp | 94 | depmode=msvisualcpp |
1365 | 95 | fi | 95 | fi |
1366 | 96 | 96 | ||
1367 | 97 | if test "$depmode" = msvc7msys; then | ||
1368 | 98 | # This is just like msvc7 but w/o cygpath translation. | ||
1369 | 99 | # Just convert the backslash-escaped backslashes to single forward | ||
1370 | 100 | # slashes to satisfy depend.m4 | ||
1371 | 101 | cygpath_u='sed s,\\\\,/,g' | ||
1372 | 102 | depmode=msvc7 | ||
1373 | 103 | fi | ||
1374 | 104 | |||
1375 | 97 | case "$depmode" in | 105 | case "$depmode" in |
1376 | 98 | gcc3) | 106 | gcc3) |
1377 | 99 | ## gcc 3 implements dependency tracking that does exactly what | 107 | ## gcc 3 implements dependency tracking that does exactly what |
1378 | @@ -158,10 +166,12 @@ | |||
1379 | 158 | ' < "$tmpdepfile" | | 166 | ' < "$tmpdepfile" | |
1380 | 159 | ## Some versions of gcc put a space before the `:'. On the theory | 167 | ## Some versions of gcc put a space before the `:'. On the theory |
1381 | 160 | ## that the space means something, we add a space to the output as | 168 | ## that the space means something, we add a space to the output as |
1383 | 161 | ## well. | 169 | ## well. hp depmode also adds that space, but also prefixes the VPATH |
1384 | 170 | ## to the object. Take care to not repeat it in the output. | ||
1385 | 162 | ## Some versions of the HPUX 10.20 sed can't process this invocation | 171 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1386 | 163 | ## correctly. Breaking it into two sed invocations is a workaround. | 172 | ## correctly. Breaking it into two sed invocations is a workaround. |
1388 | 164 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" | 173 | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
1389 | 174 | | sed -e 's/$/ :/' >> "$depfile" | ||
1390 | 165 | rm -f "$tmpdepfile" | 175 | rm -f "$tmpdepfile" |
1391 | 166 | ;; | 176 | ;; |
1392 | 167 | 177 | ||
1393 | @@ -405,6 +415,52 @@ | |||
1394 | 405 | rm -f "$tmpdepfile" | 415 | rm -f "$tmpdepfile" |
1395 | 406 | ;; | 416 | ;; |
1396 | 407 | 417 | ||
1397 | 418 | msvc7) | ||
1398 | 419 | if test "$libtool" = yes; then | ||
1399 | 420 | showIncludes=-Wc,-showIncludes | ||
1400 | 421 | else | ||
1401 | 422 | showIncludes=-showIncludes | ||
1402 | 423 | fi | ||
1403 | 424 | "$@" $showIncludes > "$tmpdepfile" | ||
1404 | 425 | stat=$? | ||
1405 | 426 | grep -v '^Note: including file: ' "$tmpdepfile" | ||
1406 | 427 | if test "$stat" = 0; then : | ||
1407 | 428 | else | ||
1408 | 429 | rm -f "$tmpdepfile" | ||
1409 | 430 | exit $stat | ||
1410 | 431 | fi | ||
1411 | 432 | rm -f "$depfile" | ||
1412 | 433 | echo "$object : \\" > "$depfile" | ||
1413 | 434 | # The first sed program below extracts the file names and escapes | ||
1414 | 435 | # backslashes for cygpath. The second sed program outputs the file | ||
1415 | 436 | # name when reading, but also accumulates all include files in the | ||
1416 | 437 | # hold buffer in order to output them again at the end. This only | ||
1417 | 438 | # works with sed implementations that can handle large buffers. | ||
1418 | 439 | sed < "$tmpdepfile" -n ' | ||
1419 | 440 | /^Note: including file: *\(.*\)/ { | ||
1420 | 441 | s//\1/ | ||
1421 | 442 | s/\\/\\\\/g | ||
1422 | 443 | p | ||
1423 | 444 | }' | $cygpath_u | sort -u | sed -n ' | ||
1424 | 445 | s/ /\\ /g | ||
1425 | 446 | s/\(.*\)/ \1 \\/p | ||
1426 | 447 | s/.\(.*\) \\/\1:/ | ||
1427 | 448 | H | ||
1428 | 449 | $ { | ||
1429 | 450 | s/.*/ / | ||
1430 | 451 | G | ||
1431 | 452 | p | ||
1432 | 453 | }' >> "$depfile" | ||
1433 | 454 | rm -f "$tmpdepfile" | ||
1434 | 455 | ;; | ||
1435 | 456 | |||
1436 | 457 | msvc7msys) | ||
1437 | 458 | # This case exists only to let depend.m4 do its work. It works by | ||
1438 | 459 | # looking at the text of this script. This case will never be run, | ||
1439 | 460 | # since it is checked for above. | ||
1440 | 461 | exit 1 | ||
1441 | 462 | ;; | ||
1442 | 463 | |||
1443 | 408 | #nosideeffect) | 464 | #nosideeffect) |
1444 | 409 | # This comment above is used by automake to tell side-effect | 465 | # This comment above is used by automake to tell side-effect |
1445 | 410 | # dependency tracking mechanisms from slower ones. | 466 | # dependency tracking mechanisms from slower ones. |
1446 | @@ -503,7 +559,9 @@ | |||
1447 | 503 | touch "$tmpdepfile" | 559 | touch "$tmpdepfile" |
1448 | 504 | ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" | 560 | ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" |
1449 | 505 | rm -f "$depfile" | 561 | rm -f "$depfile" |
1451 | 506 | cat < "$tmpdepfile" > "$depfile" | 562 | # makedepend may prepend the VPATH from the source file name to the object. |
1452 | 563 | # No need to regex-escape $object, excess matching of '.' is harmless. | ||
1453 | 564 | sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" | ||
1454 | 507 | sed '1,2d' "$tmpdepfile" | tr ' ' ' | 565 | sed '1,2d' "$tmpdepfile" | tr ' ' ' |
1455 | 508 | ' | \ | 566 | ' | \ |
1456 | 509 | ## Some versions of the HPUX 10.20 sed can't process this invocation | 567 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1457 | 510 | 568 | ||
1458 | === modified file 'build-aux/install-sh' | |||
1459 | --- build-aux/install-sh 2011-07-07 18:12:06 +0000 | |||
1460 | +++ build-aux/install-sh 2012-02-14 22:32:23 +0000 | |||
1461 | @@ -1,7 +1,7 @@ | |||
1462 | 1 | #!/bin/sh | 1 | #!/bin/sh |
1463 | 2 | # install - install a program, script, or datafile | 2 | # install - install a program, script, or datafile |
1464 | 3 | 3 | ||
1466 | 4 | scriptversion=2009-04-28.21; # UTC | 4 | scriptversion=2011-01-19.21; # UTC |
1467 | 5 | 5 | ||
1468 | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
1469 | 7 | # later released in X11R6 (xc/config/util/install.sh) with the | 7 | # later released in X11R6 (xc/config/util/install.sh) with the |
1470 | @@ -156,6 +156,10 @@ | |||
1471 | 156 | -s) stripcmd=$stripprog;; | 156 | -s) stripcmd=$stripprog;; |
1472 | 157 | 157 | ||
1473 | 158 | -t) dst_arg=$2 | 158 | -t) dst_arg=$2 |
1474 | 159 | # Protect names problematic for `test' and other utilities. | ||
1475 | 160 | case $dst_arg in | ||
1476 | 161 | -* | [=\(\)!]) dst_arg=./$dst_arg;; | ||
1477 | 162 | esac | ||
1478 | 159 | shift;; | 163 | shift;; |
1479 | 160 | 164 | ||
1480 | 161 | -T) no_target_directory=true;; | 165 | -T) no_target_directory=true;; |
1481 | @@ -186,6 +190,10 @@ | |||
1482 | 186 | fi | 190 | fi |
1483 | 187 | shift # arg | 191 | shift # arg |
1484 | 188 | dst_arg=$arg | 192 | dst_arg=$arg |
1485 | 193 | # Protect names problematic for `test' and other utilities. | ||
1486 | 194 | case $dst_arg in | ||
1487 | 195 | -* | [=\(\)!]) dst_arg=./$dst_arg;; | ||
1488 | 196 | esac | ||
1489 | 189 | done | 197 | done |
1490 | 190 | fi | 198 | fi |
1491 | 191 | 199 | ||
1492 | @@ -200,7 +208,11 @@ | |||
1493 | 200 | fi | 208 | fi |
1494 | 201 | 209 | ||
1495 | 202 | if test -z "$dir_arg"; then | 210 | if test -z "$dir_arg"; then |
1497 | 203 | trap '(exit $?); exit' 1 2 13 15 | 211 | do_exit='(exit $ret); exit $ret' |
1498 | 212 | trap "ret=129; $do_exit" 1 | ||
1499 | 213 | trap "ret=130; $do_exit" 2 | ||
1500 | 214 | trap "ret=141; $do_exit" 13 | ||
1501 | 215 | trap "ret=143; $do_exit" 15 | ||
1502 | 204 | 216 | ||
1503 | 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. |
1504 | 206 | # However, 'strip' requires both read and write access to temps. | 218 | # However, 'strip' requires both read and write access to temps. |
1505 | @@ -228,9 +240,9 @@ | |||
1506 | 228 | 240 | ||
1507 | 229 | for src | 241 | for src |
1508 | 230 | do | 242 | do |
1510 | 231 | # Protect names starting with `-'. | 243 | # Protect names problematic for `test' and other utilities. |
1511 | 232 | case $src in | 244 | case $src in |
1513 | 233 | -*) src=./$src;; | 245 | -* | [=\(\)!]) src=./$src;; |
1514 | 234 | esac | 246 | esac |
1515 | 235 | 247 | ||
1516 | 236 | if test -n "$dir_arg"; then | 248 | if test -n "$dir_arg"; then |
1517 | @@ -252,12 +264,7 @@ | |||
1518 | 252 | echo "$0: no destination specified." >&2 | 264 | echo "$0: no destination specified." >&2 |
1519 | 253 | exit 1 | 265 | exit 1 |
1520 | 254 | fi | 266 | fi |
1521 | 255 | |||
1522 | 256 | dst=$dst_arg | 267 | dst=$dst_arg |
1523 | 257 | # Protect names starting with `-'. | ||
1524 | 258 | case $dst in | ||
1525 | 259 | -*) dst=./$dst;; | ||
1526 | 260 | esac | ||
1527 | 261 | 268 | ||
1528 | 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 |
1529 | 263 | # if double slashes aren't ignored. | 270 | # if double slashes aren't ignored. |
1530 | @@ -385,7 +392,7 @@ | |||
1531 | 385 | 392 | ||
1532 | 386 | case $dstdir in | 393 | case $dstdir in |
1533 | 387 | /*) prefix='/';; | 394 | /*) prefix='/';; |
1535 | 388 | -*) prefix='./';; | 395 | [-=\(\)!]*) prefix='./';; |
1536 | 389 | *) prefix='';; | 396 | *) prefix='';; |
1537 | 390 | esac | 397 | esac |
1538 | 391 | 398 | ||
1539 | @@ -403,7 +410,7 @@ | |||
1540 | 403 | 410 | ||
1541 | 404 | for d | 411 | for d |
1542 | 405 | do | 412 | do |
1544 | 406 | test -z "$d" && continue | 413 | test X"$d" = X && continue |
1545 | 407 | 414 | ||
1546 | 408 | prefix=$prefix$d | 415 | prefix=$prefix$d |
1547 | 409 | if test -d "$prefix"; then | 416 | if test -d "$prefix"; then |
1548 | 410 | 417 | ||
1549 | === modified file 'build-aux/ltmain.sh' (properties changed: +x to -x) | |||
1550 | --- build-aux/ltmain.sh 2011-07-07 18:12:06 +0000 | |||
1551 | +++ build-aux/ltmain.sh 2012-02-14 22:32:23 +0000 | |||
1552 | @@ -1,9 +1,9 @@ | |||
1553 | 1 | 1 | ||
1555 | 2 | # libtool (GNU libtool) 2.4 | 2 | # libtool (GNU libtool) 2.4.2 |
1556 | 3 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | 3 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
1557 | 4 | 4 | ||
1558 | 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, |
1560 | 6 | # 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 6 | # 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
1561 | 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 |
1562 | 8 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 8 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
1563 | 9 | 9 | ||
1564 | @@ -41,6 +41,7 @@ | |||
1565 | 41 | # --quiet, --silent don't print informational messages | 41 | # --quiet, --silent don't print informational messages |
1566 | 42 | # --no-quiet, --no-silent | 42 | # --no-quiet, --no-silent |
1567 | 43 | # print informational messages (default) | 43 | # print informational messages (default) |
1568 | 44 | # --no-warn don't display warning messages | ||
1569 | 44 | # --tag=TAG use configuration variables from tag TAG | 45 | # --tag=TAG use configuration variables from tag TAG |
1570 | 45 | # -v, --verbose print more informational messages than default | 46 | # -v, --verbose print more informational messages than default |
1571 | 46 | # --no-verbose don't print the extra informational messages | 47 | # --no-verbose don't print the extra informational messages |
1572 | @@ -69,7 +70,7 @@ | |||
1573 | 69 | # compiler: $LTCC | 70 | # compiler: $LTCC |
1574 | 70 | # compiler flags: $LTCFLAGS | 71 | # compiler flags: $LTCFLAGS |
1575 | 71 | # linker: $LD (gnu? $with_gnu_ld) | 72 | # linker: $LD (gnu? $with_gnu_ld) |
1577 | 72 | # $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 | 73 | # $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 |
1578 | 73 | # automake: $automake_version | 74 | # automake: $automake_version |
1579 | 74 | # autoconf: $autoconf_version | 75 | # autoconf: $autoconf_version |
1580 | 75 | # | 76 | # |
1581 | @@ -79,9 +80,9 @@ | |||
1582 | 79 | 80 | ||
1583 | 80 | PROGRAM=libtool | 81 | PROGRAM=libtool |
1584 | 81 | PACKAGE=libtool | 82 | PACKAGE=libtool |
1586 | 82 | VERSION="2.4 Debian-2.4-2ubuntu1" | 83 | VERSION="2.4.2 Debian-2.4.2-1ubuntu1" |
1587 | 83 | TIMESTAMP="" | 84 | TIMESTAMP="" |
1589 | 84 | package_revision=1.3293 | 85 | package_revision=1.3337 |
1590 | 85 | 86 | ||
1591 | 86 | # Be Bourne compatible | 87 | # Be Bourne compatible |
1592 | 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 |
1593 | @@ -136,15 +137,10 @@ | |||
1594 | 136 | 137 | ||
1595 | 137 | : ${CP="cp -f"} | 138 | : ${CP="cp -f"} |
1596 | 138 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} | 139 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
1597 | 139 | : ${EGREP="/bin/grep -E"} | ||
1598 | 140 | : ${FGREP="/bin/grep -F"} | ||
1599 | 141 | : ${GREP="/bin/grep"} | ||
1600 | 142 | : ${LN_S="ln -s"} | ||
1601 | 143 | : ${MAKE="make"} | 140 | : ${MAKE="make"} |
1602 | 144 | : ${MKDIR="mkdir"} | 141 | : ${MKDIR="mkdir"} |
1603 | 145 | : ${MV="mv -f"} | 142 | : ${MV="mv -f"} |
1604 | 146 | : ${RM="rm -f"} | 143 | : ${RM="rm -f"} |
1605 | 147 | : ${SED="/bin/sed"} | ||
1606 | 148 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} | 144 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
1607 | 149 | : ${Xsed="$SED -e 1s/^X//"} | 145 | : ${Xsed="$SED -e 1s/^X//"} |
1608 | 150 | 146 | ||
1609 | @@ -387,7 +383,7 @@ | |||
1610 | 387 | ;; | 383 | ;; |
1611 | 388 | *) | 384 | *) |
1612 | 389 | save_IFS="$IFS" | 385 | save_IFS="$IFS" |
1614 | 390 | IFS=: | 386 | IFS=${PATH_SEPARATOR-:} |
1615 | 391 | for progdir in $PATH; do | 387 | for progdir in $PATH; do |
1616 | 392 | IFS="$save_IFS" | 388 | IFS="$save_IFS" |
1617 | 393 | test -x "$progdir/$progname" && break | 389 | test -x "$progdir/$progname" && break |
1618 | @@ -771,8 +767,8 @@ | |||
1619 | 771 | s*\$LTCFLAGS*'"$LTCFLAGS"'* | 767 | s*\$LTCFLAGS*'"$LTCFLAGS"'* |
1620 | 772 | s*\$LD*'"$LD"'* | 768 | s*\$LD*'"$LD"'* |
1621 | 773 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ | 769 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ |
1624 | 774 | s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ | 770 | s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ |
1625 | 775 | s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ | 771 | s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ |
1626 | 776 | p | 772 | p |
1627 | 777 | d | 773 | d |
1628 | 778 | } | 774 | } |
1629 | @@ -1052,6 +1048,7 @@ | |||
1630 | 1052 | opt_help=false | 1048 | opt_help=false |
1631 | 1053 | opt_help_all=false | 1049 | opt_help_all=false |
1632 | 1054 | opt_silent=: | 1050 | opt_silent=: |
1633 | 1051 | opt_warning=: | ||
1634 | 1055 | opt_verbose=: | 1052 | opt_verbose=: |
1635 | 1056 | opt_silent=false | 1053 | opt_silent=false |
1636 | 1057 | opt_verbose=false | 1054 | opt_verbose=false |
1637 | @@ -1120,6 +1117,10 @@ | |||
1638 | 1120 | opt_silent=false | 1117 | opt_silent=false |
1639 | 1121 | func_append preserve_args " $opt" | 1118 | func_append preserve_args " $opt" |
1640 | 1122 | ;; | 1119 | ;; |
1641 | 1120 | --no-warning|--no-warn) | ||
1642 | 1121 | opt_warning=false | ||
1643 | 1122 | func_append preserve_args " $opt" | ||
1644 | 1123 | ;; | ||
1645 | 1123 | --no-verbose) | 1124 | --no-verbose) |
1646 | 1124 | opt_verbose=false | 1125 | opt_verbose=false |
1647 | 1125 | func_append preserve_args " $opt" | 1126 | func_append preserve_args " $opt" |
1648 | @@ -2059,7 +2060,7 @@ | |||
1649 | 2059 | *.[cCFSifmso] | \ | 2060 | *.[cCFSifmso] | \ |
1650 | 2060 | *.ada | *.adb | *.ads | *.asm | \ | 2061 | *.ada | *.adb | *.ads | *.asm | \ |
1651 | 2061 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ | 2062 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ |
1653 | 2062 | *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) | 2063 | *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) |
1654 | 2063 | func_xform "$libobj" | 2064 | func_xform "$libobj" |
1655 | 2064 | libobj=$func_xform_result | 2065 | libobj=$func_xform_result |
1656 | 2065 | ;; | 2066 | ;; |
1657 | @@ -3201,11 +3202,13 @@ | |||
1658 | 3201 | 3202 | ||
1659 | 3202 | # Set up the ranlib parameters. | 3203 | # Set up the ranlib parameters. |
1660 | 3203 | oldlib="$destdir/$name" | 3204 | oldlib="$destdir/$name" |
1661 | 3205 | func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 | ||
1662 | 3206 | tool_oldlib=$func_to_tool_file_result | ||
1663 | 3204 | 3207 | ||
1664 | 3205 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' | 3208 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' |
1665 | 3206 | 3209 | ||
1666 | 3207 | if test -n "$stripme" && test -n "$old_striplib"; then | 3210 | if test -n "$stripme" && test -n "$old_striplib"; then |
1668 | 3208 | func_show_eval "$old_striplib $oldlib" 'exit $?' | 3211 | func_show_eval "$old_striplib $tool_oldlib" 'exit $?' |
1669 | 3209 | fi | 3212 | fi |
1670 | 3210 | 3213 | ||
1671 | 3211 | # Do each command in the postinstall commands. | 3214 | # Do each command in the postinstall commands. |
1672 | @@ -3470,7 +3473,7 @@ | |||
1673 | 3470 | # linked before any other PIC object. But we must not use | 3473 | # linked before any other PIC object. But we must not use |
1674 | 3471 | # pic_flag when linking with -static. The problem exists in | 3474 | # pic_flag when linking with -static. The problem exists in |
1675 | 3472 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. | 3475 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. |
1677 | 3473 | *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) | 3476 | *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
1678 | 3474 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; | 3477 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; |
1679 | 3475 | *-*-hpux*) | 3478 | *-*-hpux*) |
1680 | 3476 | pic_flag_for_symtable=" $pic_flag" ;; | 3479 | pic_flag_for_symtable=" $pic_flag" ;; |
1681 | @@ -3982,14 +3985,17 @@ | |||
1682 | 3982 | # launches target application with the remaining arguments. | 3985 | # launches target application with the remaining arguments. |
1683 | 3983 | func_exec_program () | 3986 | func_exec_program () |
1684 | 3984 | { | 3987 | { |
1693 | 3985 | for lt_wr_arg | 3988 | case \" \$* \" in |
1694 | 3986 | do | 3989 | *\\ --lt-*) |
1695 | 3987 | case \$lt_wr_arg in | 3990 | for lt_wr_arg |
1696 | 3988 | --lt-*) ;; | 3991 | do |
1697 | 3989 | *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; | 3992 | case \$lt_wr_arg in |
1698 | 3990 | esac | 3993 | --lt-*) ;; |
1699 | 3991 | shift | 3994 | *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
1700 | 3992 | done | 3995 | esac |
1701 | 3996 | shift | ||
1702 | 3997 | done ;; | ||
1703 | 3998 | esac | ||
1704 | 3993 | func_exec_program_core \${1+\"\$@\"} | 3999 | func_exec_program_core \${1+\"\$@\"} |
1705 | 3994 | } | 4000 | } |
1706 | 3995 | 4001 | ||
1707 | @@ -5057,9 +5063,15 @@ | |||
1708 | 5057 | { | 5063 | { |
1709 | 5058 | EOF | 5064 | EOF |
1710 | 5059 | func_emit_wrapper yes | | 5065 | func_emit_wrapper yes | |
1714 | 5060 | $SED -e 's/\([\\"]\)/\\\1/g' \ | 5066 | $SED -n -e ' |
1715 | 5061 | -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' | 5067 | s/^\(.\{79\}\)\(..*\)/\1\ |
1716 | 5062 | 5068 | \2/ | |
1717 | 5069 | h | ||
1718 | 5070 | s/\([\\"]\)/\\\1/g | ||
1719 | 5071 | s/$/\\n/ | ||
1720 | 5072 | s/\([^\n]*\).*/ fputs ("\1", f);/p | ||
1721 | 5073 | g | ||
1722 | 5074 | D' | ||
1723 | 5063 | cat <<"EOF" | 5075 | cat <<"EOF" |
1724 | 5064 | } | 5076 | } |
1725 | 5065 | EOF | 5077 | EOF |
1726 | @@ -5643,7 +5655,8 @@ | |||
1727 | 5643 | continue | 5655 | continue |
1728 | 5644 | ;; | 5656 | ;; |
1729 | 5645 | 5657 | ||
1731 | 5646 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) | 5658 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
1732 | 5659 | |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) | ||
1733 | 5647 | func_append compiler_flags " $arg" | 5660 | func_append compiler_flags " $arg" |
1734 | 5648 | func_append compile_command " $arg" | 5661 | func_append compile_command " $arg" |
1735 | 5649 | func_append finalize_command " $arg" | 5662 | func_append finalize_command " $arg" |
1736 | @@ -6150,7 +6163,8 @@ | |||
1737 | 6150 | lib= | 6163 | lib= |
1738 | 6151 | found=no | 6164 | found=no |
1739 | 6152 | case $deplib in | 6165 | case $deplib in |
1741 | 6153 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) | 6166 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
1742 | 6167 | |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) | ||
1743 | 6154 | if test "$linkmode,$pass" = "prog,link"; then | 6168 | if test "$linkmode,$pass" = "prog,link"; then |
1744 | 6155 | compile_deplibs="$deplib $compile_deplibs" | 6169 | compile_deplibs="$deplib $compile_deplibs" |
1745 | 6156 | finalize_deplibs="$deplib $finalize_deplibs" | 6170 | finalize_deplibs="$deplib $finalize_deplibs" |
1746 | @@ -6834,7 +6848,7 @@ | |||
1747 | 6834 | test "$hardcode_direct_absolute" = no; then | 6848 | test "$hardcode_direct_absolute" = no; then |
1748 | 6835 | add="$dir/$linklib" | 6849 | add="$dir/$linklib" |
1749 | 6836 | elif test "$hardcode_minus_L" = yes; then | 6850 | elif test "$hardcode_minus_L" = yes; then |
1751 | 6837 | add_dir="-L$dir" | 6851 | add_dir="-L$absdir" |
1752 | 6838 | # Try looking first in the location we're being installed to. | 6852 | # Try looking first in the location we're being installed to. |
1753 | 6839 | if test -n "$inst_prefix_dir"; then | 6853 | if test -n "$inst_prefix_dir"; then |
1754 | 6840 | case $libdir in | 6854 | case $libdir in |
1755 | @@ -7319,6 +7333,7 @@ | |||
1756 | 7319 | # which has an extra 1 added just for fun | 7333 | # which has an extra 1 added just for fun |
1757 | 7320 | # | 7334 | # |
1758 | 7321 | case $version_type in | 7335 | case $version_type in |
1759 | 7336 | # correct linux to gnu/linux during the next big refactor | ||
1760 | 7322 | darwin|linux|osf|windows|none) | 7337 | darwin|linux|osf|windows|none) |
1761 | 7323 | func_arith $number_major + $number_minor | 7338 | func_arith $number_major + $number_minor |
1762 | 7324 | current=$func_arith_result | 7339 | current=$func_arith_result |
1763 | @@ -7438,7 +7453,7 @@ | |||
1764 | 7438 | versuffix="$major.$revision" | 7453 | versuffix="$major.$revision" |
1765 | 7439 | ;; | 7454 | ;; |
1766 | 7440 | 7455 | ||
1768 | 7441 | linux) | 7456 | linux) # correct to gnu/linux during the next big refactor |
1769 | 7442 | func_arith $current - $age | 7457 | func_arith $current - $age |
1770 | 7443 | major=.$func_arith_result | 7458 | major=.$func_arith_result |
1771 | 7444 | versuffix="$major.$age.$revision" | 7459 | versuffix="$major.$age.$revision" |
1772 | @@ -8026,6 +8041,11 @@ | |||
1773 | 8026 | 8041 | ||
1774 | 8027 | # Test again, we may have decided not to build it any more | 8042 | # Test again, we may have decided not to build it any more |
1775 | 8028 | if test "$build_libtool_libs" = yes; then | 8043 | if test "$build_libtool_libs" = yes; then |
1776 | 8044 | # Remove ${wl} instances when linking with ld. | ||
1777 | 8045 | # FIXME: should test the right _cmds variable. | ||
1778 | 8046 | case $archive_cmds in | ||
1779 | 8047 | *\$LD\ *) wl= ;; | ||
1780 | 8048 | esac | ||
1781 | 8029 | if test "$hardcode_into_libs" = yes; then | 8049 | if test "$hardcode_into_libs" = yes; then |
1782 | 8030 | # Hardcode the library paths | 8050 | # Hardcode the library paths |
1783 | 8031 | hardcode_libdirs= | 8051 | hardcode_libdirs= |
1784 | @@ -8056,7 +8076,7 @@ | |||
1785 | 8056 | elif test -n "$runpath_var"; then | 8076 | elif test -n "$runpath_var"; then |
1786 | 8057 | case "$perm_rpath " in | 8077 | case "$perm_rpath " in |
1787 | 8058 | *" $libdir "*) ;; | 8078 | *" $libdir "*) ;; |
1789 | 8059 | *) func_apped perm_rpath " $libdir" ;; | 8079 | *) func_append perm_rpath " $libdir" ;; |
1790 | 8060 | esac | 8080 | esac |
1791 | 8061 | fi | 8081 | fi |
1792 | 8062 | done | 8082 | done |
1793 | @@ -8064,11 +8084,7 @@ | |||
1794 | 8064 | if test -n "$hardcode_libdir_separator" && | 8084 | if test -n "$hardcode_libdir_separator" && |
1795 | 8065 | test -n "$hardcode_libdirs"; then | 8085 | test -n "$hardcode_libdirs"; then |
1796 | 8066 | libdir="$hardcode_libdirs" | 8086 | libdir="$hardcode_libdirs" |
1802 | 8067 | if test -n "$hardcode_libdir_flag_spec_ld"; then | 8087 | eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
1798 | 8068 | eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" | ||
1799 | 8069 | else | ||
1800 | 8070 | eval dep_rpath=\"$hardcode_libdir_flag_spec\" | ||
1801 | 8071 | fi | ||
1803 | 8072 | fi | 8088 | fi |
1804 | 8073 | if test -n "$runpath_var" && test -n "$perm_rpath"; then | 8089 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
1805 | 8074 | # We should set the runpath_var. | 8090 | # We should set the runpath_var. |
1806 | @@ -9158,6 +9174,8 @@ | |||
1807 | 9158 | esac | 9174 | esac |
1808 | 9159 | done | 9175 | done |
1809 | 9160 | fi | 9176 | fi |
1810 | 9177 | func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 | ||
1811 | 9178 | tool_oldlib=$func_to_tool_file_result | ||
1812 | 9161 | eval cmds=\"$old_archive_cmds\" | 9179 | eval cmds=\"$old_archive_cmds\" |
1813 | 9162 | 9180 | ||
1814 | 9163 | func_len " $cmds" | 9181 | func_len " $cmds" |
1815 | @@ -9267,7 +9285,8 @@ | |||
1816 | 9267 | *.la) | 9285 | *.la) |
1817 | 9268 | func_basename "$deplib" | 9286 | func_basename "$deplib" |
1818 | 9269 | name="$func_basename_result" | 9287 | name="$func_basename_result" |
1820 | 9270 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | 9288 | func_resolve_sysroot "$deplib" |
1821 | 9289 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
1822 | 9271 | test -z "$libdir" && \ | 9290 | test -z "$libdir" && \ |
1823 | 9272 | func_fatal_error "\`$deplib' is not a valid libtool archive" | 9291 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
1824 | 9273 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" | 9292 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
1825 | 9274 | 9293 | ||
1826 | === modified file 'build-aux/missing' | |||
1827 | --- build-aux/missing 2011-07-07 18:12:06 +0000 | |||
1828 | +++ build-aux/missing 2012-02-14 22:32:23 +0000 | |||
1829 | @@ -1,10 +1,10 @@ | |||
1830 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1831 | 2 | # Common stub for a few missing GNU programs while installing. | 2 | # Common stub for a few missing GNU programs while installing. |
1832 | 3 | 3 | ||
1834 | 4 | scriptversion=2009-04-28.21; # UTC | 4 | scriptversion=2012-01-06.13; # UTC |
1835 | 5 | 5 | ||
1836 | 6 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, | 6 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, |
1838 | 7 | # 2008, 2009 Free Software Foundation, Inc. | 7 | # 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. |
1839 | 8 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. | 8 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
1840 | 9 | 9 | ||
1841 | 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 |
1842 | @@ -84,7 +84,6 @@ | |||
1843 | 84 | help2man touch the output file | 84 | help2man touch the output file |
1844 | 85 | lex create \`lex.yy.c', if possible, from existing .c | 85 | lex create \`lex.yy.c', if possible, from existing .c |
1845 | 86 | makeinfo touch the output file | 86 | makeinfo touch the output file |
1846 | 87 | tar try tar, gnutar, gtar, then tar without non-portable flags | ||
1847 | 88 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] | 87 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] |
1848 | 89 | 88 | ||
1849 | 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 |
1850 | @@ -122,15 +121,6 @@ | |||
1851 | 122 | # Not GNU programs, they don't have --version. | 121 | # Not GNU programs, they don't have --version. |
1852 | 123 | ;; | 122 | ;; |
1853 | 124 | 123 | ||
1854 | 125 | tar*) | ||
1855 | 126 | if test -n "$run"; then | ||
1856 | 127 | echo 1>&2 "ERROR: \`tar' requires --run" | ||
1857 | 128 | exit 1 | ||
1858 | 129 | elif test "x$2" = "x--version" || test "x$2" = "x--help"; then | ||
1859 | 130 | exit 1 | ||
1860 | 131 | fi | ||
1861 | 132 | ;; | ||
1862 | 133 | |||
1863 | 134 | *) | 124 | *) |
1864 | 135 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then | 125 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
1865 | 136 | # We have it, but it failed. | 126 | # We have it, but it failed. |
1866 | @@ -226,7 +216,7 @@ | |||
1867 | 226 | \`Bison' from any GNU archive site." | 216 | \`Bison' from any GNU archive site." |
1868 | 227 | rm -f y.tab.c y.tab.h | 217 | rm -f y.tab.c y.tab.h |
1869 | 228 | if test $# -ne 1; then | 218 | if test $# -ne 1; then |
1871 | 229 | eval LASTARG="\${$#}" | 219 | eval LASTARG=\${$#} |
1872 | 230 | case $LASTARG in | 220 | case $LASTARG in |
1873 | 231 | *.y) | 221 | *.y) |
1874 | 232 | SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` | 222 | SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` |
1875 | @@ -256,7 +246,7 @@ | |||
1876 | 256 | \`Flex' from any GNU archive site." | 246 | \`Flex' from any GNU archive site." |
1877 | 257 | rm -f lex.yy.c | 247 | rm -f lex.yy.c |
1878 | 258 | if test $# -ne 1; then | 248 | if test $# -ne 1; then |
1880 | 259 | eval LASTARG="\${$#}" | 249 | eval LASTARG=\${$#} |
1881 | 260 | case $LASTARG in | 250 | case $LASTARG in |
1882 | 261 | *.l) | 251 | *.l) |
1883 | 262 | SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` | 252 | SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` |
1884 | @@ -318,41 +308,6 @@ | |||
1885 | 318 | touch $file | 308 | touch $file |
1886 | 319 | ;; | 309 | ;; |
1887 | 320 | 310 | ||
1888 | 321 | tar*) | ||
1889 | 322 | shift | ||
1890 | 323 | |||
1891 | 324 | # We have already tried tar in the generic part. | ||
1892 | 325 | # Look for gnutar/gtar before invocation to avoid ugly error | ||
1893 | 326 | # messages. | ||
1894 | 327 | if (gnutar --version > /dev/null 2>&1); then | ||
1895 | 328 | gnutar "$@" && exit 0 | ||
1896 | 329 | fi | ||
1897 | 330 | if (gtar --version > /dev/null 2>&1); then | ||
1898 | 331 | gtar "$@" && exit 0 | ||
1899 | 332 | fi | ||
1900 | 333 | firstarg="$1" | ||
1901 | 334 | if shift; then | ||
1902 | 335 | case $firstarg in | ||
1903 | 336 | *o*) | ||
1904 | 337 | firstarg=`echo "$firstarg" | sed s/o//` | ||
1905 | 338 | tar "$firstarg" "$@" && exit 0 | ||
1906 | 339 | ;; | ||
1907 | 340 | esac | ||
1908 | 341 | case $firstarg in | ||
1909 | 342 | *h*) | ||
1910 | 343 | firstarg=`echo "$firstarg" | sed s/h//` | ||
1911 | 344 | tar "$firstarg" "$@" && exit 0 | ||
1912 | 345 | ;; | ||
1913 | 346 | esac | ||
1914 | 347 | fi | ||
1915 | 348 | |||
1916 | 349 | echo 1>&2 "\ | ||
1917 | 350 | WARNING: I can't seem to be able to run \`tar' with the given arguments. | ||
1918 | 351 | You may want to install GNU tar or Free paxutils, or check the | ||
1919 | 352 | command line arguments." | ||
1920 | 353 | exit 1 | ||
1921 | 354 | ;; | ||
1922 | 355 | |||
1923 | 356 | *) | 311 | *) |
1924 | 357 | echo 1>&2 "\ | 312 | echo 1>&2 "\ |
1925 | 358 | WARNING: \`$1' is needed, and is $msg. | 313 | WARNING: \`$1' is needed, and is $msg. |
1926 | 359 | 314 | ||
1927 | === modified file 'configure' | |||
1928 | --- configure 2011-10-24 15:07:53 +0000 | |||
1929 | +++ configure 2012-02-14 22:32:23 +0000 | |||
1930 | @@ -1,6 +1,6 @@ | |||
1931 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1932 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
1934 | 3 | # Generated by GNU Autoconf 2.68 for indicator-power 0.10. | 3 | # Generated by GNU Autoconf 2.68 for indicator-power 1.90. |
1935 | 4 | # | 4 | # |
1936 | 5 | # Report bugs to <http://bugs.launchpad.net/indicator-power>. | 5 | # Report bugs to <http://bugs.launchpad.net/indicator-power>. |
1937 | 6 | # | 6 | # |
1938 | @@ -570,8 +570,8 @@ | |||
1939 | 570 | # Identity of this package. | 570 | # Identity of this package. |
1940 | 571 | PACKAGE_NAME='indicator-power' | 571 | PACKAGE_NAME='indicator-power' |
1941 | 572 | PACKAGE_TARNAME='indicator-power' | 572 | PACKAGE_TARNAME='indicator-power' |
1944 | 573 | PACKAGE_VERSION='0.10' | 573 | PACKAGE_VERSION='1.90' |
1945 | 574 | PACKAGE_STRING='indicator-power 0.10' | 574 | PACKAGE_STRING='indicator-power 1.90' |
1946 | 575 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-power' | 575 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-power' |
1947 | 576 | PACKAGE_URL='http://launchpad.net/indicator-power' | 576 | PACKAGE_URL='http://launchpad.net/indicator-power' |
1948 | 577 | 577 | ||
1949 | @@ -656,12 +656,25 @@ | |||
1950 | 656 | INTLTOOL_KEYS_RULE | 656 | INTLTOOL_KEYS_RULE |
1951 | 657 | INTLTOOL_DIRECTORY_RULE | 657 | INTLTOOL_DIRECTORY_RULE |
1952 | 658 | INTLTOOL_DESKTOP_RULE | 658 | INTLTOOL_DESKTOP_RULE |
1953 | 659 | intltool__v_merge_options_0 | ||
1954 | 660 | intltool__v_merge_options_ | ||
1955 | 661 | INTLTOOL_V_MERGE_OPTIONS | ||
1956 | 662 | INTLTOOL__v_MERGE_0 | ||
1957 | 663 | INTLTOOL__v_MERGE_ | ||
1958 | 664 | INTLTOOL_V_MERGE | ||
1959 | 659 | INTLTOOL_EXTRACT | 665 | INTLTOOL_EXTRACT |
1960 | 660 | INTLTOOL_MERGE | 666 | INTLTOOL_MERGE |
1961 | 661 | INTLTOOL_UPDATE | 667 | INTLTOOL_UPDATE |
1962 | 662 | USE_NLS | 668 | USE_NLS |
1963 | 663 | INDICATORICONSDIR | 669 | INDICATORICONSDIR |
1964 | 664 | INDICATORDIR | 670 | INDICATORDIR |
1965 | 671 | COVERAGE_LDFLAGS | ||
1966 | 672 | COVERAGE_CXXFLAGS | ||
1967 | 673 | COVERAGE_CFLAGS | ||
1968 | 674 | GCOVR | ||
1969 | 675 | GENHTML | ||
1970 | 676 | LCOV | ||
1971 | 677 | SHTOOL | ||
1972 | 665 | GSETTINGS_RULES | 678 | GSETTINGS_RULES |
1973 | 666 | GLIB_COMPILE_SCHEMAS | 679 | GLIB_COMPILE_SCHEMAS |
1974 | 667 | gsettingsschemadir | 680 | gsettingsschemadir |
1975 | @@ -708,6 +721,7 @@ | |||
1976 | 708 | am__fastdepCC_FALSE | 721 | am__fastdepCC_FALSE |
1977 | 709 | am__fastdepCC_TRUE | 722 | am__fastdepCC_TRUE |
1978 | 710 | CCDEPMODE | 723 | CCDEPMODE |
1979 | 724 | am__nodep | ||
1980 | 711 | AMDEPBACKSLASH | 725 | AMDEPBACKSLASH |
1981 | 712 | AMDEP_FALSE | 726 | AMDEP_FALSE |
1982 | 713 | AMDEP_TRUE | 727 | AMDEP_TRUE |
1983 | @@ -723,6 +737,8 @@ | |||
1984 | 723 | CC | 737 | CC |
1985 | 724 | AM_BACKSLASH | 738 | AM_BACKSLASH |
1986 | 725 | AM_DEFAULT_VERBOSITY | 739 | AM_DEFAULT_VERBOSITY |
1987 | 740 | AM_DEFAULT_V | ||
1988 | 741 | AM_V | ||
1989 | 726 | MAINT | 742 | MAINT |
1990 | 727 | MAINTAINER_MODE_FALSE | 743 | MAINTAINER_MODE_FALSE |
1991 | 728 | MAINTAINER_MODE_TRUE | 744 | MAINTAINER_MODE_TRUE |
1992 | @@ -801,6 +817,7 @@ | |||
1993 | 801 | with_sysroot | 817 | with_sysroot |
1994 | 802 | enable_libtool_lock | 818 | enable_libtool_lock |
1995 | 803 | enable_schemas_compile | 819 | enable_schemas_compile |
1996 | 820 | enable_gcov | ||
1997 | 804 | enable_localinstall | 821 | enable_localinstall |
1998 | 805 | enable_nls | 822 | enable_nls |
1999 | 806 | enable_rpath | 823 | enable_rpath |
2000 | @@ -1367,7 +1384,7 @@ | |||
2001 | 1367 | # Omit some internal or obsolete options to make the list less imposing. | 1384 | # Omit some internal or obsolete options to make the list less imposing. |
2002 | 1368 | # This message is too long to be a string in the A/UX 3.1 sh. | 1385 | # This message is too long to be a string in the A/UX 3.1 sh. |
2003 | 1369 | cat <<_ACEOF | 1386 | cat <<_ACEOF |
2005 | 1370 | \`configure' configures indicator-power 0.10 to adapt to many kinds of systems. | 1387 | \`configure' configures indicator-power 1.90 to adapt to many kinds of systems. |
2006 | 1371 | 1388 | ||
2007 | 1372 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1389 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2008 | 1373 | 1390 | ||
2009 | @@ -1437,7 +1454,7 @@ | |||
2010 | 1437 | 1454 | ||
2011 | 1438 | if test -n "$ac_init_help"; then | 1455 | if test -n "$ac_init_help"; then |
2012 | 1439 | case $ac_init_help in | 1456 | case $ac_init_help in |
2014 | 1440 | short | recursive ) echo "Configuration of indicator-power 0.10:";; | 1457 | short | recursive ) echo "Configuration of indicator-power 1.90:";; |
2015 | 1441 | esac | 1458 | esac |
2016 | 1442 | cat <<\_ACEOF | 1459 | cat <<\_ACEOF |
2017 | 1443 | 1460 | ||
2018 | @@ -1458,6 +1475,7 @@ | |||
2019 | 1458 | --disable-libtool-lock avoid locking (might break parallel builds) | 1475 | --disable-libtool-lock avoid locking (might break parallel builds) |
2020 | 1459 | --disable-schemas-compile | 1476 | --disable-schemas-compile |
2021 | 1460 | Disable regeneration of gschemas.compiled on install | 1477 | Disable regeneration of gschemas.compiled on install |
2022 | 1478 | --enable-gcov enable coverage testing with gcov | ||
2023 | 1461 | --enable-localinstall install all of the files localy instead of system | 1479 | --enable-localinstall install all of the files localy instead of system |
2024 | 1462 | directories (for distcheck) | 1480 | directories (for distcheck) |
2025 | 1463 | --disable-nls do not use Native Language Support | 1481 | --disable-nls do not use Native Language Support |
2026 | @@ -1466,7 +1484,7 @@ | |||
2027 | 1466 | Optional Packages: | 1484 | Optional Packages: |
2028 | 1467 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | 1485 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
2029 | 1468 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | 1486 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
2031 | 1469 | --with-pic try to use only PIC/non-PIC objects [default=use | 1487 | --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
2032 | 1470 | both] | 1488 | both] |
2033 | 1471 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 1489 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
2034 | 1472 | --with-sysroot=DIR Search for dependent libraries within DIR | 1490 | --with-sysroot=DIR Search for dependent libraries within DIR |
2035 | @@ -1568,7 +1586,7 @@ | |||
2036 | 1568 | test -n "$ac_init_help" && exit $ac_status | 1586 | test -n "$ac_init_help" && exit $ac_status |
2037 | 1569 | if $ac_init_version; then | 1587 | if $ac_init_version; then |
2038 | 1570 | cat <<\_ACEOF | 1588 | cat <<\_ACEOF |
2040 | 1571 | indicator-power configure 0.10 | 1589 | indicator-power configure 1.90 |
2041 | 1572 | generated by GNU Autoconf 2.68 | 1590 | generated by GNU Autoconf 2.68 |
2042 | 1573 | 1591 | ||
2043 | 1574 | Copyright (C) 2010 Free Software Foundation, Inc. | 1592 | Copyright (C) 2010 Free Software Foundation, Inc. |
2044 | @@ -1846,7 +1864,7 @@ | |||
2045 | 1846 | This file contains any messages produced by compilers while | 1864 | This file contains any messages produced by compilers while |
2046 | 1847 | running configure, to aid debugging if configure makes a mistake. | 1865 | running configure, to aid debugging if configure makes a mistake. |
2047 | 1848 | 1866 | ||
2049 | 1849 | It was created by indicator-power $as_me 0.10, which was | 1867 | It was created by indicator-power $as_me 1.90, which was |
2050 | 1850 | generated by GNU Autoconf 2.68. Invocation command line was | 1868 | generated by GNU Autoconf 2.68. Invocation command line was |
2051 | 1851 | 1869 | ||
2052 | 1852 | $ $0 $@ | 1870 | $ $0 $@ |
2053 | @@ -2670,7 +2688,7 @@ | |||
2054 | 2670 | 2688 | ||
2055 | 2671 | # Define the identity of the package. | 2689 | # Define the identity of the package. |
2056 | 2672 | PACKAGE='indicator-power' | 2690 | PACKAGE='indicator-power' |
2058 | 2673 | VERSION='0.10' | 2691 | VERSION='1.90' |
2059 | 2674 | 2692 | ||
2060 | 2675 | 2693 | ||
2061 | 2676 | cat >>confdefs.h <<_ACEOF | 2694 | cat >>confdefs.h <<_ACEOF |
2062 | @@ -2700,19 +2718,19 @@ | |||
2063 | 2700 | 2718 | ||
2064 | 2701 | # We need awk for the "check" target. The system "awk" is bad on | 2719 | # We need awk for the "check" target. The system "awk" is bad on |
2065 | 2702 | # some platforms. | 2720 | # some platforms. |
2079 | 2703 | # Always define AMTAR for backward compatibility. | 2721 | # Always define AMTAR for backward compatibility. Yes, it's still used |
2080 | 2704 | 2722 | # in the wild :-( We should find a proper way to deprecate it ... | |
2081 | 2705 | AMTAR=${AMTAR-"${am_missing_run}tar"} | 2723 | AMTAR='$${TAR-tar}' |
2082 | 2706 | 2724 | ||
2083 | 2707 | am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' | 2725 | am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
2084 | 2708 | 2726 | ||
2085 | 2709 | 2727 | ||
2086 | 2710 | 2728 | ||
2087 | 2711 | 2729 | ||
2088 | 2712 | 2730 | ||
2089 | 2713 | 2731 | ||
2090 | 2714 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 | 2732 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
2091 | 2715 | $as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } | 2733 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
2092 | 2716 | # Check whether --enable-maintainer-mode was given. | 2734 | # Check whether --enable-maintainer-mode was given. |
2093 | 2717 | if test "${enable_maintainer_mode+set}" = set; then : | 2735 | if test "${enable_maintainer_mode+set}" = set; then : |
2094 | 2718 | enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval | 2736 | enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval |
2095 | @@ -2744,6 +2762,33 @@ | |||
2096 | 2744 | no) AM_DEFAULT_VERBOSITY=1;; | 2762 | no) AM_DEFAULT_VERBOSITY=1;; |
2097 | 2745 | *) AM_DEFAULT_VERBOSITY=0;; | 2763 | *) AM_DEFAULT_VERBOSITY=0;; |
2098 | 2746 | esac | 2764 | esac |
2099 | 2765 | am_make=${MAKE-make} | ||
2100 | 2766 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 | ||
2101 | 2767 | $as_echo_n "checking whether $am_make supports nested variables... " >&6; } | ||
2102 | 2768 | if ${am_cv_make_support_nested_variables+:} false; then : | ||
2103 | 2769 | $as_echo_n "(cached) " >&6 | ||
2104 | 2770 | else | ||
2105 | 2771 | if $as_echo 'TRUE=$(BAR$(V)) | ||
2106 | 2772 | BAR0=false | ||
2107 | 2773 | BAR1=true | ||
2108 | 2774 | V=1 | ||
2109 | 2775 | am__doit: | ||
2110 | 2776 | @$(TRUE) | ||
2111 | 2777 | .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then | ||
2112 | 2778 | am_cv_make_support_nested_variables=yes | ||
2113 | 2779 | else | ||
2114 | 2780 | am_cv_make_support_nested_variables=no | ||
2115 | 2781 | fi | ||
2116 | 2782 | fi | ||
2117 | 2783 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 | ||
2118 | 2784 | $as_echo "$am_cv_make_support_nested_variables" >&6; } | ||
2119 | 2785 | if test $am_cv_make_support_nested_variables = yes; then | ||
2120 | 2786 | AM_V='$(V)' | ||
2121 | 2787 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
2122 | 2788 | else | ||
2123 | 2789 | AM_V=$AM_DEFAULT_VERBOSITY | ||
2124 | 2790 | AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
2125 | 2791 | fi | ||
2126 | 2747 | AM_BACKSLASH='\' | 2792 | AM_BACKSLASH='\' |
2127 | 2748 | 2793 | ||
2128 | 2749 | 2794 | ||
2129 | @@ -3589,6 +3634,7 @@ | |||
2130 | 3589 | if test "x$enable_dependency_tracking" != xno; then | 3634 | if test "x$enable_dependency_tracking" != xno; then |
2131 | 3590 | am_depcomp="$ac_aux_dir/depcomp" | 3635 | am_depcomp="$ac_aux_dir/depcomp" |
2132 | 3591 | AMDEPBACKSLASH='\' | 3636 | AMDEPBACKSLASH='\' |
2133 | 3637 | am__nodep='_no' | ||
2134 | 3592 | fi | 3638 | fi |
2135 | 3593 | if test "x$enable_dependency_tracking" != xno; then | 3639 | if test "x$enable_dependency_tracking" != xno; then |
2136 | 3594 | AMDEP_TRUE= | 3640 | AMDEP_TRUE= |
2137 | @@ -3613,6 +3659,7 @@ | |||
2138 | 3613 | # instance it was reported that on HP-UX the gcc test will end up | 3659 | # instance it was reported that on HP-UX the gcc test will end up |
2139 | 3614 | # making a dummy file named `D' -- because `-MD' means `put the output | 3660 | # making a dummy file named `D' -- because `-MD' means `put the output |
2140 | 3615 | # in D'. | 3661 | # in D'. |
2141 | 3662 | rm -rf conftest.dir | ||
2142 | 3616 | mkdir conftest.dir | 3663 | mkdir conftest.dir |
2143 | 3617 | # Copy depcomp to subdir because otherwise we won't find it if we're | 3664 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2144 | 3618 | # using a relative directory. | 3665 | # using a relative directory. |
2145 | @@ -3672,7 +3719,7 @@ | |||
2146 | 3672 | break | 3719 | break |
2147 | 3673 | fi | 3720 | fi |
2148 | 3674 | ;; | 3721 | ;; |
2150 | 3675 | msvisualcpp | msvcmsys) | 3722 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2151 | 3676 | # This compiler won't grok `-c -o', but also, the minuso test has | 3723 | # This compiler won't grok `-c -o', but also, the minuso test has |
2152 | 3677 | # not run yet. These depmodes are late enough in the game, and | 3724 | # not run yet. These depmodes are late enough in the game, and |
2153 | 3678 | # so weak that their functioning should not be impacted. | 3725 | # so weak that their functioning should not be impacted. |
2154 | @@ -3864,8 +3911,8 @@ | |||
2155 | 3864 | 3911 | ||
2156 | 3865 | 3912 | ||
2157 | 3866 | 3913 | ||
2160 | 3867 | macro_version='2.4' | 3914 | macro_version='2.4.2' |
2161 | 3868 | macro_revision='1.3293' | 3915 | macro_revision='1.3337' |
2162 | 3869 | 3916 | ||
2163 | 3870 | 3917 | ||
2164 | 3871 | 3918 | ||
2165 | @@ -4710,6 +4757,11 @@ | |||
2166 | 4710 | lt_cv_sys_max_cmd_len=196608 | 4757 | lt_cv_sys_max_cmd_len=196608 |
2167 | 4711 | ;; | 4758 | ;; |
2168 | 4712 | 4759 | ||
2169 | 4760 | os2*) | ||
2170 | 4761 | # The test takes a long time on OS/2. | ||
2171 | 4762 | lt_cv_sys_max_cmd_len=8192 | ||
2172 | 4763 | ;; | ||
2173 | 4764 | |||
2174 | 4713 | osf*) | 4765 | osf*) |
2175 | 4714 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | 4766 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2176 | 4715 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | 4767 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2177 | @@ -4749,7 +4801,7 @@ | |||
2178 | 4749 | # If test is not a shell built-in, we'll probably end up computing a | 4801 | # If test is not a shell built-in, we'll probably end up computing a |
2179 | 4750 | # maximum length that is only half of the actual maximum length, but | 4802 | # maximum length that is only half of the actual maximum length, but |
2180 | 4751 | # we can't tell. | 4803 | # we can't tell. |
2182 | 4752 | while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | 4804 | while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2183 | 4753 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | 4805 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2184 | 4754 | test $i != 17 # 1/2 MB should be enough | 4806 | test $i != 17 # 1/2 MB should be enough |
2185 | 4755 | do | 4807 | do |
2186 | @@ -5178,7 +5230,7 @@ | |||
2187 | 5178 | lt_cv_deplibs_check_method=pass_all | 5230 | lt_cv_deplibs_check_method=pass_all |
2188 | 5179 | ;; | 5231 | ;; |
2189 | 5180 | 5232 | ||
2191 | 5181 | # This must be Linux ELF. | 5233 | # This must be glibc/ELF. |
2192 | 5182 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 5234 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2193 | 5183 | lt_cv_deplibs_check_method=pass_all | 5235 | lt_cv_deplibs_check_method=pass_all |
2194 | 5184 | ;; | 5236 | ;; |
2195 | @@ -5819,13 +5871,13 @@ | |||
2196 | 5819 | if test -n "$RANLIB"; then | 5871 | if test -n "$RANLIB"; then |
2197 | 5820 | case $host_os in | 5872 | case $host_os in |
2198 | 5821 | openbsd*) | 5873 | openbsd*) |
2200 | 5822 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | 5874 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
2201 | 5823 | ;; | 5875 | ;; |
2202 | 5824 | *) | 5876 | *) |
2204 | 5825 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | 5877 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
2205 | 5826 | ;; | 5878 | ;; |
2206 | 5827 | esac | 5879 | esac |
2208 | 5828 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 5880 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
2209 | 5829 | fi | 5881 | fi |
2210 | 5830 | 5882 | ||
2211 | 5831 | case $host_os in | 5883 | case $host_os in |
2212 | @@ -5972,6 +6024,7 @@ | |||
2213 | 5972 | # which start with @ or ?. | 6024 | # which start with @ or ?. |
2214 | 5973 | lt_cv_sys_global_symbol_pipe="$AWK '"\ | 6025 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
2215 | 5974 | " {last_section=section; section=\$ 3};"\ | 6026 | " {last_section=section; section=\$ 3};"\ |
2216 | 6027 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
2217 | 5975 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | 6028 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
2218 | 5976 | " \$ 0!~/External *\|/{next};"\ | 6029 | " \$ 0!~/External *\|/{next};"\ |
2219 | 5977 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | 6030 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
2220 | @@ -6360,7 +6413,7 @@ | |||
2221 | 6360 | CFLAGS="$SAVE_CFLAGS" | 6413 | CFLAGS="$SAVE_CFLAGS" |
2222 | 6361 | fi | 6414 | fi |
2223 | 6362 | ;; | 6415 | ;; |
2225 | 6363 | sparc*-*solaris*) | 6416 | *-*solaris*) |
2226 | 6364 | # Find out which ABI we are using. | 6417 | # Find out which ABI we are using. |
2227 | 6365 | echo 'int i;' > conftest.$ac_ext | 6418 | echo 'int i;' > conftest.$ac_ext |
2228 | 6366 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 6419 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
2229 | @@ -6371,7 +6424,20 @@ | |||
2230 | 6371 | case `/usr/bin/file conftest.o` in | 6424 | case `/usr/bin/file conftest.o` in |
2231 | 6372 | *64-bit*) | 6425 | *64-bit*) |
2232 | 6373 | case $lt_cv_prog_gnu_ld in | 6426 | case $lt_cv_prog_gnu_ld in |
2234 | 6374 | yes*) LD="${LD-ld} -m elf64_sparc" ;; | 6427 | yes*) |
2235 | 6428 | case $host in | ||
2236 | 6429 | i?86-*-solaris*) | ||
2237 | 6430 | LD="${LD-ld} -m elf_x86_64" | ||
2238 | 6431 | ;; | ||
2239 | 6432 | sparc*-*-solaris*) | ||
2240 | 6433 | LD="${LD-ld} -m elf64_sparc" | ||
2241 | 6434 | ;; | ||
2242 | 6435 | esac | ||
2243 | 6436 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
2244 | 6437 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
2245 | 6438 | LD="${LD-ld}_sol2" | ||
2246 | 6439 | fi | ||
2247 | 6440 | ;; | ||
2248 | 6375 | *) | 6441 | *) |
2249 | 6376 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | 6442 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
2250 | 6377 | LD="${LD-ld} -64" | 6443 | LD="${LD-ld} -64" |
2251 | @@ -7011,7 +7077,13 @@ | |||
2252 | 7011 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | 7077 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
2253 | 7012 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | 7078 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
2254 | 7013 | _lt_result=$? | 7079 | _lt_result=$? |
2256 | 7014 | if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | 7080 | # If there is a non-empty error log, and "single_module" |
2257 | 7081 | # appears in it, assume the flag caused a linker warning | ||
2258 | 7082 | if test -s conftest.err && $GREP single_module conftest.err; then | ||
2259 | 7083 | cat conftest.err >&5 | ||
2260 | 7084 | # Otherwise, if the output was created with a 0 exit code from | ||
2261 | 7085 | # the compiler, it worked. | ||
2262 | 7086 | elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
2263 | 7015 | lt_cv_apple_cc_single_mod=yes | 7087 | lt_cv_apple_cc_single_mod=yes |
2264 | 7016 | else | 7088 | else |
2265 | 7017 | cat conftest.err >&5 | 7089 | cat conftest.err >&5 |
2266 | @@ -7022,6 +7094,7 @@ | |||
2267 | 7022 | fi | 7094 | fi |
2268 | 7023 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 | 7095 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 |
2269 | 7024 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } | 7096 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
2270 | 7097 | |||
2271 | 7025 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 | 7098 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
2272 | 7026 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } | 7099 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
2273 | 7027 | if ${lt_cv_ld_exported_symbols_list+:} false; then : | 7100 | if ${lt_cv_ld_exported_symbols_list+:} false; then : |
2274 | @@ -7054,6 +7127,7 @@ | |||
2275 | 7054 | fi | 7127 | fi |
2276 | 7055 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 | 7128 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
2277 | 7056 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } | 7129 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
2278 | 7130 | |||
2279 | 7057 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 | 7131 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
2280 | 7058 | $as_echo_n "checking for -force_load linker flag... " >&6; } | 7132 | $as_echo_n "checking for -force_load linker flag... " >&6; } |
2281 | 7059 | if ${lt_cv_ld_force_load+:} false; then : | 7133 | if ${lt_cv_ld_force_load+:} false; then : |
2282 | @@ -7075,7 +7149,9 @@ | |||
2283 | 7075 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 | 7149 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
2284 | 7076 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | 7150 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
2285 | 7077 | _lt_result=$? | 7151 | _lt_result=$? |
2287 | 7078 | if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | 7152 | if test -s conftest.err && $GREP force_load conftest.err; then |
2288 | 7153 | cat conftest.err >&5 | ||
2289 | 7154 | elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
2290 | 7079 | lt_cv_ld_force_load=yes | 7155 | lt_cv_ld_force_load=yes |
2291 | 7080 | else | 7156 | else |
2292 | 7081 | cat conftest.err >&5 | 7157 | cat conftest.err >&5 |
2293 | @@ -7480,7 +7556,22 @@ | |||
2294 | 7480 | 7556 | ||
2295 | 7481 | # Check whether --with-pic was given. | 7557 | # Check whether --with-pic was given. |
2296 | 7482 | if test "${with_pic+set}" = set; then : | 7558 | if test "${with_pic+set}" = set; then : |
2298 | 7483 | withval=$with_pic; pic_mode="$withval" | 7559 | withval=$with_pic; lt_p=${PACKAGE-default} |
2299 | 7560 | case $withval in | ||
2300 | 7561 | yes|no) pic_mode=$withval ;; | ||
2301 | 7562 | *) | ||
2302 | 7563 | pic_mode=default | ||
2303 | 7564 | # Look at the argument we got. We use all the common list separators. | ||
2304 | 7565 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | ||
2305 | 7566 | for lt_pkg in $withval; do | ||
2306 | 7567 | IFS="$lt_save_ifs" | ||
2307 | 7568 | if test "X$lt_pkg" = "X$lt_p"; then | ||
2308 | 7569 | pic_mode=yes | ||
2309 | 7570 | fi | ||
2310 | 7571 | done | ||
2311 | 7572 | IFS="$lt_save_ifs" | ||
2312 | 7573 | ;; | ||
2313 | 7574 | esac | ||
2314 | 7484 | else | 7575 | else |
2315 | 7485 | pic_mode=default | 7576 | pic_mode=default |
2316 | 7486 | fi | 7577 | fi |
2317 | @@ -7558,6 +7649,10 @@ | |||
2318 | 7558 | 7649 | ||
2319 | 7559 | 7650 | ||
2320 | 7560 | 7651 | ||
2321 | 7652 | |||
2322 | 7653 | |||
2323 | 7654 | |||
2324 | 7655 | |||
2325 | 7561 | test -z "$LN_S" && LN_S="ln -s" | 7656 | test -z "$LN_S" && LN_S="ln -s" |
2326 | 7562 | 7657 | ||
2327 | 7563 | 7658 | ||
2328 | @@ -8017,7 +8112,9 @@ | |||
2329 | 8017 | case $cc_basename in | 8112 | case $cc_basename in |
2330 | 8018 | nvcc*) # Cuda Compiler Driver 2.2 | 8113 | nvcc*) # Cuda Compiler Driver 2.2 |
2331 | 8019 | lt_prog_compiler_wl='-Xlinker ' | 8114 | lt_prog_compiler_wl='-Xlinker ' |
2333 | 8020 | lt_prog_compiler_pic='-Xcompiler -fPIC' | 8115 | if test -n "$lt_prog_compiler_pic"; then |
2334 | 8116 | lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" | ||
2335 | 8117 | fi | ||
2336 | 8021 | ;; | 8118 | ;; |
2337 | 8022 | esac | 8119 | esac |
2338 | 8023 | else | 8120 | else |
2339 | @@ -8108,18 +8205,33 @@ | |||
2340 | 8108 | ;; | 8205 | ;; |
2341 | 8109 | *) | 8206 | *) |
2342 | 8110 | case `$CC -V 2>&1 | sed 5q` in | 8207 | case `$CC -V 2>&1 | sed 5q` in |
2344 | 8111 | *Sun\ F* | *Sun*Fortran*) | 8208 | *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) |
2345 | 8112 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | 8209 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
2346 | 8113 | lt_prog_compiler_pic='-KPIC' | 8210 | lt_prog_compiler_pic='-KPIC' |
2347 | 8114 | lt_prog_compiler_static='-Bstatic' | 8211 | lt_prog_compiler_static='-Bstatic' |
2348 | 8115 | lt_prog_compiler_wl='' | 8212 | lt_prog_compiler_wl='' |
2349 | 8116 | ;; | 8213 | ;; |
2350 | 8214 | *Sun\ F* | *Sun*Fortran*) | ||
2351 | 8215 | lt_prog_compiler_pic='-KPIC' | ||
2352 | 8216 | lt_prog_compiler_static='-Bstatic' | ||
2353 | 8217 | lt_prog_compiler_wl='-Qoption ld ' | ||
2354 | 8218 | ;; | ||
2355 | 8117 | *Sun\ C*) | 8219 | *Sun\ C*) |
2356 | 8118 | # Sun C 5.9 | 8220 | # Sun C 5.9 |
2357 | 8119 | lt_prog_compiler_pic='-KPIC' | 8221 | lt_prog_compiler_pic='-KPIC' |
2358 | 8120 | lt_prog_compiler_static='-Bstatic' | 8222 | lt_prog_compiler_static='-Bstatic' |
2359 | 8121 | lt_prog_compiler_wl='-Wl,' | 8223 | lt_prog_compiler_wl='-Wl,' |
2360 | 8122 | ;; | 8224 | ;; |
2361 | 8225 | *Intel*\ [CF]*Compiler*) | ||
2362 | 8226 | lt_prog_compiler_wl='-Wl,' | ||
2363 | 8227 | lt_prog_compiler_pic='-fPIC' | ||
2364 | 8228 | lt_prog_compiler_static='-static' | ||
2365 | 8229 | ;; | ||
2366 | 8230 | *Portland\ Group*) | ||
2367 | 8231 | lt_prog_compiler_wl='-Wl,' | ||
2368 | 8232 | lt_prog_compiler_pic='-fpic' | ||
2369 | 8233 | lt_prog_compiler_static='-Bstatic' | ||
2370 | 8234 | ;; | ||
2371 | 8123 | esac | 8235 | esac |
2372 | 8124 | ;; | 8236 | ;; |
2373 | 8125 | esac | 8237 | esac |
2374 | @@ -8481,7 +8593,6 @@ | |||
2375 | 8481 | hardcode_direct=no | 8593 | hardcode_direct=no |
2376 | 8482 | hardcode_direct_absolute=no | 8594 | hardcode_direct_absolute=no |
2377 | 8483 | hardcode_libdir_flag_spec= | 8595 | hardcode_libdir_flag_spec= |
2378 | 8484 | hardcode_libdir_flag_spec_ld= | ||
2379 | 8485 | hardcode_libdir_separator= | 8596 | hardcode_libdir_separator= |
2380 | 8486 | hardcode_minus_L=no | 8597 | hardcode_minus_L=no |
2381 | 8487 | hardcode_shlibpath_var=unsupported | 8598 | hardcode_shlibpath_var=unsupported |
2382 | @@ -8734,8 +8845,7 @@ | |||
2383 | 8734 | xlf* | bgf* | bgxlf* | mpixlf*) | 8845 | xlf* | bgf* | bgxlf* | mpixlf*) |
2384 | 8735 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 8846 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
2385 | 8736 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 8847 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2388 | 8737 | hardcode_libdir_flag_spec= | 8848 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2387 | 8738 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
2389 | 8739 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | 8849 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
2390 | 8740 | if test "x$supports_anon_versioning" = xyes; then | 8850 | if test "x$supports_anon_versioning" = xyes; then |
2391 | 8741 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | 8851 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
2392 | @@ -9115,6 +9225,7 @@ | |||
2393 | 9115 | # The linker will not automatically build a static lib if we build a DLL. | 9225 | # The linker will not automatically build a static lib if we build a DLL. |
2394 | 9116 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | 9226 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
2395 | 9117 | enable_shared_with_static_runtimes=yes | 9227 | enable_shared_with_static_runtimes=yes |
2396 | 9228 | exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
2397 | 9118 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | 9229 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
2398 | 9119 | # Don't use ranlib | 9230 | # Don't use ranlib |
2399 | 9120 | old_postinstall_cmds='chmod 644 $oldlib' | 9231 | old_postinstall_cmds='chmod 644 $oldlib' |
2400 | @@ -9160,6 +9271,7 @@ | |||
2401 | 9160 | hardcode_shlibpath_var=unsupported | 9271 | hardcode_shlibpath_var=unsupported |
2402 | 9161 | if test "$lt_cv_ld_force_load" = "yes"; then | 9272 | if test "$lt_cv_ld_force_load" = "yes"; then |
2403 | 9162 | 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\"`' | 9273 | 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\"`' |
2404 | 9274 | |||
2405 | 9163 | else | 9275 | else |
2406 | 9164 | whole_archive_flag_spec='' | 9276 | whole_archive_flag_spec='' |
2407 | 9165 | fi | 9277 | fi |
2408 | @@ -9188,10 +9300,6 @@ | |||
2409 | 9188 | hardcode_shlibpath_var=no | 9300 | hardcode_shlibpath_var=no |
2410 | 9189 | ;; | 9301 | ;; |
2411 | 9190 | 9302 | ||
2412 | 9191 | freebsd1*) | ||
2413 | 9192 | ld_shlibs=no | ||
2414 | 9193 | ;; | ||
2415 | 9194 | |||
2416 | 9195 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | 9303 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
2417 | 9196 | # support. Future versions do this automatically, but an explicit c++rt0.o | 9304 | # support. Future versions do this automatically, but an explicit c++rt0.o |
2418 | 9197 | # does not break anything, and helps significantly (at the cost of a little | 9305 | # does not break anything, and helps significantly (at the cost of a little |
2419 | @@ -9204,7 +9312,7 @@ | |||
2420 | 9204 | ;; | 9312 | ;; |
2421 | 9205 | 9313 | ||
2422 | 9206 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | 9314 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
2424 | 9207 | freebsd2*) | 9315 | freebsd2.*) |
2425 | 9208 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | 9316 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
2426 | 9209 | hardcode_direct=yes | 9317 | hardcode_direct=yes |
2427 | 9210 | hardcode_minus_L=yes | 9318 | hardcode_minus_L=yes |
2428 | @@ -9243,7 +9351,6 @@ | |||
2429 | 9243 | fi | 9351 | fi |
2430 | 9244 | if test "$with_gnu_ld" = no; then | 9352 | if test "$with_gnu_ld" = no; then |
2431 | 9245 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | 9353 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
2432 | 9246 | hardcode_libdir_flag_spec_ld='+b $libdir' | ||
2433 | 9247 | hardcode_libdir_separator=: | 9354 | hardcode_libdir_separator=: |
2434 | 9248 | hardcode_direct=yes | 9355 | hardcode_direct=yes |
2435 | 9249 | hardcode_direct_absolute=yes | 9356 | hardcode_direct_absolute=yes |
2436 | @@ -9867,11 +9974,6 @@ | |||
2437 | 9867 | 9974 | ||
2438 | 9868 | 9975 | ||
2439 | 9869 | 9976 | ||
2440 | 9870 | |||
2441 | 9871 | |||
2442 | 9872 | |||
2443 | 9873 | |||
2444 | 9874 | |||
2445 | 9875 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | 9977 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
2446 | 9876 | $as_echo_n "checking dynamic linker characteristics... " >&6; } | 9978 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
2447 | 9877 | 9979 | ||
2448 | @@ -9961,7 +10063,7 @@ | |||
2449 | 9961 | 10063 | ||
2450 | 9962 | case $host_os in | 10064 | case $host_os in |
2451 | 9963 | aix3*) | 10065 | aix3*) |
2453 | 9964 | version_type=linux | 10066 | version_type=linux # correct to gnu/linux during the next big refactor |
2454 | 9965 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | 10067 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
2455 | 9966 | shlibpath_var=LIBPATH | 10068 | shlibpath_var=LIBPATH |
2456 | 9967 | 10069 | ||
2457 | @@ -9970,7 +10072,7 @@ | |||
2458 | 9970 | ;; | 10072 | ;; |
2459 | 9971 | 10073 | ||
2460 | 9972 | aix[4-9]*) | 10074 | aix[4-9]*) |
2462 | 9973 | version_type=linux | 10075 | version_type=linux # correct to gnu/linux during the next big refactor |
2463 | 9974 | need_lib_prefix=no | 10076 | need_lib_prefix=no |
2464 | 9975 | need_version=no | 10077 | need_version=no |
2465 | 9976 | hardcode_into_libs=yes | 10078 | hardcode_into_libs=yes |
2466 | @@ -10035,7 +10137,7 @@ | |||
2467 | 10035 | ;; | 10137 | ;; |
2468 | 10036 | 10138 | ||
2469 | 10037 | bsdi[45]*) | 10139 | bsdi[45]*) |
2471 | 10038 | version_type=linux | 10140 | version_type=linux # correct to gnu/linux during the next big refactor |
2472 | 10039 | need_version=no | 10141 | need_version=no |
2473 | 10040 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10142 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2474 | 10041 | soname_spec='${libname}${release}${shared_ext}$major' | 10143 | soname_spec='${libname}${release}${shared_ext}$major' |
2475 | @@ -10174,7 +10276,7 @@ | |||
2476 | 10174 | ;; | 10276 | ;; |
2477 | 10175 | 10277 | ||
2478 | 10176 | dgux*) | 10278 | dgux*) |
2480 | 10177 | version_type=linux | 10279 | version_type=linux # correct to gnu/linux during the next big refactor |
2481 | 10178 | need_lib_prefix=no | 10280 | need_lib_prefix=no |
2482 | 10179 | need_version=no | 10281 | need_version=no |
2483 | 10180 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | 10282 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
2484 | @@ -10182,10 +10284,6 @@ | |||
2485 | 10182 | shlibpath_var=LD_LIBRARY_PATH | 10284 | shlibpath_var=LD_LIBRARY_PATH |
2486 | 10183 | ;; | 10285 | ;; |
2487 | 10184 | 10286 | ||
2488 | 10185 | freebsd1*) | ||
2489 | 10186 | dynamic_linker=no | ||
2490 | 10187 | ;; | ||
2491 | 10188 | |||
2492 | 10189 | freebsd* | dragonfly*) | 10287 | freebsd* | dragonfly*) |
2493 | 10190 | # DragonFly does not have aout. When/if they implement a new | 10288 | # DragonFly does not have aout. When/if they implement a new |
2494 | 10191 | # versioning mechanism, adjust this. | 10289 | # versioning mechanism, adjust this. |
2495 | @@ -10193,7 +10291,7 @@ | |||
2496 | 10193 | objformat=`/usr/bin/objformat` | 10291 | objformat=`/usr/bin/objformat` |
2497 | 10194 | else | 10292 | else |
2498 | 10195 | case $host_os in | 10293 | case $host_os in |
2500 | 10196 | freebsd[123]*) objformat=aout ;; | 10294 | freebsd[23].*) objformat=aout ;; |
2501 | 10197 | *) objformat=elf ;; | 10295 | *) objformat=elf ;; |
2502 | 10198 | esac | 10296 | esac |
2503 | 10199 | fi | 10297 | fi |
2504 | @@ -10211,7 +10309,7 @@ | |||
2505 | 10211 | esac | 10309 | esac |
2506 | 10212 | shlibpath_var=LD_LIBRARY_PATH | 10310 | shlibpath_var=LD_LIBRARY_PATH |
2507 | 10213 | case $host_os in | 10311 | case $host_os in |
2509 | 10214 | freebsd2*) | 10312 | freebsd2.*) |
2510 | 10215 | shlibpath_overrides_runpath=yes | 10313 | shlibpath_overrides_runpath=yes |
2511 | 10216 | ;; | 10314 | ;; |
2512 | 10217 | freebsd3.[01]* | freebsdelf3.[01]*) | 10315 | freebsd3.[01]* | freebsdelf3.[01]*) |
2513 | @@ -10231,7 +10329,7 @@ | |||
2514 | 10231 | ;; | 10329 | ;; |
2515 | 10232 | 10330 | ||
2516 | 10233 | gnu*) | 10331 | gnu*) |
2518 | 10234 | version_type=linux | 10332 | version_type=linux # correct to gnu/linux during the next big refactor |
2519 | 10235 | need_lib_prefix=no | 10333 | need_lib_prefix=no |
2520 | 10236 | need_version=no | 10334 | need_version=no |
2521 | 10237 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 10335 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2522 | @@ -10242,7 +10340,7 @@ | |||
2523 | 10242 | ;; | 10340 | ;; |
2524 | 10243 | 10341 | ||
2525 | 10244 | haiku*) | 10342 | haiku*) |
2527 | 10245 | version_type=linux | 10343 | version_type=linux # correct to gnu/linux during the next big refactor |
2528 | 10246 | need_lib_prefix=no | 10344 | need_lib_prefix=no |
2529 | 10247 | need_version=no | 10345 | need_version=no |
2530 | 10248 | dynamic_linker="$host_os runtime_loader" | 10346 | dynamic_linker="$host_os runtime_loader" |
2531 | @@ -10303,7 +10401,7 @@ | |||
2532 | 10303 | ;; | 10401 | ;; |
2533 | 10304 | 10402 | ||
2534 | 10305 | interix[3-9]*) | 10403 | interix[3-9]*) |
2536 | 10306 | version_type=linux | 10404 | version_type=linux # correct to gnu/linux during the next big refactor |
2537 | 10307 | need_lib_prefix=no | 10405 | need_lib_prefix=no |
2538 | 10308 | need_version=no | 10406 | need_version=no |
2539 | 10309 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 10407 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2540 | @@ -10319,7 +10417,7 @@ | |||
2541 | 10319 | nonstopux*) version_type=nonstopux ;; | 10417 | nonstopux*) version_type=nonstopux ;; |
2542 | 10320 | *) | 10418 | *) |
2543 | 10321 | if test "$lt_cv_prog_gnu_ld" = yes; then | 10419 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2545 | 10322 | version_type=linux | 10420 | version_type=linux # correct to gnu/linux during the next big refactor |
2546 | 10323 | else | 10421 | else |
2547 | 10324 | version_type=irix | 10422 | version_type=irix |
2548 | 10325 | fi ;; | 10423 | fi ;; |
2549 | @@ -10356,9 +10454,9 @@ | |||
2550 | 10356 | dynamic_linker=no | 10454 | dynamic_linker=no |
2551 | 10357 | ;; | 10455 | ;; |
2552 | 10358 | 10456 | ||
2554 | 10359 | # This must be Linux ELF. | 10457 | # This must be glibc/ELF. |
2555 | 10360 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 10458 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2557 | 10361 | version_type=linux | 10459 | version_type=linux # correct to gnu/linux during the next big refactor |
2558 | 10362 | need_lib_prefix=no | 10460 | need_lib_prefix=no |
2559 | 10363 | need_version=no | 10461 | need_version=no |
2560 | 10364 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10462 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2561 | @@ -10452,7 +10550,7 @@ | |||
2562 | 10452 | ;; | 10550 | ;; |
2563 | 10453 | 10551 | ||
2564 | 10454 | newsos6) | 10552 | newsos6) |
2566 | 10455 | version_type=linux | 10553 | version_type=linux # correct to gnu/linux during the next big refactor |
2567 | 10456 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10554 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2568 | 10457 | shlibpath_var=LD_LIBRARY_PATH | 10555 | shlibpath_var=LD_LIBRARY_PATH |
2569 | 10458 | shlibpath_overrides_runpath=yes | 10556 | shlibpath_overrides_runpath=yes |
2570 | @@ -10521,7 +10619,7 @@ | |||
2571 | 10521 | ;; | 10619 | ;; |
2572 | 10522 | 10620 | ||
2573 | 10523 | solaris*) | 10621 | solaris*) |
2575 | 10524 | version_type=linux | 10622 | version_type=linux # correct to gnu/linux during the next big refactor |
2576 | 10525 | need_lib_prefix=no | 10623 | need_lib_prefix=no |
2577 | 10526 | need_version=no | 10624 | need_version=no |
2578 | 10527 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10625 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2579 | @@ -10546,7 +10644,7 @@ | |||
2580 | 10546 | ;; | 10644 | ;; |
2581 | 10547 | 10645 | ||
2582 | 10548 | sysv4 | sysv4.3*) | 10646 | sysv4 | sysv4.3*) |
2584 | 10549 | version_type=linux | 10647 | version_type=linux # correct to gnu/linux during the next big refactor |
2585 | 10550 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10648 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2586 | 10551 | soname_spec='${libname}${release}${shared_ext}$major' | 10649 | soname_spec='${libname}${release}${shared_ext}$major' |
2587 | 10552 | shlibpath_var=LD_LIBRARY_PATH | 10650 | shlibpath_var=LD_LIBRARY_PATH |
2588 | @@ -10570,7 +10668,7 @@ | |||
2589 | 10570 | 10668 | ||
2590 | 10571 | sysv4*MP*) | 10669 | sysv4*MP*) |
2591 | 10572 | if test -d /usr/nec ;then | 10670 | if test -d /usr/nec ;then |
2593 | 10573 | version_type=linux | 10671 | version_type=linux # correct to gnu/linux during the next big refactor |
2594 | 10574 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | 10672 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
2595 | 10575 | soname_spec='$libname${shared_ext}.$major' | 10673 | soname_spec='$libname${shared_ext}.$major' |
2596 | 10576 | shlibpath_var=LD_LIBRARY_PATH | 10674 | shlibpath_var=LD_LIBRARY_PATH |
2597 | @@ -10601,7 +10699,7 @@ | |||
2598 | 10601 | 10699 | ||
2599 | 10602 | tpf*) | 10700 | tpf*) |
2600 | 10603 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | 10701 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
2602 | 10604 | version_type=linux | 10702 | version_type=linux # correct to gnu/linux during the next big refactor |
2603 | 10605 | need_lib_prefix=no | 10703 | need_lib_prefix=no |
2604 | 10606 | need_version=no | 10704 | need_version=no |
2605 | 10607 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10705 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2606 | @@ -10611,7 +10709,7 @@ | |||
2607 | 10611 | ;; | 10709 | ;; |
2608 | 10612 | 10710 | ||
2609 | 10613 | uts4*) | 10711 | uts4*) |
2611 | 10614 | version_type=linux | 10712 | version_type=linux # correct to gnu/linux during the next big refactor |
2612 | 10615 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 10713 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2613 | 10616 | soname_spec='${libname}${release}${shared_ext}$major' | 10714 | soname_spec='${libname}${release}${shared_ext}$major' |
2614 | 10617 | shlibpath_var=LD_LIBRARY_PATH | 10715 | shlibpath_var=LD_LIBRARY_PATH |
2615 | @@ -11393,6 +11491,8 @@ | |||
2616 | 11393 | 11491 | ||
2617 | 11394 | 11492 | ||
2618 | 11395 | 11493 | ||
2619 | 11494 | |||
2620 | 11495 | |||
2621 | 11396 | ac_config_commands="$ac_config_commands libtool" | 11496 | ac_config_commands="$ac_config_commands libtool" |
2622 | 11397 | 11497 | ||
2623 | 11398 | 11498 | ||
2624 | @@ -12079,6 +12179,260 @@ | |||
2625 | 12079 | 12179 | ||
2626 | 12080 | 12180 | ||
2627 | 12081 | ########################### | 12181 | ########################### |
2628 | 12182 | # gcov coverage reporting | ||
2629 | 12183 | ########################### | ||
2630 | 12184 | |||
2631 | 12185 | # Checks for existence of coverage tools: | ||
2632 | 12186 | # * gcov | ||
2633 | 12187 | # * lcov | ||
2634 | 12188 | # * genhtml | ||
2635 | 12189 | # * gcovr | ||
2636 | 12190 | # | ||
2637 | 12191 | # Sets ac_cv_check_gcov to yes if tooling is present | ||
2638 | 12192 | # and reports the executables to the variables LCOV, GCOVR and GENHTML. | ||
2639 | 12193 | # AC_TDD_GCOV | ||
2640 | 12194 | |||
2641 | 12195 | |||
2642 | 12196 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether code coverage tools are available" >&5 | ||
2643 | 12197 | $as_echo_n "checking whether code coverage tools are available... " >&6; } | ||
2644 | 12198 | if ${ac_cv_check_gcov+:} false; then : | ||
2645 | 12199 | $as_echo_n "(cached) " >&6 | ||
2646 | 12200 | else | ||
2647 | 12201 | |||
2648 | 12202 | # Check whether --enable-gcov was given. | ||
2649 | 12203 | if test "${enable_gcov+set}" = set; then : | ||
2650 | 12204 | enableval=$enable_gcov; use_gcov=$enableval | ||
2651 | 12205 | else | ||
2652 | 12206 | use_gcov=no | ||
2653 | 12207 | fi | ||
2654 | 12208 | |||
2655 | 12209 | |||
2656 | 12210 | if test "x$use_gcov" = "xyes"; then | ||
2657 | 12211 | # we need gcc: | ||
2658 | 12212 | if test "$GCC" != "yes"; then | ||
2659 | 12213 | as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 | ||
2660 | 12214 | fi | ||
2661 | 12215 | |||
2662 | 12216 | # Check if ccache is being used | ||
2663 | 12217 | # Extract the first word of "shtool", so it can be a program name with args. | ||
2664 | 12218 | set dummy shtool; ac_word=$2 | ||
2665 | 12219 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2666 | 12220 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2667 | 12221 | if ${ac_cv_prog_SHTOOL+:} false; then : | ||
2668 | 12222 | $as_echo_n "(cached) " >&6 | ||
2669 | 12223 | else | ||
2670 | 12224 | if test -n "$SHTOOL"; then | ||
2671 | 12225 | ac_cv_prog_SHTOOL="$SHTOOL" # Let the user override the test. | ||
2672 | 12226 | else | ||
2673 | 12227 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2674 | 12228 | for as_dir in $PATH | ||
2675 | 12229 | do | ||
2676 | 12230 | IFS=$as_save_IFS | ||
2677 | 12231 | test -z "$as_dir" && as_dir=. | ||
2678 | 12232 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2679 | 12233 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2680 | 12234 | ac_cv_prog_SHTOOL="shtool" | ||
2681 | 12235 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2682 | 12236 | break 2 | ||
2683 | 12237 | fi | ||
2684 | 12238 | done | ||
2685 | 12239 | done | ||
2686 | 12240 | IFS=$as_save_IFS | ||
2687 | 12241 | |||
2688 | 12242 | fi | ||
2689 | 12243 | fi | ||
2690 | 12244 | SHTOOL=$ac_cv_prog_SHTOOL | ||
2691 | 12245 | if test -n "$SHTOOL"; then | ||
2692 | 12246 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHTOOL" >&5 | ||
2693 | 12247 | $as_echo "$SHTOOL" >&6; } | ||
2694 | 12248 | else | ||
2695 | 12249 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2696 | 12250 | $as_echo "no" >&6; } | ||
2697 | 12251 | fi | ||
2698 | 12252 | |||
2699 | 12253 | |||
2700 | 12254 | case `$SHTOOL path $CC` in | ||
2701 | 12255 | *ccache*) gcc_ccache=yes;; | ||
2702 | 12256 | *) gcc_ccache=no;; | ||
2703 | 12257 | esac | ||
2704 | 12258 | |||
2705 | 12259 | if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then | ||
2706 | 12260 | as_fn_error $? "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 | ||
2707 | 12261 | fi | ||
2708 | 12262 | |||
2709 | 12263 | lcov_version_list="1.6 1.7 1.8 1.9" | ||
2710 | 12264 | # Extract the first word of "lcov", so it can be a program name with args. | ||
2711 | 12265 | set dummy lcov; ac_word=$2 | ||
2712 | 12266 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2713 | 12267 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2714 | 12268 | if ${ac_cv_prog_LCOV+:} false; then : | ||
2715 | 12269 | $as_echo_n "(cached) " >&6 | ||
2716 | 12270 | else | ||
2717 | 12271 | if test -n "$LCOV"; then | ||
2718 | 12272 | ac_cv_prog_LCOV="$LCOV" # Let the user override the test. | ||
2719 | 12273 | else | ||
2720 | 12274 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2721 | 12275 | for as_dir in $PATH | ||
2722 | 12276 | do | ||
2723 | 12277 | IFS=$as_save_IFS | ||
2724 | 12278 | test -z "$as_dir" && as_dir=. | ||
2725 | 12279 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2726 | 12280 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2727 | 12281 | ac_cv_prog_LCOV="lcov" | ||
2728 | 12282 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2729 | 12283 | break 2 | ||
2730 | 12284 | fi | ||
2731 | 12285 | done | ||
2732 | 12286 | done | ||
2733 | 12287 | IFS=$as_save_IFS | ||
2734 | 12288 | |||
2735 | 12289 | fi | ||
2736 | 12290 | fi | ||
2737 | 12291 | LCOV=$ac_cv_prog_LCOV | ||
2738 | 12292 | if test -n "$LCOV"; then | ||
2739 | 12293 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 | ||
2740 | 12294 | $as_echo "$LCOV" >&6; } | ||
2741 | 12295 | else | ||
2742 | 12296 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2743 | 12297 | $as_echo "no" >&6; } | ||
2744 | 12298 | fi | ||
2745 | 12299 | |||
2746 | 12300 | |||
2747 | 12301 | # Extract the first word of "genhtml", so it can be a program name with args. | ||
2748 | 12302 | set dummy genhtml; ac_word=$2 | ||
2749 | 12303 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2750 | 12304 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2751 | 12305 | if ${ac_cv_prog_GENHTML+:} false; then : | ||
2752 | 12306 | $as_echo_n "(cached) " >&6 | ||
2753 | 12307 | else | ||
2754 | 12308 | if test -n "$GENHTML"; then | ||
2755 | 12309 | ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. | ||
2756 | 12310 | else | ||
2757 | 12311 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2758 | 12312 | for as_dir in $PATH | ||
2759 | 12313 | do | ||
2760 | 12314 | IFS=$as_save_IFS | ||
2761 | 12315 | test -z "$as_dir" && as_dir=. | ||
2762 | 12316 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2763 | 12317 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2764 | 12318 | ac_cv_prog_GENHTML="genhtml" | ||
2765 | 12319 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2766 | 12320 | break 2 | ||
2767 | 12321 | fi | ||
2768 | 12322 | done | ||
2769 | 12323 | done | ||
2770 | 12324 | IFS=$as_save_IFS | ||
2771 | 12325 | |||
2772 | 12326 | fi | ||
2773 | 12327 | fi | ||
2774 | 12328 | GENHTML=$ac_cv_prog_GENHTML | ||
2775 | 12329 | if test -n "$GENHTML"; then | ||
2776 | 12330 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 | ||
2777 | 12331 | $as_echo "$GENHTML" >&6; } | ||
2778 | 12332 | else | ||
2779 | 12333 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2780 | 12334 | $as_echo "no" >&6; } | ||
2781 | 12335 | fi | ||
2782 | 12336 | |||
2783 | 12337 | |||
2784 | 12338 | # Extract the first word of "gcovr", so it can be a program name with args. | ||
2785 | 12339 | set dummy gcovr; ac_word=$2 | ||
2786 | 12340 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2787 | 12341 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2788 | 12342 | if ${ac_cv_prog_GCOVR+:} false; then : | ||
2789 | 12343 | $as_echo_n "(cached) " >&6 | ||
2790 | 12344 | else | ||
2791 | 12345 | if test -n "$GCOVR"; then | ||
2792 | 12346 | ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test. | ||
2793 | 12347 | else | ||
2794 | 12348 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2795 | 12349 | for as_dir in $PATH | ||
2796 | 12350 | do | ||
2797 | 12351 | IFS=$as_save_IFS | ||
2798 | 12352 | test -z "$as_dir" && as_dir=. | ||
2799 | 12353 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2800 | 12354 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2801 | 12355 | ac_cv_prog_GCOVR="gcovr" | ||
2802 | 12356 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2803 | 12357 | break 2 | ||
2804 | 12358 | fi | ||
2805 | 12359 | done | ||
2806 | 12360 | done | ||
2807 | 12361 | IFS=$as_save_IFS | ||
2808 | 12362 | |||
2809 | 12363 | fi | ||
2810 | 12364 | fi | ||
2811 | 12365 | GCOVR=$ac_cv_prog_GCOVR | ||
2812 | 12366 | if test -n "$GCOVR"; then | ||
2813 | 12367 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5 | ||
2814 | 12368 | $as_echo "$GCOVR" >&6; } | ||
2815 | 12369 | else | ||
2816 | 12370 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2817 | 12371 | $as_echo "no" >&6; } | ||
2818 | 12372 | fi | ||
2819 | 12373 | |||
2820 | 12374 | |||
2821 | 12375 | |||
2822 | 12376 | if test "$LCOV"; then | ||
2823 | 12377 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 | ||
2824 | 12378 | $as_echo_n "checking for lcov version... " >&6; } | ||
2825 | 12379 | if ${glib_cv_lcov_version+:} false; then : | ||
2826 | 12380 | $as_echo_n "(cached) " >&6 | ||
2827 | 12381 | else | ||
2828 | 12382 | |||
2829 | 12383 | glib_cv_lcov_version=invalid | ||
2830 | 12384 | lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` | ||
2831 | 12385 | for lcov_check_version in $lcov_version_list; do | ||
2832 | 12386 | if test "$lcov_version" = "$lcov_check_version"; then | ||
2833 | 12387 | glib_cv_lcov_version="$lcov_check_version (ok)" | ||
2834 | 12388 | fi | ||
2835 | 12389 | done | ||
2836 | 12390 | |||
2837 | 12391 | fi | ||
2838 | 12392 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_lcov_version" >&5 | ||
2839 | 12393 | $as_echo "$glib_cv_lcov_version" >&6; } | ||
2840 | 12394 | else | ||
2841 | 12395 | lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" | ||
2842 | 12396 | as_fn_error $? "$lcov_msg" "$LINENO" 5 | ||
2843 | 12397 | fi | ||
2844 | 12398 | |||
2845 | 12399 | case $glib_cv_lcov_version in | ||
2846 | 12400 | ""|invalid) | ||
2847 | 12401 | lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." | ||
2848 | 12402 | as_fn_error $? "$lcov_msg" "$LINENO" 5 | ||
2849 | 12403 | LCOV="exit 0;" | ||
2850 | 12404 | ;; | ||
2851 | 12405 | esac | ||
2852 | 12406 | |||
2853 | 12407 | if test -z "$GENHTML"; then | ||
2854 | 12408 | as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 | ||
2855 | 12409 | fi | ||
2856 | 12410 | |||
2857 | 12411 | if test -z "$GCOVR"; then | ||
2858 | 12412 | as_fn_error $? "Could not find gcovr; easy_install (or pip) gcovr" "$LINENO" 5 | ||
2859 | 12413 | fi | ||
2860 | 12414 | |||
2861 | 12415 | |||
2862 | 12416 | # Remove all optimization flags from CFLAGS | ||
2863 | 12417 | |||
2864 | 12418 | CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` | ||
2865 | 12419 | |||
2866 | 12420 | |||
2867 | 12421 | # Add the special gcc flags | ||
2868 | 12422 | COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
2869 | 12423 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
2870 | 12424 | COVERAGE_LDFLAGS="-lgcov" | ||
2871 | 12425 | |||
2872 | 12426 | fi | ||
2873 | 12427 | |||
2874 | 12428 | fi | ||
2875 | 12429 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5 | ||
2876 | 12430 | $as_echo "$ac_cv_check_gcov" >&6; } | ||
2877 | 12431 | |||
2878 | 12432 | |||
2879 | 12433 | |||
2880 | 12434 | |||
2881 | 12435 | ########################### | ||
2882 | 12082 | # Check to see if we're local | 12436 | # Check to see if we're local |
2883 | 12083 | ########################### | 12437 | ########################### |
2884 | 12084 | 12438 | ||
2885 | @@ -12277,25 +12631,44 @@ | |||
2886 | 12277 | as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 | 12631 | as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 |
2887 | 12278 | fi | 12632 | fi |
2888 | 12279 | 12633 | ||
2908 | 12280 | INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12634 | if test -z "$AM_DEFAULT_VERBOSITY"; then |
2909 | 12281 | INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12635 | AM_DEFAULT_VERBOSITY=1 |
2910 | 12282 | INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12636 | fi |
2911 | 12283 | INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12637 | |
2912 | 12284 | INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' | 12638 | |
2913 | 12285 | INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12639 | INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' |
2914 | 12286 | INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12640 | INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' |
2915 | 12287 | INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12641 | INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' |
2916 | 12288 | INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12642 | |
2917 | 12289 | INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12643 | |
2918 | 12290 | INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12644 | |
2919 | 12291 | INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' | 12645 | |
2920 | 12292 | INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12646 | INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' |
2921 | 12293 | INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12647 | intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' |
2922 | 12294 | INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12648 | intltool__v_merge_options_0='-q' |
2923 | 12295 | INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12649 | |
2924 | 12296 | INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12650 | |
2925 | 12297 | INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12651 | |
2926 | 12298 | INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | 12652 | |
2927 | 12653 | INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2928 | 12654 | INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2929 | 12655 | INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2930 | 12656 | INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2931 | 12657 | INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' | ||
2932 | 12658 | INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2933 | 12659 | INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2934 | 12660 | INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2935 | 12661 | INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2936 | 12662 | INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2937 | 12663 | INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2938 | 12664 | INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' | ||
2939 | 12665 | INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2940 | 12666 | INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2941 | 12667 | INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2942 | 12668 | INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2943 | 12669 | INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2944 | 12670 | INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2945 | 12671 | INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' | ||
2946 | 12299 | 12672 | ||
2947 | 12300 | 12673 | ||
2948 | 12301 | 12674 | ||
2949 | @@ -12614,7 +12987,7 @@ | |||
2950 | 12614 | if test $? -ne 0; then | 12987 | if test $? -ne 0; then |
2951 | 12615 | as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 | 12988 | as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 |
2952 | 12616 | else | 12989 | else |
2954 | 12617 | IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" | 12990 | IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` |
2955 | 12618 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 | 12991 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 |
2956 | 12619 | $as_echo "$IT_PERL_VERSION" >&6; } | 12992 | $as_echo "$IT_PERL_VERSION" >&6; } |
2957 | 12620 | fi | 12993 | fi |
2958 | @@ -14575,7 +14948,7 @@ | |||
2959 | 14575 | # Files | 14948 | # Files |
2960 | 14576 | ########################### | 14949 | ########################### |
2961 | 14577 | 14950 | ||
2963 | 14578 | ac_config_files="$ac_config_files Makefile po/Makefile.in" | 14951 | ac_config_files="$ac_config_files Makefile po/Makefile.in data/Makefile" |
2964 | 14579 | 14952 | ||
2965 | 14580 | cat >confcache <<\_ACEOF | 14953 | cat >confcache <<\_ACEOF |
2966 | 14581 | # This file is a shell script that caches the results of configure | 14954 | # This file is a shell script that caches the results of configure |
2967 | @@ -15119,7 +15492,7 @@ | |||
2968 | 15119 | # report actual input values of CONFIG_FILES etc. instead of their | 15492 | # report actual input values of CONFIG_FILES etc. instead of their |
2969 | 15120 | # values after options handling. | 15493 | # values after options handling. |
2970 | 15121 | ac_log=" | 15494 | ac_log=" |
2972 | 15122 | This file was extended by indicator-power $as_me 0.10, which was | 15495 | This file was extended by indicator-power $as_me 1.90, which was |
2973 | 15123 | generated by GNU Autoconf 2.68. Invocation command line was | 15496 | generated by GNU Autoconf 2.68. Invocation command line was |
2974 | 15124 | 15497 | ||
2975 | 15125 | CONFIG_FILES = $CONFIG_FILES | 15498 | CONFIG_FILES = $CONFIG_FILES |
2976 | @@ -15186,7 +15559,7 @@ | |||
2977 | 15186 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 15559 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2978 | 15187 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 15560 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2979 | 15188 | ac_cs_version="\\ | 15561 | ac_cs_version="\\ |
2981 | 15189 | indicator-power config.status 0.10 | 15562 | indicator-power config.status 1.90 |
2982 | 15190 | configured by $0, generated by GNU Autoconf 2.68, | 15563 | configured by $0, generated by GNU Autoconf 2.68, |
2983 | 15191 | with options \\"\$ac_cs_config\\" | 15564 | with options \\"\$ac_cs_config\\" |
2984 | 15192 | 15565 | ||
2985 | @@ -15323,6 +15696,7 @@ | |||
2986 | 15323 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' | 15696 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
2987 | 15324 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' | 15697 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
2988 | 15325 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' | 15698 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
2989 | 15699 | PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' | ||
2990 | 15326 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' | 15700 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' |
2991 | 15327 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' | 15701 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' |
2992 | 15328 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' | 15702 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' |
2993 | @@ -15405,7 +15779,6 @@ | |||
2994 | 15405 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' | 15779 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' |
2995 | 15406 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' | 15780 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' |
2996 | 15407 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' | 15781 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' |
2997 | 15408 | hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' | ||
2998 | 15409 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' | 15782 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' |
2999 | 15410 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' | 15783 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' |
3000 | 15411 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' | 15784 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' |
3001 | @@ -15461,6 +15834,7 @@ | |||
3002 | 15461 | # Quote evaled strings. | 15834 | # Quote evaled strings. |
3003 | 15462 | for var in SHELL \ | 15835 | for var in SHELL \ |
3004 | 15463 | ECHO \ | 15836 | ECHO \ |
3005 | 15837 | PATH_SEPARATOR \ | ||
3006 | 15464 | SED \ | 15838 | SED \ |
3007 | 15465 | GREP \ | 15839 | GREP \ |
3008 | 15466 | EGREP \ | 15840 | EGREP \ |
3009 | @@ -15511,7 +15885,6 @@ | |||
3010 | 15511 | allow_undefined_flag \ | 15885 | allow_undefined_flag \ |
3011 | 15512 | no_undefined_flag \ | 15886 | no_undefined_flag \ |
3012 | 15513 | hardcode_libdir_flag_spec \ | 15887 | hardcode_libdir_flag_spec \ |
3013 | 15514 | hardcode_libdir_flag_spec_ld \ | ||
3014 | 15515 | hardcode_libdir_separator \ | 15888 | hardcode_libdir_separator \ |
3015 | 15516 | exclude_expsyms \ | 15889 | exclude_expsyms \ |
3016 | 15517 | include_expsyms \ | 15890 | include_expsyms \ |
3017 | @@ -15605,6 +15978,7 @@ | |||
3018 | 15605 | "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; | 15978 | "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; |
3019 | 15606 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 15979 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
3020 | 15607 | "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; | 15980 | "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; |
3021 | 15981 | "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; | ||
3022 | 15608 | "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; | 15982 | "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; |
3023 | 15609 | 15983 | ||
3024 | 15610 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 15984 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
3025 | @@ -16317,8 +16691,8 @@ | |||
3026 | 16317 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 16691 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3027 | 16318 | # | 16692 | # |
3028 | 16319 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 16693 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3031 | 16320 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | 16694 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3032 | 16321 | # Inc. | 16695 | # Foundation, Inc. |
3033 | 16322 | # Written by Gordon Matzigkeit, 1996 | 16696 | # Written by Gordon Matzigkeit, 1996 |
3034 | 16323 | # | 16697 | # |
3035 | 16324 | # This file is part of GNU Libtool. | 16698 | # This file is part of GNU Libtool. |
3036 | @@ -16372,6 +16746,9 @@ | |||
3037 | 16372 | # An echo program that protects backslashes. | 16746 | # An echo program that protects backslashes. |
3038 | 16373 | ECHO=$lt_ECHO | 16747 | ECHO=$lt_ECHO |
3039 | 16374 | 16748 | ||
3040 | 16749 | # The PATH separator for the build system. | ||
3041 | 16750 | PATH_SEPARATOR=$lt_PATH_SEPARATOR | ||
3042 | 16751 | |||
3043 | 16375 | # The host system. | 16752 | # The host system. |
3044 | 16376 | host_alias=$host_alias | 16753 | host_alias=$host_alias |
3045 | 16377 | host=$host | 16754 | host=$host |
3046 | @@ -16673,10 +17050,6 @@ | |||
3047 | 16673 | # This must work even if \$libdir does not exist | 17050 | # This must work even if \$libdir does not exist |
3048 | 16674 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec | 17051 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec |
3049 | 16675 | 17052 | ||
3050 | 16676 | # If ld is used when linking, flag to hardcode \$libdir into a binary | ||
3051 | 16677 | # during linking. This must work even if \$libdir does not exist. | ||
3052 | 16678 | hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld | ||
3053 | 16679 | |||
3054 | 16680 | # Whether we need a single "-rpath" flag with a separated argument. | 17053 | # Whether we need a single "-rpath" flag with a separated argument. |
3055 | 16681 | hardcode_libdir_separator=$lt_hardcode_libdir_separator | 17054 | hardcode_libdir_separator=$lt_hardcode_libdir_separator |
3056 | 16682 | 17055 | ||
3057 | @@ -17109,6 +17482,7 @@ | |||
3058 | 17109 | 17482 | ||
3059 | 17110 | Prefix: $prefix | 17483 | Prefix: $prefix |
3060 | 17111 | Local Install: $with_localinstall | 17484 | Local Install: $with_localinstall |
3061 | 17485 | gcov: $use_gcov | ||
3062 | 17112 | " >&5 | 17486 | " >&5 |
3063 | 17113 | $as_echo "$as_me: | 17487 | $as_echo "$as_me: |
3064 | 17114 | 17488 | ||
3065 | @@ -17116,4 +17490,5 @@ | |||
3066 | 17116 | 17490 | ||
3067 | 17117 | Prefix: $prefix | 17491 | Prefix: $prefix |
3068 | 17118 | Local Install: $with_localinstall | 17492 | Local Install: $with_localinstall |
3069 | 17493 | gcov: $use_gcov | ||
3070 | 17119 | " >&6;} | 17494 | " >&6;} |
3071 | 17120 | 17495 | ||
3072 | === modified file 'configure.ac' | |||
3073 | --- configure.ac 2011-10-24 16:27:33 +0000 | |||
3074 | +++ configure.ac 2012-02-14 22:32:23 +0000 | |||
3075 | @@ -1,5 +1,5 @@ | |||
3076 | 1 | AC_INIT([indicator-power], | 1 | AC_INIT([indicator-power], |
3078 | 2 | [0.10], | 2 | [1.90], |
3079 | 3 | [http://bugs.launchpad.net/indicator-power], | 3 | [http://bugs.launchpad.net/indicator-power], |
3080 | 4 | [indicator-power], | 4 | [indicator-power], |
3081 | 5 | [http://launchpad.net/indicator-power]) | 5 | [http://launchpad.net/indicator-power]) |
3082 | @@ -48,6 +48,16 @@ | |||
3083 | 48 | GLIB_GSETTINGS | 48 | GLIB_GSETTINGS |
3084 | 49 | 49 | ||
3085 | 50 | ########################### | 50 | ########################### |
3086 | 51 | # gcov coverage reporting | ||
3087 | 52 | ########################### | ||
3088 | 53 | |||
3089 | 54 | m4_include([m4/gcov.m4]) | ||
3090 | 55 | AC_TDD_GCOV | ||
3091 | 56 | AC_SUBST(COVERAGE_CFLAGS) | ||
3092 | 57 | AC_SUBST(COVERAGE_CXXFLAGS) | ||
3093 | 58 | AC_SUBST(COVERAGE_LDFLAGS) | ||
3094 | 59 | |||
3095 | 60 | ########################### | ||
3096 | 51 | # Check to see if we're local | 61 | # Check to see if we're local |
3097 | 52 | ########################### | 62 | ########################### |
3098 | 53 | 63 | ||
3099 | @@ -105,6 +115,7 @@ | |||
3100 | 105 | AC_CONFIG_FILES([ | 115 | AC_CONFIG_FILES([ |
3101 | 106 | Makefile | 116 | Makefile |
3102 | 107 | po/Makefile.in | 117 | po/Makefile.in |
3103 | 118 | data/Makefile | ||
3104 | 108 | ]) | 119 | ]) |
3105 | 109 | AC_OUTPUT | 120 | AC_OUTPUT |
3106 | 110 | 121 | ||
3107 | @@ -118,4 +129,5 @@ | |||
3108 | 118 | 129 | ||
3109 | 119 | Prefix: $prefix | 130 | Prefix: $prefix |
3110 | 120 | Local Install: $with_localinstall | 131 | Local Install: $with_localinstall |
3111 | 132 | gcov: $use_gcov | ||
3112 | 121 | ]) | 133 | ]) |
3113 | 122 | 134 | ||
3114 | === added file 'data/Makefile.am' | |||
3115 | --- data/Makefile.am 1970-01-01 00:00:00 +0000 | |||
3116 | +++ data/Makefile.am 2012-02-14 22:32:23 +0000 | |||
3117 | @@ -0,0 +1,17 @@ | |||
3118 | 1 | |||
3119 | 2 | gsettings_in_file = com.canonical.indicator.power.gschema.xml.in | ||
3120 | 3 | gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) | ||
3121 | 4 | |||
3122 | 5 | @INTLTOOL_XML_NOMERGE_RULE@ | ||
3123 | 6 | |||
3124 | 7 | @GSETTINGS_RULES@ | ||
3125 | 8 | |||
3126 | 9 | dist_noinst_DATA = \ | ||
3127 | 10 | com.canonical.indicator.power.gschema.xml \ | ||
3128 | 11 | $(gsettings_in_file) | ||
3129 | 12 | |||
3130 | 13 | CLEANFILES = \ | ||
3131 | 14 | $(gsettings_SCHEMAS) | ||
3132 | 15 | |||
3133 | 16 | MAINTAINERCLEANFILES = \ | ||
3134 | 17 | $(gsettings_SCHEMAS:.xml=.valid) | ||
3135 | 0 | 18 | ||
3136 | === added file 'data/Makefile.in' | |||
3137 | --- data/Makefile.in 1970-01-01 00:00:00 +0000 | |||
3138 | +++ data/Makefile.in 2012-02-14 22:32:23 +0000 | |||
3139 | @@ -0,0 +1,442 @@ | |||
3140 | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. | ||
3141 | 2 | # @configure_input@ | ||
3142 | 3 | |||
3143 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
3144 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | ||
3145 | 6 | # Foundation, Inc. | ||
3146 | 7 | # This Makefile.in is free software; the Free Software Foundation | ||
3147 | 8 | # gives unlimited permission to copy and/or distribute it, | ||
3148 | 9 | # with or without modifications, as long as this notice is preserved. | ||
3149 | 10 | |||
3150 | 11 | # This program is distributed in the hope that it will be useful, | ||
3151 | 12 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
3152 | 13 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
3153 | 14 | # PARTICULAR PURPOSE. | ||
3154 | 15 | |||
3155 | 16 | @SET_MAKE@ | ||
3156 | 17 | |||
3157 | 18 | VPATH = @srcdir@ | ||
3158 | 19 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
3159 | 20 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
3160 | 21 | pkglibdir = $(libdir)/@PACKAGE@ | ||
3161 | 22 | pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
3162 | 23 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
3163 | 24 | install_sh_DATA = $(install_sh) -c -m 644 | ||
3164 | 25 | install_sh_PROGRAM = $(install_sh) -c | ||
3165 | 26 | install_sh_SCRIPT = $(install_sh) -c | ||
3166 | 27 | INSTALL_HEADER = $(INSTALL_DATA) | ||
3167 | 28 | transform = $(program_transform_name) | ||
3168 | 29 | NORMAL_INSTALL = : | ||
3169 | 30 | PRE_INSTALL = : | ||
3170 | 31 | POST_INSTALL = : | ||
3171 | 32 | NORMAL_UNINSTALL = : | ||
3172 | 33 | PRE_UNINSTALL = : | ||
3173 | 34 | POST_UNINSTALL = : | ||
3174 | 35 | build_triplet = @build@ | ||
3175 | 36 | host_triplet = @host@ | ||
3176 | 37 | subdir = data | ||
3177 | 38 | DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \ | ||
3178 | 39 | $(srcdir)/Makefile.in | ||
3179 | 40 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
3180 | 41 | am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ | ||
3181 | 42 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ | ||
3182 | 43 | $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ | ||
3183 | 44 | $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ | ||
3184 | 45 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | ||
3185 | 46 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | ||
3186 | 47 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ | ||
3187 | 48 | $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ | ||
3188 | 49 | $(top_srcdir)/m4/gcov.m4 $(top_srcdir)/configure.ac | ||
3189 | 50 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
3190 | 51 | $(ACLOCAL_M4) | ||
3191 | 52 | mkinstalldirs = $(install_sh) -d | ||
3192 | 53 | CONFIG_HEADER = $(top_builddir)/config.h | ||
3193 | 54 | CONFIG_CLEAN_FILES = | ||
3194 | 55 | CONFIG_CLEAN_VPATH_FILES = | ||
3195 | 56 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
3196 | 57 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
3197 | 58 | am__v_GEN_0 = @echo " GEN " $@; | ||
3198 | 59 | AM_V_at = $(am__v_at_@AM_V@) | ||
3199 | 60 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
3200 | 61 | am__v_at_0 = @ | ||
3201 | 62 | SOURCES = | ||
3202 | 63 | DIST_SOURCES = | ||
3203 | 64 | DATA = $(dist_noinst_DATA) | ||
3204 | 65 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
3205 | 66 | ACLOCAL = @ACLOCAL@ | ||
3206 | 67 | ALL_LINGUAS = @ALL_LINGUAS@ | ||
3207 | 68 | AMTAR = @AMTAR@ | ||
3208 | 69 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
3209 | 70 | AR = @AR@ | ||
3210 | 71 | AUTOCONF = @AUTOCONF@ | ||
3211 | 72 | AUTOHEADER = @AUTOHEADER@ | ||
3212 | 73 | AUTOMAKE = @AUTOMAKE@ | ||
3213 | 74 | AWK = @AWK@ | ||
3214 | 75 | CC = @CC@ | ||
3215 | 76 | CCDEPMODE = @CCDEPMODE@ | ||
3216 | 77 | CFLAGS = @CFLAGS@ | ||
3217 | 78 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
3218 | 79 | COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ | ||
3219 | 80 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
3220 | 81 | CPP = @CPP@ | ||
3221 | 82 | CPPFLAGS = @CPPFLAGS@ | ||
3222 | 83 | CYGPATH_W = @CYGPATH_W@ | ||
3223 | 84 | DATADIRNAME = @DATADIRNAME@ | ||
3224 | 85 | DEFS = @DEFS@ | ||
3225 | 86 | DEPDIR = @DEPDIR@ | ||
3226 | 87 | DLLTOOL = @DLLTOOL@ | ||
3227 | 88 | DSYMUTIL = @DSYMUTIL@ | ||
3228 | 89 | DUMPBIN = @DUMPBIN@ | ||
3229 | 90 | ECHO_C = @ECHO_C@ | ||
3230 | 91 | ECHO_N = @ECHO_N@ | ||
3231 | 92 | ECHO_T = @ECHO_T@ | ||
3232 | 93 | EGREP = @EGREP@ | ||
3233 | 94 | EXEEXT = @EXEEXT@ | ||
3234 | 95 | FGREP = @FGREP@ | ||
3235 | 96 | GCOVR = @GCOVR@ | ||
3236 | 97 | GENHTML = @GENHTML@ | ||
3237 | 98 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ | ||
3238 | 99 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | ||
3239 | 100 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | ||
3240 | 101 | GMSGFMT = @GMSGFMT@ | ||
3241 | 102 | GMSGFMT_015 = @GMSGFMT_015@ | ||
3242 | 103 | GREP = @GREP@ | ||
3243 | 104 | GSD_CFLAGS = @GSD_CFLAGS@ | ||
3244 | 105 | GSD_LIBS = @GSD_LIBS@ | ||
3245 | 106 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ | ||
3246 | 107 | INDICATORDIR = @INDICATORDIR@ | ||
3247 | 108 | INDICATORICONSDIR = @INDICATORICONSDIR@ | ||
3248 | 109 | INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ | ||
3249 | 110 | INDICATOR_LIBS = @INDICATOR_LIBS@ | ||
3250 | 111 | INSTALL = @INSTALL@ | ||
3251 | 112 | INSTALL_DATA = @INSTALL_DATA@ | ||
3252 | 113 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | ||
3253 | 114 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | ||
3254 | 115 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | ||
3255 | 116 | INTLLIBS = @INTLLIBS@ | ||
3256 | 117 | INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ | ||
3257 | 118 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ | ||
3258 | 119 | INTLTOOL_PERL = @INTLTOOL_PERL@ | ||
3259 | 120 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ | ||
3260 | 121 | INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ | ||
3261 | 122 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | ||
3262 | 123 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | ||
3263 | 124 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | ||
3264 | 125 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ | ||
3265 | 126 | LCOV = @LCOV@ | ||
3266 | 127 | LD = @LD@ | ||
3267 | 128 | LDFLAGS = @LDFLAGS@ | ||
3268 | 129 | LIBICONV = @LIBICONV@ | ||
3269 | 130 | LIBINTL = @LIBINTL@ | ||
3270 | 131 | LIBOBJS = @LIBOBJS@ | ||
3271 | 132 | LIBS = @LIBS@ | ||
3272 | 133 | LIBTOOL = @LIBTOOL@ | ||
3273 | 134 | LIPO = @LIPO@ | ||
3274 | 135 | LN_S = @LN_S@ | ||
3275 | 136 | LTLIBICONV = @LTLIBICONV@ | ||
3276 | 137 | LTLIBINTL = @LTLIBINTL@ | ||
3277 | 138 | LTLIBOBJS = @LTLIBOBJS@ | ||
3278 | 139 | MAINT = @MAINT@ | ||
3279 | 140 | MAKEINFO = @MAKEINFO@ | ||
3280 | 141 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
3281 | 142 | MKDIR_P = @MKDIR_P@ | ||
3282 | 143 | MSGFMT = @MSGFMT@ | ||
3283 | 144 | MSGFMT_015 = @MSGFMT_015@ | ||
3284 | 145 | MSGMERGE = @MSGMERGE@ | ||
3285 | 146 | NM = @NM@ | ||
3286 | 147 | NMEDIT = @NMEDIT@ | ||
3287 | 148 | OBJDUMP = @OBJDUMP@ | ||
3288 | 149 | OBJEXT = @OBJEXT@ | ||
3289 | 150 | OTOOL = @OTOOL@ | ||
3290 | 151 | OTOOL64 = @OTOOL64@ | ||
3291 | 152 | PACKAGE = @PACKAGE@ | ||
3292 | 153 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
3293 | 154 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
3294 | 155 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
3295 | 156 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
3296 | 157 | PACKAGE_URL = @PACKAGE_URL@ | ||
3297 | 158 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
3298 | 159 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
3299 | 160 | PKG_CONFIG = @PKG_CONFIG@ | ||
3300 | 161 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
3301 | 162 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
3302 | 163 | POSUB = @POSUB@ | ||
3303 | 164 | RANLIB = @RANLIB@ | ||
3304 | 165 | SED = @SED@ | ||
3305 | 166 | SET_MAKE = @SET_MAKE@ | ||
3306 | 167 | SHELL = @SHELL@ | ||
3307 | 168 | SHTOOL = @SHTOOL@ | ||
3308 | 169 | STRIP = @STRIP@ | ||
3309 | 170 | UPOWER_CFLAGS = @UPOWER_CFLAGS@ | ||
3310 | 171 | UPOWER_LIBS = @UPOWER_LIBS@ | ||
3311 | 172 | USE_NLS = @USE_NLS@ | ||
3312 | 173 | VERSION = @VERSION@ | ||
3313 | 174 | XGETTEXT = @XGETTEXT@ | ||
3314 | 175 | XGETTEXT_015 = @XGETTEXT_015@ | ||
3315 | 176 | XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ | ||
3316 | 177 | abs_builddir = @abs_builddir@ | ||
3317 | 178 | abs_srcdir = @abs_srcdir@ | ||
3318 | 179 | abs_top_builddir = @abs_top_builddir@ | ||
3319 | 180 | abs_top_srcdir = @abs_top_srcdir@ | ||
3320 | 181 | ac_ct_AR = @ac_ct_AR@ | ||
3321 | 182 | ac_ct_CC = @ac_ct_CC@ | ||
3322 | 183 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
3323 | 184 | am__include = @am__include@ | ||
3324 | 185 | am__leading_dot = @am__leading_dot@ | ||
3325 | 186 | am__quote = @am__quote@ | ||
3326 | 187 | am__tar = @am__tar@ | ||
3327 | 188 | am__untar = @am__untar@ | ||
3328 | 189 | bindir = @bindir@ | ||
3329 | 190 | build = @build@ | ||
3330 | 191 | build_alias = @build_alias@ | ||
3331 | 192 | build_cpu = @build_cpu@ | ||
3332 | 193 | build_os = @build_os@ | ||
3333 | 194 | build_vendor = @build_vendor@ | ||
3334 | 195 | builddir = @builddir@ | ||
3335 | 196 | datadir = @datadir@ | ||
3336 | 197 | datarootdir = @datarootdir@ | ||
3337 | 198 | docdir = @docdir@ | ||
3338 | 199 | dvidir = @dvidir@ | ||
3339 | 200 | exec_prefix = @exec_prefix@ | ||
3340 | 201 | gsettingsschemadir = @gsettingsschemadir@ | ||
3341 | 202 | host = @host@ | ||
3342 | 203 | host_alias = @host_alias@ | ||
3343 | 204 | host_cpu = @host_cpu@ | ||
3344 | 205 | host_os = @host_os@ | ||
3345 | 206 | host_vendor = @host_vendor@ | ||
3346 | 207 | htmldir = @htmldir@ | ||
3347 | 208 | includedir = @includedir@ | ||
3348 | 209 | infodir = @infodir@ | ||
3349 | 210 | install_sh = @install_sh@ | ||
3350 | 211 | intltool__v_merge_options_ = @intltool__v_merge_options_@ | ||
3351 | 212 | intltool__v_merge_options_0 = @intltool__v_merge_options_0@ | ||
3352 | 213 | libdir = @libdir@ | ||
3353 | 214 | libexecdir = @libexecdir@ | ||
3354 | 215 | localedir = @localedir@ | ||
3355 | 216 | localstatedir = @localstatedir@ | ||
3356 | 217 | mandir = @mandir@ | ||
3357 | 218 | mkdir_p = @mkdir_p@ | ||
3358 | 219 | oldincludedir = @oldincludedir@ | ||
3359 | 220 | pdfdir = @pdfdir@ | ||
3360 | 221 | prefix = @prefix@ | ||
3361 | 222 | program_transform_name = @program_transform_name@ | ||
3362 | 223 | psdir = @psdir@ | ||
3363 | 224 | sbindir = @sbindir@ | ||
3364 | 225 | sharedstatedir = @sharedstatedir@ | ||
3365 | 226 | srcdir = @srcdir@ | ||
3366 | 227 | sysconfdir = @sysconfdir@ | ||
3367 | 228 | target_alias = @target_alias@ | ||
3368 | 229 | top_build_prefix = @top_build_prefix@ | ||
3369 | 230 | top_builddir = @top_builddir@ | ||
3370 | 231 | top_srcdir = @top_srcdir@ | ||
3371 | 232 | gsettings_in_file = com.canonical.indicator.power.gschema.xml.in | ||
3372 | 233 | gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) | ||
3373 | 234 | dist_noinst_DATA = \ | ||
3374 | 235 | com.canonical.indicator.power.gschema.xml \ | ||
3375 | 236 | $(gsettings_in_file) | ||
3376 | 237 | |||
3377 | 238 | CLEANFILES = \ | ||
3378 | 239 | $(gsettings_SCHEMAS) | ||
3379 | 240 | |||
3380 | 241 | MAINTAINERCLEANFILES = \ | ||
3381 | 242 | $(gsettings_SCHEMAS:.xml=.valid) | ||
3382 | 243 | |||
3383 | 244 | all: all-am | ||
3384 | 245 | |||
3385 | 246 | .SUFFIXES: | ||
3386 | 247 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | ||
3387 | 248 | @for dep in $?; do \ | ||
3388 | 249 | case '$(am__configure_deps)' in \ | ||
3389 | 250 | *$$dep*) \ | ||
3390 | 251 | ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ | ||
3391 | 252 | && { if test -f $@; then exit 0; else break; fi; }; \ | ||
3392 | 253 | exit 1;; \ | ||
3393 | 254 | esac; \ | ||
3394 | 255 | done; \ | ||
3395 | 256 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \ | ||
3396 | 257 | $(am__cd) $(top_srcdir) && \ | ||
3397 | 258 | $(AUTOMAKE) --foreign data/Makefile | ||
3398 | 259 | .PRECIOUS: Makefile | ||
3399 | 260 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
3400 | 261 | @case '$?' in \ | ||
3401 | 262 | *config.status*) \ | ||
3402 | 263 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | ||
3403 | 264 | *) \ | ||
3404 | 265 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | ||
3405 | 266 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | ||
3406 | 267 | esac; | ||
3407 | 268 | |||
3408 | 269 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
3409 | 270 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
3410 | 271 | |||
3411 | 272 | $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | ||
3412 | 273 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
3413 | 274 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
3414 | 275 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
3415 | 276 | $(am__aclocal_m4_deps): | ||
3416 | 277 | |||
3417 | 278 | mostlyclean-libtool: | ||
3418 | 279 | -rm -f *.lo | ||
3419 | 280 | |||
3420 | 281 | clean-libtool: | ||
3421 | 282 | -rm -rf .libs _libs | ||
3422 | 283 | tags: TAGS | ||
3423 | 284 | TAGS: | ||
3424 | 285 | |||
3425 | 286 | ctags: CTAGS | ||
3426 | 287 | CTAGS: | ||
3427 | 288 | |||
3428 | 289 | |||
3429 | 290 | distdir: $(DISTFILES) | ||
3430 | 291 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
3431 | 292 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
3432 | 293 | list='$(DISTFILES)'; \ | ||
3433 | 294 | dist_files=`for file in $$list; do echo $$file; done | \ | ||
3434 | 295 | sed -e "s|^$$srcdirstrip/||;t" \ | ||
3435 | 296 | -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | ||
3436 | 297 | case $$dist_files in \ | ||
3437 | 298 | */*) $(MKDIR_P) `echo "$$dist_files" | \ | ||
3438 | 299 | sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | ||
3439 | 300 | sort -u` ;; \ | ||
3440 | 301 | esac; \ | ||
3441 | 302 | for file in $$dist_files; do \ | ||
3442 | 303 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
3443 | 304 | if test -d $$d/$$file; then \ | ||
3444 | 305 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
3445 | 306 | if test -d "$(distdir)/$$file"; then \ | ||
3446 | 307 | find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
3447 | 308 | fi; \ | ||
3448 | 309 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
3449 | 310 | cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
3450 | 311 | find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
3451 | 312 | fi; \ | ||
3452 | 313 | cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
3453 | 314 | else \ | ||
3454 | 315 | test -f "$(distdir)/$$file" \ | ||
3455 | 316 | || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
3456 | 317 | || exit 1; \ | ||
3457 | 318 | fi; \ | ||
3458 | 319 | done | ||
3459 | 320 | check-am: all-am | ||
3460 | 321 | check: check-am | ||
3461 | 322 | all-am: Makefile $(DATA) | ||
3462 | 323 | installdirs: | ||
3463 | 324 | install: install-am | ||
3464 | 325 | install-exec: install-exec-am | ||
3465 | 326 | install-data: install-data-am | ||
3466 | 327 | uninstall: uninstall-am | ||
3467 | 328 | |||
3468 | 329 | install-am: all-am | ||
3469 | 330 | @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am | ||
3470 | 331 | |||
3471 | 332 | installcheck: installcheck-am | ||
3472 | 333 | install-strip: | ||
3473 | 334 | if test -z '$(STRIP)'; then \ | ||
3474 | 335 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
3475 | 336 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
3476 | 337 | install; \ | ||
3477 | 338 | else \ | ||
3478 | 339 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
3479 | 340 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
3480 | 341 | "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
3481 | 342 | fi | ||
3482 | 343 | mostlyclean-generic: | ||
3483 | 344 | |||
3484 | 345 | clean-generic: | ||
3485 | 346 | -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) | ||
3486 | 347 | |||
3487 | 348 | distclean-generic: | ||
3488 | 349 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
3489 | 350 | -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
3490 | 351 | |||
3491 | 352 | maintainer-clean-generic: | ||
3492 | 353 | @echo "This command is intended for maintainers to use" | ||
3493 | 354 | @echo "it deletes files that may require special tools to rebuild." | ||
3494 | 355 | -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) | ||
3495 | 356 | clean: clean-am | ||
3496 | 357 | |||
3497 | 358 | clean-am: clean-generic clean-libtool mostlyclean-am | ||
3498 | 359 | |||
3499 | 360 | distclean: distclean-am | ||
3500 | 361 | -rm -f Makefile | ||
3501 | 362 | distclean-am: clean-am distclean-generic | ||
3502 | 363 | |||
3503 | 364 | dvi: dvi-am | ||
3504 | 365 | |||
3505 | 366 | dvi-am: | ||
3506 | 367 | |||
3507 | 368 | html: html-am | ||
3508 | 369 | |||
3509 | 370 | html-am: | ||
3510 | 371 | |||
3511 | 372 | info: info-am | ||
3512 | 373 | |||
3513 | 374 | info-am: | ||
3514 | 375 | |||
3515 | 376 | install-data-am: | ||
3516 | 377 | |||
3517 | 378 | install-dvi: install-dvi-am | ||
3518 | 379 | |||
3519 | 380 | install-dvi-am: | ||
3520 | 381 | |||
3521 | 382 | install-exec-am: | ||
3522 | 383 | |||
3523 | 384 | install-html: install-html-am | ||
3524 | 385 | |||
3525 | 386 | install-html-am: | ||
3526 | 387 | |||
3527 | 388 | install-info: install-info-am | ||
3528 | 389 | |||
3529 | 390 | install-info-am: | ||
3530 | 391 | |||
3531 | 392 | install-man: | ||
3532 | 393 | |||
3533 | 394 | install-pdf: install-pdf-am | ||
3534 | 395 | |||
3535 | 396 | install-pdf-am: | ||
3536 | 397 | |||
3537 | 398 | install-ps: install-ps-am | ||
3538 | 399 | |||
3539 | 400 | install-ps-am: | ||
3540 | 401 | |||
3541 | 402 | installcheck-am: | ||
3542 | 403 | |||
3543 | 404 | maintainer-clean: maintainer-clean-am | ||
3544 | 405 | -rm -f Makefile | ||
3545 | 406 | maintainer-clean-am: distclean-am maintainer-clean-generic | ||
3546 | 407 | |||
3547 | 408 | mostlyclean: mostlyclean-am | ||
3548 | 409 | |||
3549 | 410 | mostlyclean-am: mostlyclean-generic mostlyclean-libtool | ||
3550 | 411 | |||
3551 | 412 | pdf: pdf-am | ||
3552 | 413 | |||
3553 | 414 | pdf-am: | ||
3554 | 415 | |||
3555 | 416 | ps: ps-am | ||
3556 | 417 | |||
3557 | 418 | ps-am: | ||
3558 | 419 | |||
3559 | 420 | uninstall-am: | ||
3560 | 421 | |||
3561 | 422 | .MAKE: install-am install-strip | ||
3562 | 423 | |||
3563 | 424 | .PHONY: all all-am check check-am clean clean-generic clean-libtool \ | ||
3564 | 425 | distclean distclean-generic distclean-libtool distdir dvi \ | ||
3565 | 426 | dvi-am html html-am info info-am install install-am \ | ||
3566 | 427 | install-data install-data-am install-dvi install-dvi-am \ | ||
3567 | 428 | install-exec install-exec-am install-html install-html-am \ | ||
3568 | 429 | install-info install-info-am install-man install-pdf \ | ||
3569 | 430 | install-pdf-am install-ps install-ps-am install-strip \ | ||
3570 | 431 | installcheck installcheck-am installdirs maintainer-clean \ | ||
3571 | 432 | maintainer-clean-generic mostlyclean mostlyclean-generic \ | ||
3572 | 433 | mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am | ||
3573 | 434 | |||
3574 | 435 | |||
3575 | 436 | @INTLTOOL_XML_NOMERGE_RULE@ | ||
3576 | 437 | |||
3577 | 438 | @GSETTINGS_RULES@ | ||
3578 | 439 | |||
3579 | 440 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
3580 | 441 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
3581 | 442 | .NOEXPORT: | ||
3582 | 0 | 443 | ||
3583 | === modified file 'data/com.canonical.indicator.power.gschema.xml' | |||
3584 | --- data/com.canonical.indicator.power.gschema.xml 2011-09-23 17:03:11 +0000 | |||
3585 | +++ data/com.canonical.indicator.power.gschema.xml 2012-02-14 22:32:23 +0000 | |||
3586 | @@ -1,10 +1,20 @@ | |||
3587 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
3588 | 2 | <schemalist> | 2 | <schemalist> |
3589 | 3 | <enum id="icon-policy-enum"> | ||
3590 | 4 | <value value="0" nick="present"/> | ||
3591 | 5 | <value value="1" nick="charge"/> | ||
3592 | 6 | <value value="2" nick="never"/> | ||
3593 | 7 | </enum> | ||
3594 | 3 | <schema path="/com/canonical/indicator/power/" id="com.canonical.indicator.power" gettext-domain="@GETTEXT_PACKAGE@"> | 8 | <schema path="/com/canonical/indicator/power/" id="com.canonical.indicator.power" gettext-domain="@GETTEXT_PACKAGE@"> |
3595 | 4 | <key type="b" name="show-time"> | 9 | <key type="b" name="show-time"> |
3596 | 5 | <default>false</default> | 10 | <default>false</default> |
3597 | 6 | <summary>Show time in Menu Bar</summary> | 11 | <summary>Show time in Menu Bar</summary> |
3599 | 7 | <description>Whether show the time in the menu bar.</description> | 12 | <description>Whether or not to show the time in the menu bar.</description> |
3600 | 13 | </key> | ||
3601 | 14 | <key name="icon-policy" enum="icon-policy-enum"> | ||
3602 | 15 | <default>"present"</default> | ||
3603 | 16 | <summary>When to show the battery status in the menu bar.</summary> | ||
3604 | 17 | <description>Options for when to show battery status. Valid options are "present", "charge", and "never".</description> | ||
3605 | 8 | </key> | 18 | </key> |
3606 | 9 | </schema> | 19 | </schema> |
3607 | 10 | </schemalist> | 20 | </schemalist> |
3608 | 11 | \ No newline at end of file | 21 | \ No newline at end of file |
3609 | 12 | 22 | ||
3610 | === modified file 'data/com.canonical.indicator.power.gschema.xml.in' | |||
3611 | --- data/com.canonical.indicator.power.gschema.xml.in 2011-08-25 17:46:15 +0000 | |||
3612 | +++ data/com.canonical.indicator.power.gschema.xml.in 2012-02-14 22:32:23 +0000 | |||
3613 | @@ -1,9 +1,19 @@ | |||
3614 | 1 | <schemalist> | 1 | <schemalist> |
3615 | 2 | <enum id="icon-policy-enum"> | ||
3616 | 3 | <value nick="present" value="0" /> | ||
3617 | 4 | <value nick="charge" value="1" /> | ||
3618 | 5 | <value nick="never" value="2" /> | ||
3619 | 6 | </enum> | ||
3620 | 2 | <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.indicator.power" path="/com/canonical/indicator/power/"> | 7 | <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.indicator.power" path="/com/canonical/indicator/power/"> |
3621 | 3 | <key name="show-time" type="b"> | 8 | <key name="show-time" type="b"> |
3622 | 4 | <default>false</default> | 9 | <default>false</default> |
3623 | 5 | <_summary>Show time in Menu Bar</_summary> | 10 | <_summary>Show time in Menu Bar</_summary> |
3625 | 6 | <_description>Whether show the time in the menu bar.</_description> | 11 | <_description>Whether or not to show the time in the menu bar.</_description> |
3626 | 12 | </key> | ||
3627 | 13 | <key enum="icon-policy-enum" name="icon-policy"> | ||
3628 | 14 | <default>"present"</default> | ||
3629 | 15 | <_summary>When to show the battery status in the menu bar.</_summary> | ||
3630 | 16 | <_description>Options for when to show battery status. Valid options are "present", "charge", and "never".</_description> | ||
3631 | 7 | </key> | 17 | </key> |
3632 | 8 | </schema> | 18 | </schema> |
3633 | 9 | </schemalist> | 19 | </schemalist> |
3634 | 10 | 20 | ||
3635 | === modified file 'debian/changelog' | |||
3636 | --- debian/changelog 2012-01-25 14:58:45 +0000 | |||
3637 | +++ debian/changelog 2012-02-14 22:32:23 +0000 | |||
3638 | @@ -1,3 +1,11 @@ | |||
3639 | 1 | indicator-power (1.90-0ubuntu1~ppa1) precise; urgency=low | ||
3640 | 2 | |||
3641 | 3 | * New upstream release. | ||
3642 | 4 | * Support for hiding of icon and settings for it as well | ||
3643 | 5 | * Adding a name hint | ||
3644 | 6 | |||
3645 | 7 | -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 16:26:48 -0600 | ||
3646 | 8 | |||
3647 | 1 | indicator-power (0.10-0ubuntu2) precise; urgency=low | 9 | indicator-power (0.10-0ubuntu2) precise; urgency=low |
3648 | 2 | 10 | ||
3649 | 3 | * no change rebuild for libindicator7 | 11 | * no change rebuild for libindicator7 |
3650 | 4 | 12 | ||
3651 | === added directory 'm4' | |||
3652 | === removed directory 'm4' | |||
3653 | === added file 'm4/gcov.m4' | |||
3654 | --- m4/gcov.m4 1970-01-01 00:00:00 +0000 | |||
3655 | +++ m4/gcov.m4 2012-02-14 22:32:23 +0000 | |||
3656 | @@ -0,0 +1,83 @@ | |||
3657 | 1 | # Checks for existence of coverage tools: | ||
3658 | 2 | # * gcov | ||
3659 | 3 | # * lcov | ||
3660 | 4 | # * genhtml | ||
3661 | 5 | # * gcovr | ||
3662 | 6 | # | ||
3663 | 7 | # Sets ac_cv_check_gcov to yes if tooling is present | ||
3664 | 8 | # and reports the executables to the variables LCOV, GCOVR and GENHTML. | ||
3665 | 9 | AC_DEFUN([AC_TDD_GCOV], | ||
3666 | 10 | [AC_CACHE_CHECK([whether code coverage tools are available], ac_cv_check_gcov, | ||
3667 | 11 | [ | ||
3668 | 12 | AC_ARG_ENABLE(gcov, | ||
3669 | 13 | AS_HELP_STRING([--enable-gcov], | ||
3670 | 14 | [enable coverage testing with gcov]), | ||
3671 | 15 | [use_gcov=$enableval], [use_gcov=no]) | ||
3672 | 16 | |||
3673 | 17 | if test "x$use_gcov" = "xyes"; then | ||
3674 | 18 | # we need gcc: | ||
3675 | 19 | if test "$GCC" != "yes"; then | ||
3676 | 20 | AC_MSG_ERROR([GCC is required for --enable-gcov]) | ||
3677 | 21 | fi | ||
3678 | 22 | |||
3679 | 23 | # Check if ccache is being used | ||
3680 | 24 | AC_CHECK_PROG(SHTOOL, shtool, shtool) | ||
3681 | 25 | case `$SHTOOL path $CC` in | ||
3682 | 26 | *ccache*[)] gcc_ccache=yes;; | ||
3683 | 27 | *[)] gcc_ccache=no;; | ||
3684 | 28 | esac | ||
3685 | 29 | |||
3686 | 30 | if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then | ||
3687 | 31 | AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) | ||
3688 | 32 | fi | ||
3689 | 33 | |||
3690 | 34 | lcov_version_list="1.6 1.7 1.8 1.9" | ||
3691 | 35 | AC_CHECK_PROG(LCOV, lcov, lcov) | ||
3692 | 36 | AC_CHECK_PROG(GENHTML, genhtml, genhtml) | ||
3693 | 37 | AC_CHECK_PROG(GCOVR, gcovr, gcovr) | ||
3694 | 38 | |||
3695 | 39 | if test "$LCOV"; then | ||
3696 | 40 | AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ | ||
3697 | 41 | glib_cv_lcov_version=invalid | ||
3698 | 42 | lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` | ||
3699 | 43 | for lcov_check_version in $lcov_version_list; do | ||
3700 | 44 | if test "$lcov_version" = "$lcov_check_version"; then | ||
3701 | 45 | glib_cv_lcov_version="$lcov_check_version (ok)" | ||
3702 | 46 | fi | ||
3703 | 47 | done | ||
3704 | 48 | ]) | ||
3705 | 49 | else | ||
3706 | 50 | lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" | ||
3707 | 51 | AC_MSG_ERROR([$lcov_msg]) | ||
3708 | 52 | fi | ||
3709 | 53 | |||
3710 | 54 | case $glib_cv_lcov_version in | ||
3711 | 55 | ""|invalid[)] | ||
3712 | 56 | lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." | ||
3713 | 57 | AC_MSG_ERROR([$lcov_msg]) | ||
3714 | 58 | LCOV="exit 0;" | ||
3715 | 59 | ;; | ||
3716 | 60 | esac | ||
3717 | 61 | |||
3718 | 62 | if test -z "$GENHTML"; then | ||
3719 | 63 | AC_MSG_ERROR([Could not find genhtml from the lcov package]) | ||
3720 | 64 | fi | ||
3721 | 65 | |||
3722 | 66 | if test -z "$GCOVR"; then | ||
3723 | 67 | AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr]) | ||
3724 | 68 | fi | ||
3725 | 69 | |||
3726 | 70 | |||
3727 | 71 | # Remove all optimization flags from CFLAGS | ||
3728 | 72 | changequote({,}) | ||
3729 | 73 | CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` | ||
3730 | 74 | changequote([,]) | ||
3731 | 75 | |||
3732 | 76 | # Add the special gcc flags | ||
3733 | 77 | COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
3734 | 78 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
3735 | 79 | COVERAGE_LDFLAGS="-lgcov" | ||
3736 | 80 | |||
3737 | 81 | fi | ||
3738 | 82 | ])]) # AC_TDD_GCOV | ||
3739 | 83 | |||
3740 | 0 | 84 | ||
3741 | === renamed file 'm4/gettext.m4' => 'm4/gettext.m4' | |||
3742 | === renamed file 'm4/iconv.m4' => 'm4/iconv.m4' | |||
3743 | === renamed file 'm4/intlmacosx.m4' => 'm4/intlmacosx.m4' | |||
3744 | === renamed file 'm4/intltool.m4' => 'm4/intltool.m4' | |||
3745 | --- m4/intltool.m4 2011-07-07 18:12:06 +0000 | |||
3746 | +++ m4/intltool.m4 2012-02-14 22:32:23 +0000 | |||
3747 | @@ -23,7 +23,7 @@ | |||
3748 | 23 | ## the same distribution terms that you use for the rest of that program. | 23 | ## the same distribution terms that you use for the rest of that program. |
3749 | 24 | 24 | ||
3750 | 25 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) | 25 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) |
3752 | 26 | # serial 40 IT_PROG_INTLTOOL | 26 | # serial 41 IT_PROG_INTLTOOL |
3753 | 27 | AC_DEFUN([IT_PROG_INTLTOOL], [ | 27 | AC_DEFUN([IT_PROG_INTLTOOL], [ |
3754 | 28 | AC_PREREQ([2.50])dnl | 28 | AC_PREREQ([2.50])dnl |
3755 | 29 | AC_REQUIRE([AM_NLS])dnl | 29 | AC_REQUIRE([AM_NLS])dnl |
3756 | @@ -55,25 +55,44 @@ | |||
3757 | 55 | AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) | 55 | AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) |
3758 | 56 | fi | 56 | fi |
3759 | 57 | 57 | ||
3779 | 58 | INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 58 | if test -z "$AM_DEFAULT_VERBOSITY"; then |
3780 | 59 | INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 59 | AM_DEFAULT_VERBOSITY=1 |
3781 | 60 | INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 60 | fi |
3782 | 61 | INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 61 | AC_SUBST([AM_DEFAULT_VERBOSITY]) |
3783 | 62 | INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' | 62 | |
3784 | 63 | INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 63 | INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' |
3785 | 64 | INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 64 | INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' |
3786 | 65 | INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 65 | INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' |
3787 | 66 | INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 66 | AC_SUBST(INTLTOOL_V_MERGE) |
3788 | 67 | INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 67 | AC_SUBST(INTLTOOL__v_MERGE_) |
3789 | 68 | INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 68 | AC_SUBST(INTLTOOL__v_MERGE_0) |
3790 | 69 | INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' | 69 | |
3791 | 70 | INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 70 | INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' |
3792 | 71 | INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 71 | intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' |
3793 | 72 | INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 72 | intltool__v_merge_options_0='-q' |
3794 | 73 | INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 73 | AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) |
3795 | 74 | INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 74 | AC_SUBST(intltool__v_merge_options_) |
3796 | 75 | INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 75 | AC_SUBST(intltool__v_merge_options_0) |
3797 | 76 | INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | 76 | |
3798 | 77 | INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3799 | 78 | INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3800 | 79 | INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3801 | 80 | INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3802 | 81 | INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' | ||
3803 | 82 | INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3804 | 83 | INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3805 | 84 | INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3806 | 85 | INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3807 | 86 | INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3808 | 87 | INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3809 | 88 | INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' | ||
3810 | 89 | INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3811 | 90 | INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3812 | 91 | INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3813 | 92 | INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3814 | 93 | INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3815 | 94 | INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3816 | 95 | INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' | ||
3817 | 77 | 96 | ||
3818 | 78 | _IT_SUBST(INTLTOOL_DESKTOP_RULE) | 97 | _IT_SUBST(INTLTOOL_DESKTOP_RULE) |
3819 | 79 | _IT_SUBST(INTLTOOL_DIRECTORY_RULE) | 98 | _IT_SUBST(INTLTOOL_DIRECTORY_RULE) |
3820 | @@ -119,7 +138,7 @@ | |||
3821 | 119 | if test $? -ne 0; then | 138 | if test $? -ne 0; then |
3822 | 120 | AC_MSG_ERROR([perl 5.8.1 is required for intltool]) | 139 | AC_MSG_ERROR([perl 5.8.1 is required for intltool]) |
3823 | 121 | else | 140 | else |
3825 | 122 | IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" | 141 | IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` |
3826 | 123 | AC_MSG_RESULT([$IT_PERL_VERSION]) | 142 | AC_MSG_RESULT([$IT_PERL_VERSION]) |
3827 | 124 | fi | 143 | fi |
3828 | 125 | if test "x$2" != "xno-xml"; then | 144 | if test "x$2" != "xno-xml"; then |
3829 | 126 | 145 | ||
3830 | === renamed file 'm4/lib-ld.m4' => 'm4/lib-ld.m4' | |||
3831 | === renamed file 'm4/lib-link.m4' => 'm4/lib-link.m4' | |||
3832 | === renamed file 'm4/lib-prefix.m4' => 'm4/lib-prefix.m4' | |||
3833 | === renamed file 'm4/libtool.m4' => 'm4/libtool.m4' | |||
3834 | --- m4/libtool.m4 2011-07-07 18:12:06 +0000 | |||
3835 | +++ m4/libtool.m4 2012-02-14 22:32:23 +0000 | |||
3836 | @@ -1,8 +1,8 @@ | |||
3837 | 1 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 1 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
3838 | 2 | # | 2 | # |
3839 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3842 | 4 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | 4 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3843 | 5 | # Inc. | 5 | # Foundation, Inc. |
3844 | 6 | # Written by Gordon Matzigkeit, 1996 | 6 | # Written by Gordon Matzigkeit, 1996 |
3845 | 7 | # | 7 | # |
3846 | 8 | # This file is free software; the Free Software Foundation gives | 8 | # This file is free software; the Free Software Foundation gives |
3847 | @@ -11,8 +11,8 @@ | |||
3848 | 11 | 11 | ||
3849 | 12 | m4_define([_LT_COPYING], [dnl | 12 | m4_define([_LT_COPYING], [dnl |
3850 | 13 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 13 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3853 | 14 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | 14 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3854 | 15 | # Inc. | 15 | # Foundation, Inc. |
3855 | 16 | # Written by Gordon Matzigkeit, 1996 | 16 | # Written by Gordon Matzigkeit, 1996 |
3856 | 17 | # | 17 | # |
3857 | 18 | # This file is part of GNU Libtool. | 18 | # This file is part of GNU Libtool. |
3858 | @@ -146,6 +146,8 @@ | |||
3859 | 146 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl | 146 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
3860 | 147 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl | 147 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
3861 | 148 | 148 | ||
3862 | 149 | _LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl | ||
3863 | 150 | dnl | ||
3864 | 149 | _LT_DECL([], [host_alias], [0], [The host system])dnl | 151 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
3865 | 150 | _LT_DECL([], [host], [0])dnl | 152 | _LT_DECL([], [host], [0])dnl |
3866 | 151 | _LT_DECL([], [host_os], [0])dnl | 153 | _LT_DECL([], [host_os], [0])dnl |
3867 | @@ -637,7 +639,7 @@ | |||
3868 | 637 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 639 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
3869 | 638 | configured by $[0], generated by m4_PACKAGE_STRING. | 640 | configured by $[0], generated by m4_PACKAGE_STRING. |
3870 | 639 | 641 | ||
3872 | 640 | Copyright (C) 2010 Free Software Foundation, Inc. | 642 | Copyright (C) 2011 Free Software Foundation, Inc. |
3873 | 641 | This config.lt script is free software; the Free Software Foundation | 643 | This config.lt script is free software; the Free Software Foundation |
3874 | 642 | gives unlimited permision to copy, distribute and modify it." | 644 | gives unlimited permision to copy, distribute and modify it." |
3875 | 643 | 645 | ||
3876 | @@ -801,6 +803,7 @@ | |||
3877 | 801 | m4_case([$1], | 803 | m4_case([$1], |
3878 | 802 | [C], [_LT_LANG(C)], | 804 | [C], [_LT_LANG(C)], |
3879 | 803 | [C++], [_LT_LANG(CXX)], | 805 | [C++], [_LT_LANG(CXX)], |
3880 | 806 | [Go], [_LT_LANG(GO)], | ||
3881 | 804 | [Java], [_LT_LANG(GCJ)], | 807 | [Java], [_LT_LANG(GCJ)], |
3882 | 805 | [Fortran 77], [_LT_LANG(F77)], | 808 | [Fortran 77], [_LT_LANG(F77)], |
3883 | 806 | [Fortran], [_LT_LANG(FC)], | 809 | [Fortran], [_LT_LANG(FC)], |
3884 | @@ -822,6 +825,31 @@ | |||
3885 | 822 | ])# _LT_LANG | 825 | ])# _LT_LANG |
3886 | 823 | 826 | ||
3887 | 824 | 827 | ||
3888 | 828 | m4_ifndef([AC_PROG_GO], [ | ||
3889 | 829 | ############################################################ | ||
3890 | 830 | # NOTE: This macro has been submitted for inclusion into # | ||
3891 | 831 | # GNU Autoconf as AC_PROG_GO. When it is available in # | ||
3892 | 832 | # a released version of Autoconf we should remove this # | ||
3893 | 833 | # macro and use it instead. # | ||
3894 | 834 | ############################################################ | ||
3895 | 835 | m4_defun([AC_PROG_GO], | ||
3896 | 836 | [AC_LANG_PUSH(Go)dnl | ||
3897 | 837 | AC_ARG_VAR([GOC], [Go compiler command])dnl | ||
3898 | 838 | AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl | ||
3899 | 839 | _AC_ARG_VAR_LDFLAGS()dnl | ||
3900 | 840 | AC_CHECK_TOOL(GOC, gccgo) | ||
3901 | 841 | if test -z "$GOC"; then | ||
3902 | 842 | if test -n "$ac_tool_prefix"; then | ||
3903 | 843 | AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) | ||
3904 | 844 | fi | ||
3905 | 845 | fi | ||
3906 | 846 | if test -z "$GOC"; then | ||
3907 | 847 | AC_CHECK_PROG(GOC, gccgo, gccgo, false) | ||
3908 | 848 | fi | ||
3909 | 849 | ])#m4_defun | ||
3910 | 850 | ])#m4_ifndef | ||
3911 | 851 | |||
3912 | 852 | |||
3913 | 825 | # _LT_LANG_DEFAULT_CONFIG | 853 | # _LT_LANG_DEFAULT_CONFIG |
3914 | 826 | # ----------------------- | 854 | # ----------------------- |
3915 | 827 | m4_defun([_LT_LANG_DEFAULT_CONFIG], | 855 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
3916 | @@ -852,6 +880,10 @@ | |||
3917 | 852 | m4_ifdef([LT_PROG_GCJ], | 880 | m4_ifdef([LT_PROG_GCJ], |
3918 | 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)])])])])]) |
3919 | 854 | 882 | ||
3920 | 883 | AC_PROVIDE_IFELSE([AC_PROG_GO], | ||
3921 | 884 | [LT_LANG(GO)], | ||
3922 | 885 | [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) | ||
3923 | 886 | |||
3924 | 855 | AC_PROVIDE_IFELSE([LT_PROG_RC], | 887 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
3925 | 856 | [LT_LANG(RC)], | 888 | [LT_LANG(RC)], |
3926 | 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)])]) |
3927 | @@ -954,7 +986,13 @@ | |||
3928 | 954 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | 986 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
3929 | 955 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | 987 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
3930 | 956 | _lt_result=$? | 988 | _lt_result=$? |
3932 | 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" |
3933 | 990 | # appears in it, assume the flag caused a linker warning | ||
3934 | 991 | if test -s conftest.err && $GREP single_module conftest.err; then | ||
3935 | 992 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
3936 | 993 | # Otherwise, if the output was created with a 0 exit code from | ||
3937 | 994 | # the compiler, it worked. | ||
3938 | 995 | elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
3939 | 958 | lt_cv_apple_cc_single_mod=yes | 996 | lt_cv_apple_cc_single_mod=yes |
3940 | 959 | else | 997 | else |
3941 | 960 | cat conftest.err >&AS_MESSAGE_LOG_FD | 998 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3942 | @@ -962,6 +1000,7 @@ | |||
3943 | 962 | rm -rf libconftest.dylib* | 1000 | rm -rf libconftest.dylib* |
3944 | 963 | rm -f conftest.* | 1001 | rm -f conftest.* |
3945 | 964 | fi]) | 1002 | fi]) |
3946 | 1003 | |||
3947 | 965 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], | 1004 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
3948 | 966 | [lt_cv_ld_exported_symbols_list], | 1005 | [lt_cv_ld_exported_symbols_list], |
3949 | 967 | [lt_cv_ld_exported_symbols_list=no | 1006 | [lt_cv_ld_exported_symbols_list=no |
3950 | @@ -973,6 +1012,7 @@ | |||
3951 | 973 | [lt_cv_ld_exported_symbols_list=no]) | 1012 | [lt_cv_ld_exported_symbols_list=no]) |
3952 | 974 | LDFLAGS="$save_LDFLAGS" | 1013 | LDFLAGS="$save_LDFLAGS" |
3953 | 975 | ]) | 1014 | ]) |
3954 | 1015 | |||
3955 | 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], |
3956 | 977 | [lt_cv_ld_force_load=no | 1017 | [lt_cv_ld_force_load=no |
3957 | 978 | cat > conftest.c << _LT_EOF | 1018 | cat > conftest.c << _LT_EOF |
3958 | @@ -990,7 +1030,9 @@ | |||
3959 | 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 |
3960 | 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 |
3961 | 992 | _lt_result=$? | 1032 | _lt_result=$? |
3963 | 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 |
3964 | 1034 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
3965 | 1035 | elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
3966 | 994 | lt_cv_ld_force_load=yes | 1036 | lt_cv_ld_force_load=yes |
3967 | 995 | else | 1037 | else |
3968 | 996 | cat conftest.err >&AS_MESSAGE_LOG_FD | 1038 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3969 | @@ -1035,8 +1077,8 @@ | |||
3970 | 1035 | ]) | 1077 | ]) |
3971 | 1036 | 1078 | ||
3972 | 1037 | 1079 | ||
3975 | 1038 | # _LT_DARWIN_LINKER_FEATURES | 1080 | # _LT_DARWIN_LINKER_FEATURES([TAG]) |
3976 | 1039 | # -------------------------- | 1081 | # --------------------------------- |
3977 | 1040 | # Checks for linker and compiler features on darwin | 1082 | # Checks for linker and compiler features on darwin |
3978 | 1041 | m4_defun([_LT_DARWIN_LINKER_FEATURES], | 1083 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
3979 | 1042 | [ | 1084 | [ |
3980 | @@ -1047,6 +1089,8 @@ | |||
3981 | 1047 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 1089 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
3982 | 1048 | if test "$lt_cv_ld_force_load" = "yes"; then | 1090 | if test "$lt_cv_ld_force_load" = "yes"; then |
3983 | 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\"`' |
3984 | 1092 | m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], | ||
3985 | 1093 | [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) | ||
3986 | 1050 | else | 1094 | else |
3987 | 1051 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | 1095 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
3988 | 1052 | fi | 1096 | fi |
3989 | @@ -1330,14 +1374,27 @@ | |||
3990 | 1330 | CFLAGS="$SAVE_CFLAGS" | 1374 | CFLAGS="$SAVE_CFLAGS" |
3991 | 1331 | fi | 1375 | fi |
3992 | 1332 | ;; | 1376 | ;; |
3994 | 1333 | sparc*-*solaris*) | 1377 | *-*solaris*) |
3995 | 1334 | # Find out which ABI we are using. | 1378 | # Find out which ABI we are using. |
3996 | 1335 | echo 'int i;' > conftest.$ac_ext | 1379 | echo 'int i;' > conftest.$ac_ext |
3997 | 1336 | if AC_TRY_EVAL(ac_compile); then | 1380 | if AC_TRY_EVAL(ac_compile); then |
3998 | 1337 | case `/usr/bin/file conftest.o` in | 1381 | case `/usr/bin/file conftest.o` in |
3999 | 1338 | *64-bit*) | 1382 | *64-bit*) |
4000 | 1339 | case $lt_cv_prog_gnu_ld in | 1383 | case $lt_cv_prog_gnu_ld in |
4002 | 1340 | yes*) LD="${LD-ld} -m elf64_sparc" ;; | 1384 | yes*) |
4003 | 1385 | case $host in | ||
4004 | 1386 | i?86-*-solaris*) | ||
4005 | 1387 | LD="${LD-ld} -m elf_x86_64" | ||
4006 | 1388 | ;; | ||
4007 | 1389 | sparc*-*-solaris*) | ||
4008 | 1390 | LD="${LD-ld} -m elf64_sparc" | ||
4009 | 1391 | ;; | ||
4010 | 1392 | esac | ||
4011 | 1393 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
4012 | 1394 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
4013 | 1395 | LD="${LD-ld}_sol2" | ||
4014 | 1396 | fi | ||
4015 | 1397 | ;; | ||
4016 | 1341 | *) | 1398 | *) |
4017 | 1342 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | 1399 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
4018 | 1343 | LD="${LD-ld} -64" | 1400 | LD="${LD-ld} -64" |
4019 | @@ -1414,13 +1471,13 @@ | |||
4020 | 1414 | if test -n "$RANLIB"; then | 1471 | if test -n "$RANLIB"; then |
4021 | 1415 | case $host_os in | 1472 | case $host_os in |
4022 | 1416 | openbsd*) | 1473 | openbsd*) |
4024 | 1417 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | 1474 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
4025 | 1418 | ;; | 1475 | ;; |
4026 | 1419 | *) | 1476 | *) |
4028 | 1420 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | 1477 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
4029 | 1421 | ;; | 1478 | ;; |
4030 | 1422 | esac | 1479 | esac |
4032 | 1423 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 1480 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
4033 | 1424 | fi | 1481 | fi |
4034 | 1425 | 1482 | ||
4035 | 1426 | case $host_os in | 1483 | case $host_os in |
4036 | @@ -1600,6 +1657,11 @@ | |||
4037 | 1600 | lt_cv_sys_max_cmd_len=196608 | 1657 | lt_cv_sys_max_cmd_len=196608 |
4038 | 1601 | ;; | 1658 | ;; |
4039 | 1602 | 1659 | ||
4040 | 1660 | os2*) | ||
4041 | 1661 | # The test takes a long time on OS/2. | ||
4042 | 1662 | lt_cv_sys_max_cmd_len=8192 | ||
4043 | 1663 | ;; | ||
4044 | 1664 | |||
4045 | 1603 | osf*) | 1665 | osf*) |
4046 | 1604 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | 1666 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
4047 | 1605 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | 1667 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
4048 | @@ -1639,7 +1701,7 @@ | |||
4049 | 1639 | # If test is not a shell built-in, we'll probably end up computing a | 1701 | # If test is not a shell built-in, we'll probably end up computing a |
4050 | 1640 | # maximum length that is only half of the actual maximum length, but | 1702 | # maximum length that is only half of the actual maximum length, but |
4051 | 1641 | # we can't tell. | 1703 | # we can't tell. |
4053 | 1642 | while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | 1704 | while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
4054 | 1643 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | 1705 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
4055 | 1644 | test $i != 17 # 1/2 MB should be enough | 1706 | test $i != 17 # 1/2 MB should be enough |
4056 | 1645 | do | 1707 | do |
4057 | @@ -2185,7 +2247,7 @@ | |||
4058 | 2185 | 2247 | ||
4059 | 2186 | case $host_os in | 2248 | case $host_os in |
4060 | 2187 | aix3*) | 2249 | aix3*) |
4062 | 2188 | version_type=linux | 2250 | version_type=linux # correct to gnu/linux during the next big refactor |
4063 | 2189 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | 2251 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
4064 | 2190 | shlibpath_var=LIBPATH | 2252 | shlibpath_var=LIBPATH |
4065 | 2191 | 2253 | ||
4066 | @@ -2194,7 +2256,7 @@ | |||
4067 | 2194 | ;; | 2256 | ;; |
4068 | 2195 | 2257 | ||
4069 | 2196 | aix[[4-9]]*) | 2258 | aix[[4-9]]*) |
4071 | 2197 | version_type=linux | 2259 | version_type=linux # correct to gnu/linux during the next big refactor |
4072 | 2198 | need_lib_prefix=no | 2260 | need_lib_prefix=no |
4073 | 2199 | need_version=no | 2261 | need_version=no |
4074 | 2200 | hardcode_into_libs=yes | 2262 | hardcode_into_libs=yes |
4075 | @@ -2259,7 +2321,7 @@ | |||
4076 | 2259 | ;; | 2321 | ;; |
4077 | 2260 | 2322 | ||
4078 | 2261 | bsdi[[45]]*) | 2323 | bsdi[[45]]*) |
4080 | 2262 | version_type=linux | 2324 | version_type=linux # correct to gnu/linux during the next big refactor |
4081 | 2263 | need_version=no | 2325 | need_version=no |
4082 | 2264 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2326 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4083 | 2265 | soname_spec='${libname}${release}${shared_ext}$major' | 2327 | soname_spec='${libname}${release}${shared_ext}$major' |
4084 | @@ -2398,7 +2460,7 @@ | |||
4085 | 2398 | ;; | 2460 | ;; |
4086 | 2399 | 2461 | ||
4087 | 2400 | dgux*) | 2462 | dgux*) |
4089 | 2401 | version_type=linux | 2463 | version_type=linux # correct to gnu/linux during the next big refactor |
4090 | 2402 | need_lib_prefix=no | 2464 | need_lib_prefix=no |
4091 | 2403 | need_version=no | 2465 | need_version=no |
4092 | 2404 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | 2466 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
4093 | @@ -2406,10 +2468,6 @@ | |||
4094 | 2406 | shlibpath_var=LD_LIBRARY_PATH | 2468 | shlibpath_var=LD_LIBRARY_PATH |
4095 | 2407 | ;; | 2469 | ;; |
4096 | 2408 | 2470 | ||
4097 | 2409 | freebsd1*) | ||
4098 | 2410 | dynamic_linker=no | ||
4099 | 2411 | ;; | ||
4100 | 2412 | |||
4101 | 2413 | freebsd* | dragonfly*) | 2471 | freebsd* | dragonfly*) |
4102 | 2414 | # DragonFly does not have aout. When/if they implement a new | 2472 | # DragonFly does not have aout. When/if they implement a new |
4103 | 2415 | # versioning mechanism, adjust this. | 2473 | # versioning mechanism, adjust this. |
4104 | @@ -2417,7 +2475,7 @@ | |||
4105 | 2417 | objformat=`/usr/bin/objformat` | 2475 | objformat=`/usr/bin/objformat` |
4106 | 2418 | else | 2476 | else |
4107 | 2419 | case $host_os in | 2477 | case $host_os in |
4109 | 2420 | freebsd[[123]]*) objformat=aout ;; | 2478 | freebsd[[23]].*) objformat=aout ;; |
4110 | 2421 | *) objformat=elf ;; | 2479 | *) objformat=elf ;; |
4111 | 2422 | esac | 2480 | esac |
4112 | 2423 | fi | 2481 | fi |
4113 | @@ -2435,7 +2493,7 @@ | |||
4114 | 2435 | esac | 2493 | esac |
4115 | 2436 | shlibpath_var=LD_LIBRARY_PATH | 2494 | shlibpath_var=LD_LIBRARY_PATH |
4116 | 2437 | case $host_os in | 2495 | case $host_os in |
4118 | 2438 | freebsd2*) | 2496 | freebsd2.*) |
4119 | 2439 | shlibpath_overrides_runpath=yes | 2497 | shlibpath_overrides_runpath=yes |
4120 | 2440 | ;; | 2498 | ;; |
4121 | 2441 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) | 2499 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
4122 | @@ -2455,7 +2513,7 @@ | |||
4123 | 2455 | ;; | 2513 | ;; |
4124 | 2456 | 2514 | ||
4125 | 2457 | gnu*) | 2515 | gnu*) |
4127 | 2458 | version_type=linux | 2516 | version_type=linux # correct to gnu/linux during the next big refactor |
4128 | 2459 | need_lib_prefix=no | 2517 | need_lib_prefix=no |
4129 | 2460 | need_version=no | 2518 | need_version=no |
4130 | 2461 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 2519 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
4131 | @@ -2466,7 +2524,7 @@ | |||
4132 | 2466 | ;; | 2524 | ;; |
4133 | 2467 | 2525 | ||
4134 | 2468 | haiku*) | 2526 | haiku*) |
4136 | 2469 | version_type=linux | 2527 | version_type=linux # correct to gnu/linux during the next big refactor |
4137 | 2470 | need_lib_prefix=no | 2528 | need_lib_prefix=no |
4138 | 2471 | need_version=no | 2529 | need_version=no |
4139 | 2472 | dynamic_linker="$host_os runtime_loader" | 2530 | dynamic_linker="$host_os runtime_loader" |
4140 | @@ -2527,7 +2585,7 @@ | |||
4141 | 2527 | ;; | 2585 | ;; |
4142 | 2528 | 2586 | ||
4143 | 2529 | interix[[3-9]]*) | 2587 | interix[[3-9]]*) |
4145 | 2530 | version_type=linux | 2588 | version_type=linux # correct to gnu/linux during the next big refactor |
4146 | 2531 | need_lib_prefix=no | 2589 | need_lib_prefix=no |
4147 | 2532 | need_version=no | 2590 | need_version=no |
4148 | 2533 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 2591 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
4149 | @@ -2543,7 +2601,7 @@ | |||
4150 | 2543 | nonstopux*) version_type=nonstopux ;; | 2601 | nonstopux*) version_type=nonstopux ;; |
4151 | 2544 | *) | 2602 | *) |
4152 | 2545 | if test "$lt_cv_prog_gnu_ld" = yes; then | 2603 | if test "$lt_cv_prog_gnu_ld" = yes; then |
4154 | 2546 | version_type=linux | 2604 | version_type=linux # correct to gnu/linux during the next big refactor |
4155 | 2547 | else | 2605 | else |
4156 | 2548 | version_type=irix | 2606 | version_type=irix |
4157 | 2549 | fi ;; | 2607 | fi ;; |
4158 | @@ -2580,9 +2638,9 @@ | |||
4159 | 2580 | dynamic_linker=no | 2638 | dynamic_linker=no |
4160 | 2581 | ;; | 2639 | ;; |
4161 | 2582 | 2640 | ||
4163 | 2583 | # This must be Linux ELF. | 2641 | # This must be glibc/ELF. |
4164 | 2584 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 2642 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4166 | 2585 | version_type=linux | 2643 | version_type=linux # correct to gnu/linux during the next big refactor |
4167 | 2586 | need_lib_prefix=no | 2644 | need_lib_prefix=no |
4168 | 2587 | need_version=no | 2645 | need_version=no |
4169 | 2588 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2646 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4170 | @@ -2657,7 +2715,7 @@ | |||
4171 | 2657 | ;; | 2715 | ;; |
4172 | 2658 | 2716 | ||
4173 | 2659 | newsos6) | 2717 | newsos6) |
4175 | 2660 | version_type=linux | 2718 | version_type=linux # correct to gnu/linux during the next big refactor |
4176 | 2661 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2719 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4177 | 2662 | shlibpath_var=LD_LIBRARY_PATH | 2720 | shlibpath_var=LD_LIBRARY_PATH |
4178 | 2663 | shlibpath_overrides_runpath=yes | 2721 | shlibpath_overrides_runpath=yes |
4179 | @@ -2726,7 +2784,7 @@ | |||
4180 | 2726 | ;; | 2784 | ;; |
4181 | 2727 | 2785 | ||
4182 | 2728 | solaris*) | 2786 | solaris*) |
4184 | 2729 | version_type=linux | 2787 | version_type=linux # correct to gnu/linux during the next big refactor |
4185 | 2730 | need_lib_prefix=no | 2788 | need_lib_prefix=no |
4186 | 2731 | need_version=no | 2789 | need_version=no |
4187 | 2732 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2790 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4188 | @@ -2751,7 +2809,7 @@ | |||
4189 | 2751 | ;; | 2809 | ;; |
4190 | 2752 | 2810 | ||
4191 | 2753 | sysv4 | sysv4.3*) | 2811 | sysv4 | sysv4.3*) |
4193 | 2754 | version_type=linux | 2812 | version_type=linux # correct to gnu/linux during the next big refactor |
4194 | 2755 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2813 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4195 | 2756 | soname_spec='${libname}${release}${shared_ext}$major' | 2814 | soname_spec='${libname}${release}${shared_ext}$major' |
4196 | 2757 | shlibpath_var=LD_LIBRARY_PATH | 2815 | shlibpath_var=LD_LIBRARY_PATH |
4197 | @@ -2775,7 +2833,7 @@ | |||
4198 | 2775 | 2833 | ||
4199 | 2776 | sysv4*MP*) | 2834 | sysv4*MP*) |
4200 | 2777 | if test -d /usr/nec ;then | 2835 | if test -d /usr/nec ;then |
4202 | 2778 | version_type=linux | 2836 | version_type=linux # correct to gnu/linux during the next big refactor |
4203 | 2779 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | 2837 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
4204 | 2780 | soname_spec='$libname${shared_ext}.$major' | 2838 | soname_spec='$libname${shared_ext}.$major' |
4205 | 2781 | shlibpath_var=LD_LIBRARY_PATH | 2839 | shlibpath_var=LD_LIBRARY_PATH |
4206 | @@ -2806,7 +2864,7 @@ | |||
4207 | 2806 | 2864 | ||
4208 | 2807 | tpf*) | 2865 | tpf*) |
4209 | 2808 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | 2866 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
4211 | 2809 | version_type=linux | 2867 | version_type=linux # correct to gnu/linux during the next big refactor |
4212 | 2810 | need_lib_prefix=no | 2868 | need_lib_prefix=no |
4213 | 2811 | need_version=no | 2869 | need_version=no |
4214 | 2812 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2870 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4215 | @@ -2816,7 +2874,7 @@ | |||
4216 | 2816 | ;; | 2874 | ;; |
4217 | 2817 | 2875 | ||
4218 | 2818 | uts4*) | 2876 | uts4*) |
4220 | 2819 | version_type=linux | 2877 | version_type=linux # correct to gnu/linux during the next big refactor |
4221 | 2820 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2878 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4222 | 2821 | soname_spec='${libname}${release}${shared_ext}$major' | 2879 | soname_spec='${libname}${release}${shared_ext}$major' |
4223 | 2822 | shlibpath_var=LD_LIBRARY_PATH | 2880 | shlibpath_var=LD_LIBRARY_PATH |
4224 | @@ -3238,7 +3296,7 @@ | |||
4225 | 3238 | lt_cv_deplibs_check_method=pass_all | 3296 | lt_cv_deplibs_check_method=pass_all |
4226 | 3239 | ;; | 3297 | ;; |
4227 | 3240 | 3298 | ||
4229 | 3241 | # This must be Linux ELF. | 3299 | # This must be glibc/ELF. |
4230 | 3242 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 3300 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4231 | 3243 | lt_cv_deplibs_check_method=pass_all | 3301 | lt_cv_deplibs_check_method=pass_all |
4232 | 3244 | ;; | 3302 | ;; |
4233 | @@ -3658,6 +3716,7 @@ | |||
4234 | 3658 | # which start with @ or ?. | 3716 | # which start with @ or ?. |
4235 | 3659 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ | 3717 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
4236 | 3660 | " {last_section=section; section=\$ 3};"\ | 3718 | " {last_section=section; section=\$ 3};"\ |
4237 | 3719 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
4238 | 3661 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | 3720 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
4239 | 3662 | " \$ 0!~/External *\|/{next};"\ | 3721 | " \$ 0!~/External *\|/{next};"\ |
4240 | 3663 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | 3722 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
4241 | @@ -4242,7 +4301,9 @@ | |||
4242 | 4242 | case $cc_basename in | 4301 | case $cc_basename in |
4243 | 4243 | nvcc*) # Cuda Compiler Driver 2.2 | 4302 | nvcc*) # Cuda Compiler Driver 2.2 |
4244 | 4244 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' | 4303 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
4246 | 4245 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' | 4304 | if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
4247 | 4305 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" | ||
4248 | 4306 | fi | ||
4249 | 4246 | ;; | 4307 | ;; |
4250 | 4247 | esac | 4308 | esac |
4251 | 4248 | else | 4309 | else |
4252 | @@ -4334,18 +4395,33 @@ | |||
4253 | 4334 | ;; | 4395 | ;; |
4254 | 4335 | *) | 4396 | *) |
4255 | 4336 | case `$CC -V 2>&1 | sed 5q` in | 4397 | case `$CC -V 2>&1 | sed 5q` in |
4257 | 4337 | *Sun\ F* | *Sun*Fortran*) | 4398 | *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
4258 | 4338 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | 4399 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4259 | 4339 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4400 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4260 | 4340 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4401 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4261 | 4341 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | 4402 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
4262 | 4342 | ;; | 4403 | ;; |
4263 | 4404 | *Sun\ F* | *Sun*Fortran*) | ||
4264 | 4405 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
4265 | 4406 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
4266 | 4407 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' | ||
4267 | 4408 | ;; | ||
4268 | 4343 | *Sun\ C*) | 4409 | *Sun\ C*) |
4269 | 4344 | # Sun C 5.9 | 4410 | # Sun C 5.9 |
4270 | 4345 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4411 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4271 | 4346 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4412 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4272 | 4347 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4413 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4273 | 4348 | ;; | 4414 | ;; |
4274 | 4415 | *Intel*\ [[CF]]*Compiler*) | ||
4275 | 4416 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
4276 | 4417 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | ||
4277 | 4418 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
4278 | 4419 | ;; | ||
4279 | 4420 | *Portland\ Group*) | ||
4280 | 4421 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
4281 | 4422 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' | ||
4282 | 4423 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
4283 | 4424 | ;; | ||
4284 | 4349 | esac | 4425 | esac |
4285 | 4350 | ;; | 4426 | ;; |
4286 | 4351 | esac | 4427 | esac |
4287 | @@ -4505,7 +4581,9 @@ | |||
4288 | 4505 | ;; | 4581 | ;; |
4289 | 4506 | cygwin* | mingw* | cegcc*) | 4582 | cygwin* | mingw* | cegcc*) |
4290 | 4507 | case $cc_basename in | 4583 | case $cc_basename in |
4292 | 4508 | cl*) ;; | 4584 | cl*) |
4293 | 4585 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
4294 | 4586 | ;; | ||
4295 | 4509 | *) | 4587 | *) |
4296 | 4510 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' | 4588 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
4297 | 4511 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | 4589 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
4298 | @@ -4533,7 +4611,6 @@ | |||
4299 | 4533 | _LT_TAGVAR(hardcode_direct, $1)=no | 4611 | _LT_TAGVAR(hardcode_direct, $1)=no |
4300 | 4534 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 4612 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4301 | 4535 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4613 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4302 | 4536 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
4303 | 4537 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 4614 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4304 | 4538 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 4615 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4305 | 4539 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 4616 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4306 | @@ -4787,8 +4864,7 @@ | |||
4307 | 4787 | xlf* | bgf* | bgxlf* | mpixlf*) | 4864 | xlf* | bgf* | bgxlf* | mpixlf*) |
4308 | 4788 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 4865 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
4309 | 4789 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 4866 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
4312 | 4790 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4867 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4311 | 4791 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | ||
4313 | 4792 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | 4868 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
4314 | 4793 | if test "x$supports_anon_versioning" = xyes; then | 4869 | if test "x$supports_anon_versioning" = xyes; then |
4315 | 4794 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | 4870 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
4316 | @@ -5084,6 +5160,7 @@ | |||
4317 | 5084 | # The linker will not automatically build a static lib if we build a DLL. | 5160 | # The linker will not automatically build a static lib if we build a DLL. |
4318 | 5085 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | 5161 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4319 | 5086 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 5162 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4320 | 5163 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
4321 | 5087 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' | 5164 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
4322 | 5088 | # Don't use ranlib | 5165 | # Don't use ranlib |
4323 | 5089 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | 5166 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
4324 | @@ -5130,10 +5207,6 @@ | |||
4325 | 5130 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 5207 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
4326 | 5131 | ;; | 5208 | ;; |
4327 | 5132 | 5209 | ||
4328 | 5133 | freebsd1*) | ||
4329 | 5134 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
4330 | 5135 | ;; | ||
4331 | 5136 | |||
4332 | 5137 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | 5210 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
4333 | 5138 | # support. Future versions do this automatically, but an explicit c++rt0.o | 5211 | # support. Future versions do this automatically, but an explicit c++rt0.o |
4334 | 5139 | # does not break anything, and helps significantly (at the cost of a little | 5212 | # does not break anything, and helps significantly (at the cost of a little |
4335 | @@ -5146,7 +5219,7 @@ | |||
4336 | 5146 | ;; | 5219 | ;; |
4337 | 5147 | 5220 | ||
4338 | 5148 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | 5221 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
4340 | 5149 | freebsd2*) | 5222 | freebsd2.*) |
4341 | 5150 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | 5223 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
4342 | 5151 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5224 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4343 | 5152 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 5225 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
4344 | @@ -5185,7 +5258,6 @@ | |||
4345 | 5185 | fi | 5258 | fi |
4346 | 5186 | if test "$with_gnu_ld" = no; then | 5259 | if test "$with_gnu_ld" = no; then |
4347 | 5187 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 5260 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4348 | 5188 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' | ||
4349 | 5189 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 5261 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
4350 | 5190 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5262 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4351 | 5191 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes | 5263 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
4352 | @@ -5627,9 +5699,6 @@ | |||
4353 | 5627 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], | 5699 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
4354 | 5628 | [Flag to hardcode $libdir into a binary during linking. | 5700 | [Flag to hardcode $libdir into a binary during linking. |
4355 | 5629 | This must work even if $libdir does not exist]) | 5701 | This must work even if $libdir does not exist]) |
4356 | 5630 | _LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], | ||
4357 | 5631 | [[If ld is used when linking, flag to hardcode $libdir into a binary | ||
4358 | 5632 | during linking. This must work even if $libdir does not exist]]) | ||
4359 | 5633 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], | 5702 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
4360 | 5634 | [Whether we need a single "-rpath" flag with a separated argument]) | 5703 | [Whether we need a single "-rpath" flag with a separated argument]) |
4361 | 5635 | _LT_TAGDECL([], [hardcode_direct], [0], | 5704 | _LT_TAGDECL([], [hardcode_direct], [0], |
4362 | @@ -5787,7 +5856,6 @@ | |||
4363 | 5787 | _LT_TAGVAR(hardcode_direct, $1)=no | 5856 | _LT_TAGVAR(hardcode_direct, $1)=no |
4364 | 5788 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 5857 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4365 | 5789 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 5858 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4366 | 5790 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
4367 | 5791 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 5859 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4368 | 5792 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 5860 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4369 | 5793 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 5861 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4370 | @@ -6157,7 +6225,7 @@ | |||
4371 | 6157 | esac | 6225 | esac |
4372 | 6158 | ;; | 6226 | ;; |
4373 | 6159 | 6227 | ||
4375 | 6160 | freebsd[[12]]*) | 6228 | freebsd2.*) |
4376 | 6161 | # C++ shared libraries reported to be fairly broken before | 6229 | # C++ shared libraries reported to be fairly broken before |
4377 | 6162 | # switch to ELF | 6230 | # switch to ELF |
4378 | 6163 | _LT_TAGVAR(ld_shlibs, $1)=no | 6231 | _LT_TAGVAR(ld_shlibs, $1)=no |
4379 | @@ -6918,12 +6986,18 @@ | |||
4380 | 6918 | } | 6986 | } |
4381 | 6919 | }; | 6987 | }; |
4382 | 6920 | _LT_EOF | 6988 | _LT_EOF |
4383 | 6989 | ], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF | ||
4384 | 6990 | package foo | ||
4385 | 6991 | func foo() { | ||
4386 | 6992 | } | ||
4387 | 6993 | _LT_EOF | ||
4388 | 6921 | ]) | 6994 | ]) |
4389 | 6922 | 6995 | ||
4390 | 6923 | _lt_libdeps_save_CFLAGS=$CFLAGS | 6996 | _lt_libdeps_save_CFLAGS=$CFLAGS |
4391 | 6924 | case "$CC $CFLAGS " in #( | 6997 | case "$CC $CFLAGS " in #( |
4392 | 6925 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | 6998 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
4393 | 6926 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | 6999 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
4394 | 7000 | *\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; | ||
4395 | 6927 | esac | 7001 | esac |
4396 | 6928 | 7002 | ||
4397 | 6929 | dnl Parse the compiler output and extract the necessary | 7003 | dnl Parse the compiler output and extract the necessary |
4398 | @@ -7120,7 +7194,6 @@ | |||
4399 | 7120 | _LT_TAGVAR(hardcode_direct, $1)=no | 7194 | _LT_TAGVAR(hardcode_direct, $1)=no |
4400 | 7121 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 7195 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4401 | 7122 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 7196 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4402 | 7123 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
4403 | 7124 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 7197 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4404 | 7125 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 7198 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4405 | 7126 | _LT_TAGVAR(hardcode_automatic, $1)=no | 7199 | _LT_TAGVAR(hardcode_automatic, $1)=no |
4406 | @@ -7253,7 +7326,6 @@ | |||
4407 | 7253 | _LT_TAGVAR(hardcode_direct, $1)=no | 7326 | _LT_TAGVAR(hardcode_direct, $1)=no |
4408 | 7254 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 7327 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4409 | 7255 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 7328 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4410 | 7256 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
4411 | 7257 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 7329 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4412 | 7258 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 7330 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4413 | 7259 | _LT_TAGVAR(hardcode_automatic, $1)=no | 7331 | _LT_TAGVAR(hardcode_automatic, $1)=no |
4414 | @@ -7440,6 +7512,77 @@ | |||
4415 | 7440 | ])# _LT_LANG_GCJ_CONFIG | 7512 | ])# _LT_LANG_GCJ_CONFIG |
4416 | 7441 | 7513 | ||
4417 | 7442 | 7514 | ||
4418 | 7515 | # _LT_LANG_GO_CONFIG([TAG]) | ||
4419 | 7516 | # -------------------------- | ||
4420 | 7517 | # Ensure that the configuration variables for the GNU Go compiler | ||
4421 | 7518 | # are suitably defined. These variables are subsequently used by _LT_CONFIG | ||
4422 | 7519 | # to write the compiler configuration to `libtool'. | ||
4423 | 7520 | m4_defun([_LT_LANG_GO_CONFIG], | ||
4424 | 7521 | [AC_REQUIRE([LT_PROG_GO])dnl | ||
4425 | 7522 | AC_LANG_SAVE | ||
4426 | 7523 | |||
4427 | 7524 | # Source file extension for Go test sources. | ||
4428 | 7525 | ac_ext=go | ||
4429 | 7526 | |||
4430 | 7527 | # Object file extension for compiled Go test sources. | ||
4431 | 7528 | objext=o | ||
4432 | 7529 | _LT_TAGVAR(objext, $1)=$objext | ||
4433 | 7530 | |||
4434 | 7531 | # Code to be used in simple compile tests | ||
4435 | 7532 | lt_simple_compile_test_code="package main; func main() { }" | ||
4436 | 7533 | |||
4437 | 7534 | # Code to be used in simple link tests | ||
4438 | 7535 | lt_simple_link_test_code='package main; func main() { }' | ||
4439 | 7536 | |||
4440 | 7537 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. | ||
4441 | 7538 | _LT_TAG_COMPILER | ||
4442 | 7539 | |||
4443 | 7540 | # save warnings/boilerplate of simple test code | ||
4444 | 7541 | _LT_COMPILER_BOILERPLATE | ||
4445 | 7542 | _LT_LINKER_BOILERPLATE | ||
4446 | 7543 | |||
4447 | 7544 | # Allow CC to be a program name with arguments. | ||
4448 | 7545 | lt_save_CC=$CC | ||
4449 | 7546 | lt_save_CFLAGS=$CFLAGS | ||
4450 | 7547 | lt_save_GCC=$GCC | ||
4451 | 7548 | GCC=yes | ||
4452 | 7549 | CC=${GOC-"gccgo"} | ||
4453 | 7550 | CFLAGS=$GOFLAGS | ||
4454 | 7551 | compiler=$CC | ||
4455 | 7552 | _LT_TAGVAR(compiler, $1)=$CC | ||
4456 | 7553 | _LT_TAGVAR(LD, $1)="$LD" | ||
4457 | 7554 | _LT_CC_BASENAME([$compiler]) | ||
4458 | 7555 | |||
4459 | 7556 | # Go did not exist at the time GCC didn't implicitly link libc in. | ||
4460 | 7557 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | ||
4461 | 7558 | |||
4462 | 7559 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | ||
4463 | 7560 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
4464 | 7561 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
4465 | 7562 | |||
4466 | 7563 | ## CAVEAT EMPTOR: | ||
4467 | 7564 | ## There is no encapsulation within the following macros, do not change | ||
4468 | 7565 | ## the running order or otherwise move them around unless you know exactly | ||
4469 | 7566 | ## what you are doing... | ||
4470 | 7567 | if test -n "$compiler"; then | ||
4471 | 7568 | _LT_COMPILER_NO_RTTI($1) | ||
4472 | 7569 | _LT_COMPILER_PIC($1) | ||
4473 | 7570 | _LT_COMPILER_C_O($1) | ||
4474 | 7571 | _LT_COMPILER_FILE_LOCKS($1) | ||
4475 | 7572 | _LT_LINKER_SHLIBS($1) | ||
4476 | 7573 | _LT_LINKER_HARDCODE_LIBPATH($1) | ||
4477 | 7574 | |||
4478 | 7575 | _LT_CONFIG($1) | ||
4479 | 7576 | fi | ||
4480 | 7577 | |||
4481 | 7578 | AC_LANG_RESTORE | ||
4482 | 7579 | |||
4483 | 7580 | GCC=$lt_save_GCC | ||
4484 | 7581 | CC=$lt_save_CC | ||
4485 | 7582 | CFLAGS=$lt_save_CFLAGS | ||
4486 | 7583 | ])# _LT_LANG_GO_CONFIG | ||
4487 | 7584 | |||
4488 | 7585 | |||
4489 | 7443 | # _LT_LANG_RC_CONFIG([TAG]) | 7586 | # _LT_LANG_RC_CONFIG([TAG]) |
4490 | 7444 | # ------------------------- | 7587 | # ------------------------- |
4491 | 7445 | # Ensure that the configuration variables for the Windows resource compiler | 7588 | # Ensure that the configuration variables for the Windows resource compiler |
4492 | @@ -7509,6 +7652,13 @@ | |||
4493 | 7509 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) | 7652 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
4494 | 7510 | 7653 | ||
4495 | 7511 | 7654 | ||
4496 | 7655 | # LT_PROG_GO | ||
4497 | 7656 | # ---------- | ||
4498 | 7657 | AC_DEFUN([LT_PROG_GO], | ||
4499 | 7658 | [AC_CHECK_TOOL(GOC, gccgo,) | ||
4500 | 7659 | ]) | ||
4501 | 7660 | |||
4502 | 7661 | |||
4503 | 7512 | # LT_PROG_RC | 7662 | # LT_PROG_RC |
4504 | 7513 | # ---------- | 7663 | # ---------- |
4505 | 7514 | AC_DEFUN([LT_PROG_RC], | 7664 | AC_DEFUN([LT_PROG_RC], |
4506 | 7515 | 7665 | ||
4507 | === renamed file 'm4/ltoptions.m4' => 'm4/ltoptions.m4' | |||
4508 | --- m4/ltoptions.m4 2011-07-07 18:12:06 +0000 | |||
4509 | +++ m4/ltoptions.m4 2012-02-14 22:32:23 +0000 | |||
4510 | @@ -326,9 +326,24 @@ | |||
4511 | 326 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. | 326 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
4512 | 327 | m4_define([_LT_WITH_PIC], | 327 | m4_define([_LT_WITH_PIC], |
4513 | 328 | [AC_ARG_WITH([pic], | 328 | [AC_ARG_WITH([pic], |
4515 | 329 | [AS_HELP_STRING([--with-pic], | 329 | [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], |
4516 | 330 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], | 330 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
4518 | 331 | [pic_mode="$withval"], | 331 | [lt_p=${PACKAGE-default} |
4519 | 332 | case $withval in | ||
4520 | 333 | yes|no) pic_mode=$withval ;; | ||
4521 | 334 | *) | ||
4522 | 335 | pic_mode=default | ||
4523 | 336 | # Look at the argument we got. We use all the common list separators. | ||
4524 | 337 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | ||
4525 | 338 | for lt_pkg in $withval; do | ||
4526 | 339 | IFS="$lt_save_ifs" | ||
4527 | 340 | if test "X$lt_pkg" = "X$lt_p"; then | ||
4528 | 341 | pic_mode=yes | ||
4529 | 342 | fi | ||
4530 | 343 | done | ||
4531 | 344 | IFS="$lt_save_ifs" | ||
4532 | 345 | ;; | ||
4533 | 346 | esac], | ||
4534 | 332 | [pic_mode=default]) | 347 | [pic_mode=default]) |
4535 | 333 | 348 | ||
4536 | 334 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) | 349 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) |
4537 | 335 | 350 | ||
4538 | === renamed file 'm4/ltsugar.m4' => 'm4/ltsugar.m4' | |||
4539 | === renamed file 'm4/ltversion.m4' => 'm4/ltversion.m4' | |||
4540 | --- m4/ltversion.m4 2011-07-07 18:12:06 +0000 | |||
4541 | +++ m4/ltversion.m4 2012-02-14 22:32:23 +0000 | |||
4542 | @@ -9,15 +9,15 @@ | |||
4543 | 9 | 9 | ||
4544 | 10 | # @configure_input@ | 10 | # @configure_input@ |
4545 | 11 | 11 | ||
4547 | 12 | # serial 3293 ltversion.m4 | 12 | # serial 3337 ltversion.m4 |
4548 | 13 | # This file is part of GNU Libtool | 13 | # This file is part of GNU Libtool |
4549 | 14 | 14 | ||
4552 | 15 | m4_define([LT_PACKAGE_VERSION], [2.4]) | 15 | m4_define([LT_PACKAGE_VERSION], [2.4.2]) |
4553 | 16 | m4_define([LT_PACKAGE_REVISION], [1.3293]) | 16 | m4_define([LT_PACKAGE_REVISION], [1.3337]) |
4554 | 17 | 17 | ||
4555 | 18 | AC_DEFUN([LTVERSION_VERSION], | 18 | AC_DEFUN([LTVERSION_VERSION], |
4558 | 19 | [macro_version='2.4' | 19 | [macro_version='2.4.2' |
4559 | 20 | macro_revision='1.3293' | 20 | macro_revision='1.3337' |
4560 | 21 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | 21 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
4561 | 22 | _LT_DECL(, macro_revision, 0) | 22 | _LT_DECL(, macro_revision, 0) |
4562 | 23 | ]) | 23 | ]) |
4563 | 24 | 24 | ||
4564 | === renamed file 'm4/lt~obsolete.m4' => 'm4/lt~obsolete.m4' | |||
4565 | === renamed file 'm4/nls.m4' => 'm4/nls.m4' | |||
4566 | === renamed file 'm4/po.m4' => 'm4/po.m4' | |||
4567 | === renamed file 'm4/progtest.m4' => 'm4/progtest.m4' | |||
4568 | === modified file 'po/Makefile.in.in' | |||
4569 | --- po/Makefile.in.in 2011-07-07 18:12:06 +0000 | |||
4570 | +++ po/Makefile.in.in 2012-02-14 22:32:23 +0000 | |||
4571 | @@ -49,8 +49,8 @@ | |||
4572 | 49 | XGETTEXT = @XGETTEXT@ | 49 | XGETTEXT = @XGETTEXT@ |
4573 | 50 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ | 50 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
4574 | 51 | INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ | 51 | INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
4577 | 52 | MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist | 52 | MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist |
4578 | 53 | GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot | 53 | GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot |
4579 | 54 | 54 | ||
4580 | 55 | ALL_LINGUAS = @ALL_LINGUAS@ | 55 | ALL_LINGUAS = @ALL_LINGUAS@ |
4581 | 56 | 56 | ||
4582 | @@ -73,15 +73,20 @@ | |||
4583 | 73 | .SUFFIXES: | 73 | .SUFFIXES: |
4584 | 74 | .SUFFIXES: .po .pox .gmo .mo .msg .cat | 74 | .SUFFIXES: .po .pox .gmo .mo .msg .cat |
4585 | 75 | 75 | ||
4586 | 76 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
4587 | 77 | INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) | ||
4588 | 78 | INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) | ||
4589 | 79 | INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; | ||
4590 | 80 | |||
4591 | 76 | .po.pox: | 81 | .po.pox: |
4592 | 77 | $(MAKE) $(GETTEXT_PACKAGE).pot | 82 | $(MAKE) $(GETTEXT_PACKAGE).pot |
4593 | 78 | $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox | 83 | $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox |
4594 | 79 | 84 | ||
4595 | 80 | .po.mo: | 85 | .po.mo: |
4597 | 81 | $(MSGFMT) -o $@ $< | 86 | $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< |
4598 | 82 | 87 | ||
4599 | 83 | .po.gmo: | 88 | .po.gmo: |
4601 | 84 | file=`echo $* | sed 's,.*/,,'`.gmo \ | 89 | $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ |
4602 | 85 | && rm -f $$file && $(GMSGFMT) -o $$file $< | 90 | && rm -f $$file && $(GMSGFMT) -o $$file $< |
4603 | 86 | 91 | ||
4604 | 87 | .po.cat: | 92 | .po.cat: |
4605 | 88 | 93 | ||
4606 | === modified file 'src/indicator-power.c' | |||
4607 | --- src/indicator-power.c 2011-10-24 16:27:33 +0000 | |||
4608 | +++ src/indicator-power.c 2012-02-14 22:32:23 +0000 | |||
4609 | @@ -24,7 +24,6 @@ | |||
4610 | 24 | #endif | 24 | #endif |
4611 | 25 | 25 | ||
4612 | 26 | /* GStuff */ | 26 | /* GStuff */ |
4613 | 27 | #include <glib.h> | ||
4614 | 28 | #include <glib-object.h> | 27 | #include <glib-object.h> |
4615 | 29 | #include <glib/gi18n-lib.h> | 28 | #include <glib/gi18n-lib.h> |
4616 | 30 | #include <gio/gio.h> | 29 | #include <gio/gio.h> |
4617 | @@ -36,6 +35,8 @@ | |||
4618 | 36 | #include <libindicator/indicator.h> | 35 | #include <libindicator/indicator.h> |
4619 | 37 | #include <libindicator/indicator-object.h> | 36 | #include <libindicator/indicator-object.h> |
4620 | 38 | 37 | ||
4621 | 38 | #define ICON_POLICY_KEY "icon-policy" | ||
4622 | 39 | |||
4623 | 39 | #define DEFAULT_ICON "gpm-battery-missing" | 40 | #define DEFAULT_ICON "gpm-battery-missing" |
4624 | 40 | 41 | ||
4625 | 41 | #define DBUS_SERVICE "org.gnome.SettingsDaemon" | 42 | #define DBUS_SERVICE "org.gnome.SettingsDaemon" |
4626 | @@ -43,6 +44,12 @@ | |||
4627 | 43 | #define POWER_DBUS_PATH DBUS_PATH "/Power" | 44 | #define POWER_DBUS_PATH DBUS_PATH "/Power" |
4628 | 44 | #define POWER_DBUS_INTERFACE "org.gnome.SettingsDaemon.Power" | 45 | #define POWER_DBUS_INTERFACE "org.gnome.SettingsDaemon.Power" |
4629 | 45 | 46 | ||
4630 | 47 | enum { | ||
4631 | 48 | POWER_INDICATOR_ICON_POLICY_PRESENT, | ||
4632 | 49 | POWER_INDICATOR_ICON_POLICY_CHARGE, | ||
4633 | 50 | POWER_INDICATOR_ICON_POLICY_NEVER | ||
4634 | 51 | }; | ||
4635 | 52 | |||
4636 | 46 | #define INDICATOR_POWER_TYPE (indicator_power_get_type ()) | 53 | #define INDICATOR_POWER_TYPE (indicator_power_get_type ()) |
4637 | 47 | #define INDICATOR_POWER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_POWER_TYPE, IndicatorPower)) | 54 | #define INDICATOR_POWER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_POWER_TYPE, IndicatorPower)) |
4638 | 48 | #define INDICATOR_POWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_POWER_TYPE, IndicatorPowerClass)) | 55 | #define INDICATOR_POWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_POWER_TYPE, IndicatorPowerClass)) |
4639 | @@ -50,27 +57,18 @@ | |||
4640 | 50 | #define IS_INDICATOR_POWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_POWER_TYPE)) | 57 | #define IS_INDICATOR_POWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_POWER_TYPE)) |
4641 | 51 | #define INDICATOR_POWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_POWER_TYPE, IndicatorPowerClass)) | 58 | #define INDICATOR_POWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_POWER_TYPE, IndicatorPowerClass)) |
4642 | 52 | 59 | ||
4643 | 60 | typedef struct _IndicatorPowerClass IndicatorPowerClass; | ||
4644 | 53 | typedef struct _IndicatorPower IndicatorPower; | 61 | typedef struct _IndicatorPower IndicatorPower; |
4647 | 54 | typedef struct _IndicatorPowerClass IndicatorPowerClass; | 62 | |
4648 | 55 | typedef struct _IndicatorPowerPrivate IndicatorPowerPrivate; | 63 | struct _IndicatorPowerClass |
4649 | 64 | { | ||
4650 | 65 | IndicatorObjectClass parent_class; | ||
4651 | 66 | }; | ||
4652 | 56 | 67 | ||
4653 | 57 | struct _IndicatorPower | 68 | struct _IndicatorPower |
4654 | 58 | { | 69 | { |
4655 | 59 | IndicatorObject parent_instance; | 70 | IndicatorObject parent_instance; |
4656 | 60 | 71 | ||
4657 | 61 | IndicatorPowerPrivate *priv; | ||
4658 | 62 | }; | ||
4659 | 63 | |||
4660 | 64 | struct _IndicatorPowerClass | ||
4661 | 65 | { | ||
4662 | 66 | IndicatorObjectClass parent_class; | ||
4663 | 67 | }; | ||
4664 | 68 | |||
4665 | 69 | GType indicator_power_get_type (void) G_GNUC_CONST; | ||
4666 | 70 | |||
4667 | 71 | |||
4668 | 72 | struct _IndicatorPowerPrivate | ||
4669 | 73 | { | ||
4670 | 74 | GtkMenu *menu; | 72 | GtkMenu *menu; |
4671 | 75 | 73 | ||
4672 | 76 | GtkLabel *label; | 74 | GtkLabel *label; |
4673 | @@ -87,9 +85,12 @@ | |||
4674 | 87 | GSettings *settings; | 85 | GSettings *settings; |
4675 | 88 | }; | 86 | }; |
4676 | 89 | 87 | ||
4677 | 88 | GType indicator_power_get_type (void) G_GNUC_CONST; | ||
4678 | 89 | |||
4679 | 90 | INDICATOR_SET_VERSION | ||
4680 | 91 | INDICATOR_SET_TYPE (INDICATOR_POWER_TYPE) | ||
4681 | 92 | |||
4682 | 90 | /* Prototypes */ | 93 | /* Prototypes */ |
4683 | 91 | static void indicator_power_class_init (IndicatorPowerClass *klass); | ||
4684 | 92 | static void indicator_power_init (IndicatorPower *self); | ||
4685 | 93 | static void indicator_power_dispose (GObject *object); | 94 | static void indicator_power_dispose (GObject *object); |
4686 | 94 | static void indicator_power_finalize (GObject *object); | 95 | static void indicator_power_finalize (GObject *object); |
4687 | 95 | 96 | ||
4688 | @@ -97,16 +98,15 @@ | |||
4689 | 97 | static GtkImage* get_image (IndicatorObject * io); | 98 | static GtkImage* get_image (IndicatorObject * io); |
4690 | 98 | static GtkMenu* get_menu (IndicatorObject * io); | 99 | static GtkMenu* get_menu (IndicatorObject * io); |
4691 | 99 | static const gchar* get_accessible_desc (IndicatorObject * io); | 100 | static const gchar* get_accessible_desc (IndicatorObject * io); |
4693 | 100 | 101 | static const gchar* get_name_hint (IndicatorObject * io); | |
4694 | 102 | |||
4695 | 103 | static void update_visibility (IndicatorPower * self); | ||
4696 | 104 | static gboolean should_be_visible (IndicatorPower * self); | ||
4697 | 105 | |||
4698 | 106 | static void gsd_appeared_callback (GDBusConnection *connection, const gchar *name, const gchar *name_owner, gpointer user_data); | ||
4699 | 101 | 107 | ||
4700 | 102 | G_DEFINE_TYPE (IndicatorPower, indicator_power, INDICATOR_OBJECT_TYPE); | 108 | G_DEFINE_TYPE (IndicatorPower, indicator_power, INDICATOR_OBJECT_TYPE); |
4701 | 103 | 109 | ||
4702 | 104 | |||
4703 | 105 | /* Indicator stuff */ | ||
4704 | 106 | INDICATOR_SET_VERSION | ||
4705 | 107 | INDICATOR_SET_TYPE (INDICATOR_POWER_TYPE) | ||
4706 | 108 | |||
4707 | 109 | |||
4708 | 110 | static void | 110 | static void |
4709 | 111 | indicator_power_class_init (IndicatorPowerClass *klass) | 111 | indicator_power_class_init (IndicatorPowerClass *klass) |
4710 | 112 | { | 112 | { |
4711 | @@ -120,8 +120,76 @@ | |||
4712 | 120 | io_class->get_image = get_image; | 120 | io_class->get_image = get_image; |
4713 | 121 | io_class->get_menu = get_menu; | 121 | io_class->get_menu = get_menu; |
4714 | 122 | io_class->get_accessible_desc = get_accessible_desc; | 122 | io_class->get_accessible_desc = get_accessible_desc; |
4717 | 123 | 123 | io_class->get_name_hint = get_name_hint; | |
4718 | 124 | g_type_class_add_private (klass, sizeof (IndicatorPowerPrivate)); | 124 | } |
4719 | 125 | |||
4720 | 126 | static void | ||
4721 | 127 | indicator_power_init (IndicatorPower *self) | ||
4722 | 128 | { | ||
4723 | 129 | self->menu = GTK_MENU(gtk_menu_new()); | ||
4724 | 130 | |||
4725 | 131 | self->accessible_desc = NULL; | ||
4726 | 132 | |||
4727 | 133 | self->watcher_id = g_bus_watch_name (G_BUS_TYPE_SESSION, | ||
4728 | 134 | DBUS_SERVICE, | ||
4729 | 135 | G_BUS_NAME_WATCHER_FLAGS_NONE, | ||
4730 | 136 | gsd_appeared_callback, | ||
4731 | 137 | NULL, | ||
4732 | 138 | self, | ||
4733 | 139 | NULL); | ||
4734 | 140 | |||
4735 | 141 | self->settings = g_settings_new ("com.canonical.indicator.power"); | ||
4736 | 142 | g_signal_connect_swapped (self->settings, "changed::" ICON_POLICY_KEY, | ||
4737 | 143 | G_CALLBACK(update_visibility), self); | ||
4738 | 144 | g_object_set (G_OBJECT(self), | ||
4739 | 145 | INDICATOR_OBJECT_DEFAULT_VISIBILITY, FALSE, | ||
4740 | 146 | NULL); | ||
4741 | 147 | } | ||
4742 | 148 | |||
4743 | 149 | static void | ||
4744 | 150 | indicator_power_dispose (GObject *object) | ||
4745 | 151 | { | ||
4746 | 152 | IndicatorPower *self = INDICATOR_POWER(object); | ||
4747 | 153 | |||
4748 | 154 | if (self->devices != NULL) { | ||
4749 | 155 | g_variant_unref (self->devices); | ||
4750 | 156 | self->devices = NULL; | ||
4751 | 157 | } | ||
4752 | 158 | |||
4753 | 159 | if (self->device != NULL) { | ||
4754 | 160 | g_variant_unref (self->device); | ||
4755 | 161 | self->device = NULL; | ||
4756 | 162 | } | ||
4757 | 163 | |||
4758 | 164 | g_clear_object (&self->proxy); | ||
4759 | 165 | g_clear_object (&self->proxy_cancel); | ||
4760 | 166 | |||
4761 | 167 | g_clear_object (&self->settings); | ||
4762 | 168 | |||
4763 | 169 | G_OBJECT_CLASS (indicator_power_parent_class)->dispose (object); | ||
4764 | 170 | } | ||
4765 | 171 | |||
4766 | 172 | static void | ||
4767 | 173 | indicator_power_finalize (GObject *object) | ||
4768 | 174 | { | ||
4769 | 175 | IndicatorPower *self = INDICATOR_POWER(object); | ||
4770 | 176 | |||
4771 | 177 | g_free (self->accessible_desc); | ||
4772 | 178 | |||
4773 | 179 | G_OBJECT_CLASS (indicator_power_parent_class)->finalize (object); | ||
4774 | 180 | } | ||
4775 | 181 | |||
4776 | 182 | /*** | ||
4777 | 183 | **** | ||
4778 | 184 | ***/ | ||
4779 | 185 | |||
4780 | 186 | static void | ||
4781 | 187 | spawn_command_line_async (const char * command) | ||
4782 | 188 | { | ||
4783 | 189 | GError * err = NULL; | ||
4784 | 190 | if (!g_spawn_command_line_async (command, &err)) | ||
4785 | 191 | g_warning ("Couldn't execute command \"%s\": %s", command, err->message); | ||
4786 | 192 | g_clear_error (&err); | ||
4787 | 125 | } | 193 | } |
4788 | 126 | 194 | ||
4789 | 127 | static void | 195 | static void |
4790 | @@ -129,37 +197,21 @@ | |||
4791 | 129 | gpointer data) | 197 | gpointer data) |
4792 | 130 | { | 198 | { |
4793 | 131 | /*TODO: show the statistics of the specific device*/ | 199 | /*TODO: show the statistics of the specific device*/ |
4798 | 132 | const gchar *command = "gnome-power-statistics"; | 200 | spawn_command_line_async ("gnome-power-statistics"); |
4795 | 133 | |||
4796 | 134 | if (g_spawn_command_line_async (command, NULL) == FALSE) | ||
4797 | 135 | g_warning ("Couldn't execute command: %s", command); | ||
4799 | 136 | } | 201 | } |
4800 | 137 | 202 | ||
4801 | 138 | static void | 203 | static void |
4804 | 139 | option_toggled_cb (GtkCheckMenuItem *item, | 204 | option_toggled_cb (GtkCheckMenuItem *item, IndicatorPower * self) |
4803 | 140 | gpointer user_data) | ||
4805 | 141 | { | 205 | { |
4817 | 142 | IndicatorPower *self = INDICATOR_POWER (user_data); | 206 | gtk_widget_set_visible (GTK_WIDGET (self->label), |
4818 | 143 | IndicatorPowerPrivate *priv = self->priv; | 207 | gtk_check_menu_item_get_active(item)); |
4808 | 144 | gboolean visible; | ||
4809 | 145 | |||
4810 | 146 | visible = gtk_check_menu_item_get_active (item); | ||
4811 | 147 | |||
4812 | 148 | gtk_widget_set_visible (GTK_WIDGET (priv->label), | ||
4813 | 149 | visible); | ||
4814 | 150 | |||
4815 | 151 | g_settings_set_boolean (priv->settings, "show-time", | ||
4816 | 152 | visible); | ||
4819 | 153 | } | 208 | } |
4820 | 154 | 209 | ||
4821 | 155 | static void | 210 | static void |
4822 | 156 | show_preferences_cb (GtkMenuItem *item, | 211 | show_preferences_cb (GtkMenuItem *item, |
4823 | 157 | gpointer data) | 212 | gpointer data) |
4824 | 158 | { | 213 | { |
4829 | 159 | const gchar *command = "gnome-control-center power"; | 214 | spawn_command_line_async ("gnome-control-center power"); |
4826 | 160 | |||
4827 | 161 | if (g_spawn_command_line_async (command, NULL) == FALSE) | ||
4828 | 162 | g_warning ("Couldn't execute command: %s", command); | ||
4830 | 163 | } | 215 | } |
4831 | 164 | 216 | ||
4832 | 165 | static void | 217 | static void |
4833 | @@ -350,14 +402,12 @@ | |||
4834 | 350 | set_accessible_desc (IndicatorPower *self, | 402 | set_accessible_desc (IndicatorPower *self, |
4835 | 351 | const gchar *desc) | 403 | const gchar *desc) |
4836 | 352 | { | 404 | { |
4840 | 353 | IndicatorPowerPrivate *priv = self->priv; | 405 | if (desc == NULL || desc[0] == '\0') |
4838 | 354 | |||
4839 | 355 | if (desc == NULL || strlen(desc) == 0) | ||
4841 | 356 | return; | 406 | return; |
4842 | 357 | 407 | ||
4844 | 358 | g_free (priv->accessible_desc); | 408 | g_free (self->accessible_desc); |
4845 | 359 | 409 | ||
4847 | 360 | priv->accessible_desc = g_strdup (desc); | 410 | self->accessible_desc = g_strdup (desc); |
4848 | 361 | } | 411 | } |
4849 | 362 | 412 | ||
4850 | 363 | static const gchar * | 413 | static const gchar * |
4851 | @@ -557,38 +607,32 @@ | |||
4852 | 557 | static void | 607 | static void |
4853 | 558 | build_menu (IndicatorPower *self) | 608 | build_menu (IndicatorPower *self) |
4854 | 559 | { | 609 | { |
4855 | 560 | IndicatorPowerPrivate *priv = self->priv; | ||
4856 | 561 | GtkWidget *item; | 610 | GtkWidget *item; |
4857 | 562 | GtkWidget *image; | 611 | GtkWidget *image; |
4858 | 563 | GList *children; | 612 | GList *children; |
4859 | 564 | gsize n_devices = 0; | 613 | gsize n_devices = 0; |
4866 | 565 | gboolean visible; | 614 | |
4867 | 566 | 615 | /* remove the existing menuitems */ | |
4868 | 567 | if (priv->menu == NULL) | 616 | children = gtk_container_get_children (GTK_CONTAINER (self->menu)); |
4863 | 568 | priv->menu = GTK_MENU (gtk_menu_new ()); | ||
4864 | 569 | |||
4865 | 570 | children = gtk_container_get_children (GTK_CONTAINER (priv->menu)); | ||
4869 | 571 | g_list_foreach (children, (GFunc) gtk_widget_destroy, NULL); | 617 | g_list_foreach (children, (GFunc) gtk_widget_destroy, NULL); |
4870 | 572 | g_list_free (children); | 618 | g_list_free (children); |
4871 | 573 | 619 | ||
4872 | 574 | /* devices */ | 620 | /* devices */ |
4874 | 575 | n_devices = menu_add_devices (priv->menu, priv->devices); | 621 | n_devices = menu_add_devices (self->menu, self->devices); |
4875 | 576 | 622 | ||
4876 | 577 | if (!get_greeter_mode ()) { | 623 | if (!get_greeter_mode ()) { |
4877 | 578 | /* only do the separator if we have at least one device */ | 624 | /* only do the separator if we have at least one device */ |
4878 | 579 | if (n_devices != 0) | 625 | if (n_devices != 0) |
4879 | 580 | { | 626 | { |
4880 | 581 | item = gtk_separator_menu_item_new (); | 627 | item = gtk_separator_menu_item_new (); |
4882 | 582 | gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item); | 628 | gtk_menu_shell_append (GTK_MENU_SHELL (self->menu), item); |
4883 | 583 | } | 629 | } |
4884 | 584 | 630 | ||
4885 | 585 | /* options */ | 631 | /* options */ |
4886 | 586 | item = gtk_check_menu_item_new_with_label (_("Show Time in Menu Bar")); | 632 | item = gtk_check_menu_item_new_with_label (_("Show Time in Menu Bar")); |
4892 | 587 | g_signal_connect (G_OBJECT (item), "toggled", | 633 | g_signal_connect (item, "toggled", G_CALLBACK(option_toggled_cb), self); |
4893 | 588 | G_CALLBACK (option_toggled_cb), self); | 634 | g_settings_bind (self->settings, "show-time", item, "active", G_SETTINGS_BIND_DEFAULT); |
4894 | 589 | visible = g_settings_get_boolean (priv->settings, "show-time"); | 635 | gtk_menu_shell_append (GTK_MENU_SHELL (self->menu), item); |
4890 | 590 | gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), visible); | ||
4891 | 591 | gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item); | ||
4895 | 592 | 636 | ||
4896 | 593 | /* preferences */ | 637 | /* preferences */ |
4897 | 594 | item = gtk_image_menu_item_new_with_label (_("Power Settings...")); | 638 | item = gtk_image_menu_item_new_with_label (_("Power Settings...")); |
4898 | @@ -596,11 +640,11 @@ | |||
4899 | 596 | gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); | 640 | gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); |
4900 | 597 | g_signal_connect (G_OBJECT (item), "activate", | 641 | g_signal_connect (G_OBJECT (item), "activate", |
4901 | 598 | G_CALLBACK (show_preferences_cb), NULL); | 642 | G_CALLBACK (show_preferences_cb), NULL); |
4903 | 599 | gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item); | 643 | gtk_menu_shell_append (GTK_MENU_SHELL (self->menu), item); |
4904 | 600 | } | 644 | } |
4905 | 601 | 645 | ||
4906 | 602 | /* show the menu */ | 646 | /* show the menu */ |
4908 | 603 | gtk_widget_show_all (GTK_WIDGET (priv->menu)); | 647 | gtk_widget_show_all (GTK_WIDGET (self->menu)); |
4909 | 604 | } | 648 | } |
4910 | 605 | 649 | ||
4911 | 606 | static GVariant * | 650 | static GVariant * |
4912 | @@ -623,7 +667,7 @@ | |||
4913 | 623 | gsize n_devices; | 667 | gsize n_devices; |
4914 | 624 | guint i; | 668 | guint i; |
4915 | 625 | 669 | ||
4917 | 626 | n_devices = g_variant_n_children (devices); | 670 | n_devices = devices ? g_variant_n_children (devices) : 0; |
4918 | 627 | g_debug ("Num devices: '%" G_GSIZE_FORMAT "'\n", n_devices); | 671 | g_debug ("Num devices: '%" G_GSIZE_FORMAT "'\n", n_devices); |
4919 | 628 | 672 | ||
4920 | 629 | for (i = 0; i < n_devices; i++) | 673 | for (i = 0; i < n_devices; i++) |
4921 | @@ -697,7 +741,6 @@ | |||
4922 | 697 | put_primary_device (IndicatorPower *self, | 741 | put_primary_device (IndicatorPower *self, |
4923 | 698 | GVariant *device) | 742 | GVariant *device) |
4924 | 699 | { | 743 | { |
4925 | 700 | IndicatorPowerPrivate *priv = self->priv; | ||
4926 | 701 | UpDeviceKind kind; | 744 | UpDeviceKind kind; |
4927 | 702 | UpDeviceState state; | 745 | UpDeviceState state; |
4928 | 703 | GIcon *device_gicons; | 746 | GIcon *device_gicons; |
4929 | @@ -724,10 +767,10 @@ | |||
4930 | 724 | 767 | ||
4931 | 725 | /* set icon */ | 768 | /* set icon */ |
4932 | 726 | device_gicons = get_device_icon (kind, state, time, device_icon); | 769 | device_gicons = get_device_icon (kind, state, time, device_icon); |
4934 | 727 | gtk_image_set_from_gicon (priv->status_image, | 770 | gtk_image_set_from_gicon (self->status_image, |
4935 | 728 | device_gicons, | 771 | device_gicons, |
4936 | 729 | GTK_ICON_SIZE_LARGE_TOOLBAR); | 772 | GTK_ICON_SIZE_LARGE_TOOLBAR); |
4938 | 730 | gtk_widget_show (GTK_WIDGET (priv->status_image)); | 773 | gtk_widget_show (GTK_WIDGET (self->status_image)); |
4939 | 731 | 774 | ||
4940 | 732 | 775 | ||
4941 | 733 | /* get the device name */ | 776 | /* get the device name */ |
4942 | @@ -736,7 +779,7 @@ | |||
4943 | 736 | /* get the description */ | 779 | /* get the description */ |
4944 | 737 | build_device_time_details (device_name, time, state, percentage, &short_details, &details, &accesible_name); | 780 | build_device_time_details (device_name, time, state, percentage, &short_details, &details, &accesible_name); |
4945 | 738 | 781 | ||
4947 | 739 | gtk_label_set_label (GTK_LABEL (priv->label), | 782 | gtk_label_set_label (GTK_LABEL (self->label), |
4948 | 740 | short_details); | 783 | short_details); |
4949 | 741 | set_accessible_desc (self, accesible_name); | 784 | set_accessible_desc (self, accesible_name); |
4950 | 742 | 785 | ||
4951 | @@ -753,32 +796,47 @@ | |||
4952 | 753 | gpointer user_data) | 796 | gpointer user_data) |
4953 | 754 | { | 797 | { |
4954 | 755 | IndicatorPower *self = INDICATOR_POWER (user_data); | 798 | IndicatorPower *self = INDICATOR_POWER (user_data); |
4955 | 756 | IndicatorPowerPrivate *priv = self->priv; | ||
4956 | 757 | GVariant *devices_container; | 799 | GVariant *devices_container; |
4957 | 758 | GError *error = NULL; | 800 | GError *error = NULL; |
4958 | 759 | 801 | ||
4959 | 760 | devices_container = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); | 802 | devices_container = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); |
4960 | 761 | if (devices_container == NULL) | 803 | if (devices_container == NULL) |
4961 | 762 | { | 804 | { |
4963 | 763 | g_printerr ("Error getting devices: %s\n", error->message); | 805 | g_message ("Couldn't get devices: %s\n", error->message); |
4964 | 764 | g_error_free (error); | 806 | g_error_free (error); |
4965 | 765 | |||
4966 | 766 | return; | ||
4967 | 767 | } | 807 | } |
4973 | 768 | priv->devices = g_variant_get_child_value (devices_container, 0); | 808 | else /* update 'devices' */ |
4969 | 769 | g_variant_unref (devices_container); | ||
4970 | 770 | |||
4971 | 771 | priv->device = get_primary_device (priv->devices); | ||
4972 | 772 | if (priv->device == NULL) | ||
4974 | 773 | { | 809 | { |
4978 | 774 | g_printerr ("Error getting primary device"); | 810 | if (self->devices != NULL) |
4979 | 775 | 811 | g_variant_unref (self->devices); | |
4980 | 776 | return; | 812 | self->devices = g_variant_get_child_value (devices_container, 0); |
4981 | 813 | |||
4982 | 814 | g_variant_unref (devices_container); | ||
4983 | 815 | |||
4984 | 816 | if (self->device != NULL) | ||
4985 | 817 | g_variant_unref (self->device); | ||
4986 | 818 | self->device = get_primary_device (self->devices); | ||
4987 | 819 | |||
4988 | 820 | if (self->device == NULL) | ||
4989 | 821 | { | ||
4990 | 822 | g_message ("Couldn't find primary device"); | ||
4991 | 823 | } | ||
4992 | 824 | else | ||
4993 | 825 | { | ||
4994 | 826 | put_primary_device (self, self->device); | ||
4995 | 827 | } | ||
4996 | 777 | } | 828 | } |
4997 | 778 | 829 | ||
4998 | 779 | put_primary_device (self, priv->device); | ||
4999 | 780 | |||
5000 | 781 | build_menu (self); | 830 | build_menu (self); |
The diff has been truncated for viewing.