Merge lp:~noskcaj/ubuntu/vivid/hicolor-icon-theme/0.14 into lp:ubuntu/vivid/hicolor-icon-theme
- Vivid (15.04)
- 0.14
- Merge into vivid
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp:~noskcaj/ubuntu/vivid/hicolor-icon-theme/0.14 |
Merge into: | lp:ubuntu/vivid/hicolor-icon-theme |
Diff against target: |
3356 lines (+2836/-288) 12 files modified
Makefile.am (+23/-0) Makefile.in (+593/-38) aclocal.m4 (+754/-0) autogen.sh (+61/-0) configure (+665/-10) configure.ac (+2/-2) debian/changelog (+7/-0) debian/control (+2/-1) debian/control.in (+2/-1) debian/watch (+2/-2) install-sh (+510/-234) missing (+215/-0) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/vivid/hicolor-icon-theme/0.14 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+245453@code.launchpad.net |
Commit message
Description of the change
New upstream release. Better cross-building support + 512x512 icon directory added
To post a comment you must log in.
Unmerged revisions
- 17. By Jackson Doak
-
* New upstream release.
* debian/watch: Upstream now uses .xz
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'Makefile.am' | |||
2 | --- Makefile.am 1970-01-01 00:00:00 +0000 | |||
3 | +++ Makefile.am 2014-12-30 20:20:45 +0000 | |||
4 | @@ -0,0 +1,23 @@ | |||
5 | 1 | ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \ | ||
6 | 2 | 128x128 192x192 256x256 512x512 scalable | ||
7 | 3 | ICON_CONTEXTS = actions animations apps categories devices emblems emotes \ | ||
8 | 4 | filesystems intl mimetypes places status stock | ||
9 | 5 | STOCK_SUBS = chart code data form image io media navigation net object table text | ||
10 | 6 | |||
11 | 7 | themedir = $(datadir)/icons/hicolor | ||
12 | 8 | dist_theme_DATA = index.theme | ||
13 | 9 | |||
14 | 10 | EXTRA_DIST = COPYING README autogen.sh | ||
15 | 11 | |||
16 | 12 | install-data-hook: | ||
17 | 13 | mkdir -p $(DESTDIR)$(themedir) | ||
18 | 14 | for dir in $(ICON_SIZES); do \ | ||
19 | 15 | for ctxt in $(ICON_CONTEXTS); do \ | ||
20 | 16 | mkdir -p $(DESTDIR)$(themedir)/$$dir/$$ctxt; \ | ||
21 | 17 | if [ "$$ctxt" = "stock" ]; then \ | ||
22 | 18 | for sub in $(STOCK_SUBS); do \ | ||
23 | 19 | mkdir -p $(DESTDIR)$(themedir)/$$dir/$$ctxt/$$sub; \ | ||
24 | 20 | done \ | ||
25 | 21 | fi \ | ||
26 | 22 | done \ | ||
27 | 23 | done | ||
28 | 0 | 24 | ||
29 | === modified file 'Makefile.in' | |||
30 | --- Makefile.in 2010-09-08 19:52:22 +0000 | |||
31 | +++ Makefile.in 2014-12-30 20:20:45 +0000 | |||
32 | @@ -1,53 +1,608 @@ | |||
38 | 1 | PACKAGE = @PACKAGE_TARNAME@ | 1 | # Makefile.in generated by automake 1.14.1 from Makefile.am. |
39 | 2 | VERSION = @PACKAGE_VERSION@ | 2 | # @configure_input@ |
40 | 3 | prefix = @prefix@ | 3 | |
41 | 4 | datarootdir = @datarootdir@ | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
42 | 5 | datadir = @datadir@ | 5 | |
43 | 6 | # This Makefile.in is free software; the Free Software Foundation | ||
44 | 7 | # gives unlimited permission to copy and/or distribute it, | ||
45 | 8 | # with or without modifications, as long as this notice is preserved. | ||
46 | 9 | |||
47 | 10 | # This program is distributed in the hope that it will be useful, | ||
48 | 11 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
49 | 12 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
50 | 13 | # PARTICULAR PURPOSE. | ||
51 | 14 | |||
52 | 15 | @SET_MAKE@ | ||
53 | 16 | |||
54 | 17 | VPATH = @srcdir@ | ||
55 | 18 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | ||
56 | 19 | am__make_running_with_option = \ | ||
57 | 20 | case $${target_option-} in \ | ||
58 | 21 | ?) ;; \ | ||
59 | 22 | *) echo "am__make_running_with_option: internal error: invalid" \ | ||
60 | 23 | "target option '$${target_option-}' specified" >&2; \ | ||
61 | 24 | exit 1;; \ | ||
62 | 25 | esac; \ | ||
63 | 26 | has_opt=no; \ | ||
64 | 27 | sane_makeflags=$$MAKEFLAGS; \ | ||
65 | 28 | if $(am__is_gnu_make); then \ | ||
66 | 29 | sane_makeflags=$$MFLAGS; \ | ||
67 | 30 | else \ | ||
68 | 31 | case $$MAKEFLAGS in \ | ||
69 | 32 | *\\[\ \ ]*) \ | ||
70 | 33 | bs=\\; \ | ||
71 | 34 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | ||
72 | 35 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | ||
73 | 36 | esac; \ | ||
74 | 37 | fi; \ | ||
75 | 38 | skip_next=no; \ | ||
76 | 39 | strip_trailopt () \ | ||
77 | 40 | { \ | ||
78 | 41 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | ||
79 | 42 | }; \ | ||
80 | 43 | for flg in $$sane_makeflags; do \ | ||
81 | 44 | test $$skip_next = yes && { skip_next=no; continue; }; \ | ||
82 | 45 | case $$flg in \ | ||
83 | 46 | *=*|--*) continue;; \ | ||
84 | 47 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | ||
85 | 48 | -*I?*) strip_trailopt 'I';; \ | ||
86 | 49 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | ||
87 | 50 | -*O?*) strip_trailopt 'O';; \ | ||
88 | 51 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | ||
89 | 52 | -*l?*) strip_trailopt 'l';; \ | ||
90 | 53 | -[dEDm]) skip_next=yes;; \ | ||
91 | 54 | -[JT]) skip_next=yes;; \ | ||
92 | 55 | esac; \ | ||
93 | 56 | case $$flg in \ | ||
94 | 57 | *$$target_option*) has_opt=yes; break;; \ | ||
95 | 58 | esac; \ | ||
96 | 59 | done; \ | ||
97 | 60 | test $$has_opt = yes | ||
98 | 61 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | ||
99 | 62 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | ||
100 | 63 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
101 | 64 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
102 | 65 | pkglibdir = $(libdir)/@PACKAGE@ | ||
103 | 66 | pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
104 | 67 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
105 | 68 | install_sh_DATA = $(install_sh) -c -m 644 | ||
106 | 69 | install_sh_PROGRAM = $(install_sh) -c | ||
107 | 70 | install_sh_SCRIPT = $(install_sh) -c | ||
108 | 71 | INSTALL_HEADER = $(INSTALL_DATA) | ||
109 | 72 | transform = $(program_transform_name) | ||
110 | 73 | NORMAL_INSTALL = : | ||
111 | 74 | PRE_INSTALL = : | ||
112 | 75 | POST_INSTALL = : | ||
113 | 76 | NORMAL_UNINSTALL = : | ||
114 | 77 | PRE_UNINSTALL = : | ||
115 | 78 | POST_UNINSTALL = : | ||
116 | 79 | subdir = . | ||
117 | 80 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | ||
118 | 81 | $(top_srcdir)/configure $(am__configure_deps) \ | ||
119 | 82 | $(dist_theme_DATA) COPYING ChangeLog README install-sh missing | ||
120 | 83 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
121 | 84 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | ||
122 | 85 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
123 | 86 | $(ACLOCAL_M4) | ||
124 | 87 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | ||
125 | 88 | configure.lineno config.status.lineno | ||
126 | 89 | mkinstalldirs = $(install_sh) -d | ||
127 | 90 | CONFIG_CLEAN_FILES = | ||
128 | 91 | CONFIG_CLEAN_VPATH_FILES = | ||
129 | 92 | AM_V_P = $(am__v_P_@AM_V@) | ||
130 | 93 | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) | ||
131 | 94 | am__v_P_0 = false | ||
132 | 95 | am__v_P_1 = : | ||
133 | 96 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
134 | 97 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
135 | 98 | am__v_GEN_0 = @echo " GEN " $@; | ||
136 | 99 | am__v_GEN_1 = | ||
137 | 100 | AM_V_at = $(am__v_at_@AM_V@) | ||
138 | 101 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
139 | 102 | am__v_at_0 = @ | ||
140 | 103 | am__v_at_1 = | ||
141 | 104 | SOURCES = | ||
142 | 105 | DIST_SOURCES = | ||
143 | 106 | am__can_run_installinfo = \ | ||
144 | 107 | case $$AM_UPDATE_INFO_DIR in \ | ||
145 | 108 | n|no|NO) false;; \ | ||
146 | 109 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
147 | 110 | esac | ||
148 | 111 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
149 | 112 | am__vpath_adj = case $$p in \ | ||
150 | 113 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
151 | 114 | *) f=$$p;; \ | ||
152 | 115 | esac; | ||
153 | 116 | am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
154 | 117 | am__install_max = 40 | ||
155 | 118 | am__nobase_strip_setup = \ | ||
156 | 119 | srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
157 | 120 | am__nobase_strip = \ | ||
158 | 121 | for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
159 | 122 | am__nobase_list = $(am__nobase_strip_setup); \ | ||
160 | 123 | for p in $$list; do echo "$$p $$p"; done | \ | ||
161 | 124 | sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
162 | 125 | $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
163 | 126 | if (++n[$$2] == $(am__install_max)) \ | ||
164 | 127 | { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
165 | 128 | END { for (dir in files) print dir, files[dir] }' | ||
166 | 129 | am__base_list = \ | ||
167 | 130 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
168 | 131 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
169 | 132 | am__uninstall_files_from_dir = { \ | ||
170 | 133 | test -z "$$files" \ | ||
171 | 134 | || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
172 | 135 | || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
173 | 136 | $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
174 | 137 | } | ||
175 | 138 | am__installdirs = "$(DESTDIR)$(themedir)" | ||
176 | 139 | DATA = $(dist_theme_DATA) | ||
177 | 140 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) | ||
178 | 141 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
179 | 142 | distdir = $(PACKAGE)-$(VERSION) | ||
180 | 143 | top_distdir = $(distdir) | ||
181 | 144 | am__remove_distdir = \ | ||
182 | 145 | if test -d "$(distdir)"; then \ | ||
183 | 146 | find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ | ||
184 | 147 | && rm -rf "$(distdir)" \ | ||
185 | 148 | || { sleep 5 && rm -rf "$(distdir)"; }; \ | ||
186 | 149 | else :; fi | ||
187 | 150 | am__post_remove_distdir = $(am__remove_distdir) | ||
188 | 151 | GZIP_ENV = --best | ||
189 | 152 | DIST_ARCHIVES = $(distdir).tar.xz | ||
190 | 153 | DIST_TARGETS = dist-xz | ||
191 | 154 | distuninstallcheck_listfiles = find . -type f -print | ||
192 | 155 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | ||
193 | 156 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | ||
194 | 157 | distcleancheck_listfiles = find . -type f -print | ||
195 | 158 | ACLOCAL = @ACLOCAL@ | ||
196 | 159 | AMTAR = @AMTAR@ | ||
197 | 160 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
198 | 161 | AUTOCONF = @AUTOCONF@ | ||
199 | 162 | AUTOHEADER = @AUTOHEADER@ | ||
200 | 163 | AUTOMAKE = @AUTOMAKE@ | ||
201 | 164 | AWK = @AWK@ | ||
202 | 165 | CYGPATH_W = @CYGPATH_W@ | ||
203 | 166 | DEFS = @DEFS@ | ||
204 | 167 | ECHO_C = @ECHO_C@ | ||
205 | 168 | ECHO_N = @ECHO_N@ | ||
206 | 169 | ECHO_T = @ECHO_T@ | ||
207 | 6 | INSTALL = @INSTALL@ | 170 | INSTALL = @INSTALL@ |
208 | 7 | INSTALL_DATA = @INSTALL_DATA@ | 171 | INSTALL_DATA = @INSTALL_DATA@ |
213 | 8 | 172 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
214 | 9 | distdir = $(PACKAGE)-$(VERSION) | 173 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
215 | 10 | FILES = README Makefile.in configure.ac configure install-sh index.theme ChangeLog COPYING | 174 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
216 | 11 | 175 | LIBOBJS = @LIBOBJS@ | |
217 | 176 | LIBS = @LIBS@ | ||
218 | 177 | LTLIBOBJS = @LTLIBOBJS@ | ||
219 | 178 | MAKEINFO = @MAKEINFO@ | ||
220 | 179 | MKDIR_P = @MKDIR_P@ | ||
221 | 180 | PACKAGE = @PACKAGE@ | ||
222 | 181 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
223 | 182 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
224 | 183 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
225 | 184 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
226 | 185 | PACKAGE_URL = @PACKAGE_URL@ | ||
227 | 186 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
228 | 187 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
229 | 188 | SET_MAKE = @SET_MAKE@ | ||
230 | 189 | SHELL = @SHELL@ | ||
231 | 190 | STRIP = @STRIP@ | ||
232 | 191 | VERSION = @VERSION@ | ||
233 | 192 | abs_builddir = @abs_builddir@ | ||
234 | 193 | abs_srcdir = @abs_srcdir@ | ||
235 | 194 | abs_top_builddir = @abs_top_builddir@ | ||
236 | 195 | abs_top_srcdir = @abs_top_srcdir@ | ||
237 | 196 | am__leading_dot = @am__leading_dot@ | ||
238 | 197 | am__tar = @am__tar@ | ||
239 | 198 | am__untar = @am__untar@ | ||
240 | 199 | bindir = @bindir@ | ||
241 | 200 | build_alias = @build_alias@ | ||
242 | 201 | builddir = @builddir@ | ||
243 | 202 | datadir = @datadir@ | ||
244 | 203 | datarootdir = @datarootdir@ | ||
245 | 204 | docdir = @docdir@ | ||
246 | 205 | dvidir = @dvidir@ | ||
247 | 206 | exec_prefix = @exec_prefix@ | ||
248 | 207 | host_alias = @host_alias@ | ||
249 | 208 | htmldir = @htmldir@ | ||
250 | 209 | includedir = @includedir@ | ||
251 | 210 | infodir = @infodir@ | ||
252 | 211 | install_sh = @install_sh@ | ||
253 | 212 | libdir = @libdir@ | ||
254 | 213 | libexecdir = @libexecdir@ | ||
255 | 214 | localedir = @localedir@ | ||
256 | 215 | localstatedir = @localstatedir@ | ||
257 | 216 | mandir = @mandir@ | ||
258 | 217 | mkdir_p = @mkdir_p@ | ||
259 | 218 | oldincludedir = @oldincludedir@ | ||
260 | 219 | pdfdir = @pdfdir@ | ||
261 | 220 | prefix = @prefix@ | ||
262 | 221 | program_transform_name = @program_transform_name@ | ||
263 | 222 | psdir = @psdir@ | ||
264 | 223 | sbindir = @sbindir@ | ||
265 | 224 | sharedstatedir = @sharedstatedir@ | ||
266 | 225 | srcdir = @srcdir@ | ||
267 | 226 | sysconfdir = @sysconfdir@ | ||
268 | 227 | target_alias = @target_alias@ | ||
269 | 228 | top_build_prefix = @top_build_prefix@ | ||
270 | 229 | top_builddir = @top_builddir@ | ||
271 | 230 | top_srcdir = @top_srcdir@ | ||
272 | 12 | ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \ | 231 | ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \ |
275 | 13 | 128x128 192x192 256x256 scalable | 232 | 128x128 192x192 256x256 512x512 scalable |
276 | 14 | ICON_CONTEXTS = actions animations apps categories devices emblems emotes filesystems intl mimetypes places status stock | 233 | |
277 | 234 | ICON_CONTEXTS = actions animations apps categories devices emblems emotes \ | ||
278 | 235 | filesystems intl mimetypes places status stock | ||
279 | 236 | |||
280 | 15 | STOCK_SUBS = chart code data form image io media navigation net object table text | 237 | STOCK_SUBS = chart code data form image io media navigation net object table text |
281 | 238 | themedir = $(datadir)/icons/hicolor | ||
282 | 239 | dist_theme_DATA = index.theme | ||
283 | 240 | EXTRA_DIST = COPYING README autogen.sh | ||
284 | 241 | all: all-am | ||
285 | 16 | 242 | ||
287 | 17 | all: | 243 | .SUFFIXES: |
288 | 244 | am--refresh: Makefile | ||
289 | 18 | @: | 245 | @: |
294 | 19 | 246 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
295 | 20 | install: | 247 | @for dep in $?; do \ |
296 | 21 | mkdir -p $(DESTDIR)$(datadir)/icons/hicolor | 248 | case '$(am__configure_deps)' in \ |
297 | 22 | $(INSTALL_DATA) index.theme $(DESTDIR)$(datadir)/icons/hicolor | 249 | *$$dep*) \ |
298 | 250 | echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ | ||
299 | 251 | $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ | ||
300 | 252 | && exit 0; \ | ||
301 | 253 | exit 1;; \ | ||
302 | 254 | esac; \ | ||
303 | 255 | done; \ | ||
304 | 256 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ | ||
305 | 257 | $(am__cd) $(top_srcdir) && \ | ||
306 | 258 | $(AUTOMAKE) --foreign Makefile | ||
307 | 259 | .PRECIOUS: Makefile | ||
308 | 260 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
309 | 261 | @case '$?' in \ | ||
310 | 262 | *config.status*) \ | ||
311 | 263 | echo ' $(SHELL) ./config.status'; \ | ||
312 | 264 | $(SHELL) ./config.status;; \ | ||
313 | 265 | *) \ | ||
314 | 266 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | ||
315 | 267 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | ||
316 | 268 | esac; | ||
317 | 269 | |||
318 | 270 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
319 | 271 | $(SHELL) ./config.status --recheck | ||
320 | 272 | |||
321 | 273 | $(top_srcdir)/configure: $(am__configure_deps) | ||
322 | 274 | $(am__cd) $(srcdir) && $(AUTOCONF) | ||
323 | 275 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) | ||
324 | 276 | $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | ||
325 | 277 | $(am__aclocal_m4_deps): | ||
326 | 278 | install-dist_themeDATA: $(dist_theme_DATA) | ||
327 | 279 | @$(NORMAL_INSTALL) | ||
328 | 280 | @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ | ||
329 | 281 | if test -n "$$list"; then \ | ||
330 | 282 | echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ | ||
331 | 283 | $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ | ||
332 | 284 | fi; \ | ||
333 | 285 | for p in $$list; do \ | ||
334 | 286 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
335 | 287 | echo "$$d$$p"; \ | ||
336 | 288 | done | $(am__base_list) | \ | ||
337 | 289 | while read files; do \ | ||
338 | 290 | echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \ | ||
339 | 291 | $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \ | ||
340 | 292 | done | ||
341 | 293 | |||
342 | 294 | uninstall-dist_themeDATA: | ||
343 | 295 | @$(NORMAL_UNINSTALL) | ||
344 | 296 | @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \ | ||
345 | 297 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
346 | 298 | dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) | ||
347 | 299 | tags TAGS: | ||
348 | 300 | |||
349 | 301 | ctags CTAGS: | ||
350 | 302 | |||
351 | 303 | cscope cscopelist: | ||
352 | 304 | |||
353 | 305 | |||
354 | 306 | distdir: $(DISTFILES) | ||
355 | 307 | $(am__remove_distdir) | ||
356 | 308 | test -d "$(distdir)" || mkdir "$(distdir)" | ||
357 | 309 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
358 | 310 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
359 | 311 | list='$(DISTFILES)'; \ | ||
360 | 312 | dist_files=`for file in $$list; do echo $$file; done | \ | ||
361 | 313 | sed -e "s|^$$srcdirstrip/||;t" \ | ||
362 | 314 | -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | ||
363 | 315 | case $$dist_files in \ | ||
364 | 316 | */*) $(MKDIR_P) `echo "$$dist_files" | \ | ||
365 | 317 | sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | ||
366 | 318 | sort -u` ;; \ | ||
367 | 319 | esac; \ | ||
368 | 320 | for file in $$dist_files; do \ | ||
369 | 321 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
370 | 322 | if test -d $$d/$$file; then \ | ||
371 | 323 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
372 | 324 | if test -d "$(distdir)/$$file"; then \ | ||
373 | 325 | find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
374 | 326 | fi; \ | ||
375 | 327 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
376 | 328 | cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
377 | 329 | find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
378 | 330 | fi; \ | ||
379 | 331 | cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
380 | 332 | else \ | ||
381 | 333 | test -f "$(distdir)/$$file" \ | ||
382 | 334 | || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
383 | 335 | || exit 1; \ | ||
384 | 336 | fi; \ | ||
385 | 337 | done | ||
386 | 338 | -test -n "$(am__skip_mode_fix)" \ | ||
387 | 339 | || find "$(distdir)" -type d ! -perm -755 \ | ||
388 | 340 | -exec chmod u+rwx,go+rx {} \; -o \ | ||
389 | 341 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ | ||
390 | 342 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ | ||
391 | 343 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ | ||
392 | 344 | || chmod -R a+r "$(distdir)" | ||
393 | 345 | dist-gzip: distdir | ||
394 | 346 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | ||
395 | 347 | $(am__post_remove_distdir) | ||
396 | 348 | |||
397 | 349 | dist-bzip2: distdir | ||
398 | 350 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 | ||
399 | 351 | $(am__post_remove_distdir) | ||
400 | 352 | |||
401 | 353 | dist-lzip: distdir | ||
402 | 354 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz | ||
403 | 355 | $(am__post_remove_distdir) | ||
404 | 356 | dist-xz: distdir | ||
405 | 357 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz | ||
406 | 358 | $(am__post_remove_distdir) | ||
407 | 359 | |||
408 | 360 | dist-tarZ: distdir | ||
409 | 361 | @echo WARNING: "Support for shar distribution archives is" \ | ||
410 | 362 | "deprecated." >&2 | ||
411 | 363 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | ||
412 | 364 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | ||
413 | 365 | $(am__post_remove_distdir) | ||
414 | 366 | |||
415 | 367 | dist-shar: distdir | ||
416 | 368 | @echo WARNING: "Support for distribution archives compressed with" \ | ||
417 | 369 | "legacy program 'compress' is deprecated." >&2 | ||
418 | 370 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | ||
419 | 371 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz | ||
420 | 372 | $(am__post_remove_distdir) | ||
421 | 373 | |||
422 | 374 | dist-zip: distdir | ||
423 | 375 | -rm -f $(distdir).zip | ||
424 | 376 | zip -rq $(distdir).zip $(distdir) | ||
425 | 377 | $(am__post_remove_distdir) | ||
426 | 378 | |||
427 | 379 | dist dist-all: | ||
428 | 380 | $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' | ||
429 | 381 | $(am__post_remove_distdir) | ||
430 | 382 | |||
431 | 383 | # This target untars the dist file and tries a VPATH configuration. Then | ||
432 | 384 | # it guarantees that the distribution is self-contained by making another | ||
433 | 385 | # tarfile. | ||
434 | 386 | distcheck: dist | ||
435 | 387 | case '$(DIST_ARCHIVES)' in \ | ||
436 | 388 | *.tar.gz*) \ | ||
437 | 389 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ | ||
438 | 390 | *.tar.bz2*) \ | ||
439 | 391 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ | ||
440 | 392 | *.tar.lz*) \ | ||
441 | 393 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ | ||
442 | 394 | *.tar.xz*) \ | ||
443 | 395 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ | ||
444 | 396 | *.tar.Z*) \ | ||
445 | 397 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ | ||
446 | 398 | *.shar.gz*) \ | ||
447 | 399 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ | ||
448 | 400 | *.zip*) \ | ||
449 | 401 | unzip $(distdir).zip ;;\ | ||
450 | 402 | esac | ||
451 | 403 | chmod -R a-w $(distdir) | ||
452 | 404 | chmod u+w $(distdir) | ||
453 | 405 | mkdir $(distdir)/_build $(distdir)/_inst | ||
454 | 406 | chmod a-w $(distdir) | ||
455 | 407 | test -d $(distdir)/_build || exit 0; \ | ||
456 | 408 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ | ||
457 | 409 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ | ||
458 | 410 | && am__cwd=`pwd` \ | ||
459 | 411 | && $(am__cd) $(distdir)/_build \ | ||
460 | 412 | && ../configure \ | ||
461 | 413 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ | ||
462 | 414 | $(DISTCHECK_CONFIGURE_FLAGS) \ | ||
463 | 415 | --srcdir=.. --prefix="$$dc_install_base" \ | ||
464 | 416 | && $(MAKE) $(AM_MAKEFLAGS) \ | ||
465 | 417 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ | ||
466 | 418 | && $(MAKE) $(AM_MAKEFLAGS) check \ | ||
467 | 419 | && $(MAKE) $(AM_MAKEFLAGS) install \ | ||
468 | 420 | && $(MAKE) $(AM_MAKEFLAGS) installcheck \ | ||
469 | 421 | && $(MAKE) $(AM_MAKEFLAGS) uninstall \ | ||
470 | 422 | && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ | ||
471 | 423 | distuninstallcheck \ | ||
472 | 424 | && chmod -R a-w "$$dc_install_base" \ | ||
473 | 425 | && ({ \ | ||
474 | 426 | (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ | ||
475 | 427 | && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ | ||
476 | 428 | && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ | ||
477 | 429 | && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ | ||
478 | 430 | distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ | ||
479 | 431 | } || { rm -rf "$$dc_destdir"; exit 1; }) \ | ||
480 | 432 | && rm -rf "$$dc_destdir" \ | ||
481 | 433 | && $(MAKE) $(AM_MAKEFLAGS) dist \ | ||
482 | 434 | && rm -rf $(DIST_ARCHIVES) \ | ||
483 | 435 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ | ||
484 | 436 | && cd "$$am__cwd" \ | ||
485 | 437 | || exit 1 | ||
486 | 438 | $(am__post_remove_distdir) | ||
487 | 439 | @(echo "$(distdir) archives ready for distribution: "; \ | ||
488 | 440 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | ||
489 | 441 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | ||
490 | 442 | distuninstallcheck: | ||
491 | 443 | @test -n '$(distuninstallcheck_dir)' || { \ | ||
492 | 444 | echo 'ERROR: trying to run $@ with an empty' \ | ||
493 | 445 | '$$(distuninstallcheck_dir)' >&2; \ | ||
494 | 446 | exit 1; \ | ||
495 | 447 | }; \ | ||
496 | 448 | $(am__cd) '$(distuninstallcheck_dir)' || { \ | ||
497 | 449 | echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ | ||
498 | 450 | exit 1; \ | ||
499 | 451 | }; \ | ||
500 | 452 | test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ | ||
501 | 453 | || { echo "ERROR: files left after uninstall:" ; \ | ||
502 | 454 | if test -n "$(DESTDIR)"; then \ | ||
503 | 455 | echo " (check DESTDIR support)"; \ | ||
504 | 456 | fi ; \ | ||
505 | 457 | $(distuninstallcheck_listfiles) ; \ | ||
506 | 458 | exit 1; } >&2 | ||
507 | 459 | distcleancheck: distclean | ||
508 | 460 | @if test '$(srcdir)' = . ; then \ | ||
509 | 461 | echo "ERROR: distcleancheck can only run from a VPATH build" ; \ | ||
510 | 462 | exit 1 ; \ | ||
511 | 463 | fi | ||
512 | 464 | @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ | ||
513 | 465 | || { echo "ERROR: files left in build directory after distclean:" ; \ | ||
514 | 466 | $(distcleancheck_listfiles) ; \ | ||
515 | 467 | exit 1; } >&2 | ||
516 | 468 | check-am: all-am | ||
517 | 469 | check: check-am | ||
518 | 470 | all-am: Makefile $(DATA) | ||
519 | 471 | installdirs: | ||
520 | 472 | for dir in "$(DESTDIR)$(themedir)"; do \ | ||
521 | 473 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | ||
522 | 474 | done | ||
523 | 475 | install: install-am | ||
524 | 476 | install-exec: install-exec-am | ||
525 | 477 | install-data: install-data-am | ||
526 | 478 | uninstall: uninstall-am | ||
527 | 479 | |||
528 | 480 | install-am: all-am | ||
529 | 481 | @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am | ||
530 | 482 | |||
531 | 483 | installcheck: installcheck-am | ||
532 | 484 | install-strip: | ||
533 | 485 | if test -z '$(STRIP)'; then \ | ||
534 | 486 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
535 | 487 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
536 | 488 | install; \ | ||
537 | 489 | else \ | ||
538 | 490 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
539 | 491 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
540 | 492 | "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
541 | 493 | fi | ||
542 | 494 | mostlyclean-generic: | ||
543 | 495 | |||
544 | 496 | clean-generic: | ||
545 | 497 | |||
546 | 498 | distclean-generic: | ||
547 | 499 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
548 | 500 | -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
549 | 501 | |||
550 | 502 | maintainer-clean-generic: | ||
551 | 503 | @echo "This command is intended for maintainers to use" | ||
552 | 504 | @echo "it deletes files that may require special tools to rebuild." | ||
553 | 505 | clean: clean-am | ||
554 | 506 | |||
555 | 507 | clean-am: clean-generic mostlyclean-am | ||
556 | 508 | |||
557 | 509 | distclean: distclean-am | ||
558 | 510 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | ||
559 | 511 | -rm -f Makefile | ||
560 | 512 | distclean-am: clean-am distclean-generic | ||
561 | 513 | |||
562 | 514 | dvi: dvi-am | ||
563 | 515 | |||
564 | 516 | dvi-am: | ||
565 | 517 | |||
566 | 518 | html: html-am | ||
567 | 519 | |||
568 | 520 | html-am: | ||
569 | 521 | |||
570 | 522 | info: info-am | ||
571 | 523 | |||
572 | 524 | info-am: | ||
573 | 525 | |||
574 | 526 | install-data-am: install-dist_themeDATA | ||
575 | 527 | @$(NORMAL_INSTALL) | ||
576 | 528 | $(MAKE) $(AM_MAKEFLAGS) install-data-hook | ||
577 | 529 | install-dvi: install-dvi-am | ||
578 | 530 | |||
579 | 531 | install-dvi-am: | ||
580 | 532 | |||
581 | 533 | install-exec-am: | ||
582 | 534 | |||
583 | 535 | install-html: install-html-am | ||
584 | 536 | |||
585 | 537 | install-html-am: | ||
586 | 538 | |||
587 | 539 | install-info: install-info-am | ||
588 | 540 | |||
589 | 541 | install-info-am: | ||
590 | 542 | |||
591 | 543 | install-man: | ||
592 | 544 | |||
593 | 545 | install-pdf: install-pdf-am | ||
594 | 546 | |||
595 | 547 | install-pdf-am: | ||
596 | 548 | |||
597 | 549 | install-ps: install-ps-am | ||
598 | 550 | |||
599 | 551 | install-ps-am: | ||
600 | 552 | |||
601 | 553 | installcheck-am: | ||
602 | 554 | |||
603 | 555 | maintainer-clean: maintainer-clean-am | ||
604 | 556 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | ||
605 | 557 | -rm -rf $(top_srcdir)/autom4te.cache | ||
606 | 558 | -rm -f Makefile | ||
607 | 559 | maintainer-clean-am: distclean-am maintainer-clean-generic | ||
608 | 560 | |||
609 | 561 | mostlyclean: mostlyclean-am | ||
610 | 562 | |||
611 | 563 | mostlyclean-am: mostlyclean-generic | ||
612 | 564 | |||
613 | 565 | pdf: pdf-am | ||
614 | 566 | |||
615 | 567 | pdf-am: | ||
616 | 568 | |||
617 | 569 | ps: ps-am | ||
618 | 570 | |||
619 | 571 | ps-am: | ||
620 | 572 | |||
621 | 573 | uninstall-am: uninstall-dist_themeDATA | ||
622 | 574 | |||
623 | 575 | .MAKE: install-am install-data-am install-strip | ||
624 | 576 | |||
625 | 577 | .PHONY: all all-am am--refresh check check-am clean clean-generic \ | ||
626 | 578 | cscopelist-am ctags-am dist dist-all dist-bzip2 dist-gzip \ | ||
627 | 579 | dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ | ||
628 | 580 | distclean distclean-generic distcleancheck distdir \ | ||
629 | 581 | distuninstallcheck dvi dvi-am html html-am info info-am \ | ||
630 | 582 | install install-am install-data install-data-am \ | ||
631 | 583 | install-data-hook install-dist_themeDATA install-dvi \ | ||
632 | 584 | install-dvi-am install-exec install-exec-am install-html \ | ||
633 | 585 | install-html-am install-info install-info-am install-man \ | ||
634 | 586 | install-pdf install-pdf-am install-ps install-ps-am \ | ||
635 | 587 | install-strip installcheck installcheck-am installdirs \ | ||
636 | 588 | maintainer-clean maintainer-clean-generic mostlyclean \ | ||
637 | 589 | mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ | ||
638 | 590 | uninstall-am uninstall-dist_themeDATA | ||
639 | 591 | |||
640 | 592 | |||
641 | 593 | install-data-hook: | ||
642 | 594 | mkdir -p $(DESTDIR)$(themedir) | ||
643 | 23 | for dir in $(ICON_SIZES); do \ | 595 | for dir in $(ICON_SIZES); do \ |
644 | 24 | for ctxt in $(ICON_CONTEXTS); do \ | 596 | for ctxt in $(ICON_CONTEXTS); do \ |
646 | 25 | mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$dir/$$ctxt; \ | 597 | mkdir -p $(DESTDIR)$(themedir)/$$dir/$$ctxt; \ |
647 | 26 | if [ "$$ctxt" = "stock" ]; then \ | 598 | if [ "$$ctxt" = "stock" ]; then \ |
648 | 27 | for sub in $(STOCK_SUBS); do \ | 599 | for sub in $(STOCK_SUBS); do \ |
650 | 28 | mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$dir/$$ctxt/$$sub; \ | 600 | mkdir -p $(DESTDIR)$(themedir)/$$dir/$$ctxt/$$sub; \ |
651 | 29 | done \ | 601 | done \ |
652 | 30 | fi \ | 602 | fi \ |
653 | 31 | done \ | 603 | done \ |
654 | 32 | done | 604 | done |
655 | 33 | 605 | ||
676 | 34 | dist: | 606 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
677 | 35 | rm -rf $(distdir) | 607 | # Otherwise a system limit (for SysV at least) may be exceeded. |
678 | 36 | mkdir $(distdir) | 608 | .NOEXPORT: |
659 | 37 | cp $(FILES) $(distdir) | ||
660 | 38 | tar czvf $(distdir).tar.gz $(distdir) | ||
661 | 39 | rm -rf $(distdir) | ||
662 | 40 | |||
663 | 41 | tag: | ||
664 | 42 | cvs tag DEFAULT_ICON_THEME_`echo $(VERSION)|sed "s/\./_/"` | ||
665 | 43 | |||
666 | 44 | # cause rebuilds | ||
667 | 45 | Makefile: Makefile.in config.status | ||
668 | 46 | ./config.status Makefile | ||
669 | 47 | configure: configure.ac | ||
670 | 48 | autoconf | ||
671 | 49 | config.status: configure | ||
672 | 50 | ./config.status --recheck | ||
673 | 51 | |||
674 | 52 | .PHONY: all install dist tag | ||
675 | 53 | |||
679 | 54 | 609 | ||
680 | === added file 'aclocal.m4' | |||
681 | --- aclocal.m4 1970-01-01 00:00:00 +0000 | |||
682 | +++ aclocal.m4 2014-12-30 20:20:45 +0000 | |||
683 | @@ -0,0 +1,754 @@ | |||
684 | 1 | # generated automatically by aclocal 1.14.1 -*- Autoconf -*- | ||
685 | 2 | |||
686 | 3 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | ||
687 | 4 | |||
688 | 5 | # This file is free software; the Free Software Foundation | ||
689 | 6 | # gives unlimited permission to copy and/or distribute it, | ||
690 | 7 | # with or without modifications, as long as this notice is preserved. | ||
691 | 8 | |||
692 | 9 | # This program is distributed in the hope that it will be useful, | ||
693 | 10 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
694 | 11 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
695 | 12 | # PARTICULAR PURPOSE. | ||
696 | 13 | |||
697 | 14 | m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | ||
698 | 15 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
699 | 16 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
700 | 17 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, | ||
701 | 18 | [m4_warning([this file was generated for autoconf 2.69. | ||
702 | 19 | You have another version of autoconf. It may work, but is not guaranteed to. | ||
703 | 20 | If you have problems, you may need to regenerate the build system entirely. | ||
704 | 21 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | ||
705 | 22 | |||
706 | 23 | # Copyright (C) 2002-2013 Free Software Foundation, Inc. | ||
707 | 24 | # | ||
708 | 25 | # This file is free software; the Free Software Foundation | ||
709 | 26 | # gives unlimited permission to copy and/or distribute it, | ||
710 | 27 | # with or without modifications, as long as this notice is preserved. | ||
711 | 28 | |||
712 | 29 | # AM_AUTOMAKE_VERSION(VERSION) | ||
713 | 30 | # ---------------------------- | ||
714 | 31 | # Automake X.Y traces this macro to ensure aclocal.m4 has been | ||
715 | 32 | # generated from the m4 files accompanying Automake X.Y. | ||
716 | 33 | # (This private macro should not be called outside this file.) | ||
717 | 34 | AC_DEFUN([AM_AUTOMAKE_VERSION], | ||
718 | 35 | [am__api_version='1.14' | ||
719 | 36 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | ||
720 | 37 | dnl require some minimum version. Point them to the right macro. | ||
721 | 38 | m4_if([$1], [1.14.1], [], | ||
722 | 39 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | ||
723 | 40 | ]) | ||
724 | 41 | |||
725 | 42 | # _AM_AUTOCONF_VERSION(VERSION) | ||
726 | 43 | # ----------------------------- | ||
727 | 44 | # aclocal traces this macro to find the Autoconf version. | ||
728 | 45 | # This is a private macro too. Using m4_define simplifies | ||
729 | 46 | # the logic in aclocal, which can simply ignore this definition. | ||
730 | 47 | m4_define([_AM_AUTOCONF_VERSION], []) | ||
731 | 48 | |||
732 | 49 | # AM_SET_CURRENT_AUTOMAKE_VERSION | ||
733 | 50 | # ------------------------------- | ||
734 | 51 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | ||
735 | 52 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | ||
736 | 53 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | ||
737 | 54 | [AM_AUTOMAKE_VERSION([1.14.1])dnl | ||
738 | 55 | m4_ifndef([AC_AUTOCONF_VERSION], | ||
739 | 56 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
740 | 57 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | ||
741 | 58 | |||
742 | 59 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | ||
743 | 60 | |||
744 | 61 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | ||
745 | 62 | # | ||
746 | 63 | # This file is free software; the Free Software Foundation | ||
747 | 64 | # gives unlimited permission to copy and/or distribute it, | ||
748 | 65 | # with or without modifications, as long as this notice is preserved. | ||
749 | 66 | |||
750 | 67 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | ||
751 | 68 | # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to | ||
752 | 69 | # '$srcdir', '$srcdir/..', or '$srcdir/../..'. | ||
753 | 70 | # | ||
754 | 71 | # Of course, Automake must honor this variable whenever it calls a | ||
755 | 72 | # tool from the auxiliary directory. The problem is that $srcdir (and | ||
756 | 73 | # therefore $ac_aux_dir as well) can be either absolute or relative, | ||
757 | 74 | # depending on how configure is run. This is pretty annoying, since | ||
758 | 75 | # it makes $ac_aux_dir quite unusable in subdirectories: in the top | ||
759 | 76 | # source directory, any form will work fine, but in subdirectories a | ||
760 | 77 | # relative path needs to be adjusted first. | ||
761 | 78 | # | ||
762 | 79 | # $ac_aux_dir/missing | ||
763 | 80 | # fails when called from a subdirectory if $ac_aux_dir is relative | ||
764 | 81 | # $top_srcdir/$ac_aux_dir/missing | ||
765 | 82 | # fails if $ac_aux_dir is absolute, | ||
766 | 83 | # fails when called from a subdirectory in a VPATH build with | ||
767 | 84 | # a relative $ac_aux_dir | ||
768 | 85 | # | ||
769 | 86 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir | ||
770 | 87 | # are both prefixed by $srcdir. In an in-source build this is usually | ||
771 | 88 | # harmless because $srcdir is '.', but things will broke when you | ||
772 | 89 | # start a VPATH build or use an absolute $srcdir. | ||
773 | 90 | # | ||
774 | 91 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, | ||
775 | 92 | # iff we strip the leading $srcdir from $ac_aux_dir. That would be: | ||
776 | 93 | # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` | ||
777 | 94 | # and then we would define $MISSING as | ||
778 | 95 | # MISSING="\${SHELL} $am_aux_dir/missing" | ||
779 | 96 | # This will work as long as MISSING is not called from configure, because | ||
780 | 97 | # unfortunately $(top_srcdir) has no meaning in configure. | ||
781 | 98 | # However there are other variables, like CC, which are often used in | ||
782 | 99 | # configure, and could therefore not use this "fixed" $ac_aux_dir. | ||
783 | 100 | # | ||
784 | 101 | # Another solution, used here, is to always expand $ac_aux_dir to an | ||
785 | 102 | # absolute PATH. The drawback is that using absolute paths prevent a | ||
786 | 103 | # configured tree to be moved without reconfiguration. | ||
787 | 104 | |||
788 | 105 | AC_DEFUN([AM_AUX_DIR_EXPAND], | ||
789 | 106 | [dnl Rely on autoconf to set up CDPATH properly. | ||
790 | 107 | AC_PREREQ([2.50])dnl | ||
791 | 108 | # expand $ac_aux_dir to an absolute path | ||
792 | 109 | am_aux_dir=`cd $ac_aux_dir && pwd` | ||
793 | 110 | ]) | ||
794 | 111 | |||
795 | 112 | # Do all the work for Automake. -*- Autoconf -*- | ||
796 | 113 | |||
797 | 114 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | ||
798 | 115 | # | ||
799 | 116 | # This file is free software; the Free Software Foundation | ||
800 | 117 | # gives unlimited permission to copy and/or distribute it, | ||
801 | 118 | # with or without modifications, as long as this notice is preserved. | ||
802 | 119 | |||
803 | 120 | # This macro actually does too much. Some checks are only needed if | ||
804 | 121 | # your package does certain things. But this isn't really a big deal. | ||
805 | 122 | |||
806 | 123 | dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. | ||
807 | 124 | m4_define([AC_PROG_CC], | ||
808 | 125 | m4_defn([AC_PROG_CC]) | ||
809 | 126 | [_AM_PROG_CC_C_O | ||
810 | 127 | ]) | ||
811 | 128 | |||
812 | 129 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) | ||
813 | 130 | # AM_INIT_AUTOMAKE([OPTIONS]) | ||
814 | 131 | # ----------------------------------------------- | ||
815 | 132 | # The call with PACKAGE and VERSION arguments is the old style | ||
816 | 133 | # call (pre autoconf-2.50), which is being phased out. PACKAGE | ||
817 | 134 | # and VERSION should now be passed to AC_INIT and removed from | ||
818 | 135 | # the call to AM_INIT_AUTOMAKE. | ||
819 | 136 | # We support both call styles for the transition. After | ||
820 | 137 | # the next Automake release, Autoconf can make the AC_INIT | ||
821 | 138 | # arguments mandatory, and then we can depend on a new Autoconf | ||
822 | 139 | # release and drop the old call support. | ||
823 | 140 | AC_DEFUN([AM_INIT_AUTOMAKE], | ||
824 | 141 | [AC_PREREQ([2.65])dnl | ||
825 | 142 | dnl Autoconf wants to disallow AM_ names. We explicitly allow | ||
826 | 143 | dnl the ones we care about. | ||
827 | 144 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | ||
828 | 145 | AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl | ||
829 | 146 | AC_REQUIRE([AC_PROG_INSTALL])dnl | ||
830 | 147 | if test "`cd $srcdir && pwd`" != "`pwd`"; then | ||
831 | 148 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output | ||
832 | 149 | # is not polluted with repeated "-I." | ||
833 | 150 | AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl | ||
834 | 151 | # test to see if srcdir already configured | ||
835 | 152 | if test -f $srcdir/config.status; then | ||
836 | 153 | AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) | ||
837 | 154 | fi | ||
838 | 155 | fi | ||
839 | 156 | |||
840 | 157 | # test whether we have cygpath | ||
841 | 158 | if test -z "$CYGPATH_W"; then | ||
842 | 159 | if (cygpath --version) >/dev/null 2>/dev/null; then | ||
843 | 160 | CYGPATH_W='cygpath -w' | ||
844 | 161 | else | ||
845 | 162 | CYGPATH_W=echo | ||
846 | 163 | fi | ||
847 | 164 | fi | ||
848 | 165 | AC_SUBST([CYGPATH_W]) | ||
849 | 166 | |||
850 | 167 | # Define the identity of the package. | ||
851 | 168 | dnl Distinguish between old-style and new-style calls. | ||
852 | 169 | m4_ifval([$2], | ||
853 | 170 | [AC_DIAGNOSE([obsolete], | ||
854 | 171 | [$0: two- and three-arguments forms are deprecated.]) | ||
855 | 172 | m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | ||
856 | 173 | AC_SUBST([PACKAGE], [$1])dnl | ||
857 | 174 | AC_SUBST([VERSION], [$2])], | ||
858 | 175 | [_AM_SET_OPTIONS([$1])dnl | ||
859 | 176 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | ||
860 | 177 | m4_if( | ||
861 | 178 | m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | ||
862 | 179 | [ok:ok],, | ||
863 | 180 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | ||
864 | 181 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | ||
865 | 182 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl | ||
866 | 183 | |||
867 | 184 | _AM_IF_OPTION([no-define],, | ||
868 | 185 | [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) | ||
869 | 186 | AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl | ||
870 | 187 | |||
871 | 188 | # Some tools Automake needs. | ||
872 | 189 | AC_REQUIRE([AM_SANITY_CHECK])dnl | ||
873 | 190 | AC_REQUIRE([AC_ARG_PROGRAM])dnl | ||
874 | 191 | AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) | ||
875 | 192 | AM_MISSING_PROG([AUTOCONF], [autoconf]) | ||
876 | 193 | AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) | ||
877 | 194 | AM_MISSING_PROG([AUTOHEADER], [autoheader]) | ||
878 | 195 | AM_MISSING_PROG([MAKEINFO], [makeinfo]) | ||
879 | 196 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | ||
880 | 197 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | ||
881 | 198 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | ||
882 | 199 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
883 | 200 | # dies out for good. For more background, see: | ||
884 | 201 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
885 | 202 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
886 | 203 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | ||
887 | 204 | # We need awk for the "check" target. The system "awk" is bad on | ||
888 | 205 | # some platforms. | ||
889 | 206 | AC_REQUIRE([AC_PROG_AWK])dnl | ||
890 | 207 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | ||
891 | 208 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl | ||
892 | 209 | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], | ||
893 | 210 | [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], | ||
894 | 211 | [_AM_PROG_TAR([v7])])]) | ||
895 | 212 | _AM_IF_OPTION([no-dependencies],, | ||
896 | 213 | [AC_PROVIDE_IFELSE([AC_PROG_CC], | ||
897 | 214 | [_AM_DEPENDENCIES([CC])], | ||
898 | 215 | [m4_define([AC_PROG_CC], | ||
899 | 216 | m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl | ||
900 | 217 | AC_PROVIDE_IFELSE([AC_PROG_CXX], | ||
901 | 218 | [_AM_DEPENDENCIES([CXX])], | ||
902 | 219 | [m4_define([AC_PROG_CXX], | ||
903 | 220 | m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl | ||
904 | 221 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], | ||
905 | 222 | [_AM_DEPENDENCIES([OBJC])], | ||
906 | 223 | [m4_define([AC_PROG_OBJC], | ||
907 | 224 | m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl | ||
908 | 225 | AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], | ||
909 | 226 | [_AM_DEPENDENCIES([OBJCXX])], | ||
910 | 227 | [m4_define([AC_PROG_OBJCXX], | ||
911 | 228 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl | ||
912 | 229 | ]) | ||
913 | 230 | AC_REQUIRE([AM_SILENT_RULES])dnl | ||
914 | 231 | dnl The testsuite driver may need to know about EXEEXT, so add the | ||
915 | 232 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This | ||
916 | 233 | dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. | ||
917 | 234 | AC_CONFIG_COMMANDS_PRE(dnl | ||
918 | 235 | [m4_provide_if([_AM_COMPILER_EXEEXT], | ||
919 | 236 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | ||
920 | 237 | |||
921 | 238 | # POSIX will say in a future version that running "rm -f" with no argument | ||
922 | 239 | # is OK; and we want to be able to make that assumption in our Makefile | ||
923 | 240 | # recipes. So use an aggressive probe to check that the usage we want is | ||
924 | 241 | # actually supported "in the wild" to an acceptable degree. | ||
925 | 242 | # See automake bug#10828. | ||
926 | 243 | # To make any issue more visible, cause the running configure to be aborted | ||
927 | 244 | # by default if the 'rm' program in use doesn't match our expectations; the | ||
928 | 245 | # user can still override this though. | ||
929 | 246 | if rm -f && rm -fr && rm -rf; then : OK; else | ||
930 | 247 | cat >&2 <<'END' | ||
931 | 248 | Oops! | ||
932 | 249 | |||
933 | 250 | Your 'rm' program seems unable to run without file operands specified | ||
934 | 251 | on the command line, even when the '-f' option is present. This is contrary | ||
935 | 252 | to the behaviour of most rm programs out there, and not conforming with | ||
936 | 253 | the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> | ||
937 | 254 | |||
938 | 255 | Please tell bug-automake@gnu.org about your system, including the value | ||
939 | 256 | of your $PATH and any error possibly output before this message. This | ||
940 | 257 | can help us improve future automake versions. | ||
941 | 258 | |||
942 | 259 | END | ||
943 | 260 | if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then | ||
944 | 261 | echo 'Configuration will proceed anyway, since you have set the' >&2 | ||
945 | 262 | echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 | ||
946 | 263 | echo >&2 | ||
947 | 264 | else | ||
948 | 265 | cat >&2 <<'END' | ||
949 | 266 | Aborting the configuration process, to ensure you take notice of the issue. | ||
950 | 267 | |||
951 | 268 | You can download and install GNU coreutils to get an 'rm' implementation | ||
952 | 269 | that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
953 | 270 | |||
954 | 271 | If you want to complete the configuration process using your problematic | ||
955 | 272 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
956 | 273 | to "yes", and re-run configure. | ||
957 | 274 | |||
958 | 275 | END | ||
959 | 276 | AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) | ||
960 | 277 | fi | ||
961 | 278 | fi]) | ||
962 | 279 | |||
963 | 280 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | ||
964 | 281 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | ||
965 | 282 | dnl mangled by Autoconf and run in a shell conditional statement. | ||
966 | 283 | m4_define([_AC_COMPILER_EXEEXT], | ||
967 | 284 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | ||
968 | 285 | |||
969 | 286 | # When config.status generates a header, we must update the stamp-h file. | ||
970 | 287 | # This file resides in the same directory as the config header | ||
971 | 288 | # that is generated. The stamp files are numbered to have different names. | ||
972 | 289 | |||
973 | 290 | # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the | ||
974 | 291 | # loop where config.status creates the headers, so we can generate | ||
975 | 292 | # our stamp files there. | ||
976 | 293 | AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], | ||
977 | 294 | [# Compute $1's index in $config_headers. | ||
978 | 295 | _am_arg=$1 | ||
979 | 296 | _am_stamp_count=1 | ||
980 | 297 | for _am_header in $config_headers :; do | ||
981 | 298 | case $_am_header in | ||
982 | 299 | $_am_arg | $_am_arg:* ) | ||
983 | 300 | break ;; | ||
984 | 301 | * ) | ||
985 | 302 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; | ||
986 | 303 | esac | ||
987 | 304 | done | ||
988 | 305 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | ||
989 | 306 | |||
990 | 307 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | ||
991 | 308 | # | ||
992 | 309 | # This file is free software; the Free Software Foundation | ||
993 | 310 | # gives unlimited permission to copy and/or distribute it, | ||
994 | 311 | # with or without modifications, as long as this notice is preserved. | ||
995 | 312 | |||
996 | 313 | # AM_PROG_INSTALL_SH | ||
997 | 314 | # ------------------ | ||
998 | 315 | # Define $install_sh. | ||
999 | 316 | AC_DEFUN([AM_PROG_INSTALL_SH], | ||
1000 | 317 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
1001 | 318 | if test x"${install_sh}" != xset; then | ||
1002 | 319 | case $am_aux_dir in | ||
1003 | 320 | *\ * | *\ *) | ||
1004 | 321 | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | ||
1005 | 322 | *) | ||
1006 | 323 | install_sh="\${SHELL} $am_aux_dir/install-sh" | ||
1007 | 324 | esac | ||
1008 | 325 | fi | ||
1009 | 326 | AC_SUBST([install_sh])]) | ||
1010 | 327 | |||
1011 | 328 | # Copyright (C) 2003-2013 Free Software Foundation, Inc. | ||
1012 | 329 | # | ||
1013 | 330 | # This file is free software; the Free Software Foundation | ||
1014 | 331 | # gives unlimited permission to copy and/or distribute it, | ||
1015 | 332 | # with or without modifications, as long as this notice is preserved. | ||
1016 | 333 | |||
1017 | 334 | # Check whether the underlying file-system supports filenames | ||
1018 | 335 | # with a leading dot. For instance MS-DOS doesn't. | ||
1019 | 336 | AC_DEFUN([AM_SET_LEADING_DOT], | ||
1020 | 337 | [rm -rf .tst 2>/dev/null | ||
1021 | 338 | mkdir .tst 2>/dev/null | ||
1022 | 339 | if test -d .tst; then | ||
1023 | 340 | am__leading_dot=. | ||
1024 | 341 | else | ||
1025 | 342 | am__leading_dot=_ | ||
1026 | 343 | fi | ||
1027 | 344 | rmdir .tst 2>/dev/null | ||
1028 | 345 | AC_SUBST([am__leading_dot])]) | ||
1029 | 346 | |||
1030 | 347 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | ||
1031 | 348 | |||
1032 | 349 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. | ||
1033 | 350 | # | ||
1034 | 351 | # This file is free software; the Free Software Foundation | ||
1035 | 352 | # gives unlimited permission to copy and/or distribute it, | ||
1036 | 353 | # with or without modifications, as long as this notice is preserved. | ||
1037 | 354 | |||
1038 | 355 | # AM_MISSING_PROG(NAME, PROGRAM) | ||
1039 | 356 | # ------------------------------ | ||
1040 | 357 | AC_DEFUN([AM_MISSING_PROG], | ||
1041 | 358 | [AC_REQUIRE([AM_MISSING_HAS_RUN]) | ||
1042 | 359 | $1=${$1-"${am_missing_run}$2"} | ||
1043 | 360 | AC_SUBST($1)]) | ||
1044 | 361 | |||
1045 | 362 | # AM_MISSING_HAS_RUN | ||
1046 | 363 | # ------------------ | ||
1047 | 364 | # Define MISSING if not defined so far and test if it is modern enough. | ||
1048 | 365 | # If it is, set am_missing_run to use it, otherwise, to nothing. | ||
1049 | 366 | AC_DEFUN([AM_MISSING_HAS_RUN], | ||
1050 | 367 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
1051 | 368 | AC_REQUIRE_AUX_FILE([missing])dnl | ||
1052 | 369 | if test x"${MISSING+set}" != xset; then | ||
1053 | 370 | case $am_aux_dir in | ||
1054 | 371 | *\ * | *\ *) | ||
1055 | 372 | MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
1056 | 373 | *) | ||
1057 | 374 | MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
1058 | 375 | esac | ||
1059 | 376 | fi | ||
1060 | 377 | # Use eval to expand $SHELL | ||
1061 | 378 | if eval "$MISSING --is-lightweight"; then | ||
1062 | 379 | am_missing_run="$MISSING " | ||
1063 | 380 | else | ||
1064 | 381 | am_missing_run= | ||
1065 | 382 | AC_MSG_WARN(['missing' script is too old or missing]) | ||
1066 | 383 | fi | ||
1067 | 384 | ]) | ||
1068 | 385 | |||
1069 | 386 | # Helper functions for option handling. -*- Autoconf -*- | ||
1070 | 387 | |||
1071 | 388 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | ||
1072 | 389 | # | ||
1073 | 390 | # This file is free software; the Free Software Foundation | ||
1074 | 391 | # gives unlimited permission to copy and/or distribute it, | ||
1075 | 392 | # with or without modifications, as long as this notice is preserved. | ||
1076 | 393 | |||
1077 | 394 | # _AM_MANGLE_OPTION(NAME) | ||
1078 | 395 | # ----------------------- | ||
1079 | 396 | AC_DEFUN([_AM_MANGLE_OPTION], | ||
1080 | 397 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | ||
1081 | 398 | |||
1082 | 399 | # _AM_SET_OPTION(NAME) | ||
1083 | 400 | # -------------------- | ||
1084 | 401 | # Set option NAME. Presently that only means defining a flag for this option. | ||
1085 | 402 | AC_DEFUN([_AM_SET_OPTION], | ||
1086 | 403 | [m4_define(_AM_MANGLE_OPTION([$1]), [1])]) | ||
1087 | 404 | |||
1088 | 405 | # _AM_SET_OPTIONS(OPTIONS) | ||
1089 | 406 | # ------------------------ | ||
1090 | 407 | # OPTIONS is a space-separated list of Automake options. | ||
1091 | 408 | AC_DEFUN([_AM_SET_OPTIONS], | ||
1092 | 409 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | ||
1093 | 410 | |||
1094 | 411 | # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) | ||
1095 | 412 | # ------------------------------------------- | ||
1096 | 413 | # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. | ||
1097 | 414 | AC_DEFUN([_AM_IF_OPTION], | ||
1098 | 415 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | ||
1099 | 416 | |||
1100 | 417 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | ||
1101 | 418 | # | ||
1102 | 419 | # This file is free software; the Free Software Foundation | ||
1103 | 420 | # gives unlimited permission to copy and/or distribute it, | ||
1104 | 421 | # with or without modifications, as long as this notice is preserved. | ||
1105 | 422 | |||
1106 | 423 | # AM_RUN_LOG(COMMAND) | ||
1107 | 424 | # ------------------- | ||
1108 | 425 | # Run COMMAND, save the exit status in ac_status, and log it. | ||
1109 | 426 | # (This has been adapted from Autoconf's _AC_RUN_LOG macro.) | ||
1110 | 427 | AC_DEFUN([AM_RUN_LOG], | ||
1111 | 428 | [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD | ||
1112 | 429 | ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD | ||
1113 | 430 | ac_status=$? | ||
1114 | 431 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | ||
1115 | 432 | (exit $ac_status); }]) | ||
1116 | 433 | |||
1117 | 434 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | ||
1118 | 435 | |||
1119 | 436 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | ||
1120 | 437 | # | ||
1121 | 438 | # This file is free software; the Free Software Foundation | ||
1122 | 439 | # gives unlimited permission to copy and/or distribute it, | ||
1123 | 440 | # with or without modifications, as long as this notice is preserved. | ||
1124 | 441 | |||
1125 | 442 | # AM_SANITY_CHECK | ||
1126 | 443 | # --------------- | ||
1127 | 444 | AC_DEFUN([AM_SANITY_CHECK], | ||
1128 | 445 | [AC_MSG_CHECKING([whether build environment is sane]) | ||
1129 | 446 | # Reject unsafe characters in $srcdir or the absolute working directory | ||
1130 | 447 | # name. Accept space and tab only in the latter. | ||
1131 | 448 | am_lf=' | ||
1132 | 449 | ' | ||
1133 | 450 | case `pwd` in | ||
1134 | 451 | *[[\\\"\#\$\&\'\`$am_lf]]*) | ||
1135 | 452 | AC_MSG_ERROR([unsafe absolute working directory name]);; | ||
1136 | 453 | esac | ||
1137 | 454 | case $srcdir in | ||
1138 | 455 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) | ||
1139 | 456 | AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; | ||
1140 | 457 | esac | ||
1141 | 458 | |||
1142 | 459 | # Do 'set' in a subshell so we don't clobber the current shell's | ||
1143 | 460 | # arguments. Must try -L first in case configure is actually a | ||
1144 | 461 | # symlink; some systems play weird games with the mod time of symlinks | ||
1145 | 462 | # (eg FreeBSD returns the mod time of the symlink's containing | ||
1146 | 463 | # directory). | ||
1147 | 464 | if ( | ||
1148 | 465 | am_has_slept=no | ||
1149 | 466 | for am_try in 1 2; do | ||
1150 | 467 | echo "timestamp, slept: $am_has_slept" > conftest.file | ||
1151 | 468 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | ||
1152 | 469 | if test "$[*]" = "X"; then | ||
1153 | 470 | # -L didn't work. | ||
1154 | 471 | set X `ls -t "$srcdir/configure" conftest.file` | ||
1155 | 472 | fi | ||
1156 | 473 | if test "$[*]" != "X $srcdir/configure conftest.file" \ | ||
1157 | 474 | && test "$[*]" != "X conftest.file $srcdir/configure"; then | ||
1158 | 475 | |||
1159 | 476 | # If neither matched, then we have a broken ls. This can happen | ||
1160 | 477 | # if, for instance, CONFIG_SHELL is bash and it inherits a | ||
1161 | 478 | # broken ls alias from the environment. This has actually | ||
1162 | 479 | # happened. Such a system could not be considered "sane". | ||
1163 | 480 | AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken | ||
1164 | 481 | alias in your environment]) | ||
1165 | 482 | fi | ||
1166 | 483 | if test "$[2]" = conftest.file || test $am_try -eq 2; then | ||
1167 | 484 | break | ||
1168 | 485 | fi | ||
1169 | 486 | # Just in case. | ||
1170 | 487 | sleep 1 | ||
1171 | 488 | am_has_slept=yes | ||
1172 | 489 | done | ||
1173 | 490 | test "$[2]" = conftest.file | ||
1174 | 491 | ) | ||
1175 | 492 | then | ||
1176 | 493 | # Ok. | ||
1177 | 494 | : | ||
1178 | 495 | else | ||
1179 | 496 | AC_MSG_ERROR([newly created file is older than distributed files! | ||
1180 | 497 | Check your system clock]) | ||
1181 | 498 | fi | ||
1182 | 499 | AC_MSG_RESULT([yes]) | ||
1183 | 500 | # If we didn't sleep, we still need to ensure time stamps of config.status and | ||
1184 | 501 | # generated files are strictly newer. | ||
1185 | 502 | am_sleep_pid= | ||
1186 | 503 | if grep 'slept: no' conftest.file >/dev/null 2>&1; then | ||
1187 | 504 | ( sleep 1 ) & | ||
1188 | 505 | am_sleep_pid=$! | ||
1189 | 506 | fi | ||
1190 | 507 | AC_CONFIG_COMMANDS_PRE( | ||
1191 | 508 | [AC_MSG_CHECKING([that generated files are newer than configure]) | ||
1192 | 509 | if test -n "$am_sleep_pid"; then | ||
1193 | 510 | # Hide warnings about reused PIDs. | ||
1194 | 511 | wait $am_sleep_pid 2>/dev/null | ||
1195 | 512 | fi | ||
1196 | 513 | AC_MSG_RESULT([done])]) | ||
1197 | 514 | rm -f conftest.file | ||
1198 | 515 | ]) | ||
1199 | 516 | |||
1200 | 517 | # Copyright (C) 2009-2013 Free Software Foundation, Inc. | ||
1201 | 518 | # | ||
1202 | 519 | # This file is free software; the Free Software Foundation | ||
1203 | 520 | # gives unlimited permission to copy and/or distribute it, | ||
1204 | 521 | # with or without modifications, as long as this notice is preserved. | ||
1205 | 522 | |||
1206 | 523 | # AM_SILENT_RULES([DEFAULT]) | ||
1207 | 524 | # -------------------------- | ||
1208 | 525 | # Enable less verbose build rules; with the default set to DEFAULT | ||
1209 | 526 | # ("yes" being less verbose, "no" or empty being verbose). | ||
1210 | 527 | AC_DEFUN([AM_SILENT_RULES], | ||
1211 | 528 | [AC_ARG_ENABLE([silent-rules], [dnl | ||
1212 | 529 | AS_HELP_STRING( | ||
1213 | 530 | [--enable-silent-rules], | ||
1214 | 531 | [less verbose build output (undo: "make V=1")]) | ||
1215 | 532 | AS_HELP_STRING( | ||
1216 | 533 | [--disable-silent-rules], | ||
1217 | 534 | [verbose build output (undo: "make V=0")])dnl | ||
1218 | 535 | ]) | ||
1219 | 536 | case $enable_silent_rules in @%:@ ((( | ||
1220 | 537 | yes) AM_DEFAULT_VERBOSITY=0;; | ||
1221 | 538 | no) AM_DEFAULT_VERBOSITY=1;; | ||
1222 | 539 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; | ||
1223 | 540 | esac | ||
1224 | 541 | dnl | ||
1225 | 542 | dnl A few 'make' implementations (e.g., NonStop OS and NextStep) | ||
1226 | 543 | dnl do not support nested variable expansions. | ||
1227 | 544 | dnl See automake bug#9928 and bug#10237. | ||
1228 | 545 | am_make=${MAKE-make} | ||
1229 | 546 | AC_CACHE_CHECK([whether $am_make supports nested variables], | ||
1230 | 547 | [am_cv_make_support_nested_variables], | ||
1231 | 548 | [if AS_ECHO([['TRUE=$(BAR$(V)) | ||
1232 | 549 | BAR0=false | ||
1233 | 550 | BAR1=true | ||
1234 | 551 | V=1 | ||
1235 | 552 | am__doit: | ||
1236 | 553 | @$(TRUE) | ||
1237 | 554 | .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then | ||
1238 | 555 | am_cv_make_support_nested_variables=yes | ||
1239 | 556 | else | ||
1240 | 557 | am_cv_make_support_nested_variables=no | ||
1241 | 558 | fi]) | ||
1242 | 559 | if test $am_cv_make_support_nested_variables = yes; then | ||
1243 | 560 | dnl Using '$V' instead of '$(V)' breaks IRIX make. | ||
1244 | 561 | AM_V='$(V)' | ||
1245 | 562 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
1246 | 563 | else | ||
1247 | 564 | AM_V=$AM_DEFAULT_VERBOSITY | ||
1248 | 565 | AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
1249 | 566 | fi | ||
1250 | 567 | AC_SUBST([AM_V])dnl | ||
1251 | 568 | AM_SUBST_NOTMAKE([AM_V])dnl | ||
1252 | 569 | AC_SUBST([AM_DEFAULT_V])dnl | ||
1253 | 570 | AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl | ||
1254 | 571 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl | ||
1255 | 572 | AM_BACKSLASH='\' | ||
1256 | 573 | AC_SUBST([AM_BACKSLASH])dnl | ||
1257 | 574 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | ||
1258 | 575 | ]) | ||
1259 | 576 | |||
1260 | 577 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | ||
1261 | 578 | # | ||
1262 | 579 | # This file is free software; the Free Software Foundation | ||
1263 | 580 | # gives unlimited permission to copy and/or distribute it, | ||
1264 | 581 | # with or without modifications, as long as this notice is preserved. | ||
1265 | 582 | |||
1266 | 583 | # AM_PROG_INSTALL_STRIP | ||
1267 | 584 | # --------------------- | ||
1268 | 585 | # One issue with vendor 'install' (even GNU) is that you can't | ||
1269 | 586 | # specify the program used to strip binaries. This is especially | ||
1270 | 587 | # annoying in cross-compiling environments, where the build's strip | ||
1271 | 588 | # is unlikely to handle the host's binaries. | ||
1272 | 589 | # Fortunately install-sh will honor a STRIPPROG variable, so we | ||
1273 | 590 | # always use install-sh in "make install-strip", and initialize | ||
1274 | 591 | # STRIPPROG with the value of the STRIP variable (set by the user). | ||
1275 | 592 | AC_DEFUN([AM_PROG_INSTALL_STRIP], | ||
1276 | 593 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | ||
1277 | 594 | # Installed binaries are usually stripped using 'strip' when the user | ||
1278 | 595 | # run "make install-strip". However 'strip' might not be the right | ||
1279 | 596 | # tool to use in cross-compilation environments, therefore Automake | ||
1280 | 597 | # will honor the 'STRIP' environment variable to overrule this program. | ||
1281 | 598 | dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. | ||
1282 | 599 | if test "$cross_compiling" != no; then | ||
1283 | 600 | AC_CHECK_TOOL([STRIP], [strip], :) | ||
1284 | 601 | fi | ||
1285 | 602 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
1286 | 603 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | ||
1287 | 604 | |||
1288 | 605 | # Copyright (C) 2006-2013 Free Software Foundation, Inc. | ||
1289 | 606 | # | ||
1290 | 607 | # This file is free software; the Free Software Foundation | ||
1291 | 608 | # gives unlimited permission to copy and/or distribute it, | ||
1292 | 609 | # with or without modifications, as long as this notice is preserved. | ||
1293 | 610 | |||
1294 | 611 | # _AM_SUBST_NOTMAKE(VARIABLE) | ||
1295 | 612 | # --------------------------- | ||
1296 | 613 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. | ||
1297 | 614 | # This macro is traced by Automake. | ||
1298 | 615 | AC_DEFUN([_AM_SUBST_NOTMAKE]) | ||
1299 | 616 | |||
1300 | 617 | # AM_SUBST_NOTMAKE(VARIABLE) | ||
1301 | 618 | # -------------------------- | ||
1302 | 619 | # Public sister of _AM_SUBST_NOTMAKE. | ||
1303 | 620 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
1304 | 621 | |||
1305 | 622 | # Check how to create a tarball. -*- Autoconf -*- | ||
1306 | 623 | |||
1307 | 624 | # Copyright (C) 2004-2013 Free Software Foundation, Inc. | ||
1308 | 625 | # | ||
1309 | 626 | # This file is free software; the Free Software Foundation | ||
1310 | 627 | # gives unlimited permission to copy and/or distribute it, | ||
1311 | 628 | # with or without modifications, as long as this notice is preserved. | ||
1312 | 629 | |||
1313 | 630 | # _AM_PROG_TAR(FORMAT) | ||
1314 | 631 | # -------------------- | ||
1315 | 632 | # Check how to create a tarball in format FORMAT. | ||
1316 | 633 | # FORMAT should be one of 'v7', 'ustar', or 'pax'. | ||
1317 | 634 | # | ||
1318 | 635 | # Substitute a variable $(am__tar) that is a command | ||
1319 | 636 | # writing to stdout a FORMAT-tarball containing the directory | ||
1320 | 637 | # $tardir. | ||
1321 | 638 | # tardir=directory && $(am__tar) > result.tar | ||
1322 | 639 | # | ||
1323 | 640 | # Substitute a variable $(am__untar) that extract such | ||
1324 | 641 | # a tarball read from stdin. | ||
1325 | 642 | # $(am__untar) < result.tar | ||
1326 | 643 | # | ||
1327 | 644 | AC_DEFUN([_AM_PROG_TAR], | ||
1328 | 645 | [# Always define AMTAR for backward compatibility. Yes, it's still used | ||
1329 | 646 | # in the wild :-( We should find a proper way to deprecate it ... | ||
1330 | 647 | AC_SUBST([AMTAR], ['$${TAR-tar}']) | ||
1331 | 648 | |||
1332 | 649 | # We'll loop over all known methods to create a tar archive until one works. | ||
1333 | 650 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | ||
1334 | 651 | |||
1335 | 652 | m4_if([$1], [v7], | ||
1336 | 653 | [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], | ||
1337 | 654 | |||
1338 | 655 | [m4_case([$1], | ||
1339 | 656 | [ustar], | ||
1340 | 657 | [# The POSIX 1988 'ustar' format is defined with fixed-size fields. | ||
1341 | 658 | # There is notably a 21 bits limit for the UID and the GID. In fact, | ||
1342 | 659 | # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 | ||
1343 | 660 | # and bug#13588). | ||
1344 | 661 | am_max_uid=2097151 # 2^21 - 1 | ||
1345 | 662 | am_max_gid=$am_max_uid | ||
1346 | 663 | # The $UID and $GID variables are not portable, so we need to resort | ||
1347 | 664 | # to the POSIX-mandated id(1) utility. Errors in the 'id' calls | ||
1348 | 665 | # below are definitely unexpected, so allow the users to see them | ||
1349 | 666 | # (that is, avoid stderr redirection). | ||
1350 | 667 | am_uid=`id -u || echo unknown` | ||
1351 | 668 | am_gid=`id -g || echo unknown` | ||
1352 | 669 | AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) | ||
1353 | 670 | if test $am_uid -le $am_max_uid; then | ||
1354 | 671 | AC_MSG_RESULT([yes]) | ||
1355 | 672 | else | ||
1356 | 673 | AC_MSG_RESULT([no]) | ||
1357 | 674 | _am_tools=none | ||
1358 | 675 | fi | ||
1359 | 676 | AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) | ||
1360 | 677 | if test $am_gid -le $am_max_gid; then | ||
1361 | 678 | AC_MSG_RESULT([yes]) | ||
1362 | 679 | else | ||
1363 | 680 | AC_MSG_RESULT([no]) | ||
1364 | 681 | _am_tools=none | ||
1365 | 682 | fi], | ||
1366 | 683 | |||
1367 | 684 | [pax], | ||
1368 | 685 | [], | ||
1369 | 686 | |||
1370 | 687 | [m4_fatal([Unknown tar format])]) | ||
1371 | 688 | |||
1372 | 689 | AC_MSG_CHECKING([how to create a $1 tar archive]) | ||
1373 | 690 | |||
1374 | 691 | # Go ahead even if we have the value already cached. We do so because we | ||
1375 | 692 | # need to set the values for the 'am__tar' and 'am__untar' variables. | ||
1376 | 693 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | ||
1377 | 694 | |||
1378 | 695 | for _am_tool in $_am_tools; do | ||
1379 | 696 | case $_am_tool in | ||
1380 | 697 | gnutar) | ||
1381 | 698 | for _am_tar in tar gnutar gtar; do | ||
1382 | 699 | AM_RUN_LOG([$_am_tar --version]) && break | ||
1383 | 700 | done | ||
1384 | 701 | am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' | ||
1385 | 702 | am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' | ||
1386 | 703 | am__untar="$_am_tar -xf -" | ||
1387 | 704 | ;; | ||
1388 | 705 | plaintar) | ||
1389 | 706 | # Must skip GNU tar: if it does not support --format= it doesn't create | ||
1390 | 707 | # ustar tarball either. | ||
1391 | 708 | (tar --version) >/dev/null 2>&1 && continue | ||
1392 | 709 | am__tar='tar chf - "$$tardir"' | ||
1393 | 710 | am__tar_='tar chf - "$tardir"' | ||
1394 | 711 | am__untar='tar xf -' | ||
1395 | 712 | ;; | ||
1396 | 713 | pax) | ||
1397 | 714 | am__tar='pax -L -x $1 -w "$$tardir"' | ||
1398 | 715 | am__tar_='pax -L -x $1 -w "$tardir"' | ||
1399 | 716 | am__untar='pax -r' | ||
1400 | 717 | ;; | ||
1401 | 718 | cpio) | ||
1402 | 719 | am__tar='find "$$tardir" -print | cpio -o -H $1 -L' | ||
1403 | 720 | am__tar_='find "$tardir" -print | cpio -o -H $1 -L' | ||
1404 | 721 | am__untar='cpio -i -H $1 -d' | ||
1405 | 722 | ;; | ||
1406 | 723 | none) | ||
1407 | 724 | am__tar=false | ||
1408 | 725 | am__tar_=false | ||
1409 | 726 | am__untar=false | ||
1410 | 727 | ;; | ||
1411 | 728 | esac | ||
1412 | 729 | |||
1413 | 730 | # If the value was cached, stop now. We just wanted to have am__tar | ||
1414 | 731 | # and am__untar set. | ||
1415 | 732 | test -n "${am_cv_prog_tar_$1}" && break | ||
1416 | 733 | |||
1417 | 734 | # tar/untar a dummy directory, and stop if the command works. | ||
1418 | 735 | rm -rf conftest.dir | ||
1419 | 736 | mkdir conftest.dir | ||
1420 | 737 | echo GrepMe > conftest.dir/file | ||
1421 | 738 | AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) | ||
1422 | 739 | rm -rf conftest.dir | ||
1423 | 740 | if test -s conftest.tar; then | ||
1424 | 741 | AM_RUN_LOG([$am__untar <conftest.tar]) | ||
1425 | 742 | AM_RUN_LOG([cat conftest.dir/file]) | ||
1426 | 743 | grep GrepMe conftest.dir/file >/dev/null 2>&1 && break | ||
1427 | 744 | fi | ||
1428 | 745 | done | ||
1429 | 746 | rm -rf conftest.dir | ||
1430 | 747 | |||
1431 | 748 | AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) | ||
1432 | 749 | AC_MSG_RESULT([$am_cv_prog_tar_$1])]) | ||
1433 | 750 | |||
1434 | 751 | AC_SUBST([am__tar]) | ||
1435 | 752 | AC_SUBST([am__untar]) | ||
1436 | 753 | ]) # _AM_PROG_TAR | ||
1437 | 754 | |||
1438 | 0 | 755 | ||
1439 | === added file 'autogen.sh' | |||
1440 | --- autogen.sh 1970-01-01 00:00:00 +0000 | |||
1441 | +++ autogen.sh 2014-12-30 20:20:45 +0000 | |||
1442 | @@ -0,0 +1,61 @@ | |||
1443 | 1 | #!/bin/sh | ||
1444 | 2 | # Run this to generate all the initial makefiles, etc. | ||
1445 | 3 | |||
1446 | 4 | srcdir=`dirname $0` | ||
1447 | 5 | test -z "$srcdir" && srcdir=. | ||
1448 | 6 | |||
1449 | 7 | ORIGDIR=`pwd` | ||
1450 | 8 | cd $srcdir | ||
1451 | 9 | |||
1452 | 10 | PROJECT=hicolor-icon-theme | ||
1453 | 11 | TEST_TYPE=-f | ||
1454 | 12 | FILE=index.theme | ||
1455 | 13 | |||
1456 | 14 | DIE=0 | ||
1457 | 15 | |||
1458 | 16 | (autoconf --version) < /dev/null > /dev/null 2>&1 || { | ||
1459 | 17 | echo | ||
1460 | 18 | echo "You must have autoconf installed to compile $PROJECT." | ||
1461 | 19 | echo "Download the appropriate package for your distribution," | ||
1462 | 20 | echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" | ||
1463 | 21 | DIE=1 | ||
1464 | 22 | } | ||
1465 | 23 | |||
1466 | 24 | if test "$DIE" -eq 1; then | ||
1467 | 25 | exit 1 | ||
1468 | 26 | fi | ||
1469 | 27 | |||
1470 | 28 | test $TEST_TYPE $FILE || { | ||
1471 | 29 | echo "You must run this script in the top-level $PROJECT directory" | ||
1472 | 30 | exit 1 | ||
1473 | 31 | } | ||
1474 | 32 | |||
1475 | 33 | if test -z "$*"; then | ||
1476 | 34 | echo "I am going to run ./configure with no arguments - if you wish " | ||
1477 | 35 | echo "to pass any to it, please specify them on the $0 command line." | ||
1478 | 36 | fi | ||
1479 | 37 | |||
1480 | 38 | autoreconf --force --install || echo "autoconf failed - version 2.5x is probably required" | ||
1481 | 39 | |||
1482 | 40 | cd $ORIGDIR | ||
1483 | 41 | |||
1484 | 42 | run_configure=true | ||
1485 | 43 | for arg in $*; do | ||
1486 | 44 | case $arg in | ||
1487 | 45 | --no-configure) | ||
1488 | 46 | run_configure=false | ||
1489 | 47 | ;; | ||
1490 | 48 | *) | ||
1491 | 49 | ;; | ||
1492 | 50 | esac | ||
1493 | 51 | done | ||
1494 | 52 | |||
1495 | 53 | if $run_configure; then | ||
1496 | 54 | $srcdir/configure --enable-maintainer-mode --config-cache "$@" | ||
1497 | 55 | echo | ||
1498 | 56 | echo "Now type 'make' to compile $PROJECT." | ||
1499 | 57 | else | ||
1500 | 58 | echo | ||
1501 | 59 | echo "Now run 'configure' and 'make' to compile $PROJECT." | ||
1502 | 60 | fi | ||
1503 | 61 | |||
1504 | 0 | 62 | ||
1505 | === modified file 'configure' | |||
1506 | --- configure 2013-12-29 10:37:45 +0000 | |||
1507 | +++ configure 2014-12-30 20:20:45 +0000 | |||
1508 | @@ -1,6 +1,6 @@ | |||
1509 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1510 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
1512 | 3 | # Generated by GNU Autoconf 2.69 for hicolor-icon-theme 0.13. | 3 | # Generated by GNU Autoconf 2.69 for hicolor-icon-theme 0.14. |
1513 | 4 | # | 4 | # |
1514 | 5 | # | 5 | # |
1515 | 6 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. | 6 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
1516 | @@ -576,13 +576,37 @@ | |||
1517 | 576 | # Identity of this package. | 576 | # Identity of this package. |
1518 | 577 | PACKAGE_NAME='hicolor-icon-theme' | 577 | PACKAGE_NAME='hicolor-icon-theme' |
1519 | 578 | PACKAGE_TARNAME='hicolor-icon-theme' | 578 | PACKAGE_TARNAME='hicolor-icon-theme' |
1522 | 579 | PACKAGE_VERSION='0.13' | 579 | PACKAGE_VERSION='0.14' |
1523 | 580 | PACKAGE_STRING='hicolor-icon-theme 0.13' | 580 | PACKAGE_STRING='hicolor-icon-theme 0.14' |
1524 | 581 | PACKAGE_BUGREPORT='' | 581 | PACKAGE_BUGREPORT='' |
1525 | 582 | PACKAGE_URL='' | 582 | PACKAGE_URL='' |
1526 | 583 | 583 | ||
1527 | 584 | ac_subst_vars='LTLIBOBJS | 584 | ac_subst_vars='LTLIBOBJS |
1528 | 585 | LIBOBJS | 585 | LIBOBJS |
1529 | 586 | AM_BACKSLASH | ||
1530 | 587 | AM_DEFAULT_VERBOSITY | ||
1531 | 588 | AM_DEFAULT_V | ||
1532 | 589 | AM_V | ||
1533 | 590 | am__untar | ||
1534 | 591 | am__tar | ||
1535 | 592 | AMTAR | ||
1536 | 593 | am__leading_dot | ||
1537 | 594 | SET_MAKE | ||
1538 | 595 | AWK | ||
1539 | 596 | mkdir_p | ||
1540 | 597 | MKDIR_P | ||
1541 | 598 | INSTALL_STRIP_PROGRAM | ||
1542 | 599 | STRIP | ||
1543 | 600 | install_sh | ||
1544 | 601 | MAKEINFO | ||
1545 | 602 | AUTOHEADER | ||
1546 | 603 | AUTOMAKE | ||
1547 | 604 | AUTOCONF | ||
1548 | 605 | ACLOCAL | ||
1549 | 606 | VERSION | ||
1550 | 607 | PACKAGE | ||
1551 | 608 | CYGPATH_W | ||
1552 | 609 | am__isrc | ||
1553 | 586 | INSTALL_DATA | 610 | INSTALL_DATA |
1554 | 587 | INSTALL_SCRIPT | 611 | INSTALL_SCRIPT |
1555 | 588 | INSTALL_PROGRAM | 612 | INSTALL_PROGRAM |
1556 | @@ -627,6 +651,7 @@ | |||
1557 | 627 | ac_subst_files='' | 651 | ac_subst_files='' |
1558 | 628 | ac_user_opts=' | 652 | ac_user_opts=' |
1559 | 629 | enable_option_checking | 653 | enable_option_checking |
1560 | 654 | enable_silent_rules | ||
1561 | 630 | ' | 655 | ' |
1562 | 631 | ac_precious_vars='build_alias | 656 | ac_precious_vars='build_alias |
1563 | 632 | host_alias | 657 | host_alias |
1564 | @@ -1171,7 +1196,7 @@ | |||
1565 | 1171 | # Omit some internal or obsolete options to make the list less imposing. | 1196 | # Omit some internal or obsolete options to make the list less imposing. |
1566 | 1172 | # This message is too long to be a string in the A/UX 3.1 sh. | 1197 | # This message is too long to be a string in the A/UX 3.1 sh. |
1567 | 1173 | cat <<_ACEOF | 1198 | cat <<_ACEOF |
1569 | 1174 | \`configure' configures hicolor-icon-theme 0.13 to adapt to many kinds of systems. | 1199 | \`configure' configures hicolor-icon-theme 0.14 to adapt to many kinds of systems. |
1570 | 1175 | 1200 | ||
1571 | 1176 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1201 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1572 | 1177 | 1202 | ||
1573 | @@ -1228,15 +1253,27 @@ | |||
1574 | 1228 | _ACEOF | 1253 | _ACEOF |
1575 | 1229 | 1254 | ||
1576 | 1230 | cat <<\_ACEOF | 1255 | cat <<\_ACEOF |
1577 | 1256 | |||
1578 | 1257 | Program names: | ||
1579 | 1258 | --program-prefix=PREFIX prepend PREFIX to installed program names | ||
1580 | 1259 | --program-suffix=SUFFIX append SUFFIX to installed program names | ||
1581 | 1260 | --program-transform-name=PROGRAM run sed PROGRAM on installed program names | ||
1582 | 1231 | _ACEOF | 1261 | _ACEOF |
1583 | 1232 | fi | 1262 | fi |
1584 | 1233 | 1263 | ||
1585 | 1234 | if test -n "$ac_init_help"; then | 1264 | if test -n "$ac_init_help"; then |
1586 | 1235 | case $ac_init_help in | 1265 | case $ac_init_help in |
1588 | 1236 | short | recursive ) echo "Configuration of hicolor-icon-theme 0.13:";; | 1266 | short | recursive ) echo "Configuration of hicolor-icon-theme 0.14:";; |
1589 | 1237 | esac | 1267 | esac |
1590 | 1238 | cat <<\_ACEOF | 1268 | cat <<\_ACEOF |
1591 | 1239 | 1269 | ||
1592 | 1270 | Optional Features: | ||
1593 | 1271 | --disable-option-checking ignore unrecognized --enable/--with options | ||
1594 | 1272 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | ||
1595 | 1273 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | ||
1596 | 1274 | --enable-silent-rules less verbose build output (undo: "make V=1") | ||
1597 | 1275 | --disable-silent-rules verbose build output (undo: "make V=0") | ||
1598 | 1276 | |||
1599 | 1240 | Report bugs to the package provider. | 1277 | Report bugs to the package provider. |
1600 | 1241 | _ACEOF | 1278 | _ACEOF |
1601 | 1242 | ac_status=$? | 1279 | ac_status=$? |
1602 | @@ -1300,7 +1337,7 @@ | |||
1603 | 1300 | test -n "$ac_init_help" && exit $ac_status | 1337 | test -n "$ac_init_help" && exit $ac_status |
1604 | 1301 | if $ac_init_version; then | 1338 | if $ac_init_version; then |
1605 | 1302 | cat <<\_ACEOF | 1339 | cat <<\_ACEOF |
1607 | 1303 | hicolor-icon-theme configure 0.13 | 1340 | hicolor-icon-theme configure 0.14 |
1608 | 1304 | generated by GNU Autoconf 2.69 | 1341 | generated by GNU Autoconf 2.69 |
1609 | 1305 | 1342 | ||
1610 | 1306 | Copyright (C) 2012 Free Software Foundation, Inc. | 1343 | Copyright (C) 2012 Free Software Foundation, Inc. |
1611 | @@ -1317,7 +1354,7 @@ | |||
1612 | 1317 | This file contains any messages produced by compilers while | 1354 | This file contains any messages produced by compilers while |
1613 | 1318 | running configure, to aid debugging if configure makes a mistake. | 1355 | running configure, to aid debugging if configure makes a mistake. |
1614 | 1319 | 1356 | ||
1616 | 1320 | It was created by hicolor-icon-theme $as_me 0.13, which was | 1357 | It was created by hicolor-icon-theme $as_me 0.14, which was |
1617 | 1321 | generated by GNU Autoconf 2.69. Invocation command line was | 1358 | generated by GNU Autoconf 2.69. Invocation command line was |
1618 | 1322 | 1359 | ||
1619 | 1323 | $ $0 $@ | 1360 | $ $0 $@ |
1620 | @@ -1665,6 +1702,7 @@ | |||
1621 | 1665 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 1702 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1622 | 1666 | 1703 | ||
1623 | 1667 | 1704 | ||
1624 | 1705 | am__api_version='1.14' | ||
1625 | 1668 | 1706 | ||
1626 | 1669 | ac_aux_dir= | 1707 | ac_aux_dir= |
1627 | 1670 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | 1708 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
1628 | @@ -1788,6 +1826,607 @@ | |||
1629 | 1788 | 1826 | ||
1630 | 1789 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | 1827 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
1631 | 1790 | 1828 | ||
1632 | 1829 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 | ||
1633 | 1830 | $as_echo_n "checking whether build environment is sane... " >&6; } | ||
1634 | 1831 | # Reject unsafe characters in $srcdir or the absolute working directory | ||
1635 | 1832 | # name. Accept space and tab only in the latter. | ||
1636 | 1833 | am_lf=' | ||
1637 | 1834 | ' | ||
1638 | 1835 | case `pwd` in | ||
1639 | 1836 | *[\\\"\#\$\&\'\`$am_lf]*) | ||
1640 | 1837 | as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; | ||
1641 | 1838 | esac | ||
1642 | 1839 | case $srcdir in | ||
1643 | 1840 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) | ||
1644 | 1841 | as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; | ||
1645 | 1842 | esac | ||
1646 | 1843 | |||
1647 | 1844 | # Do 'set' in a subshell so we don't clobber the current shell's | ||
1648 | 1845 | # arguments. Must try -L first in case configure is actually a | ||
1649 | 1846 | # symlink; some systems play weird games with the mod time of symlinks | ||
1650 | 1847 | # (eg FreeBSD returns the mod time of the symlink's containing | ||
1651 | 1848 | # directory). | ||
1652 | 1849 | if ( | ||
1653 | 1850 | am_has_slept=no | ||
1654 | 1851 | for am_try in 1 2; do | ||
1655 | 1852 | echo "timestamp, slept: $am_has_slept" > conftest.file | ||
1656 | 1853 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | ||
1657 | 1854 | if test "$*" = "X"; then | ||
1658 | 1855 | # -L didn't work. | ||
1659 | 1856 | set X `ls -t "$srcdir/configure" conftest.file` | ||
1660 | 1857 | fi | ||
1661 | 1858 | if test "$*" != "X $srcdir/configure conftest.file" \ | ||
1662 | 1859 | && test "$*" != "X conftest.file $srcdir/configure"; then | ||
1663 | 1860 | |||
1664 | 1861 | # If neither matched, then we have a broken ls. This can happen | ||
1665 | 1862 | # if, for instance, CONFIG_SHELL is bash and it inherits a | ||
1666 | 1863 | # broken ls alias from the environment. This has actually | ||
1667 | 1864 | # happened. Such a system could not be considered "sane". | ||
1668 | 1865 | as_fn_error $? "ls -t appears to fail. Make sure there is not a broken | ||
1669 | 1866 | alias in your environment" "$LINENO" 5 | ||
1670 | 1867 | fi | ||
1671 | 1868 | if test "$2" = conftest.file || test $am_try -eq 2; then | ||
1672 | 1869 | break | ||
1673 | 1870 | fi | ||
1674 | 1871 | # Just in case. | ||
1675 | 1872 | sleep 1 | ||
1676 | 1873 | am_has_slept=yes | ||
1677 | 1874 | done | ||
1678 | 1875 | test "$2" = conftest.file | ||
1679 | 1876 | ) | ||
1680 | 1877 | then | ||
1681 | 1878 | # Ok. | ||
1682 | 1879 | : | ||
1683 | 1880 | else | ||
1684 | 1881 | as_fn_error $? "newly created file is older than distributed files! | ||
1685 | 1882 | Check your system clock" "$LINENO" 5 | ||
1686 | 1883 | fi | ||
1687 | 1884 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
1688 | 1885 | $as_echo "yes" >&6; } | ||
1689 | 1886 | # If we didn't sleep, we still need to ensure time stamps of config.status and | ||
1690 | 1887 | # generated files are strictly newer. | ||
1691 | 1888 | am_sleep_pid= | ||
1692 | 1889 | if grep 'slept: no' conftest.file >/dev/null 2>&1; then | ||
1693 | 1890 | ( sleep 1 ) & | ||
1694 | 1891 | am_sleep_pid=$! | ||
1695 | 1892 | fi | ||
1696 | 1893 | |||
1697 | 1894 | rm -f conftest.file | ||
1698 | 1895 | |||
1699 | 1896 | test "$program_prefix" != NONE && | ||
1700 | 1897 | program_transform_name="s&^&$program_prefix&;$program_transform_name" | ||
1701 | 1898 | # Use a double $ so make ignores it. | ||
1702 | 1899 | test "$program_suffix" != NONE && | ||
1703 | 1900 | program_transform_name="s&\$&$program_suffix&;$program_transform_name" | ||
1704 | 1901 | # Double any \ or $. | ||
1705 | 1902 | # By default was `s,x,x', remove it if useless. | ||
1706 | 1903 | ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' | ||
1707 | 1904 | program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` | ||
1708 | 1905 | |||
1709 | 1906 | # expand $ac_aux_dir to an absolute path | ||
1710 | 1907 | am_aux_dir=`cd $ac_aux_dir && pwd` | ||
1711 | 1908 | |||
1712 | 1909 | if test x"${MISSING+set}" != xset; then | ||
1713 | 1910 | case $am_aux_dir in | ||
1714 | 1911 | *\ * | *\ *) | ||
1715 | 1912 | MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
1716 | 1913 | *) | ||
1717 | 1914 | MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
1718 | 1915 | esac | ||
1719 | 1916 | fi | ||
1720 | 1917 | # Use eval to expand $SHELL | ||
1721 | 1918 | if eval "$MISSING --is-lightweight"; then | ||
1722 | 1919 | am_missing_run="$MISSING " | ||
1723 | 1920 | else | ||
1724 | 1921 | am_missing_run= | ||
1725 | 1922 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 | ||
1726 | 1923 | $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} | ||
1727 | 1924 | fi | ||
1728 | 1925 | |||
1729 | 1926 | if test x"${install_sh}" != xset; then | ||
1730 | 1927 | case $am_aux_dir in | ||
1731 | 1928 | *\ * | *\ *) | ||
1732 | 1929 | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | ||
1733 | 1930 | *) | ||
1734 | 1931 | install_sh="\${SHELL} $am_aux_dir/install-sh" | ||
1735 | 1932 | esac | ||
1736 | 1933 | fi | ||
1737 | 1934 | |||
1738 | 1935 | # Installed binaries are usually stripped using 'strip' when the user | ||
1739 | 1936 | # run "make install-strip". However 'strip' might not be the right | ||
1740 | 1937 | # tool to use in cross-compilation environments, therefore Automake | ||
1741 | 1938 | # will honor the 'STRIP' environment variable to overrule this program. | ||
1742 | 1939 | if test "$cross_compiling" != no; then | ||
1743 | 1940 | if test -n "$ac_tool_prefix"; then | ||
1744 | 1941 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
1745 | 1942 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
1746 | 1943 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1747 | 1944 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1748 | 1945 | if ${ac_cv_prog_STRIP+:} false; then : | ||
1749 | 1946 | $as_echo_n "(cached) " >&6 | ||
1750 | 1947 | else | ||
1751 | 1948 | if test -n "$STRIP"; then | ||
1752 | 1949 | ac_cv_prog_STRIP="$STRIP" # Let the user override the test. | ||
1753 | 1950 | else | ||
1754 | 1951 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1755 | 1952 | for as_dir in $PATH | ||
1756 | 1953 | do | ||
1757 | 1954 | IFS=$as_save_IFS | ||
1758 | 1955 | test -z "$as_dir" && as_dir=. | ||
1759 | 1956 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1760 | 1957 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1761 | 1958 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | ||
1762 | 1959 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1763 | 1960 | break 2 | ||
1764 | 1961 | fi | ||
1765 | 1962 | done | ||
1766 | 1963 | done | ||
1767 | 1964 | IFS=$as_save_IFS | ||
1768 | 1965 | |||
1769 | 1966 | fi | ||
1770 | 1967 | fi | ||
1771 | 1968 | STRIP=$ac_cv_prog_STRIP | ||
1772 | 1969 | if test -n "$STRIP"; then | ||
1773 | 1970 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 | ||
1774 | 1971 | $as_echo "$STRIP" >&6; } | ||
1775 | 1972 | else | ||
1776 | 1973 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1777 | 1974 | $as_echo "no" >&6; } | ||
1778 | 1975 | fi | ||
1779 | 1976 | |||
1780 | 1977 | |||
1781 | 1978 | fi | ||
1782 | 1979 | if test -z "$ac_cv_prog_STRIP"; then | ||
1783 | 1980 | ac_ct_STRIP=$STRIP | ||
1784 | 1981 | # Extract the first word of "strip", so it can be a program name with args. | ||
1785 | 1982 | set dummy strip; ac_word=$2 | ||
1786 | 1983 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1787 | 1984 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1788 | 1985 | if ${ac_cv_prog_ac_ct_STRIP+:} false; then : | ||
1789 | 1986 | $as_echo_n "(cached) " >&6 | ||
1790 | 1987 | else | ||
1791 | 1988 | if test -n "$ac_ct_STRIP"; then | ||
1792 | 1989 | ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. | ||
1793 | 1990 | else | ||
1794 | 1991 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1795 | 1992 | for as_dir in $PATH | ||
1796 | 1993 | do | ||
1797 | 1994 | IFS=$as_save_IFS | ||
1798 | 1995 | test -z "$as_dir" && as_dir=. | ||
1799 | 1996 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1800 | 1997 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1801 | 1998 | ac_cv_prog_ac_ct_STRIP="strip" | ||
1802 | 1999 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1803 | 2000 | break 2 | ||
1804 | 2001 | fi | ||
1805 | 2002 | done | ||
1806 | 2003 | done | ||
1807 | 2004 | IFS=$as_save_IFS | ||
1808 | 2005 | |||
1809 | 2006 | fi | ||
1810 | 2007 | fi | ||
1811 | 2008 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | ||
1812 | 2009 | if test -n "$ac_ct_STRIP"; then | ||
1813 | 2010 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 | ||
1814 | 2011 | $as_echo "$ac_ct_STRIP" >&6; } | ||
1815 | 2012 | else | ||
1816 | 2013 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1817 | 2014 | $as_echo "no" >&6; } | ||
1818 | 2015 | fi | ||
1819 | 2016 | |||
1820 | 2017 | if test "x$ac_ct_STRIP" = x; then | ||
1821 | 2018 | STRIP=":" | ||
1822 | 2019 | else | ||
1823 | 2020 | case $cross_compiling:$ac_tool_warned in | ||
1824 | 2021 | yes:) | ||
1825 | 2022 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
1826 | 2023 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
1827 | 2024 | ac_tool_warned=yes ;; | ||
1828 | 2025 | esac | ||
1829 | 2026 | STRIP=$ac_ct_STRIP | ||
1830 | 2027 | fi | ||
1831 | 2028 | else | ||
1832 | 2029 | STRIP="$ac_cv_prog_STRIP" | ||
1833 | 2030 | fi | ||
1834 | 2031 | |||
1835 | 2032 | fi | ||
1836 | 2033 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | ||
1837 | 2034 | |||
1838 | 2035 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 | ||
1839 | 2036 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } | ||
1840 | 2037 | if test -z "$MKDIR_P"; then | ||
1841 | 2038 | if ${ac_cv_path_mkdir+:} false; then : | ||
1842 | 2039 | $as_echo_n "(cached) " >&6 | ||
1843 | 2040 | else | ||
1844 | 2041 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1845 | 2042 | for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin | ||
1846 | 2043 | do | ||
1847 | 2044 | IFS=$as_save_IFS | ||
1848 | 2045 | test -z "$as_dir" && as_dir=. | ||
1849 | 2046 | for ac_prog in mkdir gmkdir; do | ||
1850 | 2047 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1851 | 2048 | as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue | ||
1852 | 2049 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( | ||
1853 | 2050 | 'mkdir (GNU coreutils) '* | \ | ||
1854 | 2051 | 'mkdir (coreutils) '* | \ | ||
1855 | 2052 | 'mkdir (fileutils) '4.1*) | ||
1856 | 2053 | ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext | ||
1857 | 2054 | break 3;; | ||
1858 | 2055 | esac | ||
1859 | 2056 | done | ||
1860 | 2057 | done | ||
1861 | 2058 | done | ||
1862 | 2059 | IFS=$as_save_IFS | ||
1863 | 2060 | |||
1864 | 2061 | fi | ||
1865 | 2062 | |||
1866 | 2063 | test -d ./--version && rmdir ./--version | ||
1867 | 2064 | if test "${ac_cv_path_mkdir+set}" = set; then | ||
1868 | 2065 | MKDIR_P="$ac_cv_path_mkdir -p" | ||
1869 | 2066 | else | ||
1870 | 2067 | # As a last resort, use the slow shell script. Don't cache a | ||
1871 | 2068 | # value for MKDIR_P within a source directory, because that will | ||
1872 | 2069 | # break other packages using the cache if that directory is | ||
1873 | 2070 | # removed, or if the value is a relative name. | ||
1874 | 2071 | MKDIR_P="$ac_install_sh -d" | ||
1875 | 2072 | fi | ||
1876 | 2073 | fi | ||
1877 | 2074 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 | ||
1878 | 2075 | $as_echo "$MKDIR_P" >&6; } | ||
1879 | 2076 | |||
1880 | 2077 | for ac_prog in gawk mawk nawk awk | ||
1881 | 2078 | do | ||
1882 | 2079 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1883 | 2080 | set dummy $ac_prog; ac_word=$2 | ||
1884 | 2081 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
1885 | 2082 | $as_echo_n "checking for $ac_word... " >&6; } | ||
1886 | 2083 | if ${ac_cv_prog_AWK+:} false; then : | ||
1887 | 2084 | $as_echo_n "(cached) " >&6 | ||
1888 | 2085 | else | ||
1889 | 2086 | if test -n "$AWK"; then | ||
1890 | 2087 | ac_cv_prog_AWK="$AWK" # Let the user override the test. | ||
1891 | 2088 | else | ||
1892 | 2089 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1893 | 2090 | for as_dir in $PATH | ||
1894 | 2091 | do | ||
1895 | 2092 | IFS=$as_save_IFS | ||
1896 | 2093 | test -z "$as_dir" && as_dir=. | ||
1897 | 2094 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
1898 | 2095 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
1899 | 2096 | ac_cv_prog_AWK="$ac_prog" | ||
1900 | 2097 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
1901 | 2098 | break 2 | ||
1902 | 2099 | fi | ||
1903 | 2100 | done | ||
1904 | 2101 | done | ||
1905 | 2102 | IFS=$as_save_IFS | ||
1906 | 2103 | |||
1907 | 2104 | fi | ||
1908 | 2105 | fi | ||
1909 | 2106 | AWK=$ac_cv_prog_AWK | ||
1910 | 2107 | if test -n "$AWK"; then | ||
1911 | 2108 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 | ||
1912 | 2109 | $as_echo "$AWK" >&6; } | ||
1913 | 2110 | else | ||
1914 | 2111 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1915 | 2112 | $as_echo "no" >&6; } | ||
1916 | 2113 | fi | ||
1917 | 2114 | |||
1918 | 2115 | |||
1919 | 2116 | test -n "$AWK" && break | ||
1920 | 2117 | done | ||
1921 | 2118 | |||
1922 | 2119 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | ||
1923 | 2120 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } | ||
1924 | 2121 | set x ${MAKE-make} | ||
1925 | 2122 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | ||
1926 | 2123 | if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : | ||
1927 | 2124 | $as_echo_n "(cached) " >&6 | ||
1928 | 2125 | else | ||
1929 | 2126 | cat >conftest.make <<\_ACEOF | ||
1930 | 2127 | SHELL = /bin/sh | ||
1931 | 2128 | all: | ||
1932 | 2129 | @echo '@@@%%%=$(MAKE)=@@@%%%' | ||
1933 | 2130 | _ACEOF | ||
1934 | 2131 | # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. | ||
1935 | 2132 | case `${MAKE-make} -f conftest.make 2>/dev/null` in | ||
1936 | 2133 | *@@@%%%=?*=@@@%%%*) | ||
1937 | 2134 | eval ac_cv_prog_make_${ac_make}_set=yes;; | ||
1938 | 2135 | *) | ||
1939 | 2136 | eval ac_cv_prog_make_${ac_make}_set=no;; | ||
1940 | 2137 | esac | ||
1941 | 2138 | rm -f conftest.make | ||
1942 | 2139 | fi | ||
1943 | 2140 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | ||
1944 | 2141 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
1945 | 2142 | $as_echo "yes" >&6; } | ||
1946 | 2143 | SET_MAKE= | ||
1947 | 2144 | else | ||
1948 | 2145 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1949 | 2146 | $as_echo "no" >&6; } | ||
1950 | 2147 | SET_MAKE="MAKE=${MAKE-make}" | ||
1951 | 2148 | fi | ||
1952 | 2149 | |||
1953 | 2150 | rm -rf .tst 2>/dev/null | ||
1954 | 2151 | mkdir .tst 2>/dev/null | ||
1955 | 2152 | if test -d .tst; then | ||
1956 | 2153 | am__leading_dot=. | ||
1957 | 2154 | else | ||
1958 | 2155 | am__leading_dot=_ | ||
1959 | 2156 | fi | ||
1960 | 2157 | rmdir .tst 2>/dev/null | ||
1961 | 2158 | |||
1962 | 2159 | # Check whether --enable-silent-rules was given. | ||
1963 | 2160 | if test "${enable_silent_rules+set}" = set; then : | ||
1964 | 2161 | enableval=$enable_silent_rules; | ||
1965 | 2162 | fi | ||
1966 | 2163 | |||
1967 | 2164 | case $enable_silent_rules in # ((( | ||
1968 | 2165 | yes) AM_DEFAULT_VERBOSITY=0;; | ||
1969 | 2166 | no) AM_DEFAULT_VERBOSITY=1;; | ||
1970 | 2167 | *) AM_DEFAULT_VERBOSITY=1;; | ||
1971 | 2168 | esac | ||
1972 | 2169 | am_make=${MAKE-make} | ||
1973 | 2170 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 | ||
1974 | 2171 | $as_echo_n "checking whether $am_make supports nested variables... " >&6; } | ||
1975 | 2172 | if ${am_cv_make_support_nested_variables+:} false; then : | ||
1976 | 2173 | $as_echo_n "(cached) " >&6 | ||
1977 | 2174 | else | ||
1978 | 2175 | if $as_echo 'TRUE=$(BAR$(V)) | ||
1979 | 2176 | BAR0=false | ||
1980 | 2177 | BAR1=true | ||
1981 | 2178 | V=1 | ||
1982 | 2179 | am__doit: | ||
1983 | 2180 | @$(TRUE) | ||
1984 | 2181 | .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then | ||
1985 | 2182 | am_cv_make_support_nested_variables=yes | ||
1986 | 2183 | else | ||
1987 | 2184 | am_cv_make_support_nested_variables=no | ||
1988 | 2185 | fi | ||
1989 | 2186 | fi | ||
1990 | 2187 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 | ||
1991 | 2188 | $as_echo "$am_cv_make_support_nested_variables" >&6; } | ||
1992 | 2189 | if test $am_cv_make_support_nested_variables = yes; then | ||
1993 | 2190 | AM_V='$(V)' | ||
1994 | 2191 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
1995 | 2192 | else | ||
1996 | 2193 | AM_V=$AM_DEFAULT_VERBOSITY | ||
1997 | 2194 | AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
1998 | 2195 | fi | ||
1999 | 2196 | AM_BACKSLASH='\' | ||
2000 | 2197 | |||
2001 | 2198 | if test "`cd $srcdir && pwd`" != "`pwd`"; then | ||
2002 | 2199 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output | ||
2003 | 2200 | # is not polluted with repeated "-I." | ||
2004 | 2201 | am__isrc=' -I$(srcdir)' | ||
2005 | 2202 | # test to see if srcdir already configured | ||
2006 | 2203 | if test -f $srcdir/config.status; then | ||
2007 | 2204 | as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 | ||
2008 | 2205 | fi | ||
2009 | 2206 | fi | ||
2010 | 2207 | |||
2011 | 2208 | # test whether we have cygpath | ||
2012 | 2209 | if test -z "$CYGPATH_W"; then | ||
2013 | 2210 | if (cygpath --version) >/dev/null 2>/dev/null; then | ||
2014 | 2211 | CYGPATH_W='cygpath -w' | ||
2015 | 2212 | else | ||
2016 | 2213 | CYGPATH_W=echo | ||
2017 | 2214 | fi | ||
2018 | 2215 | fi | ||
2019 | 2216 | |||
2020 | 2217 | |||
2021 | 2218 | # Define the identity of the package. | ||
2022 | 2219 | PACKAGE='hicolor-icon-theme' | ||
2023 | 2220 | VERSION='0.14' | ||
2024 | 2221 | |||
2025 | 2222 | |||
2026 | 2223 | cat >>confdefs.h <<_ACEOF | ||
2027 | 2224 | #define PACKAGE "$PACKAGE" | ||
2028 | 2225 | _ACEOF | ||
2029 | 2226 | |||
2030 | 2227 | |||
2031 | 2228 | cat >>confdefs.h <<_ACEOF | ||
2032 | 2229 | #define VERSION "$VERSION" | ||
2033 | 2230 | _ACEOF | ||
2034 | 2231 | |||
2035 | 2232 | # Some tools Automake needs. | ||
2036 | 2233 | |||
2037 | 2234 | ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} | ||
2038 | 2235 | |||
2039 | 2236 | |||
2040 | 2237 | AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} | ||
2041 | 2238 | |||
2042 | 2239 | |||
2043 | 2240 | AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} | ||
2044 | 2241 | |||
2045 | 2242 | |||
2046 | 2243 | AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} | ||
2047 | 2244 | |||
2048 | 2245 | |||
2049 | 2246 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | ||
2050 | 2247 | |||
2051 | 2248 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
2052 | 2249 | # dies out for good. For more background, see: | ||
2053 | 2250 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
2054 | 2251 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
2055 | 2252 | mkdir_p='$(MKDIR_P)' | ||
2056 | 2253 | |||
2057 | 2254 | # We need awk for the "check" target. The system "awk" is bad on | ||
2058 | 2255 | # some platforms. | ||
2059 | 2256 | # Always define AMTAR for backward compatibility. Yes, it's still used | ||
2060 | 2257 | # in the wild :-( We should find a proper way to deprecate it ... | ||
2061 | 2258 | AMTAR='$${TAR-tar}' | ||
2062 | 2259 | |||
2063 | 2260 | |||
2064 | 2261 | # We'll loop over all known methods to create a tar archive until one works. | ||
2065 | 2262 | _am_tools='gnutar plaintar pax cpio none' | ||
2066 | 2263 | |||
2067 | 2264 | # The POSIX 1988 'ustar' format is defined with fixed-size fields. | ||
2068 | 2265 | # There is notably a 21 bits limit for the UID and the GID. In fact, | ||
2069 | 2266 | # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 | ||
2070 | 2267 | # and bug#13588). | ||
2071 | 2268 | am_max_uid=2097151 # 2^21 - 1 | ||
2072 | 2269 | am_max_gid=$am_max_uid | ||
2073 | 2270 | # The $UID and $GID variables are not portable, so we need to resort | ||
2074 | 2271 | # to the POSIX-mandated id(1) utility. Errors in the 'id' calls | ||
2075 | 2272 | # below are definitely unexpected, so allow the users to see them | ||
2076 | 2273 | # (that is, avoid stderr redirection). | ||
2077 | 2274 | am_uid=`id -u || echo unknown` | ||
2078 | 2275 | am_gid=`id -g || echo unknown` | ||
2079 | 2276 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 | ||
2080 | 2277 | $as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } | ||
2081 | 2278 | if test $am_uid -le $am_max_uid; then | ||
2082 | 2279 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
2083 | 2280 | $as_echo "yes" >&6; } | ||
2084 | 2281 | else | ||
2085 | 2282 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2086 | 2283 | $as_echo "no" >&6; } | ||
2087 | 2284 | _am_tools=none | ||
2088 | 2285 | fi | ||
2089 | 2286 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 | ||
2090 | 2287 | $as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } | ||
2091 | 2288 | if test $am_gid -le $am_max_gid; then | ||
2092 | 2289 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
2093 | 2290 | $as_echo "yes" >&6; } | ||
2094 | 2291 | else | ||
2095 | 2292 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2096 | 2293 | $as_echo "no" >&6; } | ||
2097 | 2294 | _am_tools=none | ||
2098 | 2295 | fi | ||
2099 | 2296 | |||
2100 | 2297 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 | ||
2101 | 2298 | $as_echo_n "checking how to create a ustar tar archive... " >&6; } | ||
2102 | 2299 | |||
2103 | 2300 | # Go ahead even if we have the value already cached. We do so because we | ||
2104 | 2301 | # need to set the values for the 'am__tar' and 'am__untar' variables. | ||
2105 | 2302 | _am_tools=${am_cv_prog_tar_ustar-$_am_tools} | ||
2106 | 2303 | |||
2107 | 2304 | for _am_tool in $_am_tools; do | ||
2108 | 2305 | case $_am_tool in | ||
2109 | 2306 | gnutar) | ||
2110 | 2307 | for _am_tar in tar gnutar gtar; do | ||
2111 | 2308 | { echo "$as_me:$LINENO: $_am_tar --version" >&5 | ||
2112 | 2309 | ($_am_tar --version) >&5 2>&5 | ||
2113 | 2310 | ac_status=$? | ||
2114 | 2311 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2115 | 2312 | (exit $ac_status); } && break | ||
2116 | 2313 | done | ||
2117 | 2314 | am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' | ||
2118 | 2315 | am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' | ||
2119 | 2316 | am__untar="$_am_tar -xf -" | ||
2120 | 2317 | ;; | ||
2121 | 2318 | plaintar) | ||
2122 | 2319 | # Must skip GNU tar: if it does not support --format= it doesn't create | ||
2123 | 2320 | # ustar tarball either. | ||
2124 | 2321 | (tar --version) >/dev/null 2>&1 && continue | ||
2125 | 2322 | am__tar='tar chf - "$$tardir"' | ||
2126 | 2323 | am__tar_='tar chf - "$tardir"' | ||
2127 | 2324 | am__untar='tar xf -' | ||
2128 | 2325 | ;; | ||
2129 | 2326 | pax) | ||
2130 | 2327 | am__tar='pax -L -x ustar -w "$$tardir"' | ||
2131 | 2328 | am__tar_='pax -L -x ustar -w "$tardir"' | ||
2132 | 2329 | am__untar='pax -r' | ||
2133 | 2330 | ;; | ||
2134 | 2331 | cpio) | ||
2135 | 2332 | am__tar='find "$$tardir" -print | cpio -o -H ustar -L' | ||
2136 | 2333 | am__tar_='find "$tardir" -print | cpio -o -H ustar -L' | ||
2137 | 2334 | am__untar='cpio -i -H ustar -d' | ||
2138 | 2335 | ;; | ||
2139 | 2336 | none) | ||
2140 | 2337 | am__tar=false | ||
2141 | 2338 | am__tar_=false | ||
2142 | 2339 | am__untar=false | ||
2143 | 2340 | ;; | ||
2144 | 2341 | esac | ||
2145 | 2342 | |||
2146 | 2343 | # If the value was cached, stop now. We just wanted to have am__tar | ||
2147 | 2344 | # and am__untar set. | ||
2148 | 2345 | test -n "${am_cv_prog_tar_ustar}" && break | ||
2149 | 2346 | |||
2150 | 2347 | # tar/untar a dummy directory, and stop if the command works. | ||
2151 | 2348 | rm -rf conftest.dir | ||
2152 | 2349 | mkdir conftest.dir | ||
2153 | 2350 | echo GrepMe > conftest.dir/file | ||
2154 | 2351 | { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 | ||
2155 | 2352 | (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 | ||
2156 | 2353 | ac_status=$? | ||
2157 | 2354 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2158 | 2355 | (exit $ac_status); } | ||
2159 | 2356 | rm -rf conftest.dir | ||
2160 | 2357 | if test -s conftest.tar; then | ||
2161 | 2358 | { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 | ||
2162 | 2359 | ($am__untar <conftest.tar) >&5 2>&5 | ||
2163 | 2360 | ac_status=$? | ||
2164 | 2361 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2165 | 2362 | (exit $ac_status); } | ||
2166 | 2363 | { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 | ||
2167 | 2364 | (cat conftest.dir/file) >&5 2>&5 | ||
2168 | 2365 | ac_status=$? | ||
2169 | 2366 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2170 | 2367 | (exit $ac_status); } | ||
2171 | 2368 | grep GrepMe conftest.dir/file >/dev/null 2>&1 && break | ||
2172 | 2369 | fi | ||
2173 | 2370 | done | ||
2174 | 2371 | rm -rf conftest.dir | ||
2175 | 2372 | |||
2176 | 2373 | if ${am_cv_prog_tar_ustar+:} false; then : | ||
2177 | 2374 | $as_echo_n "(cached) " >&6 | ||
2178 | 2375 | else | ||
2179 | 2376 | am_cv_prog_tar_ustar=$_am_tool | ||
2180 | 2377 | fi | ||
2181 | 2378 | |||
2182 | 2379 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 | ||
2183 | 2380 | $as_echo "$am_cv_prog_tar_ustar" >&6; } | ||
2184 | 2381 | |||
2185 | 2382 | |||
2186 | 2383 | |||
2187 | 2384 | |||
2188 | 2385 | |||
2189 | 2386 | |||
2190 | 2387 | # POSIX will say in a future version that running "rm -f" with no argument | ||
2191 | 2388 | # is OK; and we want to be able to make that assumption in our Makefile | ||
2192 | 2389 | # recipes. So use an aggressive probe to check that the usage we want is | ||
2193 | 2390 | # actually supported "in the wild" to an acceptable degree. | ||
2194 | 2391 | # See automake bug#10828. | ||
2195 | 2392 | # To make any issue more visible, cause the running configure to be aborted | ||
2196 | 2393 | # by default if the 'rm' program in use doesn't match our expectations; the | ||
2197 | 2394 | # user can still override this though. | ||
2198 | 2395 | if rm -f && rm -fr && rm -rf; then : OK; else | ||
2199 | 2396 | cat >&2 <<'END' | ||
2200 | 2397 | Oops! | ||
2201 | 2398 | |||
2202 | 2399 | Your 'rm' program seems unable to run without file operands specified | ||
2203 | 2400 | on the command line, even when the '-f' option is present. This is contrary | ||
2204 | 2401 | to the behaviour of most rm programs out there, and not conforming with | ||
2205 | 2402 | the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> | ||
2206 | 2403 | |||
2207 | 2404 | Please tell bug-automake@gnu.org about your system, including the value | ||
2208 | 2405 | of your $PATH and any error possibly output before this message. This | ||
2209 | 2406 | can help us improve future automake versions. | ||
2210 | 2407 | |||
2211 | 2408 | END | ||
2212 | 2409 | if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then | ||
2213 | 2410 | echo 'Configuration will proceed anyway, since you have set the' >&2 | ||
2214 | 2411 | echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 | ||
2215 | 2412 | echo >&2 | ||
2216 | 2413 | else | ||
2217 | 2414 | cat >&2 <<'END' | ||
2218 | 2415 | Aborting the configuration process, to ensure you take notice of the issue. | ||
2219 | 2416 | |||
2220 | 2417 | You can download and install GNU coreutils to get an 'rm' implementation | ||
2221 | 2418 | that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
2222 | 2419 | |||
2223 | 2420 | If you want to complete the configuration process using your problematic | ||
2224 | 2421 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
2225 | 2422 | to "yes", and re-run configure. | ||
2226 | 2423 | |||
2227 | 2424 | END | ||
2228 | 2425 | as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 | ||
2229 | 2426 | fi | ||
2230 | 2427 | fi | ||
2231 | 2428 | |||
2232 | 2429 | |||
2233 | 1791 | 2430 | ||
2234 | 1792 | ac_config_files="$ac_config_files Makefile" | 2431 | ac_config_files="$ac_config_files Makefile" |
2235 | 1793 | 2432 | ||
2236 | @@ -1937,6 +2576,15 @@ | |||
2237 | 1937 | LTLIBOBJS=$ac_ltlibobjs | 2576 | LTLIBOBJS=$ac_ltlibobjs |
2238 | 1938 | 2577 | ||
2239 | 1939 | 2578 | ||
2240 | 2579 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 | ||
2241 | 2580 | $as_echo_n "checking that generated files are newer than configure... " >&6; } | ||
2242 | 2581 | if test -n "$am_sleep_pid"; then | ||
2243 | 2582 | # Hide warnings about reused PIDs. | ||
2244 | 2583 | wait $am_sleep_pid 2>/dev/null | ||
2245 | 2584 | fi | ||
2246 | 2585 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 | ||
2247 | 2586 | $as_echo "done" >&6; } | ||
2248 | 2587 | |||
2249 | 1940 | 2588 | ||
2250 | 1941 | : "${CONFIG_STATUS=./config.status}" | 2589 | : "${CONFIG_STATUS=./config.status}" |
2251 | 1942 | ac_write_fail=0 | 2590 | ac_write_fail=0 |
2252 | @@ -2334,7 +2982,7 @@ | |||
2253 | 2334 | # report actual input values of CONFIG_FILES etc. instead of their | 2982 | # report actual input values of CONFIG_FILES etc. instead of their |
2254 | 2335 | # values after options handling. | 2983 | # values after options handling. |
2255 | 2336 | ac_log=" | 2984 | ac_log=" |
2257 | 2337 | This file was extended by hicolor-icon-theme $as_me 0.13, which was | 2985 | This file was extended by hicolor-icon-theme $as_me 0.14, which was |
2258 | 2338 | generated by GNU Autoconf 2.69. Invocation command line was | 2986 | generated by GNU Autoconf 2.69. Invocation command line was |
2259 | 2339 | 2987 | ||
2260 | 2340 | CONFIG_FILES = $CONFIG_FILES | 2988 | CONFIG_FILES = $CONFIG_FILES |
2261 | @@ -2387,7 +3035,7 @@ | |||
2262 | 2387 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 3035 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2263 | 2388 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 3036 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2264 | 2389 | ac_cs_version="\\ | 3037 | ac_cs_version="\\ |
2266 | 2390 | hicolor-icon-theme config.status 0.13 | 3038 | hicolor-icon-theme config.status 0.14 |
2267 | 2391 | configured by $0, generated by GNU Autoconf 2.69, | 3039 | configured by $0, generated by GNU Autoconf 2.69, |
2268 | 2392 | with options \\"\$ac_cs_config\\" | 3040 | with options \\"\$ac_cs_config\\" |
2269 | 2393 | 3041 | ||
2270 | @@ -2398,6 +3046,8 @@ | |||
2271 | 2398 | ac_pwd='$ac_pwd' | 3046 | ac_pwd='$ac_pwd' |
2272 | 2399 | srcdir='$srcdir' | 3047 | srcdir='$srcdir' |
2273 | 2400 | INSTALL='$INSTALL' | 3048 | INSTALL='$INSTALL' |
2274 | 3049 | MKDIR_P='$MKDIR_P' | ||
2275 | 3050 | AWK='$AWK' | ||
2276 | 2401 | test -n "\$AWK" || AWK=awk | 3051 | test -n "\$AWK" || AWK=awk |
2277 | 2402 | _ACEOF | 3052 | _ACEOF |
2278 | 2403 | 3053 | ||
2279 | @@ -2837,6 +3487,11 @@ | |||
2280 | 2837 | [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; | 3487 | [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; |
2281 | 2838 | *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; | 3488 | *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; |
2282 | 2839 | esac | 3489 | esac |
2283 | 3490 | ac_MKDIR_P=$MKDIR_P | ||
2284 | 3491 | case $MKDIR_P in | ||
2285 | 3492 | [\\/$]* | ?:[\\/]* ) ;; | ||
2286 | 3493 | */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; | ||
2287 | 3494 | esac | ||
2288 | 2840 | _ACEOF | 3495 | _ACEOF |
2289 | 2841 | 3496 | ||
2290 | 2842 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | 3497 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
2291 | @@ -2891,6 +3546,7 @@ | |||
2292 | 2891 | s&@abs_builddir@&$ac_abs_builddir&;t t | 3546 | s&@abs_builddir@&$ac_abs_builddir&;t t |
2293 | 2892 | s&@abs_top_builddir@&$ac_abs_top_builddir&;t t | 3547 | s&@abs_top_builddir@&$ac_abs_top_builddir&;t t |
2294 | 2893 | s&@INSTALL@&$ac_INSTALL&;t t | 3548 | s&@INSTALL@&$ac_INSTALL&;t t |
2295 | 3549 | s&@MKDIR_P@&$ac_MKDIR_P&;t t | ||
2296 | 2894 | $ac_datarootdir_hack | 3550 | $ac_datarootdir_hack |
2297 | 2895 | " | 3551 | " |
2298 | 2896 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ | 3552 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ |
2299 | @@ -2953,4 +3609,3 @@ | |||
2300 | 2953 | $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} | 3609 | $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} |
2301 | 2954 | fi | 3610 | fi |
2302 | 2955 | 3611 | ||
2303 | 2956 | |||
2304 | 2957 | 3612 | ||
2305 | === modified file 'configure.ac' | |||
2306 | --- configure.ac 2013-12-29 10:37:45 +0000 | |||
2307 | +++ configure.ac 2014-12-30 20:20:45 +0000 | |||
2308 | @@ -1,8 +1,8 @@ | |||
2310 | 1 | AC_INIT([hicolor-icon-theme], [0.13]) | 1 | AC_INIT([hicolor-icon-theme], [0.14]) |
2311 | 2 | AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar foreign]) | ||
2312 | 2 | 3 | ||
2313 | 3 | AC_PROG_INSTALL | 4 | AC_PROG_INSTALL |
2314 | 4 | 5 | ||
2315 | 5 | AC_CONFIG_FILES([Makefile]) | 6 | AC_CONFIG_FILES([Makefile]) |
2316 | 6 | 7 | ||
2317 | 7 | AC_OUTPUT | 8 | AC_OUTPUT |
2318 | 8 | |||
2319 | 9 | 9 | ||
2320 | === modified file 'debian/changelog' | |||
2321 | --- debian/changelog 2013-12-29 10:37:45 +0000 | |||
2322 | +++ debian/changelog 2014-12-30 20:20:45 +0000 | |||
2323 | @@ -1,3 +1,10 @@ | |||
2324 | 1 | hicolor-icon-theme (0.14-0ubuntu1) vivid; urgency=medium | ||
2325 | 2 | |||
2326 | 3 | * New upstream release. | ||
2327 | 4 | * debian/watch: Upstream now uses .xz | ||
2328 | 5 | |||
2329 | 6 | -- Jackson Doak <noskcaj@ubuntu.com> Wed, 31 Dec 2014 07:14:43 +1100 | ||
2330 | 7 | |||
2331 | 1 | hicolor-icon-theme (0.13-1) unstable; urgency=low | 8 | hicolor-icon-theme (0.13-1) unstable; urgency=low |
2332 | 2 | 9 | ||
2333 | 3 | * Set Multi-Arch: foreign. Closes: #616533. | 10 | * Set Multi-Arch: foreign. Closes: #616533. |
2334 | 4 | 11 | ||
2335 | === modified file 'debian/control' | |||
2336 | --- debian/control 2013-12-29 10:37:45 +0000 | |||
2337 | +++ debian/control 2014-12-30 20:20:45 +0000 | |||
2338 | @@ -6,7 +6,8 @@ | |||
2339 | 6 | Source: hicolor-icon-theme | 6 | Source: hicolor-icon-theme |
2340 | 7 | Section: misc | 7 | Section: misc |
2341 | 8 | Priority: optional | 8 | Priority: optional |
2343 | 9 | Maintainer: Ross Burton <ross@debian.org> | 9 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
2344 | 10 | XSBC-Original-Maintainer: Ross Burton <ross@debian.org> | ||
2345 | 10 | Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org> | 11 | Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org> |
2346 | 11 | Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools | 12 | Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools |
2347 | 12 | Standards-Version: 3.8.1 | 13 | Standards-Version: 3.8.1 |
2348 | 13 | 14 | ||
2349 | === modified file 'debian/control.in' | |||
2350 | --- debian/control.in 2013-12-29 10:37:45 +0000 | |||
2351 | +++ debian/control.in 2014-12-30 20:20:45 +0000 | |||
2352 | @@ -1,7 +1,8 @@ | |||
2353 | 1 | Source: hicolor-icon-theme | 1 | Source: hicolor-icon-theme |
2354 | 2 | Section: misc | 2 | Section: misc |
2355 | 3 | Priority: optional | 3 | Priority: optional |
2357 | 4 | Maintainer: Ross Burton <ross@debian.org> | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
2358 | 5 | XSBC-Original-Maintainer: Ross Burton <ross@debian.org> | ||
2359 | 5 | Uploaders: @GNOME_TEAM@ | 6 | Uploaders: @GNOME_TEAM@ |
2360 | 6 | Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools | 7 | Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools |
2361 | 7 | Standards-Version: 3.8.1 | 8 | Standards-Version: 3.8.1 |
2362 | 8 | 9 | ||
2363 | === modified file 'debian/watch' | |||
2364 | --- debian/watch 2005-04-08 12:50:56 +0000 | |||
2365 | +++ debian/watch 2014-12-30 20:20:45 +0000 | |||
2366 | @@ -1,2 +1,2 @@ | |||
2369 | 1 | version=2 | 1 | version=3 |
2370 | 2 | http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-(.*)\.tar\.gz | 2 | http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-(.*)\.tar\.xz |
2371 | 3 | 3 | ||
2372 | === modified file 'install-sh' | |||
2373 | --- install-sh 2004-06-19 12:49:54 +0000 | |||
2374 | +++ install-sh 2014-12-30 20:20:45 +0000 | |||
2375 | @@ -1,251 +1,527 @@ | |||
2376 | 1 | #!/bin/sh | 1 | #!/bin/sh |
2377 | 2 | # | ||
2378 | 3 | # install - install a program, script, or datafile | 2 | # install - install a program, script, or datafile |
2392 | 4 | # This comes from X11R5 (mit/util/scripts/install.sh). | 3 | |
2393 | 5 | # | 4 | scriptversion=2011-11-20.07; # UTC |
2394 | 6 | # Copyright 1991 by the Massachusetts Institute of Technology | 5 | |
2395 | 7 | # | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
2396 | 8 | # Permission to use, copy, modify, distribute, and sell this software and its | 7 | # later released in X11R6 (xc/config/util/install.sh) with the |
2397 | 9 | # documentation for any purpose is hereby granted without fee, provided that | 8 | # following copyright and license. |
2398 | 10 | # the above copyright notice appear in all copies and that both that | 9 | # |
2399 | 11 | # copyright notice and this permission notice appear in supporting | 10 | # Copyright (C) 1994 X Consortium |
2400 | 12 | # documentation, and that the name of M.I.T. not be used in advertising or | 11 | # |
2401 | 13 | # publicity pertaining to distribution of the software without specific, | 12 | # Permission is hereby granted, free of charge, to any person obtaining a copy |
2402 | 14 | # written prior permission. M.I.T. makes no representations about the | 13 | # of this software and associated documentation files (the "Software"), to |
2403 | 15 | # suitability of this software for any purpose. It is provided "as is" | 14 | # deal in the Software without restriction, including without limitation the |
2404 | 16 | # without express or implied warranty. | 15 | # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or |
2405 | 16 | # sell copies of the Software, and to permit persons to whom the Software is | ||
2406 | 17 | # furnished to do so, subject to the following conditions: | ||
2407 | 18 | # | ||
2408 | 19 | # The above copyright notice and this permission notice shall be included in | ||
2409 | 20 | # all copies or substantial portions of the Software. | ||
2410 | 21 | # | ||
2411 | 22 | # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
2412 | 23 | # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
2413 | 24 | # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
2414 | 25 | # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN | ||
2415 | 26 | # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- | ||
2416 | 27 | # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
2417 | 28 | # | ||
2418 | 29 | # Except as contained in this notice, the name of the X Consortium shall not | ||
2419 | 30 | # be used in advertising or otherwise to promote the sale, use or other deal- | ||
2420 | 31 | # ings in this Software without prior written authorization from the X Consor- | ||
2421 | 32 | # tium. | ||
2422 | 33 | # | ||
2423 | 34 | # | ||
2424 | 35 | # FSF changes to this file are in the public domain. | ||
2425 | 17 | # | 36 | # |
2426 | 18 | # Calling this script install-sh is preferred over install.sh, to prevent | 37 | # Calling this script install-sh is preferred over install.sh, to prevent |
2428 | 19 | # `make' implicit rules from creating a file called install from it | 38 | # 'make' implicit rules from creating a file called install from it |
2429 | 20 | # when there is no Makefile. | 39 | # when there is no Makefile. |
2430 | 21 | # | 40 | # |
2431 | 22 | # This script is compatible with the BSD install script, but was written | 41 | # This script is compatible with the BSD install script, but was written |
2434 | 23 | # from scratch. It can only install one file at a time, a restriction | 42 | # from scratch. |
2433 | 24 | # shared with many OS's install programs. | ||
2435 | 25 | 43 | ||
2436 | 44 | nl=' | ||
2437 | 45 | ' | ||
2438 | 46 | IFS=" "" $nl" | ||
2439 | 26 | 47 | ||
2440 | 27 | # set DOITPROG to echo to test this script | 48 | # set DOITPROG to echo to test this script |
2441 | 28 | 49 | ||
2442 | 29 | # Don't use :- since 4.3BSD and earlier shells don't like it. | 50 | # Don't use :- since 4.3BSD and earlier shells don't like it. |
2464 | 30 | doit="${DOITPROG-}" | 51 | doit=${DOITPROG-} |
2465 | 31 | 52 | if test -z "$doit"; then | |
2466 | 32 | 53 | doit_exec=exec | |
2467 | 33 | # put in absolute paths if you don't have them in your path; or use env. vars. | 54 | else |
2468 | 34 | 55 | doit_exec=$doit | |
2469 | 35 | mvprog="${MVPROG-mv}" | 56 | fi |
2470 | 36 | cpprog="${CPPROG-cp}" | 57 | |
2471 | 37 | chmodprog="${CHMODPROG-chmod}" | 58 | # Put in absolute file names if you don't have them in your path; |
2472 | 38 | chownprog="${CHOWNPROG-chown}" | 59 | # or use environment vars. |
2473 | 39 | chgrpprog="${CHGRPPROG-chgrp}" | 60 | |
2474 | 40 | stripprog="${STRIPPROG-strip}" | 61 | chgrpprog=${CHGRPPROG-chgrp} |
2475 | 41 | rmprog="${RMPROG-rm}" | 62 | chmodprog=${CHMODPROG-chmod} |
2476 | 42 | mkdirprog="${MKDIRPROG-mkdir}" | 63 | chownprog=${CHOWNPROG-chown} |
2477 | 43 | 64 | cmpprog=${CMPPROG-cmp} | |
2478 | 44 | transformbasename="" | 65 | cpprog=${CPPROG-cp} |
2479 | 45 | transform_arg="" | 66 | mkdirprog=${MKDIRPROG-mkdir} |
2480 | 46 | instcmd="$mvprog" | 67 | mvprog=${MVPROG-mv} |
2481 | 47 | chmodcmd="$chmodprog 0755" | 68 | rmprog=${RMPROG-rm} |
2482 | 48 | chowncmd="" | 69 | stripprog=${STRIPPROG-strip} |
2483 | 49 | chgrpcmd="" | 70 | |
2484 | 50 | stripcmd="" | 71 | posix_glob='?' |
2485 | 72 | initialize_posix_glob=' | ||
2486 | 73 | test "$posix_glob" != "?" || { | ||
2487 | 74 | if (set -f) 2>/dev/null; then | ||
2488 | 75 | posix_glob= | ||
2489 | 76 | else | ||
2490 | 77 | posix_glob=: | ||
2491 | 78 | fi | ||
2492 | 79 | } | ||
2493 | 80 | ' | ||
2494 | 81 | |||
2495 | 82 | posix_mkdir= | ||
2496 | 83 | |||
2497 | 84 | # Desired mode of installed file. | ||
2498 | 85 | mode=0755 | ||
2499 | 86 | |||
2500 | 87 | chgrpcmd= | ||
2501 | 88 | chmodcmd=$chmodprog | ||
2502 | 89 | chowncmd= | ||
2503 | 90 | mvcmd=$mvprog | ||
2504 | 51 | rmcmd="$rmprog -f" | 91 | rmcmd="$rmprog -f" |
2548 | 52 | mvcmd="$mvprog" | 92 | stripcmd= |
2549 | 53 | src="" | 93 | |
2550 | 54 | dst="" | 94 | src= |
2551 | 55 | dir_arg="" | 95 | dst= |
2552 | 56 | 96 | dir_arg= | |
2553 | 57 | while [ x"$1" != x ]; do | 97 | dst_arg= |
2554 | 58 | case $1 in | 98 | |
2555 | 59 | -c) instcmd="$cpprog" | 99 | copy_on_change=false |
2556 | 60 | shift | 100 | no_target_directory= |
2557 | 61 | continue;; | 101 | |
2558 | 62 | 102 | usage="\ | |
2559 | 63 | -d) dir_arg=true | 103 | Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE |
2560 | 64 | shift | 104 | or: $0 [OPTION]... SRCFILES... DIRECTORY |
2561 | 65 | continue;; | 105 | or: $0 [OPTION]... -t DIRECTORY SRCFILES... |
2562 | 66 | 106 | or: $0 [OPTION]... -d DIRECTORIES... | |
2563 | 67 | -m) chmodcmd="$chmodprog $2" | 107 | |
2564 | 68 | shift | 108 | In the 1st form, copy SRCFILE to DSTFILE. |
2565 | 69 | shift | 109 | In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. |
2566 | 70 | continue;; | 110 | In the 4th, create DIRECTORIES. |
2567 | 71 | 111 | ||
2568 | 72 | -o) chowncmd="$chownprog $2" | 112 | Options: |
2569 | 73 | shift | 113 | --help display this help and exit. |
2570 | 74 | shift | 114 | --version display version info and exit. |
2571 | 75 | continue;; | 115 | |
2572 | 76 | 116 | -c (ignored) | |
2573 | 77 | -g) chgrpcmd="$chgrpprog $2" | 117 | -C install only if different (preserve the last data modification time) |
2574 | 78 | shift | 118 | -d create directories instead of installing files. |
2575 | 79 | shift | 119 | -g GROUP $chgrpprog installed files to GROUP. |
2576 | 80 | continue;; | 120 | -m MODE $chmodprog installed files to MODE. |
2577 | 81 | 121 | -o USER $chownprog installed files to USER. | |
2578 | 82 | -s) stripcmd="$stripprog" | 122 | -s $stripprog installed files. |
2579 | 83 | shift | 123 | -t DIRECTORY install into DIRECTORY. |
2580 | 84 | continue;; | 124 | -T report an error if DSTFILE is a directory. |
2581 | 85 | 125 | ||
2582 | 86 | -t=*) transformarg=`echo $1 | sed 's/-t=//'` | 126 | Environment variables override the default commands: |
2583 | 87 | shift | 127 | CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG |
2584 | 88 | continue;; | 128 | RMPROG STRIPPROG |
2585 | 89 | 129 | " | |
2586 | 90 | -b=*) transformbasename=`echo $1 | sed 's/-b=//'` | 130 | |
2587 | 91 | shift | 131 | while test $# -ne 0; do |
2588 | 92 | continue;; | 132 | case $1 in |
2589 | 93 | 133 | -c) ;; | |
2590 | 94 | *) if [ x"$src" = x ] | 134 | |
2591 | 135 | -C) copy_on_change=true;; | ||
2592 | 136 | |||
2593 | 137 | -d) dir_arg=true;; | ||
2594 | 138 | |||
2595 | 139 | -g) chgrpcmd="$chgrpprog $2" | ||
2596 | 140 | shift;; | ||
2597 | 141 | |||
2598 | 142 | --help) echo "$usage"; exit $?;; | ||
2599 | 143 | |||
2600 | 144 | -m) mode=$2 | ||
2601 | 145 | case $mode in | ||
2602 | 146 | *' '* | *' '* | *' | ||
2603 | 147 | '* | *'*'* | *'?'* | *'['*) | ||
2604 | 148 | echo "$0: invalid mode: $mode" >&2 | ||
2605 | 149 | exit 1;; | ||
2606 | 150 | esac | ||
2607 | 151 | shift;; | ||
2608 | 152 | |||
2609 | 153 | -o) chowncmd="$chownprog $2" | ||
2610 | 154 | shift;; | ||
2611 | 155 | |||
2612 | 156 | -s) stripcmd=$stripprog;; | ||
2613 | 157 | |||
2614 | 158 | -t) dst_arg=$2 | ||
2615 | 159 | # Protect names problematic for 'test' and other utilities. | ||
2616 | 160 | case $dst_arg in | ||
2617 | 161 | -* | [=\(\)!]) dst_arg=./$dst_arg;; | ||
2618 | 162 | esac | ||
2619 | 163 | shift;; | ||
2620 | 164 | |||
2621 | 165 | -T) no_target_directory=true;; | ||
2622 | 166 | |||
2623 | 167 | --version) echo "$0 $scriptversion"; exit $?;; | ||
2624 | 168 | |||
2625 | 169 | --) shift | ||
2626 | 170 | break;; | ||
2627 | 171 | |||
2628 | 172 | -*) echo "$0: invalid option: $1" >&2 | ||
2629 | 173 | exit 1;; | ||
2630 | 174 | |||
2631 | 175 | *) break;; | ||
2632 | 176 | esac | ||
2633 | 177 | shift | ||
2634 | 178 | done | ||
2635 | 179 | |||
2636 | 180 | if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then | ||
2637 | 181 | # When -d is used, all remaining arguments are directories to create. | ||
2638 | 182 | # When -t is used, the destination is already specified. | ||
2639 | 183 | # Otherwise, the last argument is the destination. Remove it from $@. | ||
2640 | 184 | for arg | ||
2641 | 185 | do | ||
2642 | 186 | if test -n "$dst_arg"; then | ||
2643 | 187 | # $@ is not empty: it contains at least $arg. | ||
2644 | 188 | set fnord "$@" "$dst_arg" | ||
2645 | 189 | shift # fnord | ||
2646 | 190 | fi | ||
2647 | 191 | shift # arg | ||
2648 | 192 | dst_arg=$arg | ||
2649 | 193 | # Protect names problematic for 'test' and other utilities. | ||
2650 | 194 | case $dst_arg in | ||
2651 | 195 | -* | [=\(\)!]) dst_arg=./$dst_arg;; | ||
2652 | 196 | esac | ||
2653 | 197 | done | ||
2654 | 198 | fi | ||
2655 | 199 | |||
2656 | 200 | if test $# -eq 0; then | ||
2657 | 201 | if test -z "$dir_arg"; then | ||
2658 | 202 | echo "$0: no input file specified." >&2 | ||
2659 | 203 | exit 1 | ||
2660 | 204 | fi | ||
2661 | 205 | # It's OK to call 'install-sh -d' without argument. | ||
2662 | 206 | # This can happen when creating conditional directories. | ||
2663 | 207 | exit 0 | ||
2664 | 208 | fi | ||
2665 | 209 | |||
2666 | 210 | if test -z "$dir_arg"; then | ||
2667 | 211 | do_exit='(exit $ret); exit $ret' | ||
2668 | 212 | trap "ret=129; $do_exit" 1 | ||
2669 | 213 | trap "ret=130; $do_exit" 2 | ||
2670 | 214 | trap "ret=141; $do_exit" 13 | ||
2671 | 215 | trap "ret=143; $do_exit" 15 | ||
2672 | 216 | |||
2673 | 217 | # Set umask so as not to create temps with too-generous modes. | ||
2674 | 218 | # However, 'strip' requires both read and write access to temps. | ||
2675 | 219 | case $mode in | ||
2676 | 220 | # Optimize common cases. | ||
2677 | 221 | *644) cp_umask=133;; | ||
2678 | 222 | *755) cp_umask=22;; | ||
2679 | 223 | |||
2680 | 224 | *[0-7]) | ||
2681 | 225 | if test -z "$stripcmd"; then | ||
2682 | 226 | u_plus_rw= | ||
2683 | 227 | else | ||
2684 | 228 | u_plus_rw='% 200' | ||
2685 | 229 | fi | ||
2686 | 230 | cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; | ||
2687 | 231 | *) | ||
2688 | 232 | if test -z "$stripcmd"; then | ||
2689 | 233 | u_plus_rw= | ||
2690 | 234 | else | ||
2691 | 235 | u_plus_rw=,u+rw | ||
2692 | 236 | fi | ||
2693 | 237 | cp_umask=$mode$u_plus_rw;; | ||
2694 | 238 | esac | ||
2695 | 239 | fi | ||
2696 | 240 | |||
2697 | 241 | for src | ||
2698 | 242 | do | ||
2699 | 243 | # Protect names problematic for 'test' and other utilities. | ||
2700 | 244 | case $src in | ||
2701 | 245 | -* | [=\(\)!]) src=./$src;; | ||
2702 | 246 | esac | ||
2703 | 247 | |||
2704 | 248 | if test -n "$dir_arg"; then | ||
2705 | 249 | dst=$src | ||
2706 | 250 | dstdir=$dst | ||
2707 | 251 | test -d "$dstdir" | ||
2708 | 252 | dstdir_status=$? | ||
2709 | 253 | else | ||
2710 | 254 | |||
2711 | 255 | # Waiting for this to be detected by the "$cpprog $src $dsttmp" command | ||
2712 | 256 | # might cause directories to be created, which would be especially bad | ||
2713 | 257 | # if $src (and thus $dsttmp) contains '*'. | ||
2714 | 258 | if test ! -f "$src" && test ! -d "$src"; then | ||
2715 | 259 | echo "$0: $src does not exist." >&2 | ||
2716 | 260 | exit 1 | ||
2717 | 261 | fi | ||
2718 | 262 | |||
2719 | 263 | if test -z "$dst_arg"; then | ||
2720 | 264 | echo "$0: no destination specified." >&2 | ||
2721 | 265 | exit 1 | ||
2722 | 266 | fi | ||
2723 | 267 | dst=$dst_arg | ||
2724 | 268 | |||
2725 | 269 | # If destination is a directory, append the input filename; won't work | ||
2726 | 270 | # if double slashes aren't ignored. | ||
2727 | 271 | if test -d "$dst"; then | ||
2728 | 272 | if test -n "$no_target_directory"; then | ||
2729 | 273 | echo "$0: $dst_arg: Is a directory" >&2 | ||
2730 | 274 | exit 1 | ||
2731 | 275 | fi | ||
2732 | 276 | dstdir=$dst | ||
2733 | 277 | dst=$dstdir/`basename "$src"` | ||
2734 | 278 | dstdir_status=0 | ||
2735 | 279 | else | ||
2736 | 280 | # Prefer dirname, but fall back on a substitute if dirname fails. | ||
2737 | 281 | dstdir=` | ||
2738 | 282 | (dirname "$dst") 2>/dev/null || | ||
2739 | 283 | expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
2740 | 284 | X"$dst" : 'X\(//\)[^/]' \| \ | ||
2741 | 285 | X"$dst" : 'X\(//\)$' \| \ | ||
2742 | 286 | X"$dst" : 'X\(/\)' \| . 2>/dev/null || | ||
2743 | 287 | echo X"$dst" | | ||
2744 | 288 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
2745 | 289 | s//\1/ | ||
2746 | 290 | q | ||
2747 | 291 | } | ||
2748 | 292 | /^X\(\/\/\)[^/].*/{ | ||
2749 | 293 | s//\1/ | ||
2750 | 294 | q | ||
2751 | 295 | } | ||
2752 | 296 | /^X\(\/\/\)$/{ | ||
2753 | 297 | s//\1/ | ||
2754 | 298 | q | ||
2755 | 299 | } | ||
2756 | 300 | /^X\(\/\).*/{ | ||
2757 | 301 | s//\1/ | ||
2758 | 302 | q | ||
2759 | 303 | } | ||
2760 | 304 | s/.*/./; q' | ||
2761 | 305 | ` | ||
2762 | 306 | |||
2763 | 307 | test -d "$dstdir" | ||
2764 | 308 | dstdir_status=$? | ||
2765 | 309 | fi | ||
2766 | 310 | fi | ||
2767 | 311 | |||
2768 | 312 | obsolete_mkdir_used=false | ||
2769 | 313 | |||
2770 | 314 | if test $dstdir_status != 0; then | ||
2771 | 315 | case $posix_mkdir in | ||
2772 | 316 | '') | ||
2773 | 317 | # Create intermediate dirs using mode 755 as modified by the umask. | ||
2774 | 318 | # This is like FreeBSD 'install' as of 1997-10-28. | ||
2775 | 319 | umask=`umask` | ||
2776 | 320 | case $stripcmd.$umask in | ||
2777 | 321 | # Optimize common cases. | ||
2778 | 322 | *[2367][2367]) mkdir_umask=$umask;; | ||
2779 | 323 | .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; | ||
2780 | 324 | |||
2781 | 325 | *[0-7]) | ||
2782 | 326 | mkdir_umask=`expr $umask + 22 \ | ||
2783 | 327 | - $umask % 100 % 40 + $umask % 20 \ | ||
2784 | 328 | - $umask % 10 % 4 + $umask % 2 | ||
2785 | 329 | `;; | ||
2786 | 330 | *) mkdir_umask=$umask,go-w;; | ||
2787 | 331 | esac | ||
2788 | 332 | |||
2789 | 333 | # With -d, create the new directory with the user-specified mode. | ||
2790 | 334 | # Otherwise, rely on $mkdir_umask. | ||
2791 | 335 | if test -n "$dir_arg"; then | ||
2792 | 336 | mkdir_mode=-m$mode | ||
2793 | 337 | else | ||
2794 | 338 | mkdir_mode= | ||
2795 | 339 | fi | ||
2796 | 340 | |||
2797 | 341 | posix_mkdir=false | ||
2798 | 342 | case $umask in | ||
2799 | 343 | *[123567][0-7][0-7]) | ||
2800 | 344 | # POSIX mkdir -p sets u+wx bits regardless of umask, which | ||
2801 | 345 | # is incompatible with FreeBSD 'install' when (umask & 300) != 0. | ||
2802 | 346 | ;; | ||
2803 | 347 | *) | ||
2804 | 348 | tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ | ||
2805 | 349 | trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 | ||
2806 | 350 | |||
2807 | 351 | if (umask $mkdir_umask && | ||
2808 | 352 | exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 | ||
2809 | 95 | then | 353 | then |
2811 | 96 | src=$1 | 354 | if test -z "$dir_arg" || { |
2812 | 355 | # Check for POSIX incompatibilities with -m. | ||
2813 | 356 | # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or | ||
2814 | 357 | # other-writable bit of parent directory when it shouldn't. | ||
2815 | 358 | # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. | ||
2816 | 359 | ls_ld_tmpdir=`ls -ld "$tmpdir"` | ||
2817 | 360 | case $ls_ld_tmpdir in | ||
2818 | 361 | d????-?r-*) different_mode=700;; | ||
2819 | 362 | d????-?--*) different_mode=755;; | ||
2820 | 363 | *) false;; | ||
2821 | 364 | esac && | ||
2822 | 365 | $mkdirprog -m$different_mode -p -- "$tmpdir" && { | ||
2823 | 366 | ls_ld_tmpdir_1=`ls -ld "$tmpdir"` | ||
2824 | 367 | test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" | ||
2825 | 368 | } | ||
2826 | 369 | } | ||
2827 | 370 | then posix_mkdir=: | ||
2828 | 371 | fi | ||
2829 | 372 | rmdir "$tmpdir/d" "$tmpdir" | ||
2830 | 97 | else | 373 | else |
2834 | 98 | # this colon is to work around a 386BSD /bin/sh bug | 374 | # Remove any dirs left behind by ancient mkdir implementations. |
2835 | 99 | : | 375 | rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null |
2833 | 100 | dst=$1 | ||
2836 | 101 | fi | 376 | fi |
2839 | 102 | shift | 377 | trap '' 0;; |
2840 | 103 | continue;; | 378 | esac;; |
2841 | 104 | esac | 379 | esac |
2989 | 105 | done | 380 | |
2990 | 106 | 381 | if | |
2991 | 107 | if [ x"$src" = x ] | 382 | $posix_mkdir && ( |
2992 | 108 | then | 383 | umask $mkdir_umask && |
2993 | 109 | echo "install: no input file specified" | 384 | $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" |
2994 | 110 | exit 1 | 385 | ) |
2995 | 111 | else | 386 | then : |
2996 | 112 | true | 387 | else |
2997 | 113 | fi | 388 | |
2998 | 114 | 389 | # The umask is ridiculous, or mkdir does not conform to POSIX, | |
2999 | 115 | if [ x"$dir_arg" != x ]; then | 390 | # or it failed possibly due to a race condition. Create the |
3000 | 116 | dst=$src | 391 | # directory the slow way, step by step, checking for races as we go. |
3001 | 117 | src="" | 392 | |
3002 | 118 | 393 | case $dstdir in | |
3003 | 119 | if [ -d $dst ]; then | 394 | /*) prefix='/';; |
3004 | 120 | instcmd=: | 395 | [-=\(\)!]*) prefix='./';; |
3005 | 121 | chmodcmd="" | 396 | *) prefix='';; |
3006 | 122 | else | 397 | esac |
3007 | 123 | instcmd=mkdir | 398 | |
3008 | 124 | fi | 399 | eval "$initialize_posix_glob" |
3009 | 125 | else | 400 | |
3010 | 126 | 401 | oIFS=$IFS | |
3011 | 127 | # Waiting for this to be detected by the "$instcmd $src $dsttmp" command | 402 | IFS=/ |
3012 | 128 | # might cause directories to be created, which would be especially bad | 403 | $posix_glob set -f |
3013 | 129 | # if $src (and thus $dsttmp) contains '*'. | 404 | set fnord $dstdir |
3014 | 130 | 405 | shift | |
3015 | 131 | if [ -f $src -o -d $src ] | 406 | $posix_glob set +f |
3016 | 132 | then | 407 | IFS=$oIFS |
3017 | 133 | true | 408 | |
3018 | 134 | else | 409 | prefixes= |
3019 | 135 | echo "install: $src does not exist" | 410 | |
3020 | 136 | exit 1 | 411 | for d |
3021 | 137 | fi | 412 | do |
3022 | 138 | 413 | test X"$d" = X && continue | |
3023 | 139 | if [ x"$dst" = x ] | 414 | |
3024 | 140 | then | 415 | prefix=$prefix$d |
3025 | 141 | echo "install: no destination specified" | 416 | if test -d "$prefix"; then |
3026 | 142 | exit 1 | 417 | prefixes= |
3027 | 143 | else | 418 | else |
3028 | 144 | true | 419 | if $posix_mkdir; then |
3029 | 145 | fi | 420 | (umask=$mkdir_umask && |
3030 | 146 | 421 | $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break | |
3031 | 147 | # If destination is a directory, append the input filename; if your system | 422 | # Don't fail if two instances are running concurrently. |
3032 | 148 | # does not like double slashes in filenames, you may need to add some logic | 423 | test -d "$prefix" || exit 1 |
3033 | 149 | 424 | else | |
3034 | 150 | if [ -d $dst ] | 425 | case $prefix in |
3035 | 151 | then | 426 | *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; |
3036 | 152 | dst="$dst"/`basename $src` | 427 | *) qprefix=$prefix;; |
3037 | 153 | else | 428 | esac |
3038 | 154 | true | 429 | prefixes="$prefixes '$qprefix'" |
3039 | 155 | fi | 430 | fi |
3040 | 156 | fi | 431 | fi |
3041 | 157 | 432 | prefix=$prefix/ | |
3042 | 158 | ## this sed command emulates the dirname command | 433 | done |
3043 | 159 | dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` | 434 | |
3044 | 160 | 435 | if test -n "$prefixes"; then | |
3045 | 161 | # Make sure that the destination directory exists. | 436 | # Don't fail if two instances are running concurrently. |
3046 | 162 | # this part is taken from Noah Friedman's mkinstalldirs script | 437 | (umask $mkdir_umask && |
3047 | 163 | 438 | eval "\$doit_exec \$mkdirprog $prefixes") || | |
3048 | 164 | # Skip lots of stat calls in the usual case. | 439 | test -d "$dstdir" || exit 1 |
3049 | 165 | if [ ! -d "$dstdir" ]; then | 440 | obsolete_mkdir_used=true |
3050 | 166 | defaultIFS=' | 441 | fi |
3051 | 167 | ' | 442 | fi |
3052 | 168 | IFS="${IFS-${defaultIFS}}" | 443 | fi |
3053 | 169 | 444 | ||
3054 | 170 | oIFS="${IFS}" | 445 | if test -n "$dir_arg"; then |
3055 | 171 | # Some sh's can't handle IFS=/ for some reason. | 446 | { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && |
3056 | 172 | IFS='%' | 447 | { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && |
3057 | 173 | set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` | 448 | { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || |
3058 | 174 | IFS="${oIFS}" | 449 | test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 |
3059 | 175 | 450 | else | |
3060 | 176 | pathcomp='' | 451 | |
3061 | 177 | 452 | # Make a couple of temp file names in the proper directory. | |
3062 | 178 | while [ $# -ne 0 ] ; do | 453 | dsttmp=$dstdir/_inst.$$_ |
3063 | 179 | pathcomp="${pathcomp}${1}" | 454 | rmtmp=$dstdir/_rm.$$_ |
3064 | 180 | shift | 455 | |
3065 | 181 | 456 | # Trap to clean up those temp files at exit. | |
3066 | 182 | if [ ! -d "${pathcomp}" ] ; | 457 | trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 |
3067 | 183 | then | 458 | |
3068 | 184 | $mkdirprog "${pathcomp}" | 459 | # Copy the file name to the temp name. |
3069 | 185 | else | 460 | (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && |
3070 | 186 | true | 461 | |
3071 | 187 | fi | 462 | # and set any options; do chmod last to preserve setuid bits. |
3072 | 188 | 463 | # | |
3073 | 189 | pathcomp="${pathcomp}/" | 464 | # If any of these fail, we abort the whole thing. If we want to |
3074 | 190 | done | 465 | # ignore errors from any of these, just make sure not to ignore |
3075 | 191 | fi | 466 | # errors from the above "$doit $cpprog $src $dsttmp" command. |
3076 | 192 | 467 | # | |
3077 | 193 | if [ x"$dir_arg" != x ] | 468 | { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && |
3078 | 194 | then | 469 | { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && |
3079 | 195 | $doit $instcmd $dst && | 470 | { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && |
3080 | 196 | 471 | { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && | |
3081 | 197 | if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && | 472 | |
3082 | 198 | if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && | 473 | # If -C, don't bother to copy if it wouldn't change the file. |
3083 | 199 | if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && | 474 | if $copy_on_change && |
3084 | 200 | if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi | 475 | old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && |
3085 | 201 | else | 476 | new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && |
3086 | 202 | 477 | ||
3087 | 203 | # If we're going to rename the final executable, determine the name now. | 478 | eval "$initialize_posix_glob" && |
3088 | 204 | 479 | $posix_glob set -f && | |
3089 | 205 | if [ x"$transformarg" = x ] | 480 | set X $old && old=:$2:$4:$5:$6 && |
3090 | 206 | then | 481 | set X $new && new=:$2:$4:$5:$6 && |
3091 | 207 | dstfile=`basename $dst` | 482 | $posix_glob set +f && |
3092 | 208 | else | 483 | |
3093 | 209 | dstfile=`basename $dst $transformbasename | | 484 | test "$old" = "$new" && |
3094 | 210 | sed $transformarg`$transformbasename | 485 | $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 |
3095 | 211 | fi | 486 | then |
3096 | 212 | 487 | rm -f "$dsttmp" | |
3097 | 213 | # don't allow the sed command to completely eliminate the filename | 488 | else |
3098 | 214 | 489 | # Rename the file to the real destination. | |
3099 | 215 | if [ x"$dstfile" = x ] | 490 | $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || |
3100 | 216 | then | 491 | |
3101 | 217 | dstfile=`basename $dst` | 492 | # The rename failed, perhaps because mv can't rename something else |
3102 | 218 | else | 493 | # to itself, or perhaps because mv is so ancient that it does not |
3103 | 219 | true | 494 | # support -f. |
3104 | 220 | fi | 495 | { |
3105 | 221 | 496 | # Now remove or move aside any old file at destination location. | |
3106 | 222 | # Make a temp file name in the proper directory. | 497 | # We try this two ways since rm can't unlink itself on some |
3107 | 223 | 498 | # systems and the destination file might be busy for other | |
3108 | 224 | dsttmp=$dstdir/#inst.$$# | 499 | # reasons. In this case, the final cleanup might fail but the new |
3109 | 225 | 500 | # file should still install successfully. | |
3110 | 226 | # Move or copy the file name to the temp name | 501 | { |
3111 | 227 | 502 | test ! -f "$dst" || | |
3112 | 228 | $doit $instcmd $src $dsttmp && | 503 | $doit $rmcmd -f "$dst" 2>/dev/null || |
3113 | 229 | 504 | { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && | |
3114 | 230 | trap "rm -f ${dsttmp}" 0 && | 505 | { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } |
3115 | 231 | 506 | } || | |
3116 | 232 | # and set any options; do chmod last to preserve setuid bits | 507 | { echo "$0: cannot unlink or rename $dst" >&2 |
3117 | 233 | 508 | (exit 1); exit 1 | |
3118 | 234 | # If any of these fail, we abort the whole thing. If we want to | 509 | } |
3119 | 235 | # ignore errors from any of these, just make sure not to ignore | 510 | } && |
3120 | 236 | # errors from the above "$doit $instcmd $src $dsttmp" command. | 511 | |
3121 | 237 | 512 | # Now rename the file to the real destination. | |
3122 | 238 | if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && | 513 | $doit $mvcmd "$dsttmp" "$dst" |
3123 | 239 | if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && | 514 | } |
3124 | 240 | if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && | 515 | fi || exit 1 |
3125 | 241 | if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && | 516 | |
3126 | 242 | 517 | trap '' 0 | |
3127 | 243 | # Now rename the file to the real destination. | 518 | fi |
3128 | 244 | 519 | done | |
3129 | 245 | $doit $rmcmd -f $dstdir/$dstfile && | 520 | |
3130 | 246 | $doit $mvcmd $dsttmp $dstdir/$dstfile | 521 | # Local variables: |
3131 | 247 | 522 | # eval: (add-hook 'write-file-hooks 'time-stamp) | |
3132 | 248 | fi && | 523 | # time-stamp-start: "scriptversion=" |
3133 | 249 | 524 | # time-stamp-format: "%:y-%02m-%02d.%02H" | |
3134 | 250 | 525 | # time-stamp-time-zone: "UTC" | |
3135 | 251 | exit 0 | 526 | # time-stamp-end: "; # UTC" |
3136 | 527 | # End: | ||
3137 | 252 | 528 | ||
3138 | === added file 'missing' | |||
3139 | --- missing 1970-01-01 00:00:00 +0000 | |||
3140 | +++ missing 2014-12-30 20:20:45 +0000 | |||
3141 | @@ -0,0 +1,215 @@ | |||
3142 | 1 | #! /bin/sh | ||
3143 | 2 | # Common wrapper for a few potentially missing GNU programs. | ||
3144 | 3 | |||
3145 | 4 | scriptversion=2013-10-28.13; # UTC | ||
3146 | 5 | |||
3147 | 6 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | ||
3148 | 7 | # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. | ||
3149 | 8 | |||
3150 | 9 | # This program is free software; you can redistribute it and/or modify | ||
3151 | 10 | # it under the terms of the GNU General Public License as published by | ||
3152 | 11 | # the Free Software Foundation; either version 2, or (at your option) | ||
3153 | 12 | # any later version. | ||
3154 | 13 | |||
3155 | 14 | # This program is distributed in the hope that it will be useful, | ||
3156 | 15 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
3157 | 16 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
3158 | 17 | # GNU General Public License for more details. | ||
3159 | 18 | |||
3160 | 19 | # You should have received a copy of the GNU General Public License | ||
3161 | 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
3162 | 21 | |||
3163 | 22 | # As a special exception to the GNU General Public License, if you | ||
3164 | 23 | # distribute this file as part of a program that contains a | ||
3165 | 24 | # configuration script generated by Autoconf, you may include it under | ||
3166 | 25 | # the same distribution terms that you use for the rest of that program. | ||
3167 | 26 | |||
3168 | 27 | if test $# -eq 0; then | ||
3169 | 28 | echo 1>&2 "Try '$0 --help' for more information" | ||
3170 | 29 | exit 1 | ||
3171 | 30 | fi | ||
3172 | 31 | |||
3173 | 32 | case $1 in | ||
3174 | 33 | |||
3175 | 34 | --is-lightweight) | ||
3176 | 35 | # Used by our autoconf macros to check whether the available missing | ||
3177 | 36 | # script is modern enough. | ||
3178 | 37 | exit 0 | ||
3179 | 38 | ;; | ||
3180 | 39 | |||
3181 | 40 | --run) | ||
3182 | 41 | # Back-compat with the calling convention used by older automake. | ||
3183 | 42 | shift | ||
3184 | 43 | ;; | ||
3185 | 44 | |||
3186 | 45 | -h|--h|--he|--hel|--help) | ||
3187 | 46 | echo "\ | ||
3188 | 47 | $0 [OPTION]... PROGRAM [ARGUMENT]... | ||
3189 | 48 | |||
3190 | 49 | Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due | ||
3191 | 50 | to PROGRAM being missing or too old. | ||
3192 | 51 | |||
3193 | 52 | Options: | ||
3194 | 53 | -h, --help display this help and exit | ||
3195 | 54 | -v, --version output version information and exit | ||
3196 | 55 | |||
3197 | 56 | Supported PROGRAM values: | ||
3198 | 57 | aclocal autoconf autoheader autom4te automake makeinfo | ||
3199 | 58 | bison yacc flex lex help2man | ||
3200 | 59 | |||
3201 | 60 | Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and | ||
3202 | 61 | 'g' are ignored when checking the name. | ||
3203 | 62 | |||
3204 | 63 | Send bug reports to <bug-automake@gnu.org>." | ||
3205 | 64 | exit $? | ||
3206 | 65 | ;; | ||
3207 | 66 | |||
3208 | 67 | -v|--v|--ve|--ver|--vers|--versi|--versio|--version) | ||
3209 | 68 | echo "missing $scriptversion (GNU Automake)" | ||
3210 | 69 | exit $? | ||
3211 | 70 | ;; | ||
3212 | 71 | |||
3213 | 72 | -*) | ||
3214 | 73 | echo 1>&2 "$0: unknown '$1' option" | ||
3215 | 74 | echo 1>&2 "Try '$0 --help' for more information" | ||
3216 | 75 | exit 1 | ||
3217 | 76 | ;; | ||
3218 | 77 | |||
3219 | 78 | esac | ||
3220 | 79 | |||
3221 | 80 | # Run the given program, remember its exit status. | ||
3222 | 81 | "$@"; st=$? | ||
3223 | 82 | |||
3224 | 83 | # If it succeeded, we are done. | ||
3225 | 84 | test $st -eq 0 && exit 0 | ||
3226 | 85 | |||
3227 | 86 | # Also exit now if we it failed (or wasn't found), and '--version' was | ||
3228 | 87 | # passed; such an option is passed most likely to detect whether the | ||
3229 | 88 | # program is present and works. | ||
3230 | 89 | case $2 in --version|--help) exit $st;; esac | ||
3231 | 90 | |||
3232 | 91 | # Exit code 63 means version mismatch. This often happens when the user | ||
3233 | 92 | # tries to use an ancient version of a tool on a file that requires a | ||
3234 | 93 | # minimum version. | ||
3235 | 94 | if test $st -eq 63; then | ||
3236 | 95 | msg="probably too old" | ||
3237 | 96 | elif test $st -eq 127; then | ||
3238 | 97 | # Program was missing. | ||
3239 | 98 | msg="missing on your system" | ||
3240 | 99 | else | ||
3241 | 100 | # Program was found and executed, but failed. Give up. | ||
3242 | 101 | exit $st | ||
3243 | 102 | fi | ||
3244 | 103 | |||
3245 | 104 | perl_URL=http://www.perl.org/ | ||
3246 | 105 | flex_URL=http://flex.sourceforge.net/ | ||
3247 | 106 | gnu_software_URL=http://www.gnu.org/software | ||
3248 | 107 | |||
3249 | 108 | program_details () | ||
3250 | 109 | { | ||
3251 | 110 | case $1 in | ||
3252 | 111 | aclocal|automake) | ||
3253 | 112 | echo "The '$1' program is part of the GNU Automake package:" | ||
3254 | 113 | echo "<$gnu_software_URL/automake>" | ||
3255 | 114 | echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" | ||
3256 | 115 | echo "<$gnu_software_URL/autoconf>" | ||
3257 | 116 | echo "<$gnu_software_URL/m4/>" | ||
3258 | 117 | echo "<$perl_URL>" | ||
3259 | 118 | ;; | ||
3260 | 119 | autoconf|autom4te|autoheader) | ||
3261 | 120 | echo "The '$1' program is part of the GNU Autoconf package:" | ||
3262 | 121 | echo "<$gnu_software_URL/autoconf/>" | ||
3263 | 122 | echo "It also requires GNU m4 and Perl in order to run:" | ||
3264 | 123 | echo "<$gnu_software_URL/m4/>" | ||
3265 | 124 | echo "<$perl_URL>" | ||
3266 | 125 | ;; | ||
3267 | 126 | esac | ||
3268 | 127 | } | ||
3269 | 128 | |||
3270 | 129 | give_advice () | ||
3271 | 130 | { | ||
3272 | 131 | # Normalize program name to check for. | ||
3273 | 132 | normalized_program=`echo "$1" | sed ' | ||
3274 | 133 | s/^gnu-//; t | ||
3275 | 134 | s/^gnu//; t | ||
3276 | 135 | s/^g//; t'` | ||
3277 | 136 | |||
3278 | 137 | printf '%s\n' "'$1' is $msg." | ||
3279 | 138 | |||
3280 | 139 | configure_deps="'configure.ac' or m4 files included by 'configure.ac'" | ||
3281 | 140 | case $normalized_program in | ||
3282 | 141 | autoconf*) | ||
3283 | 142 | echo "You should only need it if you modified 'configure.ac'," | ||
3284 | 143 | echo "or m4 files included by it." | ||
3285 | 144 | program_details 'autoconf' | ||
3286 | 145 | ;; | ||
3287 | 146 | autoheader*) | ||
3288 | 147 | echo "You should only need it if you modified 'acconfig.h' or" | ||
3289 | 148 | echo "$configure_deps." | ||
3290 | 149 | program_details 'autoheader' | ||
3291 | 150 | ;; | ||
3292 | 151 | automake*) | ||
3293 | 152 | echo "You should only need it if you modified 'Makefile.am' or" | ||
3294 | 153 | echo "$configure_deps." | ||
3295 | 154 | program_details 'automake' | ||
3296 | 155 | ;; | ||
3297 | 156 | aclocal*) | ||
3298 | 157 | echo "You should only need it if you modified 'acinclude.m4' or" | ||
3299 | 158 | echo "$configure_deps." | ||
3300 | 159 | program_details 'aclocal' | ||
3301 | 160 | ;; | ||
3302 | 161 | autom4te*) | ||
3303 | 162 | echo "You might have modified some maintainer files that require" | ||
3304 | 163 | echo "the 'autom4te' program to be rebuilt." | ||
3305 | 164 | program_details 'autom4te' | ||
3306 | 165 | ;; | ||
3307 | 166 | bison*|yacc*) | ||
3308 | 167 | echo "You should only need it if you modified a '.y' file." | ||
3309 | 168 | echo "You may want to install the GNU Bison package:" | ||
3310 | 169 | echo "<$gnu_software_URL/bison/>" | ||
3311 | 170 | ;; | ||
3312 | 171 | lex*|flex*) | ||
3313 | 172 | echo "You should only need it if you modified a '.l' file." | ||
3314 | 173 | echo "You may want to install the Fast Lexical Analyzer package:" | ||
3315 | 174 | echo "<$flex_URL>" | ||
3316 | 175 | ;; | ||
3317 | 176 | help2man*) | ||
3318 | 177 | echo "You should only need it if you modified a dependency" \ | ||
3319 | 178 | "of a man page." | ||
3320 | 179 | echo "You may want to install the GNU Help2man package:" | ||
3321 | 180 | echo "<$gnu_software_URL/help2man/>" | ||
3322 | 181 | ;; | ||
3323 | 182 | makeinfo*) | ||
3324 | 183 | echo "You should only need it if you modified a '.texi' file, or" | ||
3325 | 184 | echo "any other file indirectly affecting the aspect of the manual." | ||
3326 | 185 | echo "You might want to install the Texinfo package:" | ||
3327 | 186 | echo "<$gnu_software_URL/texinfo/>" | ||
3328 | 187 | echo "The spurious makeinfo call might also be the consequence of" | ||
3329 | 188 | echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" | ||
3330 | 189 | echo "want to install GNU make:" | ||
3331 | 190 | echo "<$gnu_software_URL/make/>" | ||
3332 | 191 | ;; | ||
3333 | 192 | *) | ||
3334 | 193 | echo "You might have modified some files without having the proper" | ||
3335 | 194 | echo "tools for further handling them. Check the 'README' file, it" | ||
3336 | 195 | echo "often tells you about the needed prerequisites for installing" | ||
3337 | 196 | echo "this package. You may also peek at any GNU archive site, in" | ||
3338 | 197 | echo "case some other package contains this missing '$1' program." | ||
3339 | 198 | ;; | ||
3340 | 199 | esac | ||
3341 | 200 | } | ||
3342 | 201 | |||
3343 | 202 | give_advice "$1" | sed -e '1s/^/WARNING: /' \ | ||
3344 | 203 | -e '2,$s/^/ /' >&2 | ||
3345 | 204 | |||
3346 | 205 | # Propagate the correct exit status (expected to be 127 for a program | ||
3347 | 206 | # not found, 63 for a program that failed due to version mismatch). | ||
3348 | 207 | exit $st | ||
3349 | 208 | |||
3350 | 209 | # Local variables: | ||
3351 | 210 | # eval: (add-hook 'write-file-hooks 'time-stamp) | ||
3352 | 211 | # time-stamp-start: "scriptversion=" | ||
3353 | 212 | # time-stamp-format: "%:y-%02m-%02d.%02H" | ||
3354 | 213 | # time-stamp-time-zone: "UTC" | ||
3355 | 214 | # time-stamp-end: "; # UTC" | ||
3356 | 215 | # End: |
Thanks. Uploaded.