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 | # Generated by Makefile. Do not edit. |
6 | |
7 | + Allan LeSage |
8 | + Charles Kerr |
9 | Gabor Kelemen |
10 | Javier Jardon |
11 | Javier Jardón |
12 | Ken VanDine |
13 | ken.vandine@canonical.com |
14 | + Marco Trevisan (Treviño) |
15 | Michael Terry |
16 | Ted Gould |
17 | |
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 | # Generated by Makefile. Do not edit. |
23 | |
24 | +2012-02-14 Ted Gould <ted@gould.cx> |
25 | + |
26 | + 1.90 |
27 | + |
28 | +2012-02-14 Ted Gould <ted@gould.cx> |
29 | + |
30 | + Fixing distcheck |
31 | + |
32 | +2012-02-14 Ted Gould <ted@gould.cx> |
33 | + |
34 | + Make data have it's own makefile so the GSettings rules work properly on distcheck |
35 | + |
36 | +2012-02-14 Ted Gould <ted@gould.cx> |
37 | + |
38 | + Style and performance fixes |
39 | + |
40 | +2012-02-14 Javier Jardón <javier.jardon@codethink.co.uk> |
41 | + |
42 | + Use G_GNUC_CONST for indicator_power_get_type() to improve performance |
43 | + |
44 | +2012-02-14 Javier Jardón <javier.jardon@codethink.co.uk> |
45 | + |
46 | + Code style fixes |
47 | + |
48 | +2012-02-13 Charles Kerr <charles.kerr@canonical.com> |
49 | + |
50 | + add icon-policy from branch lp:~charlesk/indicator-power/icon-policy |
51 | + |
52 | +2012-02-13 Charles Kerr <charles.kerr@canonical.com> |
53 | + |
54 | + ensure that we don't have a reference to the proxy or proxy_cancel fields in indicator_power_dispose(). |
55 | + |
56 | +2012-02-13 Charles Kerr <charles.kerr@canonical.com> |
57 | + |
58 | + move POWER_INDICATOR_ICON_POLICY_* enum to the top of the file |
59 | + |
60 | +2012-02-13 Charles Kerr <charles.kerr@canonical.com> |
61 | + |
62 | + remove unncessary private field 'visible' |
63 | + |
64 | +2012-02-13 Charles Kerr <charles.kerr@canonical.com> |
65 | + |
66 | + consistent use of ICON_POLICY_KEY |
67 | + |
68 | +2012-02-13 Charles Kerr <charles.kerr@canonical.com> |
69 | + |
70 | + remove unnecessary G_OBJECT() cast |
71 | + |
72 | +2012-02-13 Charles Kerr <charles.kerr@canonical.com> |
73 | + |
74 | + make prototypes for update_visibility() and should_be_visible() align with the neighboring forward declarations |
75 | + |
76 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
77 | + |
78 | + add support for icon-policy setting |
79 | + |
80 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
81 | + |
82 | + create the menu at init time s.t. we don't have to keep checking to see if it exists |
83 | + |
84 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
85 | + |
86 | + use g_settings_bind() for the show-time checkbox |
87 | + |
88 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
89 | + |
90 | + better error reporting if g_spawn_command_line_async() fails |
91 | + |
92 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
93 | + |
94 | + remove redundant #include of glib.h |
95 | + |
96 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
97 | + |
98 | + use g_clear_object() on the proxy_cancel field |
99 | + |
100 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
101 | + |
102 | + remove unnecessary Priv struct -- the =entire class= is private |
103 | + |
104 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
105 | + |
106 | + remove unused struct names |
107 | + |
108 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
109 | + |
110 | + group the indicator_power lifecycle funcs together |
111 | + |
112 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
113 | + |
114 | + unref+clear Priv's variant fields in _dispose() |
115 | + |
116 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
117 | + |
118 | + don't leak priv->settings |
119 | + |
120 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
121 | + |
122 | + don't leak priv->accessible_desc |
123 | + |
124 | +2012-02-01 Charles Kerr <charles.kerr@canonical.com> |
125 | + |
126 | + remove redundant prototypes |
127 | + |
128 | +2012-02-10 Ted Gould <ted@gould.cx> |
129 | + |
130 | + Support building coverage targets |
131 | + |
132 | +2011-12-06 Allan LeSage <allanlesage@gmail.com> |
133 | + |
134 | + Added coverage reporting via gcov config and targets. |
135 | + |
136 | +2011-11-30 Marco Trevisan (Treviño) <mail@3v1n0.net> |
137 | + |
138 | + Add name-hint. |
139 | + |
140 | + Using the defined PACKAGE_NAME value. |
141 | + |
142 | +2011-11-08 Marco Trevisan (Treviño) <mail@3v1n0.net> |
143 | + |
144 | + Add name-hint. |
145 | + |
146 | + Using the defined PACKAGE_NAME value. |
147 | + |
148 | 2011-10-13 Javier Jardón <javier.jardon@codethink.co.uk> |
149 | |
150 | 0.10 |
151 | |
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 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
157 | |
158 | -SUBDIRS = po |
159 | - |
160 | -gsettings_in_file = data/com.canonical.indicator.power.gschema.xml.in |
161 | -gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) |
162 | - |
163 | -@INTLTOOL_XML_NOMERGE_RULE@ |
164 | - |
165 | -@GSETTINGS_RULES@ |
166 | +SUBDIRS = \ |
167 | + po \ |
168 | + data |
169 | |
170 | ################### |
171 | # Indicator Stuff |
172 | @@ -20,12 +15,14 @@ |
173 | libpower_la_CFLAGS = \ |
174 | $(UPOWER_CFLAGS) \ |
175 | $(INDICATOR_CFLAGS) \ |
176 | + $(COVERAGE_CFLAGS) \ |
177 | -Wall -Werror \ |
178 | -DG_LOG_DOMAIN=\"Indicator-Power\" |
179 | libpower_la_LIBADD = \ |
180 | $(UPOWER_LIBS) \ |
181 | $(INDICATOR_LIBS) |
182 | libpower_la_LDFLAGS = \ |
183 | + $(COVERAGE_LDFLAGS) \ |
184 | -module \ |
185 | -avoid-version |
186 | |
187 | @@ -34,16 +31,6 @@ |
188 | dist_noinst_SCRIPTS = \ |
189 | autogen.sh |
190 | |
191 | -dist_noinst_DATA = \ |
192 | - data/com.canonical.indicator.power.gschema.xml \ |
193 | - $(gsettings_in_file) |
194 | - |
195 | -CLEANFILES = \ |
196 | - $(gsettings_SCHEMAS) |
197 | - |
198 | -MAINTAINERCLEANFILES = \ |
199 | - $(gsettings_SCHEMAS:.xml=.valid) |
200 | - |
201 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall |
202 | |
203 | ############################################################ |
204 | @@ -73,3 +60,39 @@ |
205 | else \ |
206 | echo Failed to generate AUTHORS: not a branch >&2; \ |
207 | fi |
208 | + |
209 | + |
210 | +# Coverage targets |
211 | + |
212 | +.PHONY: clean-gcda |
213 | +clean-gcda: |
214 | + @echo Removing old coverage results |
215 | + -find -name '*.gcda' -print | xargs -r rm |
216 | + |
217 | +.PHONY: coverage-html generate-coverage-html clean-coverage-html |
218 | +coverage-html: clean-gcda |
219 | + -$(MAKE) $(AM_MAKEFLAGS) -k check |
220 | + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html |
221 | + |
222 | +generate-coverage-html: |
223 | + @echo Collecting coverage data |
224 | + $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool |
225 | + LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info |
226 | + |
227 | +clean-coverage-html: clean-gcda |
228 | + -$(LCOV) --directory $(top_builddir) -z |
229 | + -rm -rf coverage.info coveragereport |
230 | + |
231 | +.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml |
232 | +coverage-xml: clean-gcda |
233 | + -$(MAKE) $(AM_MAKEFLAGS) -k check |
234 | + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml |
235 | + |
236 | +generate-coverage-xml: |
237 | + @echo Generating coverage XML report |
238 | + $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml |
239 | + |
240 | +clean-coverage-xml: clean-gcda |
241 | + -rm -rf $(top_builddir)/coverage.xml |
242 | + |
243 | +clean-local: clean-coverage-html clean-coverage-xml |
244 | |
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 @@ |
249 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
250 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
251 | # @configure_input@ |
252 | |
253 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
254 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
255 | -# Inc. |
256 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
257 | +# Foundation, Inc. |
258 | # This Makefile.in is free software; the Free Software Foundation |
259 | # gives unlimited permission to copy and/or distribute it, |
260 | # with or without modifications, as long as this notice is preserved. |
261 | @@ -16,7 +16,6 @@ |
262 | @SET_MAKE@ |
263 | |
264 | |
265 | - |
266 | VPATH = @srcdir@ |
267 | pkgdatadir = $(datadir)/@PACKAGE@ |
268 | pkgincludedir = $(includedir)/@PACKAGE@ |
269 | @@ -37,13 +36,12 @@ |
270 | build_triplet = @build@ |
271 | host_triplet = @host@ |
272 | subdir = . |
273 | -DIST_COMMON = $(am__configure_deps) $(dist_noinst_DATA) \ |
274 | - $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \ |
275 | - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
276 | - $(top_srcdir)/configure ABOUT-NLS COPYING build-aux/compile \ |
277 | - build-aux/config.guess build-aux/config.rpath \ |
278 | - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ |
279 | - build-aux/ltmain.sh build-aux/missing |
280 | +DIST_COMMON = $(am__configure_deps) $(dist_noinst_SCRIPTS) \ |
281 | + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
282 | + $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \ |
283 | + COPYING build-aux/compile build-aux/config.guess \ |
284 | + build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ |
285 | + build-aux/install-sh build-aux/ltmain.sh build-aux/missing |
286 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
287 | am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
288 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
289 | @@ -53,7 +51,7 @@ |
290 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
291 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ |
292 | $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ |
293 | - $(top_srcdir)/configure.ac |
294 | + $(top_srcdir)/m4/gcov.m4 $(top_srcdir)/configure.ac |
295 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
296 | $(ACLOCAL_M4) |
297 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
298 | @@ -83,6 +81,12 @@ |
299 | am__base_list = \ |
300 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
301 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
302 | +am__uninstall_files_from_dir = { \ |
303 | + test -z "$$files" \ |
304 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
305 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
306 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
307 | + } |
308 | am__installdirs = "$(DESTDIR)$(powerlibdir)" |
309 | LTLIBRARIES = $(powerlib_LTLIBRARIES) |
310 | am__DEPENDENCIES_1 = |
311 | @@ -90,8 +94,8 @@ |
312 | am__dirstamp = $(am__leading_dot)dirstamp |
313 | am_libpower_la_OBJECTS = src/libpower_la-indicator-power.lo |
314 | libpower_la_OBJECTS = $(am_libpower_la_OBJECTS) |
315 | -AM_V_lt = $(am__v_lt_$(V)) |
316 | -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) |
317 | +AM_V_lt = $(am__v_lt_@AM_V@) |
318 | +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
319 | am__v_lt_0 = --silent |
320 | libpower_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
321 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpower_la_CFLAGS) \ |
322 | @@ -107,21 +111,21 @@ |
323 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ |
324 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ |
325 | $(AM_CFLAGS) $(CFLAGS) |
326 | -AM_V_CC = $(am__v_CC_$(V)) |
327 | -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) |
328 | +AM_V_CC = $(am__v_CC_@AM_V@) |
329 | +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
330 | am__v_CC_0 = @echo " CC " $@; |
331 | -AM_V_at = $(am__v_at_$(V)) |
332 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
333 | +AM_V_at = $(am__v_at_@AM_V@) |
334 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
335 | am__v_at_0 = @ |
336 | CCLD = $(CC) |
337 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
338 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
339 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
340 | -AM_V_CCLD = $(am__v_CCLD_$(V)) |
341 | -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) |
342 | +AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
343 | +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
344 | am__v_CCLD_0 = @echo " CCLD " $@; |
345 | -AM_V_GEN = $(am__v_GEN_$(V)) |
346 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
347 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
348 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
349 | am__v_GEN_0 = @echo " GEN " $@; |
350 | SOURCES = $(libpower_la_SOURCES) |
351 | DIST_SOURCES = $(libpower_la_SOURCES) |
352 | @@ -132,7 +136,6 @@ |
353 | install-pdf-recursive install-ps-recursive install-recursive \ |
354 | installcheck-recursive installdirs-recursive pdf-recursive \ |
355 | ps-recursive uninstall-recursive |
356 | -DATA = $(dist_noinst_DATA) |
357 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
358 | distclean-recursive maintainer-clean-recursive |
359 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
360 | @@ -145,9 +148,11 @@ |
361 | distdir = $(PACKAGE)-$(VERSION) |
362 | top_distdir = $(distdir) |
363 | am__remove_distdir = \ |
364 | - { test ! -d "$(distdir)" \ |
365 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
366 | - && rm -fr "$(distdir)"; }; } |
367 | + if test -d "$(distdir)"; then \ |
368 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
369 | + && rm -rf "$(distdir)" \ |
370 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
371 | + else :; fi |
372 | am__relativize = \ |
373 | dir0=`pwd`; \ |
374 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
375 | @@ -176,6 +181,8 @@ |
376 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz |
377 | GZIP_ENV = --best |
378 | distuninstallcheck_listfiles = find . -type f -print |
379 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
380 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
381 | distcleancheck_listfiles = find . -type f -print |
382 | ACLOCAL = @ACLOCAL@ |
383 | ALL_LINGUAS = @ALL_LINGUAS@ |
384 | @@ -189,6 +196,9 @@ |
385 | CC = @CC@ |
386 | CCDEPMODE = @CCDEPMODE@ |
387 | CFLAGS = @CFLAGS@ |
388 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
389 | +COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ |
390 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
391 | CPP = @CPP@ |
392 | CPPFLAGS = @CPPFLAGS@ |
393 | CYGPATH_W = @CYGPATH_W@ |
394 | @@ -204,6 +214,8 @@ |
395 | EGREP = @EGREP@ |
396 | EXEEXT = @EXEEXT@ |
397 | FGREP = @FGREP@ |
398 | +GCOVR = @GCOVR@ |
399 | +GENHTML = @GENHTML@ |
400 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
401 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
402 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
403 | @@ -227,7 +239,12 @@ |
404 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
405 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
406 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
407 | +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
408 | +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
409 | +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
410 | +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
411 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
412 | +LCOV = @LCOV@ |
413 | LD = @LD@ |
414 | LDFLAGS = @LDFLAGS@ |
415 | LIBICONV = @LIBICONV@ |
416 | @@ -269,6 +286,7 @@ |
417 | SED = @SED@ |
418 | SET_MAKE = @SET_MAKE@ |
419 | SHELL = @SHELL@ |
420 | +SHTOOL = @SHTOOL@ |
421 | STRIP = @STRIP@ |
422 | UPOWER_CFLAGS = @UPOWER_CFLAGS@ |
423 | UPOWER_LIBS = @UPOWER_LIBS@ |
424 | @@ -311,6 +329,8 @@ |
425 | includedir = @includedir@ |
426 | infodir = @infodir@ |
427 | install_sh = @install_sh@ |
428 | +intltool__v_merge_options_ = @intltool__v_merge_options_@ |
429 | +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
430 | libdir = @libdir@ |
431 | libexecdir = @libexecdir@ |
432 | localedir = @localedir@ |
433 | @@ -331,9 +351,10 @@ |
434 | top_builddir = @top_builddir@ |
435 | top_srcdir = @top_srcdir@ |
436 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
437 | -SUBDIRS = po |
438 | -gsettings_in_file = data/com.canonical.indicator.power.gschema.xml.in |
439 | -gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) |
440 | +SUBDIRS = \ |
441 | + po \ |
442 | + data |
443 | + |
444 | |
445 | ################### |
446 | # Indicator Stuff |
447 | @@ -346,6 +367,7 @@ |
448 | libpower_la_CFLAGS = \ |
449 | $(UPOWER_CFLAGS) \ |
450 | $(INDICATOR_CFLAGS) \ |
451 | + $(COVERAGE_CFLAGS) \ |
452 | -Wall -Werror \ |
453 | -DG_LOG_DOMAIN=\"Indicator-Power\" |
454 | |
455 | @@ -354,6 +376,7 @@ |
456 | $(INDICATOR_LIBS) |
457 | |
458 | libpower_la_LDFLAGS = \ |
459 | + $(COVERAGE_LDFLAGS) \ |
460 | -module \ |
461 | -avoid-version |
462 | |
463 | @@ -362,23 +385,13 @@ |
464 | dist_noinst_SCRIPTS = \ |
465 | autogen.sh |
466 | |
467 | -dist_noinst_DATA = \ |
468 | - data/com.canonical.indicator.power.gschema.xml \ |
469 | - $(gsettings_in_file) |
470 | - |
471 | -CLEANFILES = \ |
472 | - $(gsettings_SCHEMAS) |
473 | - |
474 | -MAINTAINERCLEANFILES = \ |
475 | - $(gsettings_SCHEMAS:.xml=.valid) |
476 | - |
477 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall |
478 | all: config.h |
479 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
480 | |
481 | .SUFFIXES: |
482 | .SUFFIXES: .c .lo .o .obj |
483 | -am--refresh: |
484 | +am--refresh: Makefile |
485 | @: |
486 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
487 | @for dep in $?; do \ |
488 | @@ -414,10 +427,8 @@ |
489 | $(am__aclocal_m4_deps): |
490 | |
491 | config.h: stamp-h1 |
492 | - @if test ! -f $@; then \ |
493 | - rm -f stamp-h1; \ |
494 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
495 | - else :; fi |
496 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
497 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
498 | |
499 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
500 | @rm -f stamp-h1 |
501 | @@ -468,7 +479,7 @@ |
502 | @: > src/$(DEPDIR)/$(am__dirstamp) |
503 | src/libpower_la-indicator-power.lo: src/$(am__dirstamp) \ |
504 | src/$(DEPDIR)/$(am__dirstamp) |
505 | -libpower.la: $(libpower_la_OBJECTS) $(libpower_la_DEPENDENCIES) |
506 | +libpower.la: $(libpower_la_OBJECTS) $(libpower_la_DEPENDENCIES) $(EXTRA_libpower_la_DEPENDENCIES) |
507 | $(AM_V_CCLD)$(libpower_la_LINK) -rpath $(powerlibdir) $(libpower_la_OBJECTS) $(libpower_la_LIBADD) $(LIBS) |
508 | |
509 | mostlyclean-compile: |
510 | @@ -485,36 +496,32 @@ |
511 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ |
512 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ |
513 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po |
514 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
515 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
516 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
517 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
518 | -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< |
519 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
520 | |
521 | .c.obj: |
522 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ |
523 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ |
524 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po |
525 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
526 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
527 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
528 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
529 | -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
530 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
531 | |
532 | .c.lo: |
533 | @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ |
534 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ |
535 | @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo |
536 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
537 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
538 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
539 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
540 | -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
541 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
542 | |
543 | src/libpower_la-indicator-power.lo: src/indicator-power.c |
544 | @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 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/libpower_la-indicator-power.Tpo src/$(DEPDIR)/libpower_la-indicator-power.Plo |
546 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
547 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/indicator-power.c' object='src/libpower_la-indicator-power.lo' libtool=yes @AMDEPBACKSLASH@ |
548 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/indicator-power.c' object='src/libpower_la-indicator-power.lo' libtool=yes @AMDEPBACKSLASH@ |
549 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
550 | -@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 |
551 | +@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 | |
553 | mostlyclean-libtool: |
554 | -rm -f *.lo |
555 | @@ -736,14 +743,18 @@ |
556 | $(am__remove_distdir) |
557 | |
558 | dist-bzip2: distdir |
559 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
560 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
561 | + $(am__remove_distdir) |
562 | + |
563 | +dist-lzip: distdir |
564 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
565 | $(am__remove_distdir) |
566 | |
567 | dist-lzma: distdir |
568 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
569 | $(am__remove_distdir) |
570 | dist-xz: distdir |
571 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
572 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
573 | $(am__remove_distdir) |
574 | |
575 | dist-tarZ: distdir |
576 | @@ -761,7 +772,7 @@ |
577 | |
578 | dist dist-all: distdir |
579 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
580 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
581 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
582 | $(am__remove_distdir) |
583 | |
584 | # This target untars the dist file and tries a VPATH configuration. Then |
585 | @@ -775,6 +786,8 @@ |
586 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
587 | *.tar.lzma*) \ |
588 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
589 | + *.tar.lz*) \ |
590 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
591 | *.tar.xz*) \ |
592 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
593 | *.tar.Z*) \ |
594 | @@ -794,6 +807,7 @@ |
595 | && am__cwd=`pwd` \ |
596 | && $(am__cd) $(distdir)/_build \ |
597 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
598 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
599 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
600 | && $(MAKE) $(AM_MAKEFLAGS) \ |
601 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
602 | @@ -822,8 +836,16 @@ |
603 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
604 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
605 | distuninstallcheck: |
606 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
607 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
608 | + @test -n '$(distuninstallcheck_dir)' || { \ |
609 | + echo 'ERROR: trying to run $@ with an empty' \ |
610 | + '$$(distuninstallcheck_dir)' >&2; \ |
611 | + exit 1; \ |
612 | + }; \ |
613 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
614 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
615 | + exit 1; \ |
616 | + }; \ |
617 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
618 | || { echo "ERROR: files left after uninstall:" ; \ |
619 | if test -n "$(DESTDIR)"; then \ |
620 | echo " (check DESTDIR support)"; \ |
621 | @@ -841,7 +863,7 @@ |
622 | exit 1; } >&2 |
623 | check-am: all-am |
624 | check: check-recursive |
625 | -all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) config.h |
626 | +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) config.h |
627 | installdirs: installdirs-recursive |
628 | installdirs-am: |
629 | for dir in "$(DESTDIR)$(powerlibdir)"; do \ |
630 | @@ -857,14 +879,18 @@ |
631 | |
632 | installcheck: installcheck-recursive |
633 | install-strip: |
634 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
635 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
636 | - `test -z '$(STRIP)' || \ |
637 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
638 | + if test -z '$(STRIP)'; then \ |
639 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
640 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
641 | + install; \ |
642 | + else \ |
643 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
644 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
645 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
646 | + fi |
647 | mostlyclean-generic: |
648 | |
649 | clean-generic: |
650 | - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) |
651 | |
652 | distclean-generic: |
653 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
654 | @@ -875,11 +901,10 @@ |
655 | maintainer-clean-generic: |
656 | @echo "This command is intended for maintainers to use" |
657 | @echo "it deletes files that may require special tools to rebuild." |
658 | - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) |
659 | clean: clean-recursive |
660 | |
661 | -clean-am: clean-generic clean-libtool clean-powerlibLTLIBRARIES \ |
662 | - mostlyclean-am |
663 | +clean-am: clean-generic clean-libtool clean-local \ |
664 | + clean-powerlibLTLIBRARIES mostlyclean-am |
665 | |
666 | distclean: distclean-recursive |
667 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
668 | @@ -955,27 +980,23 @@ |
669 | |
670 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
671 | all all-am am--refresh check check-am clean clean-generic \ |
672 | - clean-libtool clean-powerlibLTLIBRARIES ctags ctags-recursive \ |
673 | - dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \ |
674 | - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ |
675 | - distclean-compile distclean-generic distclean-hdr \ |
676 | - distclean-libtool distclean-tags distcleancheck distdir \ |
677 | - distuninstallcheck dvi dvi-am html html-am info info-am \ |
678 | - install install-am install-data install-data-am install-dvi \ |
679 | - install-dvi-am install-exec install-exec-am install-html \ |
680 | - install-html-am install-info install-info-am install-man \ |
681 | - install-pdf install-pdf-am install-powerlibLTLIBRARIES \ |
682 | - install-ps install-ps-am install-strip installcheck \ |
683 | - installcheck-am installdirs installdirs-am maintainer-clean \ |
684 | - maintainer-clean-generic mostlyclean mostlyclean-compile \ |
685 | - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
686 | - tags tags-recursive uninstall uninstall-am \ |
687 | - uninstall-powerlibLTLIBRARIES |
688 | - |
689 | - |
690 | -@INTLTOOL_XML_NOMERGE_RULE@ |
691 | - |
692 | -@GSETTINGS_RULES@ |
693 | + clean-libtool clean-local clean-powerlibLTLIBRARIES ctags \ |
694 | + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ |
695 | + dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
696 | + distcheck distclean distclean-compile distclean-generic \ |
697 | + distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
698 | + distdir distuninstallcheck dvi dvi-am html html-am info \ |
699 | + info-am install install-am install-data install-data-am \ |
700 | + install-dvi install-dvi-am install-exec install-exec-am \ |
701 | + install-html install-html-am install-info install-info-am \ |
702 | + install-man install-pdf install-pdf-am \ |
703 | + install-powerlibLTLIBRARIES install-ps install-ps-am \ |
704 | + install-strip installcheck installcheck-am installdirs \ |
705 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
706 | + mostlyclean mostlyclean-compile mostlyclean-generic \ |
707 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
708 | + uninstall uninstall-am uninstall-powerlibLTLIBRARIES |
709 | + |
710 | |
711 | ############################################################ |
712 | |
713 | @@ -1005,6 +1026,41 @@ |
714 | echo Failed to generate AUTHORS: not a branch >&2; \ |
715 | fi |
716 | |
717 | +# Coverage targets |
718 | + |
719 | +.PHONY: clean-gcda |
720 | +clean-gcda: |
721 | + @echo Removing old coverage results |
722 | + -find -name '*.gcda' -print | xargs -r rm |
723 | + |
724 | +.PHONY: coverage-html generate-coverage-html clean-coverage-html |
725 | +coverage-html: clean-gcda |
726 | + -$(MAKE) $(AM_MAKEFLAGS) -k check |
727 | + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html |
728 | + |
729 | +generate-coverage-html: |
730 | + @echo Collecting coverage data |
731 | + $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool |
732 | + LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info |
733 | + |
734 | +clean-coverage-html: clean-gcda |
735 | + -$(LCOV) --directory $(top_builddir) -z |
736 | + -rm -rf coverage.info coveragereport |
737 | + |
738 | +.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml |
739 | +coverage-xml: clean-gcda |
740 | + -$(MAKE) $(AM_MAKEFLAGS) -k check |
741 | + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml |
742 | + |
743 | +generate-coverage-xml: |
744 | + @echo Generating coverage XML report |
745 | + $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml |
746 | + |
747 | +clean-coverage-xml: clean-gcda |
748 | + -rm -rf $(top_builddir)/coverage.xml |
749 | + |
750 | +clean-local: clean-coverage-html clean-coverage-xml |
751 | + |
752 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
753 | # Otherwise a system limit (for SysV at least) may be exceeded. |
754 | .NOEXPORT: |
755 | |
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 @@ |
760 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
761 | +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
762 | |
763 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
764 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
765 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
766 | +# Inc. |
767 | # This file is free software; the Free Software Foundation |
768 | # gives unlimited permission to copy and/or distribute it, |
769 | # with or without modifications, as long as this notice is preserved. |
770 | @@ -263,12 +264,15 @@ |
771 | fi[]dnl |
772 | ])# PKG_CHECK_MODULES |
773 | |
774 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
775 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
776 | +# Foundation, Inc. |
777 | # |
778 | # This file is free software; the Free Software Foundation |
779 | # gives unlimited permission to copy and/or distribute it, |
780 | # with or without modifications, as long as this notice is preserved. |
781 | |
782 | +# serial 1 |
783 | + |
784 | # AM_AUTOMAKE_VERSION(VERSION) |
785 | # ---------------------------- |
786 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
787 | @@ -278,7 +282,7 @@ |
788 | [am__api_version='1.11' |
789 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
790 | dnl require some minimum version. Point them to the right macro. |
791 | -m4_if([$1], [1.11.1], [], |
792 | +m4_if([$1], [1.11.3], [], |
793 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
794 | ]) |
795 | |
796 | @@ -294,19 +298,21 @@ |
797 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
798 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
799 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
800 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
801 | +[AM_AUTOMAKE_VERSION([1.11.3])dnl |
802 | m4_ifndef([AC_AUTOCONF_VERSION], |
803 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
804 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
805 | |
806 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
807 | |
808 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
809 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
810 | # |
811 | # This file is free software; the Free Software Foundation |
812 | # gives unlimited permission to copy and/or distribute it, |
813 | # with or without modifications, as long as this notice is preserved. |
814 | |
815 | +# serial 1 |
816 | + |
817 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
818 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
819 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
820 | @@ -388,14 +394,14 @@ |
821 | Usually this means the macro was only invoked conditionally.]]) |
822 | fi])]) |
823 | |
824 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
825 | -# Free Software Foundation, Inc. |
826 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
827 | +# 2010, 2011 Free Software Foundation, Inc. |
828 | # |
829 | # This file is free software; the Free Software Foundation |
830 | # gives unlimited permission to copy and/or distribute it, |
831 | # with or without modifications, as long as this notice is preserved. |
832 | |
833 | -# serial 10 |
834 | +# serial 12 |
835 | |
836 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
837 | # written in clear, in which case automake, when reading aclocal.m4, |
838 | @@ -435,6 +441,7 @@ |
839 | # instance it was reported that on HP-UX the gcc test will end up |
840 | # making a dummy file named `D' -- because `-MD' means `put the output |
841 | # in D'. |
842 | + rm -rf conftest.dir |
843 | mkdir conftest.dir |
844 | # Copy depcomp to subdir because otherwise we won't find it if we're |
845 | # using a relative directory. |
846 | @@ -499,7 +506,7 @@ |
847 | break |
848 | fi |
849 | ;; |
850 | - msvisualcpp | msvcmsys) |
851 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
852 | # This compiler won't grok `-c -o', but also, the minuso test has |
853 | # not run yet. These depmodes are late enough in the game, and |
854 | # so weak that their functioning should not be impacted. |
855 | @@ -564,10 +571,13 @@ |
856 | if test "x$enable_dependency_tracking" != xno; then |
857 | am_depcomp="$ac_aux_dir/depcomp" |
858 | AMDEPBACKSLASH='\' |
859 | + am__nodep='_no' |
860 | fi |
861 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
862 | AC_SUBST([AMDEPBACKSLASH])dnl |
863 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
864 | +AC_SUBST([am__nodep])dnl |
865 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
866 | ]) |
867 | |
868 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
869 | @@ -789,12 +799,15 @@ |
870 | done |
871 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
872 | |
873 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
874 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
875 | +# Inc. |
876 | # |
877 | # This file is free software; the Free Software Foundation |
878 | # gives unlimited permission to copy and/or distribute it, |
879 | # with or without modifications, as long as this notice is preserved. |
880 | |
881 | +# serial 1 |
882 | + |
883 | # AM_PROG_INSTALL_SH |
884 | # ------------------ |
885 | # Define $install_sh. |
886 | @@ -834,8 +847,8 @@ |
887 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
888 | # From Jim Meyering |
889 | |
890 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
891 | -# Free Software Foundation, Inc. |
892 | +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
893 | +# 2011 Free Software Foundation, Inc. |
894 | # |
895 | # This file is free software; the Free Software Foundation |
896 | # gives unlimited permission to copy and/or distribute it, |
897 | @@ -855,7 +868,7 @@ |
898 | [disable], [m4_define([am_maintainer_other], [enable])], |
899 | [m4_define([am_maintainer_other], [enable]) |
900 | m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
901 | -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) |
902 | +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
903 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
904 | AC_ARG_ENABLE([maintainer-mode], |
905 | [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
906 | @@ -1001,12 +1014,15 @@ |
907 | fi |
908 | ]) |
909 | |
910 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
911 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
912 | +# Inc. |
913 | # |
914 | # This file is free software; the Free Software Foundation |
915 | # gives unlimited permission to copy and/or distribute it, |
916 | # with or without modifications, as long as this notice is preserved. |
917 | |
918 | +# serial 1 |
919 | + |
920 | # AM_PROG_MKDIR_P |
921 | # --------------- |
922 | # Check for `mkdir -p'. |
923 | @@ -1029,13 +1045,14 @@ |
924 | |
925 | # Helper functions for option handling. -*- Autoconf -*- |
926 | |
927 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
928 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
929 | +# Foundation, Inc. |
930 | # |
931 | # This file is free software; the Free Software Foundation |
932 | # gives unlimited permission to copy and/or distribute it, |
933 | # with or without modifications, as long as this notice is preserved. |
934 | |
935 | -# serial 4 |
936 | +# serial 5 |
937 | |
938 | # _AM_MANGLE_OPTION(NAME) |
939 | # ----------------------- |
940 | @@ -1043,13 +1060,13 @@ |
941 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
942 | |
943 | # _AM_SET_OPTION(NAME) |
944 | -# ------------------------------ |
945 | +# -------------------- |
946 | # Set option NAME. Presently that only means defining a flag for this option. |
947 | AC_DEFUN([_AM_SET_OPTION], |
948 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
949 | |
950 | # _AM_SET_OPTIONS(OPTIONS) |
951 | -# ---------------------------------- |
952 | +# ------------------------ |
953 | # OPTIONS is a space-separated list of Automake options. |
954 | AC_DEFUN([_AM_SET_OPTIONS], |
955 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
956 | @@ -1125,13 +1142,13 @@ |
957 | fi |
958 | AC_MSG_RESULT(yes)]) |
959 | |
960 | -# Copyright (C) 2009 Free Software Foundation, Inc. |
961 | +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. |
962 | # |
963 | # This file is free software; the Free Software Foundation |
964 | # gives unlimited permission to copy and/or distribute it, |
965 | # with or without modifications, as long as this notice is preserved. |
966 | |
967 | -# serial 1 |
968 | +# serial 2 |
969 | |
970 | # AM_SILENT_RULES([DEFAULT]) |
971 | # -------------------------- |
972 | @@ -1146,18 +1163,50 @@ |
973 | no) AM_DEFAULT_VERBOSITY=1;; |
974 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
975 | esac |
976 | +dnl |
977 | +dnl A few `make' implementations (e.g., NonStop OS and NextStep) |
978 | +dnl do not support nested variable expansions. |
979 | +dnl See automake bug#9928 and bug#10237. |
980 | +am_make=${MAKE-make} |
981 | +AC_CACHE_CHECK([whether $am_make supports nested variables], |
982 | + [am_cv_make_support_nested_variables], |
983 | + [if AS_ECHO([['TRUE=$(BAR$(V)) |
984 | +BAR0=false |
985 | +BAR1=true |
986 | +V=1 |
987 | +am__doit: |
988 | + @$(TRUE) |
989 | +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then |
990 | + am_cv_make_support_nested_variables=yes |
991 | +else |
992 | + am_cv_make_support_nested_variables=no |
993 | +fi]) |
994 | +if test $am_cv_make_support_nested_variables = yes; then |
995 | + dnl Using `$V' instead of `$(V)' breaks IRIX make. |
996 | + AM_V='$(V)' |
997 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
998 | +else |
999 | + AM_V=$AM_DEFAULT_VERBOSITY |
1000 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
1001 | +fi |
1002 | +AC_SUBST([AM_V])dnl |
1003 | +AM_SUBST_NOTMAKE([AM_V])dnl |
1004 | +AC_SUBST([AM_DEFAULT_V])dnl |
1005 | +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
1006 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
1007 | AM_BACKSLASH='\' |
1008 | AC_SUBST([AM_BACKSLASH])dnl |
1009 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
1010 | ]) |
1011 | |
1012 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
1013 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1014 | # |
1015 | # This file is free software; the Free Software Foundation |
1016 | # gives unlimited permission to copy and/or distribute it, |
1017 | # with or without modifications, as long as this notice is preserved. |
1018 | |
1019 | +# serial 1 |
1020 | + |
1021 | # AM_PROG_INSTALL_STRIP |
1022 | # --------------------- |
1023 | # One issue with vendor `install' (even GNU) is that you can't |
1024 | @@ -1180,13 +1229,13 @@ |
1025 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1026 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1027 | |
1028 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
1029 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
1030 | # |
1031 | # This file is free software; the Free Software Foundation |
1032 | # gives unlimited permission to copy and/or distribute it, |
1033 | # with or without modifications, as long as this notice is preserved. |
1034 | |
1035 | -# serial 2 |
1036 | +# serial 3 |
1037 | |
1038 | # _AM_SUBST_NOTMAKE(VARIABLE) |
1039 | # --------------------------- |
1040 | @@ -1195,13 +1244,13 @@ |
1041 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
1042 | |
1043 | # AM_SUBST_NOTMAKE(VARIABLE) |
1044 | -# --------------------------- |
1045 | +# -------------------------- |
1046 | # Public sister of _AM_SUBST_NOTMAKE. |
1047 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
1048 | |
1049 | # Check how to create a tarball. -*- Autoconf -*- |
1050 | |
1051 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
1052 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
1053 | # |
1054 | # This file is free software; the Free Software Foundation |
1055 | # gives unlimited permission to copy and/or distribute it, |
1056 | @@ -1223,10 +1272,11 @@ |
1057 | # a tarball read from stdin. |
1058 | # $(am__untar) < result.tar |
1059 | AC_DEFUN([_AM_PROG_TAR], |
1060 | -[# Always define AMTAR for backward compatibility. |
1061 | -AM_MISSING_PROG([AMTAR], [tar]) |
1062 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
1063 | +# in the wild :-( We should find a proper way to deprecate it ... |
1064 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1065 | m4_if([$1], [v7], |
1066 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
1067 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1068 | [m4_case([$1], [ustar],, [pax],, |
1069 | [m4_fatal([Unknown tar format])]) |
1070 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
1071 | |
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 | #! /bin/sh |
1077 | -# Wrapper for compilers which do not understand `-c -o'. |
1078 | - |
1079 | -scriptversion=2009-10-06.20; # UTC |
1080 | - |
1081 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software |
1082 | -# Foundation, Inc. |
1083 | +# Wrapper for compilers which do not understand '-c -o'. |
1084 | + |
1085 | +scriptversion=2012-01-04.17; # UTC |
1086 | + |
1087 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free |
1088 | +# Software Foundation, Inc. |
1089 | # Written by Tom Tromey <tromey@cygnus.com>. |
1090 | # |
1091 | # This program is free software; you can redistribute it and/or modify |
1092 | @@ -29,21 +29,186 @@ |
1093 | # bugs to <bug-automake@gnu.org> or send patches to |
1094 | # <automake-patches@gnu.org>. |
1095 | |
1096 | +nl=' |
1097 | +' |
1098 | + |
1099 | +# We need space, tab and new line, in precisely that order. Quoting is |
1100 | +# there to prevent tools from complaining about whitespace usage. |
1101 | +IFS=" "" $nl" |
1102 | + |
1103 | +file_conv= |
1104 | + |
1105 | +# func_file_conv build_file lazy |
1106 | +# Convert a $build file to $host form and store it in $file |
1107 | +# Currently only supports Windows hosts. If the determined conversion |
1108 | +# type is listed in (the comma separated) LAZY, no conversion will |
1109 | +# take place. |
1110 | +func_file_conv () |
1111 | +{ |
1112 | + file=$1 |
1113 | + case $file in |
1114 | + / | /[!/]*) # absolute file, and not a UNC file |
1115 | + if test -z "$file_conv"; then |
1116 | + # lazily determine how to convert abs files |
1117 | + case `uname -s` in |
1118 | + MINGW*) |
1119 | + file_conv=mingw |
1120 | + ;; |
1121 | + CYGWIN*) |
1122 | + file_conv=cygwin |
1123 | + ;; |
1124 | + *) |
1125 | + file_conv=wine |
1126 | + ;; |
1127 | + esac |
1128 | + fi |
1129 | + case $file_conv/,$2, in |
1130 | + *,$file_conv,*) |
1131 | + ;; |
1132 | + mingw/*) |
1133 | + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` |
1134 | + ;; |
1135 | + cygwin/*) |
1136 | + file=`cygpath -m "$file" || echo "$file"` |
1137 | + ;; |
1138 | + wine/*) |
1139 | + file=`winepath -w "$file" || echo "$file"` |
1140 | + ;; |
1141 | + esac |
1142 | + ;; |
1143 | + esac |
1144 | +} |
1145 | + |
1146 | +# func_cl_wrapper cl arg... |
1147 | +# Adjust compile command to suit cl |
1148 | +func_cl_wrapper () |
1149 | +{ |
1150 | + # Assume a capable shell |
1151 | + lib_path= |
1152 | + shared=: |
1153 | + linker_opts= |
1154 | + for arg |
1155 | + do |
1156 | + if test -n "$eat"; then |
1157 | + eat= |
1158 | + else |
1159 | + case $1 in |
1160 | + -o) |
1161 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1162 | + eat=1 |
1163 | + case $2 in |
1164 | + *.o | *.[oO][bB][jJ]) |
1165 | + func_file_conv "$2" |
1166 | + set x "$@" -Fo"$file" |
1167 | + shift |
1168 | + ;; |
1169 | + *) |
1170 | + func_file_conv "$2" |
1171 | + set x "$@" -Fe"$file" |
1172 | + shift |
1173 | + ;; |
1174 | + esac |
1175 | + ;; |
1176 | + -I*) |
1177 | + func_file_conv "${1#-I}" mingw |
1178 | + set x "$@" -I"$file" |
1179 | + shift |
1180 | + ;; |
1181 | + -l*) |
1182 | + lib=${1#-l} |
1183 | + found=no |
1184 | + save_IFS=$IFS |
1185 | + IFS=';' |
1186 | + for dir in $lib_path $LIB |
1187 | + do |
1188 | + IFS=$save_IFS |
1189 | + if $shared && test -f "$dir/$lib.dll.lib"; then |
1190 | + found=yes |
1191 | + set x "$@" "$dir/$lib.dll.lib" |
1192 | + break |
1193 | + fi |
1194 | + if test -f "$dir/$lib.lib"; then |
1195 | + found=yes |
1196 | + set x "$@" "$dir/$lib.lib" |
1197 | + break |
1198 | + fi |
1199 | + done |
1200 | + IFS=$save_IFS |
1201 | + |
1202 | + test "$found" != yes && set x "$@" "$lib.lib" |
1203 | + shift |
1204 | + ;; |
1205 | + -L*) |
1206 | + func_file_conv "${1#-L}" |
1207 | + if test -z "$lib_path"; then |
1208 | + lib_path=$file |
1209 | + else |
1210 | + lib_path="$lib_path;$file" |
1211 | + fi |
1212 | + linker_opts="$linker_opts -LIBPATH:$file" |
1213 | + ;; |
1214 | + -static) |
1215 | + shared=false |
1216 | + ;; |
1217 | + -Wl,*) |
1218 | + arg=${1#-Wl,} |
1219 | + save_ifs="$IFS"; IFS=',' |
1220 | + for flag in $arg; do |
1221 | + IFS="$save_ifs" |
1222 | + linker_opts="$linker_opts $flag" |
1223 | + done |
1224 | + IFS="$save_ifs" |
1225 | + ;; |
1226 | + -Xlinker) |
1227 | + eat=1 |
1228 | + linker_opts="$linker_opts $2" |
1229 | + ;; |
1230 | + -*) |
1231 | + set x "$@" "$1" |
1232 | + shift |
1233 | + ;; |
1234 | + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) |
1235 | + func_file_conv "$1" |
1236 | + set x "$@" -Tp"$file" |
1237 | + shift |
1238 | + ;; |
1239 | + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) |
1240 | + func_file_conv "$1" mingw |
1241 | + set x "$@" "$file" |
1242 | + shift |
1243 | + ;; |
1244 | + *) |
1245 | + set x "$@" "$1" |
1246 | + shift |
1247 | + ;; |
1248 | + esac |
1249 | + fi |
1250 | + shift |
1251 | + done |
1252 | + if test -n "$linker_opts"; then |
1253 | + linker_opts="-link$linker_opts" |
1254 | + fi |
1255 | + exec "$@" $linker_opts |
1256 | + exit 1 |
1257 | +} |
1258 | + |
1259 | +eat= |
1260 | + |
1261 | case $1 in |
1262 | '') |
1263 | - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 |
1264 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1265 | exit 1; |
1266 | ;; |
1267 | -h | --h*) |
1268 | cat <<\EOF |
1269 | Usage: compile [--help] [--version] PROGRAM [ARGS] |
1270 | |
1271 | -Wrapper for compilers which do not understand `-c -o'. |
1272 | -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining |
1273 | +Wrapper for compilers which do not understand '-c -o'. |
1274 | +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining |
1275 | arguments, and rename the output as expected. |
1276 | |
1277 | If you are trying to build a whole package this is not the |
1278 | -right script to run: please start by reading the file `INSTALL'. |
1279 | +right script to run: please start by reading the file 'INSTALL'. |
1280 | |
1281 | Report bugs to <bug-automake@gnu.org>. |
1282 | EOF |
1283 | @@ -53,11 +218,13 @@ |
1284 | echo "compile $scriptversion" |
1285 | exit $? |
1286 | ;; |
1287 | + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) |
1288 | + func_cl_wrapper "$@" # Doesn't return... |
1289 | + ;; |
1290 | esac |
1291 | |
1292 | ofile= |
1293 | cfile= |
1294 | -eat= |
1295 | |
1296 | for arg |
1297 | do |
1298 | @@ -66,8 +233,8 @@ |
1299 | else |
1300 | case $1 in |
1301 | -o) |
1302 | - # configure might choose to run compile as `compile cc -o foo foo.c'. |
1303 | - # So we strip `-o arg' only if arg is an object. |
1304 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1305 | + # So we strip '-o arg' only if arg is an object. |
1306 | eat=1 |
1307 | case $2 in |
1308 | *.o | *.obj) |
1309 | @@ -94,10 +261,10 @@ |
1310 | done |
1311 | |
1312 | if test -z "$ofile" || test -z "$cfile"; then |
1313 | - # If no `-o' option was seen then we might have been invoked from a |
1314 | + # If no '-o' option was seen then we might have been invoked from a |
1315 | # pattern rule where we don't need one. That is ok -- this is a |
1316 | # normal compilation that the losing compiler can handle. If no |
1317 | - # `.c' file was seen then we are probably linking. That is also |
1318 | + # '.c' file was seen then we are probably linking. That is also |
1319 | # ok. |
1320 | exec "$@" |
1321 | fi |
1322 | @@ -106,7 +273,7 @@ |
1323 | cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` |
1324 | |
1325 | # Create the lock directory. |
1326 | -# Note: use `[/\\:.-]' here to ensure that we don't use the same name |
1327 | +# Note: use '[/\\:.-]' here to ensure that we don't use the same name |
1328 | # that we are using for the .o file. Also, base the name on the expected |
1329 | # object file name, since that is what matters with a parallel build. |
1330 | lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |
1331 | |
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 | #! /bin/sh |
1337 | # depcomp - compile a program generating dependencies as side-effects |
1338 | |
1339 | -scriptversion=2009-04-28.21; # UTC |
1340 | +scriptversion=2011-12-04.11; # UTC |
1341 | |
1342 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free |
1343 | -# Software Foundation, Inc. |
1344 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, |
1345 | +# 2011 Free Software Foundation, Inc. |
1346 | |
1347 | # This program is free software; you can redistribute it and/or modify |
1348 | # it under the terms of the GNU General Public License as published by |
1349 | @@ -44,7 +44,7 @@ |
1350 | object Object file output by `PROGRAMS ARGS'. |
1351 | DEPDIR directory where to store dependencies. |
1352 | depfile Dependency file to output. |
1353 | - tmpdepfile Temporary file to use when outputing dependencies. |
1354 | + tmpdepfile Temporary file to use when outputting dependencies. |
1355 | libtool Whether libtool is used (yes/no). |
1356 | |
1357 | Report bugs to <bug-automake@gnu.org>. |
1358 | @@ -90,10 +90,18 @@ |
1359 | # This is just like msvisualcpp but w/o cygpath translation. |
1360 | # Just convert the backslash-escaped backslashes to single forward |
1361 | # slashes to satisfy depend.m4 |
1362 | - cygpath_u="sed s,\\\\\\\\,/,g" |
1363 | + cygpath_u='sed s,\\\\,/,g' |
1364 | depmode=msvisualcpp |
1365 | fi |
1366 | |
1367 | +if test "$depmode" = msvc7msys; then |
1368 | + # This is just like msvc7 but w/o cygpath translation. |
1369 | + # Just convert the backslash-escaped backslashes to single forward |
1370 | + # slashes to satisfy depend.m4 |
1371 | + cygpath_u='sed s,\\\\,/,g' |
1372 | + depmode=msvc7 |
1373 | +fi |
1374 | + |
1375 | case "$depmode" in |
1376 | gcc3) |
1377 | ## gcc 3 implements dependency tracking that does exactly what |
1378 | @@ -158,10 +166,12 @@ |
1379 | ' < "$tmpdepfile" | |
1380 | ## Some versions of gcc put a space before the `:'. On the theory |
1381 | ## that the space means something, we add a space to the output as |
1382 | -## well. |
1383 | +## well. hp depmode also adds that space, but also prefixes the VPATH |
1384 | +## to the object. Take care to not repeat it in the output. |
1385 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1386 | ## correctly. Breaking it into two sed invocations is a workaround. |
1387 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
1388 | + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
1389 | + | sed -e 's/$/ :/' >> "$depfile" |
1390 | rm -f "$tmpdepfile" |
1391 | ;; |
1392 | |
1393 | @@ -405,6 +415,52 @@ |
1394 | rm -f "$tmpdepfile" |
1395 | ;; |
1396 | |
1397 | +msvc7) |
1398 | + if test "$libtool" = yes; then |
1399 | + showIncludes=-Wc,-showIncludes |
1400 | + else |
1401 | + showIncludes=-showIncludes |
1402 | + fi |
1403 | + "$@" $showIncludes > "$tmpdepfile" |
1404 | + stat=$? |
1405 | + grep -v '^Note: including file: ' "$tmpdepfile" |
1406 | + if test "$stat" = 0; then : |
1407 | + else |
1408 | + rm -f "$tmpdepfile" |
1409 | + exit $stat |
1410 | + fi |
1411 | + rm -f "$depfile" |
1412 | + echo "$object : \\" > "$depfile" |
1413 | + # The first sed program below extracts the file names and escapes |
1414 | + # backslashes for cygpath. The second sed program outputs the file |
1415 | + # name when reading, but also accumulates all include files in the |
1416 | + # hold buffer in order to output them again at the end. This only |
1417 | + # works with sed implementations that can handle large buffers. |
1418 | + sed < "$tmpdepfile" -n ' |
1419 | +/^Note: including file: *\(.*\)/ { |
1420 | + s//\1/ |
1421 | + s/\\/\\\\/g |
1422 | + p |
1423 | +}' | $cygpath_u | sort -u | sed -n ' |
1424 | +s/ /\\ /g |
1425 | +s/\(.*\)/ \1 \\/p |
1426 | +s/.\(.*\) \\/\1:/ |
1427 | +H |
1428 | +$ { |
1429 | + s/.*/ / |
1430 | + G |
1431 | + p |
1432 | +}' >> "$depfile" |
1433 | + rm -f "$tmpdepfile" |
1434 | + ;; |
1435 | + |
1436 | +msvc7msys) |
1437 | + # This case exists only to let depend.m4 do its work. It works by |
1438 | + # looking at the text of this script. This case will never be run, |
1439 | + # since it is checked for above. |
1440 | + exit 1 |
1441 | + ;; |
1442 | + |
1443 | #nosideeffect) |
1444 | # This comment above is used by automake to tell side-effect |
1445 | # dependency tracking mechanisms from slower ones. |
1446 | @@ -503,7 +559,9 @@ |
1447 | touch "$tmpdepfile" |
1448 | ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" |
1449 | rm -f "$depfile" |
1450 | - cat < "$tmpdepfile" > "$depfile" |
1451 | + # makedepend may prepend the VPATH from the source file name to the object. |
1452 | + # No need to regex-escape $object, excess matching of '.' is harmless. |
1453 | + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
1454 | sed '1,2d' "$tmpdepfile" | tr ' ' ' |
1455 | ' | \ |
1456 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1457 | |
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 | #!/bin/sh |
1463 | # install - install a program, script, or datafile |
1464 | |
1465 | -scriptversion=2009-04-28.21; # UTC |
1466 | +scriptversion=2011-01-19.21; # UTC |
1467 | |
1468 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
1469 | # later released in X11R6 (xc/config/util/install.sh) with the |
1470 | @@ -156,6 +156,10 @@ |
1471 | -s) stripcmd=$stripprog;; |
1472 | |
1473 | -t) dst_arg=$2 |
1474 | + # Protect names problematic for `test' and other utilities. |
1475 | + case $dst_arg in |
1476 | + -* | [=\(\)!]) dst_arg=./$dst_arg;; |
1477 | + esac |
1478 | shift;; |
1479 | |
1480 | -T) no_target_directory=true;; |
1481 | @@ -186,6 +190,10 @@ |
1482 | fi |
1483 | shift # arg |
1484 | dst_arg=$arg |
1485 | + # Protect names problematic for `test' and other utilities. |
1486 | + case $dst_arg in |
1487 | + -* | [=\(\)!]) dst_arg=./$dst_arg;; |
1488 | + esac |
1489 | done |
1490 | fi |
1491 | |
1492 | @@ -200,7 +208,11 @@ |
1493 | fi |
1494 | |
1495 | if test -z "$dir_arg"; then |
1496 | - trap '(exit $?); exit' 1 2 13 15 |
1497 | + do_exit='(exit $ret); exit $ret' |
1498 | + trap "ret=129; $do_exit" 1 |
1499 | + trap "ret=130; $do_exit" 2 |
1500 | + trap "ret=141; $do_exit" 13 |
1501 | + trap "ret=143; $do_exit" 15 |
1502 | |
1503 | # Set umask so as not to create temps with too-generous modes. |
1504 | # However, 'strip' requires both read and write access to temps. |
1505 | @@ -228,9 +240,9 @@ |
1506 | |
1507 | for src |
1508 | do |
1509 | - # Protect names starting with `-'. |
1510 | + # Protect names problematic for `test' and other utilities. |
1511 | case $src in |
1512 | - -*) src=./$src;; |
1513 | + -* | [=\(\)!]) src=./$src;; |
1514 | esac |
1515 | |
1516 | if test -n "$dir_arg"; then |
1517 | @@ -252,12 +264,7 @@ |
1518 | echo "$0: no destination specified." >&2 |
1519 | exit 1 |
1520 | fi |
1521 | - |
1522 | dst=$dst_arg |
1523 | - # Protect names starting with `-'. |
1524 | - case $dst in |
1525 | - -*) dst=./$dst;; |
1526 | - esac |
1527 | |
1528 | # If destination is a directory, append the input filename; won't work |
1529 | # if double slashes aren't ignored. |
1530 | @@ -385,7 +392,7 @@ |
1531 | |
1532 | case $dstdir in |
1533 | /*) prefix='/';; |
1534 | - -*) prefix='./';; |
1535 | + [-=\(\)!]*) prefix='./';; |
1536 | *) prefix='';; |
1537 | esac |
1538 | |
1539 | @@ -403,7 +410,7 @@ |
1540 | |
1541 | for d |
1542 | do |
1543 | - test -z "$d" && continue |
1544 | + test X"$d" = X && continue |
1545 | |
1546 | prefix=$prefix$d |
1547 | if test -d "$prefix"; then |
1548 | |
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 | |
1554 | -# libtool (GNU libtool) 2.4 |
1555 | +# libtool (GNU libtool) 2.4.2 |
1556 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
1557 | |
1558 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
1559 | -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
1560 | +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
1561 | # This is free software; see the source for copying conditions. There is NO |
1562 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
1563 | |
1564 | @@ -41,6 +41,7 @@ |
1565 | # --quiet, --silent don't print informational messages |
1566 | # --no-quiet, --no-silent |
1567 | # print informational messages (default) |
1568 | +# --no-warn don't display warning messages |
1569 | # --tag=TAG use configuration variables from tag TAG |
1570 | # -v, --verbose print more informational messages than default |
1571 | # --no-verbose don't print the extra informational messages |
1572 | @@ -69,7 +70,7 @@ |
1573 | # compiler: $LTCC |
1574 | # compiler flags: $LTCFLAGS |
1575 | # linker: $LD (gnu? $with_gnu_ld) |
1576 | -# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 |
1577 | +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 |
1578 | # automake: $automake_version |
1579 | # autoconf: $autoconf_version |
1580 | # |
1581 | @@ -79,9 +80,9 @@ |
1582 | |
1583 | PROGRAM=libtool |
1584 | PACKAGE=libtool |
1585 | -VERSION="2.4 Debian-2.4-2ubuntu1" |
1586 | +VERSION="2.4.2 Debian-2.4.2-1ubuntu1" |
1587 | TIMESTAMP="" |
1588 | -package_revision=1.3293 |
1589 | +package_revision=1.3337 |
1590 | |
1591 | # Be Bourne compatible |
1592 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
1593 | @@ -136,15 +137,10 @@ |
1594 | |
1595 | : ${CP="cp -f"} |
1596 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
1597 | -: ${EGREP="/bin/grep -E"} |
1598 | -: ${FGREP="/bin/grep -F"} |
1599 | -: ${GREP="/bin/grep"} |
1600 | -: ${LN_S="ln -s"} |
1601 | : ${MAKE="make"} |
1602 | : ${MKDIR="mkdir"} |
1603 | : ${MV="mv -f"} |
1604 | : ${RM="rm -f"} |
1605 | -: ${SED="/bin/sed"} |
1606 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
1607 | : ${Xsed="$SED -e 1s/^X//"} |
1608 | |
1609 | @@ -387,7 +383,7 @@ |
1610 | ;; |
1611 | *) |
1612 | save_IFS="$IFS" |
1613 | - IFS=: |
1614 | + IFS=${PATH_SEPARATOR-:} |
1615 | for progdir in $PATH; do |
1616 | IFS="$save_IFS" |
1617 | test -x "$progdir/$progname" && break |
1618 | @@ -771,8 +767,8 @@ |
1619 | s*\$LTCFLAGS*'"$LTCFLAGS"'* |
1620 | s*\$LD*'"$LD"'* |
1621 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ |
1622 | - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ |
1623 | - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ |
1624 | + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ |
1625 | + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ |
1626 | p |
1627 | d |
1628 | } |
1629 | @@ -1052,6 +1048,7 @@ |
1630 | opt_help=false |
1631 | opt_help_all=false |
1632 | opt_silent=: |
1633 | +opt_warning=: |
1634 | opt_verbose=: |
1635 | opt_silent=false |
1636 | opt_verbose=false |
1637 | @@ -1120,6 +1117,10 @@ |
1638 | opt_silent=false |
1639 | func_append preserve_args " $opt" |
1640 | ;; |
1641 | + --no-warning|--no-warn) |
1642 | + opt_warning=false |
1643 | +func_append preserve_args " $opt" |
1644 | + ;; |
1645 | --no-verbose) |
1646 | opt_verbose=false |
1647 | func_append preserve_args " $opt" |
1648 | @@ -2059,7 +2060,7 @@ |
1649 | *.[cCFSifmso] | \ |
1650 | *.ada | *.adb | *.ads | *.asm | \ |
1651 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ |
1652 | - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) |
1653 | + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) |
1654 | func_xform "$libobj" |
1655 | libobj=$func_xform_result |
1656 | ;; |
1657 | @@ -3201,11 +3202,13 @@ |
1658 | |
1659 | # Set up the ranlib parameters. |
1660 | oldlib="$destdir/$name" |
1661 | + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 |
1662 | + tool_oldlib=$func_to_tool_file_result |
1663 | |
1664 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' |
1665 | |
1666 | if test -n "$stripme" && test -n "$old_striplib"; then |
1667 | - func_show_eval "$old_striplib $oldlib" 'exit $?' |
1668 | + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' |
1669 | fi |
1670 | |
1671 | # Do each command in the postinstall commands. |
1672 | @@ -3470,7 +3473,7 @@ |
1673 | # linked before any other PIC object. But we must not use |
1674 | # pic_flag when linking with -static. The problem exists in |
1675 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. |
1676 | - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
1677 | + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
1678 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; |
1679 | *-*-hpux*) |
1680 | pic_flag_for_symtable=" $pic_flag" ;; |
1681 | @@ -3982,14 +3985,17 @@ |
1682 | # launches target application with the remaining arguments. |
1683 | func_exec_program () |
1684 | { |
1685 | - for lt_wr_arg |
1686 | - do |
1687 | - case \$lt_wr_arg in |
1688 | - --lt-*) ;; |
1689 | - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
1690 | - esac |
1691 | - shift |
1692 | - done |
1693 | + case \" \$* \" in |
1694 | + *\\ --lt-*) |
1695 | + for lt_wr_arg |
1696 | + do |
1697 | + case \$lt_wr_arg in |
1698 | + --lt-*) ;; |
1699 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
1700 | + esac |
1701 | + shift |
1702 | + done ;; |
1703 | + esac |
1704 | func_exec_program_core \${1+\"\$@\"} |
1705 | } |
1706 | |
1707 | @@ -5057,9 +5063,15 @@ |
1708 | { |
1709 | EOF |
1710 | func_emit_wrapper yes | |
1711 | - $SED -e 's/\([\\"]\)/\\\1/g' \ |
1712 | - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' |
1713 | - |
1714 | + $SED -n -e ' |
1715 | +s/^\(.\{79\}\)\(..*\)/\1\ |
1716 | +\2/ |
1717 | +h |
1718 | +s/\([\\"]\)/\\\1/g |
1719 | +s/$/\\n/ |
1720 | +s/\([^\n]*\).*/ fputs ("\1", f);/p |
1721 | +g |
1722 | +D' |
1723 | cat <<"EOF" |
1724 | } |
1725 | EOF |
1726 | @@ -5643,7 +5655,8 @@ |
1727 | continue |
1728 | ;; |
1729 | |
1730 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
1731 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
1732 | + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
1733 | func_append compiler_flags " $arg" |
1734 | func_append compile_command " $arg" |
1735 | func_append finalize_command " $arg" |
1736 | @@ -6150,7 +6163,8 @@ |
1737 | lib= |
1738 | found=no |
1739 | case $deplib in |
1740 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
1741 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
1742 | + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
1743 | if test "$linkmode,$pass" = "prog,link"; then |
1744 | compile_deplibs="$deplib $compile_deplibs" |
1745 | finalize_deplibs="$deplib $finalize_deplibs" |
1746 | @@ -6834,7 +6848,7 @@ |
1747 | test "$hardcode_direct_absolute" = no; then |
1748 | add="$dir/$linklib" |
1749 | elif test "$hardcode_minus_L" = yes; then |
1750 | - add_dir="-L$dir" |
1751 | + add_dir="-L$absdir" |
1752 | # Try looking first in the location we're being installed to. |
1753 | if test -n "$inst_prefix_dir"; then |
1754 | case $libdir in |
1755 | @@ -7319,6 +7333,7 @@ |
1756 | # which has an extra 1 added just for fun |
1757 | # |
1758 | case $version_type in |
1759 | + # correct linux to gnu/linux during the next big refactor |
1760 | darwin|linux|osf|windows|none) |
1761 | func_arith $number_major + $number_minor |
1762 | current=$func_arith_result |
1763 | @@ -7438,7 +7453,7 @@ |
1764 | versuffix="$major.$revision" |
1765 | ;; |
1766 | |
1767 | - linux) |
1768 | + linux) # correct to gnu/linux during the next big refactor |
1769 | func_arith $current - $age |
1770 | major=.$func_arith_result |
1771 | versuffix="$major.$age.$revision" |
1772 | @@ -8026,6 +8041,11 @@ |
1773 | |
1774 | # Test again, we may have decided not to build it any more |
1775 | if test "$build_libtool_libs" = yes; then |
1776 | + # Remove ${wl} instances when linking with ld. |
1777 | + # FIXME: should test the right _cmds variable. |
1778 | + case $archive_cmds in |
1779 | + *\$LD\ *) wl= ;; |
1780 | + esac |
1781 | if test "$hardcode_into_libs" = yes; then |
1782 | # Hardcode the library paths |
1783 | hardcode_libdirs= |
1784 | @@ -8056,7 +8076,7 @@ |
1785 | elif test -n "$runpath_var"; then |
1786 | case "$perm_rpath " in |
1787 | *" $libdir "*) ;; |
1788 | - *) func_apped perm_rpath " $libdir" ;; |
1789 | + *) func_append perm_rpath " $libdir" ;; |
1790 | esac |
1791 | fi |
1792 | done |
1793 | @@ -8064,11 +8084,7 @@ |
1794 | if test -n "$hardcode_libdir_separator" && |
1795 | test -n "$hardcode_libdirs"; then |
1796 | libdir="$hardcode_libdirs" |
1797 | - if test -n "$hardcode_libdir_flag_spec_ld"; then |
1798 | - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
1799 | - else |
1800 | - eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
1801 | - fi |
1802 | + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
1803 | fi |
1804 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
1805 | # We should set the runpath_var. |
1806 | @@ -9158,6 +9174,8 @@ |
1807 | esac |
1808 | done |
1809 | fi |
1810 | + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 |
1811 | + tool_oldlib=$func_to_tool_file_result |
1812 | eval cmds=\"$old_archive_cmds\" |
1813 | |
1814 | func_len " $cmds" |
1815 | @@ -9267,7 +9285,8 @@ |
1816 | *.la) |
1817 | func_basename "$deplib" |
1818 | name="$func_basename_result" |
1819 | - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
1820 | + func_resolve_sysroot "$deplib" |
1821 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
1822 | test -z "$libdir" && \ |
1823 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
1824 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
1825 | |
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 | #! /bin/sh |
1831 | # Common stub for a few missing GNU programs while installing. |
1832 | |
1833 | -scriptversion=2009-04-28.21; # UTC |
1834 | +scriptversion=2012-01-06.13; # UTC |
1835 | |
1836 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, |
1837 | -# 2008, 2009 Free Software Foundation, Inc. |
1838 | +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. |
1839 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
1840 | |
1841 | # This program is free software; you can redistribute it and/or modify |
1842 | @@ -84,7 +84,6 @@ |
1843 | help2man touch the output file |
1844 | lex create \`lex.yy.c', if possible, from existing .c |
1845 | makeinfo touch the output file |
1846 | - tar try tar, gnutar, gtar, then tar without non-portable flags |
1847 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] |
1848 | |
1849 | Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and |
1850 | @@ -122,15 +121,6 @@ |
1851 | # Not GNU programs, they don't have --version. |
1852 | ;; |
1853 | |
1854 | - tar*) |
1855 | - if test -n "$run"; then |
1856 | - echo 1>&2 "ERROR: \`tar' requires --run" |
1857 | - exit 1 |
1858 | - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then |
1859 | - exit 1 |
1860 | - fi |
1861 | - ;; |
1862 | - |
1863 | *) |
1864 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
1865 | # We have it, but it failed. |
1866 | @@ -226,7 +216,7 @@ |
1867 | \`Bison' from any GNU archive site." |
1868 | rm -f y.tab.c y.tab.h |
1869 | if test $# -ne 1; then |
1870 | - eval LASTARG="\${$#}" |
1871 | + eval LASTARG=\${$#} |
1872 | case $LASTARG in |
1873 | *.y) |
1874 | SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` |
1875 | @@ -256,7 +246,7 @@ |
1876 | \`Flex' from any GNU archive site." |
1877 | rm -f lex.yy.c |
1878 | if test $# -ne 1; then |
1879 | - eval LASTARG="\${$#}" |
1880 | + eval LASTARG=\${$#} |
1881 | case $LASTARG in |
1882 | *.l) |
1883 | SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` |
1884 | @@ -318,41 +308,6 @@ |
1885 | touch $file |
1886 | ;; |
1887 | |
1888 | - tar*) |
1889 | - shift |
1890 | - |
1891 | - # We have already tried tar in the generic part. |
1892 | - # Look for gnutar/gtar before invocation to avoid ugly error |
1893 | - # messages. |
1894 | - if (gnutar --version > /dev/null 2>&1); then |
1895 | - gnutar "$@" && exit 0 |
1896 | - fi |
1897 | - if (gtar --version > /dev/null 2>&1); then |
1898 | - gtar "$@" && exit 0 |
1899 | - fi |
1900 | - firstarg="$1" |
1901 | - if shift; then |
1902 | - case $firstarg in |
1903 | - *o*) |
1904 | - firstarg=`echo "$firstarg" | sed s/o//` |
1905 | - tar "$firstarg" "$@" && exit 0 |
1906 | - ;; |
1907 | - esac |
1908 | - case $firstarg in |
1909 | - *h*) |
1910 | - firstarg=`echo "$firstarg" | sed s/h//` |
1911 | - tar "$firstarg" "$@" && exit 0 |
1912 | - ;; |
1913 | - esac |
1914 | - fi |
1915 | - |
1916 | - echo 1>&2 "\ |
1917 | -WARNING: I can't seem to be able to run \`tar' with the given arguments. |
1918 | - You may want to install GNU tar or Free paxutils, or check the |
1919 | - command line arguments." |
1920 | - exit 1 |
1921 | - ;; |
1922 | - |
1923 | *) |
1924 | echo 1>&2 "\ |
1925 | WARNING: \`$1' is needed, and is $msg. |
1926 | |
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 | #! /bin/sh |
1932 | # Guess values for system-dependent variables and create Makefiles. |
1933 | -# Generated by GNU Autoconf 2.68 for indicator-power 0.10. |
1934 | +# Generated by GNU Autoconf 2.68 for indicator-power 1.90. |
1935 | # |
1936 | # Report bugs to <http://bugs.launchpad.net/indicator-power>. |
1937 | # |
1938 | @@ -570,8 +570,8 @@ |
1939 | # Identity of this package. |
1940 | PACKAGE_NAME='indicator-power' |
1941 | PACKAGE_TARNAME='indicator-power' |
1942 | -PACKAGE_VERSION='0.10' |
1943 | -PACKAGE_STRING='indicator-power 0.10' |
1944 | +PACKAGE_VERSION='1.90' |
1945 | +PACKAGE_STRING='indicator-power 1.90' |
1946 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-power' |
1947 | PACKAGE_URL='http://launchpad.net/indicator-power' |
1948 | |
1949 | @@ -656,12 +656,25 @@ |
1950 | INTLTOOL_KEYS_RULE |
1951 | INTLTOOL_DIRECTORY_RULE |
1952 | INTLTOOL_DESKTOP_RULE |
1953 | +intltool__v_merge_options_0 |
1954 | +intltool__v_merge_options_ |
1955 | +INTLTOOL_V_MERGE_OPTIONS |
1956 | +INTLTOOL__v_MERGE_0 |
1957 | +INTLTOOL__v_MERGE_ |
1958 | +INTLTOOL_V_MERGE |
1959 | INTLTOOL_EXTRACT |
1960 | INTLTOOL_MERGE |
1961 | INTLTOOL_UPDATE |
1962 | USE_NLS |
1963 | INDICATORICONSDIR |
1964 | INDICATORDIR |
1965 | +COVERAGE_LDFLAGS |
1966 | +COVERAGE_CXXFLAGS |
1967 | +COVERAGE_CFLAGS |
1968 | +GCOVR |
1969 | +GENHTML |
1970 | +LCOV |
1971 | +SHTOOL |
1972 | GSETTINGS_RULES |
1973 | GLIB_COMPILE_SCHEMAS |
1974 | gsettingsschemadir |
1975 | @@ -708,6 +721,7 @@ |
1976 | am__fastdepCC_FALSE |
1977 | am__fastdepCC_TRUE |
1978 | CCDEPMODE |
1979 | +am__nodep |
1980 | AMDEPBACKSLASH |
1981 | AMDEP_FALSE |
1982 | AMDEP_TRUE |
1983 | @@ -723,6 +737,8 @@ |
1984 | CC |
1985 | AM_BACKSLASH |
1986 | AM_DEFAULT_VERBOSITY |
1987 | +AM_DEFAULT_V |
1988 | +AM_V |
1989 | MAINT |
1990 | MAINTAINER_MODE_FALSE |
1991 | MAINTAINER_MODE_TRUE |
1992 | @@ -801,6 +817,7 @@ |
1993 | with_sysroot |
1994 | enable_libtool_lock |
1995 | enable_schemas_compile |
1996 | +enable_gcov |
1997 | enable_localinstall |
1998 | enable_nls |
1999 | enable_rpath |
2000 | @@ -1367,7 +1384,7 @@ |
2001 | # Omit some internal or obsolete options to make the list less imposing. |
2002 | # This message is too long to be a string in the A/UX 3.1 sh. |
2003 | cat <<_ACEOF |
2004 | -\`configure' configures indicator-power 0.10 to adapt to many kinds of systems. |
2005 | +\`configure' configures indicator-power 1.90 to adapt to many kinds of systems. |
2006 | |
2007 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2008 | |
2009 | @@ -1437,7 +1454,7 @@ |
2010 | |
2011 | if test -n "$ac_init_help"; then |
2012 | case $ac_init_help in |
2013 | - short | recursive ) echo "Configuration of indicator-power 0.10:";; |
2014 | + short | recursive ) echo "Configuration of indicator-power 1.90:";; |
2015 | esac |
2016 | cat <<\_ACEOF |
2017 | |
2018 | @@ -1458,6 +1475,7 @@ |
2019 | --disable-libtool-lock avoid locking (might break parallel builds) |
2020 | --disable-schemas-compile |
2021 | Disable regeneration of gschemas.compiled on install |
2022 | + --enable-gcov enable coverage testing with gcov |
2023 | --enable-localinstall install all of the files localy instead of system |
2024 | directories (for distcheck) |
2025 | --disable-nls do not use Native Language Support |
2026 | @@ -1466,7 +1484,7 @@ |
2027 | Optional Packages: |
2028 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
2029 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
2030 | - --with-pic try to use only PIC/non-PIC objects [default=use |
2031 | + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
2032 | both] |
2033 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
2034 | --with-sysroot=DIR Search for dependent libraries within DIR |
2035 | @@ -1568,7 +1586,7 @@ |
2036 | test -n "$ac_init_help" && exit $ac_status |
2037 | if $ac_init_version; then |
2038 | cat <<\_ACEOF |
2039 | -indicator-power configure 0.10 |
2040 | +indicator-power configure 1.90 |
2041 | generated by GNU Autoconf 2.68 |
2042 | |
2043 | Copyright (C) 2010 Free Software Foundation, Inc. |
2044 | @@ -1846,7 +1864,7 @@ |
2045 | This file contains any messages produced by compilers while |
2046 | running configure, to aid debugging if configure makes a mistake. |
2047 | |
2048 | -It was created by indicator-power $as_me 0.10, which was |
2049 | +It was created by indicator-power $as_me 1.90, which was |
2050 | generated by GNU Autoconf 2.68. Invocation command line was |
2051 | |
2052 | $ $0 $@ |
2053 | @@ -2670,7 +2688,7 @@ |
2054 | |
2055 | # Define the identity of the package. |
2056 | PACKAGE='indicator-power' |
2057 | - VERSION='0.10' |
2058 | + VERSION='1.90' |
2059 | |
2060 | |
2061 | cat >>confdefs.h <<_ACEOF |
2062 | @@ -2700,19 +2718,19 @@ |
2063 | |
2064 | # We need awk for the "check" target. The system "awk" is bad on |
2065 | # some platforms. |
2066 | -# Always define AMTAR for backward compatibility. |
2067 | - |
2068 | -AMTAR=${AMTAR-"${am_missing_run}tar"} |
2069 | - |
2070 | -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' |
2071 | - |
2072 | - |
2073 | - |
2074 | - |
2075 | - |
2076 | - |
2077 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 |
2078 | -$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } |
2079 | +# Always define AMTAR for backward compatibility. Yes, it's still used |
2080 | +# in the wild :-( We should find a proper way to deprecate it ... |
2081 | +AMTAR='$${TAR-tar}' |
2082 | + |
2083 | +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
2084 | + |
2085 | + |
2086 | + |
2087 | + |
2088 | + |
2089 | + |
2090 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
2091 | +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
2092 | # Check whether --enable-maintainer-mode was given. |
2093 | if test "${enable_maintainer_mode+set}" = set; then : |
2094 | enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval |
2095 | @@ -2744,6 +2762,33 @@ |
2096 | no) AM_DEFAULT_VERBOSITY=1;; |
2097 | *) AM_DEFAULT_VERBOSITY=0;; |
2098 | esac |
2099 | +am_make=${MAKE-make} |
2100 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
2101 | +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } |
2102 | +if ${am_cv_make_support_nested_variables+:} false; then : |
2103 | + $as_echo_n "(cached) " >&6 |
2104 | +else |
2105 | + if $as_echo 'TRUE=$(BAR$(V)) |
2106 | +BAR0=false |
2107 | +BAR1=true |
2108 | +V=1 |
2109 | +am__doit: |
2110 | + @$(TRUE) |
2111 | +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then |
2112 | + am_cv_make_support_nested_variables=yes |
2113 | +else |
2114 | + am_cv_make_support_nested_variables=no |
2115 | +fi |
2116 | +fi |
2117 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 |
2118 | +$as_echo "$am_cv_make_support_nested_variables" >&6; } |
2119 | +if test $am_cv_make_support_nested_variables = yes; then |
2120 | + AM_V='$(V)' |
2121 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
2122 | +else |
2123 | + AM_V=$AM_DEFAULT_VERBOSITY |
2124 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
2125 | +fi |
2126 | AM_BACKSLASH='\' |
2127 | |
2128 | |
2129 | @@ -3589,6 +3634,7 @@ |
2130 | if test "x$enable_dependency_tracking" != xno; then |
2131 | am_depcomp="$ac_aux_dir/depcomp" |
2132 | AMDEPBACKSLASH='\' |
2133 | + am__nodep='_no' |
2134 | fi |
2135 | if test "x$enable_dependency_tracking" != xno; then |
2136 | AMDEP_TRUE= |
2137 | @@ -3613,6 +3659,7 @@ |
2138 | # instance it was reported that on HP-UX the gcc test will end up |
2139 | # making a dummy file named `D' -- because `-MD' means `put the output |
2140 | # in D'. |
2141 | + rm -rf conftest.dir |
2142 | mkdir conftest.dir |
2143 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2144 | # using a relative directory. |
2145 | @@ -3672,7 +3719,7 @@ |
2146 | break |
2147 | fi |
2148 | ;; |
2149 | - msvisualcpp | msvcmsys) |
2150 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2151 | # This compiler won't grok `-c -o', but also, the minuso test has |
2152 | # not run yet. These depmodes are late enough in the game, and |
2153 | # so weak that their functioning should not be impacted. |
2154 | @@ -3864,8 +3911,8 @@ |
2155 | |
2156 | |
2157 | |
2158 | -macro_version='2.4' |
2159 | -macro_revision='1.3293' |
2160 | +macro_version='2.4.2' |
2161 | +macro_revision='1.3337' |
2162 | |
2163 | |
2164 | |
2165 | @@ -4710,6 +4757,11 @@ |
2166 | lt_cv_sys_max_cmd_len=196608 |
2167 | ;; |
2168 | |
2169 | + os2*) |
2170 | + # The test takes a long time on OS/2. |
2171 | + lt_cv_sys_max_cmd_len=8192 |
2172 | + ;; |
2173 | + |
2174 | osf*) |
2175 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2176 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2177 | @@ -4749,7 +4801,7 @@ |
2178 | # If test is not a shell built-in, we'll probably end up computing a |
2179 | # maximum length that is only half of the actual maximum length, but |
2180 | # we can't tell. |
2181 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
2182 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2183 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2184 | test $i != 17 # 1/2 MB should be enough |
2185 | do |
2186 | @@ -5178,7 +5230,7 @@ |
2187 | lt_cv_deplibs_check_method=pass_all |
2188 | ;; |
2189 | |
2190 | -# This must be Linux ELF. |
2191 | +# This must be glibc/ELF. |
2192 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2193 | lt_cv_deplibs_check_method=pass_all |
2194 | ;; |
2195 | @@ -5819,13 +5871,13 @@ |
2196 | if test -n "$RANLIB"; then |
2197 | case $host_os in |
2198 | openbsd*) |
2199 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
2200 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
2201 | ;; |
2202 | *) |
2203 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
2204 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
2205 | ;; |
2206 | esac |
2207 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2208 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
2209 | fi |
2210 | |
2211 | case $host_os in |
2212 | @@ -5972,6 +6024,7 @@ |
2213 | # which start with @ or ?. |
2214 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
2215 | " {last_section=section; section=\$ 3};"\ |
2216 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
2217 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
2218 | " \$ 0!~/External *\|/{next};"\ |
2219 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
2220 | @@ -6360,7 +6413,7 @@ |
2221 | CFLAGS="$SAVE_CFLAGS" |
2222 | fi |
2223 | ;; |
2224 | -sparc*-*solaris*) |
2225 | +*-*solaris*) |
2226 | # Find out which ABI we are using. |
2227 | echo 'int i;' > conftest.$ac_ext |
2228 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
2229 | @@ -6371,7 +6424,20 @@ |
2230 | case `/usr/bin/file conftest.o` in |
2231 | *64-bit*) |
2232 | case $lt_cv_prog_gnu_ld in |
2233 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
2234 | + yes*) |
2235 | + case $host in |
2236 | + i?86-*-solaris*) |
2237 | + LD="${LD-ld} -m elf_x86_64" |
2238 | + ;; |
2239 | + sparc*-*-solaris*) |
2240 | + LD="${LD-ld} -m elf64_sparc" |
2241 | + ;; |
2242 | + esac |
2243 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
2244 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
2245 | + LD="${LD-ld}_sol2" |
2246 | + fi |
2247 | + ;; |
2248 | *) |
2249 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
2250 | LD="${LD-ld} -64" |
2251 | @@ -7011,7 +7077,13 @@ |
2252 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
2253 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
2254 | _lt_result=$? |
2255 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
2256 | + # If there is a non-empty error log, and "single_module" |
2257 | + # appears in it, assume the flag caused a linker warning |
2258 | + if test -s conftest.err && $GREP single_module conftest.err; then |
2259 | + cat conftest.err >&5 |
2260 | + # Otherwise, if the output was created with a 0 exit code from |
2261 | + # the compiler, it worked. |
2262 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
2263 | lt_cv_apple_cc_single_mod=yes |
2264 | else |
2265 | cat conftest.err >&5 |
2266 | @@ -7022,6 +7094,7 @@ |
2267 | fi |
2268 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 |
2269 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
2270 | + |
2271 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
2272 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
2273 | if ${lt_cv_ld_exported_symbols_list+:} false; then : |
2274 | @@ -7054,6 +7127,7 @@ |
2275 | fi |
2276 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
2277 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
2278 | + |
2279 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
2280 | $as_echo_n "checking for -force_load linker flag... " >&6; } |
2281 | if ${lt_cv_ld_force_load+:} false; then : |
2282 | @@ -7075,7 +7149,9 @@ |
2283 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
2284 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
2285 | _lt_result=$? |
2286 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
2287 | + if test -s conftest.err && $GREP force_load conftest.err; then |
2288 | + cat conftest.err >&5 |
2289 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
2290 | lt_cv_ld_force_load=yes |
2291 | else |
2292 | cat conftest.err >&5 |
2293 | @@ -7480,7 +7556,22 @@ |
2294 | |
2295 | # Check whether --with-pic was given. |
2296 | if test "${with_pic+set}" = set; then : |
2297 | - withval=$with_pic; pic_mode="$withval" |
2298 | + withval=$with_pic; lt_p=${PACKAGE-default} |
2299 | + case $withval in |
2300 | + yes|no) pic_mode=$withval ;; |
2301 | + *) |
2302 | + pic_mode=default |
2303 | + # Look at the argument we got. We use all the common list separators. |
2304 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
2305 | + for lt_pkg in $withval; do |
2306 | + IFS="$lt_save_ifs" |
2307 | + if test "X$lt_pkg" = "X$lt_p"; then |
2308 | + pic_mode=yes |
2309 | + fi |
2310 | + done |
2311 | + IFS="$lt_save_ifs" |
2312 | + ;; |
2313 | + esac |
2314 | else |
2315 | pic_mode=default |
2316 | fi |
2317 | @@ -7558,6 +7649,10 @@ |
2318 | |
2319 | |
2320 | |
2321 | + |
2322 | + |
2323 | + |
2324 | + |
2325 | test -z "$LN_S" && LN_S="ln -s" |
2326 | |
2327 | |
2328 | @@ -8017,7 +8112,9 @@ |
2329 | case $cc_basename in |
2330 | nvcc*) # Cuda Compiler Driver 2.2 |
2331 | lt_prog_compiler_wl='-Xlinker ' |
2332 | - lt_prog_compiler_pic='-Xcompiler -fPIC' |
2333 | + if test -n "$lt_prog_compiler_pic"; then |
2334 | + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" |
2335 | + fi |
2336 | ;; |
2337 | esac |
2338 | else |
2339 | @@ -8108,18 +8205,33 @@ |
2340 | ;; |
2341 | *) |
2342 | case `$CC -V 2>&1 | sed 5q` in |
2343 | - *Sun\ F* | *Sun*Fortran*) |
2344 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) |
2345 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
2346 | lt_prog_compiler_pic='-KPIC' |
2347 | lt_prog_compiler_static='-Bstatic' |
2348 | lt_prog_compiler_wl='' |
2349 | ;; |
2350 | + *Sun\ F* | *Sun*Fortran*) |
2351 | + lt_prog_compiler_pic='-KPIC' |
2352 | + lt_prog_compiler_static='-Bstatic' |
2353 | + lt_prog_compiler_wl='-Qoption ld ' |
2354 | + ;; |
2355 | *Sun\ C*) |
2356 | # Sun C 5.9 |
2357 | lt_prog_compiler_pic='-KPIC' |
2358 | lt_prog_compiler_static='-Bstatic' |
2359 | lt_prog_compiler_wl='-Wl,' |
2360 | ;; |
2361 | + *Intel*\ [CF]*Compiler*) |
2362 | + lt_prog_compiler_wl='-Wl,' |
2363 | + lt_prog_compiler_pic='-fPIC' |
2364 | + lt_prog_compiler_static='-static' |
2365 | + ;; |
2366 | + *Portland\ Group*) |
2367 | + lt_prog_compiler_wl='-Wl,' |
2368 | + lt_prog_compiler_pic='-fpic' |
2369 | + lt_prog_compiler_static='-Bstatic' |
2370 | + ;; |
2371 | esac |
2372 | ;; |
2373 | esac |
2374 | @@ -8481,7 +8593,6 @@ |
2375 | hardcode_direct=no |
2376 | hardcode_direct_absolute=no |
2377 | hardcode_libdir_flag_spec= |
2378 | - hardcode_libdir_flag_spec_ld= |
2379 | hardcode_libdir_separator= |
2380 | hardcode_minus_L=no |
2381 | hardcode_shlibpath_var=unsupported |
2382 | @@ -8734,8 +8845,7 @@ |
2383 | xlf* | bgf* | bgxlf* | mpixlf*) |
2384 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
2385 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2386 | - hardcode_libdir_flag_spec= |
2387 | - hardcode_libdir_flag_spec_ld='-rpath $libdir' |
2388 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2389 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
2390 | if test "x$supports_anon_versioning" = xyes; then |
2391 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
2392 | @@ -9115,6 +9225,7 @@ |
2393 | # The linker will not automatically build a static lib if we build a DLL. |
2394 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
2395 | enable_shared_with_static_runtimes=yes |
2396 | + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
2397 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
2398 | # Don't use ranlib |
2399 | old_postinstall_cmds='chmod 644 $oldlib' |
2400 | @@ -9160,6 +9271,7 @@ |
2401 | hardcode_shlibpath_var=unsupported |
2402 | if test "$lt_cv_ld_force_load" = "yes"; then |
2403 | 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 | + |
2405 | else |
2406 | whole_archive_flag_spec='' |
2407 | fi |
2408 | @@ -9188,10 +9300,6 @@ |
2409 | hardcode_shlibpath_var=no |
2410 | ;; |
2411 | |
2412 | - freebsd1*) |
2413 | - ld_shlibs=no |
2414 | - ;; |
2415 | - |
2416 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
2417 | # support. Future versions do this automatically, but an explicit c++rt0.o |
2418 | # does not break anything, and helps significantly (at the cost of a little |
2419 | @@ -9204,7 +9312,7 @@ |
2420 | ;; |
2421 | |
2422 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
2423 | - freebsd2*) |
2424 | + freebsd2.*) |
2425 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
2426 | hardcode_direct=yes |
2427 | hardcode_minus_L=yes |
2428 | @@ -9243,7 +9351,6 @@ |
2429 | fi |
2430 | if test "$with_gnu_ld" = no; then |
2431 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
2432 | - hardcode_libdir_flag_spec_ld='+b $libdir' |
2433 | hardcode_libdir_separator=: |
2434 | hardcode_direct=yes |
2435 | hardcode_direct_absolute=yes |
2436 | @@ -9867,11 +9974,6 @@ |
2437 | |
2438 | |
2439 | |
2440 | - |
2441 | - |
2442 | - |
2443 | - |
2444 | - |
2445 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
2446 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
2447 | |
2448 | @@ -9961,7 +10063,7 @@ |
2449 | |
2450 | case $host_os in |
2451 | aix3*) |
2452 | - version_type=linux |
2453 | + version_type=linux # correct to gnu/linux during the next big refactor |
2454 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
2455 | shlibpath_var=LIBPATH |
2456 | |
2457 | @@ -9970,7 +10072,7 @@ |
2458 | ;; |
2459 | |
2460 | aix[4-9]*) |
2461 | - version_type=linux |
2462 | + version_type=linux # correct to gnu/linux during the next big refactor |
2463 | need_lib_prefix=no |
2464 | need_version=no |
2465 | hardcode_into_libs=yes |
2466 | @@ -10035,7 +10137,7 @@ |
2467 | ;; |
2468 | |
2469 | bsdi[45]*) |
2470 | - version_type=linux |
2471 | + version_type=linux # correct to gnu/linux during the next big refactor |
2472 | need_version=no |
2473 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2474 | soname_spec='${libname}${release}${shared_ext}$major' |
2475 | @@ -10174,7 +10276,7 @@ |
2476 | ;; |
2477 | |
2478 | dgux*) |
2479 | - version_type=linux |
2480 | + version_type=linux # correct to gnu/linux during the next big refactor |
2481 | need_lib_prefix=no |
2482 | need_version=no |
2483 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
2484 | @@ -10182,10 +10284,6 @@ |
2485 | shlibpath_var=LD_LIBRARY_PATH |
2486 | ;; |
2487 | |
2488 | -freebsd1*) |
2489 | - dynamic_linker=no |
2490 | - ;; |
2491 | - |
2492 | freebsd* | dragonfly*) |
2493 | # DragonFly does not have aout. When/if they implement a new |
2494 | # versioning mechanism, adjust this. |
2495 | @@ -10193,7 +10291,7 @@ |
2496 | objformat=`/usr/bin/objformat` |
2497 | else |
2498 | case $host_os in |
2499 | - freebsd[123]*) objformat=aout ;; |
2500 | + freebsd[23].*) objformat=aout ;; |
2501 | *) objformat=elf ;; |
2502 | esac |
2503 | fi |
2504 | @@ -10211,7 +10309,7 @@ |
2505 | esac |
2506 | shlibpath_var=LD_LIBRARY_PATH |
2507 | case $host_os in |
2508 | - freebsd2*) |
2509 | + freebsd2.*) |
2510 | shlibpath_overrides_runpath=yes |
2511 | ;; |
2512 | freebsd3.[01]* | freebsdelf3.[01]*) |
2513 | @@ -10231,7 +10329,7 @@ |
2514 | ;; |
2515 | |
2516 | gnu*) |
2517 | - version_type=linux |
2518 | + version_type=linux # correct to gnu/linux during the next big refactor |
2519 | need_lib_prefix=no |
2520 | need_version=no |
2521 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2522 | @@ -10242,7 +10340,7 @@ |
2523 | ;; |
2524 | |
2525 | haiku*) |
2526 | - version_type=linux |
2527 | + version_type=linux # correct to gnu/linux during the next big refactor |
2528 | need_lib_prefix=no |
2529 | need_version=no |
2530 | dynamic_linker="$host_os runtime_loader" |
2531 | @@ -10303,7 +10401,7 @@ |
2532 | ;; |
2533 | |
2534 | interix[3-9]*) |
2535 | - version_type=linux |
2536 | + version_type=linux # correct to gnu/linux during the next big refactor |
2537 | need_lib_prefix=no |
2538 | need_version=no |
2539 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2540 | @@ -10319,7 +10417,7 @@ |
2541 | nonstopux*) version_type=nonstopux ;; |
2542 | *) |
2543 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2544 | - version_type=linux |
2545 | + version_type=linux # correct to gnu/linux during the next big refactor |
2546 | else |
2547 | version_type=irix |
2548 | fi ;; |
2549 | @@ -10356,9 +10454,9 @@ |
2550 | dynamic_linker=no |
2551 | ;; |
2552 | |
2553 | -# This must be Linux ELF. |
2554 | +# This must be glibc/ELF. |
2555 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2556 | - version_type=linux |
2557 | + version_type=linux # correct to gnu/linux during the next big refactor |
2558 | need_lib_prefix=no |
2559 | need_version=no |
2560 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2561 | @@ -10452,7 +10550,7 @@ |
2562 | ;; |
2563 | |
2564 | newsos6) |
2565 | - version_type=linux |
2566 | + version_type=linux # correct to gnu/linux during the next big refactor |
2567 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2568 | shlibpath_var=LD_LIBRARY_PATH |
2569 | shlibpath_overrides_runpath=yes |
2570 | @@ -10521,7 +10619,7 @@ |
2571 | ;; |
2572 | |
2573 | solaris*) |
2574 | - version_type=linux |
2575 | + version_type=linux # correct to gnu/linux during the next big refactor |
2576 | need_lib_prefix=no |
2577 | need_version=no |
2578 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2579 | @@ -10546,7 +10644,7 @@ |
2580 | ;; |
2581 | |
2582 | sysv4 | sysv4.3*) |
2583 | - version_type=linux |
2584 | + version_type=linux # correct to gnu/linux during the next big refactor |
2585 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2586 | soname_spec='${libname}${release}${shared_ext}$major' |
2587 | shlibpath_var=LD_LIBRARY_PATH |
2588 | @@ -10570,7 +10668,7 @@ |
2589 | |
2590 | sysv4*MP*) |
2591 | if test -d /usr/nec ;then |
2592 | - version_type=linux |
2593 | + version_type=linux # correct to gnu/linux during the next big refactor |
2594 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
2595 | soname_spec='$libname${shared_ext}.$major' |
2596 | shlibpath_var=LD_LIBRARY_PATH |
2597 | @@ -10601,7 +10699,7 @@ |
2598 | |
2599 | tpf*) |
2600 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
2601 | - version_type=linux |
2602 | + version_type=linux # correct to gnu/linux during the next big refactor |
2603 | need_lib_prefix=no |
2604 | need_version=no |
2605 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2606 | @@ -10611,7 +10709,7 @@ |
2607 | ;; |
2608 | |
2609 | uts4*) |
2610 | - version_type=linux |
2611 | + version_type=linux # correct to gnu/linux during the next big refactor |
2612 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2613 | soname_spec='${libname}${release}${shared_ext}$major' |
2614 | shlibpath_var=LD_LIBRARY_PATH |
2615 | @@ -11393,6 +11491,8 @@ |
2616 | |
2617 | |
2618 | |
2619 | + |
2620 | + |
2621 | ac_config_commands="$ac_config_commands libtool" |
2622 | |
2623 | |
2624 | @@ -12079,6 +12179,260 @@ |
2625 | |
2626 | |
2627 | ########################### |
2628 | +# gcov coverage reporting |
2629 | +########################### |
2630 | + |
2631 | +# Checks for existence of coverage tools: |
2632 | +# * gcov |
2633 | +# * lcov |
2634 | +# * genhtml |
2635 | +# * gcovr |
2636 | +# |
2637 | +# Sets ac_cv_check_gcov to yes if tooling is present |
2638 | +# and reports the executables to the variables LCOV, GCOVR and GENHTML. |
2639 | + # AC_TDD_GCOV |
2640 | + |
2641 | + |
2642 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether code coverage tools are available" >&5 |
2643 | +$as_echo_n "checking whether code coverage tools are available... " >&6; } |
2644 | +if ${ac_cv_check_gcov+:} false; then : |
2645 | + $as_echo_n "(cached) " >&6 |
2646 | +else |
2647 | + |
2648 | +# Check whether --enable-gcov was given. |
2649 | +if test "${enable_gcov+set}" = set; then : |
2650 | + enableval=$enable_gcov; use_gcov=$enableval |
2651 | +else |
2652 | + use_gcov=no |
2653 | +fi |
2654 | + |
2655 | + |
2656 | + if test "x$use_gcov" = "xyes"; then |
2657 | + # we need gcc: |
2658 | + if test "$GCC" != "yes"; then |
2659 | + as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 |
2660 | + fi |
2661 | + |
2662 | + # Check if ccache is being used |
2663 | + # Extract the first word of "shtool", so it can be a program name with args. |
2664 | +set dummy shtool; ac_word=$2 |
2665 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2666 | +$as_echo_n "checking for $ac_word... " >&6; } |
2667 | +if ${ac_cv_prog_SHTOOL+:} false; then : |
2668 | + $as_echo_n "(cached) " >&6 |
2669 | +else |
2670 | + if test -n "$SHTOOL"; then |
2671 | + ac_cv_prog_SHTOOL="$SHTOOL" # Let the user override the test. |
2672 | +else |
2673 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2674 | +for as_dir in $PATH |
2675 | +do |
2676 | + IFS=$as_save_IFS |
2677 | + test -z "$as_dir" && as_dir=. |
2678 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2679 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2680 | + ac_cv_prog_SHTOOL="shtool" |
2681 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2682 | + break 2 |
2683 | + fi |
2684 | +done |
2685 | + done |
2686 | +IFS=$as_save_IFS |
2687 | + |
2688 | +fi |
2689 | +fi |
2690 | +SHTOOL=$ac_cv_prog_SHTOOL |
2691 | +if test -n "$SHTOOL"; then |
2692 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHTOOL" >&5 |
2693 | +$as_echo "$SHTOOL" >&6; } |
2694 | +else |
2695 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2696 | +$as_echo "no" >&6; } |
2697 | +fi |
2698 | + |
2699 | + |
2700 | + case `$SHTOOL path $CC` in |
2701 | + *ccache*) gcc_ccache=yes;; |
2702 | + *) gcc_ccache=no;; |
2703 | + esac |
2704 | + |
2705 | + if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then |
2706 | + 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 | + fi |
2708 | + |
2709 | + lcov_version_list="1.6 1.7 1.8 1.9" |
2710 | + # Extract the first word of "lcov", so it can be a program name with args. |
2711 | +set dummy lcov; ac_word=$2 |
2712 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2713 | +$as_echo_n "checking for $ac_word... " >&6; } |
2714 | +if ${ac_cv_prog_LCOV+:} false; then : |
2715 | + $as_echo_n "(cached) " >&6 |
2716 | +else |
2717 | + if test -n "$LCOV"; then |
2718 | + ac_cv_prog_LCOV="$LCOV" # Let the user override the test. |
2719 | +else |
2720 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2721 | +for as_dir in $PATH |
2722 | +do |
2723 | + IFS=$as_save_IFS |
2724 | + test -z "$as_dir" && as_dir=. |
2725 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2726 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2727 | + ac_cv_prog_LCOV="lcov" |
2728 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2729 | + break 2 |
2730 | + fi |
2731 | +done |
2732 | + done |
2733 | +IFS=$as_save_IFS |
2734 | + |
2735 | +fi |
2736 | +fi |
2737 | +LCOV=$ac_cv_prog_LCOV |
2738 | +if test -n "$LCOV"; then |
2739 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 |
2740 | +$as_echo "$LCOV" >&6; } |
2741 | +else |
2742 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2743 | +$as_echo "no" >&6; } |
2744 | +fi |
2745 | + |
2746 | + |
2747 | + # Extract the first word of "genhtml", so it can be a program name with args. |
2748 | +set dummy genhtml; ac_word=$2 |
2749 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2750 | +$as_echo_n "checking for $ac_word... " >&6; } |
2751 | +if ${ac_cv_prog_GENHTML+:} false; then : |
2752 | + $as_echo_n "(cached) " >&6 |
2753 | +else |
2754 | + if test -n "$GENHTML"; then |
2755 | + ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. |
2756 | +else |
2757 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2758 | +for as_dir in $PATH |
2759 | +do |
2760 | + IFS=$as_save_IFS |
2761 | + test -z "$as_dir" && as_dir=. |
2762 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2763 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2764 | + ac_cv_prog_GENHTML="genhtml" |
2765 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2766 | + break 2 |
2767 | + fi |
2768 | +done |
2769 | + done |
2770 | +IFS=$as_save_IFS |
2771 | + |
2772 | +fi |
2773 | +fi |
2774 | +GENHTML=$ac_cv_prog_GENHTML |
2775 | +if test -n "$GENHTML"; then |
2776 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 |
2777 | +$as_echo "$GENHTML" >&6; } |
2778 | +else |
2779 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2780 | +$as_echo "no" >&6; } |
2781 | +fi |
2782 | + |
2783 | + |
2784 | + # Extract the first word of "gcovr", so it can be a program name with args. |
2785 | +set dummy gcovr; ac_word=$2 |
2786 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2787 | +$as_echo_n "checking for $ac_word... " >&6; } |
2788 | +if ${ac_cv_prog_GCOVR+:} false; then : |
2789 | + $as_echo_n "(cached) " >&6 |
2790 | +else |
2791 | + if test -n "$GCOVR"; then |
2792 | + ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test. |
2793 | +else |
2794 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2795 | +for as_dir in $PATH |
2796 | +do |
2797 | + IFS=$as_save_IFS |
2798 | + test -z "$as_dir" && as_dir=. |
2799 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2800 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2801 | + ac_cv_prog_GCOVR="gcovr" |
2802 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2803 | + break 2 |
2804 | + fi |
2805 | +done |
2806 | + done |
2807 | +IFS=$as_save_IFS |
2808 | + |
2809 | +fi |
2810 | +fi |
2811 | +GCOVR=$ac_cv_prog_GCOVR |
2812 | +if test -n "$GCOVR"; then |
2813 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5 |
2814 | +$as_echo "$GCOVR" >&6; } |
2815 | +else |
2816 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2817 | +$as_echo "no" >&6; } |
2818 | +fi |
2819 | + |
2820 | + |
2821 | + |
2822 | + if test "$LCOV"; then |
2823 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 |
2824 | +$as_echo_n "checking for lcov version... " >&6; } |
2825 | +if ${glib_cv_lcov_version+:} false; then : |
2826 | + $as_echo_n "(cached) " >&6 |
2827 | +else |
2828 | + |
2829 | + glib_cv_lcov_version=invalid |
2830 | + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` |
2831 | + for lcov_check_version in $lcov_version_list; do |
2832 | + if test "$lcov_version" = "$lcov_check_version"; then |
2833 | + glib_cv_lcov_version="$lcov_check_version (ok)" |
2834 | + fi |
2835 | + done |
2836 | + |
2837 | +fi |
2838 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_lcov_version" >&5 |
2839 | +$as_echo "$glib_cv_lcov_version" >&6; } |
2840 | + else |
2841 | + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" |
2842 | + as_fn_error $? "$lcov_msg" "$LINENO" 5 |
2843 | + fi |
2844 | + |
2845 | + case $glib_cv_lcov_version in |
2846 | + ""|invalid) |
2847 | + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." |
2848 | + as_fn_error $? "$lcov_msg" "$LINENO" 5 |
2849 | + LCOV="exit 0;" |
2850 | + ;; |
2851 | + esac |
2852 | + |
2853 | + if test -z "$GENHTML"; then |
2854 | + as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 |
2855 | + fi |
2856 | + |
2857 | + if test -z "$GCOVR"; then |
2858 | + as_fn_error $? "Could not find gcovr; easy_install (or pip) gcovr" "$LINENO" 5 |
2859 | + fi |
2860 | + |
2861 | + |
2862 | + # Remove all optimization flags from CFLAGS |
2863 | + |
2864 | + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` |
2865 | + |
2866 | + |
2867 | + # Add the special gcc flags |
2868 | + COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
2869 | + COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
2870 | + COVERAGE_LDFLAGS="-lgcov" |
2871 | + |
2872 | +fi |
2873 | + |
2874 | +fi |
2875 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5 |
2876 | +$as_echo "$ac_cv_check_gcov" >&6; } |
2877 | + |
2878 | + |
2879 | + |
2880 | + |
2881 | +########################### |
2882 | # Check to see if we're local |
2883 | ########################### |
2884 | |
2885 | @@ -12277,25 +12631,44 @@ |
2886 | as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 |
2887 | fi |
2888 | |
2889 | - 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 $< $@' |
2890 | -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 $< $@' |
2891 | - 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 $< $@' |
2892 | - 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 $< $@' |
2893 | - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' |
2894 | - 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 $< $@' |
2895 | - 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 $< $@' |
2896 | - 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 $< $@' |
2897 | -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 $< $@' |
2898 | - 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 $< $@' |
2899 | - 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 $< $@' |
2900 | - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' |
2901 | - 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 $< $@' |
2902 | - 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 $< $@' |
2903 | - 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 $< $@' |
2904 | - 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 $< $@' |
2905 | - 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 $< $@' |
2906 | - 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 $< $@' |
2907 | - 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 $< $@' |
2908 | +if test -z "$AM_DEFAULT_VERBOSITY"; then |
2909 | + AM_DEFAULT_VERBOSITY=1 |
2910 | +fi |
2911 | + |
2912 | + |
2913 | +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' |
2914 | +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' |
2915 | +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' |
2916 | + |
2917 | + |
2918 | + |
2919 | + |
2920 | +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' |
2921 | +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' |
2922 | +intltool__v_merge_options_0='-q' |
2923 | + |
2924 | + |
2925 | + |
2926 | + |
2927 | + 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 | +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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | +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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | |
2947 | |
2948 | |
2949 | @@ -12614,7 +12987,7 @@ |
2950 | if test $? -ne 0; then |
2951 | as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 |
2952 | else |
2953 | - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" |
2954 | + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` |
2955 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 |
2956 | $as_echo "$IT_PERL_VERSION" >&6; } |
2957 | fi |
2958 | @@ -14575,7 +14948,7 @@ |
2959 | # Files |
2960 | ########################### |
2961 | |
2962 | -ac_config_files="$ac_config_files Makefile po/Makefile.in" |
2963 | +ac_config_files="$ac_config_files Makefile po/Makefile.in data/Makefile" |
2964 | |
2965 | cat >confcache <<\_ACEOF |
2966 | # This file is a shell script that caches the results of configure |
2967 | @@ -15119,7 +15492,7 @@ |
2968 | # report actual input values of CONFIG_FILES etc. instead of their |
2969 | # values after options handling. |
2970 | ac_log=" |
2971 | -This file was extended by indicator-power $as_me 0.10, which was |
2972 | +This file was extended by indicator-power $as_me 1.90, which was |
2973 | generated by GNU Autoconf 2.68. Invocation command line was |
2974 | |
2975 | CONFIG_FILES = $CONFIG_FILES |
2976 | @@ -15186,7 +15559,7 @@ |
2977 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2978 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2979 | ac_cs_version="\\ |
2980 | -indicator-power config.status 0.10 |
2981 | +indicator-power config.status 1.90 |
2982 | configured by $0, generated by GNU Autoconf 2.68, |
2983 | with options \\"\$ac_cs_config\\" |
2984 | |
2985 | @@ -15323,6 +15696,7 @@ |
2986 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
2987 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
2988 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
2989 | +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' |
2990 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' |
2991 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' |
2992 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' |
2993 | @@ -15405,7 +15779,6 @@ |
2994 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' |
2995 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' |
2996 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' |
2997 | -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' |
2998 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' |
2999 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' |
3000 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' |
3001 | @@ -15461,6 +15834,7 @@ |
3002 | # Quote evaled strings. |
3003 | for var in SHELL \ |
3004 | ECHO \ |
3005 | +PATH_SEPARATOR \ |
3006 | SED \ |
3007 | GREP \ |
3008 | EGREP \ |
3009 | @@ -15511,7 +15885,6 @@ |
3010 | allow_undefined_flag \ |
3011 | no_undefined_flag \ |
3012 | hardcode_libdir_flag_spec \ |
3013 | -hardcode_libdir_flag_spec_ld \ |
3014 | hardcode_libdir_separator \ |
3015 | exclude_expsyms \ |
3016 | include_expsyms \ |
3017 | @@ -15605,6 +15978,7 @@ |
3018 | "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; |
3019 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
3020 | "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; |
3021 | + "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; |
3022 | "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; |
3023 | |
3024 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
3025 | @@ -16317,8 +16691,8 @@ |
3026 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3027 | # |
3028 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3029 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
3030 | -# Inc. |
3031 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3032 | +# Foundation, Inc. |
3033 | # Written by Gordon Matzigkeit, 1996 |
3034 | # |
3035 | # This file is part of GNU Libtool. |
3036 | @@ -16372,6 +16746,9 @@ |
3037 | # An echo program that protects backslashes. |
3038 | ECHO=$lt_ECHO |
3039 | |
3040 | +# The PATH separator for the build system. |
3041 | +PATH_SEPARATOR=$lt_PATH_SEPARATOR |
3042 | + |
3043 | # The host system. |
3044 | host_alias=$host_alias |
3045 | host=$host |
3046 | @@ -16673,10 +17050,6 @@ |
3047 | # This must work even if \$libdir does not exist |
3048 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec |
3049 | |
3050 | -# If ld is used when linking, flag to hardcode \$libdir into a binary |
3051 | -# during linking. This must work even if \$libdir does not exist. |
3052 | -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld |
3053 | - |
3054 | # Whether we need a single "-rpath" flag with a separated argument. |
3055 | hardcode_libdir_separator=$lt_hardcode_libdir_separator |
3056 | |
3057 | @@ -17109,6 +17482,7 @@ |
3058 | |
3059 | Prefix: $prefix |
3060 | Local Install: $with_localinstall |
3061 | + gcov: $use_gcov |
3062 | " >&5 |
3063 | $as_echo "$as_me: |
3064 | |
3065 | @@ -17116,4 +17490,5 @@ |
3066 | |
3067 | Prefix: $prefix |
3068 | Local Install: $with_localinstall |
3069 | + gcov: $use_gcov |
3070 | " >&6;} |
3071 | |
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 | AC_INIT([indicator-power], |
3077 | - [0.10], |
3078 | + [1.90], |
3079 | [http://bugs.launchpad.net/indicator-power], |
3080 | [indicator-power], |
3081 | [http://launchpad.net/indicator-power]) |
3082 | @@ -48,6 +48,16 @@ |
3083 | GLIB_GSETTINGS |
3084 | |
3085 | ########################### |
3086 | +# gcov coverage reporting |
3087 | +########################### |
3088 | + |
3089 | +m4_include([m4/gcov.m4]) |
3090 | +AC_TDD_GCOV |
3091 | +AC_SUBST(COVERAGE_CFLAGS) |
3092 | +AC_SUBST(COVERAGE_CXXFLAGS) |
3093 | +AC_SUBST(COVERAGE_LDFLAGS) |
3094 | + |
3095 | +########################### |
3096 | # Check to see if we're local |
3097 | ########################### |
3098 | |
3099 | @@ -105,6 +115,7 @@ |
3100 | AC_CONFIG_FILES([ |
3101 | Makefile |
3102 | po/Makefile.in |
3103 | +data/Makefile |
3104 | ]) |
3105 | AC_OUTPUT |
3106 | |
3107 | @@ -118,4 +129,5 @@ |
3108 | |
3109 | Prefix: $prefix |
3110 | Local Install: $with_localinstall |
3111 | + gcov: $use_gcov |
3112 | ]) |
3113 | |
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 | + |
3119 | +gsettings_in_file = com.canonical.indicator.power.gschema.xml.in |
3120 | +gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) |
3121 | + |
3122 | +@INTLTOOL_XML_NOMERGE_RULE@ |
3123 | + |
3124 | +@GSETTINGS_RULES@ |
3125 | + |
3126 | +dist_noinst_DATA = \ |
3127 | + com.canonical.indicator.power.gschema.xml \ |
3128 | + $(gsettings_in_file) |
3129 | + |
3130 | +CLEANFILES = \ |
3131 | + $(gsettings_SCHEMAS) |
3132 | + |
3133 | +MAINTAINERCLEANFILES = \ |
3134 | + $(gsettings_SCHEMAS:.xml=.valid) |
3135 | |
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 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3141 | +# @configure_input@ |
3142 | + |
3143 | +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3144 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3145 | +# Foundation, Inc. |
3146 | +# This Makefile.in is free software; the Free Software Foundation |
3147 | +# gives unlimited permission to copy and/or distribute it, |
3148 | +# with or without modifications, as long as this notice is preserved. |
3149 | + |
3150 | +# This program is distributed in the hope that it will be useful, |
3151 | +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
3152 | +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
3153 | +# PARTICULAR PURPOSE. |
3154 | + |
3155 | +@SET_MAKE@ |
3156 | + |
3157 | +VPATH = @srcdir@ |
3158 | +pkgdatadir = $(datadir)/@PACKAGE@ |
3159 | +pkgincludedir = $(includedir)/@PACKAGE@ |
3160 | +pkglibdir = $(libdir)/@PACKAGE@ |
3161 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ |
3162 | +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
3163 | +install_sh_DATA = $(install_sh) -c -m 644 |
3164 | +install_sh_PROGRAM = $(install_sh) -c |
3165 | +install_sh_SCRIPT = $(install_sh) -c |
3166 | +INSTALL_HEADER = $(INSTALL_DATA) |
3167 | +transform = $(program_transform_name) |
3168 | +NORMAL_INSTALL = : |
3169 | +PRE_INSTALL = : |
3170 | +POST_INSTALL = : |
3171 | +NORMAL_UNINSTALL = : |
3172 | +PRE_UNINSTALL = : |
3173 | +POST_UNINSTALL = : |
3174 | +build_triplet = @build@ |
3175 | +host_triplet = @host@ |
3176 | +subdir = data |
3177 | +DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \ |
3178 | + $(srcdir)/Makefile.in |
3179 | +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
3180 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
3181 | + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
3182 | + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
3183 | + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
3184 | + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
3185 | + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
3186 | + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ |
3187 | + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ |
3188 | + $(top_srcdir)/m4/gcov.m4 $(top_srcdir)/configure.ac |
3189 | +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
3190 | + $(ACLOCAL_M4) |
3191 | +mkinstalldirs = $(install_sh) -d |
3192 | +CONFIG_HEADER = $(top_builddir)/config.h |
3193 | +CONFIG_CLEAN_FILES = |
3194 | +CONFIG_CLEAN_VPATH_FILES = |
3195 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
3196 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
3197 | +am__v_GEN_0 = @echo " GEN " $@; |
3198 | +AM_V_at = $(am__v_at_@AM_V@) |
3199 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
3200 | +am__v_at_0 = @ |
3201 | +SOURCES = |
3202 | +DIST_SOURCES = |
3203 | +DATA = $(dist_noinst_DATA) |
3204 | +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3205 | +ACLOCAL = @ACLOCAL@ |
3206 | +ALL_LINGUAS = @ALL_LINGUAS@ |
3207 | +AMTAR = @AMTAR@ |
3208 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
3209 | +AR = @AR@ |
3210 | +AUTOCONF = @AUTOCONF@ |
3211 | +AUTOHEADER = @AUTOHEADER@ |
3212 | +AUTOMAKE = @AUTOMAKE@ |
3213 | +AWK = @AWK@ |
3214 | +CC = @CC@ |
3215 | +CCDEPMODE = @CCDEPMODE@ |
3216 | +CFLAGS = @CFLAGS@ |
3217 | +COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
3218 | +COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ |
3219 | +COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
3220 | +CPP = @CPP@ |
3221 | +CPPFLAGS = @CPPFLAGS@ |
3222 | +CYGPATH_W = @CYGPATH_W@ |
3223 | +DATADIRNAME = @DATADIRNAME@ |
3224 | +DEFS = @DEFS@ |
3225 | +DEPDIR = @DEPDIR@ |
3226 | +DLLTOOL = @DLLTOOL@ |
3227 | +DSYMUTIL = @DSYMUTIL@ |
3228 | +DUMPBIN = @DUMPBIN@ |
3229 | +ECHO_C = @ECHO_C@ |
3230 | +ECHO_N = @ECHO_N@ |
3231 | +ECHO_T = @ECHO_T@ |
3232 | +EGREP = @EGREP@ |
3233 | +EXEEXT = @EXEEXT@ |
3234 | +FGREP = @FGREP@ |
3235 | +GCOVR = @GCOVR@ |
3236 | +GENHTML = @GENHTML@ |
3237 | +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
3238 | +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
3239 | +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
3240 | +GMSGFMT = @GMSGFMT@ |
3241 | +GMSGFMT_015 = @GMSGFMT_015@ |
3242 | +GREP = @GREP@ |
3243 | +GSD_CFLAGS = @GSD_CFLAGS@ |
3244 | +GSD_LIBS = @GSD_LIBS@ |
3245 | +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
3246 | +INDICATORDIR = @INDICATORDIR@ |
3247 | +INDICATORICONSDIR = @INDICATORICONSDIR@ |
3248 | +INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ |
3249 | +INDICATOR_LIBS = @INDICATOR_LIBS@ |
3250 | +INSTALL = @INSTALL@ |
3251 | +INSTALL_DATA = @INSTALL_DATA@ |
3252 | +INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
3253 | +INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
3254 | +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
3255 | +INTLLIBS = @INTLLIBS@ |
3256 | +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
3257 | +INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
3258 | +INTLTOOL_PERL = @INTLTOOL_PERL@ |
3259 | +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
3260 | +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
3261 | +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
3262 | +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
3263 | +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
3264 | +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
3265 | +LCOV = @LCOV@ |
3266 | +LD = @LD@ |
3267 | +LDFLAGS = @LDFLAGS@ |
3268 | +LIBICONV = @LIBICONV@ |
3269 | +LIBINTL = @LIBINTL@ |
3270 | +LIBOBJS = @LIBOBJS@ |
3271 | +LIBS = @LIBS@ |
3272 | +LIBTOOL = @LIBTOOL@ |
3273 | +LIPO = @LIPO@ |
3274 | +LN_S = @LN_S@ |
3275 | +LTLIBICONV = @LTLIBICONV@ |
3276 | +LTLIBINTL = @LTLIBINTL@ |
3277 | +LTLIBOBJS = @LTLIBOBJS@ |
3278 | +MAINT = @MAINT@ |
3279 | +MAKEINFO = @MAKEINFO@ |
3280 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
3281 | +MKDIR_P = @MKDIR_P@ |
3282 | +MSGFMT = @MSGFMT@ |
3283 | +MSGFMT_015 = @MSGFMT_015@ |
3284 | +MSGMERGE = @MSGMERGE@ |
3285 | +NM = @NM@ |
3286 | +NMEDIT = @NMEDIT@ |
3287 | +OBJDUMP = @OBJDUMP@ |
3288 | +OBJEXT = @OBJEXT@ |
3289 | +OTOOL = @OTOOL@ |
3290 | +OTOOL64 = @OTOOL64@ |
3291 | +PACKAGE = @PACKAGE@ |
3292 | +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
3293 | +PACKAGE_NAME = @PACKAGE_NAME@ |
3294 | +PACKAGE_STRING = @PACKAGE_STRING@ |
3295 | +PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
3296 | +PACKAGE_URL = @PACKAGE_URL@ |
3297 | +PACKAGE_VERSION = @PACKAGE_VERSION@ |
3298 | +PATH_SEPARATOR = @PATH_SEPARATOR@ |
3299 | +PKG_CONFIG = @PKG_CONFIG@ |
3300 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
3301 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
3302 | +POSUB = @POSUB@ |
3303 | +RANLIB = @RANLIB@ |
3304 | +SED = @SED@ |
3305 | +SET_MAKE = @SET_MAKE@ |
3306 | +SHELL = @SHELL@ |
3307 | +SHTOOL = @SHTOOL@ |
3308 | +STRIP = @STRIP@ |
3309 | +UPOWER_CFLAGS = @UPOWER_CFLAGS@ |
3310 | +UPOWER_LIBS = @UPOWER_LIBS@ |
3311 | +USE_NLS = @USE_NLS@ |
3312 | +VERSION = @VERSION@ |
3313 | +XGETTEXT = @XGETTEXT@ |
3314 | +XGETTEXT_015 = @XGETTEXT_015@ |
3315 | +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
3316 | +abs_builddir = @abs_builddir@ |
3317 | +abs_srcdir = @abs_srcdir@ |
3318 | +abs_top_builddir = @abs_top_builddir@ |
3319 | +abs_top_srcdir = @abs_top_srcdir@ |
3320 | +ac_ct_AR = @ac_ct_AR@ |
3321 | +ac_ct_CC = @ac_ct_CC@ |
3322 | +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
3323 | +am__include = @am__include@ |
3324 | +am__leading_dot = @am__leading_dot@ |
3325 | +am__quote = @am__quote@ |
3326 | +am__tar = @am__tar@ |
3327 | +am__untar = @am__untar@ |
3328 | +bindir = @bindir@ |
3329 | +build = @build@ |
3330 | +build_alias = @build_alias@ |
3331 | +build_cpu = @build_cpu@ |
3332 | +build_os = @build_os@ |
3333 | +build_vendor = @build_vendor@ |
3334 | +builddir = @builddir@ |
3335 | +datadir = @datadir@ |
3336 | +datarootdir = @datarootdir@ |
3337 | +docdir = @docdir@ |
3338 | +dvidir = @dvidir@ |
3339 | +exec_prefix = @exec_prefix@ |
3340 | +gsettingsschemadir = @gsettingsschemadir@ |
3341 | +host = @host@ |
3342 | +host_alias = @host_alias@ |
3343 | +host_cpu = @host_cpu@ |
3344 | +host_os = @host_os@ |
3345 | +host_vendor = @host_vendor@ |
3346 | +htmldir = @htmldir@ |
3347 | +includedir = @includedir@ |
3348 | +infodir = @infodir@ |
3349 | +install_sh = @install_sh@ |
3350 | +intltool__v_merge_options_ = @intltool__v_merge_options_@ |
3351 | +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
3352 | +libdir = @libdir@ |
3353 | +libexecdir = @libexecdir@ |
3354 | +localedir = @localedir@ |
3355 | +localstatedir = @localstatedir@ |
3356 | +mandir = @mandir@ |
3357 | +mkdir_p = @mkdir_p@ |
3358 | +oldincludedir = @oldincludedir@ |
3359 | +pdfdir = @pdfdir@ |
3360 | +prefix = @prefix@ |
3361 | +program_transform_name = @program_transform_name@ |
3362 | +psdir = @psdir@ |
3363 | +sbindir = @sbindir@ |
3364 | +sharedstatedir = @sharedstatedir@ |
3365 | +srcdir = @srcdir@ |
3366 | +sysconfdir = @sysconfdir@ |
3367 | +target_alias = @target_alias@ |
3368 | +top_build_prefix = @top_build_prefix@ |
3369 | +top_builddir = @top_builddir@ |
3370 | +top_srcdir = @top_srcdir@ |
3371 | +gsettings_in_file = com.canonical.indicator.power.gschema.xml.in |
3372 | +gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) |
3373 | +dist_noinst_DATA = \ |
3374 | + com.canonical.indicator.power.gschema.xml \ |
3375 | + $(gsettings_in_file) |
3376 | + |
3377 | +CLEANFILES = \ |
3378 | + $(gsettings_SCHEMAS) |
3379 | + |
3380 | +MAINTAINERCLEANFILES = \ |
3381 | + $(gsettings_SCHEMAS:.xml=.valid) |
3382 | + |
3383 | +all: all-am |
3384 | + |
3385 | +.SUFFIXES: |
3386 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
3387 | + @for dep in $?; do \ |
3388 | + case '$(am__configure_deps)' in \ |
3389 | + *$$dep*) \ |
3390 | + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ |
3391 | + && { if test -f $@; then exit 0; else break; fi; }; \ |
3392 | + exit 1;; \ |
3393 | + esac; \ |
3394 | + done; \ |
3395 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \ |
3396 | + $(am__cd) $(top_srcdir) && \ |
3397 | + $(AUTOMAKE) --foreign data/Makefile |
3398 | +.PRECIOUS: Makefile |
3399 | +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
3400 | + @case '$?' in \ |
3401 | + *config.status*) \ |
3402 | + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ |
3403 | + *) \ |
3404 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ |
3405 | + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ |
3406 | + esac; |
3407 | + |
3408 | +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
3409 | + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
3410 | + |
3411 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
3412 | + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
3413 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
3414 | + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
3415 | +$(am__aclocal_m4_deps): |
3416 | + |
3417 | +mostlyclean-libtool: |
3418 | + -rm -f *.lo |
3419 | + |
3420 | +clean-libtool: |
3421 | + -rm -rf .libs _libs |
3422 | +tags: TAGS |
3423 | +TAGS: |
3424 | + |
3425 | +ctags: CTAGS |
3426 | +CTAGS: |
3427 | + |
3428 | + |
3429 | +distdir: $(DISTFILES) |
3430 | + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
3431 | + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
3432 | + list='$(DISTFILES)'; \ |
3433 | + dist_files=`for file in $$list; do echo $$file; done | \ |
3434 | + sed -e "s|^$$srcdirstrip/||;t" \ |
3435 | + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
3436 | + case $$dist_files in \ |
3437 | + */*) $(MKDIR_P) `echo "$$dist_files" | \ |
3438 | + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
3439 | + sort -u` ;; \ |
3440 | + esac; \ |
3441 | + for file in $$dist_files; do \ |
3442 | + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
3443 | + if test -d $$d/$$file; then \ |
3444 | + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
3445 | + if test -d "$(distdir)/$$file"; then \ |
3446 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
3447 | + fi; \ |
3448 | + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
3449 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
3450 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
3451 | + fi; \ |
3452 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
3453 | + else \ |
3454 | + test -f "$(distdir)/$$file" \ |
3455 | + || cp -p $$d/$$file "$(distdir)/$$file" \ |
3456 | + || exit 1; \ |
3457 | + fi; \ |
3458 | + done |
3459 | +check-am: all-am |
3460 | +check: check-am |
3461 | +all-am: Makefile $(DATA) |
3462 | +installdirs: |
3463 | +install: install-am |
3464 | +install-exec: install-exec-am |
3465 | +install-data: install-data-am |
3466 | +uninstall: uninstall-am |
3467 | + |
3468 | +install-am: all-am |
3469 | + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
3470 | + |
3471 | +installcheck: installcheck-am |
3472 | +install-strip: |
3473 | + if test -z '$(STRIP)'; then \ |
3474 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3475 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3476 | + install; \ |
3477 | + else \ |
3478 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3479 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3480 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3481 | + fi |
3482 | +mostlyclean-generic: |
3483 | + |
3484 | +clean-generic: |
3485 | + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) |
3486 | + |
3487 | +distclean-generic: |
3488 | + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
3489 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
3490 | + |
3491 | +maintainer-clean-generic: |
3492 | + @echo "This command is intended for maintainers to use" |
3493 | + @echo "it deletes files that may require special tools to rebuild." |
3494 | + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) |
3495 | +clean: clean-am |
3496 | + |
3497 | +clean-am: clean-generic clean-libtool mostlyclean-am |
3498 | + |
3499 | +distclean: distclean-am |
3500 | + -rm -f Makefile |
3501 | +distclean-am: clean-am distclean-generic |
3502 | + |
3503 | +dvi: dvi-am |
3504 | + |
3505 | +dvi-am: |
3506 | + |
3507 | +html: html-am |
3508 | + |
3509 | +html-am: |
3510 | + |
3511 | +info: info-am |
3512 | + |
3513 | +info-am: |
3514 | + |
3515 | +install-data-am: |
3516 | + |
3517 | +install-dvi: install-dvi-am |
3518 | + |
3519 | +install-dvi-am: |
3520 | + |
3521 | +install-exec-am: |
3522 | + |
3523 | +install-html: install-html-am |
3524 | + |
3525 | +install-html-am: |
3526 | + |
3527 | +install-info: install-info-am |
3528 | + |
3529 | +install-info-am: |
3530 | + |
3531 | +install-man: |
3532 | + |
3533 | +install-pdf: install-pdf-am |
3534 | + |
3535 | +install-pdf-am: |
3536 | + |
3537 | +install-ps: install-ps-am |
3538 | + |
3539 | +install-ps-am: |
3540 | + |
3541 | +installcheck-am: |
3542 | + |
3543 | +maintainer-clean: maintainer-clean-am |
3544 | + -rm -f Makefile |
3545 | +maintainer-clean-am: distclean-am maintainer-clean-generic |
3546 | + |
3547 | +mostlyclean: mostlyclean-am |
3548 | + |
3549 | +mostlyclean-am: mostlyclean-generic mostlyclean-libtool |
3550 | + |
3551 | +pdf: pdf-am |
3552 | + |
3553 | +pdf-am: |
3554 | + |
3555 | +ps: ps-am |
3556 | + |
3557 | +ps-am: |
3558 | + |
3559 | +uninstall-am: |
3560 | + |
3561 | +.MAKE: install-am install-strip |
3562 | + |
3563 | +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
3564 | + distclean distclean-generic distclean-libtool distdir dvi \ |
3565 | + dvi-am html html-am info info-am install install-am \ |
3566 | + install-data install-data-am install-dvi install-dvi-am \ |
3567 | + install-exec install-exec-am install-html install-html-am \ |
3568 | + install-info install-info-am install-man install-pdf \ |
3569 | + install-pdf-am install-ps install-ps-am install-strip \ |
3570 | + installcheck installcheck-am installdirs maintainer-clean \ |
3571 | + maintainer-clean-generic mostlyclean mostlyclean-generic \ |
3572 | + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am |
3573 | + |
3574 | + |
3575 | +@INTLTOOL_XML_NOMERGE_RULE@ |
3576 | + |
3577 | +@GSETTINGS_RULES@ |
3578 | + |
3579 | +# Tell versions [3.59,3.63) of GNU make to not export all variables. |
3580 | +# Otherwise a system limit (for SysV at least) may be exceeded. |
3581 | +.NOEXPORT: |
3582 | |
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 | <?xml version="1.0" encoding="UTF-8"?> |
3588 | <schemalist> |
3589 | + <enum id="icon-policy-enum"> |
3590 | + <value value="0" nick="present"/> |
3591 | + <value value="1" nick="charge"/> |
3592 | + <value value="2" nick="never"/> |
3593 | + </enum> |
3594 | <schema path="/com/canonical/indicator/power/" id="com.canonical.indicator.power" gettext-domain="@GETTEXT_PACKAGE@"> |
3595 | <key type="b" name="show-time"> |
3596 | <default>false</default> |
3597 | <summary>Show time in Menu Bar</summary> |
3598 | - <description>Whether show the time in the menu bar.</description> |
3599 | + <description>Whether or not to show the time in the menu bar.</description> |
3600 | + </key> |
3601 | + <key name="icon-policy" enum="icon-policy-enum"> |
3602 | + <default>"present"</default> |
3603 | + <summary>When to show the battery status in the menu bar.</summary> |
3604 | + <description>Options for when to show battery status. Valid options are "present", "charge", and "never".</description> |
3605 | </key> |
3606 | </schema> |
3607 | </schemalist> |
3608 | \ No newline at end of file |
3609 | |
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 | <schemalist> |
3615 | + <enum id="icon-policy-enum"> |
3616 | + <value nick="present" value="0" /> |
3617 | + <value nick="charge" value="1" /> |
3618 | + <value nick="never" value="2" /> |
3619 | + </enum> |
3620 | <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.indicator.power" path="/com/canonical/indicator/power/"> |
3621 | <key name="show-time" type="b"> |
3622 | <default>false</default> |
3623 | <_summary>Show time in Menu Bar</_summary> |
3624 | - <_description>Whether show the time in the menu bar.</_description> |
3625 | + <_description>Whether or not to show the time in the menu bar.</_description> |
3626 | + </key> |
3627 | + <key enum="icon-policy-enum" name="icon-policy"> |
3628 | + <default>"present"</default> |
3629 | + <_summary>When to show the battery status in the menu bar.</_summary> |
3630 | + <_description>Options for when to show battery status. Valid options are "present", "charge", and "never".</_description> |
3631 | </key> |
3632 | </schema> |
3633 | </schemalist> |
3634 | |
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 | +indicator-power (1.90-0ubuntu1~ppa1) precise; urgency=low |
3640 | + |
3641 | + * New upstream release. |
3642 | + * Support for hiding of icon and settings for it as well |
3643 | + * Adding a name hint |
3644 | + |
3645 | + -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 16:26:48 -0600 |
3646 | + |
3647 | indicator-power (0.10-0ubuntu2) precise; urgency=low |
3648 | |
3649 | * no change rebuild for libindicator7 |
3650 | |
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 | +# Checks for existence of coverage tools: |
3658 | +# * gcov |
3659 | +# * lcov |
3660 | +# * genhtml |
3661 | +# * gcovr |
3662 | +# |
3663 | +# Sets ac_cv_check_gcov to yes if tooling is present |
3664 | +# and reports the executables to the variables LCOV, GCOVR and GENHTML. |
3665 | +AC_DEFUN([AC_TDD_GCOV], |
3666 | +[AC_CACHE_CHECK([whether code coverage tools are available], ac_cv_check_gcov, |
3667 | +[ |
3668 | +AC_ARG_ENABLE(gcov, |
3669 | + AS_HELP_STRING([--enable-gcov], |
3670 | + [enable coverage testing with gcov]), |
3671 | + [use_gcov=$enableval], [use_gcov=no]) |
3672 | + |
3673 | + if test "x$use_gcov" = "xyes"; then |
3674 | + # we need gcc: |
3675 | + if test "$GCC" != "yes"; then |
3676 | + AC_MSG_ERROR([GCC is required for --enable-gcov]) |
3677 | + fi |
3678 | + |
3679 | + # Check if ccache is being used |
3680 | + AC_CHECK_PROG(SHTOOL, shtool, shtool) |
3681 | + case `$SHTOOL path $CC` in |
3682 | + *ccache*[)] gcc_ccache=yes;; |
3683 | + *[)] gcc_ccache=no;; |
3684 | + esac |
3685 | + |
3686 | + if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then |
3687 | + 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 | + fi |
3689 | + |
3690 | + lcov_version_list="1.6 1.7 1.8 1.9" |
3691 | + AC_CHECK_PROG(LCOV, lcov, lcov) |
3692 | + AC_CHECK_PROG(GENHTML, genhtml, genhtml) |
3693 | + AC_CHECK_PROG(GCOVR, gcovr, gcovr) |
3694 | + |
3695 | + if test "$LCOV"; then |
3696 | + AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ |
3697 | + glib_cv_lcov_version=invalid |
3698 | + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` |
3699 | + for lcov_check_version in $lcov_version_list; do |
3700 | + if test "$lcov_version" = "$lcov_check_version"; then |
3701 | + glib_cv_lcov_version="$lcov_check_version (ok)" |
3702 | + fi |
3703 | + done |
3704 | + ]) |
3705 | + else |
3706 | + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" |
3707 | + AC_MSG_ERROR([$lcov_msg]) |
3708 | + fi |
3709 | + |
3710 | + case $glib_cv_lcov_version in |
3711 | + ""|invalid[)] |
3712 | + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." |
3713 | + AC_MSG_ERROR([$lcov_msg]) |
3714 | + LCOV="exit 0;" |
3715 | + ;; |
3716 | + esac |
3717 | + |
3718 | + if test -z "$GENHTML"; then |
3719 | + AC_MSG_ERROR([Could not find genhtml from the lcov package]) |
3720 | + fi |
3721 | + |
3722 | + if test -z "$GCOVR"; then |
3723 | + AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr]) |
3724 | + fi |
3725 | + |
3726 | + |
3727 | + # Remove all optimization flags from CFLAGS |
3728 | + changequote({,}) |
3729 | + CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` |
3730 | + changequote([,]) |
3731 | + |
3732 | + # Add the special gcc flags |
3733 | + COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
3734 | + COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
3735 | + COVERAGE_LDFLAGS="-lgcov" |
3736 | + |
3737 | +fi |
3738 | +])]) # AC_TDD_GCOV |
3739 | + |
3740 | |
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 | ## the same distribution terms that you use for the rest of that program. |
3749 | |
3750 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) |
3751 | -# serial 40 IT_PROG_INTLTOOL |
3752 | +# serial 41 IT_PROG_INTLTOOL |
3753 | AC_DEFUN([IT_PROG_INTLTOOL], [ |
3754 | AC_PREREQ([2.50])dnl |
3755 | AC_REQUIRE([AM_NLS])dnl |
3756 | @@ -55,25 +55,44 @@ |
3757 | AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) |
3758 | fi |
3759 | |
3760 | - 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 $< [$]@' |
3761 | -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 $< [$]@' |
3762 | - 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 $< [$]@' |
3763 | - 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 $< [$]@' |
3764 | - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' |
3765 | - 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 $< [$]@' |
3766 | - 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 $< [$]@' |
3767 | - 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 $< [$]@' |
3768 | -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 $< [$]@' |
3769 | - 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 $< [$]@' |
3770 | - 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 $< [$]@' |
3771 | - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' |
3772 | - 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 $< [$]@' |
3773 | - 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 $< [$]@' |
3774 | - 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 $< [$]@' |
3775 | - 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 $< [$]@' |
3776 | - 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 $< [$]@' |
3777 | - 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 $< [$]@' |
3778 | - 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 $< [$]@' |
3779 | +if test -z "$AM_DEFAULT_VERBOSITY"; then |
3780 | + AM_DEFAULT_VERBOSITY=1 |
3781 | +fi |
3782 | +AC_SUBST([AM_DEFAULT_VERBOSITY]) |
3783 | + |
3784 | +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' |
3785 | +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' |
3786 | +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' |
3787 | +AC_SUBST(INTLTOOL_V_MERGE) |
3788 | +AC_SUBST(INTLTOOL__v_MERGE_) |
3789 | +AC_SUBST(INTLTOOL__v_MERGE_0) |
3790 | + |
3791 | +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' |
3792 | +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' |
3793 | +intltool__v_merge_options_0='-q' |
3794 | +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) |
3795 | +AC_SUBST(intltool__v_merge_options_) |
3796 | +AC_SUBST(intltool__v_merge_options_0) |
3797 | + |
3798 | + 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 | +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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | +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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | |
3818 | _IT_SUBST(INTLTOOL_DESKTOP_RULE) |
3819 | _IT_SUBST(INTLTOOL_DIRECTORY_RULE) |
3820 | @@ -119,7 +138,7 @@ |
3821 | if test $? -ne 0; then |
3822 | AC_MSG_ERROR([perl 5.8.1 is required for intltool]) |
3823 | else |
3824 | - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" |
3825 | + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` |
3826 | AC_MSG_RESULT([$IT_PERL_VERSION]) |
3827 | fi |
3828 | if test "x$2" != "xno-xml"; then |
3829 | |
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 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
3838 | # |
3839 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3840 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
3841 | -# Inc. |
3842 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3843 | +# Foundation, Inc. |
3844 | # Written by Gordon Matzigkeit, 1996 |
3845 | # |
3846 | # This file is free software; the Free Software Foundation gives |
3847 | @@ -11,8 +11,8 @@ |
3848 | |
3849 | m4_define([_LT_COPYING], [dnl |
3850 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3851 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
3852 | -# Inc. |
3853 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3854 | +# Foundation, Inc. |
3855 | # Written by Gordon Matzigkeit, 1996 |
3856 | # |
3857 | # This file is part of GNU Libtool. |
3858 | @@ -146,6 +146,8 @@ |
3859 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
3860 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
3861 | |
3862 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
3863 | +dnl |
3864 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
3865 | _LT_DECL([], [host], [0])dnl |
3866 | _LT_DECL([], [host_os], [0])dnl |
3867 | @@ -637,7 +639,7 @@ |
3868 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
3869 | configured by $[0], generated by m4_PACKAGE_STRING. |
3870 | |
3871 | -Copyright (C) 2010 Free Software Foundation, Inc. |
3872 | +Copyright (C) 2011 Free Software Foundation, Inc. |
3873 | This config.lt script is free software; the Free Software Foundation |
3874 | gives unlimited permision to copy, distribute and modify it." |
3875 | |
3876 | @@ -801,6 +803,7 @@ |
3877 | m4_case([$1], |
3878 | [C], [_LT_LANG(C)], |
3879 | [C++], [_LT_LANG(CXX)], |
3880 | + [Go], [_LT_LANG(GO)], |
3881 | [Java], [_LT_LANG(GCJ)], |
3882 | [Fortran 77], [_LT_LANG(F77)], |
3883 | [Fortran], [_LT_LANG(FC)], |
3884 | @@ -822,6 +825,31 @@ |
3885 | ])# _LT_LANG |
3886 | |
3887 | |
3888 | +m4_ifndef([AC_PROG_GO], [ |
3889 | +############################################################ |
3890 | +# NOTE: This macro has been submitted for inclusion into # |
3891 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
3892 | +# a released version of Autoconf we should remove this # |
3893 | +# macro and use it instead. # |
3894 | +############################################################ |
3895 | +m4_defun([AC_PROG_GO], |
3896 | +[AC_LANG_PUSH(Go)dnl |
3897 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
3898 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
3899 | +_AC_ARG_VAR_LDFLAGS()dnl |
3900 | +AC_CHECK_TOOL(GOC, gccgo) |
3901 | +if test -z "$GOC"; then |
3902 | + if test -n "$ac_tool_prefix"; then |
3903 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
3904 | + fi |
3905 | +fi |
3906 | +if test -z "$GOC"; then |
3907 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
3908 | +fi |
3909 | +])#m4_defun |
3910 | +])#m4_ifndef |
3911 | + |
3912 | + |
3913 | # _LT_LANG_DEFAULT_CONFIG |
3914 | # ----------------------- |
3915 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
3916 | @@ -852,6 +880,10 @@ |
3917 | m4_ifdef([LT_PROG_GCJ], |
3918 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
3919 | |
3920 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
3921 | + [LT_LANG(GO)], |
3922 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
3923 | + |
3924 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
3925 | [LT_LANG(RC)], |
3926 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
3927 | @@ -954,7 +986,13 @@ |
3928 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
3929 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
3930 | _lt_result=$? |
3931 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
3932 | + # If there is a non-empty error log, and "single_module" |
3933 | + # appears in it, assume the flag caused a linker warning |
3934 | + if test -s conftest.err && $GREP single_module conftest.err; then |
3935 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
3936 | + # Otherwise, if the output was created with a 0 exit code from |
3937 | + # the compiler, it worked. |
3938 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
3939 | lt_cv_apple_cc_single_mod=yes |
3940 | else |
3941 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3942 | @@ -962,6 +1000,7 @@ |
3943 | rm -rf libconftest.dylib* |
3944 | rm -f conftest.* |
3945 | fi]) |
3946 | + |
3947 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
3948 | [lt_cv_ld_exported_symbols_list], |
3949 | [lt_cv_ld_exported_symbols_list=no |
3950 | @@ -973,6 +1012,7 @@ |
3951 | [lt_cv_ld_exported_symbols_list=no]) |
3952 | LDFLAGS="$save_LDFLAGS" |
3953 | ]) |
3954 | + |
3955 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
3956 | [lt_cv_ld_force_load=no |
3957 | cat > conftest.c << _LT_EOF |
3958 | @@ -990,7 +1030,9 @@ |
3959 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
3960 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
3961 | _lt_result=$? |
3962 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
3963 | + if test -s conftest.err && $GREP force_load conftest.err; then |
3964 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
3965 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
3966 | lt_cv_ld_force_load=yes |
3967 | else |
3968 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3969 | @@ -1035,8 +1077,8 @@ |
3970 | ]) |
3971 | |
3972 | |
3973 | -# _LT_DARWIN_LINKER_FEATURES |
3974 | -# -------------------------- |
3975 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
3976 | +# --------------------------------- |
3977 | # Checks for linker and compiler features on darwin |
3978 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
3979 | [ |
3980 | @@ -1047,6 +1089,8 @@ |
3981 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
3982 | if test "$lt_cv_ld_force_load" = "yes"; then |
3983 | _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 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
3985 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
3986 | else |
3987 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
3988 | fi |
3989 | @@ -1330,14 +1374,27 @@ |
3990 | CFLAGS="$SAVE_CFLAGS" |
3991 | fi |
3992 | ;; |
3993 | -sparc*-*solaris*) |
3994 | +*-*solaris*) |
3995 | # Find out which ABI we are using. |
3996 | echo 'int i;' > conftest.$ac_ext |
3997 | if AC_TRY_EVAL(ac_compile); then |
3998 | case `/usr/bin/file conftest.o` in |
3999 | *64-bit*) |
4000 | case $lt_cv_prog_gnu_ld in |
4001 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
4002 | + yes*) |
4003 | + case $host in |
4004 | + i?86-*-solaris*) |
4005 | + LD="${LD-ld} -m elf_x86_64" |
4006 | + ;; |
4007 | + sparc*-*-solaris*) |
4008 | + LD="${LD-ld} -m elf64_sparc" |
4009 | + ;; |
4010 | + esac |
4011 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
4012 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
4013 | + LD="${LD-ld}_sol2" |
4014 | + fi |
4015 | + ;; |
4016 | *) |
4017 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
4018 | LD="${LD-ld} -64" |
4019 | @@ -1414,13 +1471,13 @@ |
4020 | if test -n "$RANLIB"; then |
4021 | case $host_os in |
4022 | openbsd*) |
4023 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
4024 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
4025 | ;; |
4026 | *) |
4027 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
4028 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
4029 | ;; |
4030 | esac |
4031 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
4032 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
4033 | fi |
4034 | |
4035 | case $host_os in |
4036 | @@ -1600,6 +1657,11 @@ |
4037 | lt_cv_sys_max_cmd_len=196608 |
4038 | ;; |
4039 | |
4040 | + os2*) |
4041 | + # The test takes a long time on OS/2. |
4042 | + lt_cv_sys_max_cmd_len=8192 |
4043 | + ;; |
4044 | + |
4045 | osf*) |
4046 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
4047 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
4048 | @@ -1639,7 +1701,7 @@ |
4049 | # If test is not a shell built-in, we'll probably end up computing a |
4050 | # maximum length that is only half of the actual maximum length, but |
4051 | # we can't tell. |
4052 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
4053 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
4054 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
4055 | test $i != 17 # 1/2 MB should be enough |
4056 | do |
4057 | @@ -2185,7 +2247,7 @@ |
4058 | |
4059 | case $host_os in |
4060 | aix3*) |
4061 | - version_type=linux |
4062 | + version_type=linux # correct to gnu/linux during the next big refactor |
4063 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
4064 | shlibpath_var=LIBPATH |
4065 | |
4066 | @@ -2194,7 +2256,7 @@ |
4067 | ;; |
4068 | |
4069 | aix[[4-9]]*) |
4070 | - version_type=linux |
4071 | + version_type=linux # correct to gnu/linux during the next big refactor |
4072 | need_lib_prefix=no |
4073 | need_version=no |
4074 | hardcode_into_libs=yes |
4075 | @@ -2259,7 +2321,7 @@ |
4076 | ;; |
4077 | |
4078 | bsdi[[45]]*) |
4079 | - version_type=linux |
4080 | + version_type=linux # correct to gnu/linux during the next big refactor |
4081 | need_version=no |
4082 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4083 | soname_spec='${libname}${release}${shared_ext}$major' |
4084 | @@ -2398,7 +2460,7 @@ |
4085 | ;; |
4086 | |
4087 | dgux*) |
4088 | - version_type=linux |
4089 | + version_type=linux # correct to gnu/linux during the next big refactor |
4090 | need_lib_prefix=no |
4091 | need_version=no |
4092 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
4093 | @@ -2406,10 +2468,6 @@ |
4094 | shlibpath_var=LD_LIBRARY_PATH |
4095 | ;; |
4096 | |
4097 | -freebsd1*) |
4098 | - dynamic_linker=no |
4099 | - ;; |
4100 | - |
4101 | freebsd* | dragonfly*) |
4102 | # DragonFly does not have aout. When/if they implement a new |
4103 | # versioning mechanism, adjust this. |
4104 | @@ -2417,7 +2475,7 @@ |
4105 | objformat=`/usr/bin/objformat` |
4106 | else |
4107 | case $host_os in |
4108 | - freebsd[[123]]*) objformat=aout ;; |
4109 | + freebsd[[23]].*) objformat=aout ;; |
4110 | *) objformat=elf ;; |
4111 | esac |
4112 | fi |
4113 | @@ -2435,7 +2493,7 @@ |
4114 | esac |
4115 | shlibpath_var=LD_LIBRARY_PATH |
4116 | case $host_os in |
4117 | - freebsd2*) |
4118 | + freebsd2.*) |
4119 | shlibpath_overrides_runpath=yes |
4120 | ;; |
4121 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
4122 | @@ -2455,7 +2513,7 @@ |
4123 | ;; |
4124 | |
4125 | gnu*) |
4126 | - version_type=linux |
4127 | + version_type=linux # correct to gnu/linux during the next big refactor |
4128 | need_lib_prefix=no |
4129 | need_version=no |
4130 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
4131 | @@ -2466,7 +2524,7 @@ |
4132 | ;; |
4133 | |
4134 | haiku*) |
4135 | - version_type=linux |
4136 | + version_type=linux # correct to gnu/linux during the next big refactor |
4137 | need_lib_prefix=no |
4138 | need_version=no |
4139 | dynamic_linker="$host_os runtime_loader" |
4140 | @@ -2527,7 +2585,7 @@ |
4141 | ;; |
4142 | |
4143 | interix[[3-9]]*) |
4144 | - version_type=linux |
4145 | + version_type=linux # correct to gnu/linux during the next big refactor |
4146 | need_lib_prefix=no |
4147 | need_version=no |
4148 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
4149 | @@ -2543,7 +2601,7 @@ |
4150 | nonstopux*) version_type=nonstopux ;; |
4151 | *) |
4152 | if test "$lt_cv_prog_gnu_ld" = yes; then |
4153 | - version_type=linux |
4154 | + version_type=linux # correct to gnu/linux during the next big refactor |
4155 | else |
4156 | version_type=irix |
4157 | fi ;; |
4158 | @@ -2580,9 +2638,9 @@ |
4159 | dynamic_linker=no |
4160 | ;; |
4161 | |
4162 | -# This must be Linux ELF. |
4163 | +# This must be glibc/ELF. |
4164 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4165 | - version_type=linux |
4166 | + version_type=linux # correct to gnu/linux during the next big refactor |
4167 | need_lib_prefix=no |
4168 | need_version=no |
4169 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4170 | @@ -2657,7 +2715,7 @@ |
4171 | ;; |
4172 | |
4173 | newsos6) |
4174 | - version_type=linux |
4175 | + version_type=linux # correct to gnu/linux during the next big refactor |
4176 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4177 | shlibpath_var=LD_LIBRARY_PATH |
4178 | shlibpath_overrides_runpath=yes |
4179 | @@ -2726,7 +2784,7 @@ |
4180 | ;; |
4181 | |
4182 | solaris*) |
4183 | - version_type=linux |
4184 | + version_type=linux # correct to gnu/linux during the next big refactor |
4185 | need_lib_prefix=no |
4186 | need_version=no |
4187 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4188 | @@ -2751,7 +2809,7 @@ |
4189 | ;; |
4190 | |
4191 | sysv4 | sysv4.3*) |
4192 | - version_type=linux |
4193 | + version_type=linux # correct to gnu/linux during the next big refactor |
4194 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4195 | soname_spec='${libname}${release}${shared_ext}$major' |
4196 | shlibpath_var=LD_LIBRARY_PATH |
4197 | @@ -2775,7 +2833,7 @@ |
4198 | |
4199 | sysv4*MP*) |
4200 | if test -d /usr/nec ;then |
4201 | - version_type=linux |
4202 | + version_type=linux # correct to gnu/linux during the next big refactor |
4203 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
4204 | soname_spec='$libname${shared_ext}.$major' |
4205 | shlibpath_var=LD_LIBRARY_PATH |
4206 | @@ -2806,7 +2864,7 @@ |
4207 | |
4208 | tpf*) |
4209 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
4210 | - version_type=linux |
4211 | + version_type=linux # correct to gnu/linux during the next big refactor |
4212 | need_lib_prefix=no |
4213 | need_version=no |
4214 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4215 | @@ -2816,7 +2874,7 @@ |
4216 | ;; |
4217 | |
4218 | uts4*) |
4219 | - version_type=linux |
4220 | + version_type=linux # correct to gnu/linux during the next big refactor |
4221 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4222 | soname_spec='${libname}${release}${shared_ext}$major' |
4223 | shlibpath_var=LD_LIBRARY_PATH |
4224 | @@ -3238,7 +3296,7 @@ |
4225 | lt_cv_deplibs_check_method=pass_all |
4226 | ;; |
4227 | |
4228 | -# This must be Linux ELF. |
4229 | +# This must be glibc/ELF. |
4230 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4231 | lt_cv_deplibs_check_method=pass_all |
4232 | ;; |
4233 | @@ -3658,6 +3716,7 @@ |
4234 | # which start with @ or ?. |
4235 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
4236 | " {last_section=section; section=\$ 3};"\ |
4237 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
4238 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
4239 | " \$ 0!~/External *\|/{next};"\ |
4240 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
4241 | @@ -4242,7 +4301,9 @@ |
4242 | case $cc_basename in |
4243 | nvcc*) # Cuda Compiler Driver 2.2 |
4244 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
4245 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' |
4246 | + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
4247 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" |
4248 | + fi |
4249 | ;; |
4250 | esac |
4251 | else |
4252 | @@ -4334,18 +4395,33 @@ |
4253 | ;; |
4254 | *) |
4255 | case `$CC -V 2>&1 | sed 5q` in |
4256 | - *Sun\ F* | *Sun*Fortran*) |
4257 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
4258 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4259 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4260 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4261 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
4262 | ;; |
4263 | + *Sun\ F* | *Sun*Fortran*) |
4264 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4265 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4266 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
4267 | + ;; |
4268 | *Sun\ C*) |
4269 | # Sun C 5.9 |
4270 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4271 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4272 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4273 | ;; |
4274 | + *Intel*\ [[CF]]*Compiler*) |
4275 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4276 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
4277 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
4278 | + ;; |
4279 | + *Portland\ Group*) |
4280 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4281 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
4282 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4283 | + ;; |
4284 | esac |
4285 | ;; |
4286 | esac |
4287 | @@ -4505,7 +4581,9 @@ |
4288 | ;; |
4289 | cygwin* | mingw* | cegcc*) |
4290 | case $cc_basename in |
4291 | - cl*) ;; |
4292 | + cl*) |
4293 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
4294 | + ;; |
4295 | *) |
4296 | _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 | _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 | _LT_TAGVAR(hardcode_direct, $1)=no |
4300 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4301 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4302 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4303 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4304 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4305 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4306 | @@ -4787,8 +4864,7 @@ |
4307 | xlf* | bgf* | bgxlf* | mpixlf*) |
4308 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
4309 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
4310 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4311 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
4312 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4313 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
4314 | if test "x$supports_anon_versioning" = xyes; then |
4315 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
4316 | @@ -5084,6 +5160,7 @@ |
4317 | # The linker will not automatically build a static lib if we build a DLL. |
4318 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4319 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4320 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
4321 | _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 | # Don't use ranlib |
4323 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
4324 | @@ -5130,10 +5207,6 @@ |
4325 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
4326 | ;; |
4327 | |
4328 | - freebsd1*) |
4329 | - _LT_TAGVAR(ld_shlibs, $1)=no |
4330 | - ;; |
4331 | - |
4332 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
4333 | # support. Future versions do this automatically, but an explicit c++rt0.o |
4334 | # does not break anything, and helps significantly (at the cost of a little |
4335 | @@ -5146,7 +5219,7 @@ |
4336 | ;; |
4337 | |
4338 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
4339 | - freebsd2*) |
4340 | + freebsd2.*) |
4341 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
4342 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4343 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
4344 | @@ -5185,7 +5258,6 @@ |
4345 | fi |
4346 | if test "$with_gnu_ld" = no; then |
4347 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4348 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
4349 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
4350 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4351 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
4352 | @@ -5627,9 +5699,6 @@ |
4353 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
4354 | [Flag to hardcode $libdir into a binary during linking. |
4355 | This must work even if $libdir does not exist]) |
4356 | -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], |
4357 | - [[If ld is used when linking, flag to hardcode $libdir into a binary |
4358 | - during linking. This must work even if $libdir does not exist]]) |
4359 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
4360 | [Whether we need a single "-rpath" flag with a separated argument]) |
4361 | _LT_TAGDECL([], [hardcode_direct], [0], |
4362 | @@ -5787,7 +5856,6 @@ |
4363 | _LT_TAGVAR(hardcode_direct, $1)=no |
4364 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4365 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4366 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4367 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4368 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4369 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4370 | @@ -6157,7 +6225,7 @@ |
4371 | esac |
4372 | ;; |
4373 | |
4374 | - freebsd[[12]]*) |
4375 | + freebsd2.*) |
4376 | # C++ shared libraries reported to be fairly broken before |
4377 | # switch to ELF |
4378 | _LT_TAGVAR(ld_shlibs, $1)=no |
4379 | @@ -6918,12 +6986,18 @@ |
4380 | } |
4381 | }; |
4382 | _LT_EOF |
4383 | +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF |
4384 | +package foo |
4385 | +func foo() { |
4386 | +} |
4387 | +_LT_EOF |
4388 | ]) |
4389 | |
4390 | _lt_libdeps_save_CFLAGS=$CFLAGS |
4391 | case "$CC $CFLAGS " in #( |
4392 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
4393 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
4394 | +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; |
4395 | esac |
4396 | |
4397 | dnl Parse the compiler output and extract the necessary |
4398 | @@ -7120,7 +7194,6 @@ |
4399 | _LT_TAGVAR(hardcode_direct, $1)=no |
4400 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4401 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4402 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4403 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4404 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4405 | _LT_TAGVAR(hardcode_automatic, $1)=no |
4406 | @@ -7253,7 +7326,6 @@ |
4407 | _LT_TAGVAR(hardcode_direct, $1)=no |
4408 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4409 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4410 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4411 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4412 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4413 | _LT_TAGVAR(hardcode_automatic, $1)=no |
4414 | @@ -7440,6 +7512,77 @@ |
4415 | ])# _LT_LANG_GCJ_CONFIG |
4416 | |
4417 | |
4418 | +# _LT_LANG_GO_CONFIG([TAG]) |
4419 | +# -------------------------- |
4420 | +# Ensure that the configuration variables for the GNU Go compiler |
4421 | +# are suitably defined. These variables are subsequently used by _LT_CONFIG |
4422 | +# to write the compiler configuration to `libtool'. |
4423 | +m4_defun([_LT_LANG_GO_CONFIG], |
4424 | +[AC_REQUIRE([LT_PROG_GO])dnl |
4425 | +AC_LANG_SAVE |
4426 | + |
4427 | +# Source file extension for Go test sources. |
4428 | +ac_ext=go |
4429 | + |
4430 | +# Object file extension for compiled Go test sources. |
4431 | +objext=o |
4432 | +_LT_TAGVAR(objext, $1)=$objext |
4433 | + |
4434 | +# Code to be used in simple compile tests |
4435 | +lt_simple_compile_test_code="package main; func main() { }" |
4436 | + |
4437 | +# Code to be used in simple link tests |
4438 | +lt_simple_link_test_code='package main; func main() { }' |
4439 | + |
4440 | +# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
4441 | +_LT_TAG_COMPILER |
4442 | + |
4443 | +# save warnings/boilerplate of simple test code |
4444 | +_LT_COMPILER_BOILERPLATE |
4445 | +_LT_LINKER_BOILERPLATE |
4446 | + |
4447 | +# Allow CC to be a program name with arguments. |
4448 | +lt_save_CC=$CC |
4449 | +lt_save_CFLAGS=$CFLAGS |
4450 | +lt_save_GCC=$GCC |
4451 | +GCC=yes |
4452 | +CC=${GOC-"gccgo"} |
4453 | +CFLAGS=$GOFLAGS |
4454 | +compiler=$CC |
4455 | +_LT_TAGVAR(compiler, $1)=$CC |
4456 | +_LT_TAGVAR(LD, $1)="$LD" |
4457 | +_LT_CC_BASENAME([$compiler]) |
4458 | + |
4459 | +# Go did not exist at the time GCC didn't implicitly link libc in. |
4460 | +_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4461 | + |
4462 | +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4463 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
4464 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4465 | + |
4466 | +## CAVEAT EMPTOR: |
4467 | +## There is no encapsulation within the following macros, do not change |
4468 | +## the running order or otherwise move them around unless you know exactly |
4469 | +## what you are doing... |
4470 | +if test -n "$compiler"; then |
4471 | + _LT_COMPILER_NO_RTTI($1) |
4472 | + _LT_COMPILER_PIC($1) |
4473 | + _LT_COMPILER_C_O($1) |
4474 | + _LT_COMPILER_FILE_LOCKS($1) |
4475 | + _LT_LINKER_SHLIBS($1) |
4476 | + _LT_LINKER_HARDCODE_LIBPATH($1) |
4477 | + |
4478 | + _LT_CONFIG($1) |
4479 | +fi |
4480 | + |
4481 | +AC_LANG_RESTORE |
4482 | + |
4483 | +GCC=$lt_save_GCC |
4484 | +CC=$lt_save_CC |
4485 | +CFLAGS=$lt_save_CFLAGS |
4486 | +])# _LT_LANG_GO_CONFIG |
4487 | + |
4488 | + |
4489 | # _LT_LANG_RC_CONFIG([TAG]) |
4490 | # ------------------------- |
4491 | # Ensure that the configuration variables for the Windows resource compiler |
4492 | @@ -7509,6 +7652,13 @@ |
4493 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
4494 | |
4495 | |
4496 | +# LT_PROG_GO |
4497 | +# ---------- |
4498 | +AC_DEFUN([LT_PROG_GO], |
4499 | +[AC_CHECK_TOOL(GOC, gccgo,) |
4500 | +]) |
4501 | + |
4502 | + |
4503 | # LT_PROG_RC |
4504 | # ---------- |
4505 | AC_DEFUN([LT_PROG_RC], |
4506 | |
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 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
4512 | m4_define([_LT_WITH_PIC], |
4513 | [AC_ARG_WITH([pic], |
4514 | - [AS_HELP_STRING([--with-pic], |
4515 | + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], |
4516 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
4517 | - [pic_mode="$withval"], |
4518 | + [lt_p=${PACKAGE-default} |
4519 | + case $withval in |
4520 | + yes|no) pic_mode=$withval ;; |
4521 | + *) |
4522 | + pic_mode=default |
4523 | + # Look at the argument we got. We use all the common list separators. |
4524 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
4525 | + for lt_pkg in $withval; do |
4526 | + IFS="$lt_save_ifs" |
4527 | + if test "X$lt_pkg" = "X$lt_p"; then |
4528 | + pic_mode=yes |
4529 | + fi |
4530 | + done |
4531 | + IFS="$lt_save_ifs" |
4532 | + ;; |
4533 | + esac], |
4534 | [pic_mode=default]) |
4535 | |
4536 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) |
4537 | |
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 | |
4544 | # @configure_input@ |
4545 | |
4546 | -# serial 3293 ltversion.m4 |
4547 | +# serial 3337 ltversion.m4 |
4548 | # This file is part of GNU Libtool |
4549 | |
4550 | -m4_define([LT_PACKAGE_VERSION], [2.4]) |
4551 | -m4_define([LT_PACKAGE_REVISION], [1.3293]) |
4552 | +m4_define([LT_PACKAGE_VERSION], [2.4.2]) |
4553 | +m4_define([LT_PACKAGE_REVISION], [1.3337]) |
4554 | |
4555 | AC_DEFUN([LTVERSION_VERSION], |
4556 | -[macro_version='2.4' |
4557 | -macro_revision='1.3293' |
4558 | +[macro_version='2.4.2' |
4559 | +macro_revision='1.3337' |
4560 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
4561 | _LT_DECL(, macro_revision, 0) |
4562 | ]) |
4563 | |
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 | XGETTEXT = @XGETTEXT@ |
4573 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
4574 | INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
4575 | -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist |
4576 | -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot |
4577 | +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist |
4578 | +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot |
4579 | |
4580 | ALL_LINGUAS = @ALL_LINGUAS@ |
4581 | |
4582 | @@ -73,15 +73,20 @@ |
4583 | .SUFFIXES: |
4584 | .SUFFIXES: .po .pox .gmo .mo .msg .cat |
4585 | |
4586 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
4587 | +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) |
4588 | +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) |
4589 | +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; |
4590 | + |
4591 | .po.pox: |
4592 | $(MAKE) $(GETTEXT_PACKAGE).pot |
4593 | $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox |
4594 | |
4595 | .po.mo: |
4596 | - $(MSGFMT) -o $@ $< |
4597 | + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< |
4598 | |
4599 | .po.gmo: |
4600 | - file=`echo $* | sed 's,.*/,,'`.gmo \ |
4601 | + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ |
4602 | && rm -f $$file && $(GMSGFMT) -o $$file $< |
4603 | |
4604 | .po.cat: |
4605 | |
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 | #endif |
4611 | |
4612 | /* GStuff */ |
4613 | -#include <glib.h> |
4614 | #include <glib-object.h> |
4615 | #include <glib/gi18n-lib.h> |
4616 | #include <gio/gio.h> |
4617 | @@ -36,6 +35,8 @@ |
4618 | #include <libindicator/indicator.h> |
4619 | #include <libindicator/indicator-object.h> |
4620 | |
4621 | +#define ICON_POLICY_KEY "icon-policy" |
4622 | + |
4623 | #define DEFAULT_ICON "gpm-battery-missing" |
4624 | |
4625 | #define DBUS_SERVICE "org.gnome.SettingsDaemon" |
4626 | @@ -43,6 +44,12 @@ |
4627 | #define POWER_DBUS_PATH DBUS_PATH "/Power" |
4628 | #define POWER_DBUS_INTERFACE "org.gnome.SettingsDaemon.Power" |
4629 | |
4630 | +enum { |
4631 | + POWER_INDICATOR_ICON_POLICY_PRESENT, |
4632 | + POWER_INDICATOR_ICON_POLICY_CHARGE, |
4633 | + POWER_INDICATOR_ICON_POLICY_NEVER |
4634 | +}; |
4635 | + |
4636 | #define INDICATOR_POWER_TYPE (indicator_power_get_type ()) |
4637 | #define INDICATOR_POWER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_POWER_TYPE, IndicatorPower)) |
4638 | #define INDICATOR_POWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_POWER_TYPE, IndicatorPowerClass)) |
4639 | @@ -50,27 +57,18 @@ |
4640 | #define IS_INDICATOR_POWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_POWER_TYPE)) |
4641 | #define INDICATOR_POWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_POWER_TYPE, IndicatorPowerClass)) |
4642 | |
4643 | +typedef struct _IndicatorPowerClass IndicatorPowerClass; |
4644 | typedef struct _IndicatorPower IndicatorPower; |
4645 | -typedef struct _IndicatorPowerClass IndicatorPowerClass; |
4646 | -typedef struct _IndicatorPowerPrivate IndicatorPowerPrivate; |
4647 | + |
4648 | +struct _IndicatorPowerClass |
4649 | +{ |
4650 | + IndicatorObjectClass parent_class; |
4651 | +}; |
4652 | |
4653 | struct _IndicatorPower |
4654 | { |
4655 | IndicatorObject parent_instance; |
4656 | |
4657 | - IndicatorPowerPrivate *priv; |
4658 | -}; |
4659 | - |
4660 | -struct _IndicatorPowerClass |
4661 | -{ |
4662 | - IndicatorObjectClass parent_class; |
4663 | -}; |
4664 | - |
4665 | -GType indicator_power_get_type (void) G_GNUC_CONST; |
4666 | - |
4667 | - |
4668 | -struct _IndicatorPowerPrivate |
4669 | -{ |
4670 | GtkMenu *menu; |
4671 | |
4672 | GtkLabel *label; |
4673 | @@ -87,9 +85,12 @@ |
4674 | GSettings *settings; |
4675 | }; |
4676 | |
4677 | +GType indicator_power_get_type (void) G_GNUC_CONST; |
4678 | + |
4679 | +INDICATOR_SET_VERSION |
4680 | +INDICATOR_SET_TYPE (INDICATOR_POWER_TYPE) |
4681 | + |
4682 | /* Prototypes */ |
4683 | -static void indicator_power_class_init (IndicatorPowerClass *klass); |
4684 | -static void indicator_power_init (IndicatorPower *self); |
4685 | static void indicator_power_dispose (GObject *object); |
4686 | static void indicator_power_finalize (GObject *object); |
4687 | |
4688 | @@ -97,16 +98,15 @@ |
4689 | static GtkImage* get_image (IndicatorObject * io); |
4690 | static GtkMenu* get_menu (IndicatorObject * io); |
4691 | static const gchar* get_accessible_desc (IndicatorObject * io); |
4692 | - |
4693 | +static const gchar* get_name_hint (IndicatorObject * io); |
4694 | + |
4695 | +static void update_visibility (IndicatorPower * self); |
4696 | +static gboolean should_be_visible (IndicatorPower * self); |
4697 | + |
4698 | +static void gsd_appeared_callback (GDBusConnection *connection, const gchar *name, const gchar *name_owner, gpointer user_data); |
4699 | |
4700 | G_DEFINE_TYPE (IndicatorPower, indicator_power, INDICATOR_OBJECT_TYPE); |
4701 | |
4702 | - |
4703 | -/* Indicator stuff */ |
4704 | -INDICATOR_SET_VERSION |
4705 | -INDICATOR_SET_TYPE (INDICATOR_POWER_TYPE) |
4706 | - |
4707 | - |
4708 | static void |
4709 | indicator_power_class_init (IndicatorPowerClass *klass) |
4710 | { |
4711 | @@ -120,8 +120,76 @@ |
4712 | io_class->get_image = get_image; |
4713 | io_class->get_menu = get_menu; |
4714 | io_class->get_accessible_desc = get_accessible_desc; |
4715 | - |
4716 | - g_type_class_add_private (klass, sizeof (IndicatorPowerPrivate)); |
4717 | + io_class->get_name_hint = get_name_hint; |
4718 | +} |
4719 | + |
4720 | +static void |
4721 | +indicator_power_init (IndicatorPower *self) |
4722 | +{ |
4723 | + self->menu = GTK_MENU(gtk_menu_new()); |
4724 | + |
4725 | + self->accessible_desc = NULL; |
4726 | + |
4727 | + self->watcher_id = g_bus_watch_name (G_BUS_TYPE_SESSION, |
4728 | + DBUS_SERVICE, |
4729 | + G_BUS_NAME_WATCHER_FLAGS_NONE, |
4730 | + gsd_appeared_callback, |
4731 | + NULL, |
4732 | + self, |
4733 | + NULL); |
4734 | + |
4735 | + self->settings = g_settings_new ("com.canonical.indicator.power"); |
4736 | + g_signal_connect_swapped (self->settings, "changed::" ICON_POLICY_KEY, |
4737 | + G_CALLBACK(update_visibility), self); |
4738 | + g_object_set (G_OBJECT(self), |
4739 | + INDICATOR_OBJECT_DEFAULT_VISIBILITY, FALSE, |
4740 | + NULL); |
4741 | +} |
4742 | + |
4743 | +static void |
4744 | +indicator_power_dispose (GObject *object) |
4745 | +{ |
4746 | + IndicatorPower *self = INDICATOR_POWER(object); |
4747 | + |
4748 | + if (self->devices != NULL) { |
4749 | + g_variant_unref (self->devices); |
4750 | + self->devices = NULL; |
4751 | + } |
4752 | + |
4753 | + if (self->device != NULL) { |
4754 | + g_variant_unref (self->device); |
4755 | + self->device = NULL; |
4756 | + } |
4757 | + |
4758 | + g_clear_object (&self->proxy); |
4759 | + g_clear_object (&self->proxy_cancel); |
4760 | + |
4761 | + g_clear_object (&self->settings); |
4762 | + |
4763 | + G_OBJECT_CLASS (indicator_power_parent_class)->dispose (object); |
4764 | +} |
4765 | + |
4766 | +static void |
4767 | +indicator_power_finalize (GObject *object) |
4768 | +{ |
4769 | + IndicatorPower *self = INDICATOR_POWER(object); |
4770 | + |
4771 | + g_free (self->accessible_desc); |
4772 | + |
4773 | + G_OBJECT_CLASS (indicator_power_parent_class)->finalize (object); |
4774 | +} |
4775 | + |
4776 | +/*** |
4777 | +**** |
4778 | +***/ |
4779 | + |
4780 | +static void |
4781 | +spawn_command_line_async (const char * command) |
4782 | +{ |
4783 | + GError * err = NULL; |
4784 | + if (!g_spawn_command_line_async (command, &err)) |
4785 | + g_warning ("Couldn't execute command \"%s\": %s", command, err->message); |
4786 | + g_clear_error (&err); |
4787 | } |
4788 | |
4789 | static void |
4790 | @@ -129,37 +197,21 @@ |
4791 | gpointer data) |
4792 | { |
4793 | /*TODO: show the statistics of the specific device*/ |
4794 | - const gchar *command = "gnome-power-statistics"; |
4795 | - |
4796 | - if (g_spawn_command_line_async (command, NULL) == FALSE) |
4797 | - g_warning ("Couldn't execute command: %s", command); |
4798 | + spawn_command_line_async ("gnome-power-statistics"); |
4799 | } |
4800 | |
4801 | static void |
4802 | -option_toggled_cb (GtkCheckMenuItem *item, |
4803 | - gpointer user_data) |
4804 | +option_toggled_cb (GtkCheckMenuItem *item, IndicatorPower * self) |
4805 | { |
4806 | - IndicatorPower *self = INDICATOR_POWER (user_data); |
4807 | - IndicatorPowerPrivate *priv = self->priv; |
4808 | - gboolean visible; |
4809 | - |
4810 | - visible = gtk_check_menu_item_get_active (item); |
4811 | - |
4812 | - gtk_widget_set_visible (GTK_WIDGET (priv->label), |
4813 | - visible); |
4814 | - |
4815 | - g_settings_set_boolean (priv->settings, "show-time", |
4816 | - visible); |
4817 | + gtk_widget_set_visible (GTK_WIDGET (self->label), |
4818 | + gtk_check_menu_item_get_active(item)); |
4819 | } |
4820 | |
4821 | static void |
4822 | show_preferences_cb (GtkMenuItem *item, |
4823 | gpointer data) |
4824 | { |
4825 | - const gchar *command = "gnome-control-center power"; |
4826 | - |
4827 | - if (g_spawn_command_line_async (command, NULL) == FALSE) |
4828 | - g_warning ("Couldn't execute command: %s", command); |
4829 | + spawn_command_line_async ("gnome-control-center power"); |
4830 | } |
4831 | |
4832 | static void |
4833 | @@ -350,14 +402,12 @@ |
4834 | set_accessible_desc (IndicatorPower *self, |
4835 | const gchar *desc) |
4836 | { |
4837 | - IndicatorPowerPrivate *priv = self->priv; |
4838 | - |
4839 | - if (desc == NULL || strlen(desc) == 0) |
4840 | + if (desc == NULL || desc[0] == '\0') |
4841 | return; |
4842 | |
4843 | - g_free (priv->accessible_desc); |
4844 | + g_free (self->accessible_desc); |
4845 | |
4846 | - priv->accessible_desc = g_strdup (desc); |
4847 | + self->accessible_desc = g_strdup (desc); |
4848 | } |
4849 | |
4850 | static const gchar * |
4851 | @@ -557,38 +607,32 @@ |
4852 | static void |
4853 | build_menu (IndicatorPower *self) |
4854 | { |
4855 | - IndicatorPowerPrivate *priv = self->priv; |
4856 | GtkWidget *item; |
4857 | GtkWidget *image; |
4858 | GList *children; |
4859 | gsize n_devices = 0; |
4860 | - gboolean visible; |
4861 | - |
4862 | - if (priv->menu == NULL) |
4863 | - priv->menu = GTK_MENU (gtk_menu_new ()); |
4864 | - |
4865 | - children = gtk_container_get_children (GTK_CONTAINER (priv->menu)); |
4866 | + |
4867 | + /* remove the existing menuitems */ |
4868 | + children = gtk_container_get_children (GTK_CONTAINER (self->menu)); |
4869 | g_list_foreach (children, (GFunc) gtk_widget_destroy, NULL); |
4870 | g_list_free (children); |
4871 | |
4872 | /* devices */ |
4873 | - n_devices = menu_add_devices (priv->menu, priv->devices); |
4874 | + n_devices = menu_add_devices (self->menu, self->devices); |
4875 | |
4876 | if (!get_greeter_mode ()) { |
4877 | /* only do the separator if we have at least one device */ |
4878 | if (n_devices != 0) |
4879 | { |
4880 | item = gtk_separator_menu_item_new (); |
4881 | - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item); |
4882 | + gtk_menu_shell_append (GTK_MENU_SHELL (self->menu), item); |
4883 | } |
4884 | |
4885 | /* options */ |
4886 | item = gtk_check_menu_item_new_with_label (_("Show Time in Menu Bar")); |
4887 | - g_signal_connect (G_OBJECT (item), "toggled", |
4888 | - G_CALLBACK (option_toggled_cb), self); |
4889 | - visible = g_settings_get_boolean (priv->settings, "show-time"); |
4890 | - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), visible); |
4891 | - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item); |
4892 | + g_signal_connect (item, "toggled", G_CALLBACK(option_toggled_cb), self); |
4893 | + g_settings_bind (self->settings, "show-time", item, "active", G_SETTINGS_BIND_DEFAULT); |
4894 | + gtk_menu_shell_append (GTK_MENU_SHELL (self->menu), item); |
4895 | |
4896 | /* preferences */ |
4897 | item = gtk_image_menu_item_new_with_label (_("Power Settings...")); |
4898 | @@ -596,11 +640,11 @@ |
4899 | gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); |
4900 | g_signal_connect (G_OBJECT (item), "activate", |
4901 | G_CALLBACK (show_preferences_cb), NULL); |
4902 | - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item); |
4903 | + gtk_menu_shell_append (GTK_MENU_SHELL (self->menu), item); |
4904 | } |
4905 | |
4906 | /* show the menu */ |
4907 | - gtk_widget_show_all (GTK_WIDGET (priv->menu)); |
4908 | + gtk_widget_show_all (GTK_WIDGET (self->menu)); |
4909 | } |
4910 | |
4911 | static GVariant * |
4912 | @@ -623,7 +667,7 @@ |
4913 | gsize n_devices; |
4914 | guint i; |
4915 | |
4916 | - n_devices = g_variant_n_children (devices); |
4917 | + n_devices = devices ? g_variant_n_children (devices) : 0; |
4918 | g_debug ("Num devices: '%" G_GSIZE_FORMAT "'\n", n_devices); |
4919 | |
4920 | for (i = 0; i < n_devices; i++) |
4921 | @@ -697,7 +741,6 @@ |
4922 | put_primary_device (IndicatorPower *self, |
4923 | GVariant *device) |
4924 | { |
4925 | - IndicatorPowerPrivate *priv = self->priv; |
4926 | UpDeviceKind kind; |
4927 | UpDeviceState state; |
4928 | GIcon *device_gicons; |
4929 | @@ -724,10 +767,10 @@ |
4930 | |
4931 | /* set icon */ |
4932 | device_gicons = get_device_icon (kind, state, time, device_icon); |
4933 | - gtk_image_set_from_gicon (priv->status_image, |
4934 | + gtk_image_set_from_gicon (self->status_image, |
4935 | device_gicons, |
4936 | GTK_ICON_SIZE_LARGE_TOOLBAR); |
4937 | - gtk_widget_show (GTK_WIDGET (priv->status_image)); |
4938 | + gtk_widget_show (GTK_WIDGET (self->status_image)); |
4939 | |
4940 | |
4941 | /* get the device name */ |
4942 | @@ -736,7 +779,7 @@ |
4943 | /* get the description */ |
4944 | build_device_time_details (device_name, time, state, percentage, &short_details, &details, &accesible_name); |
4945 | |
4946 | - gtk_label_set_label (GTK_LABEL (priv->label), |
4947 | + gtk_label_set_label (GTK_LABEL (self->label), |
4948 | short_details); |
4949 | set_accessible_desc (self, accesible_name); |
4950 | |
4951 | @@ -753,32 +796,47 @@ |
4952 | gpointer user_data) |
4953 | { |
4954 | IndicatorPower *self = INDICATOR_POWER (user_data); |
4955 | - IndicatorPowerPrivate *priv = self->priv; |
4956 | GVariant *devices_container; |
4957 | GError *error = NULL; |
4958 | |
4959 | devices_container = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); |
4960 | if (devices_container == NULL) |
4961 | { |
4962 | - g_printerr ("Error getting devices: %s\n", error->message); |
4963 | + g_message ("Couldn't get devices: %s\n", error->message); |
4964 | g_error_free (error); |
4965 | - |
4966 | - return; |
4967 | } |
4968 | - priv->devices = g_variant_get_child_value (devices_container, 0); |
4969 | - g_variant_unref (devices_container); |
4970 | - |
4971 | - priv->device = get_primary_device (priv->devices); |
4972 | - if (priv->device == NULL) |
4973 | + else /* update 'devices' */ |
4974 | { |
4975 | - g_printerr ("Error getting primary device"); |
4976 | - |
4977 | - return; |
4978 | + if (self->devices != NULL) |
4979 | + g_variant_unref (self->devices); |
4980 | + self->devices = g_variant_get_child_value (devices_container, 0); |
4981 | + |
4982 | + g_variant_unref (devices_container); |
4983 | + |
4984 | + if (self->device != NULL) |
4985 | + g_variant_unref (self->device); |
4986 | + self->device = get_primary_device (self->devices); |
4987 | + |
4988 | + if (self->device == NULL) |
4989 | + { |
4990 | + g_message ("Couldn't find primary device"); |
4991 | + } |
4992 | + else |
4993 | + { |
4994 | + put_primary_device (self, self->device); |
4995 | + } |
4996 | } |
4997 | |
4998 | - put_primary_device (self, priv->device); |
4999 | - |
5000 | build_menu (self); |
The diff has been truncated for viewing.