Merge lp:~mh21/ubuntu/utopic/indicator-multiload/version-0.4 into lp:ubuntu/utopic/indicator-multiload
- Utopic (14.10)
- version-0.4
- Merge into utopic
Proposed by
Michael Hofmann
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp:~mh21/ubuntu/utopic/indicator-multiload/version-0.4 |
Merge into: | lp:ubuntu/utopic/indicator-multiload |
Diff against target: |
108382 lines (+48259/-31328) 181 files modified
HACKING (+1/-1) Makefile.am (+150/-29) Makefile.in (+840/-215) README (+1/-1) TODO (+10/-9) aclocal.m4 (+420/-2596) compile (+347/-0) config.h.in (+0/-22) configure (+491/-2841) configure.ac (+18/-10) data/Makefile.am (+0/-23) data/Makefile.in (+0/-476) data/de.mh21.indicator-multiload.gschema.xml.in.in (+801/-0) data/de.mh21.indicator.multiload.gschema.xml.in.in (+0/-848) data/indicator-multiload.desktop.in (+0/-1) data/preferences.ui.in (+1696/-1216) debian/changelog (+14/-0) debian/compat (+1/-1) debian/control (+2/-2) debian/copyright (+2/-2) depcomp (+296/-193) indicator_multiload_vala.stamp (+1/-0) install-sh (+7/-7) missing (+159/-275) po/POTFILES.in (+2/-2) po/POTFILES.skip (+8/-2) po/af.po (+278/-143) po/am.po (+251/-128) po/ar.po (+367/-176) po/as.po (+321/-153) po/ast.po (+333/-161) po/az.po (+305/-158) po/be.po (+327/-165) po/bg.po (+360/-185) po/bn.po (+344/-172) po/br.po (+297/-144) po/bs.po (+306/-159) po/ca.po (+332/-160) po/ca@valencia.po (+328/-160) po/crh.po (+347/-179) po/cs.po (+343/-161) po/cy.po (+319/-160) po/da.po (+346/-164) po/de.po (+363/-185) po/dz.po (+324/-167) po/el.po (+330/-161) po/en_CA.po (+319/-160) po/en_GB.po (+333/-161) po/eo.po (+329/-161) po/es.po (+351/-173) po/et.po (+329/-161) po/eu.po (+329/-161) po/fa.po (+322/-163) po/fi.po (+334/-163) po/fo.po (+234/-120) po/fr.po (+345/-165) po/ga.po (+329/-161) po/gl.po (+332/-164) po/gu.po (+331/-163) po/he.po (+329/-161) po/hi.po (+331/-163) po/hr.po (+349/-166) po/hu.po (+334/-161) po/hy.po (+319/-151) po/id.po (+329/-161) po/is.po (+327/-161) po/it.po (+343/-161) po/ja.po (+372/-189) po/ka.po (+320/-161) po/kk.po (+244/-127) po/kn.po (+329/-161) po/ko.po (+339/-165) po/ku.po (+322/-163) po/ky.po (+211/-116) po/lt.po (+353/-163) po/lv.po (+329/-161) po/mai.po (+322/-163) po/mg.po (+319/-160) po/mk.po (+319/-160) po/ml.po (+332/-164) po/mn.po (+292/-145) po/mr.po (+333/-166) po/ms.po (+343/-161) po/nb.po (+328/-160) po/ne.po (+314/-155) po/nl.po (+344/-168) po/nn.po (+329/-161) po/oc.po (+329/-161) po/or.po (+331/-163) po/pa.po (+329/-162) po/pl.po (+342/-161) po/ps.po (+288/-147) po/pt.po (+329/-161) po/pt_BR.po (+333/-161) po/ro.po (+328/-160) po/ru.po (+355/-166) po/rw.po (+230/-124) po/si.po (+274/-142) po/sk.po (+343/-161) po/sl.po (+336/-163) po/sq.po (+319/-160) po/sr.po (+339/-161) po/sr@latin.po (+330/-162) po/sv.po (+329/-161) po/ta.po (+334/-167) po/te.po (+331/-163) po/th.po (+331/-163) po/tr.po (+329/-161) po/ug.po (+329/-161) po/uk.po (+348/-166) po/vi.po (+328/-160) po/wa.po (+264/-135) po/xh.po (+320/-161) po/zh_CN.po (+360/-166) po/zh_HK.po (+328/-160) po/zh_TW.po (+328/-160) src/Makefile.am (+0/-58) src/Makefile.in (+0/-752) src/advpreferences.c (+846/-0) src/advpreferences.vala (+182/-0) src/appindicatorview.c (+275/-0) src/appindicatorview.vala (+56/-0) src/colormapper.c (+1065/-0) src/colormapper.vala (+149/-0) src/cpufreqprovider.c (+607/-0) src/cpufreqprovider.vala (+81/-0) src/cpuprovider.c (+522/-232) src/cpuprovider.vala (+43/-18) src/diskprovider.c (+154/-154) src/diskprovider.vala (+5/-5) src/expressionparser.c (+501/-501) src/expressionparser.vala (+4/-3) src/function.c (+204/-86) src/function.vala (+16/-1) src/graphmodel.c (+286/-367) src/graphmodel.vala (+3/-13) src/graphmodels.c (+36/-36) src/graphmodels.vala (+1/-1) src/gsettings-fixed.vapi (+0/-75) src/indicator.c (+2050/-0) src/indicator.vala (+257/-0) src/indicator_multiload_vala.stamp (+0/-1) src/indicatorview.c (+124/-0) src/indicatorview.vala (+26/-0) src/itemhelp.c (+716/-0) src/itemhelp.vala (+126/-0) src/itempreferences.c (+429/-408) src/itempreferences.vala (+43/-35) src/loadprovider.c (+83/-41) src/loadprovider.vala (+5/-3) src/main.c (+997/-965) src/main.vala (+74/-56) src/memprovider.c (+66/-66) src/memprovider.vala (+2/-2) src/menumodel.c (+59/-59) src/menumodel.vala (+1/-1) src/multiloadindicator.c (+0/-2006) src/multiloadindicator.vala (+0/-268) src/netprovider.c (+734/-341) src/netprovider.vala (+51/-23) src/preferences.c (+801/-334) src/preferences.vala (+151/-55) src/provider.c (+77/-45) src/provider.vala (+4/-3) src/providers.c (+184/-152) src/providers.vala (+7/-6) src/reaper.c (+59/-59) src/reaper.vala (+1/-1) src/settingscache.c (+52/-52) src/settingscache.vala (+17/-18) src/settingsconversion.c (+526/-445) src/settingsconversion.vala (+58/-59) src/swapprovider.c (+29/-29) src/swapprovider.vala (+2/-2) src/tracemodel.c (+116/-116) src/tracemodel.vala (+2/-2) src/trayindicatorview.c (+432/-0) src/trayindicatorview.vala (+73/-0) src/utils.c (+277/-208) src/utils.vala (+37/-20) src/various.vapi (+21/-3) |
To merge this branch: | bzr merge lp:~mh21/ubuntu/utopic/indicator-multiload/version-0.4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Review via email: mp+223158@code.launchpad.net |
Commit message
Description of the change
updated upstream version to 0.4
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'HACKING' |
2 | --- HACKING 2011-08-07 13:04:59 +0000 |
3 | +++ HACKING 2014-06-14 19:08:06 +0000 |
4 | @@ -1,4 +1,4 @@ |
5 | -You need at least vala 0.12 and devel packages for glib, gtk+ 3.0, cairo, appindicator and libgtop 2.0. |
6 | +You need at least vala 0.14 and devel packages for glib, gtk+ 3.0, cairo, appindicator and libgtop 2.0. |
7 | |
8 | To compile, run |
9 | ./autogen.sh && make |
10 | |
11 | === modified file 'Makefile.am' |
12 | --- Makefile.am 2013-02-16 17:50:35 +0000 |
13 | +++ Makefile.am 2014-06-14 19:08:06 +0000 |
14 | @@ -1,4 +1,80 @@ |
15 | -SUBDIRS = src data po |
16 | +SUBDIRS = po |
17 | + |
18 | +# general stuff |
19 | + |
20 | +AM_CPPFLAGS = \ |
21 | + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ |
22 | + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ |
23 | + $(MULTILOADDEPS_CFLAGS) \ |
24 | + -include $(CONFIG_HEADER) |
25 | + |
26 | +AM_CFLAGS = -Wall \ |
27 | + -Wno-unused-but-set-variable \ |
28 | + -Wno-unused-variable \ |
29 | + -Wno-unused-function \ |
30 | + -Wno-missing-braces |
31 | + |
32 | +VALAFLAGS = \ |
33 | + --pkg=posix \ |
34 | + --pkg=gtk+-3.0 \ |
35 | + --pkg=cairo \ |
36 | + --pkg=appindicator3-0.1 \ |
37 | + --pkg=glib-2.0 \ |
38 | + --pkg=gio-unix-2.0 \ |
39 | + --pkg=gmodule-2.0 \ |
40 | + --enable-checking |
41 | + |
42 | +@INTLTOOL_DESKTOP_RULE@ |
43 | +@INTLTOOL_XML_NOMERGE_RULE@ |
44 | +@GSETTINGS_RULES@ |
45 | + |
46 | +# the indicator |
47 | + |
48 | +bin_PROGRAMS = indicator-multiload |
49 | + |
50 | +indicator_multiload_VALASOURCES = \ |
51 | + src/advpreferences.vala \ |
52 | + src/appindicatorview.vala \ |
53 | + src/colormapper.vala \ |
54 | + src/cpufreqprovider.vala \ |
55 | + src/cpuprovider.vala \ |
56 | + src/diskprovider.vala \ |
57 | + src/expressionparser.vala \ |
58 | + src/function.vala \ |
59 | + src/graphmodels.vala \ |
60 | + src/graphmodel.vala \ |
61 | + src/indicator.vala \ |
62 | + src/indicatorview.vala \ |
63 | + src/itemhelp.vala \ |
64 | + src/itempreferences.vala \ |
65 | + src/loadprovider.vala \ |
66 | + src/main.vala \ |
67 | + src/memprovider.vala \ |
68 | + src/menumodel.vala \ |
69 | + src/netprovider.vala \ |
70 | + src/preferences.vala \ |
71 | + src/providers.vala \ |
72 | + src/provider.vala \ |
73 | + src/reaper.vala \ |
74 | + src/settingscache.vala \ |
75 | + src/settingsconversion.vala \ |
76 | + src/swapprovider.vala \ |
77 | + src/tracemodel.vala \ |
78 | + src/trayindicatorview.vala \ |
79 | + src/utils.vala |
80 | + |
81 | +indicator_multiload_SOURCES = \ |
82 | + $(indicator_multiload_VALASOURCES) \ |
83 | + src/config.vapi \ |
84 | + src/gtop.vapi \ |
85 | + src/various.vapi |
86 | + |
87 | +indicator_multiload_LDFLAGS = \ |
88 | + -Wl,--export-dynamic -Wl,--as-needed |
89 | + |
90 | +indicator_multiload_LDADD = $(MULTILOADDEPS_LIBS) -lm |
91 | + |
92 | +# documentation |
93 | |
94 | multiloaddocdir = ${datadir}/doc/indicator-multiload |
95 | multiloaddoc_DATA = \ |
96 | @@ -7,36 +83,81 @@ |
97 | TODO \ |
98 | HACKING |
99 | |
100 | +# gui |
101 | + |
102 | +uidir = $(pkgdatadir) |
103 | +nodist_ui_DATA = data/preferences.ui |
104 | + |
105 | +# desktop file |
106 | + |
107 | +desktopdir = $(datadir)/applications |
108 | +desktop_in_files = data/indicator-multiload.desktop.in |
109 | +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) |
110 | + |
111 | +# gsettings schema |
112 | + |
113 | +gsettings_SCHEMAS = data/de.mh21.indicator-multiload.gschema.xml |
114 | + |
115 | +# clean and dist |
116 | + |
117 | +CLEANFILES = \ |
118 | + $(desktop_DATA) \ |
119 | + $(gsettings_SCHEMAS) |
120 | + |
121 | +DISTCLEANFILES = \ |
122 | + $(indicator_multiload_VALASOURCES:.vala=.c) indicator_multiload_vala.stamp |
123 | + |
124 | EXTRA_DIST = \ |
125 | $(multiloaddoc_DATA) \ |
126 | + $(desktop_in_files) \ |
127 | + data/preferences.ui.in \ |
128 | + data/de.mh21.indicator-multiload.gschema.xml.in.in \ |
129 | autogen.sh |
130 | |
131 | uninstall-hook: |
132 | - -rmdir $(multiloaddocdir) |
133 | - |
134 | -test-run: |
135 | - -rm -rf local-xdg-data-dir |
136 | - -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
137 | - -ln -s ../../../data/de.mh21.indicator.multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
138 | - -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
139 | - -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
140 | - -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_SLICE=always-malloc src/indicator-multiload |
141 | - -rm -rf local-xdg-data-dir |
142 | - |
143 | -test-debug: |
144 | - -rm -rf local-xdg-data-dir |
145 | - -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
146 | - -ln -s ../../../data/de.mh21.indicator.multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
147 | - -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
148 | - -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
149 | - -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_SLICE=always-malloc gdb src/indicator-multiload |
150 | - -rm -rf local-xdg-data-dir |
151 | - |
152 | -test-valgrind: |
153 | - -rm -rf local-xdg-data-dir |
154 | - -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
155 | - -ln -s ../../../data/de.mh21.indicator.multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
156 | - -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
157 | - -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
158 | - -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=20 --show-reachable=yes --log-file=vgdump src/indicator-multiload |
159 | - -rm -rf local-xdg-data-dir |
160 | + -rmdir $(multiloaddocdir) $(pkgdatadir) |
161 | + |
162 | +# run targets |
163 | + |
164 | +test-run: all |
165 | + -rm -rf local-xdg-data-dir |
166 | + -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
167 | + -ln -s ../../../data/de.mh21.indicator-multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
168 | + -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
169 | + -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
170 | + -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_SLICE=always-malloc ./indicator-multiload |
171 | + -rm -rf local-xdg-data-dir |
172 | + |
173 | +test-verbose: all |
174 | + -rm -rf local-xdg-data-dir |
175 | + -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
176 | + -ln -s ../../../data/de.mh21.indicator-multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
177 | + -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
178 | + -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
179 | + -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_MESSAGES_DEBUG=all G_SLICE=always-malloc ./indicator-multiload |
180 | + -rm -rf local-xdg-data-dir |
181 | + |
182 | +test-debug: all |
183 | + -rm -rf local-xdg-data-dir |
184 | + -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
185 | + -ln -s ../../../data/de.mh21.indicator-multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
186 | + -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
187 | + -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
188 | + -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_MESSAGES_DEBUG=all G_SLICE=always-malloc gdb --args ./indicator-multiload |
189 | + -rm -rf local-xdg-data-dir |
190 | + |
191 | +test-valgrind: all |
192 | + -rm -rf local-xdg-data-dir |
193 | + -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
194 | + -ln -s ../../../data/de.mh21.indicator-multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
195 | + -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
196 | + -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
197 | + -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_MESSAGES_DEBUG=all G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=20 --show-reachable=yes --log-file=vgdump ./indicator-multiload |
198 | + -rm -rf local-xdg-data-dir |
199 | + |
200 | +# these are a bit of a hack, as automake has tags support |
201 | +tags: |
202 | + -anjuta-tags -R -o tags src |
203 | + |
204 | +tags-vala: |
205 | + -anjuta-tags -o tags-vala /usr/share/vala-$$($(VALAC) --version | sed 's/.*\(0\.[0-9]\+\)\.[0-9]\+/\1/')/vapi/*.vapi |
206 | |
207 | === modified file 'Makefile.in' |
208 | --- Makefile.in 2013-02-16 17:50:35 +0000 |
209 | +++ Makefile.in 2014-06-14 19:08:06 +0000 |
210 | @@ -1,9 +1,8 @@ |
211 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
212 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
213 | # @configure_input@ |
214 | |
215 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
216 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
217 | -# Foundation, Inc. |
218 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
219 | + |
220 | # This Makefile.in is free software; the Free Software Foundation |
221 | # gives unlimited permission to copy and/or distribute it, |
222 | # with or without modifications, as long as this notice is preserved. |
223 | @@ -15,7 +14,53 @@ |
224 | |
225 | @SET_MAKE@ |
226 | |
227 | + |
228 | VPATH = @srcdir@ |
229 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
230 | +am__make_running_with_option = \ |
231 | + case $${target_option-} in \ |
232 | + ?) ;; \ |
233 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
234 | + "target option '$${target_option-}' specified" >&2; \ |
235 | + exit 1;; \ |
236 | + esac; \ |
237 | + has_opt=no; \ |
238 | + sane_makeflags=$$MAKEFLAGS; \ |
239 | + if $(am__is_gnu_make); then \ |
240 | + sane_makeflags=$$MFLAGS; \ |
241 | + else \ |
242 | + case $$MAKEFLAGS in \ |
243 | + *\\[\ \ ]*) \ |
244 | + bs=\\; \ |
245 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
246 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
247 | + esac; \ |
248 | + fi; \ |
249 | + skip_next=no; \ |
250 | + strip_trailopt () \ |
251 | + { \ |
252 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
253 | + }; \ |
254 | + for flg in $$sane_makeflags; do \ |
255 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
256 | + case $$flg in \ |
257 | + *=*|--*) continue;; \ |
258 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
259 | + -*I?*) strip_trailopt 'I';; \ |
260 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
261 | + -*O?*) strip_trailopt 'O';; \ |
262 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
263 | + -*l?*) strip_trailopt 'l';; \ |
264 | + -[dEDm]) skip_next=yes;; \ |
265 | + -[JT]) skip_next=yes;; \ |
266 | + esac; \ |
267 | + case $$flg in \ |
268 | + *$$target_option*) has_opt=yes; break;; \ |
269 | + esac; \ |
270 | + done; \ |
271 | + test $$has_opt = yes |
272 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
273 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
274 | pkgdatadir = $(datadir)/@PACKAGE@ |
275 | pkgincludedir = $(includedir)/@PACKAGE@ |
276 | pkglibdir = $(libdir)/@PACKAGE@ |
277 | @@ -32,14 +77,24 @@ |
278 | NORMAL_UNINSTALL = : |
279 | PRE_UNINSTALL = : |
280 | POST_UNINSTALL = : |
281 | -build_triplet = @build@ |
282 | -host_triplet = @host@ |
283 | +bin_PROGRAMS = indicator-multiload$(EXEEXT) |
284 | subdir = . |
285 | -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
286 | - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
287 | - $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING TODO \ |
288 | - config.guess config.rpath config.sub depcomp install-sh \ |
289 | - missing |
290 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
291 | + $(top_srcdir)/configure $(am__configure_deps) \ |
292 | + $(srcdir)/config.h.in $(top_srcdir)/data/preferences.ui.in \ |
293 | + $(top_srcdir)/data/de.mh21.indicator-multiload.gschema.xml.in.in \ |
294 | + src/advpreferences.c src/appindicatorview.c src/colormapper.c \ |
295 | + src/cpufreqprovider.c src/cpuprovider.c src/diskprovider.c \ |
296 | + src/expressionparser.c src/function.c src/graphmodels.c \ |
297 | + src/graphmodel.c src/indicator.c src/indicatorview.c \ |
298 | + src/itemhelp.c src/itempreferences.c src/loadprovider.c \ |
299 | + src/main.c src/memprovider.c src/menumodel.c src/netprovider.c \ |
300 | + src/preferences.c src/providers.c src/provider.c src/reaper.c \ |
301 | + src/settingscache.c src/settingsconversion.c \ |
302 | + src/swapprovider.c src/tracemodel.c src/trayindicatorview.c \ |
303 | + src/utils.c depcomp $(srcdir)/indicator_multiload_vala.stamp \ |
304 | + ABOUT-NLS AUTHORS COPYING README TODO compile config.guess \ |
305 | + config.rpath config.sub install-sh missing |
306 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
307 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
308 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
309 | @@ -48,23 +103,82 @@ |
310 | configure.lineno config.status.lineno |
311 | mkinstalldirs = $(install_sh) -d |
312 | CONFIG_HEADER = config.h |
313 | -CONFIG_CLEAN_FILES = |
314 | +CONFIG_CLEAN_FILES = data/preferences.ui \ |
315 | + data/de.mh21.indicator-multiload.gschema.xml.in |
316 | CONFIG_CLEAN_VPATH_FILES = |
317 | +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ |
318 | + "$(DESTDIR)$(multiloaddocdir)" "$(DESTDIR)$(uidir)" |
319 | +PROGRAMS = $(bin_PROGRAMS) |
320 | +am__dirstamp = $(am__leading_dot)dirstamp |
321 | +am__objects_1 = src/advpreferences.$(OBJEXT) \ |
322 | + src/appindicatorview.$(OBJEXT) src/colormapper.$(OBJEXT) \ |
323 | + src/cpufreqprovider.$(OBJEXT) src/cpuprovider.$(OBJEXT) \ |
324 | + src/diskprovider.$(OBJEXT) src/expressionparser.$(OBJEXT) \ |
325 | + src/function.$(OBJEXT) src/graphmodels.$(OBJEXT) \ |
326 | + src/graphmodel.$(OBJEXT) src/indicator.$(OBJEXT) \ |
327 | + src/indicatorview.$(OBJEXT) src/itemhelp.$(OBJEXT) \ |
328 | + src/itempreferences.$(OBJEXT) src/loadprovider.$(OBJEXT) \ |
329 | + src/main.$(OBJEXT) src/memprovider.$(OBJEXT) \ |
330 | + src/menumodel.$(OBJEXT) src/netprovider.$(OBJEXT) \ |
331 | + src/preferences.$(OBJEXT) src/providers.$(OBJEXT) \ |
332 | + src/provider.$(OBJEXT) src/reaper.$(OBJEXT) \ |
333 | + src/settingscache.$(OBJEXT) src/settingsconversion.$(OBJEXT) \ |
334 | + src/swapprovider.$(OBJEXT) src/tracemodel.$(OBJEXT) \ |
335 | + src/trayindicatorview.$(OBJEXT) src/utils.$(OBJEXT) |
336 | +am_indicator_multiload_OBJECTS = $(am__objects_1) |
337 | +indicator_multiload_OBJECTS = $(am_indicator_multiload_OBJECTS) |
338 | +am__DEPENDENCIES_1 = |
339 | +indicator_multiload_DEPENDENCIES = $(am__DEPENDENCIES_1) |
340 | +indicator_multiload_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
341 | + $(indicator_multiload_LDFLAGS) $(LDFLAGS) -o $@ |
342 | +AM_V_P = $(am__v_P_@AM_V@) |
343 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
344 | +am__v_P_0 = false |
345 | +am__v_P_1 = : |
346 | AM_V_GEN = $(am__v_GEN_@AM_V@) |
347 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
348 | -am__v_GEN_0 = @echo " GEN " $@; |
349 | +am__v_GEN_0 = @echo " GEN " $@; |
350 | +am__v_GEN_1 = |
351 | AM_V_at = $(am__v_at_@AM_V@) |
352 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
353 | am__v_at_0 = @ |
354 | -SOURCES = |
355 | -DIST_SOURCES = |
356 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
357 | - html-recursive info-recursive install-data-recursive \ |
358 | - install-dvi-recursive install-exec-recursive \ |
359 | - install-html-recursive install-info-recursive \ |
360 | - install-pdf-recursive install-ps-recursive install-recursive \ |
361 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
362 | - ps-recursive uninstall-recursive |
363 | +am__v_at_1 = |
364 | +DEFAULT_INCLUDES = -I.@am__isrc@ |
365 | +depcomp = $(SHELL) $(top_srcdir)/depcomp |
366 | +am__depfiles_maybe = depfiles |
367 | +am__mv = mv -f |
368 | +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
369 | + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
370 | +AM_V_CC = $(am__v_CC_@AM_V@) |
371 | +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
372 | +am__v_CC_0 = @echo " CC " $@; |
373 | +am__v_CC_1 = |
374 | +CCLD = $(CC) |
375 | +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
376 | +AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
377 | +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
378 | +am__v_CCLD_0 = @echo " CCLD " $@; |
379 | +am__v_CCLD_1 = |
380 | +VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) |
381 | +AM_V_VALAC = $(am__v_VALAC_@AM_V@) |
382 | +am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@) |
383 | +am__v_VALAC_0 = @echo " VALAC " $@; |
384 | +am__v_VALAC_1 = |
385 | +SOURCES = $(indicator_multiload_SOURCES) |
386 | +DIST_SOURCES = $(indicator_multiload_SOURCES) |
387 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
388 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
389 | + install-data-recursive install-dvi-recursive \ |
390 | + install-exec-recursive install-html-recursive \ |
391 | + install-info-recursive install-pdf-recursive \ |
392 | + install-ps-recursive install-recursive installcheck-recursive \ |
393 | + installdirs-recursive pdf-recursive ps-recursive \ |
394 | + tags-recursive uninstall-recursive |
395 | +am__can_run_installinfo = \ |
396 | + case $$AM_UPDATE_INFO_DIR in \ |
397 | + n|no|NO) false;; \ |
398 | + *) (install-info --version) >/dev/null 2>&1;; \ |
399 | + esac |
400 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
401 | am__vpath_adj = case $$p in \ |
402 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
403 | @@ -92,15 +206,36 @@ |
404 | || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
405 | $(am__cd) "$$dir" && rm -f $$files; }; \ |
406 | } |
407 | -am__installdirs = "$(DESTDIR)$(multiloaddocdir)" |
408 | -DATA = $(multiloaddoc_DATA) |
409 | +DATA = $(desktop_DATA) $(multiloaddoc_DATA) $(nodist_ui_DATA) |
410 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
411 | distclean-recursive maintainer-clean-recursive |
412 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
413 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
414 | - distdir dist dist-all distcheck |
415 | +am__recursive_targets = \ |
416 | + $(RECURSIVE_TARGETS) \ |
417 | + $(RECURSIVE_CLEAN_TARGETS) \ |
418 | + $(am__extra_recursive_targets) |
419 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
420 | + cscope distdir dist dist-all distcheck |
421 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
422 | + $(LISP)config.h.in |
423 | +# Read a list of newline-separated strings from the standard input, |
424 | +# and print each of them once, without duplicates. Input order is |
425 | +# *not* preserved. |
426 | +am__uniquify_input = $(AWK) '\ |
427 | + BEGIN { nonempty = 0; } \ |
428 | + { items[$$0] = 1; nonempty = 1; } \ |
429 | + END { if (nonempty) { for (i in items) print i; }; } \ |
430 | +' |
431 | +# Make sure the list of sources is unique. This is necessary because, |
432 | +# e.g., the same source file might be shared among _SOURCES variables |
433 | +# for different programs/libraries. |
434 | +am__define_uniq_tagged_files = \ |
435 | + list='$(am__tagged_files)'; \ |
436 | + unique=`for i in $$list; do \ |
437 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
438 | + done | $(am__uniquify_input)` |
439 | ETAGS = etags |
440 | CTAGS = ctags |
441 | +CSCOPE = cscope |
442 | DIST_SUBDIRS = $(SUBDIRS) |
443 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
444 | distdir = $(PACKAGE)-$(VERSION) |
445 | @@ -111,6 +246,7 @@ |
446 | && rm -rf "$(distdir)" \ |
447 | || { sleep 5 && rm -rf "$(distdir)"; }; \ |
448 | else :; fi |
449 | +am__post_remove_distdir = $(am__remove_distdir) |
450 | am__relativize = \ |
451 | dir0=`pwd`; \ |
452 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
453 | @@ -136,8 +272,9 @@ |
454 | dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
455 | done; \ |
456 | reldir="$$dir2" |
457 | -DIST_ARCHIVES = $(distdir).tar.gz |
458 | GZIP_ENV = --best |
459 | +DIST_ARCHIVES = $(distdir).tar.xz |
460 | +DIST_TARGETS = dist-xz |
461 | distuninstallcheck_listfiles = find . -type f -print |
462 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
463 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
464 | @@ -153,7 +290,6 @@ |
465 | CC = @CC@ |
466 | CCDEPMODE = @CCDEPMODE@ |
467 | CFLAGS = @CFLAGS@ |
468 | -CPP = @CPP@ |
469 | CPPFLAGS = @CPPFLAGS@ |
470 | CYGPATH_W = @CYGPATH_W@ |
471 | DATADIRNAME = @DATADIRNAME@ |
472 | @@ -162,21 +298,16 @@ |
473 | ECHO_C = @ECHO_C@ |
474 | ECHO_N = @ECHO_N@ |
475 | ECHO_T = @ECHO_T@ |
476 | -EGREP = @EGREP@ |
477 | EXEEXT = @EXEEXT@ |
478 | -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
479 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
480 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
481 | GMSGFMT = @GMSGFMT@ |
482 | -GMSGFMT_015 = @GMSGFMT_015@ |
483 | -GREP = @GREP@ |
484 | GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ |
485 | INSTALL = @INSTALL@ |
486 | INSTALL_DATA = @INSTALL_DATA@ |
487 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
488 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
489 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
490 | -INTLLIBS = @INTLLIBS@ |
491 | INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
492 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
493 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
494 | @@ -185,19 +316,13 @@ |
495 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
496 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
497 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
498 | -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
499 | LDFLAGS = @LDFLAGS@ |
500 | -LIBICONV = @LIBICONV@ |
501 | -LIBINTL = @LIBINTL@ |
502 | LIBOBJS = @LIBOBJS@ |
503 | LIBS = @LIBS@ |
504 | -LTLIBICONV = @LTLIBICONV@ |
505 | -LTLIBINTL = @LTLIBINTL@ |
506 | LTLIBOBJS = @LTLIBOBJS@ |
507 | MAKEINFO = @MAKEINFO@ |
508 | MKDIR_P = @MKDIR_P@ |
509 | MSGFMT = @MSGFMT@ |
510 | -MSGFMT_015 = @MSGFMT_015@ |
511 | MSGMERGE = @MSGMERGE@ |
512 | MULTILOADDEPS_CFLAGS = @MULTILOADDEPS_CFLAGS@ |
513 | MULTILOADDEPS_LIBS = @MULTILOADDEPS_LIBS@ |
514 | @@ -213,7 +338,6 @@ |
515 | PKG_CONFIG = @PKG_CONFIG@ |
516 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
517 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
518 | -POSUB = @POSUB@ |
519 | SET_MAKE = @SET_MAKE@ |
520 | SHELL = @SHELL@ |
521 | STRIP = @STRIP@ |
522 | @@ -221,8 +345,6 @@ |
523 | VALAC = @VALAC@ |
524 | VERSION = @VERSION@ |
525 | XGETTEXT = @XGETTEXT@ |
526 | -XGETTEXT_015 = @XGETTEXT_015@ |
527 | -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
528 | abs_builddir = @abs_builddir@ |
529 | abs_srcdir = @abs_srcdir@ |
530 | abs_top_builddir = @abs_top_builddir@ |
531 | @@ -234,11 +356,7 @@ |
532 | am__tar = @am__tar@ |
533 | am__untar = @am__untar@ |
534 | bindir = @bindir@ |
535 | -build = @build@ |
536 | build_alias = @build_alias@ |
537 | -build_cpu = @build_cpu@ |
538 | -build_os = @build_os@ |
539 | -build_vendor = @build_vendor@ |
540 | builddir = @builddir@ |
541 | datadir = @datadir@ |
542 | datarootdir = @datarootdir@ |
543 | @@ -246,11 +364,7 @@ |
544 | dvidir = @dvidir@ |
545 | exec_prefix = @exec_prefix@ |
546 | gsettingsschemadir = @gsettingsschemadir@ |
547 | -host = @host@ |
548 | host_alias = @host_alias@ |
549 | -host_cpu = @host_cpu@ |
550 | -host_os = @host_os@ |
551 | -host_vendor = @host_vendor@ |
552 | htmldir = @htmldir@ |
553 | includedir = @includedir@ |
554 | infodir = @infodir@ |
555 | @@ -276,7 +390,74 @@ |
556 | top_build_prefix = @top_build_prefix@ |
557 | top_builddir = @top_builddir@ |
558 | top_srcdir = @top_srcdir@ |
559 | -SUBDIRS = src data po |
560 | +SUBDIRS = po |
561 | + |
562 | +# general stuff |
563 | +AM_CPPFLAGS = \ |
564 | + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ |
565 | + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ |
566 | + $(MULTILOADDEPS_CFLAGS) \ |
567 | + -include $(CONFIG_HEADER) |
568 | + |
569 | +AM_CFLAGS = -Wall \ |
570 | + -Wno-unused-but-set-variable \ |
571 | + -Wno-unused-variable \ |
572 | + -Wno-unused-function \ |
573 | + -Wno-missing-braces |
574 | + |
575 | +VALAFLAGS = \ |
576 | + --pkg=posix \ |
577 | + --pkg=gtk+-3.0 \ |
578 | + --pkg=cairo \ |
579 | + --pkg=appindicator3-0.1 \ |
580 | + --pkg=glib-2.0 \ |
581 | + --pkg=gio-unix-2.0 \ |
582 | + --pkg=gmodule-2.0 \ |
583 | + --enable-checking |
584 | + |
585 | +indicator_multiload_VALASOURCES = \ |
586 | + src/advpreferences.vala \ |
587 | + src/appindicatorview.vala \ |
588 | + src/colormapper.vala \ |
589 | + src/cpufreqprovider.vala \ |
590 | + src/cpuprovider.vala \ |
591 | + src/diskprovider.vala \ |
592 | + src/expressionparser.vala \ |
593 | + src/function.vala \ |
594 | + src/graphmodels.vala \ |
595 | + src/graphmodel.vala \ |
596 | + src/indicator.vala \ |
597 | + src/indicatorview.vala \ |
598 | + src/itemhelp.vala \ |
599 | + src/itempreferences.vala \ |
600 | + src/loadprovider.vala \ |
601 | + src/main.vala \ |
602 | + src/memprovider.vala \ |
603 | + src/menumodel.vala \ |
604 | + src/netprovider.vala \ |
605 | + src/preferences.vala \ |
606 | + src/providers.vala \ |
607 | + src/provider.vala \ |
608 | + src/reaper.vala \ |
609 | + src/settingscache.vala \ |
610 | + src/settingsconversion.vala \ |
611 | + src/swapprovider.vala \ |
612 | + src/tracemodel.vala \ |
613 | + src/trayindicatorview.vala \ |
614 | + src/utils.vala |
615 | + |
616 | +indicator_multiload_SOURCES = \ |
617 | + $(indicator_multiload_VALASOURCES) \ |
618 | + src/config.vapi \ |
619 | + src/gtop.vapi \ |
620 | + src/various.vapi |
621 | + |
622 | +indicator_multiload_LDFLAGS = \ |
623 | + -Wl,--export-dynamic -Wl,--as-needed |
624 | + |
625 | +indicator_multiload_LDADD = $(MULTILOADDEPS_LIBS) -lm |
626 | + |
627 | +# documentation |
628 | multiloaddocdir = ${datadir}/doc/indicator-multiload |
629 | multiloaddoc_DATA = \ |
630 | COPYING \ |
631 | @@ -284,14 +465,39 @@ |
632 | TODO \ |
633 | HACKING |
634 | |
635 | + |
636 | +# gui |
637 | +uidir = $(pkgdatadir) |
638 | +nodist_ui_DATA = data/preferences.ui |
639 | + |
640 | +# desktop file |
641 | +desktopdir = $(datadir)/applications |
642 | +desktop_in_files = data/indicator-multiload.desktop.in |
643 | +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) |
644 | + |
645 | +# gsettings schema |
646 | +gsettings_SCHEMAS = data/de.mh21.indicator-multiload.gschema.xml |
647 | + |
648 | +# clean and dist |
649 | +CLEANFILES = \ |
650 | + $(desktop_DATA) \ |
651 | + $(gsettings_SCHEMAS) |
652 | + |
653 | +DISTCLEANFILES = \ |
654 | + $(indicator_multiload_VALASOURCES:.vala=.c) indicator_multiload_vala.stamp |
655 | + |
656 | EXTRA_DIST = \ |
657 | $(multiloaddoc_DATA) \ |
658 | + $(desktop_in_files) \ |
659 | + data/preferences.ui.in \ |
660 | + data/de.mh21.indicator-multiload.gschema.xml.in.in \ |
661 | autogen.sh |
662 | |
663 | all: config.h |
664 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
665 | |
666 | .SUFFIXES: |
667 | +.SUFFIXES: .c .o .obj |
668 | am--refresh: Makefile |
669 | @: |
670 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
671 | @@ -328,8 +534,8 @@ |
672 | $(am__aclocal_m4_deps): |
673 | |
674 | config.h: stamp-h1 |
675 | - @if test ! -f $@; then rm -f stamp-h1; else :; fi |
676 | - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
677 | + @test -f $@ || rm -f stamp-h1 |
678 | + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 |
679 | |
680 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
681 | @rm -f stamp-h1 |
682 | @@ -341,10 +547,348 @@ |
683 | |
684 | distclean-hdr: |
685 | -rm -f config.h stamp-h1 |
686 | +data/preferences.ui: $(top_builddir)/config.status $(top_srcdir)/data/preferences.ui.in |
687 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
688 | +data/de.mh21.indicator-multiload.gschema.xml.in: $(top_builddir)/config.status $(top_srcdir)/data/de.mh21.indicator-multiload.gschema.xml.in.in |
689 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
690 | +install-binPROGRAMS: $(bin_PROGRAMS) |
691 | + @$(NORMAL_INSTALL) |
692 | + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
693 | + if test -n "$$list"; then \ |
694 | + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
695 | + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
696 | + fi; \ |
697 | + for p in $$list; do echo "$$p $$p"; done | \ |
698 | + sed 's/$(EXEEXT)$$//' | \ |
699 | + while read p p1; do if test -f $$p \ |
700 | + ; then echo "$$p"; echo "$$p"; else :; fi; \ |
701 | + done | \ |
702 | + sed -e 'p;s,.*/,,;n;h' \ |
703 | + -e 's|.*|.|' \ |
704 | + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ |
705 | + sed 'N;N;N;s,\n, ,g' | \ |
706 | + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ |
707 | + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ |
708 | + if ($$2 == $$4) files[d] = files[d] " " $$1; \ |
709 | + else { print "f", $$3 "/" $$4, $$1; } } \ |
710 | + END { for (d in files) print "f", d, files[d] }' | \ |
711 | + while read type dir files; do \ |
712 | + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
713 | + test -z "$$files" || { \ |
714 | + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
715 | + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
716 | + } \ |
717 | + ; done |
718 | + |
719 | +uninstall-binPROGRAMS: |
720 | + @$(NORMAL_UNINSTALL) |
721 | + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
722 | + files=`for p in $$list; do echo "$$p"; done | \ |
723 | + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
724 | + -e 's/$$/$(EXEEXT)/' \ |
725 | + `; \ |
726 | + test -n "$$list" || exit 0; \ |
727 | + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
728 | + cd "$(DESTDIR)$(bindir)" && rm -f $$files |
729 | + |
730 | +clean-binPROGRAMS: |
731 | + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) |
732 | +src/$(am__dirstamp): |
733 | + @$(MKDIR_P) src |
734 | + @: > src/$(am__dirstamp) |
735 | +src/$(DEPDIR)/$(am__dirstamp): |
736 | + @$(MKDIR_P) src/$(DEPDIR) |
737 | + @: > src/$(DEPDIR)/$(am__dirstamp) |
738 | +src/advpreferences.$(OBJEXT): src/$(am__dirstamp) \ |
739 | + src/$(DEPDIR)/$(am__dirstamp) |
740 | +src/appindicatorview.$(OBJEXT): src/$(am__dirstamp) \ |
741 | + src/$(DEPDIR)/$(am__dirstamp) |
742 | +src/colormapper.$(OBJEXT): src/$(am__dirstamp) \ |
743 | + src/$(DEPDIR)/$(am__dirstamp) |
744 | +src/cpufreqprovider.$(OBJEXT): src/$(am__dirstamp) \ |
745 | + src/$(DEPDIR)/$(am__dirstamp) |
746 | +src/cpuprovider.$(OBJEXT): src/$(am__dirstamp) \ |
747 | + src/$(DEPDIR)/$(am__dirstamp) |
748 | +src/diskprovider.$(OBJEXT): src/$(am__dirstamp) \ |
749 | + src/$(DEPDIR)/$(am__dirstamp) |
750 | +src/expressionparser.$(OBJEXT): src/$(am__dirstamp) \ |
751 | + src/$(DEPDIR)/$(am__dirstamp) |
752 | +src/function.$(OBJEXT): src/$(am__dirstamp) \ |
753 | + src/$(DEPDIR)/$(am__dirstamp) |
754 | +src/graphmodels.$(OBJEXT): src/$(am__dirstamp) \ |
755 | + src/$(DEPDIR)/$(am__dirstamp) |
756 | +src/graphmodel.$(OBJEXT): src/$(am__dirstamp) \ |
757 | + src/$(DEPDIR)/$(am__dirstamp) |
758 | +src/indicator.$(OBJEXT): src/$(am__dirstamp) \ |
759 | + src/$(DEPDIR)/$(am__dirstamp) |
760 | +src/indicatorview.$(OBJEXT): src/$(am__dirstamp) \ |
761 | + src/$(DEPDIR)/$(am__dirstamp) |
762 | +src/itemhelp.$(OBJEXT): src/$(am__dirstamp) \ |
763 | + src/$(DEPDIR)/$(am__dirstamp) |
764 | +src/itempreferences.$(OBJEXT): src/$(am__dirstamp) \ |
765 | + src/$(DEPDIR)/$(am__dirstamp) |
766 | +src/loadprovider.$(OBJEXT): src/$(am__dirstamp) \ |
767 | + src/$(DEPDIR)/$(am__dirstamp) |
768 | +src/main.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) |
769 | +src/memprovider.$(OBJEXT): src/$(am__dirstamp) \ |
770 | + src/$(DEPDIR)/$(am__dirstamp) |
771 | +src/menumodel.$(OBJEXT): src/$(am__dirstamp) \ |
772 | + src/$(DEPDIR)/$(am__dirstamp) |
773 | +src/netprovider.$(OBJEXT): src/$(am__dirstamp) \ |
774 | + src/$(DEPDIR)/$(am__dirstamp) |
775 | +src/preferences.$(OBJEXT): src/$(am__dirstamp) \ |
776 | + src/$(DEPDIR)/$(am__dirstamp) |
777 | +src/providers.$(OBJEXT): src/$(am__dirstamp) \ |
778 | + src/$(DEPDIR)/$(am__dirstamp) |
779 | +src/provider.$(OBJEXT): src/$(am__dirstamp) \ |
780 | + src/$(DEPDIR)/$(am__dirstamp) |
781 | +src/reaper.$(OBJEXT): src/$(am__dirstamp) \ |
782 | + src/$(DEPDIR)/$(am__dirstamp) |
783 | +src/settingscache.$(OBJEXT): src/$(am__dirstamp) \ |
784 | + src/$(DEPDIR)/$(am__dirstamp) |
785 | +src/settingsconversion.$(OBJEXT): src/$(am__dirstamp) \ |
786 | + src/$(DEPDIR)/$(am__dirstamp) |
787 | +src/swapprovider.$(OBJEXT): src/$(am__dirstamp) \ |
788 | + src/$(DEPDIR)/$(am__dirstamp) |
789 | +src/tracemodel.$(OBJEXT): src/$(am__dirstamp) \ |
790 | + src/$(DEPDIR)/$(am__dirstamp) |
791 | +src/trayindicatorview.$(OBJEXT): src/$(am__dirstamp) \ |
792 | + src/$(DEPDIR)/$(am__dirstamp) |
793 | +src/utils.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) |
794 | + |
795 | +indicator-multiload$(EXEEXT): $(indicator_multiload_OBJECTS) $(indicator_multiload_DEPENDENCIES) $(EXTRA_indicator_multiload_DEPENDENCIES) |
796 | + @rm -f indicator-multiload$(EXEEXT) |
797 | + $(AM_V_CCLD)$(indicator_multiload_LINK) $(indicator_multiload_OBJECTS) $(indicator_multiload_LDADD) $(LIBS) |
798 | + |
799 | +mostlyclean-compile: |
800 | + -rm -f *.$(OBJEXT) |
801 | + -rm -f src/*.$(OBJEXT) |
802 | + |
803 | +distclean-compile: |
804 | + -rm -f *.tab.c |
805 | + |
806 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/advpreferences.Po@am__quote@ |
807 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/appindicatorview.Po@am__quote@ |
808 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/colormapper.Po@am__quote@ |
809 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cpufreqprovider.Po@am__quote@ |
810 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cpuprovider.Po@am__quote@ |
811 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/diskprovider.Po@am__quote@ |
812 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/expressionparser.Po@am__quote@ |
813 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/function.Po@am__quote@ |
814 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/graphmodel.Po@am__quote@ |
815 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/graphmodels.Po@am__quote@ |
816 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/indicator.Po@am__quote@ |
817 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/indicatorview.Po@am__quote@ |
818 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/itemhelp.Po@am__quote@ |
819 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/itempreferences.Po@am__quote@ |
820 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/loadprovider.Po@am__quote@ |
821 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/main.Po@am__quote@ |
822 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/memprovider.Po@am__quote@ |
823 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/menumodel.Po@am__quote@ |
824 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/netprovider.Po@am__quote@ |
825 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/preferences.Po@am__quote@ |
826 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/provider.Po@am__quote@ |
827 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/providers.Po@am__quote@ |
828 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/reaper.Po@am__quote@ |
829 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/settingscache.Po@am__quote@ |
830 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/settingsconversion.Po@am__quote@ |
831 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/swapprovider.Po@am__quote@ |
832 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tracemodel.Po@am__quote@ |
833 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/trayindicatorview.Po@am__quote@ |
834 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/utils.Po@am__quote@ |
835 | + |
836 | +.c.o: |
837 | +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ |
838 | +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ |
839 | +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po |
840 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
841 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
842 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
843 | + |
844 | +.c.obj: |
845 | +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ |
846 | +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ |
847 | +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po |
848 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
849 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
850 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
851 | +$(srcdir)/src/advpreferences.c: $(srcdir)/indicator_multiload_vala.stamp |
852 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
853 | + @if test -f $@; then :; else \ |
854 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
855 | + fi |
856 | +$(srcdir)/src/appindicatorview.c: $(srcdir)/indicator_multiload_vala.stamp |
857 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
858 | + @if test -f $@; then :; else \ |
859 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
860 | + fi |
861 | +$(srcdir)/src/colormapper.c: $(srcdir)/indicator_multiload_vala.stamp |
862 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
863 | + @if test -f $@; then :; else \ |
864 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
865 | + fi |
866 | +$(srcdir)/src/cpufreqprovider.c: $(srcdir)/indicator_multiload_vala.stamp |
867 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
868 | + @if test -f $@; then :; else \ |
869 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
870 | + fi |
871 | +$(srcdir)/src/cpuprovider.c: $(srcdir)/indicator_multiload_vala.stamp |
872 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
873 | + @if test -f $@; then :; else \ |
874 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
875 | + fi |
876 | +$(srcdir)/src/diskprovider.c: $(srcdir)/indicator_multiload_vala.stamp |
877 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
878 | + @if test -f $@; then :; else \ |
879 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
880 | + fi |
881 | +$(srcdir)/src/expressionparser.c: $(srcdir)/indicator_multiload_vala.stamp |
882 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
883 | + @if test -f $@; then :; else \ |
884 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
885 | + fi |
886 | +$(srcdir)/src/function.c: $(srcdir)/indicator_multiload_vala.stamp |
887 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
888 | + @if test -f $@; then :; else \ |
889 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
890 | + fi |
891 | +$(srcdir)/src/graphmodels.c: $(srcdir)/indicator_multiload_vala.stamp |
892 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
893 | + @if test -f $@; then :; else \ |
894 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
895 | + fi |
896 | +$(srcdir)/src/graphmodel.c: $(srcdir)/indicator_multiload_vala.stamp |
897 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
898 | + @if test -f $@; then :; else \ |
899 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
900 | + fi |
901 | +$(srcdir)/src/indicator.c: $(srcdir)/indicator_multiload_vala.stamp |
902 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
903 | + @if test -f $@; then :; else \ |
904 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
905 | + fi |
906 | +$(srcdir)/src/indicatorview.c: $(srcdir)/indicator_multiload_vala.stamp |
907 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
908 | + @if test -f $@; then :; else \ |
909 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
910 | + fi |
911 | +$(srcdir)/src/itemhelp.c: $(srcdir)/indicator_multiload_vala.stamp |
912 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
913 | + @if test -f $@; then :; else \ |
914 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
915 | + fi |
916 | +$(srcdir)/src/itempreferences.c: $(srcdir)/indicator_multiload_vala.stamp |
917 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
918 | + @if test -f $@; then :; else \ |
919 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
920 | + fi |
921 | +$(srcdir)/src/loadprovider.c: $(srcdir)/indicator_multiload_vala.stamp |
922 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
923 | + @if test -f $@; then :; else \ |
924 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
925 | + fi |
926 | +$(srcdir)/src/main.c: $(srcdir)/indicator_multiload_vala.stamp |
927 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
928 | + @if test -f $@; then :; else \ |
929 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
930 | + fi |
931 | +$(srcdir)/src/memprovider.c: $(srcdir)/indicator_multiload_vala.stamp |
932 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
933 | + @if test -f $@; then :; else \ |
934 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
935 | + fi |
936 | +$(srcdir)/src/menumodel.c: $(srcdir)/indicator_multiload_vala.stamp |
937 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
938 | + @if test -f $@; then :; else \ |
939 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
940 | + fi |
941 | +$(srcdir)/src/netprovider.c: $(srcdir)/indicator_multiload_vala.stamp |
942 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
943 | + @if test -f $@; then :; else \ |
944 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
945 | + fi |
946 | +$(srcdir)/src/preferences.c: $(srcdir)/indicator_multiload_vala.stamp |
947 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
948 | + @if test -f $@; then :; else \ |
949 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
950 | + fi |
951 | +$(srcdir)/src/providers.c: $(srcdir)/indicator_multiload_vala.stamp |
952 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
953 | + @if test -f $@; then :; else \ |
954 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
955 | + fi |
956 | +$(srcdir)/src/provider.c: $(srcdir)/indicator_multiload_vala.stamp |
957 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
958 | + @if test -f $@; then :; else \ |
959 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
960 | + fi |
961 | +$(srcdir)/src/reaper.c: $(srcdir)/indicator_multiload_vala.stamp |
962 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
963 | + @if test -f $@; then :; else \ |
964 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
965 | + fi |
966 | +$(srcdir)/src/settingscache.c: $(srcdir)/indicator_multiload_vala.stamp |
967 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
968 | + @if test -f $@; then :; else \ |
969 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
970 | + fi |
971 | +$(srcdir)/src/settingsconversion.c: $(srcdir)/indicator_multiload_vala.stamp |
972 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
973 | + @if test -f $@; then :; else \ |
974 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
975 | + fi |
976 | +$(srcdir)/src/swapprovider.c: $(srcdir)/indicator_multiload_vala.stamp |
977 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
978 | + @if test -f $@; then :; else \ |
979 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
980 | + fi |
981 | +$(srcdir)/src/tracemodel.c: $(srcdir)/indicator_multiload_vala.stamp |
982 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
983 | + @if test -f $@; then :; else \ |
984 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
985 | + fi |
986 | +$(srcdir)/src/trayindicatorview.c: $(srcdir)/indicator_multiload_vala.stamp |
987 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
988 | + @if test -f $@; then :; else \ |
989 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
990 | + fi |
991 | +$(srcdir)/src/utils.c: $(srcdir)/indicator_multiload_vala.stamp |
992 | + @if test -f $@; then :; else rm -f $(srcdir)/indicator_multiload_vala.stamp; fi |
993 | + @if test -f $@; then :; else \ |
994 | + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/indicator_multiload_vala.stamp; \ |
995 | + fi |
996 | +$(srcdir)/indicator_multiload_vala.stamp: src/advpreferences.vala src/appindicatorview.vala src/colormapper.vala src/cpufreqprovider.vala src/cpuprovider.vala src/diskprovider.vala src/expressionparser.vala src/function.vala src/graphmodels.vala src/graphmodel.vala src/indicator.vala src/indicatorview.vala src/itemhelp.vala src/itempreferences.vala src/loadprovider.vala src/main.vala src/memprovider.vala src/menumodel.vala src/netprovider.vala src/preferences.vala src/providers.vala src/provider.vala src/reaper.vala src/settingscache.vala src/settingsconversion.vala src/swapprovider.vala src/tracemodel.vala src/trayindicatorview.vala src/utils.vala src/config.vapi src/gtop.vapi src/various.vapi |
997 | + $(AM_V_at)rm -f $@ && echo stamp > $@-t |
998 | + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C src/advpreferences.vala src/appindicatorview.vala src/colormapper.vala src/cpufreqprovider.vala src/cpuprovider.vala src/diskprovider.vala src/expressionparser.vala src/function.vala src/graphmodels.vala src/graphmodel.vala src/indicator.vala src/indicatorview.vala src/itemhelp.vala src/itempreferences.vala src/loadprovider.vala src/main.vala src/memprovider.vala src/menumodel.vala src/netprovider.vala src/preferences.vala src/providers.vala src/provider.vala src/reaper.vala src/settingscache.vala src/settingsconversion.vala src/swapprovider.vala src/tracemodel.vala src/trayindicatorview.vala src/utils.vala src/config.vapi src/gtop.vapi src/various.vapi |
999 | + $(AM_V_at)mv -f $@-t $@ |
1000 | +install-desktopDATA: $(desktop_DATA) |
1001 | + @$(NORMAL_INSTALL) |
1002 | + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ |
1003 | + if test -n "$$list"; then \ |
1004 | + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ |
1005 | + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ |
1006 | + fi; \ |
1007 | + for p in $$list; do \ |
1008 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
1009 | + echo "$$d$$p"; \ |
1010 | + done | $(am__base_list) | \ |
1011 | + while read files; do \ |
1012 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ |
1013 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ |
1014 | + done |
1015 | + |
1016 | +uninstall-desktopDATA: |
1017 | + @$(NORMAL_UNINSTALL) |
1018 | + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ |
1019 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1020 | + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) |
1021 | install-multiloaddocDATA: $(multiloaddoc_DATA) |
1022 | @$(NORMAL_INSTALL) |
1023 | - test -z "$(multiloaddocdir)" || $(MKDIR_P) "$(DESTDIR)$(multiloaddocdir)" |
1024 | @list='$(multiloaddoc_DATA)'; test -n "$(multiloaddocdir)" || list=; \ |
1025 | + if test -n "$$list"; then \ |
1026 | + echo " $(MKDIR_P) '$(DESTDIR)$(multiloaddocdir)'"; \ |
1027 | + $(MKDIR_P) "$(DESTDIR)$(multiloaddocdir)" || exit 1; \ |
1028 | + fi; \ |
1029 | for p in $$list; do \ |
1030 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
1031 | echo "$$d$$p"; \ |
1032 | @@ -359,24 +903,48 @@ |
1033 | @list='$(multiloaddoc_DATA)'; test -n "$(multiloaddocdir)" || list=; \ |
1034 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1035 | dir='$(DESTDIR)$(multiloaddocdir)'; $(am__uninstall_files_from_dir) |
1036 | +install-nodist_uiDATA: $(nodist_ui_DATA) |
1037 | + @$(NORMAL_INSTALL) |
1038 | + @list='$(nodist_ui_DATA)'; test -n "$(uidir)" || list=; \ |
1039 | + if test -n "$$list"; then \ |
1040 | + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ |
1041 | + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ |
1042 | + fi; \ |
1043 | + for p in $$list; do \ |
1044 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
1045 | + echo "$$d$$p"; \ |
1046 | + done | $(am__base_list) | \ |
1047 | + while read files; do \ |
1048 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ |
1049 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ |
1050 | + done |
1051 | + |
1052 | +uninstall-nodist_uiDATA: |
1053 | + @$(NORMAL_UNINSTALL) |
1054 | + @list='$(nodist_ui_DATA)'; test -n "$(uidir)" || list=; \ |
1055 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
1056 | + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) |
1057 | |
1058 | # This directory's subdirectories are mostly independent; you can cd |
1059 | -# into them and run `make' without going through this Makefile. |
1060 | -# To change the values of `make' variables: instead of editing Makefiles, |
1061 | -# (1) if the variable is set in `config.status', edit `config.status' |
1062 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
1063 | -# (2) otherwise, pass the desired values on the `make' command line. |
1064 | -$(RECURSIVE_TARGETS): |
1065 | - @fail= failcom='exit 1'; \ |
1066 | - for f in x $$MAKEFLAGS; do \ |
1067 | - case $$f in \ |
1068 | - *=* | --[!k]*);; \ |
1069 | - *k*) failcom='fail=yes';; \ |
1070 | - esac; \ |
1071 | - done; \ |
1072 | +# into them and run 'make' without going through this Makefile. |
1073 | +# To change the values of 'make' variables: instead of editing Makefiles, |
1074 | +# (1) if the variable is set in 'config.status', edit 'config.status' |
1075 | +# (which will cause the Makefiles to be regenerated when you run 'make'); |
1076 | +# (2) otherwise, pass the desired values on the 'make' command line. |
1077 | +$(am__recursive_targets): |
1078 | + @fail=; \ |
1079 | + if $(am__make_keepgoing); then \ |
1080 | + failcom='fail=yes'; \ |
1081 | + else \ |
1082 | + failcom='exit 1'; \ |
1083 | + fi; \ |
1084 | dot_seen=no; \ |
1085 | target=`echo $@ | sed s/-recursive//`; \ |
1086 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1087 | + case "$@" in \ |
1088 | + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
1089 | + *) list='$(SUBDIRS)' ;; \ |
1090 | + esac; \ |
1091 | + for subdir in $$list; do \ |
1092 | echo "Making $$target in $$subdir"; \ |
1093 | if test "$$subdir" = "."; then \ |
1094 | dot_seen=yes; \ |
1095 | @@ -391,57 +959,11 @@ |
1096 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
1097 | fi; test -z "$$fail" |
1098 | |
1099 | -$(RECURSIVE_CLEAN_TARGETS): |
1100 | - @fail= failcom='exit 1'; \ |
1101 | - for f in x $$MAKEFLAGS; do \ |
1102 | - case $$f in \ |
1103 | - *=* | --[!k]*);; \ |
1104 | - *k*) failcom='fail=yes';; \ |
1105 | - esac; \ |
1106 | - done; \ |
1107 | - dot_seen=no; \ |
1108 | - case "$@" in \ |
1109 | - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
1110 | - *) list='$(SUBDIRS)' ;; \ |
1111 | - esac; \ |
1112 | - rev=''; for subdir in $$list; do \ |
1113 | - if test "$$subdir" = "."; then :; else \ |
1114 | - rev="$$subdir $$rev"; \ |
1115 | - fi; \ |
1116 | - done; \ |
1117 | - rev="$$rev ."; \ |
1118 | - target=`echo $@ | sed s/-recursive//`; \ |
1119 | - for subdir in $$rev; do \ |
1120 | - echo "Making $$target in $$subdir"; \ |
1121 | - if test "$$subdir" = "."; then \ |
1122 | - local_target="$$target-am"; \ |
1123 | - else \ |
1124 | - local_target="$$target"; \ |
1125 | - fi; \ |
1126 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1127 | - || eval $$failcom; \ |
1128 | - done && test -z "$$fail" |
1129 | -tags-recursive: |
1130 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1131 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
1132 | - done |
1133 | -ctags-recursive: |
1134 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1135 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
1136 | - done |
1137 | - |
1138 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
1139 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
1140 | - unique=`for i in $$list; do \ |
1141 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1142 | - done | \ |
1143 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1144 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1145 | - mkid -fID $$unique |
1146 | -tags: TAGS |
1147 | - |
1148 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1149 | - $(TAGS_FILES) $(LISP) |
1150 | +ID: $(am__tagged_files) |
1151 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
1152 | +TAGS: tags |
1153 | + |
1154 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
1155 | set x; \ |
1156 | here=`pwd`; \ |
1157 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
1158 | @@ -457,12 +979,7 @@ |
1159 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
1160 | fi; \ |
1161 | done; \ |
1162 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1163 | - unique=`for i in $$list; do \ |
1164 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1165 | - done | \ |
1166 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1167 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1168 | + $(am__define_uniq_tagged_files); \ |
1169 | shift; \ |
1170 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
1171 | test -n "$$unique" || unique=$$empty_fix; \ |
1172 | @@ -474,15 +991,11 @@ |
1173 | $$unique; \ |
1174 | fi; \ |
1175 | fi |
1176 | -ctags: CTAGS |
1177 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1178 | - $(TAGS_FILES) $(LISP) |
1179 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1180 | - unique=`for i in $$list; do \ |
1181 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1182 | - done | \ |
1183 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1184 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1185 | +ctags: ctags-recursive |
1186 | + |
1187 | +CTAGS: ctags |
1188 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
1189 | + $(am__define_uniq_tagged_files); \ |
1190 | test -z "$(CTAGS_ARGS)$$unique" \ |
1191 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
1192 | $$unique |
1193 | @@ -491,9 +1004,31 @@ |
1194 | here=`$(am__cd) $(top_builddir) && pwd` \ |
1195 | && $(am__cd) $(top_srcdir) \ |
1196 | && gtags -i $(GTAGS_ARGS) "$$here" |
1197 | +cscope: cscope.files |
1198 | + test ! -s cscope.files \ |
1199 | + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
1200 | +clean-cscope: |
1201 | + -rm -f cscope.files |
1202 | +cscope.files: clean-cscope cscopelist |
1203 | +cscopelist: cscopelist-recursive |
1204 | + |
1205 | +cscopelist-am: $(am__tagged_files) |
1206 | + list='$(am__tagged_files)'; \ |
1207 | + case "$(srcdir)" in \ |
1208 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
1209 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
1210 | + esac; \ |
1211 | + for i in $$list; do \ |
1212 | + if test -f "$$i"; then \ |
1213 | + echo "$(subdir)/$$i"; \ |
1214 | + else \ |
1215 | + echo "$$sdir/$$i"; \ |
1216 | + fi; \ |
1217 | + done >> $(top_builddir)/cscope.files |
1218 | |
1219 | distclean-tags: |
1220 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
1221 | + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
1222 | |
1223 | distdir: $(DISTFILES) |
1224 | $(am__remove_distdir) |
1225 | @@ -529,13 +1064,10 @@ |
1226 | done |
1227 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1228 | if test "$$subdir" = .; then :; else \ |
1229 | - test -d "$(distdir)/$$subdir" \ |
1230 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1231 | - || exit 1; \ |
1232 | - fi; \ |
1233 | - done |
1234 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1235 | - if test "$$subdir" = .; then :; else \ |
1236 | + $(am__make_dryrun) \ |
1237 | + || test -d "$(distdir)/$$subdir" \ |
1238 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1239 | + || exit 1; \ |
1240 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
1241 | $(am__relativize); \ |
1242 | new_distdir=$$reldir; \ |
1243 | @@ -564,40 +1096,41 @@ |
1244 | || chmod -R a+r "$(distdir)" |
1245 | dist-gzip: distdir |
1246 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1247 | - $(am__remove_distdir) |
1248 | + $(am__post_remove_distdir) |
1249 | |
1250 | dist-bzip2: distdir |
1251 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1252 | - $(am__remove_distdir) |
1253 | + $(am__post_remove_distdir) |
1254 | |
1255 | dist-lzip: distdir |
1256 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
1257 | - $(am__remove_distdir) |
1258 | - |
1259 | -dist-lzma: distdir |
1260 | - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
1261 | - $(am__remove_distdir) |
1262 | - |
1263 | + $(am__post_remove_distdir) |
1264 | dist-xz: distdir |
1265 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
1266 | - $(am__remove_distdir) |
1267 | + $(am__post_remove_distdir) |
1268 | |
1269 | dist-tarZ: distdir |
1270 | + @echo WARNING: "Support for shar distribution archives is" \ |
1271 | + "deprecated." >&2 |
1272 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
1273 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
1274 | - $(am__remove_distdir) |
1275 | + $(am__post_remove_distdir) |
1276 | |
1277 | dist-shar: distdir |
1278 | + @echo WARNING: "Support for distribution archives compressed with" \ |
1279 | + "legacy program 'compress' is deprecated." >&2 |
1280 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
1281 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
1282 | - $(am__remove_distdir) |
1283 | + $(am__post_remove_distdir) |
1284 | |
1285 | dist-zip: distdir |
1286 | -rm -f $(distdir).zip |
1287 | zip -rq $(distdir).zip $(distdir) |
1288 | - $(am__remove_distdir) |
1289 | + $(am__post_remove_distdir) |
1290 | |
1291 | -dist dist-all: distdir |
1292 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1293 | - $(am__remove_distdir) |
1294 | +dist dist-all: |
1295 | + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' |
1296 | + $(am__post_remove_distdir) |
1297 | |
1298 | # This target untars the dist file and tries a VPATH configuration. Then |
1299 | # it guarantees that the distribution is self-contained by making another |
1300 | @@ -608,8 +1141,6 @@ |
1301 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
1302 | *.tar.bz2*) \ |
1303 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
1304 | - *.tar.lzma*) \ |
1305 | - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
1306 | *.tar.lz*) \ |
1307 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
1308 | *.tar.xz*) \ |
1309 | @@ -621,18 +1152,19 @@ |
1310 | *.zip*) \ |
1311 | unzip $(distdir).zip ;;\ |
1312 | esac |
1313 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
1314 | - mkdir $(distdir)/_build |
1315 | - mkdir $(distdir)/_inst |
1316 | + chmod -R a-w $(distdir) |
1317 | + chmod u+w $(distdir) |
1318 | + mkdir $(distdir)/_build $(distdir)/_inst |
1319 | chmod a-w $(distdir) |
1320 | test -d $(distdir)/_build || exit 0; \ |
1321 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
1322 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
1323 | && am__cwd=`pwd` \ |
1324 | && $(am__cd) $(distdir)/_build \ |
1325 | - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
1326 | + && ../configure \ |
1327 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
1328 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
1329 | + --srcdir=.. --prefix="$$dc_install_base" \ |
1330 | && $(MAKE) $(AM_MAKEFLAGS) \ |
1331 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
1332 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
1333 | @@ -655,7 +1187,7 @@ |
1334 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
1335 | && cd "$$am__cwd" \ |
1336 | || exit 1 |
1337 | - $(am__remove_distdir) |
1338 | + $(am__post_remove_distdir) |
1339 | @(echo "$(distdir) archives ready for distribution: "; \ |
1340 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
1341 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
1342 | @@ -687,10 +1219,10 @@ |
1343 | exit 1; } >&2 |
1344 | check-am: all-am |
1345 | check: check-recursive |
1346 | -all-am: Makefile $(DATA) config.h |
1347 | +all-am: Makefile $(PROGRAMS) $(DATA) config.h |
1348 | installdirs: installdirs-recursive |
1349 | installdirs-am: |
1350 | - for dir in "$(DESTDIR)$(multiloaddocdir)"; do \ |
1351 | + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(multiloaddocdir)" "$(DESTDIR)$(uidir)"; do \ |
1352 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
1353 | done |
1354 | install: install-recursive |
1355 | @@ -715,22 +1247,87 @@ |
1356 | mostlyclean-generic: |
1357 | |
1358 | clean-generic: |
1359 | + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) |
1360 | |
1361 | distclean-generic: |
1362 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
1363 | -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
1364 | + -rm -f src/$(DEPDIR)/$(am__dirstamp) |
1365 | + -rm -f src/$(am__dirstamp) |
1366 | + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) |
1367 | |
1368 | maintainer-clean-generic: |
1369 | @echo "This command is intended for maintainers to use" |
1370 | @echo "it deletes files that may require special tools to rebuild." |
1371 | + -rm -f $(srcdir)/indicator_multiload_vala.stamp |
1372 | + -rm -f $(srcdir)/src/advpreferences.c |
1373 | + -rm -f $(srcdir)/src/appindicatorview.c |
1374 | + -rm -f $(srcdir)/src/colormapper.c |
1375 | + -rm -f $(srcdir)/src/cpufreqprovider.c |
1376 | + -rm -f $(srcdir)/src/cpuprovider.c |
1377 | + -rm -f $(srcdir)/src/diskprovider.c |
1378 | + -rm -f $(srcdir)/src/expressionparser.c |
1379 | + -rm -f $(srcdir)/src/function.c |
1380 | + -rm -f $(srcdir)/src/graphmodel.c |
1381 | + -rm -f $(srcdir)/src/graphmodels.c |
1382 | + -rm -f $(srcdir)/src/indicator.c |
1383 | + -rm -f $(srcdir)/src/indicatorview.c |
1384 | + -rm -f $(srcdir)/src/itemhelp.c |
1385 | + -rm -f $(srcdir)/src/itempreferences.c |
1386 | + -rm -f $(srcdir)/src/loadprovider.c |
1387 | + -rm -f $(srcdir)/src/main.c |
1388 | + -rm -f $(srcdir)/src/memprovider.c |
1389 | + -rm -f $(srcdir)/src/menumodel.c |
1390 | + -rm -f $(srcdir)/src/netprovider.c |
1391 | + -rm -f $(srcdir)/src/preferences.c |
1392 | + -rm -f $(srcdir)/src/provider.c |
1393 | + -rm -f $(srcdir)/src/providers.c |
1394 | + -rm -f $(srcdir)/src/reaper.c |
1395 | + -rm -f $(srcdir)/src/settingscache.c |
1396 | + -rm -f $(srcdir)/src/settingsconversion.c |
1397 | + -rm -f $(srcdir)/src/swapprovider.c |
1398 | + -rm -f $(srcdir)/src/tracemodel.c |
1399 | + -rm -f $(srcdir)/src/trayindicatorview.c |
1400 | + -rm -f $(srcdir)/src/utils.c |
1401 | + -rm -f src/advpreferences.c |
1402 | + -rm -f src/appindicatorview.c |
1403 | + -rm -f src/colormapper.c |
1404 | + -rm -f src/cpufreqprovider.c |
1405 | + -rm -f src/cpuprovider.c |
1406 | + -rm -f src/diskprovider.c |
1407 | + -rm -f src/expressionparser.c |
1408 | + -rm -f src/function.c |
1409 | + -rm -f src/graphmodel.c |
1410 | + -rm -f src/graphmodels.c |
1411 | + -rm -f src/indicator.c |
1412 | + -rm -f src/indicatorview.c |
1413 | + -rm -f src/itemhelp.c |
1414 | + -rm -f src/itempreferences.c |
1415 | + -rm -f src/loadprovider.c |
1416 | + -rm -f src/main.c |
1417 | + -rm -f src/memprovider.c |
1418 | + -rm -f src/menumodel.c |
1419 | + -rm -f src/netprovider.c |
1420 | + -rm -f src/preferences.c |
1421 | + -rm -f src/provider.c |
1422 | + -rm -f src/providers.c |
1423 | + -rm -f src/reaper.c |
1424 | + -rm -f src/settingscache.c |
1425 | + -rm -f src/settingsconversion.c |
1426 | + -rm -f src/swapprovider.c |
1427 | + -rm -f src/tracemodel.c |
1428 | + -rm -f src/trayindicatorview.c |
1429 | + -rm -f src/utils.c |
1430 | clean: clean-recursive |
1431 | |
1432 | -clean-am: clean-generic mostlyclean-am |
1433 | +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am |
1434 | |
1435 | distclean: distclean-recursive |
1436 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
1437 | + -rm -rf src/$(DEPDIR) |
1438 | -rm -f Makefile |
1439 | -distclean-am: clean-am distclean-generic distclean-hdr distclean-tags |
1440 | +distclean-am: clean-am distclean-compile distclean-generic \ |
1441 | + distclean-hdr distclean-tags |
1442 | |
1443 | dvi: dvi-recursive |
1444 | |
1445 | @@ -744,13 +1341,14 @@ |
1446 | |
1447 | info-am: |
1448 | |
1449 | -install-data-am: install-multiloaddocDATA |
1450 | +install-data-am: install-desktopDATA install-multiloaddocDATA \ |
1451 | + install-nodist_uiDATA |
1452 | |
1453 | install-dvi: install-dvi-recursive |
1454 | |
1455 | install-dvi-am: |
1456 | |
1457 | -install-exec-am: |
1458 | +install-exec-am: install-binPROGRAMS |
1459 | |
1460 | install-html: install-html-recursive |
1461 | |
1462 | @@ -775,12 +1373,13 @@ |
1463 | maintainer-clean: maintainer-clean-recursive |
1464 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
1465 | -rm -rf $(top_srcdir)/autom4te.cache |
1466 | + -rm -rf src/$(DEPDIR) |
1467 | -rm -f Makefile |
1468 | maintainer-clean-am: distclean-am maintainer-clean-generic |
1469 | |
1470 | mostlyclean: mostlyclean-recursive |
1471 | |
1472 | -mostlyclean-am: mostlyclean-generic |
1473 | +mostlyclean-am: mostlyclean-compile mostlyclean-generic |
1474 | |
1475 | pdf: pdf-recursive |
1476 | |
1477 | @@ -790,60 +1389,86 @@ |
1478 | |
1479 | ps-am: |
1480 | |
1481 | -uninstall-am: uninstall-multiloaddocDATA |
1482 | +uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ |
1483 | + uninstall-multiloaddocDATA uninstall-nodist_uiDATA |
1484 | @$(NORMAL_INSTALL) |
1485 | $(MAKE) $(AM_MAKEFLAGS) uninstall-hook |
1486 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
1487 | - ctags-recursive install-am install-strip tags-recursive \ |
1488 | +.MAKE: $(am__recursive_targets) all install-am install-strip \ |
1489 | uninstall-am |
1490 | |
1491 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1492 | - all all-am am--refresh check check-am clean clean-generic \ |
1493 | - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ |
1494 | - dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
1495 | - distcheck distclean distclean-generic distclean-hdr \ |
1496 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ |
1497 | + am--refresh check check-am clean clean-binPROGRAMS \ |
1498 | + clean-cscope clean-generic cscope cscopelist-am ctags ctags-am \ |
1499 | + dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ |
1500 | + dist-tarZ dist-xz dist-zip distcheck distclean \ |
1501 | + distclean-compile distclean-generic distclean-hdr \ |
1502 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
1503 | dvi-am html html-am info info-am install install-am \ |
1504 | - install-data install-data-am install-dvi install-dvi-am \ |
1505 | - install-exec install-exec-am install-html install-html-am \ |
1506 | - install-info install-info-am install-man \ |
1507 | - install-multiloaddocDATA install-pdf install-pdf-am install-ps \ |
1508 | + install-binPROGRAMS install-data install-data-am \ |
1509 | + install-desktopDATA install-dvi install-dvi-am install-exec \ |
1510 | + install-exec-am install-html install-html-am install-info \ |
1511 | + install-info-am install-man install-multiloaddocDATA \ |
1512 | + install-nodist_uiDATA install-pdf install-pdf-am install-ps \ |
1513 | install-ps-am install-strip installcheck installcheck-am \ |
1514 | installdirs installdirs-am maintainer-clean \ |
1515 | - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ |
1516 | - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ |
1517 | - uninstall-hook uninstall-multiloaddocDATA |
1518 | - |
1519 | + maintainer-clean-generic mostlyclean mostlyclean-compile \ |
1520 | + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ |
1521 | + uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \ |
1522 | + uninstall-hook uninstall-multiloaddocDATA \ |
1523 | + uninstall-nodist_uiDATA |
1524 | + |
1525 | + |
1526 | +@INTLTOOL_DESKTOP_RULE@ |
1527 | +@INTLTOOL_XML_NOMERGE_RULE@ |
1528 | +@GSETTINGS_RULES@ |
1529 | |
1530 | uninstall-hook: |
1531 | - -rmdir $(multiloaddocdir) |
1532 | - |
1533 | -test-run: |
1534 | - -rm -rf local-xdg-data-dir |
1535 | - -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
1536 | - -ln -s ../../../data/de.mh21.indicator.multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
1537 | - -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
1538 | - -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
1539 | - -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_SLICE=always-malloc src/indicator-multiload |
1540 | - -rm -rf local-xdg-data-dir |
1541 | - |
1542 | -test-debug: |
1543 | - -rm -rf local-xdg-data-dir |
1544 | - -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
1545 | - -ln -s ../../../data/de.mh21.indicator.multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
1546 | - -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
1547 | - -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
1548 | - -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_SLICE=always-malloc gdb src/indicator-multiload |
1549 | - -rm -rf local-xdg-data-dir |
1550 | - |
1551 | -test-valgrind: |
1552 | - -rm -rf local-xdg-data-dir |
1553 | - -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
1554 | - -ln -s ../../../data/de.mh21.indicator.multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
1555 | - -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
1556 | - -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
1557 | - -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=20 --show-reachable=yes --log-file=vgdump src/indicator-multiload |
1558 | - -rm -rf local-xdg-data-dir |
1559 | + -rmdir $(multiloaddocdir) $(pkgdatadir) |
1560 | + |
1561 | +# run targets |
1562 | + |
1563 | +test-run: all |
1564 | + -rm -rf local-xdg-data-dir |
1565 | + -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
1566 | + -ln -s ../../../data/de.mh21.indicator-multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
1567 | + -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
1568 | + -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
1569 | + -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_SLICE=always-malloc ./indicator-multiload |
1570 | + -rm -rf local-xdg-data-dir |
1571 | + |
1572 | +test-verbose: all |
1573 | + -rm -rf local-xdg-data-dir |
1574 | + -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
1575 | + -ln -s ../../../data/de.mh21.indicator-multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
1576 | + -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
1577 | + -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
1578 | + -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_MESSAGES_DEBUG=all G_SLICE=always-malloc ./indicator-multiload |
1579 | + -rm -rf local-xdg-data-dir |
1580 | + |
1581 | +test-debug: all |
1582 | + -rm -rf local-xdg-data-dir |
1583 | + -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
1584 | + -ln -s ../../../data/de.mh21.indicator-multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
1585 | + -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
1586 | + -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
1587 | + -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_MESSAGES_DEBUG=all G_SLICE=always-malloc gdb --args ./indicator-multiload |
1588 | + -rm -rf local-xdg-data-dir |
1589 | + |
1590 | +test-valgrind: all |
1591 | + -rm -rf local-xdg-data-dir |
1592 | + -mkdir -p local-xdg-data-dir/glib-2.0/schemas local-xdg-data-dir/indicator-multiload |
1593 | + -ln -s ../../../data/de.mh21.indicator-multiload.gschema.xml local-xdg-data-dir/glib-2.0/schemas |
1594 | + -ln -s ../../data/preferences.ui local-xdg-data-dir/indicator-multiload |
1595 | + -glib-compile-schemas local-xdg-data-dir/glib-2.0/schemas |
1596 | + -XDG_DATA_DIRS=./local-xdg-data-dir:$$XDG_DATA_DIRS G_MESSAGES_DEBUG=all G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=20 --show-reachable=yes --log-file=vgdump ./indicator-multiload |
1597 | + -rm -rf local-xdg-data-dir |
1598 | + |
1599 | +# these are a bit of a hack, as automake has tags support |
1600 | +tags: |
1601 | + -anjuta-tags -R -o tags src |
1602 | + |
1603 | +tags-vala: |
1604 | + -anjuta-tags -o tags-vala /usr/share/vala-$$($(VALAC) --version | sed 's/.*\(0\.[0-9]\+\)\.[0-9]\+/\1/')/vapi/*.vapi |
1605 | |
1606 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
1607 | # Otherwise a system limit (for SysV at least) may be exceeded. |
1608 | |
1609 | === modified file 'README' |
1610 | --- README 2013-02-16 17:50:35 +0000 |
1611 | +++ README 2014-06-14 19:08:06 +0000 |
1612 | @@ -3,7 +3,7 @@ |
1613 | Strings have been kept the same as in gnome-applets where possible to reduce translation work. |
1614 | |
1615 | For more advanced settings such as which variables are shown and whether graphs |
1616 | -autoscale, open dconf-editor and navigate to /apps/indicators/multiload/. |
1617 | +autoscale, open dconf-editor and navigate to /de/mh21/indicator-multiload/. |
1618 | |
1619 | Expressions are strings with embedded code within $(...). Variables are of the |
1620 | form provider.variable, a list is available from indicator-multiload -l. You |
1621 | |
1622 | === modified file 'TODO' |
1623 | --- TODO 2013-02-16 17:50:35 +0000 |
1624 | +++ TODO 2014-06-14 19:08:06 +0000 |
1625 | @@ -1,11 +1,12 @@ |
1626 | -0.3: |
1627 | -- no graphs shown should be possible |
1628 | -- first icon should be empty icon, not image-not-found |
1629 | -- system(...) function |
1630 | - |
1631 | 0.4: |
1632 | -- color schemes |
1633 | +- de support indicator: lxde, xfce, gnome, classic, mint, cinnamon, unity, kde |
1634 | +- de support tray icon: lxde, xfce, gnome, classic, mint, cinnamon, unity, kde |
1635 | +- label guide bug? -> file bug |
1636 | +- try to recover some translations for colors in pref dialog, menu items etc. |
1637 | + |
1638 | +0.5: |
1639 | +- gtop shared mem is always 0, remove or reuse? - alert color? |
1640 | - error messages for expressions not only on stderr |
1641 | - |
1642 | -File bug reports: |
1643 | -- glibtop lvm |
1644 | +- more providers: temp, disk temp, disk space |
1645 | +- icon styles: text, bar, chart, checker board |
1646 | +- render text ourselves |
1647 | |
1648 | === modified file 'aclocal.m4' |
1649 | --- aclocal.m4 2013-02-16 17:50:35 +0000 |
1650 | +++ aclocal.m4 2014-06-14 19:08:06 +0000 |
1651 | @@ -1,8 +1,7 @@ |
1652 | -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
1653 | - |
1654 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1655 | -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
1656 | -# Inc. |
1657 | +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- |
1658 | + |
1659 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1660 | + |
1661 | # This file is free software; the Free Software Foundation |
1662 | # gives unlimited permission to copy and/or distribute it, |
1663 | # with or without modifications, as long as this notice is preserved. |
1664 | @@ -12,397 +11,14 @@ |
1665 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1666 | # PARTICULAR PURPOSE. |
1667 | |
1668 | +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
1669 | m4_ifndef([AC_AUTOCONF_VERSION], |
1670 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1671 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
1672 | -[m4_warning([this file was generated for autoconf 2.68. |
1673 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
1674 | +[m4_warning([this file was generated for autoconf 2.69. |
1675 | You have another version of autoconf. It may work, but is not guaranteed to. |
1676 | If you have problems, you may need to regenerate the build system entirely. |
1677 | -To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1678 | - |
1679 | -# gettext.m4 serial 63 (gettext-0.18) |
1680 | -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. |
1681 | -dnl This file is free software; the Free Software Foundation |
1682 | -dnl gives unlimited permission to copy and/or distribute it, |
1683 | -dnl with or without modifications, as long as this notice is preserved. |
1684 | -dnl |
1685 | -dnl This file can can be used in projects which are not available under |
1686 | -dnl the GNU General Public License or the GNU Library General Public |
1687 | -dnl License but which still want to provide support for the GNU gettext |
1688 | -dnl functionality. |
1689 | -dnl Please note that the actual code of the GNU gettext library is covered |
1690 | -dnl by the GNU Library General Public License, and the rest of the GNU |
1691 | -dnl gettext package package is covered by the GNU General Public License. |
1692 | -dnl They are *not* in the public domain. |
1693 | - |
1694 | -dnl Authors: |
1695 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
1696 | -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010. |
1697 | - |
1698 | -dnl Macro to add for using GNU gettext. |
1699 | - |
1700 | -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). |
1701 | -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The |
1702 | -dnl default (if it is not specified or empty) is 'no-libtool'. |
1703 | -dnl INTLSYMBOL should be 'external' for packages with no intl directory, |
1704 | -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. |
1705 | -dnl If INTLSYMBOL is 'use-libtool', then a libtool library |
1706 | -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, |
1707 | -dnl depending on --{enable,disable}-{shared,static} and on the presence of |
1708 | -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library |
1709 | -dnl $(top_builddir)/intl/libintl.a will be created. |
1710 | -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext |
1711 | -dnl implementations (in libc or libintl) without the ngettext() function |
1712 | -dnl will be ignored. If NEEDSYMBOL is specified and is |
1713 | -dnl 'need-formatstring-macros', then GNU gettext implementations that don't |
1714 | -dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. |
1715 | -dnl INTLDIR is used to find the intl libraries. If empty, |
1716 | -dnl the value `$(top_builddir)/intl/' is used. |
1717 | -dnl |
1718 | -dnl The result of the configuration is one of three cases: |
1719 | -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled |
1720 | -dnl and used. |
1721 | -dnl Catalog format: GNU --> install in $(datadir) |
1722 | -dnl Catalog extension: .mo after installation, .gmo in source tree |
1723 | -dnl 2) GNU gettext has been found in the system's C library. |
1724 | -dnl Catalog format: GNU --> install in $(datadir) |
1725 | -dnl Catalog extension: .mo after installation, .gmo in source tree |
1726 | -dnl 3) No internationalization, always use English msgid. |
1727 | -dnl Catalog format: none |
1728 | -dnl Catalog extension: none |
1729 | -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. |
1730 | -dnl The use of .gmo is historical (it was needed to avoid overwriting the |
1731 | -dnl GNU format catalogs when building on a platform with an X/Open gettext), |
1732 | -dnl but we keep it in order not to force irrelevant filename changes on the |
1733 | -dnl maintainers. |
1734 | -dnl |
1735 | -AC_DEFUN([AM_GNU_GETTEXT], |
1736 | -[ |
1737 | - dnl Argument checking. |
1738 | - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , |
1739 | - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT |
1740 | -])])])])]) |
1741 | - ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], |
1742 | - [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) |
1743 | - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , |
1744 | - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT |
1745 | -])])])]) |
1746 | - define([gt_included_intl], |
1747 | - ifelse([$1], [external], |
1748 | - ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), |
1749 | - [yes])) |
1750 | - define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) |
1751 | - gt_NEEDS_INIT |
1752 | - AM_GNU_GETTEXT_NEED([$2]) |
1753 | - |
1754 | - AC_REQUIRE([AM_PO_SUBDIRS])dnl |
1755 | - ifelse(gt_included_intl, yes, [ |
1756 | - AC_REQUIRE([AM_INTL_SUBDIR])dnl |
1757 | - ]) |
1758 | - |
1759 | - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. |
1760 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
1761 | - AC_REQUIRE([AC_LIB_RPATH]) |
1762 | - |
1763 | - dnl Sometimes libintl requires libiconv, so first search for libiconv. |
1764 | - dnl Ideally we would do this search only after the |
1765 | - dnl if test "$USE_NLS" = "yes"; then |
1766 | - dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then |
1767 | - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT |
1768 | - dnl the configure script would need to contain the same shell code |
1769 | - dnl again, outside any 'if'. There are two solutions: |
1770 | - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. |
1771 | - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. |
1772 | - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not |
1773 | - dnl documented, we avoid it. |
1774 | - ifelse(gt_included_intl, yes, , [ |
1775 | - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) |
1776 | - ]) |
1777 | - |
1778 | - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. |
1779 | - gt_INTL_MACOSX |
1780 | - |
1781 | - dnl Set USE_NLS. |
1782 | - AC_REQUIRE([AM_NLS]) |
1783 | - |
1784 | - ifelse(gt_included_intl, yes, [ |
1785 | - BUILD_INCLUDED_LIBINTL=no |
1786 | - USE_INCLUDED_LIBINTL=no |
1787 | - ]) |
1788 | - LIBINTL= |
1789 | - LTLIBINTL= |
1790 | - POSUB= |
1791 | - |
1792 | - dnl Add a version number to the cache macros. |
1793 | - case " $gt_needs " in |
1794 | - *" need-formatstring-macros "*) gt_api_version=3 ;; |
1795 | - *" need-ngettext "*) gt_api_version=2 ;; |
1796 | - *) gt_api_version=1 ;; |
1797 | - esac |
1798 | - gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" |
1799 | - gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" |
1800 | - |
1801 | - dnl If we use NLS figure out what method |
1802 | - if test "$USE_NLS" = "yes"; then |
1803 | - gt_use_preinstalled_gnugettext=no |
1804 | - ifelse(gt_included_intl, yes, [ |
1805 | - AC_MSG_CHECKING([whether included gettext is requested]) |
1806 | - AC_ARG_WITH([included-gettext], |
1807 | - [ --with-included-gettext use the GNU gettext library included here], |
1808 | - nls_cv_force_use_gnu_gettext=$withval, |
1809 | - nls_cv_force_use_gnu_gettext=no) |
1810 | - AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) |
1811 | - |
1812 | - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" |
1813 | - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then |
1814 | - ]) |
1815 | - dnl User does not insist on using GNU NLS library. Figure out what |
1816 | - dnl to use. If GNU gettext is available we use this. Else we have |
1817 | - dnl to fall back to GNU NLS library. |
1818 | - |
1819 | - if test $gt_api_version -ge 3; then |
1820 | - gt_revision_test_code=' |
1821 | -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
1822 | -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) |
1823 | -#endif |
1824 | -changequote(,)dnl |
1825 | -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; |
1826 | -changequote([,])dnl |
1827 | -' |
1828 | - else |
1829 | - gt_revision_test_code= |
1830 | - fi |
1831 | - if test $gt_api_version -ge 2; then |
1832 | - gt_expression_test_code=' + * ngettext ("", "", 0)' |
1833 | - else |
1834 | - gt_expression_test_code= |
1835 | - fi |
1836 | - |
1837 | - AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], |
1838 | - [AC_TRY_LINK([#include <libintl.h> |
1839 | -$gt_revision_test_code |
1840 | -extern int _nl_msg_cat_cntr; |
1841 | -extern int *_nl_domain_bindings;], |
1842 | - [bindtextdomain ("", ""); |
1843 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], |
1844 | - [eval "$gt_func_gnugettext_libc=yes"], |
1845 | - [eval "$gt_func_gnugettext_libc=no"])]) |
1846 | - |
1847 | - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then |
1848 | - dnl Sometimes libintl requires libiconv, so first search for libiconv. |
1849 | - ifelse(gt_included_intl, yes, , [ |
1850 | - AM_ICONV_LINK |
1851 | - ]) |
1852 | - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL |
1853 | - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) |
1854 | - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL |
1855 | - dnl even if libiconv doesn't exist. |
1856 | - AC_LIB_LINKFLAGS_BODY([intl]) |
1857 | - AC_CACHE_CHECK([for GNU gettext in libintl], |
1858 | - [$gt_func_gnugettext_libintl], |
1859 | - [gt_save_CPPFLAGS="$CPPFLAGS" |
1860 | - CPPFLAGS="$CPPFLAGS $INCINTL" |
1861 | - gt_save_LIBS="$LIBS" |
1862 | - LIBS="$LIBS $LIBINTL" |
1863 | - dnl Now see whether libintl exists and does not depend on libiconv. |
1864 | - AC_TRY_LINK([#include <libintl.h> |
1865 | -$gt_revision_test_code |
1866 | -extern int _nl_msg_cat_cntr; |
1867 | -extern |
1868 | -#ifdef __cplusplus |
1869 | -"C" |
1870 | -#endif |
1871 | -const char *_nl_expand_alias (const char *);], |
1872 | - [bindtextdomain ("", ""); |
1873 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], |
1874 | - [eval "$gt_func_gnugettext_libintl=yes"], |
1875 | - [eval "$gt_func_gnugettext_libintl=no"]) |
1876 | - dnl Now see whether libintl exists and depends on libiconv. |
1877 | - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then |
1878 | - LIBS="$LIBS $LIBICONV" |
1879 | - AC_TRY_LINK([#include <libintl.h> |
1880 | -$gt_revision_test_code |
1881 | -extern int _nl_msg_cat_cntr; |
1882 | -extern |
1883 | -#ifdef __cplusplus |
1884 | -"C" |
1885 | -#endif |
1886 | -const char *_nl_expand_alias (const char *);], |
1887 | - [bindtextdomain ("", ""); |
1888 | -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], |
1889 | - [LIBINTL="$LIBINTL $LIBICONV" |
1890 | - LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
1891 | - eval "$gt_func_gnugettext_libintl=yes" |
1892 | - ]) |
1893 | - fi |
1894 | - CPPFLAGS="$gt_save_CPPFLAGS" |
1895 | - LIBS="$gt_save_LIBS"]) |
1896 | - fi |
1897 | - |
1898 | - dnl If an already present or preinstalled GNU gettext() is found, |
1899 | - dnl use it. But if this macro is used in GNU gettext, and GNU |
1900 | - dnl gettext is already preinstalled in libintl, we update this |
1901 | - dnl libintl. (Cf. the install rule in intl/Makefile.in.) |
1902 | - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ |
1903 | - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ |
1904 | - && test "$PACKAGE" != gettext-runtime \ |
1905 | - && test "$PACKAGE" != gettext-tools; }; then |
1906 | - gt_use_preinstalled_gnugettext=yes |
1907 | - else |
1908 | - dnl Reset the values set by searching for libintl. |
1909 | - LIBINTL= |
1910 | - LTLIBINTL= |
1911 | - INCINTL= |
1912 | - fi |
1913 | - |
1914 | - ifelse(gt_included_intl, yes, [ |
1915 | - if test "$gt_use_preinstalled_gnugettext" != "yes"; then |
1916 | - dnl GNU gettext is not found in the C library. |
1917 | - dnl Fall back on included GNU gettext library. |
1918 | - nls_cv_use_gnu_gettext=yes |
1919 | - fi |
1920 | - fi |
1921 | - |
1922 | - if test "$nls_cv_use_gnu_gettext" = "yes"; then |
1923 | - dnl Mark actions used to generate GNU NLS library. |
1924 | - BUILD_INCLUDED_LIBINTL=yes |
1925 | - USE_INCLUDED_LIBINTL=yes |
1926 | - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" |
1927 | - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" |
1928 | - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` |
1929 | - fi |
1930 | - |
1931 | - CATOBJEXT= |
1932 | - if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
1933 | - || test "$nls_cv_use_gnu_gettext" = "yes"; then |
1934 | - dnl Mark actions to use GNU gettext tools. |
1935 | - CATOBJEXT=.gmo |
1936 | - fi |
1937 | - ]) |
1938 | - |
1939 | - if test -n "$INTL_MACOSX_LIBS"; then |
1940 | - if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
1941 | - || test "$nls_cv_use_gnu_gettext" = "yes"; then |
1942 | - dnl Some extra flags are needed during linking. |
1943 | - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" |
1944 | - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" |
1945 | - fi |
1946 | - fi |
1947 | - |
1948 | - if test "$gt_use_preinstalled_gnugettext" = "yes" \ |
1949 | - || test "$nls_cv_use_gnu_gettext" = "yes"; then |
1950 | - AC_DEFINE([ENABLE_NLS], [1], |
1951 | - [Define to 1 if translation of program messages to the user's native language |
1952 | - is requested.]) |
1953 | - else |
1954 | - USE_NLS=no |
1955 | - fi |
1956 | - fi |
1957 | - |
1958 | - AC_MSG_CHECKING([whether to use NLS]) |
1959 | - AC_MSG_RESULT([$USE_NLS]) |
1960 | - if test "$USE_NLS" = "yes"; then |
1961 | - AC_MSG_CHECKING([where the gettext function comes from]) |
1962 | - if test "$gt_use_preinstalled_gnugettext" = "yes"; then |
1963 | - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then |
1964 | - gt_source="external libintl" |
1965 | - else |
1966 | - gt_source="libc" |
1967 | - fi |
1968 | - else |
1969 | - gt_source="included intl directory" |
1970 | - fi |
1971 | - AC_MSG_RESULT([$gt_source]) |
1972 | - fi |
1973 | - |
1974 | - if test "$USE_NLS" = "yes"; then |
1975 | - |
1976 | - if test "$gt_use_preinstalled_gnugettext" = "yes"; then |
1977 | - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then |
1978 | - AC_MSG_CHECKING([how to link with libintl]) |
1979 | - AC_MSG_RESULT([$LIBINTL]) |
1980 | - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) |
1981 | - fi |
1982 | - |
1983 | - dnl For backward compatibility. Some packages may be using this. |
1984 | - AC_DEFINE([HAVE_GETTEXT], [1], |
1985 | - [Define if the GNU gettext() function is already present or preinstalled.]) |
1986 | - AC_DEFINE([HAVE_DCGETTEXT], [1], |
1987 | - [Define if the GNU dcgettext() function is already present or preinstalled.]) |
1988 | - fi |
1989 | - |
1990 | - dnl We need to process the po/ directory. |
1991 | - POSUB=po |
1992 | - fi |
1993 | - |
1994 | - ifelse(gt_included_intl, yes, [ |
1995 | - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL |
1996 | - dnl to 'yes' because some of the testsuite requires it. |
1997 | - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then |
1998 | - BUILD_INCLUDED_LIBINTL=yes |
1999 | - fi |
2000 | - |
2001 | - dnl Make all variables we use known to autoconf. |
2002 | - AC_SUBST([BUILD_INCLUDED_LIBINTL]) |
2003 | - AC_SUBST([USE_INCLUDED_LIBINTL]) |
2004 | - AC_SUBST([CATOBJEXT]) |
2005 | - |
2006 | - dnl For backward compatibility. Some configure.ins may be using this. |
2007 | - nls_cv_header_intl= |
2008 | - nls_cv_header_libgt= |
2009 | - |
2010 | - dnl For backward compatibility. Some Makefiles may be using this. |
2011 | - DATADIRNAME=share |
2012 | - AC_SUBST([DATADIRNAME]) |
2013 | - |
2014 | - dnl For backward compatibility. Some Makefiles may be using this. |
2015 | - INSTOBJEXT=.mo |
2016 | - AC_SUBST([INSTOBJEXT]) |
2017 | - |
2018 | - dnl For backward compatibility. Some Makefiles may be using this. |
2019 | - GENCAT=gencat |
2020 | - AC_SUBST([GENCAT]) |
2021 | - |
2022 | - dnl For backward compatibility. Some Makefiles may be using this. |
2023 | - INTLOBJS= |
2024 | - if test "$USE_INCLUDED_LIBINTL" = yes; then |
2025 | - INTLOBJS="\$(GETTOBJS)" |
2026 | - fi |
2027 | - AC_SUBST([INTLOBJS]) |
2028 | - |
2029 | - dnl Enable libtool support if the surrounding package wishes it. |
2030 | - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix |
2031 | - AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) |
2032 | - ]) |
2033 | - |
2034 | - dnl For backward compatibility. Some Makefiles may be using this. |
2035 | - INTLLIBS="$LIBINTL" |
2036 | - AC_SUBST([INTLLIBS]) |
2037 | - |
2038 | - dnl Make all documented variables known to autoconf. |
2039 | - AC_SUBST([LIBINTL]) |
2040 | - AC_SUBST([LTLIBINTL]) |
2041 | - AC_SUBST([POSUB]) |
2042 | -]) |
2043 | - |
2044 | - |
2045 | -dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. |
2046 | -m4_define([gt_NEEDS_INIT], |
2047 | -[ |
2048 | - m4_divert_text([DEFAULTS], [gt_needs=]) |
2049 | - m4_define([gt_NEEDS_INIT], []) |
2050 | -]) |
2051 | - |
2052 | - |
2053 | -dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) |
2054 | -AC_DEFUN([AM_GNU_GETTEXT_NEED], |
2055 | -[ |
2056 | - m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) |
2057 | -]) |
2058 | - |
2059 | - |
2060 | -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) |
2061 | -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) |
2062 | +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
2063 | |
2064 | dnl GLIB_GSETTINGS |
2065 | dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether |
2066 | @@ -443,7 +59,7 @@ |
2067 | gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) |
2068 | |
2069 | %.gschema.valid: %.gschema.xml $(gsettings__enum_file) |
2070 | - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ |
2071 | + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ |
2072 | |
2073 | all-am: $(gsettings_SCHEMAS:.xml=.valid) |
2074 | uninstall-am: uninstall-gsettings-schemas |
2075 | @@ -488,273 +104,6 @@ |
2076 | ] |
2077 | ) |
2078 | |
2079 | -# iconv.m4 serial 11 (gettext-0.18.1) |
2080 | -dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. |
2081 | -dnl This file is free software; the Free Software Foundation |
2082 | -dnl gives unlimited permission to copy and/or distribute it, |
2083 | -dnl with or without modifications, as long as this notice is preserved. |
2084 | - |
2085 | -dnl From Bruno Haible. |
2086 | - |
2087 | -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], |
2088 | -[ |
2089 | - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. |
2090 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
2091 | - AC_REQUIRE([AC_LIB_RPATH]) |
2092 | - |
2093 | - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV |
2094 | - dnl accordingly. |
2095 | - AC_LIB_LINKFLAGS_BODY([iconv]) |
2096 | -]) |
2097 | - |
2098 | -AC_DEFUN([AM_ICONV_LINK], |
2099 | -[ |
2100 | - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and |
2101 | - dnl those with the standalone portable GNU libiconv installed). |
2102 | - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles |
2103 | - |
2104 | - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV |
2105 | - dnl accordingly. |
2106 | - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) |
2107 | - |
2108 | - dnl Add $INCICONV to CPPFLAGS before performing the following checks, |
2109 | - dnl because if the user has installed libiconv and not disabled its use |
2110 | - dnl via --without-libiconv-prefix, he wants to use it. The first |
2111 | - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. |
2112 | - am_save_CPPFLAGS="$CPPFLAGS" |
2113 | - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) |
2114 | - |
2115 | - AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ |
2116 | - am_cv_func_iconv="no, consider installing GNU libiconv" |
2117 | - am_cv_lib_iconv=no |
2118 | - AC_TRY_LINK([#include <stdlib.h> |
2119 | -#include <iconv.h>], |
2120 | - [iconv_t cd = iconv_open("",""); |
2121 | - iconv(cd,NULL,NULL,NULL,NULL); |
2122 | - iconv_close(cd);], |
2123 | - [am_cv_func_iconv=yes]) |
2124 | - if test "$am_cv_func_iconv" != yes; then |
2125 | - am_save_LIBS="$LIBS" |
2126 | - LIBS="$LIBS $LIBICONV" |
2127 | - AC_TRY_LINK([#include <stdlib.h> |
2128 | -#include <iconv.h>], |
2129 | - [iconv_t cd = iconv_open("",""); |
2130 | - iconv(cd,NULL,NULL,NULL,NULL); |
2131 | - iconv_close(cd);], |
2132 | - [am_cv_lib_iconv=yes] |
2133 | - [am_cv_func_iconv=yes]) |
2134 | - LIBS="$am_save_LIBS" |
2135 | - fi |
2136 | - ]) |
2137 | - if test "$am_cv_func_iconv" = yes; then |
2138 | - AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ |
2139 | - dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. |
2140 | - am_save_LIBS="$LIBS" |
2141 | - if test $am_cv_lib_iconv = yes; then |
2142 | - LIBS="$LIBS $LIBICONV" |
2143 | - fi |
2144 | - AC_TRY_RUN([ |
2145 | -#include <iconv.h> |
2146 | -#include <string.h> |
2147 | -int main () |
2148 | -{ |
2149 | - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful |
2150 | - returns. */ |
2151 | - { |
2152 | - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); |
2153 | - if (cd_utf8_to_88591 != (iconv_t)(-1)) |
2154 | - { |
2155 | - static const char input[] = "\342\202\254"; /* EURO SIGN */ |
2156 | - char buf[10]; |
2157 | - const char *inptr = input; |
2158 | - size_t inbytesleft = strlen (input); |
2159 | - char *outptr = buf; |
2160 | - size_t outbytesleft = sizeof (buf); |
2161 | - size_t res = iconv (cd_utf8_to_88591, |
2162 | - (char **) &inptr, &inbytesleft, |
2163 | - &outptr, &outbytesleft); |
2164 | - if (res == 0) |
2165 | - return 1; |
2166 | - } |
2167 | - } |
2168 | - /* Test against Solaris 10 bug: Failures are not distinguishable from |
2169 | - successful returns. */ |
2170 | - { |
2171 | - iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); |
2172 | - if (cd_ascii_to_88591 != (iconv_t)(-1)) |
2173 | - { |
2174 | - static const char input[] = "\263"; |
2175 | - char buf[10]; |
2176 | - const char *inptr = input; |
2177 | - size_t inbytesleft = strlen (input); |
2178 | - char *outptr = buf; |
2179 | - size_t outbytesleft = sizeof (buf); |
2180 | - size_t res = iconv (cd_ascii_to_88591, |
2181 | - (char **) &inptr, &inbytesleft, |
2182 | - &outptr, &outbytesleft); |
2183 | - if (res == 0) |
2184 | - return 1; |
2185 | - } |
2186 | - } |
2187 | -#if 0 /* This bug could be worked around by the caller. */ |
2188 | - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ |
2189 | - { |
2190 | - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); |
2191 | - if (cd_88591_to_utf8 != (iconv_t)(-1)) |
2192 | - { |
2193 | - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; |
2194 | - char buf[50]; |
2195 | - const char *inptr = input; |
2196 | - size_t inbytesleft = strlen (input); |
2197 | - char *outptr = buf; |
2198 | - size_t outbytesleft = sizeof (buf); |
2199 | - size_t res = iconv (cd_88591_to_utf8, |
2200 | - (char **) &inptr, &inbytesleft, |
2201 | - &outptr, &outbytesleft); |
2202 | - if ((int)res > 0) |
2203 | - return 1; |
2204 | - } |
2205 | - } |
2206 | -#endif |
2207 | - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is |
2208 | - provided. */ |
2209 | - if (/* Try standardized names. */ |
2210 | - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) |
2211 | - /* Try IRIX, OSF/1 names. */ |
2212 | - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) |
2213 | - /* Try AIX names. */ |
2214 | - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) |
2215 | - /* Try HP-UX names. */ |
2216 | - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) |
2217 | - return 1; |
2218 | - return 0; |
2219 | -}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], |
2220 | - [case "$host_os" in |
2221 | - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; |
2222 | - *) am_cv_func_iconv_works="guessing yes" ;; |
2223 | - esac]) |
2224 | - LIBS="$am_save_LIBS" |
2225 | - ]) |
2226 | - case "$am_cv_func_iconv_works" in |
2227 | - *no) am_func_iconv=no am_cv_lib_iconv=no ;; |
2228 | - *) am_func_iconv=yes ;; |
2229 | - esac |
2230 | - else |
2231 | - am_func_iconv=no am_cv_lib_iconv=no |
2232 | - fi |
2233 | - if test "$am_func_iconv" = yes; then |
2234 | - AC_DEFINE([HAVE_ICONV], [1], |
2235 | - [Define if you have the iconv() function and it works.]) |
2236 | - fi |
2237 | - if test "$am_cv_lib_iconv" = yes; then |
2238 | - AC_MSG_CHECKING([how to link with libiconv]) |
2239 | - AC_MSG_RESULT([$LIBICONV]) |
2240 | - else |
2241 | - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV |
2242 | - dnl either. |
2243 | - CPPFLAGS="$am_save_CPPFLAGS" |
2244 | - LIBICONV= |
2245 | - LTLIBICONV= |
2246 | - fi |
2247 | - AC_SUBST([LIBICONV]) |
2248 | - AC_SUBST([LTLIBICONV]) |
2249 | -]) |
2250 | - |
2251 | -dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to |
2252 | -dnl avoid warnings like |
2253 | -dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". |
2254 | -dnl This is tricky because of the way 'aclocal' is implemented: |
2255 | -dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. |
2256 | -dnl Otherwise aclocal's initial scan pass would miss the macro definition. |
2257 | -dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. |
2258 | -dnl Otherwise aclocal would emit many "Use of uninitialized value $1" |
2259 | -dnl warnings. |
2260 | -m4_define([gl_iconv_AC_DEFUN], |
2261 | - m4_version_prereq([2.64], |
2262 | - [[AC_DEFUN_ONCE( |
2263 | - [$1], [$2])]], |
2264 | - [[AC_DEFUN( |
2265 | - [$1], [$2])]])) |
2266 | -gl_iconv_AC_DEFUN([AM_ICONV], |
2267 | -[ |
2268 | - AM_ICONV_LINK |
2269 | - if test "$am_cv_func_iconv" = yes; then |
2270 | - AC_MSG_CHECKING([for iconv declaration]) |
2271 | - AC_CACHE_VAL([am_cv_proto_iconv], [ |
2272 | - AC_TRY_COMPILE([ |
2273 | -#include <stdlib.h> |
2274 | -#include <iconv.h> |
2275 | -extern |
2276 | -#ifdef __cplusplus |
2277 | -"C" |
2278 | -#endif |
2279 | -#if defined(__STDC__) || defined(__cplusplus) |
2280 | -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); |
2281 | -#else |
2282 | -size_t iconv(); |
2283 | -#endif |
2284 | -], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) |
2285 | - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) |
2286 | - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` |
2287 | - AC_MSG_RESULT([ |
2288 | - $am_cv_proto_iconv]) |
2289 | - AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], |
2290 | - [Define as const if the declaration of iconv() needs const.]) |
2291 | - fi |
2292 | -]) |
2293 | - |
2294 | -# intlmacosx.m4 serial 3 (gettext-0.18) |
2295 | -dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. |
2296 | -dnl This file is free software; the Free Software Foundation |
2297 | -dnl gives unlimited permission to copy and/or distribute it, |
2298 | -dnl with or without modifications, as long as this notice is preserved. |
2299 | -dnl |
2300 | -dnl This file can can be used in projects which are not available under |
2301 | -dnl the GNU General Public License or the GNU Library General Public |
2302 | -dnl License but which still want to provide support for the GNU gettext |
2303 | -dnl functionality. |
2304 | -dnl Please note that the actual code of the GNU gettext library is covered |
2305 | -dnl by the GNU Library General Public License, and the rest of the GNU |
2306 | -dnl gettext package package is covered by the GNU General Public License. |
2307 | -dnl They are *not* in the public domain. |
2308 | - |
2309 | -dnl Checks for special options needed on MacOS X. |
2310 | -dnl Defines INTL_MACOSX_LIBS. |
2311 | -AC_DEFUN([gt_INTL_MACOSX], |
2312 | -[ |
2313 | - dnl Check for API introduced in MacOS X 10.2. |
2314 | - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], |
2315 | - [gt_cv_func_CFPreferencesCopyAppValue], |
2316 | - [gt_save_LIBS="$LIBS" |
2317 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
2318 | - AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], |
2319 | - [CFPreferencesCopyAppValue(NULL, NULL)], |
2320 | - [gt_cv_func_CFPreferencesCopyAppValue=yes], |
2321 | - [gt_cv_func_CFPreferencesCopyAppValue=no]) |
2322 | - LIBS="$gt_save_LIBS"]) |
2323 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
2324 | - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], |
2325 | - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) |
2326 | - fi |
2327 | - dnl Check for API introduced in MacOS X 10.3. |
2328 | - AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], |
2329 | - [gt_save_LIBS="$LIBS" |
2330 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
2331 | - AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], |
2332 | - [gt_cv_func_CFLocaleCopyCurrent=yes], |
2333 | - [gt_cv_func_CFLocaleCopyCurrent=no]) |
2334 | - LIBS="$gt_save_LIBS"]) |
2335 | - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
2336 | - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], |
2337 | - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) |
2338 | - fi |
2339 | - INTL_MACOSX_LIBS= |
2340 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
2341 | - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
2342 | - fi |
2343 | - AC_SUBST([INTL_MACOSX_LIBS]) |
2344 | -]) |
2345 | - |
2346 | |
2347 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) |
2348 | # serial 42 IT_PROG_INTLTOOL |
2349 | @@ -970,1119 +319,8 @@ |
2350 | # AC_DEFUN([AC_PROG_INTLTOOL], ...) |
2351 | |
2352 | |
2353 | -# lib-ld.m4 serial 4 (gettext-0.18) |
2354 | -dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. |
2355 | -dnl This file is free software; the Free Software Foundation |
2356 | -dnl gives unlimited permission to copy and/or distribute it, |
2357 | -dnl with or without modifications, as long as this notice is preserved. |
2358 | - |
2359 | -dnl Subroutines of libtool.m4, |
2360 | -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision |
2361 | -dnl with libtool.m4. |
2362 | - |
2363 | -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. |
2364 | -AC_DEFUN([AC_LIB_PROG_LD_GNU], |
2365 | -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], |
2366 | -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. |
2367 | -case `$LD -v 2>&1 </dev/null` in |
2368 | -*GNU* | *'with BFD'*) |
2369 | - acl_cv_prog_gnu_ld=yes ;; |
2370 | -*) |
2371 | - acl_cv_prog_gnu_ld=no ;; |
2372 | -esac]) |
2373 | -with_gnu_ld=$acl_cv_prog_gnu_ld |
2374 | -]) |
2375 | - |
2376 | -dnl From libtool-1.4. Sets the variable LD. |
2377 | -AC_DEFUN([AC_LIB_PROG_LD], |
2378 | -[AC_ARG_WITH([gnu-ld], |
2379 | -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], |
2380 | -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) |
2381 | -AC_REQUIRE([AC_PROG_CC])dnl |
2382 | -AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2383 | -# Prepare PATH_SEPARATOR. |
2384 | -# The user is always right. |
2385 | -if test "${PATH_SEPARATOR+set}" != set; then |
2386 | - echo "#! /bin/sh" >conf$$.sh |
2387 | - echo "exit 0" >>conf$$.sh |
2388 | - chmod +x conf$$.sh |
2389 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
2390 | - PATH_SEPARATOR=';' |
2391 | - else |
2392 | - PATH_SEPARATOR=: |
2393 | - fi |
2394 | - rm -f conf$$.sh |
2395 | -fi |
2396 | -ac_prog=ld |
2397 | -if test "$GCC" = yes; then |
2398 | - # Check if gcc -print-prog-name=ld gives a path. |
2399 | - AC_MSG_CHECKING([for ld used by GCC]) |
2400 | - case $host in |
2401 | - *-*-mingw*) |
2402 | - # gcc leaves a trailing carriage return which upsets mingw |
2403 | - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; |
2404 | - *) |
2405 | - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; |
2406 | - esac |
2407 | - case $ac_prog in |
2408 | - # Accept absolute paths. |
2409 | - [[\\/]* | [A-Za-z]:[\\/]*)] |
2410 | - [re_direlt='/[^/][^/]*/\.\./'] |
2411 | - # Canonicalize the path of ld |
2412 | - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` |
2413 | - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
2414 | - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` |
2415 | - done |
2416 | - test -z "$LD" && LD="$ac_prog" |
2417 | - ;; |
2418 | - "") |
2419 | - # If it fails, then pretend we aren't using GCC. |
2420 | - ac_prog=ld |
2421 | - ;; |
2422 | - *) |
2423 | - # If it is relative, then search for the first ld in PATH. |
2424 | - with_gnu_ld=unknown |
2425 | - ;; |
2426 | - esac |
2427 | -elif test "$with_gnu_ld" = yes; then |
2428 | - AC_MSG_CHECKING([for GNU ld]) |
2429 | -else |
2430 | - AC_MSG_CHECKING([for non-GNU ld]) |
2431 | -fi |
2432 | -AC_CACHE_VAL([acl_cv_path_LD], |
2433 | -[if test -z "$LD"; then |
2434 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" |
2435 | - for ac_dir in $PATH; do |
2436 | - test -z "$ac_dir" && ac_dir=. |
2437 | - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
2438 | - acl_cv_path_LD="$ac_dir/$ac_prog" |
2439 | - # Check to see if the program is GNU ld. I'd rather use --version, |
2440 | - # but apparently some GNU ld's only accept -v. |
2441 | - # Break only if it was the GNU/non-GNU ld that we prefer. |
2442 | - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in |
2443 | - *GNU* | *'with BFD'*) |
2444 | - test "$with_gnu_ld" != no && break ;; |
2445 | - *) |
2446 | - test "$with_gnu_ld" != yes && break ;; |
2447 | - esac |
2448 | - fi |
2449 | - done |
2450 | - IFS="$ac_save_ifs" |
2451 | -else |
2452 | - acl_cv_path_LD="$LD" # Let the user override the test with a path. |
2453 | -fi]) |
2454 | -LD="$acl_cv_path_LD" |
2455 | -if test -n "$LD"; then |
2456 | - AC_MSG_RESULT([$LD]) |
2457 | -else |
2458 | - AC_MSG_RESULT([no]) |
2459 | -fi |
2460 | -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) |
2461 | -AC_LIB_PROG_LD_GNU |
2462 | -]) |
2463 | - |
2464 | -# lib-link.m4 serial 21 (gettext-0.18) |
2465 | -dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. |
2466 | -dnl This file is free software; the Free Software Foundation |
2467 | -dnl gives unlimited permission to copy and/or distribute it, |
2468 | -dnl with or without modifications, as long as this notice is preserved. |
2469 | - |
2470 | -dnl From Bruno Haible. |
2471 | - |
2472 | -AC_PREREQ([2.54]) |
2473 | - |
2474 | -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and |
2475 | -dnl the libraries corresponding to explicit and implicit dependencies. |
2476 | -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and |
2477 | -dnl augments the CPPFLAGS variable. |
2478 | -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname |
2479 | -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
2480 | -AC_DEFUN([AC_LIB_LINKFLAGS], |
2481 | -[ |
2482 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
2483 | - AC_REQUIRE([AC_LIB_RPATH]) |
2484 | - pushdef([Name],[translit([$1],[./-], [___])]) |
2485 | - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
2486 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
2487 | - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ |
2488 | - AC_LIB_LINKFLAGS_BODY([$1], [$2]) |
2489 | - ac_cv_lib[]Name[]_libs="$LIB[]NAME" |
2490 | - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" |
2491 | - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" |
2492 | - ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" |
2493 | - ]) |
2494 | - LIB[]NAME="$ac_cv_lib[]Name[]_libs" |
2495 | - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" |
2496 | - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" |
2497 | - LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" |
2498 | - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) |
2499 | - AC_SUBST([LIB]NAME) |
2500 | - AC_SUBST([LTLIB]NAME) |
2501 | - AC_SUBST([LIB]NAME[_PREFIX]) |
2502 | - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the |
2503 | - dnl results of this search when this library appears as a dependency. |
2504 | - HAVE_LIB[]NAME=yes |
2505 | - popdef([NAME]) |
2506 | - popdef([Name]) |
2507 | -]) |
2508 | - |
2509 | -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) |
2510 | -dnl searches for libname and the libraries corresponding to explicit and |
2511 | -dnl implicit dependencies, together with the specified include files and |
2512 | -dnl the ability to compile and link the specified testcode. The missing-message |
2513 | -dnl defaults to 'no' and may contain additional hints for the user. |
2514 | -dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} |
2515 | -dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and |
2516 | -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs |
2517 | -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. |
2518 | -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname |
2519 | -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
2520 | -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], |
2521 | -[ |
2522 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
2523 | - AC_REQUIRE([AC_LIB_RPATH]) |
2524 | - pushdef([Name],[translit([$1],[./-], [___])]) |
2525 | - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
2526 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
2527 | - |
2528 | - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME |
2529 | - dnl accordingly. |
2530 | - AC_LIB_LINKFLAGS_BODY([$1], [$2]) |
2531 | - |
2532 | - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, |
2533 | - dnl because if the user has installed lib[]Name and not disabled its use |
2534 | - dnl via --without-lib[]Name-prefix, he wants to use it. |
2535 | - ac_save_CPPFLAGS="$CPPFLAGS" |
2536 | - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) |
2537 | - |
2538 | - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ |
2539 | - ac_save_LIBS="$LIBS" |
2540 | - dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, |
2541 | - dnl because these -l options might require -L options that are present in |
2542 | - dnl LIBS. -l options benefit only from the -L options listed before it. |
2543 | - dnl Otherwise, add it to the front of LIBS, because it may be a static |
2544 | - dnl library that depends on another static library that is present in LIBS. |
2545 | - dnl Static libraries benefit only from the static libraries listed after |
2546 | - dnl it. |
2547 | - case " $LIB[]NAME" in |
2548 | - *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; |
2549 | - *) LIBS="$LIB[]NAME $LIBS" ;; |
2550 | - esac |
2551 | - AC_TRY_LINK([$3], [$4], |
2552 | - [ac_cv_lib[]Name=yes], |
2553 | - [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) |
2554 | - LIBS="$ac_save_LIBS" |
2555 | - ]) |
2556 | - if test "$ac_cv_lib[]Name" = yes; then |
2557 | - HAVE_LIB[]NAME=yes |
2558 | - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) |
2559 | - AC_MSG_CHECKING([how to link with lib[]$1]) |
2560 | - AC_MSG_RESULT([$LIB[]NAME]) |
2561 | - else |
2562 | - HAVE_LIB[]NAME=no |
2563 | - dnl If $LIB[]NAME didn't lead to a usable library, we don't need |
2564 | - dnl $INC[]NAME either. |
2565 | - CPPFLAGS="$ac_save_CPPFLAGS" |
2566 | - LIB[]NAME= |
2567 | - LTLIB[]NAME= |
2568 | - LIB[]NAME[]_PREFIX= |
2569 | - fi |
2570 | - AC_SUBST([HAVE_LIB]NAME) |
2571 | - AC_SUBST([LIB]NAME) |
2572 | - AC_SUBST([LTLIB]NAME) |
2573 | - AC_SUBST([LIB]NAME[_PREFIX]) |
2574 | - popdef([NAME]) |
2575 | - popdef([Name]) |
2576 | -]) |
2577 | - |
2578 | -dnl Determine the platform dependent parameters needed to use rpath: |
2579 | -dnl acl_libext, |
2580 | -dnl acl_shlibext, |
2581 | -dnl acl_hardcode_libdir_flag_spec, |
2582 | -dnl acl_hardcode_libdir_separator, |
2583 | -dnl acl_hardcode_direct, |
2584 | -dnl acl_hardcode_minus_L. |
2585 | -AC_DEFUN([AC_LIB_RPATH], |
2586 | -[ |
2587 | - dnl Tell automake >= 1.10 to complain if config.rpath is missing. |
2588 | - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) |
2589 | - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS |
2590 | - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld |
2591 | - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host |
2592 | - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir |
2593 | - AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ |
2594 | - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ |
2595 | - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh |
2596 | - . ./conftest.sh |
2597 | - rm -f ./conftest.sh |
2598 | - acl_cv_rpath=done |
2599 | - ]) |
2600 | - wl="$acl_cv_wl" |
2601 | - acl_libext="$acl_cv_libext" |
2602 | - acl_shlibext="$acl_cv_shlibext" |
2603 | - acl_libname_spec="$acl_cv_libname_spec" |
2604 | - acl_library_names_spec="$acl_cv_library_names_spec" |
2605 | - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
2606 | - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
2607 | - acl_hardcode_direct="$acl_cv_hardcode_direct" |
2608 | - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" |
2609 | - dnl Determine whether the user wants rpath handling at all. |
2610 | - AC_ARG_ENABLE([rpath], |
2611 | - [ --disable-rpath do not hardcode runtime library paths], |
2612 | - :, enable_rpath=yes) |
2613 | -]) |
2614 | - |
2615 | -dnl AC_LIB_FROMPACKAGE(name, package) |
2616 | -dnl declares that libname comes from the given package. The configure file |
2617 | -dnl will then not have a --with-libname-prefix option but a |
2618 | -dnl --with-package-prefix option. Several libraries can come from the same |
2619 | -dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar |
2620 | -dnl macro call that searches for libname. |
2621 | -AC_DEFUN([AC_LIB_FROMPACKAGE], |
2622 | -[ |
2623 | - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
2624 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
2625 | - define([acl_frompackage_]NAME, [$2]) |
2626 | - popdef([NAME]) |
2627 | - pushdef([PACK],[$2]) |
2628 | - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], |
2629 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
2630 | - define([acl_libsinpackage_]PACKUP, |
2631 | - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) |
2632 | - popdef([PACKUP]) |
2633 | - popdef([PACK]) |
2634 | -]) |
2635 | - |
2636 | -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and |
2637 | -dnl the libraries corresponding to explicit and implicit dependencies. |
2638 | -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. |
2639 | -dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found |
2640 | -dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. |
2641 | -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
2642 | -[ |
2643 | - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
2644 | - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
2645 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
2646 | - pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) |
2647 | - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], |
2648 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
2649 | - pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) |
2650 | - dnl Autoconf >= 2.61 supports dots in --with options. |
2651 | - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) |
2652 | - dnl By default, look in $includedir and $libdir. |
2653 | - use_additional=yes |
2654 | - AC_LIB_WITH_FINAL_PREFIX([ |
2655 | - eval additional_includedir=\"$includedir\" |
2656 | - eval additional_libdir=\"$libdir\" |
2657 | - ]) |
2658 | - AC_ARG_WITH(P_A_C_K[-prefix], |
2659 | -[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib |
2660 | - --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], |
2661 | -[ |
2662 | - if test "X$withval" = "Xno"; then |
2663 | - use_additional=no |
2664 | - else |
2665 | - if test "X$withval" = "X"; then |
2666 | - AC_LIB_WITH_FINAL_PREFIX([ |
2667 | - eval additional_includedir=\"$includedir\" |
2668 | - eval additional_libdir=\"$libdir\" |
2669 | - ]) |
2670 | - else |
2671 | - additional_includedir="$withval/include" |
2672 | - additional_libdir="$withval/$acl_libdirstem" |
2673 | - if test "$acl_libdirstem2" != "$acl_libdirstem" \ |
2674 | - && ! test -d "$withval/$acl_libdirstem"; then |
2675 | - additional_libdir="$withval/$acl_libdirstem2" |
2676 | - fi |
2677 | - fi |
2678 | - fi |
2679 | -]) |
2680 | - dnl Search the library and its dependencies in $additional_libdir and |
2681 | - dnl $LDFLAGS. Using breadth-first-seach. |
2682 | - LIB[]NAME= |
2683 | - LTLIB[]NAME= |
2684 | - INC[]NAME= |
2685 | - LIB[]NAME[]_PREFIX= |
2686 | - dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been |
2687 | - dnl computed. So it has to be reset here. |
2688 | - HAVE_LIB[]NAME= |
2689 | - rpathdirs= |
2690 | - ltrpathdirs= |
2691 | - names_already_handled= |
2692 | - names_next_round='$1 $2' |
2693 | - while test -n "$names_next_round"; do |
2694 | - names_this_round="$names_next_round" |
2695 | - names_next_round= |
2696 | - for name in $names_this_round; do |
2697 | - already_handled= |
2698 | - for n in $names_already_handled; do |
2699 | - if test "$n" = "$name"; then |
2700 | - already_handled=yes |
2701 | - break |
2702 | - fi |
2703 | - done |
2704 | - if test -z "$already_handled"; then |
2705 | - names_already_handled="$names_already_handled $name" |
2706 | - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS |
2707 | - dnl or AC_LIB_HAVE_LINKFLAGS call. |
2708 | - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` |
2709 | - eval value=\"\$HAVE_LIB$uppername\" |
2710 | - if test -n "$value"; then |
2711 | - if test "$value" = yes; then |
2712 | - eval value=\"\$LIB$uppername\" |
2713 | - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" |
2714 | - eval value=\"\$LTLIB$uppername\" |
2715 | - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" |
2716 | - else |
2717 | - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined |
2718 | - dnl that this library doesn't exist. So just drop it. |
2719 | - : |
2720 | - fi |
2721 | - else |
2722 | - dnl Search the library lib$name in $additional_libdir and $LDFLAGS |
2723 | - dnl and the already constructed $LIBNAME/$LTLIBNAME. |
2724 | - found_dir= |
2725 | - found_la= |
2726 | - found_so= |
2727 | - found_a= |
2728 | - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name |
2729 | - if test -n "$acl_shlibext"; then |
2730 | - shrext=".$acl_shlibext" # typically: shrext=.so |
2731 | - else |
2732 | - shrext= |
2733 | - fi |
2734 | - if test $use_additional = yes; then |
2735 | - dir="$additional_libdir" |
2736 | - dnl The same code as in the loop below: |
2737 | - dnl First look for a shared library. |
2738 | - if test -n "$acl_shlibext"; then |
2739 | - if test -f "$dir/$libname$shrext"; then |
2740 | - found_dir="$dir" |
2741 | - found_so="$dir/$libname$shrext" |
2742 | - else |
2743 | - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
2744 | - ver=`(cd "$dir" && \ |
2745 | - for f in "$libname$shrext".*; do echo "$f"; done \ |
2746 | - | sed -e "s,^$libname$shrext\\\\.,," \ |
2747 | - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
2748 | - | sed 1q ) 2>/dev/null` |
2749 | - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
2750 | - found_dir="$dir" |
2751 | - found_so="$dir/$libname$shrext.$ver" |
2752 | - fi |
2753 | - else |
2754 | - eval library_names=\"$acl_library_names_spec\" |
2755 | - for f in $library_names; do |
2756 | - if test -f "$dir/$f"; then |
2757 | - found_dir="$dir" |
2758 | - found_so="$dir/$f" |
2759 | - break |
2760 | - fi |
2761 | - done |
2762 | - fi |
2763 | - fi |
2764 | - fi |
2765 | - dnl Then look for a static library. |
2766 | - if test "X$found_dir" = "X"; then |
2767 | - if test -f "$dir/$libname.$acl_libext"; then |
2768 | - found_dir="$dir" |
2769 | - found_a="$dir/$libname.$acl_libext" |
2770 | - fi |
2771 | - fi |
2772 | - if test "X$found_dir" != "X"; then |
2773 | - if test -f "$dir/$libname.la"; then |
2774 | - found_la="$dir/$libname.la" |
2775 | - fi |
2776 | - fi |
2777 | - fi |
2778 | - if test "X$found_dir" = "X"; then |
2779 | - for x in $LDFLAGS $LTLIB[]NAME; do |
2780 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
2781 | - case "$x" in |
2782 | - -L*) |
2783 | - dir=`echo "X$x" | sed -e 's/^X-L//'` |
2784 | - dnl First look for a shared library. |
2785 | - if test -n "$acl_shlibext"; then |
2786 | - if test -f "$dir/$libname$shrext"; then |
2787 | - found_dir="$dir" |
2788 | - found_so="$dir/$libname$shrext" |
2789 | - else |
2790 | - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
2791 | - ver=`(cd "$dir" && \ |
2792 | - for f in "$libname$shrext".*; do echo "$f"; done \ |
2793 | - | sed -e "s,^$libname$shrext\\\\.,," \ |
2794 | - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
2795 | - | sed 1q ) 2>/dev/null` |
2796 | - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
2797 | - found_dir="$dir" |
2798 | - found_so="$dir/$libname$shrext.$ver" |
2799 | - fi |
2800 | - else |
2801 | - eval library_names=\"$acl_library_names_spec\" |
2802 | - for f in $library_names; do |
2803 | - if test -f "$dir/$f"; then |
2804 | - found_dir="$dir" |
2805 | - found_so="$dir/$f" |
2806 | - break |
2807 | - fi |
2808 | - done |
2809 | - fi |
2810 | - fi |
2811 | - fi |
2812 | - dnl Then look for a static library. |
2813 | - if test "X$found_dir" = "X"; then |
2814 | - if test -f "$dir/$libname.$acl_libext"; then |
2815 | - found_dir="$dir" |
2816 | - found_a="$dir/$libname.$acl_libext" |
2817 | - fi |
2818 | - fi |
2819 | - if test "X$found_dir" != "X"; then |
2820 | - if test -f "$dir/$libname.la"; then |
2821 | - found_la="$dir/$libname.la" |
2822 | - fi |
2823 | - fi |
2824 | - ;; |
2825 | - esac |
2826 | - if test "X$found_dir" != "X"; then |
2827 | - break |
2828 | - fi |
2829 | - done |
2830 | - fi |
2831 | - if test "X$found_dir" != "X"; then |
2832 | - dnl Found the library. |
2833 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" |
2834 | - if test "X$found_so" != "X"; then |
2835 | - dnl Linking with a shared library. We attempt to hardcode its |
2836 | - dnl directory into the executable's runpath, unless it's the |
2837 | - dnl standard /usr/lib. |
2838 | - if test "$enable_rpath" = no \ |
2839 | - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ |
2840 | - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then |
2841 | - dnl No hardcoding is needed. |
2842 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
2843 | - else |
2844 | - dnl Use an explicit option to hardcode DIR into the resulting |
2845 | - dnl binary. |
2846 | - dnl Potentially add DIR to ltrpathdirs. |
2847 | - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. |
2848 | - haveit= |
2849 | - for x in $ltrpathdirs; do |
2850 | - if test "X$x" = "X$found_dir"; then |
2851 | - haveit=yes |
2852 | - break |
2853 | - fi |
2854 | - done |
2855 | - if test -z "$haveit"; then |
2856 | - ltrpathdirs="$ltrpathdirs $found_dir" |
2857 | - fi |
2858 | - dnl The hardcoding into $LIBNAME is system dependent. |
2859 | - if test "$acl_hardcode_direct" = yes; then |
2860 | - dnl Using DIR/libNAME.so during linking hardcodes DIR into the |
2861 | - dnl resulting binary. |
2862 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
2863 | - else |
2864 | - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
2865 | - dnl Use an explicit option to hardcode DIR into the resulting |
2866 | - dnl binary. |
2867 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
2868 | - dnl Potentially add DIR to rpathdirs. |
2869 | - dnl The rpathdirs will be appended to $LIBNAME at the end. |
2870 | - haveit= |
2871 | - for x in $rpathdirs; do |
2872 | - if test "X$x" = "X$found_dir"; then |
2873 | - haveit=yes |
2874 | - break |
2875 | - fi |
2876 | - done |
2877 | - if test -z "$haveit"; then |
2878 | - rpathdirs="$rpathdirs $found_dir" |
2879 | - fi |
2880 | - else |
2881 | - dnl Rely on "-L$found_dir". |
2882 | - dnl But don't add it if it's already contained in the LDFLAGS |
2883 | - dnl or the already constructed $LIBNAME |
2884 | - haveit= |
2885 | - for x in $LDFLAGS $LIB[]NAME; do |
2886 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
2887 | - if test "X$x" = "X-L$found_dir"; then |
2888 | - haveit=yes |
2889 | - break |
2890 | - fi |
2891 | - done |
2892 | - if test -z "$haveit"; then |
2893 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" |
2894 | - fi |
2895 | - if test "$acl_hardcode_minus_L" != no; then |
2896 | - dnl FIXME: Not sure whether we should use |
2897 | - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" |
2898 | - dnl here. |
2899 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" |
2900 | - else |
2901 | - dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH |
2902 | - dnl here, because this doesn't fit in flags passed to the |
2903 | - dnl compiler. So give up. No hardcoding. This affects only |
2904 | - dnl very old systems. |
2905 | - dnl FIXME: Not sure whether we should use |
2906 | - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" |
2907 | - dnl here. |
2908 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" |
2909 | - fi |
2910 | - fi |
2911 | - fi |
2912 | - fi |
2913 | - else |
2914 | - if test "X$found_a" != "X"; then |
2915 | - dnl Linking with a static library. |
2916 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" |
2917 | - else |
2918 | - dnl We shouldn't come here, but anyway it's good to have a |
2919 | - dnl fallback. |
2920 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" |
2921 | - fi |
2922 | - fi |
2923 | - dnl Assume the include files are nearby. |
2924 | - additional_includedir= |
2925 | - case "$found_dir" in |
2926 | - */$acl_libdirstem | */$acl_libdirstem/) |
2927 | - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` |
2928 | - if test "$name" = '$1'; then |
2929 | - LIB[]NAME[]_PREFIX="$basedir" |
2930 | - fi |
2931 | - additional_includedir="$basedir/include" |
2932 | - ;; |
2933 | - */$acl_libdirstem2 | */$acl_libdirstem2/) |
2934 | - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` |
2935 | - if test "$name" = '$1'; then |
2936 | - LIB[]NAME[]_PREFIX="$basedir" |
2937 | - fi |
2938 | - additional_includedir="$basedir/include" |
2939 | - ;; |
2940 | - esac |
2941 | - if test "X$additional_includedir" != "X"; then |
2942 | - dnl Potentially add $additional_includedir to $INCNAME. |
2943 | - dnl But don't add it |
2944 | - dnl 1. if it's the standard /usr/include, |
2945 | - dnl 2. if it's /usr/local/include and we are using GCC on Linux, |
2946 | - dnl 3. if it's already present in $CPPFLAGS or the already |
2947 | - dnl constructed $INCNAME, |
2948 | - dnl 4. if it doesn't exist as a directory. |
2949 | - if test "X$additional_includedir" != "X/usr/include"; then |
2950 | - haveit= |
2951 | - if test "X$additional_includedir" = "X/usr/local/include"; then |
2952 | - if test -n "$GCC"; then |
2953 | - case $host_os in |
2954 | - linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
2955 | - esac |
2956 | - fi |
2957 | - fi |
2958 | - if test -z "$haveit"; then |
2959 | - for x in $CPPFLAGS $INC[]NAME; do |
2960 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
2961 | - if test "X$x" = "X-I$additional_includedir"; then |
2962 | - haveit=yes |
2963 | - break |
2964 | - fi |
2965 | - done |
2966 | - if test -z "$haveit"; then |
2967 | - if test -d "$additional_includedir"; then |
2968 | - dnl Really add $additional_includedir to $INCNAME. |
2969 | - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" |
2970 | - fi |
2971 | - fi |
2972 | - fi |
2973 | - fi |
2974 | - fi |
2975 | - dnl Look for dependencies. |
2976 | - if test -n "$found_la"; then |
2977 | - dnl Read the .la file. It defines the variables |
2978 | - dnl dlname, library_names, old_library, dependency_libs, current, |
2979 | - dnl age, revision, installed, dlopen, dlpreopen, libdir. |
2980 | - save_libdir="$libdir" |
2981 | - case "$found_la" in |
2982 | - */* | *\\*) . "$found_la" ;; |
2983 | - *) . "./$found_la" ;; |
2984 | - esac |
2985 | - libdir="$save_libdir" |
2986 | - dnl We use only dependency_libs. |
2987 | - for dep in $dependency_libs; do |
2988 | - case "$dep" in |
2989 | - -L*) |
2990 | - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` |
2991 | - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. |
2992 | - dnl But don't add it |
2993 | - dnl 1. if it's the standard /usr/lib, |
2994 | - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, |
2995 | - dnl 3. if it's already present in $LDFLAGS or the already |
2996 | - dnl constructed $LIBNAME, |
2997 | - dnl 4. if it doesn't exist as a directory. |
2998 | - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ |
2999 | - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then |
3000 | - haveit= |
3001 | - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ |
3002 | - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then |
3003 | - if test -n "$GCC"; then |
3004 | - case $host_os in |
3005 | - linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
3006 | - esac |
3007 | - fi |
3008 | - fi |
3009 | - if test -z "$haveit"; then |
3010 | - haveit= |
3011 | - for x in $LDFLAGS $LIB[]NAME; do |
3012 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
3013 | - if test "X$x" = "X-L$additional_libdir"; then |
3014 | - haveit=yes |
3015 | - break |
3016 | - fi |
3017 | - done |
3018 | - if test -z "$haveit"; then |
3019 | - if test -d "$additional_libdir"; then |
3020 | - dnl Really add $additional_libdir to $LIBNAME. |
3021 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" |
3022 | - fi |
3023 | - fi |
3024 | - haveit= |
3025 | - for x in $LDFLAGS $LTLIB[]NAME; do |
3026 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
3027 | - if test "X$x" = "X-L$additional_libdir"; then |
3028 | - haveit=yes |
3029 | - break |
3030 | - fi |
3031 | - done |
3032 | - if test -z "$haveit"; then |
3033 | - if test -d "$additional_libdir"; then |
3034 | - dnl Really add $additional_libdir to $LTLIBNAME. |
3035 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" |
3036 | - fi |
3037 | - fi |
3038 | - fi |
3039 | - fi |
3040 | - ;; |
3041 | - -R*) |
3042 | - dir=`echo "X$dep" | sed -e 's/^X-R//'` |
3043 | - if test "$enable_rpath" != no; then |
3044 | - dnl Potentially add DIR to rpathdirs. |
3045 | - dnl The rpathdirs will be appended to $LIBNAME at the end. |
3046 | - haveit= |
3047 | - for x in $rpathdirs; do |
3048 | - if test "X$x" = "X$dir"; then |
3049 | - haveit=yes |
3050 | - break |
3051 | - fi |
3052 | - done |
3053 | - if test -z "$haveit"; then |
3054 | - rpathdirs="$rpathdirs $dir" |
3055 | - fi |
3056 | - dnl Potentially add DIR to ltrpathdirs. |
3057 | - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. |
3058 | - haveit= |
3059 | - for x in $ltrpathdirs; do |
3060 | - if test "X$x" = "X$dir"; then |
3061 | - haveit=yes |
3062 | - break |
3063 | - fi |
3064 | - done |
3065 | - if test -z "$haveit"; then |
3066 | - ltrpathdirs="$ltrpathdirs $dir" |
3067 | - fi |
3068 | - fi |
3069 | - ;; |
3070 | - -l*) |
3071 | - dnl Handle this in the next round. |
3072 | - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` |
3073 | - ;; |
3074 | - *.la) |
3075 | - dnl Handle this in the next round. Throw away the .la's |
3076 | - dnl directory; it is already contained in a preceding -L |
3077 | - dnl option. |
3078 | - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` |
3079 | - ;; |
3080 | - *) |
3081 | - dnl Most likely an immediate library name. |
3082 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" |
3083 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" |
3084 | - ;; |
3085 | - esac |
3086 | - done |
3087 | - fi |
3088 | - else |
3089 | - dnl Didn't find the library; assume it is in the system directories |
3090 | - dnl known to the linker and runtime loader. (All the system |
3091 | - dnl directories known to the linker should also be known to the |
3092 | - dnl runtime loader, otherwise the system is severely misconfigured.) |
3093 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" |
3094 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" |
3095 | - fi |
3096 | - fi |
3097 | - fi |
3098 | - done |
3099 | - done |
3100 | - if test "X$rpathdirs" != "X"; then |
3101 | - if test -n "$acl_hardcode_libdir_separator"; then |
3102 | - dnl Weird platform: only the last -rpath option counts, the user must |
3103 | - dnl pass all path elements in one option. We can arrange that for a |
3104 | - dnl single library, but not when more than one $LIBNAMEs are used. |
3105 | - alldirs= |
3106 | - for found_dir in $rpathdirs; do |
3107 | - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" |
3108 | - done |
3109 | - dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. |
3110 | - acl_save_libdir="$libdir" |
3111 | - libdir="$alldirs" |
3112 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
3113 | - libdir="$acl_save_libdir" |
3114 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" |
3115 | - else |
3116 | - dnl The -rpath options are cumulative. |
3117 | - for found_dir in $rpathdirs; do |
3118 | - acl_save_libdir="$libdir" |
3119 | - libdir="$found_dir" |
3120 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
3121 | - libdir="$acl_save_libdir" |
3122 | - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" |
3123 | - done |
3124 | - fi |
3125 | - fi |
3126 | - if test "X$ltrpathdirs" != "X"; then |
3127 | - dnl When using libtool, the option that works for both libraries and |
3128 | - dnl executables is -R. The -R options are cumulative. |
3129 | - for found_dir in $ltrpathdirs; do |
3130 | - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" |
3131 | - done |
3132 | - fi |
3133 | - popdef([P_A_C_K]) |
3134 | - popdef([PACKLIBS]) |
3135 | - popdef([PACKUP]) |
3136 | - popdef([PACK]) |
3137 | - popdef([NAME]) |
3138 | -]) |
3139 | - |
3140 | -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, |
3141 | -dnl unless already present in VAR. |
3142 | -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes |
3143 | -dnl contains two or three consecutive elements that belong together. |
3144 | -AC_DEFUN([AC_LIB_APPENDTOVAR], |
3145 | -[ |
3146 | - for element in [$2]; do |
3147 | - haveit= |
3148 | - for x in $[$1]; do |
3149 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
3150 | - if test "X$x" = "X$element"; then |
3151 | - haveit=yes |
3152 | - break |
3153 | - fi |
3154 | - done |
3155 | - if test -z "$haveit"; then |
3156 | - [$1]="${[$1]}${[$1]:+ }$element" |
3157 | - fi |
3158 | - done |
3159 | -]) |
3160 | - |
3161 | -dnl For those cases where a variable contains several -L and -l options |
3162 | -dnl referring to unknown libraries and directories, this macro determines the |
3163 | -dnl necessary additional linker options for the runtime path. |
3164 | -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) |
3165 | -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. |
3166 | -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, |
3167 | -dnl otherwise linking without libtool is assumed. |
3168 | -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], |
3169 | -[ |
3170 | - AC_REQUIRE([AC_LIB_RPATH]) |
3171 | - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
3172 | - $1= |
3173 | - if test "$enable_rpath" != no; then |
3174 | - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
3175 | - dnl Use an explicit option to hardcode directories into the resulting |
3176 | - dnl binary. |
3177 | - rpathdirs= |
3178 | - next= |
3179 | - for opt in $2; do |
3180 | - if test -n "$next"; then |
3181 | - dir="$next" |
3182 | - dnl No need to hardcode the standard /usr/lib. |
3183 | - if test "X$dir" != "X/usr/$acl_libdirstem" \ |
3184 | - && test "X$dir" != "X/usr/$acl_libdirstem2"; then |
3185 | - rpathdirs="$rpathdirs $dir" |
3186 | - fi |
3187 | - next= |
3188 | - else |
3189 | - case $opt in |
3190 | - -L) next=yes ;; |
3191 | - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` |
3192 | - dnl No need to hardcode the standard /usr/lib. |
3193 | - if test "X$dir" != "X/usr/$acl_libdirstem" \ |
3194 | - && test "X$dir" != "X/usr/$acl_libdirstem2"; then |
3195 | - rpathdirs="$rpathdirs $dir" |
3196 | - fi |
3197 | - next= ;; |
3198 | - *) next= ;; |
3199 | - esac |
3200 | - fi |
3201 | - done |
3202 | - if test "X$rpathdirs" != "X"; then |
3203 | - if test -n ""$3""; then |
3204 | - dnl libtool is used for linking. Use -R options. |
3205 | - for dir in $rpathdirs; do |
3206 | - $1="${$1}${$1:+ }-R$dir" |
3207 | - done |
3208 | - else |
3209 | - dnl The linker is used for linking directly. |
3210 | - if test -n "$acl_hardcode_libdir_separator"; then |
3211 | - dnl Weird platform: only the last -rpath option counts, the user |
3212 | - dnl must pass all path elements in one option. |
3213 | - alldirs= |
3214 | - for dir in $rpathdirs; do |
3215 | - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" |
3216 | - done |
3217 | - acl_save_libdir="$libdir" |
3218 | - libdir="$alldirs" |
3219 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
3220 | - libdir="$acl_save_libdir" |
3221 | - $1="$flag" |
3222 | - else |
3223 | - dnl The -rpath options are cumulative. |
3224 | - for dir in $rpathdirs; do |
3225 | - acl_save_libdir="$libdir" |
3226 | - libdir="$dir" |
3227 | - eval flag=\"$acl_hardcode_libdir_flag_spec\" |
3228 | - libdir="$acl_save_libdir" |
3229 | - $1="${$1}${$1:+ }$flag" |
3230 | - done |
3231 | - fi |
3232 | - fi |
3233 | - fi |
3234 | - fi |
3235 | - fi |
3236 | - AC_SUBST([$1]) |
3237 | -]) |
3238 | - |
3239 | -# lib-prefix.m4 serial 7 (gettext-0.18) |
3240 | -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. |
3241 | -dnl This file is free software; the Free Software Foundation |
3242 | -dnl gives unlimited permission to copy and/or distribute it, |
3243 | -dnl with or without modifications, as long as this notice is preserved. |
3244 | - |
3245 | -dnl From Bruno Haible. |
3246 | - |
3247 | -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and |
3248 | -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't |
3249 | -dnl require excessive bracketing. |
3250 | -ifdef([AC_HELP_STRING], |
3251 | -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], |
3252 | -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) |
3253 | - |
3254 | -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed |
3255 | -dnl to access previously installed libraries. The basic assumption is that |
3256 | -dnl a user will want packages to use other packages he previously installed |
3257 | -dnl with the same --prefix option. |
3258 | -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate |
3259 | -dnl libraries, but is otherwise very convenient. |
3260 | -AC_DEFUN([AC_LIB_PREFIX], |
3261 | -[ |
3262 | - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) |
3263 | - AC_REQUIRE([AC_PROG_CC]) |
3264 | - AC_REQUIRE([AC_CANONICAL_HOST]) |
3265 | - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
3266 | - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
3267 | - dnl By default, look in $includedir and $libdir. |
3268 | - use_additional=yes |
3269 | - AC_LIB_WITH_FINAL_PREFIX([ |
3270 | - eval additional_includedir=\"$includedir\" |
3271 | - eval additional_libdir=\"$libdir\" |
3272 | - ]) |
3273 | - AC_LIB_ARG_WITH([lib-prefix], |
3274 | -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib |
3275 | - --without-lib-prefix don't search for libraries in includedir and libdir], |
3276 | -[ |
3277 | - if test "X$withval" = "Xno"; then |
3278 | - use_additional=no |
3279 | - else |
3280 | - if test "X$withval" = "X"; then |
3281 | - AC_LIB_WITH_FINAL_PREFIX([ |
3282 | - eval additional_includedir=\"$includedir\" |
3283 | - eval additional_libdir=\"$libdir\" |
3284 | - ]) |
3285 | - else |
3286 | - additional_includedir="$withval/include" |
3287 | - additional_libdir="$withval/$acl_libdirstem" |
3288 | - fi |
3289 | - fi |
3290 | -]) |
3291 | - if test $use_additional = yes; then |
3292 | - dnl Potentially add $additional_includedir to $CPPFLAGS. |
3293 | - dnl But don't add it |
3294 | - dnl 1. if it's the standard /usr/include, |
3295 | - dnl 2. if it's already present in $CPPFLAGS, |
3296 | - dnl 3. if it's /usr/local/include and we are using GCC on Linux, |
3297 | - dnl 4. if it doesn't exist as a directory. |
3298 | - if test "X$additional_includedir" != "X/usr/include"; then |
3299 | - haveit= |
3300 | - for x in $CPPFLAGS; do |
3301 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
3302 | - if test "X$x" = "X-I$additional_includedir"; then |
3303 | - haveit=yes |
3304 | - break |
3305 | - fi |
3306 | - done |
3307 | - if test -z "$haveit"; then |
3308 | - if test "X$additional_includedir" = "X/usr/local/include"; then |
3309 | - if test -n "$GCC"; then |
3310 | - case $host_os in |
3311 | - linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
3312 | - esac |
3313 | - fi |
3314 | - fi |
3315 | - if test -z "$haveit"; then |
3316 | - if test -d "$additional_includedir"; then |
3317 | - dnl Really add $additional_includedir to $CPPFLAGS. |
3318 | - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" |
3319 | - fi |
3320 | - fi |
3321 | - fi |
3322 | - fi |
3323 | - dnl Potentially add $additional_libdir to $LDFLAGS. |
3324 | - dnl But don't add it |
3325 | - dnl 1. if it's the standard /usr/lib, |
3326 | - dnl 2. if it's already present in $LDFLAGS, |
3327 | - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, |
3328 | - dnl 4. if it doesn't exist as a directory. |
3329 | - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then |
3330 | - haveit= |
3331 | - for x in $LDFLAGS; do |
3332 | - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) |
3333 | - if test "X$x" = "X-L$additional_libdir"; then |
3334 | - haveit=yes |
3335 | - break |
3336 | - fi |
3337 | - done |
3338 | - if test -z "$haveit"; then |
3339 | - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then |
3340 | - if test -n "$GCC"; then |
3341 | - case $host_os in |
3342 | - linux*) haveit=yes;; |
3343 | - esac |
3344 | - fi |
3345 | - fi |
3346 | - if test -z "$haveit"; then |
3347 | - if test -d "$additional_libdir"; then |
3348 | - dnl Really add $additional_libdir to $LDFLAGS. |
3349 | - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" |
3350 | - fi |
3351 | - fi |
3352 | - fi |
3353 | - fi |
3354 | - fi |
3355 | -]) |
3356 | - |
3357 | -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, |
3358 | -dnl acl_final_exec_prefix, containing the values to which $prefix and |
3359 | -dnl $exec_prefix will expand at the end of the configure script. |
3360 | -AC_DEFUN([AC_LIB_PREPARE_PREFIX], |
3361 | -[ |
3362 | - dnl Unfortunately, prefix and exec_prefix get only finally determined |
3363 | - dnl at the end of configure. |
3364 | - if test "X$prefix" = "XNONE"; then |
3365 | - acl_final_prefix="$ac_default_prefix" |
3366 | - else |
3367 | - acl_final_prefix="$prefix" |
3368 | - fi |
3369 | - if test "X$exec_prefix" = "XNONE"; then |
3370 | - acl_final_exec_prefix='${prefix}' |
3371 | - else |
3372 | - acl_final_exec_prefix="$exec_prefix" |
3373 | - fi |
3374 | - acl_save_prefix="$prefix" |
3375 | - prefix="$acl_final_prefix" |
3376 | - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" |
3377 | - prefix="$acl_save_prefix" |
3378 | -]) |
3379 | - |
3380 | -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the |
3381 | -dnl variables prefix and exec_prefix bound to the values they will have |
3382 | -dnl at the end of the configure script. |
3383 | -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], |
3384 | -[ |
3385 | - acl_save_prefix="$prefix" |
3386 | - prefix="$acl_final_prefix" |
3387 | - acl_save_exec_prefix="$exec_prefix" |
3388 | - exec_prefix="$acl_final_exec_prefix" |
3389 | - $1 |
3390 | - exec_prefix="$acl_save_exec_prefix" |
3391 | - prefix="$acl_save_prefix" |
3392 | -]) |
3393 | - |
3394 | -dnl AC_LIB_PREPARE_MULTILIB creates |
3395 | -dnl - a variable acl_libdirstem, containing the basename of the libdir, either |
3396 | -dnl "lib" or "lib64" or "lib/64", |
3397 | -dnl - a variable acl_libdirstem2, as a secondary possible value for |
3398 | -dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or |
3399 | -dnl "lib/amd64". |
3400 | -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], |
3401 | -[ |
3402 | - dnl There is no formal standard regarding lib and lib64. |
3403 | - dnl On glibc systems, the current practice is that on a system supporting |
3404 | - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under |
3405 | - dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine |
3406 | - dnl the compiler's default mode by looking at the compiler's library search |
3407 | - dnl path. If at least one of its elements ends in /lib64 or points to a |
3408 | - dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. |
3409 | - dnl Otherwise we use the default, namely "lib". |
3410 | - dnl On Solaris systems, the current practice is that on a system supporting |
3411 | - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under |
3412 | - dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or |
3413 | - dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. |
3414 | - AC_REQUIRE([AC_CANONICAL_HOST]) |
3415 | - acl_libdirstem=lib |
3416 | - acl_libdirstem2= |
3417 | - case "$host_os" in |
3418 | - solaris*) |
3419 | - dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment |
3420 | - dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>. |
3421 | - dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." |
3422 | - dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the |
3423 | - dnl symlink is missing, so we set acl_libdirstem2 too. |
3424 | - AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], |
3425 | - [AC_EGREP_CPP([sixtyfour bits], [ |
3426 | -#ifdef _LP64 |
3427 | -sixtyfour bits |
3428 | -#endif |
3429 | - ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) |
3430 | - ]) |
3431 | - if test $gl_cv_solaris_64bit = yes; then |
3432 | - acl_libdirstem=lib/64 |
3433 | - case "$host_cpu" in |
3434 | - sparc*) acl_libdirstem2=lib/sparcv9 ;; |
3435 | - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; |
3436 | - esac |
3437 | - fi |
3438 | - ;; |
3439 | - *) |
3440 | - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` |
3441 | - if test -n "$searchpath"; then |
3442 | - acl_save_IFS="${IFS= }"; IFS=":" |
3443 | - for searchdir in $searchpath; do |
3444 | - if test -d "$searchdir"; then |
3445 | - case "$searchdir" in |
3446 | - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; |
3447 | - */../ | */.. ) |
3448 | - # Better ignore directories of this form. They are misleading. |
3449 | - ;; |
3450 | - *) searchdir=`cd "$searchdir" && pwd` |
3451 | - case "$searchdir" in |
3452 | - */lib64 ) acl_libdirstem=lib64 ;; |
3453 | - esac ;; |
3454 | - esac |
3455 | - fi |
3456 | - done |
3457 | - IFS="$acl_save_IFS" |
3458 | - fi |
3459 | - ;; |
3460 | - esac |
3461 | - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" |
3462 | -]) |
3463 | - |
3464 | # nls.m4 serial 5 (gettext-0.18) |
3465 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, |
3466 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, |
3467 | dnl Inc. |
3468 | dnl This file is free software; the Free Software Foundation |
3469 | dnl gives unlimited permission to copy and/or distribute it, |
3470 | @@ -2274,568 +512,22 @@ |
3471 | fi[]dnl |
3472 | ])# PKG_CHECK_MODULES |
3473 | |
3474 | -# po.m4 serial 17 (gettext-0.18) |
3475 | -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. |
3476 | -dnl This file is free software; the Free Software Foundation |
3477 | -dnl gives unlimited permission to copy and/or distribute it, |
3478 | -dnl with or without modifications, as long as this notice is preserved. |
3479 | -dnl |
3480 | -dnl This file can can be used in projects which are not available under |
3481 | -dnl the GNU General Public License or the GNU Library General Public |
3482 | -dnl License but which still want to provide support for the GNU gettext |
3483 | -dnl functionality. |
3484 | -dnl Please note that the actual code of the GNU gettext library is covered |
3485 | -dnl by the GNU Library General Public License, and the rest of the GNU |
3486 | -dnl gettext package package is covered by the GNU General Public License. |
3487 | -dnl They are *not* in the public domain. |
3488 | - |
3489 | -dnl Authors: |
3490 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
3491 | -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
3492 | - |
3493 | -AC_PREREQ([2.50]) |
3494 | - |
3495 | -dnl Checks for all prerequisites of the po subdirectory. |
3496 | -AC_DEFUN([AM_PO_SUBDIRS], |
3497 | -[ |
3498 | - AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
3499 | - AC_REQUIRE([AC_PROG_INSTALL])dnl |
3500 | - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake |
3501 | - AC_REQUIRE([AM_NLS])dnl |
3502 | - |
3503 | - dnl Release version of the gettext macros. This is used to ensure that |
3504 | - dnl the gettext macros and po/Makefile.in.in are in sync. |
3505 | - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) |
3506 | - |
3507 | - dnl Perform the following tests also if --disable-nls has been given, |
3508 | - dnl because they are needed for "make dist" to work. |
3509 | - |
3510 | - dnl Search for GNU msgfmt in the PATH. |
3511 | - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. |
3512 | - dnl The second test excludes FreeBSD msgfmt. |
3513 | - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, |
3514 | - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && |
3515 | - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], |
3516 | - :) |
3517 | - AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) |
3518 | - |
3519 | - dnl Test whether it is GNU msgfmt >= 0.15. |
3520 | -changequote(,)dnl |
3521 | - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in |
3522 | - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; |
3523 | - *) MSGFMT_015=$MSGFMT ;; |
3524 | - esac |
3525 | -changequote([,])dnl |
3526 | - AC_SUBST([MSGFMT_015]) |
3527 | -changequote(,)dnl |
3528 | - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in |
3529 | - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; |
3530 | - *) GMSGFMT_015=$GMSGFMT ;; |
3531 | - esac |
3532 | -changequote([,])dnl |
3533 | - AC_SUBST([GMSGFMT_015]) |
3534 | - |
3535 | - dnl Search for GNU xgettext 0.12 or newer in the PATH. |
3536 | - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. |
3537 | - dnl The second test excludes FreeBSD xgettext. |
3538 | - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, |
3539 | - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && |
3540 | - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], |
3541 | - :) |
3542 | - dnl Remove leftover from FreeBSD xgettext call. |
3543 | - rm -f messages.po |
3544 | - |
3545 | - dnl Test whether it is GNU xgettext >= 0.15. |
3546 | -changequote(,)dnl |
3547 | - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in |
3548 | - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; |
3549 | - *) XGETTEXT_015=$XGETTEXT ;; |
3550 | - esac |
3551 | -changequote([,])dnl |
3552 | - AC_SUBST([XGETTEXT_015]) |
3553 | - |
3554 | - dnl Search for GNU msgmerge 0.11 or newer in the PATH. |
3555 | - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, |
3556 | - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) |
3557 | - |
3558 | - dnl Installation directories. |
3559 | - dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we |
3560 | - dnl have to define it here, so that it can be used in po/Makefile. |
3561 | - test -n "$localedir" || localedir='${datadir}/locale' |
3562 | - AC_SUBST([localedir]) |
3563 | - |
3564 | - dnl Support for AM_XGETTEXT_OPTION. |
3565 | - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= |
3566 | - AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) |
3567 | - |
3568 | - AC_CONFIG_COMMANDS([po-directories], [[ |
3569 | - for ac_file in $CONFIG_FILES; do |
3570 | - # Support "outfile[:infile[:infile...]]" |
3571 | - case "$ac_file" in |
3572 | - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; |
3573 | - esac |
3574 | - # PO directories have a Makefile.in generated from Makefile.in.in. |
3575 | - case "$ac_file" in */Makefile.in) |
3576 | - # Adjust a relative srcdir. |
3577 | - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` |
3578 | - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" |
3579 | - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` |
3580 | - # In autoconf-2.13 it is called $ac_given_srcdir. |
3581 | - # In autoconf-2.50 it is called $srcdir. |
3582 | - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" |
3583 | - case "$ac_given_srcdir" in |
3584 | - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; |
3585 | - /*) top_srcdir="$ac_given_srcdir" ;; |
3586 | - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; |
3587 | - esac |
3588 | - # Treat a directory as a PO directory if and only if it has a |
3589 | - # POTFILES.in file. This allows packages to have multiple PO |
3590 | - # directories under different names or in different locations. |
3591 | - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then |
3592 | - rm -f "$ac_dir/POTFILES" |
3593 | - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" |
3594 | - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" |
3595 | - POMAKEFILEDEPS="POTFILES.in" |
3596 | - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend |
3597 | - # on $ac_dir but don't depend on user-specified configuration |
3598 | - # parameters. |
3599 | - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then |
3600 | - # The LINGUAS file contains the set of available languages. |
3601 | - if test -n "$OBSOLETE_ALL_LINGUAS"; then |
3602 | - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" |
3603 | - fi |
3604 | - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` |
3605 | - # Hide the ALL_LINGUAS assigment from automake < 1.5. |
3606 | - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' |
3607 | - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" |
3608 | - else |
3609 | - # The set of available languages was given in configure.in. |
3610 | - # Hide the ALL_LINGUAS assigment from automake < 1.5. |
3611 | - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' |
3612 | - fi |
3613 | - # Compute POFILES |
3614 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) |
3615 | - # Compute UPDATEPOFILES |
3616 | - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) |
3617 | - # Compute DUMMYPOFILES |
3618 | - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) |
3619 | - # Compute GMOFILES |
3620 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) |
3621 | - case "$ac_given_srcdir" in |
3622 | - .) srcdirpre= ;; |
3623 | - *) srcdirpre='$(srcdir)/' ;; |
3624 | - esac |
3625 | - POFILES= |
3626 | - UPDATEPOFILES= |
3627 | - DUMMYPOFILES= |
3628 | - GMOFILES= |
3629 | - for lang in $ALL_LINGUAS; do |
3630 | - POFILES="$POFILES $srcdirpre$lang.po" |
3631 | - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" |
3632 | - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" |
3633 | - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" |
3634 | - done |
3635 | - # CATALOGS depends on both $ac_dir and the user's LINGUAS |
3636 | - # environment variable. |
3637 | - INST_LINGUAS= |
3638 | - if test -n "$ALL_LINGUAS"; then |
3639 | - for presentlang in $ALL_LINGUAS; do |
3640 | - useit=no |
3641 | - if test "%UNSET%" != "$LINGUAS"; then |
3642 | - desiredlanguages="$LINGUAS" |
3643 | - else |
3644 | - desiredlanguages="$ALL_LINGUAS" |
3645 | - fi |
3646 | - for desiredlang in $desiredlanguages; do |
3647 | - # Use the presentlang catalog if desiredlang is |
3648 | - # a. equal to presentlang, or |
3649 | - # b. a variant of presentlang (because in this case, |
3650 | - # presentlang can be used as a fallback for messages |
3651 | - # which are not translated in the desiredlang catalog). |
3652 | - case "$desiredlang" in |
3653 | - "$presentlang"*) useit=yes;; |
3654 | - esac |
3655 | - done |
3656 | - if test $useit = yes; then |
3657 | - INST_LINGUAS="$INST_LINGUAS $presentlang" |
3658 | - fi |
3659 | - done |
3660 | - fi |
3661 | - CATALOGS= |
3662 | - if test -n "$INST_LINGUAS"; then |
3663 | - for lang in $INST_LINGUAS; do |
3664 | - CATALOGS="$CATALOGS $lang.gmo" |
3665 | - done |
3666 | - fi |
3667 | - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" |
3668 | - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" |
3669 | - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do |
3670 | - if test -f "$f"; then |
3671 | - case "$f" in |
3672 | - *.orig | *.bak | *~) ;; |
3673 | - *) cat "$f" >> "$ac_dir/Makefile" ;; |
3674 | - esac |
3675 | - fi |
3676 | - done |
3677 | - fi |
3678 | - ;; |
3679 | - esac |
3680 | - done]], |
3681 | - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute |
3682 | - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it |
3683 | - # from automake < 1.5. |
3684 | - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' |
3685 | - # Capture the value of LINGUAS because we need it to compute CATALOGS. |
3686 | - LINGUAS="${LINGUAS-%UNSET%}" |
3687 | - ]) |
3688 | -]) |
3689 | - |
3690 | -dnl Postprocesses a Makefile in a directory containing PO files. |
3691 | -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], |
3692 | -[ |
3693 | - # When this code is run, in config.status, two variables have already been |
3694 | - # set: |
3695 | - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, |
3696 | - # - LINGUAS is the value of the environment variable LINGUAS at configure |
3697 | - # time. |
3698 | - |
3699 | -changequote(,)dnl |
3700 | - # Adjust a relative srcdir. |
3701 | - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` |
3702 | - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" |
3703 | - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` |
3704 | - # In autoconf-2.13 it is called $ac_given_srcdir. |
3705 | - # In autoconf-2.50 it is called $srcdir. |
3706 | - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" |
3707 | - case "$ac_given_srcdir" in |
3708 | - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; |
3709 | - /*) top_srcdir="$ac_given_srcdir" ;; |
3710 | - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; |
3711 | - esac |
3712 | - |
3713 | - # Find a way to echo strings without interpreting backslash. |
3714 | - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then |
3715 | - gt_echo='echo' |
3716 | - else |
3717 | - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then |
3718 | - gt_echo='printf %s\n' |
3719 | - else |
3720 | - echo_func () { |
3721 | - cat <<EOT |
3722 | -$* |
3723 | -EOT |
3724 | - } |
3725 | - gt_echo='echo_func' |
3726 | - fi |
3727 | - fi |
3728 | - |
3729 | - # A sed script that extracts the value of VARIABLE from a Makefile. |
3730 | - sed_x_variable=' |
3731 | -# Test if the hold space is empty. |
3732 | -x |
3733 | -s/P/P/ |
3734 | -x |
3735 | -ta |
3736 | -# Yes it was empty. Look if we have the expected variable definition. |
3737 | -/^[ ]*VARIABLE[ ]*=/{ |
3738 | - # Seen the first line of the variable definition. |
3739 | - s/^[ ]*VARIABLE[ ]*=// |
3740 | - ba |
3741 | -} |
3742 | -bd |
3743 | -:a |
3744 | -# Here we are processing a line from the variable definition. |
3745 | -# Remove comment, more precisely replace it with a space. |
3746 | -s/#.*$/ / |
3747 | -# See if the line ends in a backslash. |
3748 | -tb |
3749 | -:b |
3750 | -s/\\$// |
3751 | -# Print the line, without the trailing backslash. |
3752 | -p |
3753 | -tc |
3754 | -# There was no trailing backslash. The end of the variable definition is |
3755 | -# reached. Clear the hold space. |
3756 | -s/^.*$// |
3757 | -x |
3758 | -bd |
3759 | -:c |
3760 | -# A trailing backslash means that the variable definition continues in the |
3761 | -# next line. Put a nonempty string into the hold space to indicate this. |
3762 | -s/^.*$/P/ |
3763 | -x |
3764 | -:d |
3765 | -' |
3766 | -changequote([,])dnl |
3767 | - |
3768 | - # Set POTFILES to the value of the Makefile variable POTFILES. |
3769 | - sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'` |
3770 | - POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"` |
3771 | - # Compute POTFILES_DEPS as |
3772 | - # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) |
3773 | - POTFILES_DEPS= |
3774 | - for file in $POTFILES; do |
3775 | - POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file" |
3776 | - done |
3777 | - POMAKEFILEDEPS="" |
3778 | - |
3779 | - if test -n "$OBSOLETE_ALL_LINGUAS"; then |
3780 | - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" |
3781 | - fi |
3782 | - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then |
3783 | - # The LINGUAS file contains the set of available languages. |
3784 | - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` |
3785 | - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" |
3786 | - else |
3787 | - # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. |
3788 | - sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` |
3789 | - ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` |
3790 | - fi |
3791 | - # Hide the ALL_LINGUAS assigment from automake < 1.5. |
3792 | - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' |
3793 | - # Compute POFILES |
3794 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) |
3795 | - # Compute UPDATEPOFILES |
3796 | - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) |
3797 | - # Compute DUMMYPOFILES |
3798 | - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) |
3799 | - # Compute GMOFILES |
3800 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) |
3801 | - # Compute PROPERTIESFILES |
3802 | - # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties) |
3803 | - # Compute CLASSFILES |
3804 | - # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class) |
3805 | - # Compute QMFILES |
3806 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) |
3807 | - # Compute MSGFILES |
3808 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) |
3809 | - # Compute RESOURCESDLLFILES |
3810 | - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll) |
3811 | - case "$ac_given_srcdir" in |
3812 | - .) srcdirpre= ;; |
3813 | - *) srcdirpre='$(srcdir)/' ;; |
3814 | - esac |
3815 | - POFILES= |
3816 | - UPDATEPOFILES= |
3817 | - DUMMYPOFILES= |
3818 | - GMOFILES= |
3819 | - PROPERTIESFILES= |
3820 | - CLASSFILES= |
3821 | - QMFILES= |
3822 | - MSGFILES= |
3823 | - RESOURCESDLLFILES= |
3824 | - for lang in $ALL_LINGUAS; do |
3825 | - POFILES="$POFILES $srcdirpre$lang.po" |
3826 | - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" |
3827 | - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" |
3828 | - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" |
3829 | - PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties" |
3830 | - CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class" |
3831 | - QMFILES="$QMFILES $srcdirpre$lang.qm" |
3832 | - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` |
3833 | - MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" |
3834 | - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` |
3835 | - RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" |
3836 | - done |
3837 | - # CATALOGS depends on both $ac_dir and the user's LINGUAS |
3838 | - # environment variable. |
3839 | - INST_LINGUAS= |
3840 | - if test -n "$ALL_LINGUAS"; then |
3841 | - for presentlang in $ALL_LINGUAS; do |
3842 | - useit=no |
3843 | - if test "%UNSET%" != "$LINGUAS"; then |
3844 | - desiredlanguages="$LINGUAS" |
3845 | - else |
3846 | - desiredlanguages="$ALL_LINGUAS" |
3847 | - fi |
3848 | - for desiredlang in $desiredlanguages; do |
3849 | - # Use the presentlang catalog if desiredlang is |
3850 | - # a. equal to presentlang, or |
3851 | - # b. a variant of presentlang (because in this case, |
3852 | - # presentlang can be used as a fallback for messages |
3853 | - # which are not translated in the desiredlang catalog). |
3854 | - case "$desiredlang" in |
3855 | - "$presentlang"*) useit=yes;; |
3856 | - esac |
3857 | - done |
3858 | - if test $useit = yes; then |
3859 | - INST_LINGUAS="$INST_LINGUAS $presentlang" |
3860 | - fi |
3861 | - done |
3862 | - fi |
3863 | - CATALOGS= |
3864 | - JAVACATALOGS= |
3865 | - QTCATALOGS= |
3866 | - TCLCATALOGS= |
3867 | - CSHARPCATALOGS= |
3868 | - if test -n "$INST_LINGUAS"; then |
3869 | - for lang in $INST_LINGUAS; do |
3870 | - CATALOGS="$CATALOGS $lang.gmo" |
3871 | - JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties" |
3872 | - QTCATALOGS="$QTCATALOGS $lang.qm" |
3873 | - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` |
3874 | - TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" |
3875 | - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` |
3876 | - CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" |
3877 | - done |
3878 | - fi |
3879 | - |
3880 | - sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" |
3881 | - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then |
3882 | - # Add dependencies that cannot be formulated as a simple suffix rule. |
3883 | - for lang in $ALL_LINGUAS; do |
3884 | - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` |
3885 | - cat >> "$ac_file.tmp" <<EOF |
3886 | -$frobbedlang.msg: $lang.po |
3887 | - @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ |
3888 | - \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } |
3889 | -EOF |
3890 | - done |
3891 | - fi |
3892 | - if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then |
3893 | - # Add dependencies that cannot be formulated as a simple suffix rule. |
3894 | - for lang in $ALL_LINGUAS; do |
3895 | - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` |
3896 | - cat >> "$ac_file.tmp" <<EOF |
3897 | -$frobbedlang/\$(DOMAIN).resources.dll: $lang.po |
3898 | - @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ |
3899 | - \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } |
3900 | -EOF |
3901 | - done |
3902 | - fi |
3903 | - if test -n "$POMAKEFILEDEPS"; then |
3904 | - cat >> "$ac_file.tmp" <<EOF |
3905 | -Makefile: $POMAKEFILEDEPS |
3906 | -EOF |
3907 | - fi |
3908 | - mv "$ac_file.tmp" "$ac_file" |
3909 | -]) |
3910 | - |
3911 | -dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. |
3912 | -AC_DEFUN([AM_XGETTEXT_OPTION_INIT], |
3913 | -[ |
3914 | - XGETTEXT_EXTRA_OPTIONS= |
3915 | -]) |
3916 | - |
3917 | -dnl Registers an option to be passed to xgettext in the po subdirectory. |
3918 | -AC_DEFUN([AM_XGETTEXT_OPTION], |
3919 | -[ |
3920 | - AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) |
3921 | - XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" |
3922 | -]) |
3923 | - |
3924 | -# progtest.m4 serial 6 (gettext-0.18) |
3925 | -dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. |
3926 | -dnl This file is free software; the Free Software Foundation |
3927 | -dnl gives unlimited permission to copy and/or distribute it, |
3928 | -dnl with or without modifications, as long as this notice is preserved. |
3929 | -dnl |
3930 | -dnl This file can can be used in projects which are not available under |
3931 | -dnl the GNU General Public License or the GNU Library General Public |
3932 | -dnl License but which still want to provide support for the GNU gettext |
3933 | -dnl functionality. |
3934 | -dnl Please note that the actual code of the GNU gettext library is covered |
3935 | -dnl by the GNU Library General Public License, and the rest of the GNU |
3936 | -dnl gettext package package is covered by the GNU General Public License. |
3937 | -dnl They are *not* in the public domain. |
3938 | - |
3939 | -dnl Authors: |
3940 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1996. |
3941 | - |
3942 | -AC_PREREQ([2.50]) |
3943 | - |
3944 | -# Search path for a program which passes the given test. |
3945 | - |
3946 | -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, |
3947 | -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) |
3948 | -AC_DEFUN([AM_PATH_PROG_WITH_TEST], |
3949 | -[ |
3950 | -# Prepare PATH_SEPARATOR. |
3951 | -# The user is always right. |
3952 | -if test "${PATH_SEPARATOR+set}" != set; then |
3953 | - echo "#! /bin/sh" >conf$$.sh |
3954 | - echo "exit 0" >>conf$$.sh |
3955 | - chmod +x conf$$.sh |
3956 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
3957 | - PATH_SEPARATOR=';' |
3958 | - else |
3959 | - PATH_SEPARATOR=: |
3960 | - fi |
3961 | - rm -f conf$$.sh |
3962 | -fi |
3963 | - |
3964 | -# Find out how to test for executable files. Don't use a zero-byte file, |
3965 | -# as systems may use methods other than mode bits to determine executability. |
3966 | -cat >conf$$.file <<_ASEOF |
3967 | -#! /bin/sh |
3968 | -exit 0 |
3969 | -_ASEOF |
3970 | -chmod +x conf$$.file |
3971 | -if test -x conf$$.file >/dev/null 2>&1; then |
3972 | - ac_executable_p="test -x" |
3973 | -else |
3974 | - ac_executable_p="test -f" |
3975 | -fi |
3976 | -rm -f conf$$.file |
3977 | - |
3978 | -# Extract the first word of "$2", so it can be a program name with args. |
3979 | -set dummy $2; ac_word=[$]2 |
3980 | -AC_MSG_CHECKING([for $ac_word]) |
3981 | -AC_CACHE_VAL([ac_cv_path_$1], |
3982 | -[case "[$]$1" in |
3983 | - [[\\/]]* | ?:[[\\/]]*) |
3984 | - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. |
3985 | - ;; |
3986 | - *) |
3987 | - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR |
3988 | - for ac_dir in ifelse([$5], , $PATH, [$5]); do |
3989 | - IFS="$ac_save_IFS" |
3990 | - test -z "$ac_dir" && ac_dir=. |
3991 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3992 | - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then |
3993 | - echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD |
3994 | - if [$3]; then |
3995 | - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" |
3996 | - break 2 |
3997 | - fi |
3998 | - fi |
3999 | - done |
4000 | - done |
4001 | - IFS="$ac_save_IFS" |
4002 | -dnl If no 4th arg is given, leave the cache variable unset, |
4003 | -dnl so AC_PATH_PROGS will keep looking. |
4004 | -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" |
4005 | -])dnl |
4006 | - ;; |
4007 | -esac])dnl |
4008 | -$1="$ac_cv_path_$1" |
4009 | -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then |
4010 | - AC_MSG_RESULT([$][$1]) |
4011 | -else |
4012 | - AC_MSG_RESULT([no]) |
4013 | -fi |
4014 | -AC_SUBST([$1])dnl |
4015 | -]) |
4016 | - |
4017 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
4018 | -# Foundation, Inc. |
4019 | +# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
4020 | # |
4021 | # This file is free software; the Free Software Foundation |
4022 | # gives unlimited permission to copy and/or distribute it, |
4023 | # with or without modifications, as long as this notice is preserved. |
4024 | |
4025 | -# serial 1 |
4026 | - |
4027 | # AM_AUTOMAKE_VERSION(VERSION) |
4028 | # ---------------------------- |
4029 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
4030 | # generated from the m4 files accompanying Automake X.Y. |
4031 | # (This private macro should not be called outside this file.) |
4032 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
4033 | -[am__api_version='1.11' |
4034 | +[am__api_version='1.14' |
4035 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
4036 | dnl require some minimum version. Point them to the right macro. |
4037 | -m4_if([$1], [1.11.3], [], |
4038 | +m4_if([$1], [1.14.1], [], |
4039 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
4040 | ]) |
4041 | |
4042 | @@ -2851,24 +543,22 @@ |
4043 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
4044 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
4045 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
4046 | -[AM_AUTOMAKE_VERSION([1.11.3])dnl |
4047 | +[AM_AUTOMAKE_VERSION([1.14.1])dnl |
4048 | m4_ifndef([AC_AUTOCONF_VERSION], |
4049 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
4050 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
4051 | |
4052 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
4053 | |
4054 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
4055 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
4056 | # |
4057 | # This file is free software; the Free Software Foundation |
4058 | # gives unlimited permission to copy and/or distribute it, |
4059 | # with or without modifications, as long as this notice is preserved. |
4060 | |
4061 | -# serial 1 |
4062 | - |
4063 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
4064 | -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
4065 | -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
4066 | +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
4067 | +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
4068 | # |
4069 | # Of course, Automake must honor this variable whenever it calls a |
4070 | # tool from the auxiliary directory. The problem is that $srcdir (and |
4071 | @@ -2887,7 +577,7 @@ |
4072 | # |
4073 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
4074 | # are both prefixed by $srcdir. In an in-source build this is usually |
4075 | -# harmless because $srcdir is `.', but things will broke when you |
4076 | +# harmless because $srcdir is '.', but things will broke when you |
4077 | # start a VPATH build or use an absolute $srcdir. |
4078 | # |
4079 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
4080 | @@ -2913,22 +603,19 @@ |
4081 | |
4082 | # AM_CONDITIONAL -*- Autoconf -*- |
4083 | |
4084 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
4085 | -# Free Software Foundation, Inc. |
4086 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
4087 | # |
4088 | # This file is free software; the Free Software Foundation |
4089 | # gives unlimited permission to copy and/or distribute it, |
4090 | # with or without modifications, as long as this notice is preserved. |
4091 | |
4092 | -# serial 9 |
4093 | - |
4094 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
4095 | # ------------------------------------- |
4096 | # Define a conditional. |
4097 | AC_DEFUN([AM_CONDITIONAL], |
4098 | -[AC_PREREQ(2.52)dnl |
4099 | - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
4100 | - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
4101 | +[AC_PREREQ([2.52])dnl |
4102 | + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
4103 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
4104 | AC_SUBST([$1_TRUE])dnl |
4105 | AC_SUBST([$1_FALSE])dnl |
4106 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
4107 | @@ -2947,16 +634,14 @@ |
4108 | Usually this means the macro was only invoked conditionally.]]) |
4109 | fi])]) |
4110 | |
4111 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
4112 | -# 2010, 2011 Free Software Foundation, Inc. |
4113 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
4114 | # |
4115 | # This file is free software; the Free Software Foundation |
4116 | # gives unlimited permission to copy and/or distribute it, |
4117 | # with or without modifications, as long as this notice is preserved. |
4118 | |
4119 | -# serial 12 |
4120 | |
4121 | -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
4122 | +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
4123 | # written in clear, in which case automake, when reading aclocal.m4, |
4124 | # will think it sees a *use*, and therefore will trigger all it's |
4125 | # C support machinery. Also note that it means that autoscan, seeing |
4126 | @@ -2966,7 +651,7 @@ |
4127 | # _AM_DEPENDENCIES(NAME) |
4128 | # ---------------------- |
4129 | # See how the compiler implements dependency checking. |
4130 | -# NAME is "CC", "CXX", "GCJ", or "OBJC". |
4131 | +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
4132 | # We try a few techniques and use that to set a single cache variable. |
4133 | # |
4134 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
4135 | @@ -2979,12 +664,13 @@ |
4136 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
4137 | AC_REQUIRE([AM_DEP_TRACK])dnl |
4138 | |
4139 | -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
4140 | - [$1], CXX, [depcc="$CXX" am_compiler_list=], |
4141 | - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
4142 | - [$1], UPC, [depcc="$UPC" am_compiler_list=], |
4143 | - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
4144 | - [depcc="$$1" am_compiler_list=]) |
4145 | +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
4146 | + [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
4147 | + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
4148 | + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
4149 | + [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
4150 | + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
4151 | + [depcc="$$1" am_compiler_list=]) |
4152 | |
4153 | AC_CACHE_CHECK([dependency style of $depcc], |
4154 | [am_cv_$1_dependencies_compiler_type], |
4155 | @@ -2992,8 +678,8 @@ |
4156 | # We make a subdir and do the tests there. Otherwise we can end up |
4157 | # making bogus files that we don't know about and never remove. For |
4158 | # instance it was reported that on HP-UX the gcc test will end up |
4159 | - # making a dummy file named `D' -- because `-MD' means `put the output |
4160 | - # in D'. |
4161 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
4162 | + # in D". |
4163 | rm -rf conftest.dir |
4164 | mkdir conftest.dir |
4165 | # Copy depcomp to subdir because otherwise we won't find it if we're |
4166 | @@ -3033,16 +719,16 @@ |
4167 | : > sub/conftest.c |
4168 | for i in 1 2 3 4 5 6; do |
4169 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
4170 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
4171 | - # Solaris 8's {/usr,}/bin/sh. |
4172 | - touch sub/conftst$i.h |
4173 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
4174 | + # Solaris 10 /bin/sh. |
4175 | + echo '/* dummy */' > sub/conftst$i.h |
4176 | done |
4177 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
4178 | |
4179 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
4180 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
4181 | # mode. It turns out that the SunPro C++ compiler does not properly |
4182 | - # handle `-M -o', and we need to detect this. Also, some Intel |
4183 | - # versions had trouble with output in subdirs |
4184 | + # handle '-M -o', and we need to detect this. Also, some Intel |
4185 | + # versions had trouble with output in subdirs. |
4186 | am__obj=sub/conftest.${OBJEXT-o} |
4187 | am__minus_obj="-o $am__obj" |
4188 | case $depmode in |
4189 | @@ -3051,8 +737,8 @@ |
4190 | test "$am__universal" = false || continue |
4191 | ;; |
4192 | nosideeffect) |
4193 | - # after this tag, mechanisms are not by side-effect, so they'll |
4194 | - # only be used when explicitly requested |
4195 | + # After this tag, mechanisms are not by side-effect, so they'll |
4196 | + # only be used when explicitly requested. |
4197 | if test "x$enable_dependency_tracking" = xyes; then |
4198 | continue |
4199 | else |
4200 | @@ -3060,7 +746,7 @@ |
4201 | fi |
4202 | ;; |
4203 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
4204 | - # This compiler won't grok `-c -o', but also, the minuso test has |
4205 | + # This compiler won't grok '-c -o', but also, the minuso test has |
4206 | # not run yet. These depmodes are late enough in the game, and |
4207 | # so weak that their functioning should not be impacted. |
4208 | am__obj=conftest.${OBJEXT-o} |
4209 | @@ -3108,7 +794,7 @@ |
4210 | # AM_SET_DEPDIR |
4211 | # ------------- |
4212 | # Choose a directory name for dependency files. |
4213 | -# This macro is AC_REQUIREd in _AM_DEPENDENCIES |
4214 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
4215 | AC_DEFUN([AM_SET_DEPDIR], |
4216 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
4217 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
4218 | @@ -3118,9 +804,13 @@ |
4219 | # AM_DEP_TRACK |
4220 | # ------------ |
4221 | AC_DEFUN([AM_DEP_TRACK], |
4222 | -[AC_ARG_ENABLE(dependency-tracking, |
4223 | -[ --disable-dependency-tracking speeds up one-time build |
4224 | - --enable-dependency-tracking do not reject slow dependency extractors]) |
4225 | +[AC_ARG_ENABLE([dependency-tracking], [dnl |
4226 | +AS_HELP_STRING( |
4227 | + [--enable-dependency-tracking], |
4228 | + [do not reject slow dependency extractors]) |
4229 | +AS_HELP_STRING( |
4230 | + [--disable-dependency-tracking], |
4231 | + [speeds up one-time build])]) |
4232 | if test "x$enable_dependency_tracking" != xno; then |
4233 | am_depcomp="$ac_aux_dir/depcomp" |
4234 | AMDEPBACKSLASH='\' |
4235 | @@ -3135,20 +825,18 @@ |
4236 | |
4237 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
4238 | |
4239 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
4240 | -# Free Software Foundation, Inc. |
4241 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
4242 | # |
4243 | # This file is free software; the Free Software Foundation |
4244 | # gives unlimited permission to copy and/or distribute it, |
4245 | # with or without modifications, as long as this notice is preserved. |
4246 | |
4247 | -#serial 5 |
4248 | |
4249 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
4250 | # ------------------------------ |
4251 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
4252 | [{ |
4253 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
4254 | + # Older Autoconf quotes --file arguments for eval, but not when files |
4255 | # are listed without --file. Let's play safe and only enable the eval |
4256 | # if we detect the quoting. |
4257 | case $CONFIG_FILES in |
4258 | @@ -3161,7 +849,7 @@ |
4259 | # Strip MF so we end up with the name of the file. |
4260 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
4261 | # Check whether this is an Automake generated Makefile or not. |
4262 | - # We used to match only the files named `Makefile.in', but |
4263 | + # We used to match only the files named 'Makefile.in', but |
4264 | # some people rename them; so instead we look at the file content. |
4265 | # Grep'ing the first line is not enough: some people post-process |
4266 | # each Makefile.in and add a new line on top of each file to say so. |
4267 | @@ -3173,21 +861,19 @@ |
4268 | continue |
4269 | fi |
4270 | # Extract the definition of DEPDIR, am__include, and am__quote |
4271 | - # from the Makefile without running `make'. |
4272 | + # from the Makefile without running 'make'. |
4273 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
4274 | test -z "$DEPDIR" && continue |
4275 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
4276 | - test -z "am__include" && continue |
4277 | + test -z "$am__include" && continue |
4278 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
4279 | - # When using ansi2knr, U may be empty or an underscore; expand it |
4280 | - U=`sed -n 's/^U = //p' < "$mf"` |
4281 | # Find all dependency output files, they are included files with |
4282 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
4283 | # simplest approach to changing $(DEPDIR) to its actual value in the |
4284 | # expansion. |
4285 | for file in `sed -n " |
4286 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
4287 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
4288 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
4289 | # Make sure the directory exists. |
4290 | test -f "$dirpart/$file" && continue |
4291 | fdir=`AS_DIRNAME(["$file"])` |
4292 | @@ -3205,7 +891,7 @@ |
4293 | # This macro should only be invoked once -- use via AC_REQUIRE. |
4294 | # |
4295 | # This code is only required when automatic dependency tracking |
4296 | -# is enabled. FIXME. This creates each `.P' file that we will |
4297 | +# is enabled. FIXME. This creates each '.P' file that we will |
4298 | # need in order to bootstrap the dependency handling code. |
4299 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
4300 | [AC_CONFIG_COMMANDS([depfiles], |
4301 | @@ -3215,18 +901,21 @@ |
4302 | |
4303 | # Do all the work for Automake. -*- Autoconf -*- |
4304 | |
4305 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
4306 | -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
4307 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
4308 | # |
4309 | # This file is free software; the Free Software Foundation |
4310 | # gives unlimited permission to copy and/or distribute it, |
4311 | # with or without modifications, as long as this notice is preserved. |
4312 | |
4313 | -# serial 16 |
4314 | - |
4315 | # This macro actually does too much. Some checks are only needed if |
4316 | # your package does certain things. But this isn't really a big deal. |
4317 | |
4318 | +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
4319 | +m4_define([AC_PROG_CC], |
4320 | +m4_defn([AC_PROG_CC]) |
4321 | +[_AM_PROG_CC_C_O |
4322 | +]) |
4323 | + |
4324 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
4325 | # AM_INIT_AUTOMAKE([OPTIONS]) |
4326 | # ----------------------------------------------- |
4327 | @@ -3239,7 +928,7 @@ |
4328 | # arguments mandatory, and then we can depend on a new Autoconf |
4329 | # release and drop the old call support. |
4330 | AC_DEFUN([AM_INIT_AUTOMAKE], |
4331 | -[AC_PREREQ([2.62])dnl |
4332 | +[AC_PREREQ([2.65])dnl |
4333 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
4334 | dnl the ones we care about. |
4335 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
4336 | @@ -3268,31 +957,40 @@ |
4337 | # Define the identity of the package. |
4338 | dnl Distinguish between old-style and new-style calls. |
4339 | m4_ifval([$2], |
4340 | -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
4341 | +[AC_DIAGNOSE([obsolete], |
4342 | + [$0: two- and three-arguments forms are deprecated.]) |
4343 | +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
4344 | AC_SUBST([PACKAGE], [$1])dnl |
4345 | AC_SUBST([VERSION], [$2])], |
4346 | [_AM_SET_OPTIONS([$1])dnl |
4347 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
4348 | -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, |
4349 | +m4_if( |
4350 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
4351 | + [ok:ok],, |
4352 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
4353 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
4354 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
4355 | |
4356 | _AM_IF_OPTION([no-define],, |
4357 | -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) |
4358 | - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl |
4359 | +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
4360 | + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
4361 | |
4362 | # Some tools Automake needs. |
4363 | AC_REQUIRE([AM_SANITY_CHECK])dnl |
4364 | AC_REQUIRE([AC_ARG_PROGRAM])dnl |
4365 | -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) |
4366 | -AM_MISSING_PROG(AUTOCONF, autoconf) |
4367 | -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
4368 | -AM_MISSING_PROG(AUTOHEADER, autoheader) |
4369 | -AM_MISSING_PROG(MAKEINFO, makeinfo) |
4370 | +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
4371 | +AM_MISSING_PROG([AUTOCONF], [autoconf]) |
4372 | +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
4373 | +AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
4374 | +AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
4375 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
4376 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
4377 | -AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
4378 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
4379 | +# For better backward compatibility. To be removed once Automake 1.9.x |
4380 | +# dies out for good. For more background, see: |
4381 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
4382 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
4383 | +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
4384 | # We need awk for the "check" target. The system "awk" is bad on |
4385 | # some platforms. |
4386 | AC_REQUIRE([AC_PROG_AWK])dnl |
4387 | @@ -3303,34 +1001,78 @@ |
4388 | [_AM_PROG_TAR([v7])])]) |
4389 | _AM_IF_OPTION([no-dependencies],, |
4390 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
4391 | - [_AM_DEPENDENCIES(CC)], |
4392 | - [define([AC_PROG_CC], |
4393 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
4394 | + [_AM_DEPENDENCIES([CC])], |
4395 | + [m4_define([AC_PROG_CC], |
4396 | + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
4397 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
4398 | - [_AM_DEPENDENCIES(CXX)], |
4399 | - [define([AC_PROG_CXX], |
4400 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
4401 | + [_AM_DEPENDENCIES([CXX])], |
4402 | + [m4_define([AC_PROG_CXX], |
4403 | + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
4404 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
4405 | - [_AM_DEPENDENCIES(OBJC)], |
4406 | - [define([AC_PROG_OBJC], |
4407 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
4408 | + [_AM_DEPENDENCIES([OBJC])], |
4409 | + [m4_define([AC_PROG_OBJC], |
4410 | + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
4411 | +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
4412 | + [_AM_DEPENDENCIES([OBJCXX])], |
4413 | + [m4_define([AC_PROG_OBJCXX], |
4414 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
4415 | ]) |
4416 | -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
4417 | -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the |
4418 | -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
4419 | -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
4420 | +AC_REQUIRE([AM_SILENT_RULES])dnl |
4421 | +dnl The testsuite driver may need to know about EXEEXT, so add the |
4422 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
4423 | +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
4424 | AC_CONFIG_COMMANDS_PRE(dnl |
4425 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
4426 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
4427 | -]) |
4428 | - |
4429 | -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
4430 | + |
4431 | +# POSIX will say in a future version that running "rm -f" with no argument |
4432 | +# is OK; and we want to be able to make that assumption in our Makefile |
4433 | +# recipes. So use an aggressive probe to check that the usage we want is |
4434 | +# actually supported "in the wild" to an acceptable degree. |
4435 | +# See automake bug#10828. |
4436 | +# To make any issue more visible, cause the running configure to be aborted |
4437 | +# by default if the 'rm' program in use doesn't match our expectations; the |
4438 | +# user can still override this though. |
4439 | +if rm -f && rm -fr && rm -rf; then : OK; else |
4440 | + cat >&2 <<'END' |
4441 | +Oops! |
4442 | + |
4443 | +Your 'rm' program seems unable to run without file operands specified |
4444 | +on the command line, even when the '-f' option is present. This is contrary |
4445 | +to the behaviour of most rm programs out there, and not conforming with |
4446 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
4447 | + |
4448 | +Please tell bug-automake@gnu.org about your system, including the value |
4449 | +of your $PATH and any error possibly output before this message. This |
4450 | +can help us improve future automake versions. |
4451 | + |
4452 | +END |
4453 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
4454 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
4455 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
4456 | + echo >&2 |
4457 | + else |
4458 | + cat >&2 <<'END' |
4459 | +Aborting the configuration process, to ensure you take notice of the issue. |
4460 | + |
4461 | +You can download and install GNU coreutils to get an 'rm' implementation |
4462 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
4463 | + |
4464 | +If you want to complete the configuration process using your problematic |
4465 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
4466 | +to "yes", and re-run configure. |
4467 | + |
4468 | +END |
4469 | + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
4470 | + fi |
4471 | +fi]) |
4472 | + |
4473 | +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
4474 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
4475 | dnl mangled by Autoconf and run in a shell conditional statement. |
4476 | m4_define([_AC_COMPILER_EXEEXT], |
4477 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
4478 | |
4479 | - |
4480 | # When config.status generates a header, we must update the stamp-h file. |
4481 | # This file resides in the same directory as the config header |
4482 | # that is generated. The stamp files are numbered to have different names. |
4483 | @@ -3352,15 +1094,12 @@ |
4484 | done |
4485 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
4486 | |
4487 | -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
4488 | -# Inc. |
4489 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
4490 | # |
4491 | # This file is free software; the Free Software Foundation |
4492 | # gives unlimited permission to copy and/or distribute it, |
4493 | # with or without modifications, as long as this notice is preserved. |
4494 | |
4495 | -# serial 1 |
4496 | - |
4497 | # AM_PROG_INSTALL_SH |
4498 | # ------------------ |
4499 | # Define $install_sh. |
4500 | @@ -3374,16 +1113,14 @@ |
4501 | install_sh="\${SHELL} $am_aux_dir/install-sh" |
4502 | esac |
4503 | fi |
4504 | -AC_SUBST(install_sh)]) |
4505 | +AC_SUBST([install_sh])]) |
4506 | |
4507 | -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
4508 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
4509 | # |
4510 | # This file is free software; the Free Software Foundation |
4511 | # gives unlimited permission to copy and/or distribute it, |
4512 | # with or without modifications, as long as this notice is preserved. |
4513 | |
4514 | -# serial 2 |
4515 | - |
4516 | # Check whether the underlying file-system supports filenames |
4517 | # with a leading dot. For instance MS-DOS doesn't. |
4518 | AC_DEFUN([AM_SET_LEADING_DOT], |
4519 | @@ -3399,14 +1136,12 @@ |
4520 | |
4521 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
4522 | |
4523 | -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
4524 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
4525 | # |
4526 | # This file is free software; the Free Software Foundation |
4527 | # gives unlimited permission to copy and/or distribute it, |
4528 | # with or without modifications, as long as this notice is preserved. |
4529 | |
4530 | -# serial 4 |
4531 | - |
4532 | # AM_MAKE_INCLUDE() |
4533 | # ----------------- |
4534 | # Check to see how make treats includes. |
4535 | @@ -3424,7 +1159,7 @@ |
4536 | _am_result=none |
4537 | # First try GNU make style include. |
4538 | echo "include confinc" > confmf |
4539 | -# Ignore all kinds of additional output from `make'. |
4540 | +# Ignore all kinds of additional output from 'make'. |
4541 | case `$am_make -s -f confmf 2> /dev/null` in #( |
4542 | *the\ am__doit\ target*) |
4543 | am__include=include |
4544 | @@ -3451,15 +1186,12 @@ |
4545 | |
4546 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
4547 | |
4548 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
4549 | -# Free Software Foundation, Inc. |
4550 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
4551 | # |
4552 | # This file is free software; the Free Software Foundation |
4553 | # gives unlimited permission to copy and/or distribute it, |
4554 | # with or without modifications, as long as this notice is preserved. |
4555 | |
4556 | -# serial 6 |
4557 | - |
4558 | # AM_MISSING_PROG(NAME, PROGRAM) |
4559 | # ------------------------------ |
4560 | AC_DEFUN([AM_MISSING_PROG], |
4561 | @@ -3467,11 +1199,10 @@ |
4562 | $1=${$1-"${am_missing_run}$2"} |
4563 | AC_SUBST($1)]) |
4564 | |
4565 | - |
4566 | # AM_MISSING_HAS_RUN |
4567 | # ------------------ |
4568 | -# Define MISSING if not defined so far and test if it supports --run. |
4569 | -# If it does, set am_missing_run to use it, otherwise, to nothing. |
4570 | +# Define MISSING if not defined so far and test if it is modern enough. |
4571 | +# If it is, set am_missing_run to use it, otherwise, to nothing. |
4572 | AC_DEFUN([AM_MISSING_HAS_RUN], |
4573 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
4574 | AC_REQUIRE_AUX_FILE([missing])dnl |
4575 | @@ -3484,54 +1215,22 @@ |
4576 | esac |
4577 | fi |
4578 | # Use eval to expand $SHELL |
4579 | -if eval "$MISSING --run true"; then |
4580 | - am_missing_run="$MISSING --run " |
4581 | +if eval "$MISSING --is-lightweight"; then |
4582 | + am_missing_run="$MISSING " |
4583 | else |
4584 | am_missing_run= |
4585 | - AC_MSG_WARN([`missing' script is too old or missing]) |
4586 | + AC_MSG_WARN(['missing' script is too old or missing]) |
4587 | fi |
4588 | ]) |
4589 | |
4590 | -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
4591 | -# Inc. |
4592 | -# |
4593 | -# This file is free software; the Free Software Foundation |
4594 | -# gives unlimited permission to copy and/or distribute it, |
4595 | -# with or without modifications, as long as this notice is preserved. |
4596 | - |
4597 | -# serial 1 |
4598 | - |
4599 | -# AM_PROG_MKDIR_P |
4600 | -# --------------- |
4601 | -# Check for `mkdir -p'. |
4602 | -AC_DEFUN([AM_PROG_MKDIR_P], |
4603 | -[AC_PREREQ([2.60])dnl |
4604 | -AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
4605 | -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
4606 | -dnl while keeping a definition of mkdir_p for backward compatibility. |
4607 | -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
4608 | -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
4609 | -dnl Makefile.ins that do not define MKDIR_P, so we do our own |
4610 | -dnl adjustment using top_builddir (which is defined more often than |
4611 | -dnl MKDIR_P). |
4612 | -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
4613 | -case $mkdir_p in |
4614 | - [[\\/$]]* | ?:[[\\/]]*) ;; |
4615 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
4616 | -esac |
4617 | -]) |
4618 | - |
4619 | # Helper functions for option handling. -*- Autoconf -*- |
4620 | |
4621 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
4622 | -# Foundation, Inc. |
4623 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
4624 | # |
4625 | # This file is free software; the Free Software Foundation |
4626 | # gives unlimited permission to copy and/or distribute it, |
4627 | # with or without modifications, as long as this notice is preserved. |
4628 | |
4629 | -# serial 5 |
4630 | - |
4631 | # _AM_MANGLE_OPTION(NAME) |
4632 | # ----------------------- |
4633 | AC_DEFUN([_AM_MANGLE_OPTION], |
4634 | @@ -3541,7 +1240,7 @@ |
4635 | # -------------------- |
4636 | # Set option NAME. Presently that only means defining a flag for this option. |
4637 | AC_DEFUN([_AM_SET_OPTION], |
4638 | -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
4639 | +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
4640 | |
4641 | # _AM_SET_OPTIONS(OPTIONS) |
4642 | # ------------------------ |
4643 | @@ -3555,24 +1254,82 @@ |
4644 | AC_DEFUN([_AM_IF_OPTION], |
4645 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
4646 | |
4647 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
4648 | +# |
4649 | +# This file is free software; the Free Software Foundation |
4650 | +# gives unlimited permission to copy and/or distribute it, |
4651 | +# with or without modifications, as long as this notice is preserved. |
4652 | + |
4653 | +# _AM_PROG_CC_C_O |
4654 | +# --------------- |
4655 | +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
4656 | +# to automatically call this. |
4657 | +AC_DEFUN([_AM_PROG_CC_C_O], |
4658 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
4659 | +AC_REQUIRE_AUX_FILE([compile])dnl |
4660 | +AC_LANG_PUSH([C])dnl |
4661 | +AC_CACHE_CHECK( |
4662 | + [whether $CC understands -c and -o together], |
4663 | + [am_cv_prog_cc_c_o], |
4664 | + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
4665 | + # Make sure it works both with $CC and with simple cc. |
4666 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
4667 | + # compilers refuse to overwrite an existing .o file with -o, |
4668 | + # though they will create one. |
4669 | + am_cv_prog_cc_c_o=yes |
4670 | + for am_i in 1 2; do |
4671 | + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
4672 | + && test -f conftest2.$ac_objext; then |
4673 | + : OK |
4674 | + else |
4675 | + am_cv_prog_cc_c_o=no |
4676 | + break |
4677 | + fi |
4678 | + done |
4679 | + rm -f core conftest* |
4680 | + unset am_i]) |
4681 | +if test "$am_cv_prog_cc_c_o" != yes; then |
4682 | + # Losing compiler, so override with the script. |
4683 | + # FIXME: It is wrong to rewrite CC. |
4684 | + # But if we don't then we get into trouble of one sort or another. |
4685 | + # A longer-term fix would be to have automake use am__CC in this case, |
4686 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
4687 | + CC="$am_aux_dir/compile $CC" |
4688 | +fi |
4689 | +AC_LANG_POP([C])]) |
4690 | + |
4691 | +# For backward compatibility. |
4692 | +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
4693 | + |
4694 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
4695 | +# |
4696 | +# This file is free software; the Free Software Foundation |
4697 | +# gives unlimited permission to copy and/or distribute it, |
4698 | +# with or without modifications, as long as this notice is preserved. |
4699 | + |
4700 | +# AM_RUN_LOG(COMMAND) |
4701 | +# ------------------- |
4702 | +# Run COMMAND, save the exit status in ac_status, and log it. |
4703 | +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) |
4704 | +AC_DEFUN([AM_RUN_LOG], |
4705 | +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD |
4706 | + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD |
4707 | + ac_status=$? |
4708 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
4709 | + (exit $ac_status); }]) |
4710 | + |
4711 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
4712 | |
4713 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
4714 | -# Free Software Foundation, Inc. |
4715 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
4716 | # |
4717 | # This file is free software; the Free Software Foundation |
4718 | # gives unlimited permission to copy and/or distribute it, |
4719 | # with or without modifications, as long as this notice is preserved. |
4720 | |
4721 | -# serial 5 |
4722 | - |
4723 | # AM_SANITY_CHECK |
4724 | # --------------- |
4725 | AC_DEFUN([AM_SANITY_CHECK], |
4726 | [AC_MSG_CHECKING([whether build environment is sane]) |
4727 | -# Just in case |
4728 | -sleep 1 |
4729 | -echo timestamp > conftest.file |
4730 | # Reject unsafe characters in $srcdir or the absolute working directory |
4731 | # name. Accept space and tab only in the latter. |
4732 | am_lf=' |
4733 | @@ -3583,32 +1340,40 @@ |
4734 | esac |
4735 | case $srcdir in |
4736 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
4737 | - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; |
4738 | + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
4739 | esac |
4740 | |
4741 | -# Do `set' in a subshell so we don't clobber the current shell's |
4742 | +# Do 'set' in a subshell so we don't clobber the current shell's |
4743 | # arguments. Must try -L first in case configure is actually a |
4744 | # symlink; some systems play weird games with the mod time of symlinks |
4745 | # (eg FreeBSD returns the mod time of the symlink's containing |
4746 | # directory). |
4747 | if ( |
4748 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
4749 | - if test "$[*]" = "X"; then |
4750 | - # -L didn't work. |
4751 | - set X `ls -t "$srcdir/configure" conftest.file` |
4752 | - fi |
4753 | - rm -f conftest.file |
4754 | - if test "$[*]" != "X $srcdir/configure conftest.file" \ |
4755 | - && test "$[*]" != "X conftest.file $srcdir/configure"; then |
4756 | - |
4757 | - # If neither matched, then we have a broken ls. This can happen |
4758 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
4759 | - # broken ls alias from the environment. This has actually |
4760 | - # happened. Such a system could not be considered "sane". |
4761 | - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
4762 | -alias in your environment]) |
4763 | - fi |
4764 | - |
4765 | + am_has_slept=no |
4766 | + for am_try in 1 2; do |
4767 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
4768 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
4769 | + if test "$[*]" = "X"; then |
4770 | + # -L didn't work. |
4771 | + set X `ls -t "$srcdir/configure" conftest.file` |
4772 | + fi |
4773 | + if test "$[*]" != "X $srcdir/configure conftest.file" \ |
4774 | + && test "$[*]" != "X conftest.file $srcdir/configure"; then |
4775 | + |
4776 | + # If neither matched, then we have a broken ls. This can happen |
4777 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
4778 | + # broken ls alias from the environment. This has actually |
4779 | + # happened. Such a system could not be considered "sane". |
4780 | + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
4781 | + alias in your environment]) |
4782 | + fi |
4783 | + if test "$[2]" = conftest.file || test $am_try -eq 2; then |
4784 | + break |
4785 | + fi |
4786 | + # Just in case. |
4787 | + sleep 1 |
4788 | + am_has_slept=yes |
4789 | + done |
4790 | test "$[2]" = conftest.file |
4791 | ) |
4792 | then |
4793 | @@ -3618,31 +1383,50 @@ |
4794 | AC_MSG_ERROR([newly created file is older than distributed files! |
4795 | Check your system clock]) |
4796 | fi |
4797 | -AC_MSG_RESULT(yes)]) |
4798 | +AC_MSG_RESULT([yes]) |
4799 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
4800 | +# generated files are strictly newer. |
4801 | +am_sleep_pid= |
4802 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
4803 | + ( sleep 1 ) & |
4804 | + am_sleep_pid=$! |
4805 | +fi |
4806 | +AC_CONFIG_COMMANDS_PRE( |
4807 | + [AC_MSG_CHECKING([that generated files are newer than configure]) |
4808 | + if test -n "$am_sleep_pid"; then |
4809 | + # Hide warnings about reused PIDs. |
4810 | + wait $am_sleep_pid 2>/dev/null |
4811 | + fi |
4812 | + AC_MSG_RESULT([done])]) |
4813 | +rm -f conftest.file |
4814 | +]) |
4815 | |
4816 | -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. |
4817 | +# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
4818 | # |
4819 | # This file is free software; the Free Software Foundation |
4820 | # gives unlimited permission to copy and/or distribute it, |
4821 | # with or without modifications, as long as this notice is preserved. |
4822 | |
4823 | -# serial 2 |
4824 | - |
4825 | # AM_SILENT_RULES([DEFAULT]) |
4826 | # -------------------------- |
4827 | # Enable less verbose build rules; with the default set to DEFAULT |
4828 | -# (`yes' being less verbose, `no' or empty being verbose). |
4829 | +# ("yes" being less verbose, "no" or empty being verbose). |
4830 | AC_DEFUN([AM_SILENT_RULES], |
4831 | -[AC_ARG_ENABLE([silent-rules], |
4832 | -[ --enable-silent-rules less verbose build output (undo: `make V=1') |
4833 | - --disable-silent-rules verbose build output (undo: `make V=0')]) |
4834 | -case $enable_silent_rules in |
4835 | -yes) AM_DEFAULT_VERBOSITY=0;; |
4836 | -no) AM_DEFAULT_VERBOSITY=1;; |
4837 | -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
4838 | +[AC_ARG_ENABLE([silent-rules], [dnl |
4839 | +AS_HELP_STRING( |
4840 | + [--enable-silent-rules], |
4841 | + [less verbose build output (undo: "make V=1")]) |
4842 | +AS_HELP_STRING( |
4843 | + [--disable-silent-rules], |
4844 | + [verbose build output (undo: "make V=0")])dnl |
4845 | +]) |
4846 | +case $enable_silent_rules in @%:@ ((( |
4847 | + yes) AM_DEFAULT_VERBOSITY=0;; |
4848 | + no) AM_DEFAULT_VERBOSITY=1;; |
4849 | + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
4850 | esac |
4851 | dnl |
4852 | -dnl A few `make' implementations (e.g., NonStop OS and NextStep) |
4853 | +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) |
4854 | dnl do not support nested variable expansions. |
4855 | dnl See automake bug#9928 and bug#10237. |
4856 | am_make=${MAKE-make} |
4857 | @@ -3660,7 +1444,7 @@ |
4858 | am_cv_make_support_nested_variables=no |
4859 | fi]) |
4860 | if test $am_cv_make_support_nested_variables = yes; then |
4861 | - dnl Using `$V' instead of `$(V)' breaks IRIX make. |
4862 | + dnl Using '$V' instead of '$(V)' breaks IRIX make. |
4863 | AM_V='$(V)' |
4864 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
4865 | else |
4866 | @@ -3677,44 +1461,40 @@ |
4867 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
4868 | ]) |
4869 | |
4870 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
4871 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
4872 | # |
4873 | # This file is free software; the Free Software Foundation |
4874 | # gives unlimited permission to copy and/or distribute it, |
4875 | # with or without modifications, as long as this notice is preserved. |
4876 | |
4877 | -# serial 1 |
4878 | - |
4879 | # AM_PROG_INSTALL_STRIP |
4880 | # --------------------- |
4881 | -# One issue with vendor `install' (even GNU) is that you can't |
4882 | +# One issue with vendor 'install' (even GNU) is that you can't |
4883 | # specify the program used to strip binaries. This is especially |
4884 | # annoying in cross-compiling environments, where the build's strip |
4885 | # is unlikely to handle the host's binaries. |
4886 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
4887 | -# always use install-sh in `make install-strip', and initialize |
4888 | +# always use install-sh in "make install-strip", and initialize |
4889 | # STRIPPROG with the value of the STRIP variable (set by the user). |
4890 | AC_DEFUN([AM_PROG_INSTALL_STRIP], |
4891 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
4892 | -# Installed binaries are usually stripped using `strip' when the user |
4893 | -# run `make install-strip'. However `strip' might not be the right |
4894 | +# Installed binaries are usually stripped using 'strip' when the user |
4895 | +# run "make install-strip". However 'strip' might not be the right |
4896 | # tool to use in cross-compilation environments, therefore Automake |
4897 | -# will honor the `STRIP' environment variable to overrule this program. |
4898 | -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. |
4899 | +# will honor the 'STRIP' environment variable to overrule this program. |
4900 | +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
4901 | if test "$cross_compiling" != no; then |
4902 | AC_CHECK_TOOL([STRIP], [strip], :) |
4903 | fi |
4904 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
4905 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
4906 | |
4907 | -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
4908 | +# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
4909 | # |
4910 | # This file is free software; the Free Software Foundation |
4911 | # gives unlimited permission to copy and/or distribute it, |
4912 | # with or without modifications, as long as this notice is preserved. |
4913 | |
4914 | -# serial 3 |
4915 | - |
4916 | # _AM_SUBST_NOTMAKE(VARIABLE) |
4917 | # --------------------------- |
4918 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
4919 | @@ -3728,18 +1508,16 @@ |
4920 | |
4921 | # Check how to create a tarball. -*- Autoconf -*- |
4922 | |
4923 | -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
4924 | +# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
4925 | # |
4926 | # This file is free software; the Free Software Foundation |
4927 | # gives unlimited permission to copy and/or distribute it, |
4928 | # with or without modifications, as long as this notice is preserved. |
4929 | |
4930 | -# serial 2 |
4931 | - |
4932 | # _AM_PROG_TAR(FORMAT) |
4933 | # -------------------- |
4934 | # Check how to create a tarball in format FORMAT. |
4935 | -# FORMAT should be one of `v7', `ustar', or `pax'. |
4936 | +# FORMAT should be one of 'v7', 'ustar', or 'pax'. |
4937 | # |
4938 | # Substitute a variable $(am__tar) that is a command |
4939 | # writing to stdout a FORMAT-tarball containing the directory |
4940 | @@ -3749,107 +1527,153 @@ |
4941 | # Substitute a variable $(am__untar) that extract such |
4942 | # a tarball read from stdin. |
4943 | # $(am__untar) < result.tar |
4944 | +# |
4945 | AC_DEFUN([_AM_PROG_TAR], |
4946 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
4947 | # in the wild :-( We should find a proper way to deprecate it ... |
4948 | AC_SUBST([AMTAR], ['$${TAR-tar}']) |
4949 | + |
4950 | +# We'll loop over all known methods to create a tar archive until one works. |
4951 | +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
4952 | + |
4953 | m4_if([$1], [v7], |
4954 | - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
4955 | - [m4_case([$1], [ustar],, [pax],, |
4956 | - [m4_fatal([Unknown tar format])]) |
4957 | -AC_MSG_CHECKING([how to create a $1 tar archive]) |
4958 | -# Loop over all known methods to create a tar archive until one works. |
4959 | -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
4960 | -_am_tools=${am_cv_prog_tar_$1-$_am_tools} |
4961 | -# Do not fold the above two line into one, because Tru64 sh and |
4962 | -# Solaris sh will not grok spaces in the rhs of `-'. |
4963 | -for _am_tool in $_am_tools |
4964 | -do |
4965 | - case $_am_tool in |
4966 | - gnutar) |
4967 | - for _am_tar in tar gnutar gtar; |
4968 | - do |
4969 | - AM_RUN_LOG([$_am_tar --version]) && break |
4970 | - done |
4971 | - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
4972 | - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
4973 | - am__untar="$_am_tar -xf -" |
4974 | - ;; |
4975 | - plaintar) |
4976 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
4977 | - # ustar tarball either. |
4978 | - (tar --version) >/dev/null 2>&1 && continue |
4979 | - am__tar='tar chf - "$$tardir"' |
4980 | - am__tar_='tar chf - "$tardir"' |
4981 | - am__untar='tar xf -' |
4982 | - ;; |
4983 | - pax) |
4984 | - am__tar='pax -L -x $1 -w "$$tardir"' |
4985 | - am__tar_='pax -L -x $1 -w "$tardir"' |
4986 | - am__untar='pax -r' |
4987 | - ;; |
4988 | - cpio) |
4989 | - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
4990 | - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
4991 | - am__untar='cpio -i -H $1 -d' |
4992 | - ;; |
4993 | - none) |
4994 | - am__tar=false |
4995 | - am__tar_=false |
4996 | - am__untar=false |
4997 | - ;; |
4998 | - esac |
4999 | - |
5000 | - # If the value was cached, stop now. We just wanted to have am__tar |
The diff has been truncated for viewing.
Danke! Uploaded.