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