Merge lp:~noskcaj/ubuntu/trusty/xfce4-indicator-plugin/2.3.0 into lp:ubuntu/trusty/xfce4-indicator-plugin
- Trusty (14.04)
- 2.3.0
- Merge into trusty
Proposed by
Jackson Doak
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~noskcaj/ubuntu/trusty/xfce4-indicator-plugin/2.3.0 | ||||
Merge into: | lp:ubuntu/trusty/xfce4-indicator-plugin | ||||
Diff against target: |
6865 lines (+2435/-1813) 31 files modified
ChangeLog (+22/-1) INSTALL (+4/-4) Makefile.in (+168/-147) aclocal.m4 (+295/-291) config.guess (+106/-78) config.sub (+57/-48) configure (+254/-151) configure.ac (+5/-5) debian/changelog (+7/-0) debian/control (+1/-1) depcomp (+269/-186) icons/48x48/Makefile.in (+71/-37) icons/Makefile.in (+144/-126) icons/scalable/Makefile.in (+71/-37) install-sh (+7/-7) ltmain.sh (+2/-2) missing (+159/-275) mkinstalldirs (+0/-162) panel-plugin/Makefile.in (+133/-76) panel-plugin/indicator-box.c (+1/-2) panel-plugin/indicator-button-box.c (+25/-27) panel-plugin/indicator-button.c (+22/-40) panel-plugin/indicator-button.h (+1/-1) panel-plugin/indicator-dialog.c (+1/-1) panel-plugin/indicator.c (+4/-2) po/de.po (+30/-48) po/id.po (+26/-43) po/oc.po (+178/-0) po/sl.po (+178/-0) po/sv.po (+179/-0) po/zh_TW.po (+15/-15) |
||||
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/xfce4-indicator-plugin/2.3.0 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+206602@code.launchpad.net |
Commit message
Description of the change
New upstream release, needs xfce4-panel 4.11 first
To post a comment you must log in.
Unmerged revisions
- 31. By Jackson Doak
-
* New upstream release. LP: #1238997
* Bump required panel version - 30. By Jackson Doak
-
New upstream release.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2014-02-13 16:07:50 +0000 |
3 | +++ ChangeLog 2014-02-16 05:44:15 +0000 |
4 | @@ -1,3 +1,24 @@ |
5 | +# created with git log --pretty=format:"%ad %h %s %aN <%aE>" --no-merges --date=short |
6 | +2014-02-16 24fb6ad Depend on xfce4-panel 4.11.0 Andrzej <ndrwrdck@gmail.com> |
7 | +2014-02-14 019468d dialog: do not use deprecated gtk stock items Andrzej <ndrwrdck@gmail.com> |
8 | +2014-02-08 29e4b7d I18n: Add new translation sv (100%). PavelNicklasson <pavelnicklasson@bahnhof.se> |
9 | +2014-01-26 9bea734 I18n: Update translation id (100%). padmawan <andhika.padmawan@gmail.com> |
10 | +2014-01-22 9003be9 Improved handling of popup menus Andrzej <ndrwrdck@gmail.com> |
11 | +2014-01-22 11fbd8c Do not ref/unref widgets and let libindicator manage them Andrzej <ndrwrdck@gmail.com> |
12 | +2014-01-21 6eec40b Fixed button sizing when icon/image storage type == GTK_IMAGE_EMPTY Andrzej <ndrwrdck@gmail.com> |
13 | +2014-01-21 723a2db Fixed a randomly missing icon in sound indicator Andrzej <ndrwrdck@gmail.com> |
14 | +2014-01-04 2c252c2 I18n: Update translation zh_TW (97%). Walter Cheuk <wwycheuk@gmail.com> |
15 | +2014-01-03 54fb801 I18n: Update translation de (100%). Anonymous <noreply@xfce.org> |
16 | +2013-12-30 823f19c I18n: Update translation de (94%). Anonymous <noreply@xfce.org> |
17 | +2013-12-30 412b23e I18n: Update translation de (89%). Anonymous <noreply@xfce.org> |
18 | +2013-12-18 0ee1b17 Check if labels are visible. Andrzej <ndrwrdck@gmail.com> |
19 | +2013-12-18 f7ad97a Ellipsize labels only in deskbar mode. Andrzej <ndrwrdck@gmail.com> |
20 | +2013-12-11 d046d4b Check for empty labels to optimize layout Andrzej <ndrwrdck@gmail.com> |
21 | +2013-12-06 bb66797 I18n: Add new translation oc (100%). Cedric31 <cvalmary@yahoo.fr> |
22 | +2013-12-04 887fe33 I18n: Update translation sl (100%). anthonmanix <anthon.manix@gmail.com> |
23 | +2013-12-03 7f1fd24 I18n: Add new translation sl (86%). anthonmanix <anthon.manix@gmail.com> |
24 | +2013-12-01 ec0a224 Back to development Andrzej <ndrwrdck@gmail.com> |
25 | +2013-12-01 7a07e81 Preparing for a release Andrzej <ndrwrdck@gmail.com> |
26 | 2013-12-01 4971cc4 Changed required version of libxfce4panel Andrzej <ndrwrdck@gmail.com> |
27 | 2013-11-18 b992563 I18n: Update translation da (100%). cedeel <chris@cedeel.com> |
28 | 2013-11-16 bc7f4df I18n: Update translation zh_TW (78%). sofyalai <sofyalai@gmail.com> |
29 | @@ -339,4 +360,4 @@ |
30 | 2009-05-27 67c060d indicator is the one we need to check for Mark Trompell <mark@foresightlinux.org> |
31 | 2009-05-26 646fe35 Fix build issue with libtool 2.x Mark Trompell <mark@foresightlinux.org> |
32 | 2009-05-15 aa9f8f0 some random changes Mark Trompell <mark@foresightlinux.org> |
33 | -2009-05-15 ac4fe3f initial checkin Mark Trompell <mark@foresightlinux.org> |
34 | \ No newline at end of file |
35 | +2009-05-15 ac4fe3f initial checkin Mark Trompell <mark@foresightlinux.org> |
36 | |
37 | === modified file 'INSTALL' |
38 | --- INSTALL 2014-02-13 16:07:50 +0000 |
39 | +++ INSTALL 2014-02-16 05:44:15 +0000 |
40 | @@ -1,7 +1,7 @@ |
41 | Installation Instructions |
42 | ************************* |
43 | |
44 | -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, |
45 | +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, |
46 | Inc. |
47 | |
48 | Copying and distribution of this file, with or without modification, |
49 | @@ -309,9 +309,10 @@ |
50 | overridden in the site shell script). |
51 | |
52 | Unfortunately, this technique does not work for `CONFIG_SHELL' due to |
53 | -an Autoconf bug. Until the bug is fixed you can use this workaround: |
54 | +an Autoconf limitation. Until the limitation is lifted, you can use |
55 | +this workaround: |
56 | |
57 | - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash |
58 | + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash |
59 | |
60 | `configure' Invocation |
61 | ====================== |
62 | @@ -367,4 +368,3 @@ |
63 | |
64 | `configure' also accepts some other, not widely useful, options. Run |
65 | `configure --help' for more details. |
66 | - |
67 | |
68 | === modified file 'Makefile.in' |
69 | --- Makefile.in 2014-02-13 16:07:50 +0000 |
70 | +++ Makefile.in 2014-02-16 05:44:15 +0000 |
71 | @@ -1,9 +1,8 @@ |
72 | -# Makefile.in generated by automake 1.11.6 from Makefile.am. |
73 | +# Makefile.in generated by automake 1.13.3 from Makefile.am. |
74 | # @configure_input@ |
75 | |
76 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
77 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
78 | -# Foundation, Inc. |
79 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
80 | + |
81 | # This Makefile.in is free software; the Free Software Foundation |
82 | # gives unlimited permission to copy and/or distribute it, |
83 | # with or without modifications, as long as this notice is preserved. |
84 | @@ -15,23 +14,51 @@ |
85 | |
86 | @SET_MAKE@ |
87 | VPATH = @srcdir@ |
88 | -am__make_dryrun = \ |
89 | - { \ |
90 | - am__dry=no; \ |
91 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
92 | +am__make_running_with_option = \ |
93 | + case $${target_option-} in \ |
94 | + ?) ;; \ |
95 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
96 | + "target option '$${target_option-}' specified" >&2; \ |
97 | + exit 1;; \ |
98 | + esac; \ |
99 | + has_opt=no; \ |
100 | + sane_makeflags=$$MAKEFLAGS; \ |
101 | + if $(am__is_gnu_make); then \ |
102 | + sane_makeflags=$$MFLAGS; \ |
103 | + else \ |
104 | case $$MAKEFLAGS in \ |
105 | *\\[\ \ ]*) \ |
106 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
107 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
108 | - *) \ |
109 | - for am__flg in $$MAKEFLAGS; do \ |
110 | - case $$am__flg in \ |
111 | - *=*|--*) ;; \ |
112 | - *n*) am__dry=yes; break;; \ |
113 | - esac; \ |
114 | - done;; \ |
115 | - esac; \ |
116 | - test $$am__dry = yes; \ |
117 | - } |
118 | + bs=\\; \ |
119 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
120 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
121 | + esac; \ |
122 | + fi; \ |
123 | + skip_next=no; \ |
124 | + strip_trailopt () \ |
125 | + { \ |
126 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
127 | + }; \ |
128 | + for flg in $$sane_makeflags; do \ |
129 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
130 | + case $$flg in \ |
131 | + *=*|--*) continue;; \ |
132 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
133 | + -*I?*) strip_trailopt 'I';; \ |
134 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
135 | + -*O?*) strip_trailopt 'O';; \ |
136 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
137 | + -*l?*) strip_trailopt 'l';; \ |
138 | + -[dEDm]) skip_next=yes;; \ |
139 | + -[JT]) skip_next=yes;; \ |
140 | + esac; \ |
141 | + case $$flg in \ |
142 | + *$$target_option*) has_opt=yes; break;; \ |
143 | + esac; \ |
144 | + done; \ |
145 | + test $$has_opt = yes |
146 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
147 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
148 | pkgdatadir = $(datadir)/@PACKAGE@ |
149 | pkgincludedir = $(includedir)/@PACKAGE@ |
150 | pkglibdir = $(libdir)/@PACKAGE@ |
151 | @@ -52,36 +79,43 @@ |
152 | host_triplet = @host@ |
153 | target_triplet = @target@ |
154 | subdir = . |
155 | -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
156 | - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
157 | - $(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \ |
158 | - INSTALL NEWS THANKS TODO config.guess config.sub depcomp \ |
159 | - install-sh ltmain.sh missing mkinstalldirs |
160 | +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ |
161 | + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
162 | + $(top_srcdir)/configure $(am__configure_deps) \ |
163 | + $(srcdir)/config.h.in COPYING COPYING.LIB THANKS TODO \ |
164 | + config.guess config.sub depcomp install-sh missing ltmain.sh |
165 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
166 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
167 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
168 | $(ACLOCAL_M4) |
169 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
170 | configure.lineno config.status.lineno |
171 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
172 | +mkinstalldirs = $(install_sh) -d |
173 | CONFIG_HEADER = config.h |
174 | CONFIG_CLEAN_FILES = |
175 | CONFIG_CLEAN_VPATH_FILES = |
176 | +AM_V_P = $(am__v_P_@AM_V@) |
177 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
178 | +am__v_P_0 = false |
179 | +am__v_P_1 = : |
180 | AM_V_GEN = $(am__v_GEN_@AM_V@) |
181 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
182 | -am__v_GEN_0 = @echo " GEN " $@; |
183 | +am__v_GEN_0 = @echo " GEN " $@; |
184 | +am__v_GEN_1 = |
185 | AM_V_at = $(am__v_at_@AM_V@) |
186 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
187 | am__v_at_0 = @ |
188 | +am__v_at_1 = |
189 | SOURCES = |
190 | DIST_SOURCES = |
191 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
192 | - html-recursive info-recursive install-data-recursive \ |
193 | - install-dvi-recursive install-exec-recursive \ |
194 | - install-html-recursive install-info-recursive \ |
195 | - install-pdf-recursive install-ps-recursive install-recursive \ |
196 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
197 | - ps-recursive uninstall-recursive |
198 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
199 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
200 | + install-data-recursive install-dvi-recursive \ |
201 | + install-exec-recursive install-html-recursive \ |
202 | + install-info-recursive install-pdf-recursive \ |
203 | + install-ps-recursive install-recursive installcheck-recursive \ |
204 | + installdirs-recursive pdf-recursive ps-recursive \ |
205 | + tags-recursive uninstall-recursive |
206 | am__can_run_installinfo = \ |
207 | case $$AM_UPDATE_INFO_DIR in \ |
208 | n|no|NO) false;; \ |
209 | @@ -89,11 +123,33 @@ |
210 | esac |
211 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
212 | distclean-recursive maintainer-clean-recursive |
213 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
214 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
215 | - distdir dist dist-all distcheck |
216 | +am__recursive_targets = \ |
217 | + $(RECURSIVE_TARGETS) \ |
218 | + $(RECURSIVE_CLEAN_TARGETS) \ |
219 | + $(am__extra_recursive_targets) |
220 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
221 | + cscope distdir dist dist-all distcheck |
222 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
223 | + $(LISP)config.h.in |
224 | +# Read a list of newline-separated strings from the standard input, |
225 | +# and print each of them once, without duplicates. Input order is |
226 | +# *not* preserved. |
227 | +am__uniquify_input = $(AWK) '\ |
228 | + BEGIN { nonempty = 0; } \ |
229 | + { items[$$0] = 1; nonempty = 1; } \ |
230 | + END { if (nonempty) { for (i in items) print i; }; } \ |
231 | +' |
232 | +# Make sure the list of sources is unique. This is necessary because, |
233 | +# e.g., the same source file might be shared among _SOURCES variables |
234 | +# for different programs/libraries. |
235 | +am__define_uniq_tagged_files = \ |
236 | + list='$(am__tagged_files)'; \ |
237 | + unique=`for i in $$list; do \ |
238 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
239 | + done | $(am__uniquify_input)` |
240 | ETAGS = etags |
241 | CTAGS = ctags |
242 | +CSCOPE = cscope |
243 | DIST_SUBDIRS = $(SUBDIRS) |
244 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
245 | distdir = $(PACKAGE)-$(VERSION) |
246 | @@ -104,6 +160,7 @@ |
247 | && rm -rf "$(distdir)" \ |
248 | || { sleep 5 && rm -rf "$(distdir)"; }; \ |
249 | else :; fi |
250 | +am__post_remove_distdir = $(am__remove_distdir) |
251 | am__relativize = \ |
252 | dir0=`pwd`; \ |
253 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
254 | @@ -131,6 +188,7 @@ |
255 | reldir="$$dir2" |
256 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
257 | GZIP_ENV = --best |
258 | +DIST_TARGETS = dist-bzip2 dist-gzip |
259 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
260 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
261 | distcleancheck_listfiles = find . -type f -print |
262 | @@ -410,22 +468,25 @@ |
263 | -rm -f libtool config.lt |
264 | |
265 | # This directory's subdirectories are mostly independent; you can cd |
266 | -# into them and run `make' without going through this Makefile. |
267 | -# To change the values of `make' variables: instead of editing Makefiles, |
268 | -# (1) if the variable is set in `config.status', edit `config.status' |
269 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
270 | -# (2) otherwise, pass the desired values on the `make' command line. |
271 | -$(RECURSIVE_TARGETS): |
272 | - @fail= failcom='exit 1'; \ |
273 | - for f in x $$MAKEFLAGS; do \ |
274 | - case $$f in \ |
275 | - *=* | --[!k]*);; \ |
276 | - *k*) failcom='fail=yes';; \ |
277 | - esac; \ |
278 | - done; \ |
279 | +# into them and run 'make' without going through this Makefile. |
280 | +# To change the values of 'make' variables: instead of editing Makefiles, |
281 | +# (1) if the variable is set in 'config.status', edit 'config.status' |
282 | +# (which will cause the Makefiles to be regenerated when you run 'make'); |
283 | +# (2) otherwise, pass the desired values on the 'make' command line. |
284 | +$(am__recursive_targets): |
285 | + @fail=; \ |
286 | + if $(am__make_keepgoing); then \ |
287 | + failcom='fail=yes'; \ |
288 | + else \ |
289 | + failcom='exit 1'; \ |
290 | + fi; \ |
291 | dot_seen=no; \ |
292 | target=`echo $@ | sed s/-recursive//`; \ |
293 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
294 | + case "$@" in \ |
295 | + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
296 | + *) list='$(SUBDIRS)' ;; \ |
297 | + esac; \ |
298 | + for subdir in $$list; do \ |
299 | echo "Making $$target in $$subdir"; \ |
300 | if test "$$subdir" = "."; then \ |
301 | dot_seen=yes; \ |
302 | @@ -440,57 +501,12 @@ |
303 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
304 | fi; test -z "$$fail" |
305 | |
306 | -$(RECURSIVE_CLEAN_TARGETS): |
307 | - @fail= failcom='exit 1'; \ |
308 | - for f in x $$MAKEFLAGS; do \ |
309 | - case $$f in \ |
310 | - *=* | --[!k]*);; \ |
311 | - *k*) failcom='fail=yes';; \ |
312 | - esac; \ |
313 | - done; \ |
314 | - dot_seen=no; \ |
315 | - case "$@" in \ |
316 | - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
317 | - *) list='$(SUBDIRS)' ;; \ |
318 | - esac; \ |
319 | - rev=''; for subdir in $$list; do \ |
320 | - if test "$$subdir" = "."; then :; else \ |
321 | - rev="$$subdir $$rev"; \ |
322 | - fi; \ |
323 | - done; \ |
324 | - rev="$$rev ."; \ |
325 | - target=`echo $@ | sed s/-recursive//`; \ |
326 | - for subdir in $$rev; do \ |
327 | - echo "Making $$target in $$subdir"; \ |
328 | - if test "$$subdir" = "."; then \ |
329 | - local_target="$$target-am"; \ |
330 | - else \ |
331 | - local_target="$$target"; \ |
332 | - fi; \ |
333 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
334 | - || eval $$failcom; \ |
335 | - done && test -z "$$fail" |
336 | -tags-recursive: |
337 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
338 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
339 | - done |
340 | -ctags-recursive: |
341 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
342 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
343 | - done |
344 | - |
345 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
346 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
347 | - unique=`for i in $$list; do \ |
348 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
349 | - done | \ |
350 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
351 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
352 | - mkid -fID $$unique |
353 | -tags: TAGS |
354 | - |
355 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
356 | - $(TAGS_FILES) $(LISP) |
357 | +ID: $(am__tagged_files) |
358 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
359 | +tags: tags-recursive |
360 | +TAGS: tags |
361 | + |
362 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
363 | set x; \ |
364 | here=`pwd`; \ |
365 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
366 | @@ -506,12 +522,7 @@ |
367 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
368 | fi; \ |
369 | done; \ |
370 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
371 | - unique=`for i in $$list; do \ |
372 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
373 | - done | \ |
374 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
375 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
376 | + $(am__define_uniq_tagged_files); \ |
377 | shift; \ |
378 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
379 | test -n "$$unique" || unique=$$empty_fix; \ |
380 | @@ -523,15 +534,11 @@ |
381 | $$unique; \ |
382 | fi; \ |
383 | fi |
384 | -ctags: CTAGS |
385 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
386 | - $(TAGS_FILES) $(LISP) |
387 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
388 | - unique=`for i in $$list; do \ |
389 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
390 | - done | \ |
391 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
392 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
393 | +ctags: ctags-recursive |
394 | + |
395 | +CTAGS: ctags |
396 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
397 | + $(am__define_uniq_tagged_files); \ |
398 | test -z "$(CTAGS_ARGS)$$unique" \ |
399 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
400 | $$unique |
401 | @@ -540,9 +547,31 @@ |
402 | here=`$(am__cd) $(top_builddir) && pwd` \ |
403 | && $(am__cd) $(top_srcdir) \ |
404 | && gtags -i $(GTAGS_ARGS) "$$here" |
405 | +cscope: cscope.files |
406 | + test ! -s cscope.files \ |
407 | + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
408 | +clean-cscope: |
409 | + -rm -f cscope.files |
410 | +cscope.files: clean-cscope cscopelist |
411 | +cscopelist: cscopelist-recursive |
412 | + |
413 | +cscopelist-am: $(am__tagged_files) |
414 | + list='$(am__tagged_files)'; \ |
415 | + case "$(srcdir)" in \ |
416 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
417 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
418 | + esac; \ |
419 | + for i in $$list; do \ |
420 | + if test -f "$$i"; then \ |
421 | + echo "$(subdir)/$$i"; \ |
422 | + else \ |
423 | + echo "$$sdir/$$i"; \ |
424 | + fi; \ |
425 | + done >> $(top_builddir)/cscope.files |
426 | |
427 | distclean-tags: |
428 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
429 | + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
430 | |
431 | distdir: $(DISTFILES) |
432 | $(am__remove_distdir) |
433 | @@ -610,40 +639,35 @@ |
434 | || chmod -R a+r "$(distdir)" |
435 | dist-gzip: distdir |
436 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
437 | - $(am__remove_distdir) |
438 | + $(am__post_remove_distdir) |
439 | dist-bzip2: distdir |
440 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
441 | - $(am__remove_distdir) |
442 | + $(am__post_remove_distdir) |
443 | |
444 | dist-lzip: distdir |
445 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
446 | - $(am__remove_distdir) |
447 | - |
448 | -dist-lzma: distdir |
449 | - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
450 | - $(am__remove_distdir) |
451 | + $(am__post_remove_distdir) |
452 | |
453 | dist-xz: distdir |
454 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
455 | - $(am__remove_distdir) |
456 | + $(am__post_remove_distdir) |
457 | |
458 | dist-tarZ: distdir |
459 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
460 | - $(am__remove_distdir) |
461 | + $(am__post_remove_distdir) |
462 | |
463 | dist-shar: distdir |
464 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
465 | - $(am__remove_distdir) |
466 | + $(am__post_remove_distdir) |
467 | |
468 | dist-zip: distdir |
469 | -rm -f $(distdir).zip |
470 | zip -rq $(distdir).zip $(distdir) |
471 | - $(am__remove_distdir) |
472 | + $(am__post_remove_distdir) |
473 | |
474 | -dist dist-all: distdir |
475 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
476 | - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
477 | - $(am__remove_distdir) |
478 | +dist dist-all: |
479 | + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' |
480 | + $(am__post_remove_distdir) |
481 | |
482 | # This target untars the dist file and tries a VPATH configuration. Then |
483 | # it guarantees that the distribution is self-contained by making another |
484 | @@ -654,8 +678,6 @@ |
485 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
486 | *.tar.bz2*) \ |
487 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
488 | - *.tar.lzma*) \ |
489 | - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
490 | *.tar.lz*) \ |
491 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
492 | *.tar.xz*) \ |
493 | @@ -667,9 +689,9 @@ |
494 | *.zip*) \ |
495 | unzip $(distdir).zip ;;\ |
496 | esac |
497 | - chmod -R a-w $(distdir); chmod u+w $(distdir) |
498 | - mkdir $(distdir)/_build |
499 | - mkdir $(distdir)/_inst |
500 | + chmod -R a-w $(distdir) |
501 | + chmod u+w $(distdir) |
502 | + mkdir $(distdir)/_build $(distdir)/_inst |
503 | chmod a-w $(distdir) |
504 | test -d $(distdir)/_build || exit 0; \ |
505 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
506 | @@ -701,7 +723,7 @@ |
507 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
508 | && cd "$$am__cwd" \ |
509 | || exit 1 |
510 | - $(am__remove_distdir) |
511 | + $(am__post_remove_distdir) |
512 | @(echo "$(distdir) archives ready for distribution: "; \ |
513 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
514 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
515 | @@ -837,15 +859,14 @@ |
516 | |
517 | uninstall-am: |
518 | |
519 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
520 | - ctags-recursive install-am install-strip tags-recursive |
521 | +.MAKE: $(am__recursive_targets) all install-am install-strip |
522 | |
523 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
524 | - all all-am am--refresh check check-am clean clean-generic \ |
525 | - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
526 | - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ |
527 | - dist-zip distcheck distclean distclean-generic distclean-hdr \ |
528 | - distclean-libtool distclean-local distclean-tags \ |
529 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ |
530 | + am--refresh check check-am clean clean-cscope clean-generic \ |
531 | + clean-libtool cscope cscopelist-am ctags ctags-am dist \ |
532 | + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ |
533 | + dist-xz dist-zip distcheck distclean distclean-generic \ |
534 | + distclean-hdr distclean-libtool distclean-local distclean-tags \ |
535 | distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
536 | html-am info info-am install install-am install-data \ |
537 | install-data-am install-dvi install-dvi-am install-exec \ |
538 | @@ -854,8 +875,8 @@ |
539 | install-ps install-ps-am install-strip installcheck \ |
540 | installcheck-am installdirs installdirs-am maintainer-clean \ |
541 | maintainer-clean-generic mostlyclean mostlyclean-generic \ |
542 | - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
543 | - uninstall uninstall-am |
544 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ |
545 | + uninstall-am |
546 | |
547 | |
548 | distclean-local: |
549 | |
550 | === modified file 'aclocal.m4' |
551 | --- aclocal.m4 2014-02-13 16:07:50 +0000 |
552 | +++ aclocal.m4 2014-02-16 05:44:15 +0000 |
553 | @@ -1,8 +1,7 @@ |
554 | -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
555 | - |
556 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
557 | -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
558 | -# Inc. |
559 | +# generated automatically by aclocal 1.13.3 -*- Autoconf -*- |
560 | + |
561 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
562 | + |
563 | # This file is free software; the Free Software Foundation |
564 | # gives unlimited permission to copy and/or distribute it, |
565 | # with or without modifications, as long as this notice is preserved. |
566 | @@ -12,13 +11,14 @@ |
567 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
568 | # PARTICULAR PURPOSE. |
569 | |
570 | +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
571 | m4_ifndef([AC_AUTOCONF_VERSION], |
572 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
573 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
574 | [m4_warning([this file was generated for autoconf 2.69. |
575 | You have another version of autoconf. It may work, but is not guaranteed to. |
576 | If you have problems, you may need to regenerate the build system entirely. |
577 | -To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
578 | +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
579 | |
580 | # Copyright (C) 1995-2002 Free Software Foundation, Inc. |
581 | # Copyright (C) 2001-2003,2004 Red Hat, Inc. |
582 | @@ -337,7 +337,6 @@ |
583 | dnl |
584 | glib_DEFUN([GLIB_GNU_GETTEXT], |
585 | [AC_REQUIRE([AC_PROG_CC])dnl |
586 | - AC_REQUIRE([AC_HEADER_STDC])dnl |
587 | |
588 | GLIB_LC_MESSAGES |
589 | GLIB_WITH_NLS |
590 | @@ -9461,25 +9460,22 @@ |
591 | fi[]dnl |
592 | ])# PKG_CHECK_MODULES |
593 | |
594 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
595 | -# Foundation, Inc. |
596 | +# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
597 | # |
598 | # This file is free software; the Free Software Foundation |
599 | # gives unlimited permission to copy and/or distribute it, |
600 | # with or without modifications, as long as this notice is preserved. |
601 | |
602 | -# serial 1 |
603 | - |
604 | # AM_AUTOMAKE_VERSION(VERSION) |
605 | # ---------------------------- |
606 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
607 | # generated from the m4 files accompanying Automake X.Y. |
608 | # (This private macro should not be called outside this file.) |
609 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
610 | -[am__api_version='1.11' |
611 | +[am__api_version='1.13' |
612 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
613 | dnl require some minimum version. Point them to the right macro. |
614 | -m4_if([$1], [1.11.6], [], |
615 | +m4_if([$1], [1.13.3], [], |
616 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
617 | ]) |
618 | |
619 | @@ -9495,24 +9491,22 @@ |
620 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
621 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
622 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
623 | -[AM_AUTOMAKE_VERSION([1.11.6])dnl |
624 | +[AM_AUTOMAKE_VERSION([1.13.3])dnl |
625 | m4_ifndef([AC_AUTOCONF_VERSION], |
626 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
627 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
628 | |
629 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
630 | |
631 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
632 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
633 | # |
634 | # This file is free software; the Free Software Foundation |
635 | # gives unlimited permission to copy and/or distribute it, |
636 | # with or without modifications, as long as this notice is preserved. |
637 | |
638 | -# serial 1 |
639 | - |
640 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
641 | -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
642 | -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
643 | +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
644 | +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
645 | # |
646 | # Of course, Automake must honor this variable whenever it calls a |
647 | # tool from the auxiliary directory. The problem is that $srcdir (and |
648 | @@ -9531,7 +9525,7 @@ |
649 | # |
650 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
651 | # are both prefixed by $srcdir. In an in-source build this is usually |
652 | -# harmless because $srcdir is `.', but things will broke when you |
653 | +# harmless because $srcdir is '.', but things will broke when you |
654 | # start a VPATH build or use an absolute $srcdir. |
655 | # |
656 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
657 | @@ -9557,22 +9551,19 @@ |
658 | |
659 | # AM_CONDITIONAL -*- Autoconf -*- |
660 | |
661 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
662 | -# Free Software Foundation, Inc. |
663 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
664 | # |
665 | # This file is free software; the Free Software Foundation |
666 | # gives unlimited permission to copy and/or distribute it, |
667 | # with or without modifications, as long as this notice is preserved. |
668 | |
669 | -# serial 9 |
670 | - |
671 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
672 | # ------------------------------------- |
673 | # Define a conditional. |
674 | AC_DEFUN([AM_CONDITIONAL], |
675 | -[AC_PREREQ(2.52)dnl |
676 | - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
677 | - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
678 | +[AC_PREREQ([2.52])dnl |
679 | + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
680 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
681 | AC_SUBST([$1_TRUE])dnl |
682 | AC_SUBST([$1_FALSE])dnl |
683 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
684 | @@ -9591,16 +9582,14 @@ |
685 | Usually this means the macro was only invoked conditionally.]]) |
686 | fi])]) |
687 | |
688 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
689 | -# 2010, 2011 Free Software Foundation, Inc. |
690 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
691 | # |
692 | # This file is free software; the Free Software Foundation |
693 | # gives unlimited permission to copy and/or distribute it, |
694 | # with or without modifications, as long as this notice is preserved. |
695 | |
696 | -# serial 12 |
697 | |
698 | -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
699 | +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
700 | # written in clear, in which case automake, when reading aclocal.m4, |
701 | # will think it sees a *use*, and therefore will trigger all it's |
702 | # C support machinery. Also note that it means that autoscan, seeing |
703 | @@ -9610,7 +9599,7 @@ |
704 | # _AM_DEPENDENCIES(NAME) |
705 | # ---------------------- |
706 | # See how the compiler implements dependency checking. |
707 | -# NAME is "CC", "CXX", "GCJ", or "OBJC". |
708 | +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
709 | # We try a few techniques and use that to set a single cache variable. |
710 | # |
711 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
712 | @@ -9623,12 +9612,13 @@ |
713 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
714 | AC_REQUIRE([AM_DEP_TRACK])dnl |
715 | |
716 | -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
717 | - [$1], CXX, [depcc="$CXX" am_compiler_list=], |
718 | - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
719 | - [$1], UPC, [depcc="$UPC" am_compiler_list=], |
720 | - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
721 | - [depcc="$$1" am_compiler_list=]) |
722 | +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
723 | + [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
724 | + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
725 | + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
726 | + [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
727 | + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
728 | + [depcc="$$1" am_compiler_list=]) |
729 | |
730 | AC_CACHE_CHECK([dependency style of $depcc], |
731 | [am_cv_$1_dependencies_compiler_type], |
732 | @@ -9636,8 +9626,8 @@ |
733 | # We make a subdir and do the tests there. Otherwise we can end up |
734 | # making bogus files that we don't know about and never remove. For |
735 | # instance it was reported that on HP-UX the gcc test will end up |
736 | - # making a dummy file named `D' -- because `-MD' means `put the output |
737 | - # in D'. |
738 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
739 | + # in D". |
740 | rm -rf conftest.dir |
741 | mkdir conftest.dir |
742 | # Copy depcomp to subdir because otherwise we won't find it if we're |
743 | @@ -9677,16 +9667,16 @@ |
744 | : > sub/conftest.c |
745 | for i in 1 2 3 4 5 6; do |
746 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
747 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
748 | - # Solaris 8's {/usr,}/bin/sh. |
749 | - touch sub/conftst$i.h |
750 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
751 | + # Solaris 10 /bin/sh. |
752 | + echo '/* dummy */' > sub/conftst$i.h |
753 | done |
754 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
755 | |
756 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
757 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
758 | # mode. It turns out that the SunPro C++ compiler does not properly |
759 | - # handle `-M -o', and we need to detect this. Also, some Intel |
760 | - # versions had trouble with output in subdirs |
761 | + # handle '-M -o', and we need to detect this. Also, some Intel |
762 | + # versions had trouble with output in subdirs. |
763 | am__obj=sub/conftest.${OBJEXT-o} |
764 | am__minus_obj="-o $am__obj" |
765 | case $depmode in |
766 | @@ -9695,8 +9685,8 @@ |
767 | test "$am__universal" = false || continue |
768 | ;; |
769 | nosideeffect) |
770 | - # after this tag, mechanisms are not by side-effect, so they'll |
771 | - # only be used when explicitly requested |
772 | + # After this tag, mechanisms are not by side-effect, so they'll |
773 | + # only be used when explicitly requested. |
774 | if test "x$enable_dependency_tracking" = xyes; then |
775 | continue |
776 | else |
777 | @@ -9704,7 +9694,7 @@ |
778 | fi |
779 | ;; |
780 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
781 | - # This compiler won't grok `-c -o', but also, the minuso test has |
782 | + # This compiler won't grok '-c -o', but also, the minuso test has |
783 | # not run yet. These depmodes are late enough in the game, and |
784 | # so weak that their functioning should not be impacted. |
785 | am__obj=conftest.${OBJEXT-o} |
786 | @@ -9752,7 +9742,7 @@ |
787 | # AM_SET_DEPDIR |
788 | # ------------- |
789 | # Choose a directory name for dependency files. |
790 | -# This macro is AC_REQUIREd in _AM_DEPENDENCIES |
791 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
792 | AC_DEFUN([AM_SET_DEPDIR], |
793 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
794 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
795 | @@ -9762,9 +9752,13 @@ |
796 | # AM_DEP_TRACK |
797 | # ------------ |
798 | AC_DEFUN([AM_DEP_TRACK], |
799 | -[AC_ARG_ENABLE(dependency-tracking, |
800 | -[ --disable-dependency-tracking speeds up one-time build |
801 | - --enable-dependency-tracking do not reject slow dependency extractors]) |
802 | +[AC_ARG_ENABLE([dependency-tracking], [dnl |
803 | +AS_HELP_STRING( |
804 | + [--enable-dependency-tracking], |
805 | + [do not reject slow dependency extractors]) |
806 | +AS_HELP_STRING( |
807 | + [--disable-dependency-tracking], |
808 | + [speeds up one-time build])]) |
809 | if test "x$enable_dependency_tracking" != xno; then |
810 | am_depcomp="$ac_aux_dir/depcomp" |
811 | AMDEPBACKSLASH='\' |
812 | @@ -9779,20 +9773,18 @@ |
813 | |
814 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
815 | |
816 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
817 | -# Free Software Foundation, Inc. |
818 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
819 | # |
820 | # This file is free software; the Free Software Foundation |
821 | # gives unlimited permission to copy and/or distribute it, |
822 | # with or without modifications, as long as this notice is preserved. |
823 | |
824 | -#serial 5 |
825 | |
826 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
827 | # ------------------------------ |
828 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
829 | [{ |
830 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
831 | + # Older Autoconf quotes --file arguments for eval, but not when files |
832 | # are listed without --file. Let's play safe and only enable the eval |
833 | # if we detect the quoting. |
834 | case $CONFIG_FILES in |
835 | @@ -9805,7 +9797,7 @@ |
836 | # Strip MF so we end up with the name of the file. |
837 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
838 | # Check whether this is an Automake generated Makefile or not. |
839 | - # We used to match only the files named `Makefile.in', but |
840 | + # We used to match only the files named 'Makefile.in', but |
841 | # some people rename them; so instead we look at the file content. |
842 | # Grep'ing the first line is not enough: some people post-process |
843 | # each Makefile.in and add a new line on top of each file to say so. |
844 | @@ -9817,21 +9809,19 @@ |
845 | continue |
846 | fi |
847 | # Extract the definition of DEPDIR, am__include, and am__quote |
848 | - # from the Makefile without running `make'. |
849 | + # from the Makefile without running 'make'. |
850 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
851 | test -z "$DEPDIR" && continue |
852 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
853 | - test -z "am__include" && continue |
854 | + test -z "$am__include" && continue |
855 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
856 | - # When using ansi2knr, U may be empty or an underscore; expand it |
857 | - U=`sed -n 's/^U = //p' < "$mf"` |
858 | # Find all dependency output files, they are included files with |
859 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
860 | # simplest approach to changing $(DEPDIR) to its actual value in the |
861 | # expansion. |
862 | for file in `sed -n " |
863 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
864 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
865 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
866 | # Make sure the directory exists. |
867 | test -f "$dirpart/$file" && continue |
868 | fdir=`AS_DIRNAME(["$file"])` |
869 | @@ -9849,7 +9839,7 @@ |
870 | # This macro should only be invoked once -- use via AC_REQUIRE. |
871 | # |
872 | # This code is only required when automatic dependency tracking |
873 | -# is enabled. FIXME. This creates each `.P' file that we will |
874 | +# is enabled. FIXME. This creates each '.P' file that we will |
875 | # need in order to bootstrap the dependency handling code. |
876 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
877 | [AC_CONFIG_COMMANDS([depfiles], |
878 | @@ -9859,15 +9849,12 @@ |
879 | |
880 | # Do all the work for Automake. -*- Autoconf -*- |
881 | |
882 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
883 | -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
884 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
885 | # |
886 | # This file is free software; the Free Software Foundation |
887 | # gives unlimited permission to copy and/or distribute it, |
888 | # with or without modifications, as long as this notice is preserved. |
889 | |
890 | -# serial 16 |
891 | - |
892 | # This macro actually does too much. Some checks are only needed if |
893 | # your package does certain things. But this isn't really a big deal. |
894 | |
895 | @@ -9883,7 +9870,7 @@ |
896 | # arguments mandatory, and then we can depend on a new Autoconf |
897 | # release and drop the old call support. |
898 | AC_DEFUN([AM_INIT_AUTOMAKE], |
899 | -[AC_PREREQ([2.62])dnl |
900 | +[AC_PREREQ([2.65])dnl |
901 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
902 | dnl the ones we care about. |
903 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
904 | @@ -9912,31 +9899,40 @@ |
905 | # Define the identity of the package. |
906 | dnl Distinguish between old-style and new-style calls. |
907 | m4_ifval([$2], |
908 | -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
909 | +[AC_DIAGNOSE([obsolete], |
910 | + [$0: two- and three-arguments forms are deprecated.]) |
911 | +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
912 | AC_SUBST([PACKAGE], [$1])dnl |
913 | AC_SUBST([VERSION], [$2])], |
914 | [_AM_SET_OPTIONS([$1])dnl |
915 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
916 | -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, |
917 | +m4_if( |
918 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
919 | + [ok:ok],, |
920 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
921 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
922 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
923 | |
924 | _AM_IF_OPTION([no-define],, |
925 | -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) |
926 | - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl |
927 | +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
928 | + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
929 | |
930 | # Some tools Automake needs. |
931 | AC_REQUIRE([AM_SANITY_CHECK])dnl |
932 | AC_REQUIRE([AC_ARG_PROGRAM])dnl |
933 | -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) |
934 | -AM_MISSING_PROG(AUTOCONF, autoconf) |
935 | -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
936 | -AM_MISSING_PROG(AUTOHEADER, autoheader) |
937 | -AM_MISSING_PROG(MAKEINFO, makeinfo) |
938 | +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
939 | +AM_MISSING_PROG([AUTOCONF], [autoconf]) |
940 | +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
941 | +AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
942 | +AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
943 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
944 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
945 | -AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
946 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
947 | +# For better backward compatibility. To be removed once Automake 1.9.x |
948 | +# dies out for good. For more background, see: |
949 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
950 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
951 | +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
952 | # We need awk for the "check" target. The system "awk" is bad on |
953 | # some platforms. |
954 | AC_REQUIRE([AC_PROG_AWK])dnl |
955 | @@ -9947,28 +9943,32 @@ |
956 | [_AM_PROG_TAR([v7])])]) |
957 | _AM_IF_OPTION([no-dependencies],, |
958 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
959 | - [_AM_DEPENDENCIES(CC)], |
960 | - [define([AC_PROG_CC], |
961 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
962 | + [_AM_DEPENDENCIES([CC])], |
963 | + [m4_define([AC_PROG_CC], |
964 | + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
965 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
966 | - [_AM_DEPENDENCIES(CXX)], |
967 | - [define([AC_PROG_CXX], |
968 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
969 | + [_AM_DEPENDENCIES([CXX])], |
970 | + [m4_define([AC_PROG_CXX], |
971 | + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
972 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
973 | - [_AM_DEPENDENCIES(OBJC)], |
974 | - [define([AC_PROG_OBJC], |
975 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
976 | + [_AM_DEPENDENCIES([OBJC])], |
977 | + [m4_define([AC_PROG_OBJC], |
978 | + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
979 | +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
980 | + [_AM_DEPENDENCIES([OBJCXX])], |
981 | + [m4_define([AC_PROG_OBJCXX], |
982 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
983 | ]) |
984 | -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
985 | -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the |
986 | -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
987 | -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
988 | +AC_REQUIRE([AM_SILENT_RULES])dnl |
989 | +dnl The testsuite driver may need to know about EXEEXT, so add the |
990 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
991 | +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
992 | AC_CONFIG_COMMANDS_PRE(dnl |
993 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
994 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
995 | ]) |
996 | |
997 | -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
998 | +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
999 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
1000 | dnl mangled by Autoconf and run in a shell conditional statement. |
1001 | m4_define([_AC_COMPILER_EXEEXT], |
1002 | @@ -9996,15 +9996,12 @@ |
1003 | done |
1004 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
1005 | |
1006 | -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
1007 | -# Inc. |
1008 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1009 | # |
1010 | # This file is free software; the Free Software Foundation |
1011 | # gives unlimited permission to copy and/or distribute it, |
1012 | # with or without modifications, as long as this notice is preserved. |
1013 | |
1014 | -# serial 1 |
1015 | - |
1016 | # AM_PROG_INSTALL_SH |
1017 | # ------------------ |
1018 | # Define $install_sh. |
1019 | @@ -10018,16 +10015,14 @@ |
1020 | install_sh="\${SHELL} $am_aux_dir/install-sh" |
1021 | esac |
1022 | fi |
1023 | -AC_SUBST(install_sh)]) |
1024 | +AC_SUBST([install_sh])]) |
1025 | |
1026 | -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
1027 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
1028 | # |
1029 | # This file is free software; the Free Software Foundation |
1030 | # gives unlimited permission to copy and/or distribute it, |
1031 | # with or without modifications, as long as this notice is preserved. |
1032 | |
1033 | -# serial 2 |
1034 | - |
1035 | # Check whether the underlying file-system supports filenames |
1036 | # with a leading dot. For instance MS-DOS doesn't. |
1037 | AC_DEFUN([AM_SET_LEADING_DOT], |
1038 | @@ -10044,20 +10039,17 @@ |
1039 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
1040 | # From Jim Meyering |
1041 | |
1042 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
1043 | -# 2011 Free Software Foundation, Inc. |
1044 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1045 | # |
1046 | # This file is free software; the Free Software Foundation |
1047 | # gives unlimited permission to copy and/or distribute it, |
1048 | # with or without modifications, as long as this notice is preserved. |
1049 | |
1050 | -# serial 5 |
1051 | - |
1052 | # AM_MAINTAINER_MODE([DEFAULT-MODE]) |
1053 | # ---------------------------------- |
1054 | # Control maintainer-specific portions of Makefiles. |
1055 | -# Default is to disable them, unless `enable' is passed literally. |
1056 | -# For symmetry, `disable' may be passed as well. Anyway, the user |
1057 | +# Default is to disable them, unless 'enable' is passed literally. |
1058 | +# For symmetry, 'disable' may be passed as well. Anyway, the user |
1059 | # can override the default with the --enable/--disable switch. |
1060 | AC_DEFUN([AM_MAINTAINER_MODE], |
1061 | [m4_case(m4_default([$1], [disable]), |
1062 | @@ -10068,10 +10060,11 @@ |
1063 | AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
1064 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
1065 | AC_ARG_ENABLE([maintainer-mode], |
1066 | -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
1067 | - (and sometimes confusing) to the casual installer], |
1068 | - [USE_MAINTAINER_MODE=$enableval], |
1069 | - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
1070 | + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
1071 | + am_maintainer_other[ make rules and dependencies not useful |
1072 | + (and sometimes confusing) to the casual installer])], |
1073 | + [USE_MAINTAINER_MODE=$enableval], |
1074 | + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
1075 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
1076 | AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
1077 | MAINT=$MAINTAINER_MODE_TRUE |
1078 | @@ -10079,18 +10072,14 @@ |
1079 | ] |
1080 | ) |
1081 | |
1082 | -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) |
1083 | - |
1084 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
1085 | |
1086 | -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
1087 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1088 | # |
1089 | # This file is free software; the Free Software Foundation |
1090 | # gives unlimited permission to copy and/or distribute it, |
1091 | # with or without modifications, as long as this notice is preserved. |
1092 | |
1093 | -# serial 4 |
1094 | - |
1095 | # AM_MAKE_INCLUDE() |
1096 | # ----------------- |
1097 | # Check to see how make treats includes. |
1098 | @@ -10108,7 +10097,7 @@ |
1099 | _am_result=none |
1100 | # First try GNU make style include. |
1101 | echo "include confinc" > confmf |
1102 | -# Ignore all kinds of additional output from `make'. |
1103 | +# Ignore all kinds of additional output from 'make'. |
1104 | case `$am_make -s -f confmf 2> /dev/null` in #( |
1105 | *the\ am__doit\ target*) |
1106 | am__include=include |
1107 | @@ -10135,15 +10124,12 @@ |
1108 | |
1109 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
1110 | |
1111 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
1112 | -# Free Software Foundation, Inc. |
1113 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
1114 | # |
1115 | # This file is free software; the Free Software Foundation |
1116 | # gives unlimited permission to copy and/or distribute it, |
1117 | # with or without modifications, as long as this notice is preserved. |
1118 | |
1119 | -# serial 6 |
1120 | - |
1121 | # AM_MISSING_PROG(NAME, PROGRAM) |
1122 | # ------------------------------ |
1123 | AC_DEFUN([AM_MISSING_PROG], |
1124 | @@ -10151,11 +10137,10 @@ |
1125 | $1=${$1-"${am_missing_run}$2"} |
1126 | AC_SUBST($1)]) |
1127 | |
1128 | - |
1129 | # AM_MISSING_HAS_RUN |
1130 | # ------------------ |
1131 | -# Define MISSING if not defined so far and test if it supports --run. |
1132 | -# If it does, set am_missing_run to use it, otherwise, to nothing. |
1133 | +# Define MISSING if not defined so far and test if it is modern enough. |
1134 | +# If it is, set am_missing_run to use it, otherwise, to nothing. |
1135 | AC_DEFUN([AM_MISSING_HAS_RUN], |
1136 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
1137 | AC_REQUIRE_AUX_FILE([missing])dnl |
1138 | @@ -10168,54 +10153,22 @@ |
1139 | esac |
1140 | fi |
1141 | # Use eval to expand $SHELL |
1142 | -if eval "$MISSING --run true"; then |
1143 | - am_missing_run="$MISSING --run " |
1144 | +if eval "$MISSING --is-lightweight"; then |
1145 | + am_missing_run="$MISSING " |
1146 | else |
1147 | am_missing_run= |
1148 | - AC_MSG_WARN([`missing' script is too old or missing]) |
1149 | + AC_MSG_WARN(['missing' script is too old or missing]) |
1150 | fi |
1151 | ]) |
1152 | |
1153 | -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
1154 | -# Inc. |
1155 | -# |
1156 | -# This file is free software; the Free Software Foundation |
1157 | -# gives unlimited permission to copy and/or distribute it, |
1158 | -# with or without modifications, as long as this notice is preserved. |
1159 | - |
1160 | -# serial 1 |
1161 | - |
1162 | -# AM_PROG_MKDIR_P |
1163 | -# --------------- |
1164 | -# Check for `mkdir -p'. |
1165 | -AC_DEFUN([AM_PROG_MKDIR_P], |
1166 | -[AC_PREREQ([2.60])dnl |
1167 | -AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
1168 | -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
1169 | -dnl while keeping a definition of mkdir_p for backward compatibility. |
1170 | -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
1171 | -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
1172 | -dnl Makefile.ins that do not define MKDIR_P, so we do our own |
1173 | -dnl adjustment using top_builddir (which is defined more often than |
1174 | -dnl MKDIR_P). |
1175 | -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
1176 | -case $mkdir_p in |
1177 | - [[\\/$]]* | ?:[[\\/]]*) ;; |
1178 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
1179 | -esac |
1180 | -]) |
1181 | - |
1182 | # Helper functions for option handling. -*- Autoconf -*- |
1183 | |
1184 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
1185 | -# Foundation, Inc. |
1186 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1187 | # |
1188 | # This file is free software; the Free Software Foundation |
1189 | # gives unlimited permission to copy and/or distribute it, |
1190 | # with or without modifications, as long as this notice is preserved. |
1191 | |
1192 | -# serial 5 |
1193 | - |
1194 | # _AM_MANGLE_OPTION(NAME) |
1195 | # ----------------------- |
1196 | AC_DEFUN([_AM_MANGLE_OPTION], |
1197 | @@ -10225,7 +10178,7 @@ |
1198 | # -------------------- |
1199 | # Set option NAME. Presently that only means defining a flag for this option. |
1200 | AC_DEFUN([_AM_SET_OPTION], |
1201 | -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
1202 | +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
1203 | |
1204 | # _AM_SET_OPTIONS(OPTIONS) |
1205 | # ------------------------ |
1206 | @@ -10239,14 +10192,12 @@ |
1207 | AC_DEFUN([_AM_IF_OPTION], |
1208 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
1209 | |
1210 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1211 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1212 | # |
1213 | # This file is free software; the Free Software Foundation |
1214 | # gives unlimited permission to copy and/or distribute it, |
1215 | # with or without modifications, as long as this notice is preserved. |
1216 | |
1217 | -# serial 1 |
1218 | - |
1219 | # AM_RUN_LOG(COMMAND) |
1220 | # ------------------- |
1221 | # Run COMMAND, save the exit status in ac_status, and log it. |
1222 | @@ -10260,22 +10211,16 @@ |
1223 | |
1224 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
1225 | |
1226 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
1227 | -# Free Software Foundation, Inc. |
1228 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1229 | # |
1230 | # This file is free software; the Free Software Foundation |
1231 | # gives unlimited permission to copy and/or distribute it, |
1232 | # with or without modifications, as long as this notice is preserved. |
1233 | |
1234 | -# serial 5 |
1235 | - |
1236 | # AM_SANITY_CHECK |
1237 | # --------------- |
1238 | AC_DEFUN([AM_SANITY_CHECK], |
1239 | [AC_MSG_CHECKING([whether build environment is sane]) |
1240 | -# Just in case |
1241 | -sleep 1 |
1242 | -echo timestamp > conftest.file |
1243 | # Reject unsafe characters in $srcdir or the absolute working directory |
1244 | # name. Accept space and tab only in the latter. |
1245 | am_lf=' |
1246 | @@ -10286,32 +10231,40 @@ |
1247 | esac |
1248 | case $srcdir in |
1249 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
1250 | - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; |
1251 | + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
1252 | esac |
1253 | |
1254 | -# Do `set' in a subshell so we don't clobber the current shell's |
1255 | +# Do 'set' in a subshell so we don't clobber the current shell's |
1256 | # arguments. Must try -L first in case configure is actually a |
1257 | # symlink; some systems play weird games with the mod time of symlinks |
1258 | # (eg FreeBSD returns the mod time of the symlink's containing |
1259 | # directory). |
1260 | if ( |
1261 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
1262 | - if test "$[*]" = "X"; then |
1263 | - # -L didn't work. |
1264 | - set X `ls -t "$srcdir/configure" conftest.file` |
1265 | - fi |
1266 | - rm -f conftest.file |
1267 | - if test "$[*]" != "X $srcdir/configure conftest.file" \ |
1268 | - && test "$[*]" != "X conftest.file $srcdir/configure"; then |
1269 | - |
1270 | - # If neither matched, then we have a broken ls. This can happen |
1271 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
1272 | - # broken ls alias from the environment. This has actually |
1273 | - # happened. Such a system could not be considered "sane". |
1274 | - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
1275 | -alias in your environment]) |
1276 | - fi |
1277 | - |
1278 | + am_has_slept=no |
1279 | + for am_try in 1 2; do |
1280 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
1281 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
1282 | + if test "$[*]" = "X"; then |
1283 | + # -L didn't work. |
1284 | + set X `ls -t "$srcdir/configure" conftest.file` |
1285 | + fi |
1286 | + if test "$[*]" != "X $srcdir/configure conftest.file" \ |
1287 | + && test "$[*]" != "X conftest.file $srcdir/configure"; then |
1288 | + |
1289 | + # If neither matched, then we have a broken ls. This can happen |
1290 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
1291 | + # broken ls alias from the environment. This has actually |
1292 | + # happened. Such a system could not be considered "sane". |
1293 | + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
1294 | + alias in your environment]) |
1295 | + fi |
1296 | + if test "$[2]" = conftest.file || test $am_try -eq 2; then |
1297 | + break |
1298 | + fi |
1299 | + # Just in case. |
1300 | + sleep 1 |
1301 | + am_has_slept=yes |
1302 | + done |
1303 | test "$[2]" = conftest.file |
1304 | ) |
1305 | then |
1306 | @@ -10321,31 +10274,50 @@ |
1307 | AC_MSG_ERROR([newly created file is older than distributed files! |
1308 | Check your system clock]) |
1309 | fi |
1310 | -AC_MSG_RESULT(yes)]) |
1311 | +AC_MSG_RESULT([yes]) |
1312 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
1313 | +# generated files are strictly newer. |
1314 | +am_sleep_pid= |
1315 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
1316 | + ( sleep 1 ) & |
1317 | + am_sleep_pid=$! |
1318 | +fi |
1319 | +AC_CONFIG_COMMANDS_PRE( |
1320 | + [AC_MSG_CHECKING([that generated files are newer than configure]) |
1321 | + if test -n "$am_sleep_pid"; then |
1322 | + # Hide warnings about reused PIDs. |
1323 | + wait $am_sleep_pid 2>/dev/null |
1324 | + fi |
1325 | + AC_MSG_RESULT([done])]) |
1326 | +rm -f conftest.file |
1327 | +]) |
1328 | |
1329 | -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. |
1330 | +# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
1331 | # |
1332 | # This file is free software; the Free Software Foundation |
1333 | # gives unlimited permission to copy and/or distribute it, |
1334 | # with or without modifications, as long as this notice is preserved. |
1335 | |
1336 | -# serial 2 |
1337 | - |
1338 | # AM_SILENT_RULES([DEFAULT]) |
1339 | # -------------------------- |
1340 | # Enable less verbose build rules; with the default set to DEFAULT |
1341 | -# (`yes' being less verbose, `no' or empty being verbose). |
1342 | +# ("yes" being less verbose, "no" or empty being verbose). |
1343 | AC_DEFUN([AM_SILENT_RULES], |
1344 | -[AC_ARG_ENABLE([silent-rules], |
1345 | -[ --enable-silent-rules less verbose build output (undo: `make V=1') |
1346 | - --disable-silent-rules verbose build output (undo: `make V=0')]) |
1347 | -case $enable_silent_rules in |
1348 | -yes) AM_DEFAULT_VERBOSITY=0;; |
1349 | -no) AM_DEFAULT_VERBOSITY=1;; |
1350 | -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
1351 | +[AC_ARG_ENABLE([silent-rules], [dnl |
1352 | +AS_HELP_STRING( |
1353 | + [--enable-silent-rules], |
1354 | + [less verbose build output (undo: "make V=1")]) |
1355 | +AS_HELP_STRING( |
1356 | + [--disable-silent-rules], |
1357 | + [verbose build output (undo: "make V=0")])dnl |
1358 | +]) |
1359 | +case $enable_silent_rules in @%:@ ((( |
1360 | + yes) AM_DEFAULT_VERBOSITY=0;; |
1361 | + no) AM_DEFAULT_VERBOSITY=1;; |
1362 | + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
1363 | esac |
1364 | dnl |
1365 | -dnl A few `make' implementations (e.g., NonStop OS and NextStep) |
1366 | +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) |
1367 | dnl do not support nested variable expansions. |
1368 | dnl See automake bug#9928 and bug#10237. |
1369 | am_make=${MAKE-make} |
1370 | @@ -10363,7 +10335,7 @@ |
1371 | am_cv_make_support_nested_variables=no |
1372 | fi]) |
1373 | if test $am_cv_make_support_nested_variables = yes; then |
1374 | - dnl Using `$V' instead of `$(V)' breaks IRIX make. |
1375 | + dnl Using '$V' instead of '$(V)' breaks IRIX make. |
1376 | AM_V='$(V)' |
1377 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
1378 | else |
1379 | @@ -10380,44 +10352,40 @@ |
1380 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
1381 | ]) |
1382 | |
1383 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1384 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1385 | # |
1386 | # This file is free software; the Free Software Foundation |
1387 | # gives unlimited permission to copy and/or distribute it, |
1388 | # with or without modifications, as long as this notice is preserved. |
1389 | |
1390 | -# serial 1 |
1391 | - |
1392 | # AM_PROG_INSTALL_STRIP |
1393 | # --------------------- |
1394 | -# One issue with vendor `install' (even GNU) is that you can't |
1395 | +# One issue with vendor 'install' (even GNU) is that you can't |
1396 | # specify the program used to strip binaries. This is especially |
1397 | # annoying in cross-compiling environments, where the build's strip |
1398 | # is unlikely to handle the host's binaries. |
1399 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
1400 | -# always use install-sh in `make install-strip', and initialize |
1401 | +# always use install-sh in "make install-strip", and initialize |
1402 | # STRIPPROG with the value of the STRIP variable (set by the user). |
1403 | AC_DEFUN([AM_PROG_INSTALL_STRIP], |
1404 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
1405 | -# Installed binaries are usually stripped using `strip' when the user |
1406 | -# run `make install-strip'. However `strip' might not be the right |
1407 | +# Installed binaries are usually stripped using 'strip' when the user |
1408 | +# run "make install-strip". However 'strip' might not be the right |
1409 | # tool to use in cross-compilation environments, therefore Automake |
1410 | -# will honor the `STRIP' environment variable to overrule this program. |
1411 | -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. |
1412 | +# will honor the 'STRIP' environment variable to overrule this program. |
1413 | +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
1414 | if test "$cross_compiling" != no; then |
1415 | AC_CHECK_TOOL([STRIP], [strip], :) |
1416 | fi |
1417 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1418 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1419 | |
1420 | -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
1421 | +# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
1422 | # |
1423 | # This file is free software; the Free Software Foundation |
1424 | # gives unlimited permission to copy and/or distribute it, |
1425 | # with or without modifications, as long as this notice is preserved. |
1426 | |
1427 | -# serial 3 |
1428 | - |
1429 | # _AM_SUBST_NOTMAKE(VARIABLE) |
1430 | # --------------------------- |
1431 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
1432 | @@ -10431,18 +10399,16 @@ |
1433 | |
1434 | # Check how to create a tarball. -*- Autoconf -*- |
1435 | |
1436 | -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
1437 | +# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
1438 | # |
1439 | # This file is free software; the Free Software Foundation |
1440 | # gives unlimited permission to copy and/or distribute it, |
1441 | # with or without modifications, as long as this notice is preserved. |
1442 | |
1443 | -# serial 2 |
1444 | - |
1445 | # _AM_PROG_TAR(FORMAT) |
1446 | # -------------------- |
1447 | # Check how to create a tarball in format FORMAT. |
1448 | -# FORMAT should be one of `v7', `ustar', or `pax'. |
1449 | +# FORMAT should be one of 'v7', 'ustar', or 'pax'. |
1450 | # |
1451 | # Substitute a variable $(am__tar) that is a command |
1452 | # writing to stdout a FORMAT-tarball containing the directory |
1453 | @@ -10452,76 +10418,114 @@ |
1454 | # Substitute a variable $(am__untar) that extract such |
1455 | # a tarball read from stdin. |
1456 | # $(am__untar) < result.tar |
1457 | +# |
1458 | AC_DEFUN([_AM_PROG_TAR], |
1459 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
1460 | # in the wild :-( We should find a proper way to deprecate it ... |
1461 | AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1462 | + |
1463 | +# We'll loop over all known methods to create a tar archive until one works. |
1464 | +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1465 | + |
1466 | m4_if([$1], [v7], |
1467 | - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1468 | - [m4_case([$1], [ustar],, [pax],, |
1469 | - [m4_fatal([Unknown tar format])]) |
1470 | -AC_MSG_CHECKING([how to create a $1 tar archive]) |
1471 | -# Loop over all known methods to create a tar archive until one works. |
1472 | -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1473 | -_am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1474 | -# Do not fold the above two line into one, because Tru64 sh and |
1475 | -# Solaris sh will not grok spaces in the rhs of `-'. |
1476 | -for _am_tool in $_am_tools |
1477 | -do |
1478 | - case $_am_tool in |
1479 | - gnutar) |
1480 | - for _am_tar in tar gnutar gtar; |
1481 | - do |
1482 | - AM_RUN_LOG([$_am_tar --version]) && break |
1483 | - done |
1484 | - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1485 | - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
1486 | - am__untar="$_am_tar -xf -" |
1487 | - ;; |
1488 | - plaintar) |
1489 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
1490 | - # ustar tarball either. |
1491 | - (tar --version) >/dev/null 2>&1 && continue |
1492 | - am__tar='tar chf - "$$tardir"' |
1493 | - am__tar_='tar chf - "$tardir"' |
1494 | - am__untar='tar xf -' |
1495 | - ;; |
1496 | - pax) |
1497 | - am__tar='pax -L -x $1 -w "$$tardir"' |
1498 | - am__tar_='pax -L -x $1 -w "$tardir"' |
1499 | - am__untar='pax -r' |
1500 | - ;; |
1501 | - cpio) |
1502 | - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
1503 | - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
1504 | - am__untar='cpio -i -H $1 -d' |
1505 | - ;; |
1506 | - none) |
1507 | - am__tar=false |
1508 | - am__tar_=false |
1509 | - am__untar=false |
1510 | - ;; |
1511 | - esac |
1512 | - |
1513 | - # If the value was cached, stop now. We just wanted to have am__tar |
1514 | - # and am__untar set. |
1515 | - test -n "${am_cv_prog_tar_$1}" && break |
1516 | - |
1517 | - # tar/untar a dummy directory, and stop if the command works |
1518 | - rm -rf conftest.dir |
1519 | - mkdir conftest.dir |
1520 | - echo GrepMe > conftest.dir/file |
1521 | - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
1522 | - rm -rf conftest.dir |
1523 | - if test -s conftest.tar; then |
1524 | - AM_RUN_LOG([$am__untar <conftest.tar]) |
1525 | - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
1526 | - fi |
1527 | -done |
1528 | -rm -rf conftest.dir |
1529 | - |
1530 | -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
1531 | -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
1532 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1533 | + |
1534 | + [m4_case([$1], |
1535 | + [ustar], |
1536 | + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
1537 | + # There is notably a 21 bits limit for the UID and the GID. In fact, |
1538 | + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
1539 | + # and bug#13588). |
1540 | + am_max_uid=2097151 # 2^21 - 1 |
1541 | + am_max_gid=$am_max_uid |
1542 | + # The $UID and $GID variables are not portable, so we need to resort |
1543 | + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
1544 | + # below are definitely unexpected, so allow the users to see them |
1545 | + # (that is, avoid stderr redirection). |
1546 | + am_uid=`id -u || echo unknown` |
1547 | + am_gid=`id -g || echo unknown` |
1548 | + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
1549 | + if test $am_uid -le $am_max_uid; then |
1550 | + AC_MSG_RESULT([yes]) |
1551 | + else |
1552 | + AC_MSG_RESULT([no]) |
1553 | + _am_tools=none |
1554 | + fi |
1555 | + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
1556 | + if test $am_gid -le $am_max_gid; then |
1557 | + AC_MSG_RESULT([yes]) |
1558 | + else |
1559 | + AC_MSG_RESULT([no]) |
1560 | + _am_tools=none |
1561 | + fi], |
1562 | + |
1563 | + [pax], |
1564 | + [], |
1565 | + |
1566 | + [m4_fatal([Unknown tar format])]) |
1567 | + |
1568 | + AC_MSG_CHECKING([how to create a $1 tar archive]) |
1569 | + |
1570 | + # Go ahead even if we have the value already cached. We do so because we |
1571 | + # need to set the values for the 'am__tar' and 'am__untar' variables. |
1572 | + _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1573 | + |
1574 | + for _am_tool in $_am_tools; do |
1575 | + case $_am_tool in |
1576 | + gnutar) |
1577 | + for _am_tar in tar gnutar gtar; do |
1578 | + AM_RUN_LOG([$_am_tar --version]) && break |
1579 | + done |
1580 | + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1581 | + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
1582 | + am__untar="$_am_tar -xf -" |
1583 | + ;; |
1584 | + plaintar) |
1585 | + # Must skip GNU tar: if it does not support --format= it doesn't create |
1586 | + # ustar tarball either. |
1587 | + (tar --version) >/dev/null 2>&1 && continue |
1588 | + am__tar='tar chf - "$$tardir"' |
1589 | + am__tar_='tar chf - "$tardir"' |
1590 | + am__untar='tar xf -' |
1591 | + ;; |
1592 | + pax) |
1593 | + am__tar='pax -L -x $1 -w "$$tardir"' |
1594 | + am__tar_='pax -L -x $1 -w "$tardir"' |
1595 | + am__untar='pax -r' |
1596 | + ;; |
1597 | + cpio) |
1598 | + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
1599 | + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
1600 | + am__untar='cpio -i -H $1 -d' |
1601 | + ;; |
1602 | + none) |
1603 | + am__tar=false |
1604 | + am__tar_=false |
1605 | + am__untar=false |
1606 | + ;; |
1607 | + esac |
1608 | + |
1609 | + # If the value was cached, stop now. We just wanted to have am__tar |
1610 | + # and am__untar set. |
1611 | + test -n "${am_cv_prog_tar_$1}" && break |
1612 | + |
1613 | + # tar/untar a dummy directory, and stop if the command works. |
1614 | + rm -rf conftest.dir |
1615 | + mkdir conftest.dir |
1616 | + echo GrepMe > conftest.dir/file |
1617 | + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
1618 | + rm -rf conftest.dir |
1619 | + if test -s conftest.tar; then |
1620 | + AM_RUN_LOG([$am__untar <conftest.tar]) |
1621 | + AM_RUN_LOG([cat conftest.dir/file]) |
1622 | + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
1623 | + fi |
1624 | + done |
1625 | + rm -rf conftest.dir |
1626 | + |
1627 | + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
1628 | + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
1629 | + |
1630 | AC_SUBST([am__tar]) |
1631 | AC_SUBST([am__untar]) |
1632 | ]) # _AM_PROG_TAR |
1633 | @@ -10910,7 +10914,7 @@ |
1634 | AC_MSG_CHECKING([if $CC supports $flag]) |
1635 | saved_CFLAGS="$CFLAGS" |
1636 | CFLAGS="$CFLAGS $flag" |
1637 | - AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no]) |
1638 | + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) |
1639 | CFLAGS="$saved_CFLAGS" |
1640 | AC_MSG_RESULT([$flag_supported]) |
1641 | |
1642 | @@ -10944,10 +10948,10 @@ |
1643 | -Wdeclaration-after-statement \ |
1644 | -Wmissing-declarations \ |
1645 | -Wmissing-noreturn -Wshadow -Wpointer-arith \ |
1646 | - -Wcast-align -Wformat-security \ |
1647 | + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ |
1648 | -Winit-self -Wmissing-include-dirs -Wundef \ |
1649 | - -Wmissing-format-attribute -Wnested-externs" |
1650 | - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" |
1651 | + -Wnested-externs" |
1652 | + CPPFLAGS="$CPPFLAGS" |
1653 | |
1654 | if test x`uname` = x"Linux"; then |
1655 | xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" |
1656 | @@ -11014,7 +11018,7 @@ |
1657 | saved_CFLAGS="$CFLAGS" |
1658 | CFLAGS="$CFLAGS $xdt_vis_test_cflags" |
1659 | AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) |
1660 | - AC_COMPILE_IFELSE(AC_LANG_SOURCE( |
1661 | + AC_COMPILE_IFELSE([AC_LANG_SOURCE( |
1662 | [ |
1663 | void test_default (void); |
1664 | void test_hidden (void); |
1665 | @@ -11027,7 +11031,7 @@ |
1666 | test_hidden (); |
1667 | return 0; |
1668 | } |
1669 | - ]), |
1670 | + ])], |
1671 | [ |
1672 | have_gnuc_visibility=yes |
1673 | AC_MSG_RESULT([yes]) |
1674 | |
1675 | === modified file 'config.guess' |
1676 | --- config.guess 2014-02-13 16:07:50 +0000 |
1677 | +++ config.guess 2014-02-16 05:44:15 +0000 |
1678 | @@ -1,14 +1,12 @@ |
1679 | #! /bin/sh |
1680 | # Attempt to guess a canonical system name. |
1681 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1682 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1683 | -# 2011, 2012 Free Software Foundation, Inc. |
1684 | +# Copyright 1992-2013 Free Software Foundation, Inc. |
1685 | |
1686 | -timestamp='2012-02-10' |
1687 | +timestamp='2013-06-10' |
1688 | |
1689 | # This file is free software; you can redistribute it and/or modify it |
1690 | # under the terms of the GNU General Public License as published by |
1691 | -# the Free Software Foundation; either version 2 of the License, or |
1692 | +# the Free Software Foundation; either version 3 of the License, or |
1693 | # (at your option) any later version. |
1694 | # |
1695 | # This program is distributed in the hope that it will be useful, but |
1696 | @@ -22,19 +20,17 @@ |
1697 | # As a special exception to the GNU General Public License, if you |
1698 | # distribute this file as part of a program that contains a |
1699 | # configuration script generated by Autoconf, you may include it under |
1700 | -# the same distribution terms that you use for the rest of that program. |
1701 | - |
1702 | - |
1703 | -# Originally written by Per Bothner. Please send patches (context |
1704 | -# diff format) to <config-patches@gnu.org> and include a ChangeLog |
1705 | -# entry. |
1706 | +# the same distribution terms that you use for the rest of that |
1707 | +# program. This Exception is an additional permission under section 7 |
1708 | +# of the GNU General Public License, version 3 ("GPLv3"). |
1709 | # |
1710 | -# This script attempts to guess a canonical system name similar to |
1711 | -# config.sub. If it succeeds, it prints the system name on stdout, and |
1712 | -# exits with 0. Otherwise, it exits with 1. |
1713 | +# Originally written by Per Bothner. |
1714 | # |
1715 | # You can get the latest version of this script from: |
1716 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
1717 | +# |
1718 | +# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
1719 | + |
1720 | |
1721 | me=`echo "$0" | sed -e 's,.*/,,'` |
1722 | |
1723 | @@ -54,9 +50,7 @@ |
1724 | GNU config.guess ($timestamp) |
1725 | |
1726 | Originally written by Per Bothner. |
1727 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1728 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1729 | -Free Software Foundation, Inc. |
1730 | +Copyright 1992-2013 Free Software Foundation, Inc. |
1731 | |
1732 | This is free software; see the source for copying conditions. There is NO |
1733 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1734 | @@ -138,6 +132,27 @@ |
1735 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
1736 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
1737 | |
1738 | +case "${UNAME_SYSTEM}" in |
1739 | +Linux|GNU|GNU/*) |
1740 | + # If the system lacks a compiler, then just pick glibc. |
1741 | + # We could probably try harder. |
1742 | + LIBC=gnu |
1743 | + |
1744 | + eval $set_cc_for_build |
1745 | + cat <<-EOF > $dummy.c |
1746 | + #include <features.h> |
1747 | + #if defined(__UCLIBC__) |
1748 | + LIBC=uclibc |
1749 | + #elif defined(__dietlibc__) |
1750 | + LIBC=dietlibc |
1751 | + #else |
1752 | + LIBC=gnu |
1753 | + #endif |
1754 | + EOF |
1755 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
1756 | + ;; |
1757 | +esac |
1758 | + |
1759 | # Note: order is significant - the case branches are not exclusive. |
1760 | |
1761 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
1762 | @@ -200,6 +215,10 @@ |
1763 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
1764 | echo "${machine}-${os}${release}" |
1765 | exit ;; |
1766 | + *:Bitrig:*:*) |
1767 | + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
1768 | + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} |
1769 | + exit ;; |
1770 | *:OpenBSD:*:*) |
1771 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
1772 | echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
1773 | @@ -302,7 +321,7 @@ |
1774 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
1775 | echo arm-acorn-riscix${UNAME_RELEASE} |
1776 | exit ;; |
1777 | - arm:riscos:*:*|arm:RISCOS:*:*) |
1778 | + arm*:riscos:*:*|arm*:RISCOS:*:*) |
1779 | echo arm-unknown-riscos |
1780 | exit ;; |
1781 | SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
1782 | @@ -801,6 +820,9 @@ |
1783 | i*:CYGWIN*:*) |
1784 | echo ${UNAME_MACHINE}-pc-cygwin |
1785 | exit ;; |
1786 | + *:MINGW64*:*) |
1787 | + echo ${UNAME_MACHINE}-pc-mingw64 |
1788 | + exit ;; |
1789 | *:MINGW*:*) |
1790 | echo ${UNAME_MACHINE}-pc-mingw32 |
1791 | exit ;; |
1792 | @@ -852,21 +874,21 @@ |
1793 | exit ;; |
1794 | *:GNU:*:*) |
1795 | # the GNU system |
1796 | - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
1797 | + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
1798 | exit ;; |
1799 | *:GNU/*:*:*) |
1800 | # other systems with GNU libc and userland |
1801 | - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
1802 | + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} |
1803 | exit ;; |
1804 | i*86:Minix:*:*) |
1805 | echo ${UNAME_MACHINE}-pc-minix |
1806 | exit ;; |
1807 | aarch64:Linux:*:*) |
1808 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1809 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1810 | exit ;; |
1811 | aarch64_be:Linux:*:*) |
1812 | UNAME_MACHINE=aarch64_be |
1813 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1814 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1815 | exit ;; |
1816 | alpha:Linux:*:*) |
1817 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1818 | @@ -879,59 +901,54 @@ |
1819 | EV68*) UNAME_MACHINE=alphaev68 ;; |
1820 | esac |
1821 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
1822 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
1823 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
1824 | + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
1825 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1826 | + exit ;; |
1827 | + arc:Linux:*:* | arceb:Linux:*:*) |
1828 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1829 | exit ;; |
1830 | arm*:Linux:*:*) |
1831 | eval $set_cc_for_build |
1832 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
1833 | | grep -q __ARM_EABI__ |
1834 | then |
1835 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1836 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1837 | else |
1838 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
1839 | | grep -q __ARM_PCS_VFP |
1840 | then |
1841 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
1842 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi |
1843 | else |
1844 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
1845 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf |
1846 | fi |
1847 | fi |
1848 | exit ;; |
1849 | avr32*:Linux:*:*) |
1850 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1851 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1852 | exit ;; |
1853 | cris:Linux:*:*) |
1854 | - echo ${UNAME_MACHINE}-axis-linux-gnu |
1855 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
1856 | exit ;; |
1857 | crisv32:Linux:*:*) |
1858 | - echo ${UNAME_MACHINE}-axis-linux-gnu |
1859 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
1860 | exit ;; |
1861 | frv:Linux:*:*) |
1862 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1863 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1864 | exit ;; |
1865 | hexagon:Linux:*:*) |
1866 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1867 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1868 | exit ;; |
1869 | i*86:Linux:*:*) |
1870 | - LIBC=gnu |
1871 | - eval $set_cc_for_build |
1872 | - sed 's/^ //' << EOF >$dummy.c |
1873 | - #ifdef __dietlibc__ |
1874 | - LIBC=dietlibc |
1875 | - #endif |
1876 | -EOF |
1877 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
1878 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
1879 | + echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
1880 | exit ;; |
1881 | ia64:Linux:*:*) |
1882 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1883 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1884 | exit ;; |
1885 | m32r*:Linux:*:*) |
1886 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1887 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1888 | exit ;; |
1889 | m68*:Linux:*:*) |
1890 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1891 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1892 | exit ;; |
1893 | mips:Linux:*:* | mips64:Linux:*:*) |
1894 | eval $set_cc_for_build |
1895 | @@ -950,54 +967,63 @@ |
1896 | #endif |
1897 | EOF |
1898 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
1899 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
1900 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
1901 | ;; |
1902 | + or1k:Linux:*:*) |
1903 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1904 | + exit ;; |
1905 | or32:Linux:*:*) |
1906 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1907 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1908 | exit ;; |
1909 | padre:Linux:*:*) |
1910 | - echo sparc-unknown-linux-gnu |
1911 | + echo sparc-unknown-linux-${LIBC} |
1912 | exit ;; |
1913 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
1914 | - echo hppa64-unknown-linux-gnu |
1915 | + echo hppa64-unknown-linux-${LIBC} |
1916 | exit ;; |
1917 | parisc:Linux:*:* | hppa:Linux:*:*) |
1918 | # Look for CPU level |
1919 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
1920 | - PA7*) echo hppa1.1-unknown-linux-gnu ;; |
1921 | - PA8*) echo hppa2.0-unknown-linux-gnu ;; |
1922 | - *) echo hppa-unknown-linux-gnu ;; |
1923 | + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; |
1924 | + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; |
1925 | + *) echo hppa-unknown-linux-${LIBC} ;; |
1926 | esac |
1927 | exit ;; |
1928 | ppc64:Linux:*:*) |
1929 | - echo powerpc64-unknown-linux-gnu |
1930 | + echo powerpc64-unknown-linux-${LIBC} |
1931 | exit ;; |
1932 | ppc:Linux:*:*) |
1933 | - echo powerpc-unknown-linux-gnu |
1934 | + echo powerpc-unknown-linux-${LIBC} |
1935 | + exit ;; |
1936 | + ppc64le:Linux:*:*) |
1937 | + echo powerpc64le-unknown-linux-${LIBC} |
1938 | + exit ;; |
1939 | + ppcle:Linux:*:*) |
1940 | + echo powerpcle-unknown-linux-${LIBC} |
1941 | exit ;; |
1942 | s390:Linux:*:* | s390x:Linux:*:*) |
1943 | - echo ${UNAME_MACHINE}-ibm-linux |
1944 | + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} |
1945 | exit ;; |
1946 | sh64*:Linux:*:*) |
1947 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1948 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1949 | exit ;; |
1950 | sh*:Linux:*:*) |
1951 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1952 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1953 | exit ;; |
1954 | sparc:Linux:*:* | sparc64:Linux:*:*) |
1955 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1956 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1957 | exit ;; |
1958 | tile*:Linux:*:*) |
1959 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1960 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1961 | exit ;; |
1962 | vax:Linux:*:*) |
1963 | - echo ${UNAME_MACHINE}-dec-linux-gnu |
1964 | + echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
1965 | exit ;; |
1966 | x86_64:Linux:*:*) |
1967 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1968 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1969 | exit ;; |
1970 | xtensa*:Linux:*:*) |
1971 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1972 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1973 | exit ;; |
1974 | i*86:DYNIX/ptx:4*:*) |
1975 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1976 | @@ -1201,6 +1227,9 @@ |
1977 | BePC:Haiku:*:*) # Haiku running on Intel PC compatible. |
1978 | echo i586-pc-haiku |
1979 | exit ;; |
1980 | + x86_64:Haiku:*:*) |
1981 | + echo x86_64-unknown-haiku |
1982 | + exit ;; |
1983 | SX-4:SUPER-UX:*:*) |
1984 | echo sx4-nec-superux${UNAME_RELEASE} |
1985 | exit ;; |
1986 | @@ -1227,19 +1256,21 @@ |
1987 | exit ;; |
1988 | *:Darwin:*:*) |
1989 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1990 | - case $UNAME_PROCESSOR in |
1991 | - i386) |
1992 | - eval $set_cc_for_build |
1993 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1994 | - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1995 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1996 | - grep IS_64BIT_ARCH >/dev/null |
1997 | - then |
1998 | - UNAME_PROCESSOR="x86_64" |
1999 | - fi |
2000 | - fi ;; |
2001 | - unknown) UNAME_PROCESSOR=powerpc ;; |
2002 | - esac |
2003 | + eval $set_cc_for_build |
2004 | + if test "$UNAME_PROCESSOR" = unknown ; then |
2005 | + UNAME_PROCESSOR=powerpc |
2006 | + fi |
2007 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
2008 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
2009 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
2010 | + grep IS_64BIT_ARCH >/dev/null |
2011 | + then |
2012 | + case $UNAME_PROCESSOR in |
2013 | + i386) UNAME_PROCESSOR=x86_64 ;; |
2014 | + powerpc) UNAME_PROCESSOR=powerpc64 ;; |
2015 | + esac |
2016 | + fi |
2017 | + fi |
2018 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
2019 | exit ;; |
2020 | *:procnto*:*:* | *:QNX:[0123456789]*:*) |
2021 | @@ -1256,7 +1287,7 @@ |
2022 | NEO-?:NONSTOP_KERNEL:*:*) |
2023 | echo neo-tandem-nsk${UNAME_RELEASE} |
2024 | exit ;; |
2025 | - NSE-?:NONSTOP_KERNEL:*:*) |
2026 | + NSE-*:NONSTOP_KERNEL:*:*) |
2027 | echo nse-tandem-nsk${UNAME_RELEASE} |
2028 | exit ;; |
2029 | NSR-?:NONSTOP_KERNEL:*:*) |
2030 | @@ -1330,9 +1361,6 @@ |
2031 | exit ;; |
2032 | esac |
2033 | |
2034 | -#echo '(No uname command or uname output not recognized.)' 1>&2 |
2035 | -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 |
2036 | - |
2037 | eval $set_cc_for_build |
2038 | cat >$dummy.c <<EOF |
2039 | #ifdef _SEQUENT_ |
2040 | |
2041 | === modified file 'config.sub' |
2042 | --- config.sub 2014-02-13 16:07:50 +0000 |
2043 | +++ config.sub 2014-02-16 05:44:15 +0000 |
2044 | @@ -1,24 +1,18 @@ |
2045 | #! /bin/sh |
2046 | # Configuration validation subroutine script. |
2047 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
2048 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
2049 | -# 2011, 2012 Free Software Foundation, Inc. |
2050 | - |
2051 | -timestamp='2012-04-18' |
2052 | - |
2053 | -# This file is (in principle) common to ALL GNU software. |
2054 | -# The presence of a machine in this file suggests that SOME GNU software |
2055 | -# can handle that machine. It does not imply ALL GNU software can. |
2056 | -# |
2057 | -# This file is free software; you can redistribute it and/or modify |
2058 | -# it under the terms of the GNU General Public License as published by |
2059 | -# the Free Software Foundation; either version 2 of the License, or |
2060 | +# Copyright 1992-2013 Free Software Foundation, Inc. |
2061 | + |
2062 | +timestamp='2013-08-10' |
2063 | + |
2064 | +# This file is free software; you can redistribute it and/or modify it |
2065 | +# under the terms of the GNU General Public License as published by |
2066 | +# the Free Software Foundation; either version 3 of the License, or |
2067 | # (at your option) any later version. |
2068 | # |
2069 | -# This program is distributed in the hope that it will be useful, |
2070 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
2071 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2072 | -# GNU General Public License for more details. |
2073 | +# This program is distributed in the hope that it will be useful, but |
2074 | +# WITHOUT ANY WARRANTY; without even the implied warranty of |
2075 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
2076 | +# General Public License for more details. |
2077 | # |
2078 | # You should have received a copy of the GNU General Public License |
2079 | # along with this program; if not, see <http://www.gnu.org/licenses/>. |
2080 | @@ -26,11 +20,12 @@ |
2081 | # As a special exception to the GNU General Public License, if you |
2082 | # distribute this file as part of a program that contains a |
2083 | # configuration script generated by Autoconf, you may include it under |
2084 | -# the same distribution terms that you use for the rest of that program. |
2085 | - |
2086 | - |
2087 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
2088 | -# diff and a properly formatted GNU ChangeLog entry. |
2089 | +# the same distribution terms that you use for the rest of that |
2090 | +# program. This Exception is an additional permission under section 7 |
2091 | +# of the GNU General Public License, version 3 ("GPLv3"). |
2092 | + |
2093 | + |
2094 | +# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
2095 | # |
2096 | # Configuration subroutine to validate and canonicalize a configuration type. |
2097 | # Supply the specified configuration type as an argument. |
2098 | @@ -73,9 +68,7 @@ |
2099 | version="\ |
2100 | GNU config.sub ($timestamp) |
2101 | |
2102 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
2103 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
2104 | -Free Software Foundation, Inc. |
2105 | +Copyright 1992-2013 Free Software Foundation, Inc. |
2106 | |
2107 | This is free software; see the source for copying conditions. There is NO |
2108 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
2109 | @@ -123,7 +116,7 @@ |
2110 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
2111 | case $maybe_os in |
2112 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
2113 | - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
2114 | + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
2115 | knetbsd*-gnu* | netbsd*-gnu* | \ |
2116 | kopensolaris*-gnu* | \ |
2117 | storm-chaos* | os2-emx* | rtmk-nova*) |
2118 | @@ -156,7 +149,7 @@ |
2119 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
2120 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
2121 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
2122 | - -apple | -axis | -knuth | -cray | -microblaze) |
2123 | + -apple | -axis | -knuth | -cray | -microblaze*) |
2124 | os= |
2125 | basic_machine=$1 |
2126 | ;; |
2127 | @@ -259,10 +252,12 @@ |
2128 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
2129 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
2130 | | am33_2.0 \ |
2131 | - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
2132 | - | be32 | be64 \ |
2133 | + | arc | arceb \ |
2134 | + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ |
2135 | + | avr | avr32 \ |
2136 | + | be32 | be64 \ |
2137 | | bfin \ |
2138 | - | c4x | clipper \ |
2139 | + | c4x | c8051 | clipper \ |
2140 | | d10v | d30v | dlx | dsp16xx \ |
2141 | | epiphany \ |
2142 | | fido | fr30 | frv \ |
2143 | @@ -273,7 +268,7 @@ |
2144 | | le32 | le64 \ |
2145 | | lm32 \ |
2146 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
2147 | - | maxq | mb | microblaze | mcore | mep | metag \ |
2148 | + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ |
2149 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
2150 | | mips16 \ |
2151 | | mips64 | mips64el \ |
2152 | @@ -291,16 +286,17 @@ |
2153 | | mipsisa64r2 | mipsisa64r2el \ |
2154 | | mipsisa64sb1 | mipsisa64sb1el \ |
2155 | | mipsisa64sr71k | mipsisa64sr71kel \ |
2156 | + | mipsr5900 | mipsr5900el \ |
2157 | | mipstx39 | mipstx39el \ |
2158 | | mn10200 | mn10300 \ |
2159 | | moxie \ |
2160 | | mt \ |
2161 | | msp430 \ |
2162 | | nds32 | nds32le | nds32be \ |
2163 | - | nios | nios2 \ |
2164 | + | nios | nios2 | nios2eb | nios2el \ |
2165 | | ns16k | ns32k \ |
2166 | | open8 \ |
2167 | - | or32 \ |
2168 | + | or1k | or32 \ |
2169 | | pdp10 | pdp11 | pj | pjl \ |
2170 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
2171 | | pyramid \ |
2172 | @@ -370,13 +366,13 @@ |
2173 | | aarch64-* | aarch64_be-* \ |
2174 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
2175 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
2176 | - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
2177 | + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
2178 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
2179 | | avr-* | avr32-* \ |
2180 | | be32-* | be64-* \ |
2181 | | bfin-* | bs2000-* \ |
2182 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
2183 | - | clipper-* | craynv-* | cydra-* \ |
2184 | + | c8051-* | clipper-* | craynv-* | cydra-* \ |
2185 | | d10v-* | d30v-* | dlx-* \ |
2186 | | elxsi-* \ |
2187 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
2188 | @@ -389,7 +385,8 @@ |
2189 | | lm32-* \ |
2190 | | m32c-* | m32r-* | m32rle-* \ |
2191 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
2192 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
2193 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
2194 | + | microblaze-* | microblazeel-* \ |
2195 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
2196 | | mips16-* \ |
2197 | | mips64-* | mips64el-* \ |
2198 | @@ -407,12 +404,13 @@ |
2199 | | mipsisa64r2-* | mipsisa64r2el-* \ |
2200 | | mipsisa64sb1-* | mipsisa64sb1el-* \ |
2201 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
2202 | + | mipsr5900-* | mipsr5900el-* \ |
2203 | | mipstx39-* | mipstx39el-* \ |
2204 | | mmix-* \ |
2205 | | mt-* \ |
2206 | | msp430-* \ |
2207 | | nds32-* | nds32le-* | nds32be-* \ |
2208 | - | nios-* | nios2-* \ |
2209 | + | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
2210 | | none-* | np1-* | ns16k-* | ns32k-* \ |
2211 | | open8-* \ |
2212 | | orion-* \ |
2213 | @@ -788,11 +786,15 @@ |
2214 | basic_machine=ns32k-utek |
2215 | os=-sysv |
2216 | ;; |
2217 | - microblaze) |
2218 | + microblaze*) |
2219 | basic_machine=microblaze-xilinx |
2220 | ;; |
2221 | + mingw64) |
2222 | + basic_machine=x86_64-pc |
2223 | + os=-mingw64 |
2224 | + ;; |
2225 | mingw32) |
2226 | - basic_machine=i386-pc |
2227 | + basic_machine=i686-pc |
2228 | os=-mingw32 |
2229 | ;; |
2230 | mingw32ce) |
2231 | @@ -828,7 +830,7 @@ |
2232 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
2233 | ;; |
2234 | msys) |
2235 | - basic_machine=i386-pc |
2236 | + basic_machine=i686-pc |
2237 | os=-msys |
2238 | ;; |
2239 | mvs) |
2240 | @@ -1019,7 +1021,11 @@ |
2241 | basic_machine=i586-unknown |
2242 | os=-pw32 |
2243 | ;; |
2244 | - rdos) |
2245 | + rdos | rdos64) |
2246 | + basic_machine=x86_64-pc |
2247 | + os=-rdos |
2248 | + ;; |
2249 | + rdos32) |
2250 | basic_machine=i386-pc |
2251 | os=-rdos |
2252 | ;; |
2253 | @@ -1346,21 +1352,21 @@ |
2254 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
2255 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
2256 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
2257 | - | -sym* | -kopensolaris* \ |
2258 | + | -sym* | -kopensolaris* | -plan9* \ |
2259 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
2260 | | -aos* | -aros* \ |
2261 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
2262 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
2263 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
2264 | - | -openbsd* | -solidbsd* \ |
2265 | + | -bitrig* | -openbsd* | -solidbsd* \ |
2266 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
2267 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
2268 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
2269 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
2270 | | -chorusos* | -chorusrdb* | -cegcc* \ |
2271 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
2272 | - | -mingw32* | -linux-gnu* | -linux-android* \ |
2273 | - | -linux-newlib* | -linux-uclibc* \ |
2274 | + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
2275 | + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
2276 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
2277 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
2278 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
2279 | @@ -1492,9 +1498,6 @@ |
2280 | -aros*) |
2281 | os=-aros |
2282 | ;; |
2283 | - -kaos*) |
2284 | - os=-kaos |
2285 | - ;; |
2286 | -zvmoe) |
2287 | os=-zvmoe |
2288 | ;; |
2289 | @@ -1543,6 +1546,9 @@ |
2290 | c4x-* | tic4x-*) |
2291 | os=-coff |
2292 | ;; |
2293 | + c8051-*) |
2294 | + os=-elf |
2295 | + ;; |
2296 | hexagon-*) |
2297 | os=-elf |
2298 | ;; |
2299 | @@ -1586,6 +1592,9 @@ |
2300 | mips*-*) |
2301 | os=-elf |
2302 | ;; |
2303 | + or1k-*) |
2304 | + os=-elf |
2305 | + ;; |
2306 | or32-*) |
2307 | os=-coff |
2308 | ;; |
2309 | |
2310 | === modified file 'configure' |
2311 | --- configure 2014-02-13 16:07:50 +0000 |
2312 | +++ configure 2014-02-16 05:44:15 +0000 |
2313 | @@ -1,7 +1,7 @@ |
2314 | #! /bin/sh |
2315 | -# From configure.ac 4971cc4. |
2316 | +# From configure.ac 620b8e7. |
2317 | # Guess values for system-dependent variables and create Makefiles. |
2318 | -# Generated by GNU Autoconf 2.69 for xfce4-indicator-plugin 2.2.0. |
2319 | +# Generated by GNU Autoconf 2.69 for xfce4-indicator-plugin 2.3.0. |
2320 | # |
2321 | # Report bugs to <http://bugzilla.xfce.org/>. |
2322 | # |
2323 | @@ -594,8 +594,8 @@ |
2324 | # Identity of this package. |
2325 | PACKAGE_NAME='xfce4-indicator-plugin' |
2326 | PACKAGE_TARNAME='xfce4-indicator-plugin' |
2327 | -PACKAGE_VERSION='2.2.0' |
2328 | -PACKAGE_STRING='xfce4-indicator-plugin 2.2.0' |
2329 | +PACKAGE_VERSION='2.3.0' |
2330 | +PACKAGE_STRING='xfce4-indicator-plugin 2.3.0' |
2331 | PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' |
2332 | PACKAGE_URL='' |
2333 | |
2334 | @@ -774,13 +774,13 @@ |
2335 | LDFLAGS |
2336 | CFLAGS |
2337 | CC |
2338 | +MAINT |
2339 | +MAINTAINER_MODE_FALSE |
2340 | +MAINTAINER_MODE_TRUE |
2341 | AM_BACKSLASH |
2342 | AM_DEFAULT_VERBOSITY |
2343 | AM_DEFAULT_V |
2344 | AM_V |
2345 | -MAINT |
2346 | -MAINTAINER_MODE_FALSE |
2347 | -MAINTAINER_MODE_TRUE |
2348 | am__untar |
2349 | am__tar |
2350 | AMTAR |
2351 | @@ -857,8 +857,8 @@ |
2352 | ac_subst_files='' |
2353 | ac_user_opts=' |
2354 | enable_option_checking |
2355 | +enable_silent_rules |
2356 | enable_maintainer_mode |
2357 | -enable_silent_rules |
2358 | enable_dependency_tracking |
2359 | with_gnu_ld |
2360 | enable_nls |
2361 | @@ -1426,7 +1426,7 @@ |
2362 | # Omit some internal or obsolete options to make the list less imposing. |
2363 | # This message is too long to be a string in the A/UX 3.1 sh. |
2364 | cat <<_ACEOF |
2365 | -\`configure' configures xfce4-indicator-plugin 2.2.0 to adapt to many kinds of systems. |
2366 | +\`configure' configures xfce4-indicator-plugin 2.3.0 to adapt to many kinds of systems. |
2367 | |
2368 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2369 | |
2370 | @@ -1502,7 +1502,7 @@ |
2371 | |
2372 | if test -n "$ac_init_help"; then |
2373 | case $ac_init_help in |
2374 | - short | recursive ) echo "Configuration of xfce4-indicator-plugin 2.2.0:";; |
2375 | + short | recursive ) echo "Configuration of xfce4-indicator-plugin 2.3.0:";; |
2376 | esac |
2377 | cat <<\_ACEOF |
2378 | |
2379 | @@ -1510,12 +1510,15 @@ |
2380 | --disable-option-checking ignore unrecognized --enable/--with options |
2381 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
2382 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
2383 | - --enable-maintainer-mode enable make rules and dependencies not useful |
2384 | - (and sometimes confusing) to the casual installer |
2385 | - --enable-silent-rules less verbose build output (undo: `make V=1') |
2386 | - --disable-silent-rules verbose build output (undo: `make V=0') |
2387 | - --disable-dependency-tracking speeds up one-time build |
2388 | - --enable-dependency-tracking do not reject slow dependency extractors |
2389 | + --enable-silent-rules less verbose build output (undo: "make V=1") |
2390 | + --disable-silent-rules verbose build output (undo: "make V=0") |
2391 | + --enable-maintainer-mode |
2392 | + enable make rules and dependencies not useful (and |
2393 | + sometimes confusing) to the casual installer |
2394 | + --enable-dependency-tracking |
2395 | + do not reject slow dependency extractors |
2396 | + --disable-dependency-tracking |
2397 | + speeds up one-time build |
2398 | --disable-nls do not use Native Language Support |
2399 | --enable-static[=PKGS] build static libraries [default=no] |
2400 | --enable-shared[=PKGS] build shared libraries [default=yes] |
2401 | @@ -1624,7 +1627,7 @@ |
2402 | test -n "$ac_init_help" && exit $ac_status |
2403 | if $ac_init_version; then |
2404 | cat <<\_ACEOF |
2405 | -xfce4-indicator-plugin configure 2.2.0 |
2406 | +xfce4-indicator-plugin configure 2.3.0 |
2407 | generated by GNU Autoconf 2.69 |
2408 | |
2409 | Copyright (C) 2012 Free Software Foundation, Inc. |
2410 | @@ -1996,7 +1999,7 @@ |
2411 | This file contains any messages produced by compilers while |
2412 | running configure, to aid debugging if configure makes a mistake. |
2413 | |
2414 | -It was created by xfce4-indicator-plugin $as_me 2.2.0, which was |
2415 | +It was created by xfce4-indicator-plugin $as_me 2.3.0, which was |
2416 | generated by GNU Autoconf 2.69. Invocation command line was |
2417 | |
2418 | $ $0 $@ |
2419 | @@ -2488,7 +2491,7 @@ |
2420 | program_prefix=${target_alias}- |
2421 | |
2422 | |
2423 | -am__api_version='1.11' |
2424 | +am__api_version='1.13' |
2425 | |
2426 | # Find a good install program. We prefer a C program (faster), |
2427 | # so one script is as good as another. But avoid the broken or |
2428 | @@ -2585,9 +2588,6 @@ |
2429 | |
2430 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
2431 | $as_echo_n "checking whether build environment is sane... " >&6; } |
2432 | -# Just in case |
2433 | -sleep 1 |
2434 | -echo timestamp > conftest.file |
2435 | # Reject unsafe characters in $srcdir or the absolute working directory |
2436 | # name. Accept space and tab only in the latter. |
2437 | am_lf=' |
2438 | @@ -2598,32 +2598,40 @@ |
2439 | esac |
2440 | case $srcdir in |
2441 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
2442 | - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
2443 | + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; |
2444 | esac |
2445 | |
2446 | -# Do `set' in a subshell so we don't clobber the current shell's |
2447 | +# Do 'set' in a subshell so we don't clobber the current shell's |
2448 | # arguments. Must try -L first in case configure is actually a |
2449 | # symlink; some systems play weird games with the mod time of symlinks |
2450 | # (eg FreeBSD returns the mod time of the symlink's containing |
2451 | # directory). |
2452 | if ( |
2453 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
2454 | - if test "$*" = "X"; then |
2455 | - # -L didn't work. |
2456 | - set X `ls -t "$srcdir/configure" conftest.file` |
2457 | - fi |
2458 | - rm -f conftest.file |
2459 | - if test "$*" != "X $srcdir/configure conftest.file" \ |
2460 | - && test "$*" != "X conftest.file $srcdir/configure"; then |
2461 | - |
2462 | - # If neither matched, then we have a broken ls. This can happen |
2463 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
2464 | - # broken ls alias from the environment. This has actually |
2465 | - # happened. Such a system could not be considered "sane". |
2466 | - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
2467 | -alias in your environment" "$LINENO" 5 |
2468 | - fi |
2469 | - |
2470 | + am_has_slept=no |
2471 | + for am_try in 1 2; do |
2472 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
2473 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
2474 | + if test "$*" = "X"; then |
2475 | + # -L didn't work. |
2476 | + set X `ls -t "$srcdir/configure" conftest.file` |
2477 | + fi |
2478 | + if test "$*" != "X $srcdir/configure conftest.file" \ |
2479 | + && test "$*" != "X conftest.file $srcdir/configure"; then |
2480 | + |
2481 | + # If neither matched, then we have a broken ls. This can happen |
2482 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
2483 | + # broken ls alias from the environment. This has actually |
2484 | + # happened. Such a system could not be considered "sane". |
2485 | + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
2486 | + alias in your environment" "$LINENO" 5 |
2487 | + fi |
2488 | + if test "$2" = conftest.file || test $am_try -eq 2; then |
2489 | + break |
2490 | + fi |
2491 | + # Just in case. |
2492 | + sleep 1 |
2493 | + am_has_slept=yes |
2494 | + done |
2495 | test "$2" = conftest.file |
2496 | ) |
2497 | then |
2498 | @@ -2635,6 +2643,16 @@ |
2499 | fi |
2500 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2501 | $as_echo "yes" >&6; } |
2502 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
2503 | +# generated files are strictly newer. |
2504 | +am_sleep_pid= |
2505 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
2506 | + ( sleep 1 ) & |
2507 | + am_sleep_pid=$! |
2508 | +fi |
2509 | + |
2510 | +rm -f conftest.file |
2511 | + |
2512 | test "$program_prefix" != NONE && |
2513 | program_transform_name="s&^&$program_prefix&;$program_transform_name" |
2514 | # Use a double $ so make ignores it. |
2515 | @@ -2657,12 +2675,12 @@ |
2516 | esac |
2517 | fi |
2518 | # Use eval to expand $SHELL |
2519 | -if eval "$MISSING --run true"; then |
2520 | - am_missing_run="$MISSING --run " |
2521 | +if eval "$MISSING --is-lightweight"; then |
2522 | + am_missing_run="$MISSING " |
2523 | else |
2524 | am_missing_run= |
2525 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 |
2526 | -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} |
2527 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 |
2528 | +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} |
2529 | fi |
2530 | |
2531 | if test x"${install_sh}" != xset; then |
2532 | @@ -2674,10 +2692,10 @@ |
2533 | esac |
2534 | fi |
2535 | |
2536 | -# Installed binaries are usually stripped using `strip' when the user |
2537 | -# run `make install-strip'. However `strip' might not be the right |
2538 | +# Installed binaries are usually stripped using 'strip' when the user |
2539 | +# run "make install-strip". However 'strip' might not be the right |
2540 | # tool to use in cross-compilation environments, therefore Automake |
2541 | -# will honor the `STRIP' environment variable to overrule this program. |
2542 | +# will honor the 'STRIP' environment variable to overrule this program. |
2543 | if test "$cross_compiling" != no; then |
2544 | if test -n "$ac_tool_prefix"; then |
2545 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
2546 | @@ -2816,12 +2834,6 @@ |
2547 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 |
2548 | $as_echo "$MKDIR_P" >&6; } |
2549 | |
2550 | -mkdir_p="$MKDIR_P" |
2551 | -case $mkdir_p in |
2552 | - [\\/$]* | ?:[\\/]*) ;; |
2553 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
2554 | -esac |
2555 | - |
2556 | for ac_prog in gawk mawk nawk awk |
2557 | do |
2558 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
2559 | @@ -2904,6 +2916,45 @@ |
2560 | fi |
2561 | rmdir .tst 2>/dev/null |
2562 | |
2563 | +# Check whether --enable-silent-rules was given. |
2564 | +if test "${enable_silent_rules+set}" = set; then : |
2565 | + enableval=$enable_silent_rules; |
2566 | +fi |
2567 | + |
2568 | +case $enable_silent_rules in # ((( |
2569 | + yes) AM_DEFAULT_VERBOSITY=0;; |
2570 | + no) AM_DEFAULT_VERBOSITY=1;; |
2571 | + *) AM_DEFAULT_VERBOSITY=1;; |
2572 | +esac |
2573 | +am_make=${MAKE-make} |
2574 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
2575 | +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } |
2576 | +if ${am_cv_make_support_nested_variables+:} false; then : |
2577 | + $as_echo_n "(cached) " >&6 |
2578 | +else |
2579 | + if $as_echo 'TRUE=$(BAR$(V)) |
2580 | +BAR0=false |
2581 | +BAR1=true |
2582 | +V=1 |
2583 | +am__doit: |
2584 | + @$(TRUE) |
2585 | +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then |
2586 | + am_cv_make_support_nested_variables=yes |
2587 | +else |
2588 | + am_cv_make_support_nested_variables=no |
2589 | +fi |
2590 | +fi |
2591 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 |
2592 | +$as_echo "$am_cv_make_support_nested_variables" >&6; } |
2593 | +if test $am_cv_make_support_nested_variables = yes; then |
2594 | + AM_V='$(V)' |
2595 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
2596 | +else |
2597 | + AM_V=$AM_DEFAULT_VERBOSITY |
2598 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
2599 | +fi |
2600 | +AM_BACKSLASH='\' |
2601 | + |
2602 | if test "`cd $srcdir && pwd`" != "`pwd`"; then |
2603 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
2604 | # is not polluted with repeated "-I." |
2605 | @@ -2926,7 +2977,7 @@ |
2606 | |
2607 | # Define the identity of the package. |
2608 | PACKAGE='xfce4-indicator-plugin' |
2609 | - VERSION='2.2.0' |
2610 | + VERSION='2.3.0' |
2611 | |
2612 | |
2613 | cat >>confdefs.h <<_ACEOF |
2614 | @@ -2954,6 +3005,12 @@ |
2615 | |
2616 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
2617 | |
2618 | +# For better backward compatibility. To be removed once Automake 1.9.x |
2619 | +# dies out for good. For more background, see: |
2620 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
2621 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
2622 | +mkdir_p='$(MKDIR_P)' |
2623 | + |
2624 | # We need awk for the "check" target. The system "awk" is bad on |
2625 | # some platforms. |
2626 | # Always define AMTAR for backward compatibility. Yes, it's still used |
2627 | @@ -2961,86 +3018,125 @@ |
2628 | AMTAR='$${TAR-tar}' |
2629 | |
2630 | |
2631 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 |
2632 | +# We'll loop over all known methods to create a tar archive until one works. |
2633 | +_am_tools='gnutar plaintar pax cpio none' |
2634 | + |
2635 | +# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
2636 | + # There is notably a 21 bits limit for the UID and the GID. In fact, |
2637 | + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
2638 | + # and bug#13588). |
2639 | + am_max_uid=2097151 # 2^21 - 1 |
2640 | + am_max_gid=$am_max_uid |
2641 | + # The $UID and $GID variables are not portable, so we need to resort |
2642 | + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
2643 | + # below are definitely unexpected, so allow the users to see them |
2644 | + # (that is, avoid stderr redirection). |
2645 | + am_uid=`id -u || echo unknown` |
2646 | + am_gid=`id -g || echo unknown` |
2647 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 |
2648 | +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } |
2649 | + if test $am_uid -le $am_max_uid; then |
2650 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2651 | +$as_echo "yes" >&6; } |
2652 | + else |
2653 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2654 | +$as_echo "no" >&6; } |
2655 | + _am_tools=none |
2656 | + fi |
2657 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 |
2658 | +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } |
2659 | + if test $am_gid -le $am_max_gid; then |
2660 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2661 | +$as_echo "yes" >&6; } |
2662 | + else |
2663 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2664 | +$as_echo "no" >&6; } |
2665 | + _am_tools=none |
2666 | + fi |
2667 | + |
2668 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 |
2669 | $as_echo_n "checking how to create a ustar tar archive... " >&6; } |
2670 | -# Loop over all known methods to create a tar archive until one works. |
2671 | -_am_tools='gnutar plaintar pax cpio none' |
2672 | -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} |
2673 | -# Do not fold the above two line into one, because Tru64 sh and |
2674 | -# Solaris sh will not grok spaces in the rhs of `-'. |
2675 | -for _am_tool in $_am_tools |
2676 | -do |
2677 | - case $_am_tool in |
2678 | - gnutar) |
2679 | - for _am_tar in tar gnutar gtar; |
2680 | - do |
2681 | - { echo "$as_me:$LINENO: $_am_tar --version" >&5 |
2682 | + |
2683 | + # Go ahead even if we have the value already cached. We do so because we |
2684 | + # need to set the values for the 'am__tar' and 'am__untar' variables. |
2685 | + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} |
2686 | + |
2687 | + for _am_tool in $_am_tools; do |
2688 | + case $_am_tool in |
2689 | + gnutar) |
2690 | + for _am_tar in tar gnutar gtar; do |
2691 | + { echo "$as_me:$LINENO: $_am_tar --version" >&5 |
2692 | ($_am_tar --version) >&5 2>&5 |
2693 | ac_status=$? |
2694 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2695 | (exit $ac_status); } && break |
2696 | - done |
2697 | - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' |
2698 | - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' |
2699 | - am__untar="$_am_tar -xf -" |
2700 | - ;; |
2701 | - plaintar) |
2702 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
2703 | - # ustar tarball either. |
2704 | - (tar --version) >/dev/null 2>&1 && continue |
2705 | - am__tar='tar chf - "$$tardir"' |
2706 | - am__tar_='tar chf - "$tardir"' |
2707 | - am__untar='tar xf -' |
2708 | - ;; |
2709 | - pax) |
2710 | - am__tar='pax -L -x ustar -w "$$tardir"' |
2711 | - am__tar_='pax -L -x ustar -w "$tardir"' |
2712 | - am__untar='pax -r' |
2713 | - ;; |
2714 | - cpio) |
2715 | - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' |
2716 | - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' |
2717 | - am__untar='cpio -i -H ustar -d' |
2718 | - ;; |
2719 | - none) |
2720 | - am__tar=false |
2721 | - am__tar_=false |
2722 | - am__untar=false |
2723 | - ;; |
2724 | - esac |
2725 | - |
2726 | - # If the value was cached, stop now. We just wanted to have am__tar |
2727 | - # and am__untar set. |
2728 | - test -n "${am_cv_prog_tar_ustar}" && break |
2729 | - |
2730 | - # tar/untar a dummy directory, and stop if the command works |
2731 | - rm -rf conftest.dir |
2732 | - mkdir conftest.dir |
2733 | - echo GrepMe > conftest.dir/file |
2734 | - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 |
2735 | + done |
2736 | + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' |
2737 | + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' |
2738 | + am__untar="$_am_tar -xf -" |
2739 | + ;; |
2740 | + plaintar) |
2741 | + # Must skip GNU tar: if it does not support --format= it doesn't create |
2742 | + # ustar tarball either. |
2743 | + (tar --version) >/dev/null 2>&1 && continue |
2744 | + am__tar='tar chf - "$$tardir"' |
2745 | + am__tar_='tar chf - "$tardir"' |
2746 | + am__untar='tar xf -' |
2747 | + ;; |
2748 | + pax) |
2749 | + am__tar='pax -L -x ustar -w "$$tardir"' |
2750 | + am__tar_='pax -L -x ustar -w "$tardir"' |
2751 | + am__untar='pax -r' |
2752 | + ;; |
2753 | + cpio) |
2754 | + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' |
2755 | + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' |
2756 | + am__untar='cpio -i -H ustar -d' |
2757 | + ;; |
2758 | + none) |
2759 | + am__tar=false |
2760 | + am__tar_=false |
2761 | + am__untar=false |
2762 | + ;; |
2763 | + esac |
2764 | + |
2765 | + # If the value was cached, stop now. We just wanted to have am__tar |
2766 | + # and am__untar set. |
2767 | + test -n "${am_cv_prog_tar_ustar}" && break |
2768 | + |
2769 | + # tar/untar a dummy directory, and stop if the command works. |
2770 | + rm -rf conftest.dir |
2771 | + mkdir conftest.dir |
2772 | + echo GrepMe > conftest.dir/file |
2773 | + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 |
2774 | (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 |
2775 | ac_status=$? |
2776 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2777 | (exit $ac_status); } |
2778 | - rm -rf conftest.dir |
2779 | - if test -s conftest.tar; then |
2780 | - { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 |
2781 | + rm -rf conftest.dir |
2782 | + if test -s conftest.tar; then |
2783 | + { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 |
2784 | ($am__untar <conftest.tar) >&5 2>&5 |
2785 | ac_status=$? |
2786 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2787 | (exit $ac_status); } |
2788 | - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
2789 | - fi |
2790 | -done |
2791 | -rm -rf conftest.dir |
2792 | + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 |
2793 | + (cat conftest.dir/file) >&5 2>&5 |
2794 | + ac_status=$? |
2795 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2796 | + (exit $ac_status); } |
2797 | + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
2798 | + fi |
2799 | + done |
2800 | + rm -rf conftest.dir |
2801 | |
2802 | -if ${am_cv_prog_tar_ustar+:} false; then : |
2803 | + if ${am_cv_prog_tar_ustar+:} false; then : |
2804 | $as_echo_n "(cached) " >&6 |
2805 | else |
2806 | am_cv_prog_tar_ustar=$_am_tool |
2807 | fi |
2808 | |
2809 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 |
2810 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 |
2811 | $as_echo "$am_cv_prog_tar_ustar" >&6; } |
2812 | |
2813 | |
2814 | @@ -3048,6 +3144,7 @@ |
2815 | |
2816 | |
2817 | |
2818 | + |
2819 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
2820 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
2821 | # Check whether --enable-maintainer-mode was given. |
2822 | @@ -3075,10 +3172,10 @@ |
2823 | enableval=$enable_silent_rules; |
2824 | fi |
2825 | |
2826 | -case $enable_silent_rules in |
2827 | -yes) AM_DEFAULT_VERBOSITY=0;; |
2828 | -no) AM_DEFAULT_VERBOSITY=1;; |
2829 | -*) AM_DEFAULT_VERBOSITY=0;; |
2830 | +case $enable_silent_rules in # ((( |
2831 | + yes) AM_DEFAULT_VERBOSITY=0;; |
2832 | + no) AM_DEFAULT_VERBOSITY=1;; |
2833 | + *) AM_DEFAULT_VERBOSITY=0;; |
2834 | esac |
2835 | am_make=${MAKE-make} |
2836 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
2837 | @@ -3917,7 +4014,7 @@ |
2838 | _am_result=none |
2839 | # First try GNU make style include. |
2840 | echo "include confinc" > confmf |
2841 | -# Ignore all kinds of additional output from `make'. |
2842 | +# Ignore all kinds of additional output from 'make'. |
2843 | case `$am_make -s -f confmf 2> /dev/null` in #( |
2844 | *the\ am__doit\ target*) |
2845 | am__include=include |
2846 | @@ -3973,8 +4070,8 @@ |
2847 | # We make a subdir and do the tests there. Otherwise we can end up |
2848 | # making bogus files that we don't know about and never remove. For |
2849 | # instance it was reported that on HP-UX the gcc test will end up |
2850 | - # making a dummy file named `D' -- because `-MD' means `put the output |
2851 | - # in D'. |
2852 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
2853 | + # in D". |
2854 | rm -rf conftest.dir |
2855 | mkdir conftest.dir |
2856 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2857 | @@ -4009,16 +4106,16 @@ |
2858 | : > sub/conftest.c |
2859 | for i in 1 2 3 4 5 6; do |
2860 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
2861 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
2862 | - # Solaris 8's {/usr,}/bin/sh. |
2863 | - touch sub/conftst$i.h |
2864 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
2865 | + # Solaris 10 /bin/sh. |
2866 | + echo '/* dummy */' > sub/conftst$i.h |
2867 | done |
2868 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
2869 | |
2870 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
2871 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
2872 | # mode. It turns out that the SunPro C++ compiler does not properly |
2873 | - # handle `-M -o', and we need to detect this. Also, some Intel |
2874 | - # versions had trouble with output in subdirs |
2875 | + # handle '-M -o', and we need to detect this. Also, some Intel |
2876 | + # versions had trouble with output in subdirs. |
2877 | am__obj=sub/conftest.${OBJEXT-o} |
2878 | am__minus_obj="-o $am__obj" |
2879 | case $depmode in |
2880 | @@ -4027,8 +4124,8 @@ |
2881 | test "$am__universal" = false || continue |
2882 | ;; |
2883 | nosideeffect) |
2884 | - # after this tag, mechanisms are not by side-effect, so they'll |
2885 | - # only be used when explicitly requested |
2886 | + # After this tag, mechanisms are not by side-effect, so they'll |
2887 | + # only be used when explicitly requested. |
2888 | if test "x$enable_dependency_tracking" = xyes; then |
2889 | continue |
2890 | else |
2891 | @@ -4036,7 +4133,7 @@ |
2892 | fi |
2893 | ;; |
2894 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2895 | - # This compiler won't grok `-c -o', but also, the minuso test has |
2896 | + # This compiler won't grok '-c -o', but also, the minuso test has |
2897 | # not run yet. These depmodes are late enough in the game, and |
2898 | # so weak that their functioning should not be impacted. |
2899 | am__obj=conftest.${OBJEXT-o} |
2900 | @@ -12227,7 +12324,7 @@ |
2901 | |
2902 | |
2903 | |
2904 | - ALL_LINGUAS="ar bg ca cs da de en_AU en_GB es eu fi fr gl hr hu id it ja ko lt nl pl pt_BR pt ro ru sk sr tr ug uk zh_CN zh_TW " |
2905 | + ALL_LINGUAS="ar bg ca cs da de en_AU en_GB es eu fi fr gl hr hu id it ja ko lt nl oc pl pt pt_BR ro ru sk sl sr sv tr ug uk zh_CN zh_TW " |
2906 | |
2907 | for ac_header in locale.h |
2908 | do : |
2909 | @@ -14463,9 +14560,9 @@ |
2910 | |
2911 | |
2912 | |
2913 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4panel-${LIBXFCE4PANEL_VERSION_API} >= 4.10.0git" >&5 |
2914 | -$as_echo_n "checking for libxfce4panel-${LIBXFCE4PANEL_VERSION_API} >= 4.10.0git... " >&6; } |
2915 | - if $PKG_CONFIG "--atleast-version=4.10.0git" "libxfce4panel-${LIBXFCE4PANEL_VERSION_API}" >/dev/null 2>&1; then |
2916 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4panel-${LIBXFCE4PANEL_VERSION_API} >= 4.11.0" >&5 |
2917 | +$as_echo_n "checking for libxfce4panel-${LIBXFCE4PANEL_VERSION_API} >= 4.11.0... " >&6; } |
2918 | + if $PKG_CONFIG "--atleast-version=4.11.0" "libxfce4panel-${LIBXFCE4PANEL_VERSION_API}" >/dev/null 2>&1; then |
2919 | LIBXFCE4PANEL_VERSION=`$PKG_CONFIG --modversion "libxfce4panel-${LIBXFCE4PANEL_VERSION_API}"` |
2920 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_VERSION" >&5 |
2921 | $as_echo "$LIBXFCE4PANEL_VERSION" >&6; } |
2922 | @@ -14482,7 +14579,7 @@ |
2923 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_LIBS" >&5 |
2924 | $as_echo "$LIBXFCE4PANEL_LIBS" >&6; } |
2925 | |
2926 | - LIBXFCE4PANEL_REQUIRED_VERSION=4.10.0git |
2927 | + LIBXFCE4PANEL_REQUIRED_VERSION=4.11.0 |
2928 | |
2929 | |
2930 | |
2931 | @@ -14498,7 +14595,7 @@ |
2932 | |
2933 | echo "*** The required package libxfce4panel-${LIBXFCE4PANEL_VERSION_API} was found on your system," |
2934 | echo "*** but the installed version ($xdt_cv_version) is too old." |
2935 | - echo "*** Please upgrade libxfce4panel-${LIBXFCE4PANEL_VERSION_API} to atleast version 4.10.0git, or adjust" |
2936 | + echo "*** Please upgrade libxfce4panel-${LIBXFCE4PANEL_VERSION_API} to atleast version 4.11.0, or adjust" |
2937 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" |
2938 | echo "*** the new version of the package in a nonstandard prefix so" |
2939 | echo "*** pkg-config is able to find it." |
2940 | @@ -14510,7 +14607,7 @@ |
2941 | |
2942 | |
2943 | echo "*** The required package libxfce4panel-${LIBXFCE4PANEL_VERSION_API} was not found on your system." |
2944 | - echo "*** Please install libxfce4panel-${LIBXFCE4PANEL_VERSION_API} (atleast version 4.10.0git) or adjust" |
2945 | + echo "*** Please install libxfce4panel-${LIBXFCE4PANEL_VERSION_API} (atleast version 4.11.0) or adjust" |
2946 | echo "*** the PKG_CONFIG_PATH environment variable if you" |
2947 | echo "*** installed the package in a nonstandard prefix so that" |
2948 | echo "*** pkg-config is able to find it." |
2949 | @@ -15197,10 +15294,10 @@ |
2950 | -Wdeclaration-after-statement \ |
2951 | -Wmissing-declarations \ |
2952 | -Wmissing-noreturn -Wshadow -Wpointer-arith \ |
2953 | - -Wcast-align -Wformat-security \ |
2954 | + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ |
2955 | -Winit-self -Wmissing-include-dirs -Wundef \ |
2956 | - -Wmissing-format-attribute -Wnested-externs" |
2957 | - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" |
2958 | + -Wnested-externs" |
2959 | + CPPFLAGS="$CPPFLAGS" |
2960 | |
2961 | if test x`uname` = x"Linux"; then |
2962 | xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" |
2963 | @@ -15403,6 +15500,14 @@ |
2964 | LTLIBOBJS=$ac_ltlibobjs |
2965 | |
2966 | |
2967 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 |
2968 | +$as_echo_n "checking that generated files are newer than configure... " >&6; } |
2969 | + if test -n "$am_sleep_pid"; then |
2970 | + # Hide warnings about reused PIDs. |
2971 | + wait $am_sleep_pid 2>/dev/null |
2972 | + fi |
2973 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 |
2974 | +$as_echo "done" >&6; } |
2975 | if test -n "$EXEEXT"; then |
2976 | am__EXEEXT_TRUE= |
2977 | am__EXEEXT_FALSE='#' |
2978 | @@ -15828,7 +15933,7 @@ |
2979 | # report actual input values of CONFIG_FILES etc. instead of their |
2980 | # values after options handling. |
2981 | ac_log=" |
2982 | -This file was extended by xfce4-indicator-plugin $as_me 2.2.0, which was |
2983 | +This file was extended by xfce4-indicator-plugin $as_me 2.3.0, which was |
2984 | generated by GNU Autoconf 2.69. Invocation command line was |
2985 | |
2986 | CONFIG_FILES = $CONFIG_FILES |
2987 | @@ -15894,7 +15999,7 @@ |
2988 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2989 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2990 | ac_cs_version="\\ |
2991 | -xfce4-indicator-plugin config.status 2.2.0 |
2992 | +xfce4-indicator-plugin config.status 2.3.0 |
2993 | configured by $0, generated by GNU Autoconf 2.69, |
2994 | with options \\"\$ac_cs_config\\" |
2995 | |
2996 | @@ -16909,7 +17014,7 @@ |
2997 | |
2998 | case $ac_file$ac_mode in |
2999 | "depfiles":C) test x"$AMDEP_TRUE" != x"" || { |
3000 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
3001 | + # Older Autoconf quotes --file arguments for eval, but not when files |
3002 | # are listed without --file. Let's play safe and only enable the eval |
3003 | # if we detect the quoting. |
3004 | case $CONFIG_FILES in |
3005 | @@ -16922,7 +17027,7 @@ |
3006 | # Strip MF so we end up with the name of the file. |
3007 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
3008 | # Check whether this is an Automake generated Makefile or not. |
3009 | - # We used to match only the files named `Makefile.in', but |
3010 | + # We used to match only the files named 'Makefile.in', but |
3011 | # some people rename them; so instead we look at the file content. |
3012 | # Grep'ing the first line is not enough: some people post-process |
3013 | # each Makefile.in and add a new line on top of each file to say so. |
3014 | @@ -16956,21 +17061,19 @@ |
3015 | continue |
3016 | fi |
3017 | # Extract the definition of DEPDIR, am__include, and am__quote |
3018 | - # from the Makefile without running `make'. |
3019 | + # from the Makefile without running 'make'. |
3020 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
3021 | test -z "$DEPDIR" && continue |
3022 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
3023 | - test -z "am__include" && continue |
3024 | + test -z "$am__include" && continue |
3025 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
3026 | - # When using ansi2knr, U may be empty or an underscore; expand it |
3027 | - U=`sed -n 's/^U = //p' < "$mf"` |
3028 | # Find all dependency output files, they are included files with |
3029 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
3030 | # simplest approach to changing $(DEPDIR) to its actual value in the |
3031 | # expansion. |
3032 | for file in `sed -n " |
3033 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
3034 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
3035 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
3036 | # Make sure the directory exists. |
3037 | test -f "$dirpart/$file" && continue |
3038 | fdir=`$as_dirname -- "$file" || |
3039 | |
3040 | === modified file 'configure.ac' |
3041 | --- configure.ac 2014-02-13 16:07:50 +0000 |
3042 | +++ configure.ac 2014-02-16 05:44:15 +0000 |
3043 | @@ -12,10 +12,10 @@ |
3044 | dnl *** Version information *** |
3045 | dnl *************************** |
3046 | m4_define([indicator_version_major], [2]) |
3047 | -m4_define([indicator_version_minor], [2]) |
3048 | +m4_define([indicator_version_minor], [3]) |
3049 | m4_define([indicator_version_micro], [0]) |
3050 | m4_define([indicator_version_nano], []) dnl leave this empty to have no nano version |
3051 | -m4_define([indicator_version_build], [4971cc4]) |
3052 | +m4_define([indicator_version_build], [620b8e7]) |
3053 | m4_define([indicator_version_tag], []) |
3054 | m4_define([indicator_version], [indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(), [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], [indicator_version_tag()-indicator_version_build()], [indicator_version_tag()])]) |
3055 | |
3056 | @@ -28,7 +28,7 @@ |
3057 | AC_PREREQ([2.50]) |
3058 | AC_CONFIG_HEADERS([config.h]) |
3059 | AC_CANONICAL_TARGET() |
3060 | -AC_REVISION([4971cc4]) |
3061 | +AC_REVISION([620b8e7]) |
3062 | |
3063 | dnl *************************** |
3064 | dnl *** Initialize automake *** |
3065 | @@ -67,7 +67,7 @@ |
3066 | dnl ****************************** |
3067 | dnl *** Check for i18n support *** |
3068 | dnl ****************************** |
3069 | -XDT_I18N([ar bg ca cs da de en_AU en_GB es eu fi fr gl hr hu id it ja ko lt nl pl pt_BR pt ro ru sk sr tr ug uk zh_CN zh_TW ]) |
3070 | +XDT_I18N([ar bg ca cs da de en_AU en_GB es eu fi fr gl hr hu id it ja ko lt nl oc pl pt pt_BR ro ru sk sl sr sv tr ug uk zh_CN zh_TW ]) |
3071 | |
3072 | dnl ******************************* |
3073 | dnl *** Check for X11 installed *** |
3074 | @@ -86,7 +86,7 @@ |
3075 | dnl XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0]) |
3076 | XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0]) |
3077 | XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0]) |
3078 | -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.10.0git]) |
3079 | +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0]) |
3080 | XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) |
3081 | INDICATOR_PKGNAME=indicator3-0.4 |
3082 | XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1]) |
3083 | |
3084 | === modified file 'debian/changelog' |
3085 | --- debian/changelog 2014-02-13 16:07:50 +0000 |
3086 | +++ debian/changelog 2014-02-16 05:44:15 +0000 |
3087 | @@ -1,3 +1,10 @@ |
3088 | +xfce4-indicator-plugin (2.3.0-0ubuntu1) trusty; urgency=medium |
3089 | + |
3090 | + * New upstream release. LP: #1238997 |
3091 | + * Bump required panel version |
3092 | + |
3093 | + -- Jackson Doak <noskcaj@ubuntu.com> Sun, 16 Feb 2014 15:03:36 +1100 |
3094 | + |
3095 | xfce4-indicator-plugin (2.2.0-0ubuntu1) trusty; urgency=low |
3096 | |
3097 | [ Unit 193 ] |
3098 | |
3099 | === modified file 'debian/control' |
3100 | --- debian/control 2014-02-13 16:07:50 +0000 |
3101 | +++ debian/control 2014-02-16 05:44:15 +0000 |
3102 | @@ -5,7 +5,7 @@ |
3103 | XSBC-Original-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org> |
3104 | Uploaders: Yves-Alexis Perez <corsac@debian.org>, |
3105 | Evgeni Golov <evgeni@debian.org>, Lionel Le Folgoc <mrpouit@gmail.com> |
3106 | -Build-Depends: debhelper (>= 9), xfce4-panel-dev (>= 4.11.0~0.git20140209.86a1b73-0ubuntu1), |
3107 | +Build-Depends: debhelper (>= 9), xfce4-panel-dev (>= 4.11.0), |
3108 | libindicator3-dev, libido3-0.1-dev, intltool, libexo-1-dev, libxfconf-0-dev, libxfce4ui-2-dev (>= 4.11), |
3109 | libxfce4util-dev (>= 4.9), dpkg-dev (>= 1.16.1~), autotools-dev, libgtk-3-dev (>= 3.6) |
3110 | Standards-Version: 3.9.4 |
3111 | |
3112 | === modified file 'depcomp' |
3113 | --- depcomp 2014-02-13 16:07:50 +0000 |
3114 | +++ depcomp 2014-02-16 05:44:15 +0000 |
3115 | @@ -1,10 +1,9 @@ |
3116 | #! /bin/sh |
3117 | # depcomp - compile a program generating dependencies as side-effects |
3118 | |
3119 | -scriptversion=2012-03-27.16; # UTC |
3120 | +scriptversion=2013-05-30.07; # UTC |
3121 | |
3122 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, |
3123 | -# 2011, 2012 Free Software Foundation, Inc. |
3124 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
3125 | |
3126 | # This program is free software; you can redistribute it and/or modify |
3127 | # it under the terms of the GNU General Public License as published by |
3128 | @@ -28,9 +27,9 @@ |
3129 | |
3130 | case $1 in |
3131 | '') |
3132 | - echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
3133 | - exit 1; |
3134 | - ;; |
3135 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
3136 | + exit 1; |
3137 | + ;; |
3138 | -h | --h*) |
3139 | cat <<\EOF |
3140 | Usage: depcomp [--help] [--version] PROGRAM [ARGS] |
3141 | @@ -57,11 +56,65 @@ |
3142 | ;; |
3143 | esac |
3144 | |
3145 | +# Get the directory component of the given path, and save it in the |
3146 | +# global variables '$dir'. Note that this directory component will |
3147 | +# be either empty or ending with a '/' character. This is deliberate. |
3148 | +set_dir_from () |
3149 | +{ |
3150 | + case $1 in |
3151 | + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; |
3152 | + *) dir=;; |
3153 | + esac |
3154 | +} |
3155 | + |
3156 | +# Get the suffix-stripped basename of the given path, and save it the |
3157 | +# global variable '$base'. |
3158 | +set_base_from () |
3159 | +{ |
3160 | + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` |
3161 | +} |
3162 | + |
3163 | +# If no dependency file was actually created by the compiler invocation, |
3164 | +# we still have to create a dummy depfile, to avoid errors with the |
3165 | +# Makefile "include basename.Plo" scheme. |
3166 | +make_dummy_depfile () |
3167 | +{ |
3168 | + echo "#dummy" > "$depfile" |
3169 | +} |
3170 | + |
3171 | +# Factor out some common post-processing of the generated depfile. |
3172 | +# Requires the auxiliary global variable '$tmpdepfile' to be set. |
3173 | +aix_post_process_depfile () |
3174 | +{ |
3175 | + # If the compiler actually managed to produce a dependency file, |
3176 | + # post-process it. |
3177 | + if test -f "$tmpdepfile"; then |
3178 | + # Each line is of the form 'foo.o: dependency.h'. |
3179 | + # Do two passes, one to just change these to |
3180 | + # $object: dependency.h |
3181 | + # and one to simply output |
3182 | + # dependency.h: |
3183 | + # which is needed to avoid the deleted-header problem. |
3184 | + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" |
3185 | + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" |
3186 | + } > "$depfile" |
3187 | + rm -f "$tmpdepfile" |
3188 | + else |
3189 | + make_dummy_depfile |
3190 | + fi |
3191 | +} |
3192 | + |
3193 | # A tabulation character. |
3194 | tab=' ' |
3195 | # A newline character. |
3196 | nl=' |
3197 | ' |
3198 | +# Character ranges might be problematic outside the C locale. |
3199 | +# These definitions help. |
3200 | +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ |
3201 | +lower=abcdefghijklmnopqrstuvwxyz |
3202 | +digits=0123456789 |
3203 | +alpha=${upper}${lower} |
3204 | |
3205 | if test -z "$depmode" || test -z "$source" || test -z "$object"; then |
3206 | echo "depcomp: Variables source, object and depmode must be set" 1>&2 |
3207 | @@ -75,6 +128,9 @@ |
3208 | |
3209 | rm -f "$tmpdepfile" |
3210 | |
3211 | +# Avoid interferences from the environment. |
3212 | +gccflag= dashmflag= |
3213 | + |
3214 | # Some modes work just like other modes, but use different flags. We |
3215 | # parameterize here, but still list the modes in the big case below, |
3216 | # to make depend.m4 easier to write. Note that we *cannot* use a case |
3217 | @@ -86,32 +142,32 @@ |
3218 | fi |
3219 | |
3220 | if test "$depmode" = dashXmstdout; then |
3221 | - # This is just like dashmstdout with a different argument. |
3222 | - dashmflag=-xM |
3223 | - depmode=dashmstdout |
3224 | + # This is just like dashmstdout with a different argument. |
3225 | + dashmflag=-xM |
3226 | + depmode=dashmstdout |
3227 | fi |
3228 | |
3229 | cygpath_u="cygpath -u -f -" |
3230 | if test "$depmode" = msvcmsys; then |
3231 | - # This is just like msvisualcpp but w/o cygpath translation. |
3232 | - # Just convert the backslash-escaped backslashes to single forward |
3233 | - # slashes to satisfy depend.m4 |
3234 | - cygpath_u='sed s,\\\\,/,g' |
3235 | - depmode=msvisualcpp |
3236 | + # This is just like msvisualcpp but w/o cygpath translation. |
3237 | + # Just convert the backslash-escaped backslashes to single forward |
3238 | + # slashes to satisfy depend.m4 |
3239 | + cygpath_u='sed s,\\\\,/,g' |
3240 | + depmode=msvisualcpp |
3241 | fi |
3242 | |
3243 | if test "$depmode" = msvc7msys; then |
3244 | - # This is just like msvc7 but w/o cygpath translation. |
3245 | - # Just convert the backslash-escaped backslashes to single forward |
3246 | - # slashes to satisfy depend.m4 |
3247 | - cygpath_u='sed s,\\\\,/,g' |
3248 | - depmode=msvc7 |
3249 | + # This is just like msvc7 but w/o cygpath translation. |
3250 | + # Just convert the backslash-escaped backslashes to single forward |
3251 | + # slashes to satisfy depend.m4 |
3252 | + cygpath_u='sed s,\\\\,/,g' |
3253 | + depmode=msvc7 |
3254 | fi |
3255 | |
3256 | if test "$depmode" = xlc; then |
3257 | - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. |
3258 | - gccflag=-qmakedep=gcc,-MF |
3259 | - depmode=gcc |
3260 | + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. |
3261 | + gccflag=-qmakedep=gcc,-MF |
3262 | + depmode=gcc |
3263 | fi |
3264 | |
3265 | case "$depmode" in |
3266 | @@ -134,8 +190,7 @@ |
3267 | done |
3268 | "$@" |
3269 | stat=$? |
3270 | - if test $stat -eq 0; then : |
3271 | - else |
3272 | + if test $stat -ne 0; then |
3273 | rm -f "$tmpdepfile" |
3274 | exit $stat |
3275 | fi |
3276 | @@ -143,13 +198,17 @@ |
3277 | ;; |
3278 | |
3279 | gcc) |
3280 | +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. |
3281 | +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. |
3282 | +## (see the conditional assignment to $gccflag above). |
3283 | ## There are various ways to get dependency output from gcc. Here's |
3284 | ## why we pick this rather obscure method: |
3285 | ## - Don't want to use -MD because we'd like the dependencies to end |
3286 | ## up in a subdir. Having to rename by hand is ugly. |
3287 | ## (We might end up doing this anyway to support other compilers.) |
3288 | ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like |
3289 | -## -MM, not -M (despite what the docs say). |
3290 | +## -MM, not -M (despite what the docs say). Also, it might not be |
3291 | +## supported by the other compilers which use the 'gcc' depmode. |
3292 | ## - Using -M directly means running the compiler twice (even worse |
3293 | ## than renaming). |
3294 | if test -z "$gccflag"; then |
3295 | @@ -157,15 +216,14 @@ |
3296 | fi |
3297 | "$@" -Wp,"$gccflag$tmpdepfile" |
3298 | stat=$? |
3299 | - if test $stat -eq 0; then : |
3300 | - else |
3301 | + if test $stat -ne 0; then |
3302 | rm -f "$tmpdepfile" |
3303 | exit $stat |
3304 | fi |
3305 | rm -f "$depfile" |
3306 | echo "$object : \\" > "$depfile" |
3307 | - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz |
3308 | -## The second -e expression handles DOS-style file names with drive letters. |
3309 | + # The second -e expression handles DOS-style file names with drive |
3310 | + # letters. |
3311 | sed -e 's/^[^:]*: / /' \ |
3312 | -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" |
3313 | ## This next piece of magic avoids the "deleted header file" problem. |
3314 | @@ -174,15 +232,15 @@ |
3315 | ## typically no way to rebuild the header). We avoid this by adding |
3316 | ## dummy dependencies for each header file. Too bad gcc doesn't do |
3317 | ## this for us directly. |
3318 | - tr ' ' "$nl" < "$tmpdepfile" | |
3319 | ## Some versions of gcc put a space before the ':'. On the theory |
3320 | ## that the space means something, we add a space to the output as |
3321 | ## well. hp depmode also adds that space, but also prefixes the VPATH |
3322 | ## to the object. Take care to not repeat it in the output. |
3323 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
3324 | ## correctly. Breaking it into two sed invocations is a workaround. |
3325 | - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
3326 | - | sed -e 's/$/ :/' >> "$depfile" |
3327 | + tr ' ' "$nl" < "$tmpdepfile" \ |
3328 | + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
3329 | + | sed -e 's/$/ :/' >> "$depfile" |
3330 | rm -f "$tmpdepfile" |
3331 | ;; |
3332 | |
3333 | @@ -200,8 +258,7 @@ |
3334 | "$@" -MDupdate "$tmpdepfile" |
3335 | fi |
3336 | stat=$? |
3337 | - if test $stat -eq 0; then : |
3338 | - else |
3339 | + if test $stat -ne 0; then |
3340 | rm -f "$tmpdepfile" |
3341 | exit $stat |
3342 | fi |
3343 | @@ -209,7 +266,6 @@ |
3344 | |
3345 | if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files |
3346 | echo "$object : \\" > "$depfile" |
3347 | - |
3348 | # Clip off the initial element (the dependent). Don't try to be |
3349 | # clever and replace this with sed code, as IRIX sed won't handle |
3350 | # lines with more than a fixed number of characters (4096 in |
3351 | @@ -217,19 +273,15 @@ |
3352 | # the IRIX cc adds comments like '#:fec' to the end of the |
3353 | # dependency line. |
3354 | tr ' ' "$nl" < "$tmpdepfile" \ |
3355 | - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ |
3356 | - tr "$nl" ' ' >> "$depfile" |
3357 | + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ |
3358 | + | tr "$nl" ' ' >> "$depfile" |
3359 | echo >> "$depfile" |
3360 | - |
3361 | # The second pass generates a dummy entry for each header file. |
3362 | tr ' ' "$nl" < "$tmpdepfile" \ |
3363 | - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
3364 | - >> "$depfile" |
3365 | + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
3366 | + >> "$depfile" |
3367 | else |
3368 | - # The sourcefile does not contain any dependencies, so just |
3369 | - # store a dummy comment line, to avoid errors with the Makefile |
3370 | - # "include basename.Plo" scheme. |
3371 | - echo "#dummy" > "$depfile" |
3372 | + make_dummy_depfile |
3373 | fi |
3374 | rm -f "$tmpdepfile" |
3375 | ;; |
3376 | @@ -247,9 +299,8 @@ |
3377 | # current directory. Also, the AIX compiler puts '$object:' at the |
3378 | # start of each line; $object doesn't have directory information. |
3379 | # Version 6 uses the directory in both cases. |
3380 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
3381 | - test "x$dir" = "x$object" && dir= |
3382 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
3383 | + set_dir_from "$object" |
3384 | + set_base_from "$object" |
3385 | if test "$libtool" = yes; then |
3386 | tmpdepfile1=$dir$base.u |
3387 | tmpdepfile2=$base.u |
3388 | @@ -262,9 +313,7 @@ |
3389 | "$@" -M |
3390 | fi |
3391 | stat=$? |
3392 | - |
3393 | - if test $stat -eq 0; then : |
3394 | - else |
3395 | + if test $stat -ne 0; then |
3396 | rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
3397 | exit $stat |
3398 | fi |
3399 | @@ -273,65 +322,113 @@ |
3400 | do |
3401 | test -f "$tmpdepfile" && break |
3402 | done |
3403 | - if test -f "$tmpdepfile"; then |
3404 | - # Each line is of the form 'foo.o: dependent.h'. |
3405 | - # Do two passes, one to just change these to |
3406 | - # '$object: dependent.h' and one to simply 'dependent.h:'. |
3407 | - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
3408 | - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
3409 | - else |
3410 | - # The sourcefile does not contain any dependencies, so just |
3411 | - # store a dummy comment line, to avoid errors with the Makefile |
3412 | - # "include basename.Plo" scheme. |
3413 | - echo "#dummy" > "$depfile" |
3414 | + aix_post_process_depfile |
3415 | + ;; |
3416 | + |
3417 | +tcc) |
3418 | + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 |
3419 | + # FIXME: That version still under development at the moment of writing. |
3420 | + # Make that this statement remains true also for stable, released |
3421 | + # versions. |
3422 | + # It will wrap lines (doesn't matter whether long or short) with a |
3423 | + # trailing '\', as in: |
3424 | + # |
3425 | + # foo.o : \ |
3426 | + # foo.c \ |
3427 | + # foo.h \ |
3428 | + # |
3429 | + # It will put a trailing '\' even on the last line, and will use leading |
3430 | + # spaces rather than leading tabs (at least since its commit 0394caf7 |
3431 | + # "Emit spaces for -MD"). |
3432 | + "$@" -MD -MF "$tmpdepfile" |
3433 | + stat=$? |
3434 | + if test $stat -ne 0; then |
3435 | + rm -f "$tmpdepfile" |
3436 | + exit $stat |
3437 | fi |
3438 | + rm -f "$depfile" |
3439 | + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. |
3440 | + # We have to change lines of the first kind to '$object: \'. |
3441 | + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" |
3442 | + # And for each line of the second kind, we have to emit a 'dep.h:' |
3443 | + # dummy dependency, to avoid the deleted-header problem. |
3444 | + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" |
3445 | rm -f "$tmpdepfile" |
3446 | ;; |
3447 | |
3448 | -icc) |
3449 | - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. |
3450 | - # However on |
3451 | - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c |
3452 | - # ICC 7.0 will fill foo.d with something like |
3453 | - # foo.o: sub/foo.c |
3454 | - # foo.o: sub/foo.h |
3455 | - # which is wrong. We want |
3456 | - # sub/foo.o: sub/foo.c |
3457 | - # sub/foo.o: sub/foo.h |
3458 | - # sub/foo.c: |
3459 | - # sub/foo.h: |
3460 | - # ICC 7.1 will output |
3461 | +## The order of this option in the case statement is important, since the |
3462 | +## shell code in configure will try each of these formats in the order |
3463 | +## listed in this file. A plain '-MD' option would be understood by many |
3464 | +## compilers, so we must ensure this comes after the gcc and icc options. |
3465 | +pgcc) |
3466 | + # Portland's C compiler understands '-MD'. |
3467 | + # Will always output deps to 'file.d' where file is the root name of the |
3468 | + # source file under compilation, even if file resides in a subdirectory. |
3469 | + # The object file name does not affect the name of the '.d' file. |
3470 | + # pgcc 10.2 will output |
3471 | # foo.o: sub/foo.c sub/foo.h |
3472 | - # and will wrap long lines using '\': |
3473 | + # and will wrap long lines using '\' : |
3474 | # foo.o: sub/foo.c ... \ |
3475 | # sub/foo.h ... \ |
3476 | # ... |
3477 | - # tcc 0.9.26 (FIXME still under development at the moment of writing) |
3478 | - # will emit a similar output, but also prepend the continuation lines |
3479 | - # with horizontal tabulation characters. |
3480 | - "$@" -MD -MF "$tmpdepfile" |
3481 | - stat=$? |
3482 | - if test $stat -eq 0; then : |
3483 | - else |
3484 | + set_dir_from "$object" |
3485 | + # Use the source, not the object, to determine the base name, since |
3486 | + # that's sadly what pgcc will do too. |
3487 | + set_base_from "$source" |
3488 | + tmpdepfile=$base.d |
3489 | + |
3490 | + # For projects that build the same source file twice into different object |
3491 | + # files, the pgcc approach of using the *source* file root name can cause |
3492 | + # problems in parallel builds. Use a locking strategy to avoid stomping on |
3493 | + # the same $tmpdepfile. |
3494 | + lockdir=$base.d-lock |
3495 | + trap " |
3496 | + echo '$0: caught signal, cleaning up...' >&2 |
3497 | + rmdir '$lockdir' |
3498 | + exit 1 |
3499 | + " 1 2 13 15 |
3500 | + numtries=100 |
3501 | + i=$numtries |
3502 | + while test $i -gt 0; do |
3503 | + # mkdir is a portable test-and-set. |
3504 | + if mkdir "$lockdir" 2>/dev/null; then |
3505 | + # This process acquired the lock. |
3506 | + "$@" -MD |
3507 | + stat=$? |
3508 | + # Release the lock. |
3509 | + rmdir "$lockdir" |
3510 | + break |
3511 | + else |
3512 | + # If the lock is being held by a different process, wait |
3513 | + # until the winning process is done or we timeout. |
3514 | + while test -d "$lockdir" && test $i -gt 0; do |
3515 | + sleep 1 |
3516 | + i=`expr $i - 1` |
3517 | + done |
3518 | + fi |
3519 | + i=`expr $i - 1` |
3520 | + done |
3521 | + trap - 1 2 13 15 |
3522 | + if test $i -le 0; then |
3523 | + echo "$0: failed to acquire lock after $numtries attempts" >&2 |
3524 | + echo "$0: check lockdir '$lockdir'" >&2 |
3525 | + exit 1 |
3526 | + fi |
3527 | + |
3528 | + if test $stat -ne 0; then |
3529 | rm -f "$tmpdepfile" |
3530 | exit $stat |
3531 | fi |
3532 | rm -f "$depfile" |
3533 | - # Each line is of the form 'foo.o: dependent.h', |
3534 | - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. |
3535 | + # Each line is of the form `foo.o: dependent.h', |
3536 | + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. |
3537 | # Do two passes, one to just change these to |
3538 | - # '$object: dependent.h' and one to simply 'dependent.h:'. |
3539 | - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ |
3540 | - < "$tmpdepfile" > "$depfile" |
3541 | - sed ' |
3542 | - s/[ '"$tab"'][ '"$tab"']*/ /g |
3543 | - s/^ *// |
3544 | - s/ *\\*$// |
3545 | - s/^[^:]*: *// |
3546 | - /^$/d |
3547 | - /:$/d |
3548 | - s/$/ :/ |
3549 | - ' < "$tmpdepfile" >> "$depfile" |
3550 | + # `$object: dependent.h' and one to simply `dependent.h:'. |
3551 | + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" |
3552 | + # Some versions of the HPUX 10.20 sed can't process this invocation |
3553 | + # correctly. Breaking it into two sed invocations is a workaround. |
3554 | + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ |
3555 | + | sed -e 's/$/ :/' >> "$depfile" |
3556 | rm -f "$tmpdepfile" |
3557 | ;; |
3558 | |
3559 | @@ -342,9 +439,8 @@ |
3560 | # 'foo.d', which lands next to the object file, wherever that |
3561 | # happens to be. |
3562 | # Much of this is similar to the tru64 case; see comments there. |
3563 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
3564 | - test "x$dir" = "x$object" && dir= |
3565 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
3566 | + set_dir_from "$object" |
3567 | + set_base_from "$object" |
3568 | if test "$libtool" = yes; then |
3569 | tmpdepfile1=$dir$base.d |
3570 | tmpdepfile2=$dir.libs/$base.d |
3571 | @@ -355,8 +451,7 @@ |
3572 | "$@" +Maked |
3573 | fi |
3574 | stat=$? |
3575 | - if test $stat -eq 0; then : |
3576 | - else |
3577 | + if test $stat -ne 0; then |
3578 | rm -f "$tmpdepfile1" "$tmpdepfile2" |
3579 | exit $stat |
3580 | fi |
3581 | @@ -366,76 +461,61 @@ |
3582 | test -f "$tmpdepfile" && break |
3583 | done |
3584 | if test -f "$tmpdepfile"; then |
3585 | - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" |
3586 | + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" |
3587 | # Add 'dependent.h:' lines. |
3588 | sed -ne '2,${ |
3589 | - s/^ *// |
3590 | - s/ \\*$// |
3591 | - s/$/:/ |
3592 | - p |
3593 | - }' "$tmpdepfile" >> "$depfile" |
3594 | + s/^ *// |
3595 | + s/ \\*$// |
3596 | + s/$/:/ |
3597 | + p |
3598 | + }' "$tmpdepfile" >> "$depfile" |
3599 | else |
3600 | - echo "#dummy" > "$depfile" |
3601 | + make_dummy_depfile |
3602 | fi |
3603 | rm -f "$tmpdepfile" "$tmpdepfile2" |
3604 | ;; |
3605 | |
3606 | tru64) |
3607 | - # The Tru64 compiler uses -MD to generate dependencies as a side |
3608 | - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
3609 | - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
3610 | - # dependencies in 'foo.d' instead, so we check for that too. |
3611 | - # Subdirectories are respected. |
3612 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
3613 | - test "x$dir" = "x$object" && dir= |
3614 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
3615 | - |
3616 | - if test "$libtool" = yes; then |
3617 | - # With Tru64 cc, shared objects can also be used to make a |
3618 | - # static library. This mechanism is used in libtool 1.4 series to |
3619 | - # handle both shared and static libraries in a single compilation. |
3620 | - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. |
3621 | - # |
3622 | - # With libtool 1.5 this exception was removed, and libtool now |
3623 | - # generates 2 separate objects for the 2 libraries. These two |
3624 | - # compilations output dependencies in $dir.libs/$base.o.d and |
3625 | - # in $dir$base.o.d. We have to check for both files, because |
3626 | - # one of the two compilations can be disabled. We should prefer |
3627 | - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is |
3628 | - # automatically cleaned when .libs/ is deleted, while ignoring |
3629 | - # the former would cause a distcleancheck panic. |
3630 | - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 |
3631 | - tmpdepfile2=$dir$base.o.d # libtool 1.5 |
3632 | - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 |
3633 | - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 |
3634 | - "$@" -Wc,-MD |
3635 | - else |
3636 | - tmpdepfile1=$dir$base.o.d |
3637 | - tmpdepfile2=$dir$base.d |
3638 | - tmpdepfile3=$dir$base.d |
3639 | - tmpdepfile4=$dir$base.d |
3640 | - "$@" -MD |
3641 | - fi |
3642 | - |
3643 | - stat=$? |
3644 | - if test $stat -eq 0; then : |
3645 | - else |
3646 | - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" |
3647 | - exit $stat |
3648 | - fi |
3649 | - |
3650 | - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" |
3651 | - do |
3652 | - test -f "$tmpdepfile" && break |
3653 | - done |
3654 | - if test -f "$tmpdepfile"; then |
3655 | - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
3656 | - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
3657 | - else |
3658 | - echo "#dummy" > "$depfile" |
3659 | - fi |
3660 | - rm -f "$tmpdepfile" |
3661 | - ;; |
3662 | + # The Tru64 compiler uses -MD to generate dependencies as a side |
3663 | + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
3664 | + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
3665 | + # dependencies in 'foo.d' instead, so we check for that too. |
3666 | + # Subdirectories are respected. |
3667 | + set_dir_from "$object" |
3668 | + set_base_from "$object" |
3669 | + |
3670 | + if test "$libtool" = yes; then |
3671 | + # Libtool generates 2 separate objects for the 2 libraries. These |
3672 | + # two compilations output dependencies in $dir.libs/$base.o.d and |
3673 | + # in $dir$base.o.d. We have to check for both files, because |
3674 | + # one of the two compilations can be disabled. We should prefer |
3675 | + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is |
3676 | + # automatically cleaned when .libs/ is deleted, while ignoring |
3677 | + # the former would cause a distcleancheck panic. |
3678 | + tmpdepfile1=$dir$base.o.d # libtool 1.5 |
3679 | + tmpdepfile2=$dir.libs/$base.o.d # Likewise. |
3680 | + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 |
3681 | + "$@" -Wc,-MD |
3682 | + else |
3683 | + tmpdepfile1=$dir$base.d |
3684 | + tmpdepfile2=$dir$base.d |
3685 | + tmpdepfile3=$dir$base.d |
3686 | + "$@" -MD |
3687 | + fi |
3688 | + |
3689 | + stat=$? |
3690 | + if test $stat -ne 0; then |
3691 | + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
3692 | + exit $stat |
3693 | + fi |
3694 | + |
3695 | + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
3696 | + do |
3697 | + test -f "$tmpdepfile" && break |
3698 | + done |
3699 | + # Same post-processing that is required for AIX mode. |
3700 | + aix_post_process_depfile |
3701 | + ;; |
3702 | |
3703 | msvc7) |
3704 | if test "$libtool" = yes; then |
3705 | @@ -446,8 +526,7 @@ |
3706 | "$@" $showIncludes > "$tmpdepfile" |
3707 | stat=$? |
3708 | grep -v '^Note: including file: ' "$tmpdepfile" |
3709 | - if test "$stat" = 0; then : |
3710 | - else |
3711 | + if test $stat -ne 0; then |
3712 | rm -f "$tmpdepfile" |
3713 | exit $stat |
3714 | fi |
3715 | @@ -473,6 +552,7 @@ |
3716 | G |
3717 | p |
3718 | }' >> "$depfile" |
3719 | + echo >> "$depfile" # make sure the fragment doesn't end with a backslash |
3720 | rm -f "$tmpdepfile" |
3721 | ;; |
3722 | |
3723 | @@ -524,13 +604,14 @@ |
3724 | # in the target name. This is to cope with DOS-style filenames: |
3725 | # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. |
3726 | "$@" $dashmflag | |
3727 | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" |
3728 | + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" |
3729 | rm -f "$depfile" |
3730 | cat < "$tmpdepfile" > "$depfile" |
3731 | - tr ' ' "$nl" < "$tmpdepfile" | \ |
3732 | -## Some versions of the HPUX 10.20 sed can't process this invocation |
3733 | -## correctly. Breaking it into two sed invocations is a workaround. |
3734 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
3735 | + # Some versions of the HPUX 10.20 sed can't process this sed invocation |
3736 | + # correctly. Breaking it into two sed invocations is a workaround. |
3737 | + tr ' ' "$nl" < "$tmpdepfile" \ |
3738 | + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ |
3739 | + | sed -e 's/$/ :/' >> "$depfile" |
3740 | rm -f "$tmpdepfile" |
3741 | ;; |
3742 | |
3743 | @@ -583,10 +664,12 @@ |
3744 | # makedepend may prepend the VPATH from the source file name to the object. |
3745 | # No need to regex-escape $object, excess matching of '.' is harmless. |
3746 | sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
3747 | - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ |
3748 | -## Some versions of the HPUX 10.20 sed can't process this invocation |
3749 | -## correctly. Breaking it into two sed invocations is a workaround. |
3750 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
3751 | + # Some versions of the HPUX 10.20 sed can't process the last invocation |
3752 | + # correctly. Breaking it into two sed invocations is a workaround. |
3753 | + sed '1,2d' "$tmpdepfile" \ |
3754 | + | tr ' ' "$nl" \ |
3755 | + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ |
3756 | + | sed -e 's/$/ :/' >> "$depfile" |
3757 | rm -f "$tmpdepfile" "$tmpdepfile".bak |
3758 | ;; |
3759 | |
3760 | @@ -622,10 +705,10 @@ |
3761 | esac |
3762 | done |
3763 | |
3764 | - "$@" -E | |
3765 | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
3766 | - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | |
3767 | - sed '$ s: \\$::' > "$tmpdepfile" |
3768 | + "$@" -E \ |
3769 | + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
3770 | + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
3771 | + | sed '$ s: \\$::' > "$tmpdepfile" |
3772 | rm -f "$depfile" |
3773 | echo "$object : \\" > "$depfile" |
3774 | cat < "$tmpdepfile" >> "$depfile" |
3775 | @@ -657,15 +740,15 @@ |
3776 | shift |
3777 | ;; |
3778 | "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") |
3779 | - set fnord "$@" |
3780 | - shift |
3781 | - shift |
3782 | - ;; |
3783 | + set fnord "$@" |
3784 | + shift |
3785 | + shift |
3786 | + ;; |
3787 | *) |
3788 | - set fnord "$@" "$arg" |
3789 | - shift |
3790 | - shift |
3791 | - ;; |
3792 | + set fnord "$@" "$arg" |
3793 | + shift |
3794 | + shift |
3795 | + ;; |
3796 | esac |
3797 | done |
3798 | "$@" -E 2>/dev/null | |
3799 | |
3800 | === modified file 'icons/48x48/Makefile.in' |
3801 | --- icons/48x48/Makefile.in 2014-02-13 16:07:50 +0000 |
3802 | +++ icons/48x48/Makefile.in 2014-02-16 05:44:15 +0000 |
3803 | @@ -1,9 +1,8 @@ |
3804 | -# Makefile.in generated by automake 1.11.6 from Makefile.am. |
3805 | +# Makefile.in generated by automake 1.13.3 from Makefile.am. |
3806 | # @configure_input@ |
3807 | |
3808 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3809 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3810 | -# Foundation, Inc. |
3811 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3812 | + |
3813 | # This Makefile.in is free software; the Free Software Foundation |
3814 | # gives unlimited permission to copy and/or distribute it, |
3815 | # with or without modifications, as long as this notice is preserved. |
3816 | @@ -18,23 +17,51 @@ |
3817 | # $Id: Makefile.am 2257 2006-12-19 19:49:00Z nick $ |
3818 | |
3819 | VPATH = @srcdir@ |
3820 | -am__make_dryrun = \ |
3821 | - { \ |
3822 | - am__dry=no; \ |
3823 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3824 | +am__make_running_with_option = \ |
3825 | + case $${target_option-} in \ |
3826 | + ?) ;; \ |
3827 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3828 | + "target option '$${target_option-}' specified" >&2; \ |
3829 | + exit 1;; \ |
3830 | + esac; \ |
3831 | + has_opt=no; \ |
3832 | + sane_makeflags=$$MAKEFLAGS; \ |
3833 | + if $(am__is_gnu_make); then \ |
3834 | + sane_makeflags=$$MFLAGS; \ |
3835 | + else \ |
3836 | case $$MAKEFLAGS in \ |
3837 | *\\[\ \ ]*) \ |
3838 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3839 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3840 | - *) \ |
3841 | - for am__flg in $$MAKEFLAGS; do \ |
3842 | - case $$am__flg in \ |
3843 | - *=*|--*) ;; \ |
3844 | - *n*) am__dry=yes; break;; \ |
3845 | - esac; \ |
3846 | - done;; \ |
3847 | - esac; \ |
3848 | - test $$am__dry = yes; \ |
3849 | - } |
3850 | + bs=\\; \ |
3851 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
3852 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
3853 | + esac; \ |
3854 | + fi; \ |
3855 | + skip_next=no; \ |
3856 | + strip_trailopt () \ |
3857 | + { \ |
3858 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
3859 | + }; \ |
3860 | + for flg in $$sane_makeflags; do \ |
3861 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
3862 | + case $$flg in \ |
3863 | + *=*|--*) continue;; \ |
3864 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
3865 | + -*I?*) strip_trailopt 'I';; \ |
3866 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
3867 | + -*O?*) strip_trailopt 'O';; \ |
3868 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
3869 | + -*l?*) strip_trailopt 'l';; \ |
3870 | + -[dEDm]) skip_next=yes;; \ |
3871 | + -[JT]) skip_next=yes;; \ |
3872 | + esac; \ |
3873 | + case $$flg in \ |
3874 | + *$$target_option*) has_opt=yes; break;; \ |
3875 | + esac; \ |
3876 | + done; \ |
3877 | + test $$has_opt = yes |
3878 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
3879 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
3880 | pkgdatadir = $(datadir)/@PACKAGE@ |
3881 | pkgincludedir = $(includedir)/@PACKAGE@ |
3882 | pkglibdir = $(libdir)/@PACKAGE@ |
3883 | @@ -55,21 +82,27 @@ |
3884 | host_triplet = @host@ |
3885 | target_triplet = @target@ |
3886 | subdir = icons/48x48 |
3887 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
3888 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
3889 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
3890 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
3891 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
3892 | $(ACLOCAL_M4) |
3893 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
3894 | +mkinstalldirs = $(install_sh) -d |
3895 | CONFIG_HEADER = $(top_builddir)/config.h |
3896 | CONFIG_CLEAN_FILES = |
3897 | CONFIG_CLEAN_VPATH_FILES = |
3898 | +AM_V_P = $(am__v_P_@AM_V@) |
3899 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
3900 | +am__v_P_0 = false |
3901 | +am__v_P_1 = : |
3902 | AM_V_GEN = $(am__v_GEN_@AM_V@) |
3903 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
3904 | -am__v_GEN_0 = @echo " GEN " $@; |
3905 | +am__v_GEN_0 = @echo " GEN " $@; |
3906 | +am__v_GEN_1 = |
3907 | AM_V_at = $(am__v_at_@AM_V@) |
3908 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
3909 | am__v_at_0 = @ |
3910 | +am__v_at_1 = |
3911 | SOURCES = |
3912 | DIST_SOURCES = |
3913 | am__can_run_installinfo = \ |
3914 | @@ -106,6 +139,7 @@ |
3915 | } |
3916 | am__installdirs = "$(DESTDIR)$(iconsdir)" |
3917 | DATA = $(icons_DATA) |
3918 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
3919 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3920 | ACLOCAL = @ACLOCAL@ |
3921 | ALL_LINGUAS = @ALL_LINGUAS@ |
3922 | @@ -368,11 +402,11 @@ |
3923 | @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ |
3924 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
3925 | dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) |
3926 | -tags: TAGS |
3927 | -TAGS: |
3928 | - |
3929 | -ctags: CTAGS |
3930 | -CTAGS: |
3931 | +tags TAGS: |
3932 | + |
3933 | +ctags CTAGS: |
3934 | + |
3935 | +cscope cscopelist: |
3936 | |
3937 | |
3938 | distdir: $(DISTFILES) |
3939 | @@ -511,16 +545,16 @@ |
3940 | .MAKE: install-am install-strip |
3941 | |
3942 | .PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
3943 | - distclean distclean-generic distclean-libtool distdir dvi \ |
3944 | - dvi-am html html-am info info-am install install-am \ |
3945 | - install-data install-data-am install-dvi install-dvi-am \ |
3946 | - install-exec install-exec-am install-html install-html-am \ |
3947 | - install-iconsDATA install-info install-info-am install-man \ |
3948 | - install-pdf install-pdf-am install-ps install-ps-am \ |
3949 | - install-strip installcheck installcheck-am installdirs \ |
3950 | - maintainer-clean maintainer-clean-generic mostlyclean \ |
3951 | - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
3952 | - uninstall uninstall-am uninstall-iconsDATA |
3953 | + cscopelist-am ctags-am distclean distclean-generic \ |
3954 | + distclean-libtool distdir dvi dvi-am html html-am info info-am \ |
3955 | + install install-am install-data install-data-am install-dvi \ |
3956 | + install-dvi-am install-exec install-exec-am install-html \ |
3957 | + install-html-am install-iconsDATA install-info install-info-am \ |
3958 | + install-man install-pdf install-pdf-am install-ps \ |
3959 | + install-ps-am install-strip installcheck installcheck-am \ |
3960 | + installdirs maintainer-clean maintainer-clean-generic \ |
3961 | + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
3962 | + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA |
3963 | |
3964 | |
3965 | # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: |
3966 | |
3967 | === modified file 'icons/Makefile.in' |
3968 | --- icons/Makefile.in 2014-02-13 16:07:50 +0000 |
3969 | +++ icons/Makefile.in 2014-02-16 05:44:15 +0000 |
3970 | @@ -1,9 +1,8 @@ |
3971 | -# Makefile.in generated by automake 1.11.6 from Makefile.am. |
3972 | +# Makefile.in generated by automake 1.13.3 from Makefile.am. |
3973 | # @configure_input@ |
3974 | |
3975 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3976 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3977 | -# Foundation, Inc. |
3978 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
3979 | + |
3980 | # This Makefile.in is free software; the Free Software Foundation |
3981 | # gives unlimited permission to copy and/or distribute it, |
3982 | # with or without modifications, as long as this notice is preserved. |
3983 | @@ -17,23 +16,51 @@ |
3984 | |
3985 | # $Id: Makefile.am 2257 2006-12-19 19:49:00Z nick $ |
3986 | VPATH = @srcdir@ |
3987 | -am__make_dryrun = \ |
3988 | - { \ |
3989 | - am__dry=no; \ |
3990 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
3991 | +am__make_running_with_option = \ |
3992 | + case $${target_option-} in \ |
3993 | + ?) ;; \ |
3994 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
3995 | + "target option '$${target_option-}' specified" >&2; \ |
3996 | + exit 1;; \ |
3997 | + esac; \ |
3998 | + has_opt=no; \ |
3999 | + sane_makeflags=$$MAKEFLAGS; \ |
4000 | + if $(am__is_gnu_make); then \ |
4001 | + sane_makeflags=$$MFLAGS; \ |
4002 | + else \ |
4003 | case $$MAKEFLAGS in \ |
4004 | *\\[\ \ ]*) \ |
4005 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4006 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4007 | - *) \ |
4008 | - for am__flg in $$MAKEFLAGS; do \ |
4009 | - case $$am__flg in \ |
4010 | - *=*|--*) ;; \ |
4011 | - *n*) am__dry=yes; break;; \ |
4012 | - esac; \ |
4013 | - done;; \ |
4014 | - esac; \ |
4015 | - test $$am__dry = yes; \ |
4016 | - } |
4017 | + bs=\\; \ |
4018 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4019 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4020 | + esac; \ |
4021 | + fi; \ |
4022 | + skip_next=no; \ |
4023 | + strip_trailopt () \ |
4024 | + { \ |
4025 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4026 | + }; \ |
4027 | + for flg in $$sane_makeflags; do \ |
4028 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4029 | + case $$flg in \ |
4030 | + *=*|--*) continue;; \ |
4031 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4032 | + -*I?*) strip_trailopt 'I';; \ |
4033 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4034 | + -*O?*) strip_trailopt 'O';; \ |
4035 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4036 | + -*l?*) strip_trailopt 'l';; \ |
4037 | + -[dEDm]) skip_next=yes;; \ |
4038 | + -[JT]) skip_next=yes;; \ |
4039 | + esac; \ |
4040 | + case $$flg in \ |
4041 | + *$$target_option*) has_opt=yes; break;; \ |
4042 | + esac; \ |
4043 | + done; \ |
4044 | + test $$has_opt = yes |
4045 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4046 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4047 | pkgdatadir = $(datadir)/@PACKAGE@ |
4048 | pkgincludedir = $(includedir)/@PACKAGE@ |
4049 | pkglibdir = $(libdir)/@PACKAGE@ |
4050 | @@ -54,30 +81,37 @@ |
4051 | host_triplet = @host@ |
4052 | target_triplet = @target@ |
4053 | subdir = icons |
4054 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
4055 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
4056 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4057 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
4058 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
4059 | $(ACLOCAL_M4) |
4060 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
4061 | +mkinstalldirs = $(install_sh) -d |
4062 | CONFIG_HEADER = $(top_builddir)/config.h |
4063 | CONFIG_CLEAN_FILES = |
4064 | CONFIG_CLEAN_VPATH_FILES = |
4065 | +AM_V_P = $(am__v_P_@AM_V@) |
4066 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
4067 | +am__v_P_0 = false |
4068 | +am__v_P_1 = : |
4069 | AM_V_GEN = $(am__v_GEN_@AM_V@) |
4070 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
4071 | -am__v_GEN_0 = @echo " GEN " $@; |
4072 | +am__v_GEN_0 = @echo " GEN " $@; |
4073 | +am__v_GEN_1 = |
4074 | AM_V_at = $(am__v_at_@AM_V@) |
4075 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
4076 | am__v_at_0 = @ |
4077 | +am__v_at_1 = |
4078 | SOURCES = |
4079 | DIST_SOURCES = |
4080 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
4081 | - html-recursive info-recursive install-data-recursive \ |
4082 | - install-dvi-recursive install-exec-recursive \ |
4083 | - install-html-recursive install-info-recursive \ |
4084 | - install-pdf-recursive install-ps-recursive install-recursive \ |
4085 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
4086 | - ps-recursive uninstall-recursive |
4087 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
4088 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
4089 | + install-data-recursive install-dvi-recursive \ |
4090 | + install-exec-recursive install-html-recursive \ |
4091 | + install-info-recursive install-pdf-recursive \ |
4092 | + install-ps-recursive install-recursive installcheck-recursive \ |
4093 | + installdirs-recursive pdf-recursive ps-recursive \ |
4094 | + tags-recursive uninstall-recursive |
4095 | am__can_run_installinfo = \ |
4096 | case $$AM_UPDATE_INFO_DIR in \ |
4097 | n|no|NO) false;; \ |
4098 | @@ -85,9 +119,29 @@ |
4099 | esac |
4100 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
4101 | distclean-recursive maintainer-clean-recursive |
4102 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
4103 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
4104 | +am__recursive_targets = \ |
4105 | + $(RECURSIVE_TARGETS) \ |
4106 | + $(RECURSIVE_CLEAN_TARGETS) \ |
4107 | + $(am__extra_recursive_targets) |
4108 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
4109 | distdir |
4110 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
4111 | +# Read a list of newline-separated strings from the standard input, |
4112 | +# and print each of them once, without duplicates. Input order is |
4113 | +# *not* preserved. |
4114 | +am__uniquify_input = $(AWK) '\ |
4115 | + BEGIN { nonempty = 0; } \ |
4116 | + { items[$$0] = 1; nonempty = 1; } \ |
4117 | + END { if (nonempty) { for (i in items) print i; }; } \ |
4118 | +' |
4119 | +# Make sure the list of sources is unique. This is necessary because, |
4120 | +# e.g., the same source file might be shared among _SOURCES variables |
4121 | +# for different programs/libraries. |
4122 | +am__define_uniq_tagged_files = \ |
4123 | + list='$(am__tagged_files)'; \ |
4124 | + unique=`for i in $$list; do \ |
4125 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
4126 | + done | $(am__uniquify_input)` |
4127 | ETAGS = etags |
4128 | CTAGS = ctags |
4129 | DIST_SUBDIRS = $(SUBDIRS) |
4130 | @@ -357,22 +411,25 @@ |
4131 | -rm -rf .libs _libs |
4132 | |
4133 | # This directory's subdirectories are mostly independent; you can cd |
4134 | -# into them and run `make' without going through this Makefile. |
4135 | -# To change the values of `make' variables: instead of editing Makefiles, |
4136 | -# (1) if the variable is set in `config.status', edit `config.status' |
4137 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
4138 | -# (2) otherwise, pass the desired values on the `make' command line. |
4139 | -$(RECURSIVE_TARGETS): |
4140 | - @fail= failcom='exit 1'; \ |
4141 | - for f in x $$MAKEFLAGS; do \ |
4142 | - case $$f in \ |
4143 | - *=* | --[!k]*);; \ |
4144 | - *k*) failcom='fail=yes';; \ |
4145 | - esac; \ |
4146 | - done; \ |
4147 | +# into them and run 'make' without going through this Makefile. |
4148 | +# To change the values of 'make' variables: instead of editing Makefiles, |
4149 | +# (1) if the variable is set in 'config.status', edit 'config.status' |
4150 | +# (which will cause the Makefiles to be regenerated when you run 'make'); |
4151 | +# (2) otherwise, pass the desired values on the 'make' command line. |
4152 | +$(am__recursive_targets): |
4153 | + @fail=; \ |
4154 | + if $(am__make_keepgoing); then \ |
4155 | + failcom='fail=yes'; \ |
4156 | + else \ |
4157 | + failcom='exit 1'; \ |
4158 | + fi; \ |
4159 | dot_seen=no; \ |
4160 | target=`echo $@ | sed s/-recursive//`; \ |
4161 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
4162 | + case "$@" in \ |
4163 | + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
4164 | + *) list='$(SUBDIRS)' ;; \ |
4165 | + esac; \ |
4166 | + for subdir in $$list; do \ |
4167 | echo "Making $$target in $$subdir"; \ |
4168 | if test "$$subdir" = "."; then \ |
4169 | dot_seen=yes; \ |
4170 | @@ -387,57 +444,12 @@ |
4171 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
4172 | fi; test -z "$$fail" |
4173 | |
4174 | -$(RECURSIVE_CLEAN_TARGETS): |
4175 | - @fail= failcom='exit 1'; \ |
4176 | - for f in x $$MAKEFLAGS; do \ |
4177 | - case $$f in \ |
4178 | - *=* | --[!k]*);; \ |
4179 | - *k*) failcom='fail=yes';; \ |
4180 | - esac; \ |
4181 | - done; \ |
4182 | - dot_seen=no; \ |
4183 | - case "$@" in \ |
4184 | - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
4185 | - *) list='$(SUBDIRS)' ;; \ |
4186 | - esac; \ |
4187 | - rev=''; for subdir in $$list; do \ |
4188 | - if test "$$subdir" = "."; then :; else \ |
4189 | - rev="$$subdir $$rev"; \ |
4190 | - fi; \ |
4191 | - done; \ |
4192 | - rev="$$rev ."; \ |
4193 | - target=`echo $@ | sed s/-recursive//`; \ |
4194 | - for subdir in $$rev; do \ |
4195 | - echo "Making $$target in $$subdir"; \ |
4196 | - if test "$$subdir" = "."; then \ |
4197 | - local_target="$$target-am"; \ |
4198 | - else \ |
4199 | - local_target="$$target"; \ |
4200 | - fi; \ |
4201 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
4202 | - || eval $$failcom; \ |
4203 | - done && test -z "$$fail" |
4204 | -tags-recursive: |
4205 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
4206 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
4207 | - done |
4208 | -ctags-recursive: |
4209 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
4210 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
4211 | - done |
4212 | - |
4213 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
4214 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
4215 | - unique=`for i in $$list; do \ |
4216 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
4217 | - done | \ |
4218 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
4219 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
4220 | - mkid -fID $$unique |
4221 | -tags: TAGS |
4222 | - |
4223 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
4224 | - $(TAGS_FILES) $(LISP) |
4225 | +ID: $(am__tagged_files) |
4226 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
4227 | +tags: tags-recursive |
4228 | +TAGS: tags |
4229 | + |
4230 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
4231 | set x; \ |
4232 | here=`pwd`; \ |
4233 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
4234 | @@ -453,12 +465,7 @@ |
4235 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
4236 | fi; \ |
4237 | done; \ |
4238 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
4239 | - unique=`for i in $$list; do \ |
4240 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
4241 | - done | \ |
4242 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
4243 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
4244 | + $(am__define_uniq_tagged_files); \ |
4245 | shift; \ |
4246 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
4247 | test -n "$$unique" || unique=$$empty_fix; \ |
4248 | @@ -470,15 +477,11 @@ |
4249 | $$unique; \ |
4250 | fi; \ |
4251 | fi |
4252 | -ctags: CTAGS |
4253 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
4254 | - $(TAGS_FILES) $(LISP) |
4255 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
4256 | - unique=`for i in $$list; do \ |
4257 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
4258 | - done | \ |
4259 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
4260 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
4261 | +ctags: ctags-recursive |
4262 | + |
4263 | +CTAGS: ctags |
4264 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
4265 | + $(am__define_uniq_tagged_files); \ |
4266 | test -z "$(CTAGS_ARGS)$$unique" \ |
4267 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
4268 | $$unique |
4269 | @@ -487,6 +490,21 @@ |
4270 | here=`$(am__cd) $(top_builddir) && pwd` \ |
4271 | && $(am__cd) $(top_srcdir) \ |
4272 | && gtags -i $(GTAGS_ARGS) "$$here" |
4273 | +cscopelist: cscopelist-recursive |
4274 | + |
4275 | +cscopelist-am: $(am__tagged_files) |
4276 | + list='$(am__tagged_files)'; \ |
4277 | + case "$(srcdir)" in \ |
4278 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
4279 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
4280 | + esac; \ |
4281 | + for i in $$list; do \ |
4282 | + if test -f "$$i"; then \ |
4283 | + echo "$(subdir)/$$i"; \ |
4284 | + else \ |
4285 | + echo "$$sdir/$$i"; \ |
4286 | + fi; \ |
4287 | + done >> $(top_builddir)/cscope.files |
4288 | |
4289 | distclean-tags: |
4290 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
4291 | @@ -648,22 +666,22 @@ |
4292 | |
4293 | uninstall-am: |
4294 | |
4295 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ |
4296 | - install-am install-data-am install-strip tags-recursive |
4297 | +.MAKE: $(am__recursive_targets) install-am install-data-am \ |
4298 | + install-strip |
4299 | |
4300 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
4301 | - all all-am check check-am clean clean-generic clean-libtool \ |
4302 | - ctags ctags-recursive distclean distclean-generic \ |
4303 | - distclean-libtool distclean-tags distdir dvi dvi-am html \ |
4304 | - html-am info info-am install install-am install-data \ |
4305 | - install-data-am install-data-hook install-dvi install-dvi-am \ |
4306 | - install-exec install-exec-am install-html install-html-am \ |
4307 | - install-info install-info-am install-man install-pdf \ |
4308 | - install-pdf-am install-ps install-ps-am install-strip \ |
4309 | - installcheck installcheck-am installdirs installdirs-am \ |
4310 | - maintainer-clean maintainer-clean-generic mostlyclean \ |
4311 | - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
4312 | - tags tags-recursive uninstall uninstall-am |
4313 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ |
4314 | + check-am clean clean-generic clean-libtool cscopelist-am ctags \ |
4315 | + ctags-am distclean distclean-generic distclean-libtool \ |
4316 | + distclean-tags distdir dvi dvi-am html html-am info info-am \ |
4317 | + install install-am install-data install-data-am \ |
4318 | + install-data-hook install-dvi install-dvi-am install-exec \ |
4319 | + install-exec-am install-html install-html-am install-info \ |
4320 | + install-info-am install-man install-pdf install-pdf-am \ |
4321 | + install-ps install-ps-am install-strip installcheck \ |
4322 | + installcheck-am installdirs installdirs-am maintainer-clean \ |
4323 | + maintainer-clean-generic mostlyclean mostlyclean-generic \ |
4324 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ |
4325 | + uninstall-am |
4326 | |
4327 | |
4328 | install-data-hook: |
4329 | |
4330 | === modified file 'icons/scalable/Makefile.in' |
4331 | --- icons/scalable/Makefile.in 2014-02-13 16:07:50 +0000 |
4332 | +++ icons/scalable/Makefile.in 2014-02-16 05:44:15 +0000 |
4333 | @@ -1,9 +1,8 @@ |
4334 | -# Makefile.in generated by automake 1.11.6 from Makefile.am. |
4335 | +# Makefile.in generated by automake 1.13.3 from Makefile.am. |
4336 | # @configure_input@ |
4337 | |
4338 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4339 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4340 | -# Foundation, Inc. |
4341 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
4342 | + |
4343 | # This Makefile.in is free software; the Free Software Foundation |
4344 | # gives unlimited permission to copy and/or distribute it, |
4345 | # with or without modifications, as long as this notice is preserved. |
4346 | @@ -18,23 +17,51 @@ |
4347 | # $Id: Makefile.am 2257 2006-12-19 19:49:00Z nick $ |
4348 | |
4349 | VPATH = @srcdir@ |
4350 | -am__make_dryrun = \ |
4351 | - { \ |
4352 | - am__dry=no; \ |
4353 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
4354 | +am__make_running_with_option = \ |
4355 | + case $${target_option-} in \ |
4356 | + ?) ;; \ |
4357 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
4358 | + "target option '$${target_option-}' specified" >&2; \ |
4359 | + exit 1;; \ |
4360 | + esac; \ |
4361 | + has_opt=no; \ |
4362 | + sane_makeflags=$$MAKEFLAGS; \ |
4363 | + if $(am__is_gnu_make); then \ |
4364 | + sane_makeflags=$$MFLAGS; \ |
4365 | + else \ |
4366 | case $$MAKEFLAGS in \ |
4367 | *\\[\ \ ]*) \ |
4368 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
4369 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
4370 | - *) \ |
4371 | - for am__flg in $$MAKEFLAGS; do \ |
4372 | - case $$am__flg in \ |
4373 | - *=*|--*) ;; \ |
4374 | - *n*) am__dry=yes; break;; \ |
4375 | - esac; \ |
4376 | - done;; \ |
4377 | - esac; \ |
4378 | - test $$am__dry = yes; \ |
4379 | - } |
4380 | + bs=\\; \ |
4381 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
4382 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
4383 | + esac; \ |
4384 | + fi; \ |
4385 | + skip_next=no; \ |
4386 | + strip_trailopt () \ |
4387 | + { \ |
4388 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
4389 | + }; \ |
4390 | + for flg in $$sane_makeflags; do \ |
4391 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
4392 | + case $$flg in \ |
4393 | + *=*|--*) continue;; \ |
4394 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
4395 | + -*I?*) strip_trailopt 'I';; \ |
4396 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
4397 | + -*O?*) strip_trailopt 'O';; \ |
4398 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
4399 | + -*l?*) strip_trailopt 'l';; \ |
4400 | + -[dEDm]) skip_next=yes;; \ |
4401 | + -[JT]) skip_next=yes;; \ |
4402 | + esac; \ |
4403 | + case $$flg in \ |
4404 | + *$$target_option*) has_opt=yes; break;; \ |
4405 | + esac; \ |
4406 | + done; \ |
4407 | + test $$has_opt = yes |
4408 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
4409 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
4410 | pkgdatadir = $(datadir)/@PACKAGE@ |
4411 | pkgincludedir = $(includedir)/@PACKAGE@ |
4412 | pkglibdir = $(libdir)/@PACKAGE@ |
4413 | @@ -55,21 +82,27 @@ |
4414 | host_triplet = @host@ |
4415 | target_triplet = @target@ |
4416 | subdir = icons/scalable |
4417 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
4418 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
4419 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4420 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
4421 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
4422 | $(ACLOCAL_M4) |
4423 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
4424 | +mkinstalldirs = $(install_sh) -d |
4425 | CONFIG_HEADER = $(top_builddir)/config.h |
4426 | CONFIG_CLEAN_FILES = |
4427 | CONFIG_CLEAN_VPATH_FILES = |
4428 | +AM_V_P = $(am__v_P_@AM_V@) |
4429 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
4430 | +am__v_P_0 = false |
4431 | +am__v_P_1 = : |
4432 | AM_V_GEN = $(am__v_GEN_@AM_V@) |
4433 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
4434 | -am__v_GEN_0 = @echo " GEN " $@; |
4435 | +am__v_GEN_0 = @echo " GEN " $@; |
4436 | +am__v_GEN_1 = |
4437 | AM_V_at = $(am__v_at_@AM_V@) |
4438 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
4439 | am__v_at_0 = @ |
4440 | +am__v_at_1 = |
4441 | SOURCES = |
4442 | DIST_SOURCES = |
4443 | am__can_run_installinfo = \ |
4444 | @@ -106,6 +139,7 @@ |
4445 | } |
4446 | am__installdirs = "$(DESTDIR)$(iconsdir)" |
4447 | DATA = $(icons_DATA) |
4448 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
4449 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4450 | ACLOCAL = @ACLOCAL@ |
4451 | ALL_LINGUAS = @ALL_LINGUAS@ |
4452 | @@ -368,11 +402,11 @@ |
4453 | @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ |
4454 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
4455 | dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) |
4456 | -tags: TAGS |
4457 | -TAGS: |
4458 | - |
4459 | -ctags: CTAGS |
4460 | -CTAGS: |
4461 | +tags TAGS: |
4462 | + |
4463 | +ctags CTAGS: |
4464 | + |
4465 | +cscope cscopelist: |
4466 | |
4467 | |
4468 | distdir: $(DISTFILES) |
4469 | @@ -511,16 +545,16 @@ |
4470 | .MAKE: install-am install-strip |
4471 | |
4472 | .PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
4473 | - distclean distclean-generic distclean-libtool distdir dvi \ |
4474 | - dvi-am html html-am info info-am install install-am \ |
4475 | - install-data install-data-am install-dvi install-dvi-am \ |
4476 | - install-exec install-exec-am install-html install-html-am \ |
4477 | - install-iconsDATA install-info install-info-am install-man \ |
4478 | - install-pdf install-pdf-am install-ps install-ps-am \ |
4479 | - install-strip installcheck installcheck-am installdirs \ |
4480 | - maintainer-clean maintainer-clean-generic mostlyclean \ |
4481 | - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
4482 | - uninstall uninstall-am uninstall-iconsDATA |
4483 | + cscopelist-am ctags-am distclean distclean-generic \ |
4484 | + distclean-libtool distdir dvi dvi-am html html-am info info-am \ |
4485 | + install install-am install-data install-data-am install-dvi \ |
4486 | + install-dvi-am install-exec install-exec-am install-html \ |
4487 | + install-html-am install-iconsDATA install-info install-info-am \ |
4488 | + install-man install-pdf install-pdf-am install-ps \ |
4489 | + install-ps-am install-strip installcheck installcheck-am \ |
4490 | + installdirs maintainer-clean maintainer-clean-generic \ |
4491 | + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
4492 | + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA |
4493 | |
4494 | |
4495 | # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: |
4496 | |
4497 | === modified file 'install-sh' |
4498 | --- install-sh 2014-02-13 16:07:50 +0000 |
4499 | +++ install-sh 2014-02-16 05:44:15 +0000 |
4500 | @@ -1,7 +1,7 @@ |
4501 | #!/bin/sh |
4502 | # install - install a program, script, or datafile |
4503 | |
4504 | -scriptversion=2011-01-19.21; # UTC |
4505 | +scriptversion=2011-11-20.07; # UTC |
4506 | |
4507 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
4508 | # later released in X11R6 (xc/config/util/install.sh) with the |
4509 | @@ -35,7 +35,7 @@ |
4510 | # FSF changes to this file are in the public domain. |
4511 | # |
4512 | # Calling this script install-sh is preferred over install.sh, to prevent |
4513 | -# `make' implicit rules from creating a file called install from it |
4514 | +# 'make' implicit rules from creating a file called install from it |
4515 | # when there is no Makefile. |
4516 | # |
4517 | # This script is compatible with the BSD install script, but was written |
4518 | @@ -156,7 +156,7 @@ |
4519 | -s) stripcmd=$stripprog;; |
4520 | |
4521 | -t) dst_arg=$2 |
4522 | - # Protect names problematic for `test' and other utilities. |
4523 | + # Protect names problematic for 'test' and other utilities. |
4524 | case $dst_arg in |
4525 | -* | [=\(\)!]) dst_arg=./$dst_arg;; |
4526 | esac |
4527 | @@ -190,7 +190,7 @@ |
4528 | fi |
4529 | shift # arg |
4530 | dst_arg=$arg |
4531 | - # Protect names problematic for `test' and other utilities. |
4532 | + # Protect names problematic for 'test' and other utilities. |
4533 | case $dst_arg in |
4534 | -* | [=\(\)!]) dst_arg=./$dst_arg;; |
4535 | esac |
4536 | @@ -202,7 +202,7 @@ |
4537 | echo "$0: no input file specified." >&2 |
4538 | exit 1 |
4539 | fi |
4540 | - # It's OK to call `install-sh -d' without argument. |
4541 | + # It's OK to call 'install-sh -d' without argument. |
4542 | # This can happen when creating conditional directories. |
4543 | exit 0 |
4544 | fi |
4545 | @@ -240,7 +240,7 @@ |
4546 | |
4547 | for src |
4548 | do |
4549 | - # Protect names problematic for `test' and other utilities. |
4550 | + # Protect names problematic for 'test' and other utilities. |
4551 | case $src in |
4552 | -* | [=\(\)!]) src=./$src;; |
4553 | esac |
4554 | @@ -354,7 +354,7 @@ |
4555 | if test -z "$dir_arg" || { |
4556 | # Check for POSIX incompatibilities with -m. |
4557 | # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or |
4558 | - # other-writeable bit of parent directory when it shouldn't. |
4559 | + # other-writable bit of parent directory when it shouldn't. |
4560 | # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. |
4561 | ls_ld_tmpdir=`ls -ld "$tmpdir"` |
4562 | case $ls_ld_tmpdir in |
4563 | |
4564 | === modified file 'ltmain.sh' |
4565 | --- ltmain.sh 2014-02-13 16:07:50 +0000 |
4566 | +++ ltmain.sh 2014-02-16 05:44:15 +0000 |
4567 | @@ -70,7 +70,7 @@ |
4568 | # compiler: $LTCC |
4569 | # compiler flags: $LTCFLAGS |
4570 | # linker: $LD (gnu? $with_gnu_ld) |
4571 | -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1 |
4572 | +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1 |
4573 | # automake: $automake_version |
4574 | # autoconf: $autoconf_version |
4575 | # |
4576 | @@ -80,7 +80,7 @@ |
4577 | |
4578 | PROGRAM=libtool |
4579 | PACKAGE=libtool |
4580 | -VERSION="2.4.2 Debian-2.4.2-1.2ubuntu1" |
4581 | +VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" |
4582 | TIMESTAMP="" |
4583 | package_revision=1.3337 |
4584 | |
4585 | |
4586 | === modified file 'missing' |
4587 | --- missing 2014-02-13 16:07:50 +0000 |
4588 | +++ missing 2014-02-16 05:44:15 +0000 |
4589 | @@ -1,11 +1,10 @@ |
4590 | #! /bin/sh |
4591 | -# Common stub for a few missing GNU programs while installing. |
4592 | - |
4593 | -scriptversion=2012-01-06.13; # UTC |
4594 | - |
4595 | -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, |
4596 | -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. |
4597 | -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
4598 | +# Common wrapper for a few potentially missing GNU programs. |
4599 | + |
4600 | +scriptversion=2012-06-26.16; # UTC |
4601 | + |
4602 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
4603 | +# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
4604 | |
4605 | # This program is free software; you can redistribute it and/or modify |
4606 | # it under the terms of the GNU General Public License as published by |
4607 | @@ -26,68 +25,40 @@ |
4608 | # the same distribution terms that you use for the rest of that program. |
4609 | |
4610 | if test $# -eq 0; then |
4611 | - echo 1>&2 "Try \`$0 --help' for more information" |
4612 | + echo 1>&2 "Try '$0 --help' for more information" |
4613 | exit 1 |
4614 | fi |
4615 | |
4616 | -run=: |
4617 | -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' |
4618 | -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' |
4619 | - |
4620 | -# In the cases where this matters, `missing' is being run in the |
4621 | -# srcdir already. |
4622 | -if test -f configure.ac; then |
4623 | - configure_ac=configure.ac |
4624 | -else |
4625 | - configure_ac=configure.in |
4626 | -fi |
4627 | - |
4628 | -msg="missing on your system" |
4629 | - |
4630 | case $1 in |
4631 | ---run) |
4632 | - # Try to run requested program, and just exit if it succeeds. |
4633 | - run= |
4634 | - shift |
4635 | - "$@" && exit 0 |
4636 | - # Exit code 63 means version mismatch. This often happens |
4637 | - # when the user try to use an ancient version of a tool on |
4638 | - # a file that requires a minimum version. In this case we |
4639 | - # we should proceed has if the program had been absent, or |
4640 | - # if --run hadn't been passed. |
4641 | - if test $? = 63; then |
4642 | - run=: |
4643 | - msg="probably too old" |
4644 | - fi |
4645 | - ;; |
4646 | + |
4647 | + --is-lightweight) |
4648 | + # Used by our autoconf macros to check whether the available missing |
4649 | + # script is modern enough. |
4650 | + exit 0 |
4651 | + ;; |
4652 | + |
4653 | + --run) |
4654 | + # Back-compat with the calling convention used by older automake. |
4655 | + shift |
4656 | + ;; |
4657 | |
4658 | -h|--h|--he|--hel|--help) |
4659 | echo "\ |
4660 | $0 [OPTION]... PROGRAM [ARGUMENT]... |
4661 | |
4662 | -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an |
4663 | -error status if there is no known handling for PROGRAM. |
4664 | +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due |
4665 | +to PROGRAM being missing or too old. |
4666 | |
4667 | Options: |
4668 | -h, --help display this help and exit |
4669 | -v, --version output version information and exit |
4670 | - --run try to run the given command, and emulate it if it fails |
4671 | |
4672 | Supported PROGRAM values: |
4673 | - aclocal touch file \`aclocal.m4' |
4674 | - autoconf touch file \`configure' |
4675 | - autoheader touch file \`config.h.in' |
4676 | - autom4te touch the output file, or create a stub one |
4677 | - automake touch all \`Makefile.in' files |
4678 | - bison create \`y.tab.[ch]', if possible, from existing .[ch] |
4679 | - flex create \`lex.yy.c', if possible, from existing .c |
4680 | - help2man touch the output file |
4681 | - lex create \`lex.yy.c', if possible, from existing .c |
4682 | - makeinfo touch the output file |
4683 | - yacc create \`y.tab.[ch]', if possible, from existing .[ch] |
4684 | + aclocal autoconf autoheader autom4te automake makeinfo |
4685 | + bison yacc flex lex help2man |
4686 | |
4687 | -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and |
4688 | -\`g' are ignored when checking the name. |
4689 | +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and |
4690 | +'g' are ignored when checking the name. |
4691 | |
4692 | Send bug reports to <bug-automake@gnu.org>." |
4693 | exit $? |
4694 | @@ -99,228 +70,141 @@ |
4695 | ;; |
4696 | |
4697 | -*) |
4698 | - echo 1>&2 "$0: Unknown \`$1' option" |
4699 | - echo 1>&2 "Try \`$0 --help' for more information" |
4700 | - exit 1 |
4701 | - ;; |
4702 | - |
4703 | -esac |
4704 | - |
4705 | -# normalize program name to check for. |
4706 | -program=`echo "$1" | sed ' |
4707 | - s/^gnu-//; t |
4708 | - s/^gnu//; t |
4709 | - s/^g//; t'` |
4710 | - |
4711 | -# Now exit if we have it, but it failed. Also exit now if we |
4712 | -# don't have it and --version was passed (most likely to detect |
4713 | -# the program). This is about non-GNU programs, so use $1 not |
4714 | -# $program. |
4715 | -case $1 in |
4716 | - lex*|yacc*) |
4717 | - # Not GNU programs, they don't have --version. |
4718 | - ;; |
4719 | - |
4720 | - *) |
4721 | - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
4722 | - # We have it, but it failed. |
4723 | - exit 1 |
4724 | - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then |
4725 | - # Could not run --version or --help. This is probably someone |
4726 | - # running `$TOOL --version' or `$TOOL --help' to check whether |
4727 | - # $TOOL exists and not knowing $TOOL uses missing. |
4728 | - exit 1 |
4729 | - fi |
4730 | - ;; |
4731 | -esac |
4732 | - |
4733 | -# If it does not exist, or fails to run (possibly an outdated version), |
4734 | -# try to emulate it. |
4735 | -case $program in |
4736 | - aclocal*) |
4737 | - echo 1>&2 "\ |
4738 | -WARNING: \`$1' is $msg. You should only need it if |
4739 | - you modified \`acinclude.m4' or \`${configure_ac}'. You might want |
4740 | - to install the \`Automake' and \`Perl' packages. Grab them from |
4741 | - any GNU archive site." |
4742 | - touch aclocal.m4 |
4743 | - ;; |
4744 | - |
4745 | - autoconf*) |
4746 | - echo 1>&2 "\ |
4747 | -WARNING: \`$1' is $msg. You should only need it if |
4748 | - you modified \`${configure_ac}'. You might want to install the |
4749 | - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU |
4750 | - archive site." |
4751 | - touch configure |
4752 | - ;; |
4753 | - |
4754 | - autoheader*) |
4755 | - echo 1>&2 "\ |
4756 | -WARNING: \`$1' is $msg. You should only need it if |
4757 | - you modified \`acconfig.h' or \`${configure_ac}'. You might want |
4758 | - to install the \`Autoconf' and \`GNU m4' packages. Grab them |
4759 | - from any GNU archive site." |
4760 | - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` |
4761 | - test -z "$files" && files="config.h" |
4762 | - touch_files= |
4763 | - for f in $files; do |
4764 | - case $f in |
4765 | - *:*) touch_files="$touch_files "`echo "$f" | |
4766 | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; |
4767 | - *) touch_files="$touch_files $f.in";; |
4768 | - esac |
4769 | - done |
4770 | - touch $touch_files |
4771 | - ;; |
4772 | - |
4773 | - automake*) |
4774 | - echo 1>&2 "\ |
4775 | -WARNING: \`$1' is $msg. You should only need it if |
4776 | - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. |
4777 | - You might want to install the \`Automake' and \`Perl' packages. |
4778 | - Grab them from any GNU archive site." |
4779 | - find . -type f -name Makefile.am -print | |
4780 | - sed 's/\.am$/.in/' | |
4781 | - while read f; do touch "$f"; done |
4782 | - ;; |
4783 | - |
4784 | - autom4te*) |
4785 | - echo 1>&2 "\ |
4786 | -WARNING: \`$1' is needed, but is $msg. |
4787 | - You might have modified some files without having the |
4788 | - proper tools for further handling them. |
4789 | - You can get \`$1' as part of \`Autoconf' from any GNU |
4790 | - archive site." |
4791 | - |
4792 | - file=`echo "$*" | sed -n "$sed_output"` |
4793 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
4794 | - if test -f "$file"; then |
4795 | - touch $file |
4796 | - else |
4797 | - test -z "$file" || exec >$file |
4798 | - echo "#! /bin/sh" |
4799 | - echo "# Created by GNU Automake missing as a replacement of" |
4800 | - echo "# $ $@" |
4801 | - echo "exit 0" |
4802 | - chmod +x $file |
4803 | - exit 1 |
4804 | - fi |
4805 | - ;; |
4806 | - |
4807 | - bison*|yacc*) |
4808 | - echo 1>&2 "\ |
4809 | -WARNING: \`$1' $msg. You should only need it if |
4810 | - you modified a \`.y' file. You may need the \`Bison' package |
4811 | - in order for those modifications to take effect. You can get |
4812 | - \`Bison' from any GNU archive site." |
4813 | - rm -f y.tab.c y.tab.h |
4814 | - if test $# -ne 1; then |
4815 | - eval LASTARG=\${$#} |
4816 | - case $LASTARG in |
4817 | - *.y) |
4818 | - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` |
4819 | - if test -f "$SRCFILE"; then |
4820 | - cp "$SRCFILE" y.tab.c |
4821 | - fi |
4822 | - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` |
4823 | - if test -f "$SRCFILE"; then |
4824 | - cp "$SRCFILE" y.tab.h |
4825 | - fi |
4826 | - ;; |
4827 | - esac |
4828 | - fi |
4829 | - if test ! -f y.tab.h; then |
4830 | - echo >y.tab.h |
4831 | - fi |
4832 | - if test ! -f y.tab.c; then |
4833 | - echo 'main() { return 0; }' >y.tab.c |
4834 | - fi |
4835 | - ;; |
4836 | - |
4837 | - lex*|flex*) |
4838 | - echo 1>&2 "\ |
4839 | -WARNING: \`$1' is $msg. You should only need it if |
4840 | - you modified a \`.l' file. You may need the \`Flex' package |
4841 | - in order for those modifications to take effect. You can get |
4842 | - \`Flex' from any GNU archive site." |
4843 | - rm -f lex.yy.c |
4844 | - if test $# -ne 1; then |
4845 | - eval LASTARG=\${$#} |
4846 | - case $LASTARG in |
4847 | - *.l) |
4848 | - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` |
4849 | - if test -f "$SRCFILE"; then |
4850 | - cp "$SRCFILE" lex.yy.c |
4851 | - fi |
4852 | - ;; |
4853 | - esac |
4854 | - fi |
4855 | - if test ! -f lex.yy.c; then |
4856 | - echo 'main() { return 0; }' >lex.yy.c |
4857 | - fi |
4858 | - ;; |
4859 | - |
4860 | - help2man*) |
4861 | - echo 1>&2 "\ |
4862 | -WARNING: \`$1' is $msg. You should only need it if |
4863 | - you modified a dependency of a manual page. You may need the |
4864 | - \`Help2man' package in order for those modifications to take |
4865 | - effect. You can get \`Help2man' from any GNU archive site." |
4866 | - |
4867 | - file=`echo "$*" | sed -n "$sed_output"` |
4868 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
4869 | - if test -f "$file"; then |
4870 | - touch $file |
4871 | - else |
4872 | - test -z "$file" || exec >$file |
4873 | - echo ".ab help2man is required to generate this page" |
4874 | - exit $? |
4875 | - fi |
4876 | - ;; |
4877 | - |
4878 | - makeinfo*) |
4879 | - echo 1>&2 "\ |
4880 | -WARNING: \`$1' is $msg. You should only need it if |
4881 | - you modified a \`.texi' or \`.texinfo' file, or any other file |
4882 | - indirectly affecting the aspect of the manual. The spurious |
4883 | - call might also be the consequence of using a buggy \`make' (AIX, |
4884 | - DU, IRIX). You might want to install the \`Texinfo' package or |
4885 | - the \`GNU make' package. Grab either from any GNU archive site." |
4886 | - # The file to touch is that specified with -o ... |
4887 | - file=`echo "$*" | sed -n "$sed_output"` |
4888 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
4889 | - if test -z "$file"; then |
4890 | - # ... or it is the one specified with @setfilename ... |
4891 | - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` |
4892 | - file=`sed -n ' |
4893 | - /^@setfilename/{ |
4894 | - s/.* \([^ ]*\) *$/\1/ |
4895 | - p |
4896 | - q |
4897 | - }' $infile` |
4898 | - # ... or it is derived from the source name (dir/f.texi becomes f.info) |
4899 | - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info |
4900 | - fi |
4901 | - # If the file does not exist, the user really needs makeinfo; |
4902 | - # let's fail without touching anything. |
4903 | - test -f $file || exit 1 |
4904 | - touch $file |
4905 | - ;; |
4906 | - |
4907 | - *) |
4908 | - echo 1>&2 "\ |
4909 | -WARNING: \`$1' is needed, and is $msg. |
4910 | - You might have modified some files without having the |
4911 | - proper tools for further handling them. Check the \`README' file, |
4912 | - it often tells you about the needed prerequisites for installing |
4913 | - this package. You may also peek at any GNU archive site, in case |
4914 | - some other package would contain this missing \`$1' program." |
4915 | - exit 1 |
4916 | - ;; |
4917 | -esac |
4918 | - |
4919 | -exit 0 |
4920 | + echo 1>&2 "$0: unknown '$1' option" |
4921 | + echo 1>&2 "Try '$0 --help' for more information" |
4922 | + exit 1 |
4923 | + ;; |
4924 | + |
4925 | +esac |
4926 | + |
4927 | +# Run the given program, remember its exit status. |
4928 | +"$@"; st=$? |
4929 | + |
4930 | +# If it succeeded, we are done. |
4931 | +test $st -eq 0 && exit 0 |
4932 | + |
4933 | +# Also exit now if we it failed (or wasn't found), and '--version' was |
4934 | +# passed; such an option is passed most likely to detect whether the |
4935 | +# program is present and works. |
4936 | +case $2 in --version|--help) exit $st;; esac |
4937 | + |
4938 | +# Exit code 63 means version mismatch. This often happens when the user |
4939 | +# tries to use an ancient version of a tool on a file that requires a |
4940 | +# minimum version. |
4941 | +if test $st -eq 63; then |
4942 | + msg="probably too old" |
4943 | +elif test $st -eq 127; then |
4944 | + # Program was missing. |
4945 | + msg="missing on your system" |
4946 | +else |
4947 | + # Program was found and executed, but failed. Give up. |
4948 | + exit $st |
4949 | +fi |
4950 | + |
4951 | +perl_URL=http://www.perl.org/ |
4952 | +flex_URL=http://flex.sourceforge.net/ |
4953 | +gnu_software_URL=http://www.gnu.org/software |
4954 | + |
4955 | +program_details () |
4956 | +{ |
4957 | + case $1 in |
4958 | + aclocal|automake) |
4959 | + echo "The '$1' program is part of the GNU Automake package:" |
4960 | + echo "<$gnu_software_URL/automake>" |
4961 | + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" |
4962 | + echo "<$gnu_software_URL/autoconf>" |
4963 | + echo "<$gnu_software_URL/m4/>" |
4964 | + echo "<$perl_URL>" |
4965 | + ;; |
4966 | + autoconf|autom4te|autoheader) |
4967 | + echo "The '$1' program is part of the GNU Autoconf package:" |
4968 | + echo "<$gnu_software_URL/autoconf/>" |
4969 | + echo "It also requires GNU m4 and Perl in order to run:" |
4970 | + echo "<$gnu_software_URL/m4/>" |
4971 | + echo "<$perl_URL>" |
4972 | + ;; |
4973 | + esac |
4974 | +} |
4975 | + |
4976 | +give_advice () |
4977 | +{ |
4978 | + # Normalize program name to check for. |
4979 | + normalized_program=`echo "$1" | sed ' |
4980 | + s/^gnu-//; t |
4981 | + s/^gnu//; t |
4982 | + s/^g//; t'` |
4983 | + |
4984 | + printf '%s\n' "'$1' is $msg." |
4985 | + |
4986 | + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" |
4987 | + case $normalized_program in |
4988 | + autoconf*) |
4989 | + echo "You should only need it if you modified 'configure.ac'," |
4990 | + echo "or m4 files included by it." |
4991 | + program_details 'autoconf' |
4992 | + ;; |
4993 | + autoheader*) |
4994 | + echo "You should only need it if you modified 'acconfig.h' or" |
4995 | + echo "$configure_deps." |
4996 | + program_details 'autoheader' |
4997 | + ;; |
4998 | + automake*) |
4999 | + echo "You should only need it if you modified 'Makefile.am' or" |
5000 | + echo "$configure_deps." |
The diff has been truncated for viewing.
Thanks. Uploaded.