Merge lp:~noskcaj/ubuntu/vivid/hicolor-icon-theme/0.14 into lp:ubuntu/vivid/hicolor-icon-theme

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
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+245453@code.launchpad.net

Description of the change

New upstream release. Better cross-building support + 512x512 icon directory added

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

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
=== added file 'Makefile.am'
--- Makefile.am 1970-01-01 00:00:00 +0000
+++ Makefile.am 2014-12-30 20:20:45 +0000
@@ -0,0 +1,23 @@
1ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \
2 128x128 192x192 256x256 512x512 scalable
3ICON_CONTEXTS = actions animations apps categories devices emblems emotes \
4 filesystems intl mimetypes places status stock
5STOCK_SUBS = chart code data form image io media navigation net object table text
6
7themedir = $(datadir)/icons/hicolor
8dist_theme_DATA = index.theme
9
10EXTRA_DIST = COPYING README autogen.sh
11
12install-data-hook:
13 mkdir -p $(DESTDIR)$(themedir)
14 for dir in $(ICON_SIZES); do \
15 for ctxt in $(ICON_CONTEXTS); do \
16 mkdir -p $(DESTDIR)$(themedir)/$$dir/$$ctxt; \
17 if [ "$$ctxt" = "stock" ]; then \
18 for sub in $(STOCK_SUBS); do \
19 mkdir -p $(DESTDIR)$(themedir)/$$dir/$$ctxt/$$sub; \
20 done \
21 fi \
22 done \
23 done
024
=== modified file 'Makefile.in'
--- Makefile.in 2010-09-08 19:52:22 +0000
+++ Makefile.in 2014-12-30 20:20:45 +0000
@@ -1,53 +1,608 @@
1PACKAGE = @PACKAGE_TARNAME@1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2VERSION = @PACKAGE_VERSION@2# @configure_input@
3prefix = @prefix@3
4datarootdir = @datarootdir@4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5datadir = @datadir@5
6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved.
9
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE.
14
15@SET_MAKE@
16
17VPATH = @srcdir@
18am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19am__make_running_with_option = \
20 case $${target_option-} in \
21 ?) ;; \
22 *) echo "am__make_running_with_option: internal error: invalid" \
23 "target option '$${target_option-}' specified" >&2; \
24 exit 1;; \
25 esac; \
26 has_opt=no; \
27 sane_makeflags=$$MAKEFLAGS; \
28 if $(am__is_gnu_make); then \
29 sane_makeflags=$$MFLAGS; \
30 else \
31 case $$MAKEFLAGS in \
32 *\\[\ \ ]*) \
33 bs=\\; \
34 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
36 esac; \
37 fi; \
38 skip_next=no; \
39 strip_trailopt () \
40 { \
41 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42 }; \
43 for flg in $$sane_makeflags; do \
44 test $$skip_next = yes && { skip_next=no; continue; }; \
45 case $$flg in \
46 *=*|--*) continue;; \
47 -*I) strip_trailopt 'I'; skip_next=yes;; \
48 -*I?*) strip_trailopt 'I';; \
49 -*O) strip_trailopt 'O'; skip_next=yes;; \
50 -*O?*) strip_trailopt 'O';; \
51 -*l) strip_trailopt 'l'; skip_next=yes;; \
52 -*l?*) strip_trailopt 'l';; \
53 -[dEDm]) skip_next=yes;; \
54 -[JT]) skip_next=yes;; \
55 esac; \
56 case $$flg in \
57 *$$target_option*) has_opt=yes; break;; \
58 esac; \
59 done; \
60 test $$has_opt = yes
61am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
63pkgdatadir = $(datadir)/@PACKAGE@
64pkgincludedir = $(includedir)/@PACKAGE@
65pkglibdir = $(libdir)/@PACKAGE@
66pkglibexecdir = $(libexecdir)/@PACKAGE@
67am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
68install_sh_DATA = $(install_sh) -c -m 644
69install_sh_PROGRAM = $(install_sh) -c
70install_sh_SCRIPT = $(install_sh) -c
71INSTALL_HEADER = $(INSTALL_DATA)
72transform = $(program_transform_name)
73NORMAL_INSTALL = :
74PRE_INSTALL = :
75POST_INSTALL = :
76NORMAL_UNINSTALL = :
77PRE_UNINSTALL = :
78POST_UNINSTALL = :
79subdir = .
80DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
81 $(top_srcdir)/configure $(am__configure_deps) \
82 $(dist_theme_DATA) COPYING ChangeLog README install-sh missing
83ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
84am__aclocal_m4_deps = $(top_srcdir)/configure.ac
85am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
86 $(ACLOCAL_M4)
87am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
88 configure.lineno config.status.lineno
89mkinstalldirs = $(install_sh) -d
90CONFIG_CLEAN_FILES =
91CONFIG_CLEAN_VPATH_FILES =
92AM_V_P = $(am__v_P_@AM_V@)
93am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
94am__v_P_0 = false
95am__v_P_1 = :
96AM_V_GEN = $(am__v_GEN_@AM_V@)
97am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
98am__v_GEN_0 = @echo " GEN " $@;
99am__v_GEN_1 =
100AM_V_at = $(am__v_at_@AM_V@)
101am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
102am__v_at_0 = @
103am__v_at_1 =
104SOURCES =
105DIST_SOURCES =
106am__can_run_installinfo = \
107 case $$AM_UPDATE_INFO_DIR in \
108 n|no|NO) false;; \
109 *) (install-info --version) >/dev/null 2>&1;; \
110 esac
111am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
112am__vpath_adj = case $$p in \
113 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
114 *) f=$$p;; \
115 esac;
116am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
117am__install_max = 40
118am__nobase_strip_setup = \
119 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
120am__nobase_strip = \
121 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
122am__nobase_list = $(am__nobase_strip_setup); \
123 for p in $$list; do echo "$$p $$p"; done | \
124 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
125 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
126 if (++n[$$2] == $(am__install_max)) \
127 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
128 END { for (dir in files) print dir, files[dir] }'
129am__base_list = \
130 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
131 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
132am__uninstall_files_from_dir = { \
133 test -z "$$files" \
134 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
135 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
136 $(am__cd) "$$dir" && rm -f $$files; }; \
137 }
138am__installdirs = "$(DESTDIR)$(themedir)"
139DATA = $(dist_theme_DATA)
140am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
141DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
142distdir = $(PACKAGE)-$(VERSION)
143top_distdir = $(distdir)
144am__remove_distdir = \
145 if test -d "$(distdir)"; then \
146 find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
147 && rm -rf "$(distdir)" \
148 || { sleep 5 && rm -rf "$(distdir)"; }; \
149 else :; fi
150am__post_remove_distdir = $(am__remove_distdir)
151GZIP_ENV = --best
152DIST_ARCHIVES = $(distdir).tar.xz
153DIST_TARGETS = dist-xz
154distuninstallcheck_listfiles = find . -type f -print
155am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
156 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
157distcleancheck_listfiles = find . -type f -print
158ACLOCAL = @ACLOCAL@
159AMTAR = @AMTAR@
160AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
161AUTOCONF = @AUTOCONF@
162AUTOHEADER = @AUTOHEADER@
163AUTOMAKE = @AUTOMAKE@
164AWK = @AWK@
165CYGPATH_W = @CYGPATH_W@
166DEFS = @DEFS@
167ECHO_C = @ECHO_C@
168ECHO_N = @ECHO_N@
169ECHO_T = @ECHO_T@
6INSTALL = @INSTALL@170INSTALL = @INSTALL@
7INSTALL_DATA = @INSTALL_DATA@171INSTALL_DATA = @INSTALL_DATA@
8172INSTALL_PROGRAM = @INSTALL_PROGRAM@
9distdir = $(PACKAGE)-$(VERSION)173INSTALL_SCRIPT = @INSTALL_SCRIPT@
10FILES = README Makefile.in configure.ac configure install-sh index.theme ChangeLog COPYING174INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
11175LIBOBJS = @LIBOBJS@
176LIBS = @LIBS@
177LTLIBOBJS = @LTLIBOBJS@
178MAKEINFO = @MAKEINFO@
179MKDIR_P = @MKDIR_P@
180PACKAGE = @PACKAGE@
181PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
182PACKAGE_NAME = @PACKAGE_NAME@
183PACKAGE_STRING = @PACKAGE_STRING@
184PACKAGE_TARNAME = @PACKAGE_TARNAME@
185PACKAGE_URL = @PACKAGE_URL@
186PACKAGE_VERSION = @PACKAGE_VERSION@
187PATH_SEPARATOR = @PATH_SEPARATOR@
188SET_MAKE = @SET_MAKE@
189SHELL = @SHELL@
190STRIP = @STRIP@
191VERSION = @VERSION@
192abs_builddir = @abs_builddir@
193abs_srcdir = @abs_srcdir@
194abs_top_builddir = @abs_top_builddir@
195abs_top_srcdir = @abs_top_srcdir@
196am__leading_dot = @am__leading_dot@
197am__tar = @am__tar@
198am__untar = @am__untar@
199bindir = @bindir@
200build_alias = @build_alias@
201builddir = @builddir@
202datadir = @datadir@
203datarootdir = @datarootdir@
204docdir = @docdir@
205dvidir = @dvidir@
206exec_prefix = @exec_prefix@
207host_alias = @host_alias@
208htmldir = @htmldir@
209includedir = @includedir@
210infodir = @infodir@
211install_sh = @install_sh@
212libdir = @libdir@
213libexecdir = @libexecdir@
214localedir = @localedir@
215localstatedir = @localstatedir@
216mandir = @mandir@
217mkdir_p = @mkdir_p@
218oldincludedir = @oldincludedir@
219pdfdir = @pdfdir@
220prefix = @prefix@
221program_transform_name = @program_transform_name@
222psdir = @psdir@
223sbindir = @sbindir@
224sharedstatedir = @sharedstatedir@
225srcdir = @srcdir@
226sysconfdir = @sysconfdir@
227target_alias = @target_alias@
228top_build_prefix = @top_build_prefix@
229top_builddir = @top_builddir@
230top_srcdir = @top_srcdir@
12ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \231ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \
13 128x128 192x192 256x256 scalable232 128x128 192x192 256x256 512x512 scalable
14ICON_CONTEXTS = actions animations apps categories devices emblems emotes filesystems intl mimetypes places status stock233
234ICON_CONTEXTS = actions animations apps categories devices emblems emotes \
235 filesystems intl mimetypes places status stock
236
15STOCK_SUBS = chart code data form image io media navigation net object table text237STOCK_SUBS = chart code data form image io media navigation net object table text
238themedir = $(datadir)/icons/hicolor
239dist_theme_DATA = index.theme
240EXTRA_DIST = COPYING README autogen.sh
241all: all-am
16242
17all:243.SUFFIXES:
244am--refresh: Makefile
18 @:245 @:
19246$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
20install:247 @for dep in $?; do \
21 mkdir -p $(DESTDIR)$(datadir)/icons/hicolor248 case '$(am__configure_deps)' in \
22 $(INSTALL_DATA) index.theme $(DESTDIR)$(datadir)/icons/hicolor249 *$$dep*) \
250 echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
251 $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
252 && exit 0; \
253 exit 1;; \
254 esac; \
255 done; \
256 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
257 $(am__cd) $(top_srcdir) && \
258 $(AUTOMAKE) --foreign Makefile
259.PRECIOUS: Makefile
260Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
261 @case '$?' in \
262 *config.status*) \
263 echo ' $(SHELL) ./config.status'; \
264 $(SHELL) ./config.status;; \
265 *) \
266 echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
267 cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
268 esac;
269
270$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
271 $(SHELL) ./config.status --recheck
272
273$(top_srcdir)/configure: $(am__configure_deps)
274 $(am__cd) $(srcdir) && $(AUTOCONF)
275$(ACLOCAL_M4): $(am__aclocal_m4_deps)
276 $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
277$(am__aclocal_m4_deps):
278install-dist_themeDATA: $(dist_theme_DATA)
279 @$(NORMAL_INSTALL)
280 @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
281 if test -n "$$list"; then \
282 echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \
283 $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \
284 fi; \
285 for p in $$list; do \
286 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
287 echo "$$d$$p"; \
288 done | $(am__base_list) | \
289 while read files; do \
290 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedir)'"; \
291 $(INSTALL_DATA) $$files "$(DESTDIR)$(themedir)" || exit $$?; \
292 done
293
294uninstall-dist_themeDATA:
295 @$(NORMAL_UNINSTALL)
296 @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
297 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
298 dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir)
299tags TAGS:
300
301ctags CTAGS:
302
303cscope cscopelist:
304
305
306distdir: $(DISTFILES)
307 $(am__remove_distdir)
308 test -d "$(distdir)" || mkdir "$(distdir)"
309 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
310 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
311 list='$(DISTFILES)'; \
312 dist_files=`for file in $$list; do echo $$file; done | \
313 sed -e "s|^$$srcdirstrip/||;t" \
314 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
315 case $$dist_files in \
316 */*) $(MKDIR_P) `echo "$$dist_files" | \
317 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
318 sort -u` ;; \
319 esac; \
320 for file in $$dist_files; do \
321 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
322 if test -d $$d/$$file; then \
323 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
324 if test -d "$(distdir)/$$file"; then \
325 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
326 fi; \
327 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
328 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
329 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
330 fi; \
331 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
332 else \
333 test -f "$(distdir)/$$file" \
334 || cp -p $$d/$$file "$(distdir)/$$file" \
335 || exit 1; \
336 fi; \
337 done
338 -test -n "$(am__skip_mode_fix)" \
339 || find "$(distdir)" -type d ! -perm -755 \
340 -exec chmod u+rwx,go+rx {} \; -o \
341 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
342 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
343 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
344 || chmod -R a+r "$(distdir)"
345dist-gzip: distdir
346 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
347 $(am__post_remove_distdir)
348
349dist-bzip2: distdir
350 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
351 $(am__post_remove_distdir)
352
353dist-lzip: distdir
354 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
355 $(am__post_remove_distdir)
356dist-xz: distdir
357 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
358 $(am__post_remove_distdir)
359
360dist-tarZ: distdir
361 @echo WARNING: "Support for shar distribution archives is" \
362 "deprecated." >&2
363 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
364 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
365 $(am__post_remove_distdir)
366
367dist-shar: distdir
368 @echo WARNING: "Support for distribution archives compressed with" \
369 "legacy program 'compress' is deprecated." >&2
370 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
371 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
372 $(am__post_remove_distdir)
373
374dist-zip: distdir
375 -rm -f $(distdir).zip
376 zip -rq $(distdir).zip $(distdir)
377 $(am__post_remove_distdir)
378
379dist dist-all:
380 $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
381 $(am__post_remove_distdir)
382
383# This target untars the dist file and tries a VPATH configuration. Then
384# it guarantees that the distribution is self-contained by making another
385# tarfile.
386distcheck: dist
387 case '$(DIST_ARCHIVES)' in \
388 *.tar.gz*) \
389 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
390 *.tar.bz2*) \
391 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
392 *.tar.lz*) \
393 lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
394 *.tar.xz*) \
395 xz -dc $(distdir).tar.xz | $(am__untar) ;;\
396 *.tar.Z*) \
397 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
398 *.shar.gz*) \
399 GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
400 *.zip*) \
401 unzip $(distdir).zip ;;\
402 esac
403 chmod -R a-w $(distdir)
404 chmod u+w $(distdir)
405 mkdir $(distdir)/_build $(distdir)/_inst
406 chmod a-w $(distdir)
407 test -d $(distdir)/_build || exit 0; \
408 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
409 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
410 && am__cwd=`pwd` \
411 && $(am__cd) $(distdir)/_build \
412 && ../configure \
413 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
414 $(DISTCHECK_CONFIGURE_FLAGS) \
415 --srcdir=.. --prefix="$$dc_install_base" \
416 && $(MAKE) $(AM_MAKEFLAGS) \
417 && $(MAKE) $(AM_MAKEFLAGS) dvi \
418 && $(MAKE) $(AM_MAKEFLAGS) check \
419 && $(MAKE) $(AM_MAKEFLAGS) install \
420 && $(MAKE) $(AM_MAKEFLAGS) installcheck \
421 && $(MAKE) $(AM_MAKEFLAGS) uninstall \
422 && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
423 distuninstallcheck \
424 && chmod -R a-w "$$dc_install_base" \
425 && ({ \
426 (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
427 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
428 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
429 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
430 distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
431 } || { rm -rf "$$dc_destdir"; exit 1; }) \
432 && rm -rf "$$dc_destdir" \
433 && $(MAKE) $(AM_MAKEFLAGS) dist \
434 && rm -rf $(DIST_ARCHIVES) \
435 && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
436 && cd "$$am__cwd" \
437 || exit 1
438 $(am__post_remove_distdir)
439 @(echo "$(distdir) archives ready for distribution: "; \
440 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
441 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
442distuninstallcheck:
443 @test -n '$(distuninstallcheck_dir)' || { \
444 echo 'ERROR: trying to run $@ with an empty' \
445 '$$(distuninstallcheck_dir)' >&2; \
446 exit 1; \
447 }; \
448 $(am__cd) '$(distuninstallcheck_dir)' || { \
449 echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
450 exit 1; \
451 }; \
452 test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
453 || { echo "ERROR: files left after uninstall:" ; \
454 if test -n "$(DESTDIR)"; then \
455 echo " (check DESTDIR support)"; \
456 fi ; \
457 $(distuninstallcheck_listfiles) ; \
458 exit 1; } >&2
459distcleancheck: distclean
460 @if test '$(srcdir)' = . ; then \
461 echo "ERROR: distcleancheck can only run from a VPATH build" ; \
462 exit 1 ; \
463 fi
464 @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
465 || { echo "ERROR: files left in build directory after distclean:" ; \
466 $(distcleancheck_listfiles) ; \
467 exit 1; } >&2
468check-am: all-am
469check: check-am
470all-am: Makefile $(DATA)
471installdirs:
472 for dir in "$(DESTDIR)$(themedir)"; do \
473 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
474 done
475install: install-am
476install-exec: install-exec-am
477install-data: install-data-am
478uninstall: uninstall-am
479
480install-am: all-am
481 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
482
483installcheck: installcheck-am
484install-strip:
485 if test -z '$(STRIP)'; then \
486 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
487 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
488 install; \
489 else \
490 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
491 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
492 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
493 fi
494mostlyclean-generic:
495
496clean-generic:
497
498distclean-generic:
499 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
500 -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
501
502maintainer-clean-generic:
503 @echo "This command is intended for maintainers to use"
504 @echo "it deletes files that may require special tools to rebuild."
505clean: clean-am
506
507clean-am: clean-generic mostlyclean-am
508
509distclean: distclean-am
510 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
511 -rm -f Makefile
512distclean-am: clean-am distclean-generic
513
514dvi: dvi-am
515
516dvi-am:
517
518html: html-am
519
520html-am:
521
522info: info-am
523
524info-am:
525
526install-data-am: install-dist_themeDATA
527 @$(NORMAL_INSTALL)
528 $(MAKE) $(AM_MAKEFLAGS) install-data-hook
529install-dvi: install-dvi-am
530
531install-dvi-am:
532
533install-exec-am:
534
535install-html: install-html-am
536
537install-html-am:
538
539install-info: install-info-am
540
541install-info-am:
542
543install-man:
544
545install-pdf: install-pdf-am
546
547install-pdf-am:
548
549install-ps: install-ps-am
550
551install-ps-am:
552
553installcheck-am:
554
555maintainer-clean: maintainer-clean-am
556 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
557 -rm -rf $(top_srcdir)/autom4te.cache
558 -rm -f Makefile
559maintainer-clean-am: distclean-am maintainer-clean-generic
560
561mostlyclean: mostlyclean-am
562
563mostlyclean-am: mostlyclean-generic
564
565pdf: pdf-am
566
567pdf-am:
568
569ps: ps-am
570
571ps-am:
572
573uninstall-am: uninstall-dist_themeDATA
574
575.MAKE: install-am install-data-am install-strip
576
577.PHONY: all all-am am--refresh check check-am clean clean-generic \
578 cscopelist-am ctags-am dist dist-all dist-bzip2 dist-gzip \
579 dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
580 distclean distclean-generic distcleancheck distdir \
581 distuninstallcheck dvi dvi-am html html-am info info-am \
582 install install-am install-data install-data-am \
583 install-data-hook install-dist_themeDATA install-dvi \
584 install-dvi-am install-exec install-exec-am install-html \
585 install-html-am install-info install-info-am install-man \
586 install-pdf install-pdf-am install-ps install-ps-am \
587 install-strip installcheck installcheck-am installdirs \
588 maintainer-clean maintainer-clean-generic mostlyclean \
589 mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
590 uninstall-am uninstall-dist_themeDATA
591
592
593install-data-hook:
594 mkdir -p $(DESTDIR)$(themedir)
23 for dir in $(ICON_SIZES); do \595 for dir in $(ICON_SIZES); do \
24 for ctxt in $(ICON_CONTEXTS); do \596 for ctxt in $(ICON_CONTEXTS); do \
25 mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$dir/$$ctxt; \597 mkdir -p $(DESTDIR)$(themedir)/$$dir/$$ctxt; \
26 if [ "$$ctxt" = "stock" ]; then \598 if [ "$$ctxt" = "stock" ]; then \
27 for sub in $(STOCK_SUBS); do \599 for sub in $(STOCK_SUBS); do \
28 mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$dir/$$ctxt/$$sub; \600 mkdir -p $(DESTDIR)$(themedir)/$$dir/$$ctxt/$$sub; \
29 done \601 done \
30 fi \602 fi \
31 done \603 done \
32 done604 done
33605
34dist:606# Tell versions [3.59,3.63) of GNU make to not export all variables.
35 rm -rf $(distdir)607# Otherwise a system limit (for SysV at least) may be exceeded.
36 mkdir $(distdir)608.NOEXPORT:
37 cp $(FILES) $(distdir)
38 tar czvf $(distdir).tar.gz $(distdir)
39 rm -rf $(distdir)
40
41tag:
42 cvs tag DEFAULT_ICON_THEME_`echo $(VERSION)|sed "s/\./_/"`
43
44# cause rebuilds
45Makefile: Makefile.in config.status
46 ./config.status Makefile
47configure: configure.ac
48 autoconf
49config.status: configure
50 ./config.status --recheck
51
52.PHONY: all install dist tag
53
54609
=== added file 'aclocal.m4'
--- aclocal.m4 1970-01-01 00:00:00 +0000
+++ aclocal.m4 2014-12-30 20:20:45 +0000
@@ -0,0 +1,754 @@
1# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
2
3# Copyright (C) 1996-2013 Free Software Foundation, Inc.
4
5# This file is free software; the Free Software Foundation
6# gives unlimited permission to copy and/or distribute it,
7# with or without modifications, as long as this notice is preserved.
8
9# This program is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
11# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12# PARTICULAR PURPOSE.
13
14m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15m4_ifndef([AC_AUTOCONF_VERSION],
16 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18[m4_warning([this file was generated for autoconf 2.69.
19You have another version of autoconf. It may work, but is not guaranteed to.
20If you have problems, you may need to regenerate the build system entirely.
21To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22
23# Copyright (C) 2002-2013 Free Software Foundation, Inc.
24#
25# This file is free software; the Free Software Foundation
26# gives unlimited permission to copy and/or distribute it,
27# with or without modifications, as long as this notice is preserved.
28
29# AM_AUTOMAKE_VERSION(VERSION)
30# ----------------------------
31# Automake X.Y traces this macro to ensure aclocal.m4 has been
32# generated from the m4 files accompanying Automake X.Y.
33# (This private macro should not be called outside this file.)
34AC_DEFUN([AM_AUTOMAKE_VERSION],
35[am__api_version='1.14'
36dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37dnl require some minimum version. Point them to the right macro.
38m4_if([$1], [1.14.1], [],
39 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40])
41
42# _AM_AUTOCONF_VERSION(VERSION)
43# -----------------------------
44# aclocal traces this macro to find the Autoconf version.
45# This is a private macro too. Using m4_define simplifies
46# the logic in aclocal, which can simply ignore this definition.
47m4_define([_AM_AUTOCONF_VERSION], [])
48
49# AM_SET_CURRENT_AUTOMAKE_VERSION
50# -------------------------------
51# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
52# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
53AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54[AM_AUTOMAKE_VERSION([1.14.1])dnl
55m4_ifndef([AC_AUTOCONF_VERSION],
56 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
57_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
58
59# AM_AUX_DIR_EXPAND -*- Autoconf -*-
60
61# Copyright (C) 2001-2013 Free Software Foundation, Inc.
62#
63# This file is free software; the Free Software Foundation
64# gives unlimited permission to copy and/or distribute it,
65# with or without modifications, as long as this notice is preserved.
66
67# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
68# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
69# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
70#
71# Of course, Automake must honor this variable whenever it calls a
72# tool from the auxiliary directory. The problem is that $srcdir (and
73# therefore $ac_aux_dir as well) can be either absolute or relative,
74# depending on how configure is run. This is pretty annoying, since
75# it makes $ac_aux_dir quite unusable in subdirectories: in the top
76# source directory, any form will work fine, but in subdirectories a
77# relative path needs to be adjusted first.
78#
79# $ac_aux_dir/missing
80# fails when called from a subdirectory if $ac_aux_dir is relative
81# $top_srcdir/$ac_aux_dir/missing
82# fails if $ac_aux_dir is absolute,
83# fails when called from a subdirectory in a VPATH build with
84# a relative $ac_aux_dir
85#
86# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
87# are both prefixed by $srcdir. In an in-source build this is usually
88# harmless because $srcdir is '.', but things will broke when you
89# start a VPATH build or use an absolute $srcdir.
90#
91# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
92# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
93# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
94# and then we would define $MISSING as
95# MISSING="\${SHELL} $am_aux_dir/missing"
96# This will work as long as MISSING is not called from configure, because
97# unfortunately $(top_srcdir) has no meaning in configure.
98# However there are other variables, like CC, which are often used in
99# configure, and could therefore not use this "fixed" $ac_aux_dir.
100#
101# Another solution, used here, is to always expand $ac_aux_dir to an
102# absolute PATH. The drawback is that using absolute paths prevent a
103# configured tree to be moved without reconfiguration.
104
105AC_DEFUN([AM_AUX_DIR_EXPAND],
106[dnl Rely on autoconf to set up CDPATH properly.
107AC_PREREQ([2.50])dnl
108# expand $ac_aux_dir to an absolute path
109am_aux_dir=`cd $ac_aux_dir && pwd`
110])
111
112# Do all the work for Automake. -*- Autoconf -*-
113
114# Copyright (C) 1996-2013 Free Software Foundation, Inc.
115#
116# This file is free software; the Free Software Foundation
117# gives unlimited permission to copy and/or distribute it,
118# with or without modifications, as long as this notice is preserved.
119
120# This macro actually does too much. Some checks are only needed if
121# your package does certain things. But this isn't really a big deal.
122
123dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
124m4_define([AC_PROG_CC],
125m4_defn([AC_PROG_CC])
126[_AM_PROG_CC_C_O
127])
128
129# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
130# AM_INIT_AUTOMAKE([OPTIONS])
131# -----------------------------------------------
132# The call with PACKAGE and VERSION arguments is the old style
133# call (pre autoconf-2.50), which is being phased out. PACKAGE
134# and VERSION should now be passed to AC_INIT and removed from
135# the call to AM_INIT_AUTOMAKE.
136# We support both call styles for the transition. After
137# the next Automake release, Autoconf can make the AC_INIT
138# arguments mandatory, and then we can depend on a new Autoconf
139# release and drop the old call support.
140AC_DEFUN([AM_INIT_AUTOMAKE],
141[AC_PREREQ([2.65])dnl
142dnl Autoconf wants to disallow AM_ names. We explicitly allow
143dnl the ones we care about.
144m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
145AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
146AC_REQUIRE([AC_PROG_INSTALL])dnl
147if test "`cd $srcdir && pwd`" != "`pwd`"; then
148 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
149 # is not polluted with repeated "-I."
150 AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
151 # test to see if srcdir already configured
152 if test -f $srcdir/config.status; then
153 AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
154 fi
155fi
156
157# test whether we have cygpath
158if test -z "$CYGPATH_W"; then
159 if (cygpath --version) >/dev/null 2>/dev/null; then
160 CYGPATH_W='cygpath -w'
161 else
162 CYGPATH_W=echo
163 fi
164fi
165AC_SUBST([CYGPATH_W])
166
167# Define the identity of the package.
168dnl Distinguish between old-style and new-style calls.
169m4_ifval([$2],
170[AC_DIAGNOSE([obsolete],
171 [$0: two- and three-arguments forms are deprecated.])
172m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
173 AC_SUBST([PACKAGE], [$1])dnl
174 AC_SUBST([VERSION], [$2])],
175[_AM_SET_OPTIONS([$1])dnl
176dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
177m4_if(
178 m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
179 [ok:ok],,
180 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
181 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
182 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
183
184_AM_IF_OPTION([no-define],,
185[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
186 AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
187
188# Some tools Automake needs.
189AC_REQUIRE([AM_SANITY_CHECK])dnl
190AC_REQUIRE([AC_ARG_PROGRAM])dnl
191AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
192AM_MISSING_PROG([AUTOCONF], [autoconf])
193AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
194AM_MISSING_PROG([AUTOHEADER], [autoheader])
195AM_MISSING_PROG([MAKEINFO], [makeinfo])
196AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
197AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
198AC_REQUIRE([AC_PROG_MKDIR_P])dnl
199# For better backward compatibility. To be removed once Automake 1.9.x
200# dies out for good. For more background, see:
201# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
202# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
203AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
204# We need awk for the "check" target. The system "awk" is bad on
205# some platforms.
206AC_REQUIRE([AC_PROG_AWK])dnl
207AC_REQUIRE([AC_PROG_MAKE_SET])dnl
208AC_REQUIRE([AM_SET_LEADING_DOT])dnl
209_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
210 [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
211 [_AM_PROG_TAR([v7])])])
212_AM_IF_OPTION([no-dependencies],,
213[AC_PROVIDE_IFELSE([AC_PROG_CC],
214 [_AM_DEPENDENCIES([CC])],
215 [m4_define([AC_PROG_CC],
216 m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
217AC_PROVIDE_IFELSE([AC_PROG_CXX],
218 [_AM_DEPENDENCIES([CXX])],
219 [m4_define([AC_PROG_CXX],
220 m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
221AC_PROVIDE_IFELSE([AC_PROG_OBJC],
222 [_AM_DEPENDENCIES([OBJC])],
223 [m4_define([AC_PROG_OBJC],
224 m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
225AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
226 [_AM_DEPENDENCIES([OBJCXX])],
227 [m4_define([AC_PROG_OBJCXX],
228 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
229])
230AC_REQUIRE([AM_SILENT_RULES])dnl
231dnl The testsuite driver may need to know about EXEEXT, so add the
232dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
233dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
234AC_CONFIG_COMMANDS_PRE(dnl
235[m4_provide_if([_AM_COMPILER_EXEEXT],
236 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
237
238# POSIX will say in a future version that running "rm -f" with no argument
239# is OK; and we want to be able to make that assumption in our Makefile
240# recipes. So use an aggressive probe to check that the usage we want is
241# actually supported "in the wild" to an acceptable degree.
242# See automake bug#10828.
243# To make any issue more visible, cause the running configure to be aborted
244# by default if the 'rm' program in use doesn't match our expectations; the
245# user can still override this though.
246if rm -f && rm -fr && rm -rf; then : OK; else
247 cat >&2 <<'END'
248Oops!
249
250Your 'rm' program seems unable to run without file operands specified
251on the command line, even when the '-f' option is present. This is contrary
252to the behaviour of most rm programs out there, and not conforming with
253the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
254
255Please tell bug-automake@gnu.org about your system, including the value
256of your $PATH and any error possibly output before this message. This
257can help us improve future automake versions.
258
259END
260 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
261 echo 'Configuration will proceed anyway, since you have set the' >&2
262 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
263 echo >&2
264 else
265 cat >&2 <<'END'
266Aborting the configuration process, to ensure you take notice of the issue.
267
268You can download and install GNU coreutils to get an 'rm' implementation
269that behaves properly: <http://www.gnu.org/software/coreutils/>.
270
271If you want to complete the configuration process using your problematic
272'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
273to "yes", and re-run configure.
274
275END
276 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
277 fi
278fi])
279
280dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
281dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
282dnl mangled by Autoconf and run in a shell conditional statement.
283m4_define([_AC_COMPILER_EXEEXT],
284m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
285
286# When config.status generates a header, we must update the stamp-h file.
287# This file resides in the same directory as the config header
288# that is generated. The stamp files are numbered to have different names.
289
290# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
291# loop where config.status creates the headers, so we can generate
292# our stamp files there.
293AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
294[# Compute $1's index in $config_headers.
295_am_arg=$1
296_am_stamp_count=1
297for _am_header in $config_headers :; do
298 case $_am_header in
299 $_am_arg | $_am_arg:* )
300 break ;;
301 * )
302 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
303 esac
304done
305echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
306
307# Copyright (C) 2001-2013 Free Software Foundation, Inc.
308#
309# This file is free software; the Free Software Foundation
310# gives unlimited permission to copy and/or distribute it,
311# with or without modifications, as long as this notice is preserved.
312
313# AM_PROG_INSTALL_SH
314# ------------------
315# Define $install_sh.
316AC_DEFUN([AM_PROG_INSTALL_SH],
317[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
318if test x"${install_sh}" != xset; then
319 case $am_aux_dir in
320 *\ * | *\ *)
321 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
322 *)
323 install_sh="\${SHELL} $am_aux_dir/install-sh"
324 esac
325fi
326AC_SUBST([install_sh])])
327
328# Copyright (C) 2003-2013 Free Software Foundation, Inc.
329#
330# This file is free software; the Free Software Foundation
331# gives unlimited permission to copy and/or distribute it,
332# with or without modifications, as long as this notice is preserved.
333
334# Check whether the underlying file-system supports filenames
335# with a leading dot. For instance MS-DOS doesn't.
336AC_DEFUN([AM_SET_LEADING_DOT],
337[rm -rf .tst 2>/dev/null
338mkdir .tst 2>/dev/null
339if test -d .tst; then
340 am__leading_dot=.
341else
342 am__leading_dot=_
343fi
344rmdir .tst 2>/dev/null
345AC_SUBST([am__leading_dot])])
346
347# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
348
349# Copyright (C) 1997-2013 Free Software Foundation, Inc.
350#
351# This file is free software; the Free Software Foundation
352# gives unlimited permission to copy and/or distribute it,
353# with or without modifications, as long as this notice is preserved.
354
355# AM_MISSING_PROG(NAME, PROGRAM)
356# ------------------------------
357AC_DEFUN([AM_MISSING_PROG],
358[AC_REQUIRE([AM_MISSING_HAS_RUN])
359$1=${$1-"${am_missing_run}$2"}
360AC_SUBST($1)])
361
362# AM_MISSING_HAS_RUN
363# ------------------
364# Define MISSING if not defined so far and test if it is modern enough.
365# If it is, set am_missing_run to use it, otherwise, to nothing.
366AC_DEFUN([AM_MISSING_HAS_RUN],
367[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
368AC_REQUIRE_AUX_FILE([missing])dnl
369if test x"${MISSING+set}" != xset; then
370 case $am_aux_dir in
371 *\ * | *\ *)
372 MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
373 *)
374 MISSING="\${SHELL} $am_aux_dir/missing" ;;
375 esac
376fi
377# Use eval to expand $SHELL
378if eval "$MISSING --is-lightweight"; then
379 am_missing_run="$MISSING "
380else
381 am_missing_run=
382 AC_MSG_WARN(['missing' script is too old or missing])
383fi
384])
385
386# Helper functions for option handling. -*- Autoconf -*-
387
388# Copyright (C) 2001-2013 Free Software Foundation, Inc.
389#
390# This file is free software; the Free Software Foundation
391# gives unlimited permission to copy and/or distribute it,
392# with or without modifications, as long as this notice is preserved.
393
394# _AM_MANGLE_OPTION(NAME)
395# -----------------------
396AC_DEFUN([_AM_MANGLE_OPTION],
397[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
398
399# _AM_SET_OPTION(NAME)
400# --------------------
401# Set option NAME. Presently that only means defining a flag for this option.
402AC_DEFUN([_AM_SET_OPTION],
403[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
404
405# _AM_SET_OPTIONS(OPTIONS)
406# ------------------------
407# OPTIONS is a space-separated list of Automake options.
408AC_DEFUN([_AM_SET_OPTIONS],
409[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
410
411# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
412# -------------------------------------------
413# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
414AC_DEFUN([_AM_IF_OPTION],
415[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
416
417# Copyright (C) 2001-2013 Free Software Foundation, Inc.
418#
419# This file is free software; the Free Software Foundation
420# gives unlimited permission to copy and/or distribute it,
421# with or without modifications, as long as this notice is preserved.
422
423# AM_RUN_LOG(COMMAND)
424# -------------------
425# Run COMMAND, save the exit status in ac_status, and log it.
426# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
427AC_DEFUN([AM_RUN_LOG],
428[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
429 ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
430 ac_status=$?
431 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
432 (exit $ac_status); }])
433
434# Check to make sure that the build environment is sane. -*- Autoconf -*-
435
436# Copyright (C) 1996-2013 Free Software Foundation, Inc.
437#
438# This file is free software; the Free Software Foundation
439# gives unlimited permission to copy and/or distribute it,
440# with or without modifications, as long as this notice is preserved.
441
442# AM_SANITY_CHECK
443# ---------------
444AC_DEFUN([AM_SANITY_CHECK],
445[AC_MSG_CHECKING([whether build environment is sane])
446# Reject unsafe characters in $srcdir or the absolute working directory
447# name. Accept space and tab only in the latter.
448am_lf='
449'
450case `pwd` in
451 *[[\\\"\#\$\&\'\`$am_lf]]*)
452 AC_MSG_ERROR([unsafe absolute working directory name]);;
453esac
454case $srcdir in
455 *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
456 AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
457esac
458
459# Do 'set' in a subshell so we don't clobber the current shell's
460# arguments. Must try -L first in case configure is actually a
461# symlink; some systems play weird games with the mod time of symlinks
462# (eg FreeBSD returns the mod time of the symlink's containing
463# directory).
464if (
465 am_has_slept=no
466 for am_try in 1 2; do
467 echo "timestamp, slept: $am_has_slept" > conftest.file
468 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
469 if test "$[*]" = "X"; then
470 # -L didn't work.
471 set X `ls -t "$srcdir/configure" conftest.file`
472 fi
473 if test "$[*]" != "X $srcdir/configure conftest.file" \
474 && test "$[*]" != "X conftest.file $srcdir/configure"; then
475
476 # If neither matched, then we have a broken ls. This can happen
477 # if, for instance, CONFIG_SHELL is bash and it inherits a
478 # broken ls alias from the environment. This has actually
479 # happened. Such a system could not be considered "sane".
480 AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
481 alias in your environment])
482 fi
483 if test "$[2]" = conftest.file || test $am_try -eq 2; then
484 break
485 fi
486 # Just in case.
487 sleep 1
488 am_has_slept=yes
489 done
490 test "$[2]" = conftest.file
491 )
492then
493 # Ok.
494 :
495else
496 AC_MSG_ERROR([newly created file is older than distributed files!
497Check your system clock])
498fi
499AC_MSG_RESULT([yes])
500# If we didn't sleep, we still need to ensure time stamps of config.status and
501# generated files are strictly newer.
502am_sleep_pid=
503if grep 'slept: no' conftest.file >/dev/null 2>&1; then
504 ( sleep 1 ) &
505 am_sleep_pid=$!
506fi
507AC_CONFIG_COMMANDS_PRE(
508 [AC_MSG_CHECKING([that generated files are newer than configure])
509 if test -n "$am_sleep_pid"; then
510 # Hide warnings about reused PIDs.
511 wait $am_sleep_pid 2>/dev/null
512 fi
513 AC_MSG_RESULT([done])])
514rm -f conftest.file
515])
516
517# Copyright (C) 2009-2013 Free Software Foundation, Inc.
518#
519# This file is free software; the Free Software Foundation
520# gives unlimited permission to copy and/or distribute it,
521# with or without modifications, as long as this notice is preserved.
522
523# AM_SILENT_RULES([DEFAULT])
524# --------------------------
525# Enable less verbose build rules; with the default set to DEFAULT
526# ("yes" being less verbose, "no" or empty being verbose).
527AC_DEFUN([AM_SILENT_RULES],
528[AC_ARG_ENABLE([silent-rules], [dnl
529AS_HELP_STRING(
530 [--enable-silent-rules],
531 [less verbose build output (undo: "make V=1")])
532AS_HELP_STRING(
533 [--disable-silent-rules],
534 [verbose build output (undo: "make V=0")])dnl
535])
536case $enable_silent_rules in @%:@ (((
537 yes) AM_DEFAULT_VERBOSITY=0;;
538 no) AM_DEFAULT_VERBOSITY=1;;
539 *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
540esac
541dnl
542dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
543dnl do not support nested variable expansions.
544dnl See automake bug#9928 and bug#10237.
545am_make=${MAKE-make}
546AC_CACHE_CHECK([whether $am_make supports nested variables],
547 [am_cv_make_support_nested_variables],
548 [if AS_ECHO([['TRUE=$(BAR$(V))
549BAR0=false
550BAR1=true
551V=1
552am__doit:
553 @$(TRUE)
554.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
555 am_cv_make_support_nested_variables=yes
556else
557 am_cv_make_support_nested_variables=no
558fi])
559if test $am_cv_make_support_nested_variables = yes; then
560 dnl Using '$V' instead of '$(V)' breaks IRIX make.
561 AM_V='$(V)'
562 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
563else
564 AM_V=$AM_DEFAULT_VERBOSITY
565 AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
566fi
567AC_SUBST([AM_V])dnl
568AM_SUBST_NOTMAKE([AM_V])dnl
569AC_SUBST([AM_DEFAULT_V])dnl
570AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
571AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
572AM_BACKSLASH='\'
573AC_SUBST([AM_BACKSLASH])dnl
574_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
575])
576
577# Copyright (C) 2001-2013 Free Software Foundation, Inc.
578#
579# This file is free software; the Free Software Foundation
580# gives unlimited permission to copy and/or distribute it,
581# with or without modifications, as long as this notice is preserved.
582
583# AM_PROG_INSTALL_STRIP
584# ---------------------
585# One issue with vendor 'install' (even GNU) is that you can't
586# specify the program used to strip binaries. This is especially
587# annoying in cross-compiling environments, where the build's strip
588# is unlikely to handle the host's binaries.
589# Fortunately install-sh will honor a STRIPPROG variable, so we
590# always use install-sh in "make install-strip", and initialize
591# STRIPPROG with the value of the STRIP variable (set by the user).
592AC_DEFUN([AM_PROG_INSTALL_STRIP],
593[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
594# Installed binaries are usually stripped using 'strip' when the user
595# run "make install-strip". However 'strip' might not be the right
596# tool to use in cross-compilation environments, therefore Automake
597# will honor the 'STRIP' environment variable to overrule this program.
598dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
599if test "$cross_compiling" != no; then
600 AC_CHECK_TOOL([STRIP], [strip], :)
601fi
602INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
603AC_SUBST([INSTALL_STRIP_PROGRAM])])
604
605# Copyright (C) 2006-2013 Free Software Foundation, Inc.
606#
607# This file is free software; the Free Software Foundation
608# gives unlimited permission to copy and/or distribute it,
609# with or without modifications, as long as this notice is preserved.
610
611# _AM_SUBST_NOTMAKE(VARIABLE)
612# ---------------------------
613# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
614# This macro is traced by Automake.
615AC_DEFUN([_AM_SUBST_NOTMAKE])
616
617# AM_SUBST_NOTMAKE(VARIABLE)
618# --------------------------
619# Public sister of _AM_SUBST_NOTMAKE.
620AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
621
622# Check how to create a tarball. -*- Autoconf -*-
623
624# Copyright (C) 2004-2013 Free Software Foundation, Inc.
625#
626# This file is free software; the Free Software Foundation
627# gives unlimited permission to copy and/or distribute it,
628# with or without modifications, as long as this notice is preserved.
629
630# _AM_PROG_TAR(FORMAT)
631# --------------------
632# Check how to create a tarball in format FORMAT.
633# FORMAT should be one of 'v7', 'ustar', or 'pax'.
634#
635# Substitute a variable $(am__tar) that is a command
636# writing to stdout a FORMAT-tarball containing the directory
637# $tardir.
638# tardir=directory && $(am__tar) > result.tar
639#
640# Substitute a variable $(am__untar) that extract such
641# a tarball read from stdin.
642# $(am__untar) < result.tar
643#
644AC_DEFUN([_AM_PROG_TAR],
645[# Always define AMTAR for backward compatibility. Yes, it's still used
646# in the wild :-( We should find a proper way to deprecate it ...
647AC_SUBST([AMTAR], ['$${TAR-tar}'])
648
649# We'll loop over all known methods to create a tar archive until one works.
650_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
651
652m4_if([$1], [v7],
653 [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
654
655 [m4_case([$1],
656 [ustar],
657 [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
658 # There is notably a 21 bits limit for the UID and the GID. In fact,
659 # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
660 # and bug#13588).
661 am_max_uid=2097151 # 2^21 - 1
662 am_max_gid=$am_max_uid
663 # The $UID and $GID variables are not portable, so we need to resort
664 # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
665 # below are definitely unexpected, so allow the users to see them
666 # (that is, avoid stderr redirection).
667 am_uid=`id -u || echo unknown`
668 am_gid=`id -g || echo unknown`
669 AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
670 if test $am_uid -le $am_max_uid; then
671 AC_MSG_RESULT([yes])
672 else
673 AC_MSG_RESULT([no])
674 _am_tools=none
675 fi
676 AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
677 if test $am_gid -le $am_max_gid; then
678 AC_MSG_RESULT([yes])
679 else
680 AC_MSG_RESULT([no])
681 _am_tools=none
682 fi],
683
684 [pax],
685 [],
686
687 [m4_fatal([Unknown tar format])])
688
689 AC_MSG_CHECKING([how to create a $1 tar archive])
690
691 # Go ahead even if we have the value already cached. We do so because we
692 # need to set the values for the 'am__tar' and 'am__untar' variables.
693 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
694
695 for _am_tool in $_am_tools; do
696 case $_am_tool in
697 gnutar)
698 for _am_tar in tar gnutar gtar; do
699 AM_RUN_LOG([$_am_tar --version]) && break
700 done
701 am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
702 am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
703 am__untar="$_am_tar -xf -"
704 ;;
705 plaintar)
706 # Must skip GNU tar: if it does not support --format= it doesn't create
707 # ustar tarball either.
708 (tar --version) >/dev/null 2>&1 && continue
709 am__tar='tar chf - "$$tardir"'
710 am__tar_='tar chf - "$tardir"'
711 am__untar='tar xf -'
712 ;;
713 pax)
714 am__tar='pax -L -x $1 -w "$$tardir"'
715 am__tar_='pax -L -x $1 -w "$tardir"'
716 am__untar='pax -r'
717 ;;
718 cpio)
719 am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
720 am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
721 am__untar='cpio -i -H $1 -d'
722 ;;
723 none)
724 am__tar=false
725 am__tar_=false
726 am__untar=false
727 ;;
728 esac
729
730 # If the value was cached, stop now. We just wanted to have am__tar
731 # and am__untar set.
732 test -n "${am_cv_prog_tar_$1}" && break
733
734 # tar/untar a dummy directory, and stop if the command works.
735 rm -rf conftest.dir
736 mkdir conftest.dir
737 echo GrepMe > conftest.dir/file
738 AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
739 rm -rf conftest.dir
740 if test -s conftest.tar; then
741 AM_RUN_LOG([$am__untar <conftest.tar])
742 AM_RUN_LOG([cat conftest.dir/file])
743 grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
744 fi
745 done
746 rm -rf conftest.dir
747
748 AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
749 AC_MSG_RESULT([$am_cv_prog_tar_$1])])
750
751AC_SUBST([am__tar])
752AC_SUBST([am__untar])
753]) # _AM_PROG_TAR
754
0755
=== added file 'autogen.sh'
--- autogen.sh 1970-01-01 00:00:00 +0000
+++ autogen.sh 2014-12-30 20:20:45 +0000
@@ -0,0 +1,61 @@
1#!/bin/sh
2# Run this to generate all the initial makefiles, etc.
3
4srcdir=`dirname $0`
5test -z "$srcdir" && srcdir=.
6
7ORIGDIR=`pwd`
8cd $srcdir
9
10PROJECT=hicolor-icon-theme
11TEST_TYPE=-f
12FILE=index.theme
13
14DIE=0
15
16(autoconf --version) < /dev/null > /dev/null 2>&1 || {
17 echo
18 echo "You must have autoconf installed to compile $PROJECT."
19 echo "Download the appropriate package for your distribution,"
20 echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
21 DIE=1
22}
23
24if test "$DIE" -eq 1; then
25 exit 1
26fi
27
28test $TEST_TYPE $FILE || {
29 echo "You must run this script in the top-level $PROJECT directory"
30 exit 1
31}
32
33if test -z "$*"; then
34 echo "I am going to run ./configure with no arguments - if you wish "
35 echo "to pass any to it, please specify them on the $0 command line."
36fi
37
38autoreconf --force --install || echo "autoconf failed - version 2.5x is probably required"
39
40cd $ORIGDIR
41
42run_configure=true
43for arg in $*; do
44 case $arg in
45 --no-configure)
46 run_configure=false
47 ;;
48 *)
49 ;;
50 esac
51done
52
53if $run_configure; then
54 $srcdir/configure --enable-maintainer-mode --config-cache "$@"
55 echo
56 echo "Now type 'make' to compile $PROJECT."
57else
58 echo
59 echo "Now run 'configure' and 'make' to compile $PROJECT."
60fi
61
062
=== modified file 'configure'
--- configure 2013-12-29 10:37:45 +0000
+++ configure 2014-12-30 20:20:45 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
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.
4#4#
5#5#
6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,13 +576,37 @@
576# Identity of this package.576# Identity of this package.
577PACKAGE_NAME='hicolor-icon-theme'577PACKAGE_NAME='hicolor-icon-theme'
578PACKAGE_TARNAME='hicolor-icon-theme'578PACKAGE_TARNAME='hicolor-icon-theme'
579PACKAGE_VERSION='0.13'579PACKAGE_VERSION='0.14'
580PACKAGE_STRING='hicolor-icon-theme 0.13'580PACKAGE_STRING='hicolor-icon-theme 0.14'
581PACKAGE_BUGREPORT=''581PACKAGE_BUGREPORT=''
582PACKAGE_URL=''582PACKAGE_URL=''
583583
584ac_subst_vars='LTLIBOBJS584ac_subst_vars='LTLIBOBJS
585LIBOBJS585LIBOBJS
586AM_BACKSLASH
587AM_DEFAULT_VERBOSITY
588AM_DEFAULT_V
589AM_V
590am__untar
591am__tar
592AMTAR
593am__leading_dot
594SET_MAKE
595AWK
596mkdir_p
597MKDIR_P
598INSTALL_STRIP_PROGRAM
599STRIP
600install_sh
601MAKEINFO
602AUTOHEADER
603AUTOMAKE
604AUTOCONF
605ACLOCAL
606VERSION
607PACKAGE
608CYGPATH_W
609am__isrc
586INSTALL_DATA610INSTALL_DATA
587INSTALL_SCRIPT611INSTALL_SCRIPT
588INSTALL_PROGRAM612INSTALL_PROGRAM
@@ -627,6 +651,7 @@
627ac_subst_files=''651ac_subst_files=''
628ac_user_opts='652ac_user_opts='
629enable_option_checking653enable_option_checking
654enable_silent_rules
630'655'
631 ac_precious_vars='build_alias656 ac_precious_vars='build_alias
632host_alias657host_alias
@@ -1171,7 +1196,7 @@
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.
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.
1173 cat <<_ACEOF1198 cat <<_ACEOF
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.
11751200
1176Usage: $0 [OPTION]... [VAR=VALUE]...1201Usage: $0 [OPTION]... [VAR=VALUE]...
11771202
@@ -1228,15 +1253,27 @@
1228_ACEOF1253_ACEOF
12291254
1230 cat <<\_ACEOF1255 cat <<\_ACEOF
1256
1257Program names:
1258 --program-prefix=PREFIX prepend PREFIX to installed program names
1259 --program-suffix=SUFFIX append SUFFIX to installed program names
1260 --program-transform-name=PROGRAM run sed PROGRAM on installed program names
1231_ACEOF1261_ACEOF
1232fi1262fi
12331263
1234if test -n "$ac_init_help"; then1264if test -n "$ac_init_help"; then
1235 case $ac_init_help in1265 case $ac_init_help in
1236 short | recursive ) echo "Configuration of hicolor-icon-theme 0.13:";;1266 short | recursive ) echo "Configuration of hicolor-icon-theme 0.14:";;
1237 esac1267 esac
1238 cat <<\_ACEOF1268 cat <<\_ACEOF
12391269
1270Optional Features:
1271 --disable-option-checking ignore unrecognized --enable/--with options
1272 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1273 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1274 --enable-silent-rules less verbose build output (undo: "make V=1")
1275 --disable-silent-rules verbose build output (undo: "make V=0")
1276
1240Report bugs to the package provider.1277Report bugs to the package provider.
1241_ACEOF1278_ACEOF
1242ac_status=$?1279ac_status=$?
@@ -1300,7 +1337,7 @@
1300test -n "$ac_init_help" && exit $ac_status1337test -n "$ac_init_help" && exit $ac_status
1301if $ac_init_version; then1338if $ac_init_version; then
1302 cat <<\_ACEOF1339 cat <<\_ACEOF
1303hicolor-icon-theme configure 0.131340hicolor-icon-theme configure 0.14
1304generated by GNU Autoconf 2.691341generated by GNU Autoconf 2.69
13051342
1306Copyright (C) 2012 Free Software Foundation, Inc.1343Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1317,7 +1354,7 @@
1317This file contains any messages produced by compilers while1354This file contains any messages produced by compilers while
1318running configure, to aid debugging if configure makes a mistake.1355running configure, to aid debugging if configure makes a mistake.
13191356
1320It was created by hicolor-icon-theme $as_me 0.13, which was1357It was created by hicolor-icon-theme $as_me 0.14, which was
1321generated by GNU Autoconf 2.69. Invocation command line was1358generated by GNU Autoconf 2.69. Invocation command line was
13221359
1323 $ $0 $@1360 $ $0 $@
@@ -1665,6 +1702,7 @@
1665ac_compiler_gnu=$ac_cv_c_compiler_gnu1702ac_compiler_gnu=$ac_cv_c_compiler_gnu
16661703
16671704
1705am__api_version='1.14'
16681706
1669ac_aux_dir=1707ac_aux_dir=
1670for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do1708for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1788,6 +1826,607 @@
17881826
1789test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'1827test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
17901828
1829{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
1830$as_echo_n "checking whether build environment is sane... " >&6; }
1831# Reject unsafe characters in $srcdir or the absolute working directory
1832# name. Accept space and tab only in the latter.
1833am_lf='
1834'
1835case `pwd` in
1836 *[\\\"\#\$\&\'\`$am_lf]*)
1837 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
1838esac
1839case $srcdir in
1840 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
1841 as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
1842esac
1843
1844# Do 'set' in a subshell so we don't clobber the current shell's
1845# arguments. Must try -L first in case configure is actually a
1846# symlink; some systems play weird games with the mod time of symlinks
1847# (eg FreeBSD returns the mod time of the symlink's containing
1848# directory).
1849if (
1850 am_has_slept=no
1851 for am_try in 1 2; do
1852 echo "timestamp, slept: $am_has_slept" > conftest.file
1853 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1854 if test "$*" = "X"; then
1855 # -L didn't work.
1856 set X `ls -t "$srcdir/configure" conftest.file`
1857 fi
1858 if test "$*" != "X $srcdir/configure conftest.file" \
1859 && test "$*" != "X conftest.file $srcdir/configure"; then
1860
1861 # If neither matched, then we have a broken ls. This can happen
1862 # if, for instance, CONFIG_SHELL is bash and it inherits a
1863 # broken ls alias from the environment. This has actually
1864 # happened. Such a system could not be considered "sane".
1865 as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
1866 alias in your environment" "$LINENO" 5
1867 fi
1868 if test "$2" = conftest.file || test $am_try -eq 2; then
1869 break
1870 fi
1871 # Just in case.
1872 sleep 1
1873 am_has_slept=yes
1874 done
1875 test "$2" = conftest.file
1876 )
1877then
1878 # Ok.
1879 :
1880else
1881 as_fn_error $? "newly created file is older than distributed files!
1882Check your system clock" "$LINENO" 5
1883fi
1884{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1885$as_echo "yes" >&6; }
1886# If we didn't sleep, we still need to ensure time stamps of config.status and
1887# generated files are strictly newer.
1888am_sleep_pid=
1889if grep 'slept: no' conftest.file >/dev/null 2>&1; then
1890 ( sleep 1 ) &
1891 am_sleep_pid=$!
1892fi
1893
1894rm -f conftest.file
1895
1896test "$program_prefix" != NONE &&
1897 program_transform_name="s&^&$program_prefix&;$program_transform_name"
1898# Use a double $ so make ignores it.
1899test "$program_suffix" != NONE &&
1900 program_transform_name="s&\$&$program_suffix&;$program_transform_name"
1901# Double any \ or $.
1902# By default was `s,x,x', remove it if useless.
1903ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
1904program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
1905
1906# expand $ac_aux_dir to an absolute path
1907am_aux_dir=`cd $ac_aux_dir && pwd`
1908
1909if test x"${MISSING+set}" != xset; then
1910 case $am_aux_dir in
1911 *\ * | *\ *)
1912 MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
1913 *)
1914 MISSING="\${SHELL} $am_aux_dir/missing" ;;
1915 esac
1916fi
1917# Use eval to expand $SHELL
1918if eval "$MISSING --is-lightweight"; then
1919 am_missing_run="$MISSING "
1920else
1921 am_missing_run=
1922 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
1923$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
1924fi
1925
1926if test x"${install_sh}" != xset; then
1927 case $am_aux_dir in
1928 *\ * | *\ *)
1929 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
1930 *)
1931 install_sh="\${SHELL} $am_aux_dir/install-sh"
1932 esac
1933fi
1934
1935# Installed binaries are usually stripped using 'strip' when the user
1936# run "make install-strip". However 'strip' might not be the right
1937# tool to use in cross-compilation environments, therefore Automake
1938# will honor the 'STRIP' environment variable to overrule this program.
1939if test "$cross_compiling" != no; then
1940 if test -n "$ac_tool_prefix"; then
1941 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1942set dummy ${ac_tool_prefix}strip; ac_word=$2
1943{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1944$as_echo_n "checking for $ac_word... " >&6; }
1945if ${ac_cv_prog_STRIP+:} false; then :
1946 $as_echo_n "(cached) " >&6
1947else
1948 if test -n "$STRIP"; then
1949 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
1950else
1951as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1952for as_dir in $PATH
1953do
1954 IFS=$as_save_IFS
1955 test -z "$as_dir" && as_dir=.
1956 for ac_exec_ext in '' $ac_executable_extensions; do
1957 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1958 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
1959 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1960 break 2
1961 fi
1962done
1963 done
1964IFS=$as_save_IFS
1965
1966fi
1967fi
1968STRIP=$ac_cv_prog_STRIP
1969if test -n "$STRIP"; then
1970 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1971$as_echo "$STRIP" >&6; }
1972else
1973 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1974$as_echo "no" >&6; }
1975fi
1976
1977
1978fi
1979if test -z "$ac_cv_prog_STRIP"; then
1980 ac_ct_STRIP=$STRIP
1981 # Extract the first word of "strip", so it can be a program name with args.
1982set dummy strip; ac_word=$2
1983{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1984$as_echo_n "checking for $ac_word... " >&6; }
1985if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1986 $as_echo_n "(cached) " >&6
1987else
1988 if test -n "$ac_ct_STRIP"; then
1989 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
1990else
1991as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1992for as_dir in $PATH
1993do
1994 IFS=$as_save_IFS
1995 test -z "$as_dir" && as_dir=.
1996 for ac_exec_ext in '' $ac_executable_extensions; do
1997 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1998 ac_cv_prog_ac_ct_STRIP="strip"
1999 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2000 break 2
2001 fi
2002done
2003 done
2004IFS=$as_save_IFS
2005
2006fi
2007fi
2008ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2009if test -n "$ac_ct_STRIP"; then
2010 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
2011$as_echo "$ac_ct_STRIP" >&6; }
2012else
2013 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2014$as_echo "no" >&6; }
2015fi
2016
2017 if test "x$ac_ct_STRIP" = x; then
2018 STRIP=":"
2019 else
2020 case $cross_compiling:$ac_tool_warned in
2021yes:)
2022{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2023$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2024ac_tool_warned=yes ;;
2025esac
2026 STRIP=$ac_ct_STRIP
2027 fi
2028else
2029 STRIP="$ac_cv_prog_STRIP"
2030fi
2031
2032fi
2033INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2034
2035{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
2036$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
2037if test -z "$MKDIR_P"; then
2038 if ${ac_cv_path_mkdir+:} false; then :
2039 $as_echo_n "(cached) " >&6
2040else
2041 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2042for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
2043do
2044 IFS=$as_save_IFS
2045 test -z "$as_dir" && as_dir=.
2046 for ac_prog in mkdir gmkdir; do
2047 for ac_exec_ext in '' $ac_executable_extensions; do
2048 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
2049 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2050 'mkdir (GNU coreutils) '* | \
2051 'mkdir (coreutils) '* | \
2052 'mkdir (fileutils) '4.1*)
2053 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
2054 break 3;;
2055 esac
2056 done
2057 done
2058 done
2059IFS=$as_save_IFS
2060
2061fi
2062
2063 test -d ./--version && rmdir ./--version
2064 if test "${ac_cv_path_mkdir+set}" = set; then
2065 MKDIR_P="$ac_cv_path_mkdir -p"
2066 else
2067 # As a last resort, use the slow shell script. Don't cache a
2068 # value for MKDIR_P within a source directory, because that will
2069 # break other packages using the cache if that directory is
2070 # removed, or if the value is a relative name.
2071 MKDIR_P="$ac_install_sh -d"
2072 fi
2073fi
2074{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2075$as_echo "$MKDIR_P" >&6; }
2076
2077for ac_prog in gawk mawk nawk awk
2078do
2079 # Extract the first word of "$ac_prog", so it can be a program name with args.
2080set dummy $ac_prog; ac_word=$2
2081{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2082$as_echo_n "checking for $ac_word... " >&6; }
2083if ${ac_cv_prog_AWK+:} false; then :
2084 $as_echo_n "(cached) " >&6
2085else
2086 if test -n "$AWK"; then
2087 ac_cv_prog_AWK="$AWK" # Let the user override the test.
2088else
2089as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2090for as_dir in $PATH
2091do
2092 IFS=$as_save_IFS
2093 test -z "$as_dir" && as_dir=.
2094 for ac_exec_ext in '' $ac_executable_extensions; do
2095 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2096 ac_cv_prog_AWK="$ac_prog"
2097 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2098 break 2
2099 fi
2100done
2101 done
2102IFS=$as_save_IFS
2103
2104fi
2105fi
2106AWK=$ac_cv_prog_AWK
2107if test -n "$AWK"; then
2108 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
2109$as_echo "$AWK" >&6; }
2110else
2111 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2112$as_echo "no" >&6; }
2113fi
2114
2115
2116 test -n "$AWK" && break
2117done
2118
2119{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2120$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2121set x ${MAKE-make}
2122ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2123if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
2124 $as_echo_n "(cached) " >&6
2125else
2126 cat >conftest.make <<\_ACEOF
2127SHELL = /bin/sh
2128all:
2129 @echo '@@@%%%=$(MAKE)=@@@%%%'
2130_ACEOF
2131# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
2132case `${MAKE-make} -f conftest.make 2>/dev/null` in
2133 *@@@%%%=?*=@@@%%%*)
2134 eval ac_cv_prog_make_${ac_make}_set=yes;;
2135 *)
2136 eval ac_cv_prog_make_${ac_make}_set=no;;
2137esac
2138rm -f conftest.make
2139fi
2140if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2141 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2142$as_echo "yes" >&6; }
2143 SET_MAKE=
2144else
2145 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2146$as_echo "no" >&6; }
2147 SET_MAKE="MAKE=${MAKE-make}"
2148fi
2149
2150rm -rf .tst 2>/dev/null
2151mkdir .tst 2>/dev/null
2152if test -d .tst; then
2153 am__leading_dot=.
2154else
2155 am__leading_dot=_
2156fi
2157rmdir .tst 2>/dev/null
2158
2159# Check whether --enable-silent-rules was given.
2160if test "${enable_silent_rules+set}" = set; then :
2161 enableval=$enable_silent_rules;
2162fi
2163
2164case $enable_silent_rules in # (((
2165 yes) AM_DEFAULT_VERBOSITY=0;;
2166 no) AM_DEFAULT_VERBOSITY=1;;
2167 *) AM_DEFAULT_VERBOSITY=1;;
2168esac
2169am_make=${MAKE-make}
2170{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2171$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2172if ${am_cv_make_support_nested_variables+:} false; then :
2173 $as_echo_n "(cached) " >&6
2174else
2175 if $as_echo 'TRUE=$(BAR$(V))
2176BAR0=false
2177BAR1=true
2178V=1
2179am__doit:
2180 @$(TRUE)
2181.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2182 am_cv_make_support_nested_variables=yes
2183else
2184 am_cv_make_support_nested_variables=no
2185fi
2186fi
2187{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2188$as_echo "$am_cv_make_support_nested_variables" >&6; }
2189if test $am_cv_make_support_nested_variables = yes; then
2190 AM_V='$(V)'
2191 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2192else
2193 AM_V=$AM_DEFAULT_VERBOSITY
2194 AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2195fi
2196AM_BACKSLASH='\'
2197
2198if test "`cd $srcdir && pwd`" != "`pwd`"; then
2199 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2200 # is not polluted with repeated "-I."
2201 am__isrc=' -I$(srcdir)'
2202 # test to see if srcdir already configured
2203 if test -f $srcdir/config.status; then
2204 as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
2205 fi
2206fi
2207
2208# test whether we have cygpath
2209if test -z "$CYGPATH_W"; then
2210 if (cygpath --version) >/dev/null 2>/dev/null; then
2211 CYGPATH_W='cygpath -w'
2212 else
2213 CYGPATH_W=echo
2214 fi
2215fi
2216
2217
2218# Define the identity of the package.
2219 PACKAGE='hicolor-icon-theme'
2220 VERSION='0.14'
2221
2222
2223cat >>confdefs.h <<_ACEOF
2224#define PACKAGE "$PACKAGE"
2225_ACEOF
2226
2227
2228cat >>confdefs.h <<_ACEOF
2229#define VERSION "$VERSION"
2230_ACEOF
2231
2232# Some tools Automake needs.
2233
2234ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
2235
2236
2237AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
2238
2239
2240AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
2241
2242
2243AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
2244
2245
2246MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
2247
2248# For better backward compatibility. To be removed once Automake 1.9.x
2249# dies out for good. For more background, see:
2250# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2251# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2252mkdir_p='$(MKDIR_P)'
2253
2254# We need awk for the "check" target. The system "awk" is bad on
2255# some platforms.
2256# Always define AMTAR for backward compatibility. Yes, it's still used
2257# in the wild :-( We should find a proper way to deprecate it ...
2258AMTAR='$${TAR-tar}'
2259
2260
2261# We'll loop over all known methods to create a tar archive until one works.
2262_am_tools='gnutar plaintar pax cpio none'
2263
2264# The POSIX 1988 'ustar' format is defined with fixed-size fields.
2265 # There is notably a 21 bits limit for the UID and the GID. In fact,
2266 # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
2267 # and bug#13588).
2268 am_max_uid=2097151 # 2^21 - 1
2269 am_max_gid=$am_max_uid
2270 # The $UID and $GID variables are not portable, so we need to resort
2271 # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
2272 # below are definitely unexpected, so allow the users to see them
2273 # (that is, avoid stderr redirection).
2274 am_uid=`id -u || echo unknown`
2275 am_gid=`id -g || echo unknown`
2276 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
2277$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
2278 if test $am_uid -le $am_max_uid; then
2279 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2280$as_echo "yes" >&6; }
2281 else
2282 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2283$as_echo "no" >&6; }
2284 _am_tools=none
2285 fi
2286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
2287$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
2288 if test $am_gid -le $am_max_gid; then
2289 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2290$as_echo "yes" >&6; }
2291 else
2292 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2293$as_echo "no" >&6; }
2294 _am_tools=none
2295 fi
2296
2297 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
2298$as_echo_n "checking how to create a ustar tar archive... " >&6; }
2299
2300 # Go ahead even if we have the value already cached. We do so because we
2301 # need to set the values for the 'am__tar' and 'am__untar' variables.
2302 _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
2303
2304 for _am_tool in $_am_tools; do
2305 case $_am_tool in
2306 gnutar)
2307 for _am_tar in tar gnutar gtar; do
2308 { echo "$as_me:$LINENO: $_am_tar --version" >&5
2309 ($_am_tar --version) >&5 2>&5
2310 ac_status=$?
2311 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2312 (exit $ac_status); } && break
2313 done
2314 am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
2315 am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
2316 am__untar="$_am_tar -xf -"
2317 ;;
2318 plaintar)
2319 # Must skip GNU tar: if it does not support --format= it doesn't create
2320 # ustar tarball either.
2321 (tar --version) >/dev/null 2>&1 && continue
2322 am__tar='tar chf - "$$tardir"'
2323 am__tar_='tar chf - "$tardir"'
2324 am__untar='tar xf -'
2325 ;;
2326 pax)
2327 am__tar='pax -L -x ustar -w "$$tardir"'
2328 am__tar_='pax -L -x ustar -w "$tardir"'
2329 am__untar='pax -r'
2330 ;;
2331 cpio)
2332 am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
2333 am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
2334 am__untar='cpio -i -H ustar -d'
2335 ;;
2336 none)
2337 am__tar=false
2338 am__tar_=false
2339 am__untar=false
2340 ;;
2341 esac
2342
2343 # If the value was cached, stop now. We just wanted to have am__tar
2344 # and am__untar set.
2345 test -n "${am_cv_prog_tar_ustar}" && break
2346
2347 # tar/untar a dummy directory, and stop if the command works.
2348 rm -rf conftest.dir
2349 mkdir conftest.dir
2350 echo GrepMe > conftest.dir/file
2351 { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
2352 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
2353 ac_status=$?
2354 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2355 (exit $ac_status); }
2356 rm -rf conftest.dir
2357 if test -s conftest.tar; then
2358 { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
2359 ($am__untar <conftest.tar) >&5 2>&5
2360 ac_status=$?
2361 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2362 (exit $ac_status); }
2363 { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
2364 (cat conftest.dir/file) >&5 2>&5
2365 ac_status=$?
2366 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2367 (exit $ac_status); }
2368 grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
2369 fi
2370 done
2371 rm -rf conftest.dir
2372
2373 if ${am_cv_prog_tar_ustar+:} false; then :
2374 $as_echo_n "(cached) " >&6
2375else
2376 am_cv_prog_tar_ustar=$_am_tool
2377fi
2378
2379 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
2380$as_echo "$am_cv_prog_tar_ustar" >&6; }
2381
2382
2383
2384
2385
2386
2387# POSIX will say in a future version that running "rm -f" with no argument
2388# is OK; and we want to be able to make that assumption in our Makefile
2389# recipes. So use an aggressive probe to check that the usage we want is
2390# actually supported "in the wild" to an acceptable degree.
2391# See automake bug#10828.
2392# To make any issue more visible, cause the running configure to be aborted
2393# by default if the 'rm' program in use doesn't match our expectations; the
2394# user can still override this though.
2395if rm -f && rm -fr && rm -rf; then : OK; else
2396 cat >&2 <<'END'
2397Oops!
2398
2399Your 'rm' program seems unable to run without file operands specified
2400on the command line, even when the '-f' option is present. This is contrary
2401to the behaviour of most rm programs out there, and not conforming with
2402the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
2403
2404Please tell bug-automake@gnu.org about your system, including the value
2405of your $PATH and any error possibly output before this message. This
2406can help us improve future automake versions.
2407
2408END
2409 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
2410 echo 'Configuration will proceed anyway, since you have set the' >&2
2411 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
2412 echo >&2
2413 else
2414 cat >&2 <<'END'
2415Aborting the configuration process, to ensure you take notice of the issue.
2416
2417You can download and install GNU coreutils to get an 'rm' implementation
2418that behaves properly: <http://www.gnu.org/software/coreutils/>.
2419
2420If you want to complete the configuration process using your problematic
2421'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
2422to "yes", and re-run configure.
2423
2424END
2425 as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
2426 fi
2427fi
2428
2429
17912430
1792ac_config_files="$ac_config_files Makefile"2431ac_config_files="$ac_config_files Makefile"
17932432
@@ -1937,6 +2576,15 @@
1937LTLIBOBJS=$ac_ltlibobjs2576LTLIBOBJS=$ac_ltlibobjs
19382577
19392578
2579{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
2580$as_echo_n "checking that generated files are newer than configure... " >&6; }
2581 if test -n "$am_sleep_pid"; then
2582 # Hide warnings about reused PIDs.
2583 wait $am_sleep_pid 2>/dev/null
2584 fi
2585 { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
2586$as_echo "done" >&6; }
2587
19402588
1941: "${CONFIG_STATUS=./config.status}"2589: "${CONFIG_STATUS=./config.status}"
1942ac_write_fail=02590ac_write_fail=0
@@ -2334,7 +2982,7 @@
2334# report actual input values of CONFIG_FILES etc. instead of their2982# report actual input values of CONFIG_FILES etc. instead of their
2335# values after options handling.2983# values after options handling.
2336ac_log="2984ac_log="
2337This file was extended by hicolor-icon-theme $as_me 0.13, which was2985This file was extended by hicolor-icon-theme $as_me 0.14, which was
2338generated by GNU Autoconf 2.69. Invocation command line was2986generated by GNU Autoconf 2.69. Invocation command line was
23392987
2340 CONFIG_FILES = $CONFIG_FILES2988 CONFIG_FILES = $CONFIG_FILES
@@ -2387,7 +3035,7 @@
2387cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13035cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2388ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"3036ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2389ac_cs_version="\\3037ac_cs_version="\\
2390hicolor-icon-theme config.status 0.133038hicolor-icon-theme config.status 0.14
2391configured by $0, generated by GNU Autoconf 2.69,3039configured by $0, generated by GNU Autoconf 2.69,
2392 with options \\"\$ac_cs_config\\"3040 with options \\"\$ac_cs_config\\"
23933041
@@ -2398,6 +3046,8 @@
2398ac_pwd='$ac_pwd'3046ac_pwd='$ac_pwd'
2399srcdir='$srcdir'3047srcdir='$srcdir'
2400INSTALL='$INSTALL'3048INSTALL='$INSTALL'
3049MKDIR_P='$MKDIR_P'
3050AWK='$AWK'
2401test -n "\$AWK" || AWK=awk3051test -n "\$AWK" || AWK=awk
2402_ACEOF3052_ACEOF
24033053
@@ -2837,6 +3487,11 @@
2837 [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;3487 [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
2838 *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;3488 *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
2839 esac3489 esac
3490 ac_MKDIR_P=$MKDIR_P
3491 case $MKDIR_P in
3492 [\\/$]* | ?:[\\/]* ) ;;
3493 */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
3494 esac
2840_ACEOF3495_ACEOF
28413496
2842cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13497cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -2891,6 +3546,7 @@
2891s&@abs_builddir@&$ac_abs_builddir&;t t3546s&@abs_builddir@&$ac_abs_builddir&;t t
2892s&@abs_top_builddir@&$ac_abs_top_builddir&;t t3547s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
2893s&@INSTALL@&$ac_INSTALL&;t t3548s&@INSTALL@&$ac_INSTALL&;t t
3549s&@MKDIR_P@&$ac_MKDIR_P&;t t
2894$ac_datarootdir_hack3550$ac_datarootdir_hack
2895"3551"
2896eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \3552eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
@@ -2953,4 +3609,3 @@
2953$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}3609$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
2954fi3610fi
29553611
2956
29573612
=== modified file 'configure.ac'
--- configure.ac 2013-12-29 10:37:45 +0000
+++ configure.ac 2014-12-30 20:20:45 +0000
@@ -1,8 +1,8 @@
1AC_INIT([hicolor-icon-theme], [0.13])1AC_INIT([hicolor-icon-theme], [0.14])
2AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar foreign])
23
3AC_PROG_INSTALL4AC_PROG_INSTALL
45
5AC_CONFIG_FILES([Makefile])6AC_CONFIG_FILES([Makefile])
67
7AC_OUTPUT8AC_OUTPUT
8
99
=== modified file 'debian/changelog'
--- debian/changelog 2013-12-29 10:37:45 +0000
+++ debian/changelog 2014-12-30 20:20:45 +0000
@@ -1,3 +1,10 @@
1hicolor-icon-theme (0.14-0ubuntu1) vivid; urgency=medium
2
3 * New upstream release.
4 * debian/watch: Upstream now uses .xz
5
6 -- Jackson Doak <noskcaj@ubuntu.com> Wed, 31 Dec 2014 07:14:43 +1100
7
1hicolor-icon-theme (0.13-1) unstable; urgency=low8hicolor-icon-theme (0.13-1) unstable; urgency=low
29
3 * Set Multi-Arch: foreign. Closes: #616533.10 * Set Multi-Arch: foreign. Closes: #616533.
411
=== modified file 'debian/control'
--- debian/control 2013-12-29 10:37:45 +0000
+++ debian/control 2014-12-30 20:20:45 +0000
@@ -6,7 +6,8 @@
6Source: hicolor-icon-theme6Source: hicolor-icon-theme
7Section: misc7Section: misc
8Priority: optional8Priority: optional
9Maintainer: Ross Burton <ross@debian.org>9Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
10XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
10Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>11Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>
11Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools12Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools
12Standards-Version: 3.8.113Standards-Version: 3.8.1
1314
=== modified file 'debian/control.in'
--- debian/control.in 2013-12-29 10:37:45 +0000
+++ debian/control.in 2014-12-30 20:20:45 +0000
@@ -1,7 +1,8 @@
1Source: hicolor-icon-theme1Source: hicolor-icon-theme
2Section: misc2Section: misc
3Priority: optional3Priority: optional
4Maintainer: Ross Burton <ross@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
5Uploaders: @GNOME_TEAM@6Uploaders: @GNOME_TEAM@
6Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools7Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools
7Standards-Version: 3.8.18Standards-Version: 3.8.1
89
=== modified file 'debian/watch'
--- debian/watch 2005-04-08 12:50:56 +0000
+++ debian/watch 2014-12-30 20:20:45 +0000
@@ -1,2 +1,2 @@
1version=21version=3
2http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-(.*)\.tar\.gz2http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-(.*)\.tar\.xz
33
=== modified file 'install-sh'
--- install-sh 2004-06-19 12:49:54 +0000
+++ install-sh 2014-12-30 20:20:45 +0000
@@ -1,251 +1,527 @@
1#!/bin/sh1#!/bin/sh
2#
3# install - install a program, script, or datafile2# install - install a program, script, or datafile
4# This comes from X11R5 (mit/util/scripts/install.sh).3
5#4scriptversion=2011-11-20.07; # UTC
6# Copyright 1991 by the Massachusetts Institute of Technology5
7#6# This originates from X11R5 (mit/util/scripts/install.sh), which was
8# Permission to use, copy, modify, distribute, and sell this software and its7# later released in X11R6 (xc/config/util/install.sh) with the
9# documentation for any purpose is hereby granted without fee, provided that8# following copyright and license.
10# the above copyright notice appear in all copies and that both that9#
11# copyright notice and this permission notice appear in supporting10# Copyright (C) 1994 X Consortium
12# documentation, and that the name of M.I.T. not be used in advertising or11#
13# publicity pertaining to distribution of the software without specific,12# Permission is hereby granted, free of charge, to any person obtaining a copy
14# written prior permission. M.I.T. makes no representations about the13# of this software and associated documentation files (the "Software"), to
15# suitability of this software for any purpose. It is provided "as is"14# deal in the Software without restriction, including without limitation the
16# without express or implied warranty.15# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
16# sell copies of the Software, and to permit persons to whom the Software is
17# furnished to do so, subject to the following conditions:
18#
19# The above copyright notice and this permission notice shall be included in
20# all copies or substantial portions of the Software.
21#
22# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
23# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
24# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
25# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
26# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
27# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28#
29# Except as contained in this notice, the name of the X Consortium shall not
30# be used in advertising or otherwise to promote the sale, use or other deal-
31# ings in this Software without prior written authorization from the X Consor-
32# tium.
33#
34#
35# FSF changes to this file are in the public domain.
17#36#
18# Calling this script install-sh is preferred over install.sh, to prevent37# Calling this script install-sh is preferred over install.sh, to prevent
19# `make' implicit rules from creating a file called install from it38# 'make' implicit rules from creating a file called install from it
20# when there is no Makefile.39# when there is no Makefile.
21#40#
22# This script is compatible with the BSD install script, but was written41# This script is compatible with the BSD install script, but was written
23# from scratch. It can only install one file at a time, a restriction42# from scratch.
24# shared with many OS's install programs.
2543
44nl='
45'
46IFS=" "" $nl"
2647
27# set DOITPROG to echo to test this script48# set DOITPROG to echo to test this script
2849
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.
30doit="${DOITPROG-}"51doit=${DOITPROG-}
3152if test -z "$doit"; then
3253 doit_exec=exec
33# put in absolute paths if you don't have them in your path; or use env. vars.54else
3455 doit_exec=$doit
35mvprog="${MVPROG-mv}"56fi
36cpprog="${CPPROG-cp}"57
37chmodprog="${CHMODPROG-chmod}"58# Put in absolute file names if you don't have them in your path;
38chownprog="${CHOWNPROG-chown}"59# or use environment vars.
39chgrpprog="${CHGRPPROG-chgrp}"60
40stripprog="${STRIPPROG-strip}"61chgrpprog=${CHGRPPROG-chgrp}
41rmprog="${RMPROG-rm}"62chmodprog=${CHMODPROG-chmod}
42mkdirprog="${MKDIRPROG-mkdir}"63chownprog=${CHOWNPROG-chown}
4364cmpprog=${CMPPROG-cmp}
44transformbasename=""65cpprog=${CPPROG-cp}
45transform_arg=""66mkdirprog=${MKDIRPROG-mkdir}
46instcmd="$mvprog"67mvprog=${MVPROG-mv}
47chmodcmd="$chmodprog 0755"68rmprog=${RMPROG-rm}
48chowncmd=""69stripprog=${STRIPPROG-strip}
49chgrpcmd=""70
50stripcmd=""71posix_glob='?'
72initialize_posix_glob='
73 test "$posix_glob" != "?" || {
74 if (set -f) 2>/dev/null; then
75 posix_glob=
76 else
77 posix_glob=:
78 fi
79 }
80'
81
82posix_mkdir=
83
84# Desired mode of installed file.
85mode=0755
86
87chgrpcmd=
88chmodcmd=$chmodprog
89chowncmd=
90mvcmd=$mvprog
51rmcmd="$rmprog -f"91rmcmd="$rmprog -f"
52mvcmd="$mvprog"92stripcmd=
53src=""93
54dst=""94src=
55dir_arg=""95dst=
5696dir_arg=
57while [ x"$1" != x ]; do97dst_arg=
58 case $1 in98
59 -c) instcmd="$cpprog"99copy_on_change=false
60 shift100no_target_directory=
61 continue;;101
62102usage="\
63 -d) dir_arg=true103Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
64 shift104 or: $0 [OPTION]... SRCFILES... DIRECTORY
65 continue;;105 or: $0 [OPTION]... -t DIRECTORY SRCFILES...
66106 or: $0 [OPTION]... -d DIRECTORIES...
67 -m) chmodcmd="$chmodprog $2"107
68 shift108In the 1st form, copy SRCFILE to DSTFILE.
69 shift109In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
70 continue;;110In the 4th, create DIRECTORIES.
71111
72 -o) chowncmd="$chownprog $2"112Options:
73 shift113 --help display this help and exit.
74 shift114 --version display version info and exit.
75 continue;;115
76116 -c (ignored)
77 -g) chgrpcmd="$chgrpprog $2"117 -C install only if different (preserve the last data modification time)
78 shift118 -d create directories instead of installing files.
79 shift119 -g GROUP $chgrpprog installed files to GROUP.
80 continue;;120 -m MODE $chmodprog installed files to MODE.
81121 -o USER $chownprog installed files to USER.
82 -s) stripcmd="$stripprog"122 -s $stripprog installed files.
83 shift123 -t DIRECTORY install into DIRECTORY.
84 continue;;124 -T report an error if DSTFILE is a directory.
85125
86 -t=*) transformarg=`echo $1 | sed 's/-t=//'`126Environment variables override the default commands:
87 shift127 CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
88 continue;;128 RMPROG STRIPPROG
89129"
90 -b=*) transformbasename=`echo $1 | sed 's/-b=//'`130
91 shift131while test $# -ne 0; do
92 continue;;132 case $1 in
93133 -c) ;;
94 *) if [ x"$src" = x ]134
135 -C) copy_on_change=true;;
136
137 -d) dir_arg=true;;
138
139 -g) chgrpcmd="$chgrpprog $2"
140 shift;;
141
142 --help) echo "$usage"; exit $?;;
143
144 -m) mode=$2
145 case $mode in
146 *' '* | *' '* | *'
147'* | *'*'* | *'?'* | *'['*)
148 echo "$0: invalid mode: $mode" >&2
149 exit 1;;
150 esac
151 shift;;
152
153 -o) chowncmd="$chownprog $2"
154 shift;;
155
156 -s) stripcmd=$stripprog;;
157
158 -t) dst_arg=$2
159 # Protect names problematic for 'test' and other utilities.
160 case $dst_arg in
161 -* | [=\(\)!]) dst_arg=./$dst_arg;;
162 esac
163 shift;;
164
165 -T) no_target_directory=true;;
166
167 --version) echo "$0 $scriptversion"; exit $?;;
168
169 --) shift
170 break;;
171
172 -*) echo "$0: invalid option: $1" >&2
173 exit 1;;
174
175 *) break;;
176 esac
177 shift
178done
179
180if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
181 # When -d is used, all remaining arguments are directories to create.
182 # When -t is used, the destination is already specified.
183 # Otherwise, the last argument is the destination. Remove it from $@.
184 for arg
185 do
186 if test -n "$dst_arg"; then
187 # $@ is not empty: it contains at least $arg.
188 set fnord "$@" "$dst_arg"
189 shift # fnord
190 fi
191 shift # arg
192 dst_arg=$arg
193 # Protect names problematic for 'test' and other utilities.
194 case $dst_arg in
195 -* | [=\(\)!]) dst_arg=./$dst_arg;;
196 esac
197 done
198fi
199
200if test $# -eq 0; then
201 if test -z "$dir_arg"; then
202 echo "$0: no input file specified." >&2
203 exit 1
204 fi
205 # It's OK to call 'install-sh -d' without argument.
206 # This can happen when creating conditional directories.
207 exit 0
208fi
209
210if test -z "$dir_arg"; then
211 do_exit='(exit $ret); exit $ret'
212 trap "ret=129; $do_exit" 1
213 trap "ret=130; $do_exit" 2
214 trap "ret=141; $do_exit" 13
215 trap "ret=143; $do_exit" 15
216
217 # Set umask so as not to create temps with too-generous modes.
218 # However, 'strip' requires both read and write access to temps.
219 case $mode in
220 # Optimize common cases.
221 *644) cp_umask=133;;
222 *755) cp_umask=22;;
223
224 *[0-7])
225 if test -z "$stripcmd"; then
226 u_plus_rw=
227 else
228 u_plus_rw='% 200'
229 fi
230 cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
231 *)
232 if test -z "$stripcmd"; then
233 u_plus_rw=
234 else
235 u_plus_rw=,u+rw
236 fi
237 cp_umask=$mode$u_plus_rw;;
238 esac
239fi
240
241for src
242do
243 # Protect names problematic for 'test' and other utilities.
244 case $src in
245 -* | [=\(\)!]) src=./$src;;
246 esac
247
248 if test -n "$dir_arg"; then
249 dst=$src
250 dstdir=$dst
251 test -d "$dstdir"
252 dstdir_status=$?
253 else
254
255 # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
256 # might cause directories to be created, which would be especially bad
257 # if $src (and thus $dsttmp) contains '*'.
258 if test ! -f "$src" && test ! -d "$src"; then
259 echo "$0: $src does not exist." >&2
260 exit 1
261 fi
262
263 if test -z "$dst_arg"; then
264 echo "$0: no destination specified." >&2
265 exit 1
266 fi
267 dst=$dst_arg
268
269 # If destination is a directory, append the input filename; won't work
270 # if double slashes aren't ignored.
271 if test -d "$dst"; then
272 if test -n "$no_target_directory"; then
273 echo "$0: $dst_arg: Is a directory" >&2
274 exit 1
275 fi
276 dstdir=$dst
277 dst=$dstdir/`basename "$src"`
278 dstdir_status=0
279 else
280 # Prefer dirname, but fall back on a substitute if dirname fails.
281 dstdir=`
282 (dirname "$dst") 2>/dev/null ||
283 expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
284 X"$dst" : 'X\(//\)[^/]' \| \
285 X"$dst" : 'X\(//\)$' \| \
286 X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
287 echo X"$dst" |
288 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
289 s//\1/
290 q
291 }
292 /^X\(\/\/\)[^/].*/{
293 s//\1/
294 q
295 }
296 /^X\(\/\/\)$/{
297 s//\1/
298 q
299 }
300 /^X\(\/\).*/{
301 s//\1/
302 q
303 }
304 s/.*/./; q'
305 `
306
307 test -d "$dstdir"
308 dstdir_status=$?
309 fi
310 fi
311
312 obsolete_mkdir_used=false
313
314 if test $dstdir_status != 0; then
315 case $posix_mkdir in
316 '')
317 # Create intermediate dirs using mode 755 as modified by the umask.
318 # This is like FreeBSD 'install' as of 1997-10-28.
319 umask=`umask`
320 case $stripcmd.$umask in
321 # Optimize common cases.
322 *[2367][2367]) mkdir_umask=$umask;;
323 .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
324
325 *[0-7])
326 mkdir_umask=`expr $umask + 22 \
327 - $umask % 100 % 40 + $umask % 20 \
328 - $umask % 10 % 4 + $umask % 2
329 `;;
330 *) mkdir_umask=$umask,go-w;;
331 esac
332
333 # With -d, create the new directory with the user-specified mode.
334 # Otherwise, rely on $mkdir_umask.
335 if test -n "$dir_arg"; then
336 mkdir_mode=-m$mode
337 else
338 mkdir_mode=
339 fi
340
341 posix_mkdir=false
342 case $umask in
343 *[123567][0-7][0-7])
344 # POSIX mkdir -p sets u+wx bits regardless of umask, which
345 # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
346 ;;
347 *)
348 tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
349 trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
350
351 if (umask $mkdir_umask &&
352 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
95 then353 then
96 src=$1354 if test -z "$dir_arg" || {
355 # Check for POSIX incompatibilities with -m.
356 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
357 # other-writable bit of parent directory when it shouldn't.
358 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
359 ls_ld_tmpdir=`ls -ld "$tmpdir"`
360 case $ls_ld_tmpdir in
361 d????-?r-*) different_mode=700;;
362 d????-?--*) different_mode=755;;
363 *) false;;
364 esac &&
365 $mkdirprog -m$different_mode -p -- "$tmpdir" && {
366 ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
367 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
368 }
369 }
370 then posix_mkdir=:
371 fi
372 rmdir "$tmpdir/d" "$tmpdir"
97 else373 else
98 # this colon is to work around a 386BSD /bin/sh bug374 # Remove any dirs left behind by ancient mkdir implementations.
99 :375 rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
100 dst=$1
101 fi376 fi
102 shift377 trap '' 0;;
103 continue;;378 esac;;
104 esac379 esac
105done380
106381 if
107if [ x"$src" = x ]382 $posix_mkdir && (
108then383 umask $mkdir_umask &&
109 echo "install: no input file specified"384 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
110 exit 1385 )
111else386 then :
112 true387 else
113fi388
114389 # The umask is ridiculous, or mkdir does not conform to POSIX,
115if [ x"$dir_arg" != x ]; then390 # or it failed possibly due to a race condition. Create the
116 dst=$src391 # directory the slow way, step by step, checking for races as we go.
117 src=""392
118 393 case $dstdir in
119 if [ -d $dst ]; then394 /*) prefix='/';;
120 instcmd=:395 [-=\(\)!]*) prefix='./';;
121 chmodcmd=""396 *) prefix='';;
122 else397 esac
123 instcmd=mkdir398
124 fi399 eval "$initialize_posix_glob"
125else400
126401 oIFS=$IFS
127# Waiting for this to be detected by the "$instcmd $src $dsttmp" command402 IFS=/
128# might cause directories to be created, which would be especially bad 403 $posix_glob set -f
129# if $src (and thus $dsttmp) contains '*'.404 set fnord $dstdir
130405 shift
131 if [ -f $src -o -d $src ]406 $posix_glob set +f
132 then407 IFS=$oIFS
133 true408
134 else409 prefixes=
135 echo "install: $src does not exist"410
136 exit 1411 for d
137 fi412 do
138 413 test X"$d" = X && continue
139 if [ x"$dst" = x ]414
140 then415 prefix=$prefix$d
141 echo "install: no destination specified"416 if test -d "$prefix"; then
142 exit 1417 prefixes=
143 else418 else
144 true419 if $posix_mkdir; then
145 fi420 (umask=$mkdir_umask &&
146421 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
147# If destination is a directory, append the input filename; if your system422 # Don't fail if two instances are running concurrently.
148# does not like double slashes in filenames, you may need to add some logic423 test -d "$prefix" || exit 1
149424 else
150 if [ -d $dst ]425 case $prefix in
151 then426 *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
152 dst="$dst"/`basename $src`427 *) qprefix=$prefix;;
153 else428 esac
154 true429 prefixes="$prefixes '$qprefix'"
155 fi430 fi
156fi431 fi
157432 prefix=$prefix/
158## this sed command emulates the dirname command433 done
159dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`434
160435 if test -n "$prefixes"; then
161# Make sure that the destination directory exists.436 # Don't fail if two instances are running concurrently.
162# this part is taken from Noah Friedman's mkinstalldirs script437 (umask $mkdir_umask &&
163438 eval "\$doit_exec \$mkdirprog $prefixes") ||
164# Skip lots of stat calls in the usual case.439 test -d "$dstdir" || exit 1
165if [ ! -d "$dstdir" ]; then440 obsolete_mkdir_used=true
166defaultIFS=' 441 fi
167'442 fi
168IFS="${IFS-${defaultIFS}}"443 fi
169444
170oIFS="${IFS}"445 if test -n "$dir_arg"; then
171# Some sh's can't handle IFS=/ for some reason.446 { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
172IFS='%'447 { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
173set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`448 { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
174IFS="${oIFS}"449 test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
175450 else
176pathcomp=''451
177452 # Make a couple of temp file names in the proper directory.
178while [ $# -ne 0 ] ; do453 dsttmp=$dstdir/_inst.$$_
179 pathcomp="${pathcomp}${1}"454 rmtmp=$dstdir/_rm.$$_
180 shift455
181456 # Trap to clean up those temp files at exit.
182 if [ ! -d "${pathcomp}" ] ;457 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
183 then458
184 $mkdirprog "${pathcomp}"459 # Copy the file name to the temp name.
185 else460 (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
186 true461
187 fi462 # and set any options; do chmod last to preserve setuid bits.
188463 #
189 pathcomp="${pathcomp}/"464 # If any of these fail, we abort the whole thing. If we want to
190done465 # ignore errors from any of these, just make sure not to ignore
191fi466 # errors from the above "$doit $cpprog $src $dsttmp" command.
192467 #
193if [ x"$dir_arg" != x ]468 { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
194then469 { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
195 $doit $instcmd $dst &&470 { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
196471 { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
197 if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&472
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.
199 if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&474 if $copy_on_change &&
200 if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi475 old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
201else476 new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
202477
203# If we're going to rename the final executable, determine the name now.478 eval "$initialize_posix_glob" &&
204479 $posix_glob set -f &&
205 if [ x"$transformarg" = x ] 480 set X $old && old=:$2:$4:$5:$6 &&
206 then481 set X $new && new=:$2:$4:$5:$6 &&
207 dstfile=`basename $dst`482 $posix_glob set +f &&
208 else483
209 dstfile=`basename $dst $transformbasename | 484 test "$old" = "$new" &&
210 sed $transformarg`$transformbasename485 $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
211 fi486 then
212487 rm -f "$dsttmp"
213# don't allow the sed command to completely eliminate the filename488 else
214489 # Rename the file to the real destination.
215 if [ x"$dstfile" = x ] 490 $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
216 then491
217 dstfile=`basename $dst`492 # The rename failed, perhaps because mv can't rename something else
218 else493 # to itself, or perhaps because mv is so ancient that it does not
219 true494 # support -f.
220 fi495 {
221496 # Now remove or move aside any old file at destination location.
222# Make a temp file name in the proper directory.497 # We try this two ways since rm can't unlink itself on some
223498 # systems and the destination file might be busy for other
224 dsttmp=$dstdir/#inst.$$#499 # reasons. In this case, the final cleanup might fail but the new
225500 # file should still install successfully.
226# Move or copy the file name to the temp name501 {
227502 test ! -f "$dst" ||
228 $doit $instcmd $src $dsttmp &&503 $doit $rmcmd -f "$dst" 2>/dev/null ||
229504 { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
230 trap "rm -f ${dsttmp}" 0 &&505 { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
231506 } ||
232# and set any options; do chmod last to preserve setuid bits507 { echo "$0: cannot unlink or rename $dst" >&2
233508 (exit 1); exit 1
234# If any of these fail, we abort the whole thing. If we want to509 }
235# ignore errors from any of these, just make sure not to ignore510 } &&
236# errors from the above "$doit $instcmd $src $dsttmp" command.511
237512 # Now rename the file to the real destination.
238 if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&513 $doit $mvcmd "$dsttmp" "$dst"
239 if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&514 }
240 if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&515 fi || exit 1
241 if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&516
242517 trap '' 0
243# Now rename the file to the real destination.518 fi
244519done
245 $doit $rmcmd -f $dstdir/$dstfile &&520
246 $doit $mvcmd $dsttmp $dstdir/$dstfile 521# Local variables:
247522# eval: (add-hook 'write-file-hooks 'time-stamp)
248fi &&523# time-stamp-start: "scriptversion="
249524# time-stamp-format: "%:y-%02m-%02d.%02H"
250525# time-stamp-time-zone: "UTC"
251exit 0526# time-stamp-end: "; # UTC"
527# End:
252528
=== added file 'missing'
--- missing 1970-01-01 00:00:00 +0000
+++ missing 2014-12-30 20:20:45 +0000
@@ -0,0 +1,215 @@
1#! /bin/sh
2# Common wrapper for a few potentially missing GNU programs.
3
4scriptversion=2013-10-28.13; # UTC
5
6# Copyright (C) 1996-2013 Free Software Foundation, Inc.
7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8
9# This program is free software; you can redistribute it and/or modify
10# it under the terms of the GNU General Public License as published by
11# the Free Software Foundation; either version 2, or (at your option)
12# any later version.
13
14# This program is distributed in the hope that it will be useful,
15# but WITHOUT ANY WARRANTY; without even the implied warranty of
16# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17# GNU General Public License for more details.
18
19# You should have received a copy of the GNU General Public License
20# along with this program. If not, see <http://www.gnu.org/licenses/>.
21
22# As a special exception to the GNU General Public License, if you
23# distribute this file as part of a program that contains a
24# configuration script generated by Autoconf, you may include it under
25# the same distribution terms that you use for the rest of that program.
26
27if test $# -eq 0; then
28 echo 1>&2 "Try '$0 --help' for more information"
29 exit 1
30fi
31
32case $1 in
33
34 --is-lightweight)
35 # Used by our autoconf macros to check whether the available missing
36 # script is modern enough.
37 exit 0
38 ;;
39
40 --run)
41 # Back-compat with the calling convention used by older automake.
42 shift
43 ;;
44
45 -h|--h|--he|--hel|--help)
46 echo "\
47$0 [OPTION]... PROGRAM [ARGUMENT]...
48
49Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
50to PROGRAM being missing or too old.
51
52Options:
53 -h, --help display this help and exit
54 -v, --version output version information and exit
55
56Supported PROGRAM values:
57 aclocal autoconf autoheader autom4te automake makeinfo
58 bison yacc flex lex help2man
59
60Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
61'g' are ignored when checking the name.
62
63Send bug reports to <bug-automake@gnu.org>."
64 exit $?
65 ;;
66
67 -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
68 echo "missing $scriptversion (GNU Automake)"
69 exit $?
70 ;;
71
72 -*)
73 echo 1>&2 "$0: unknown '$1' option"
74 echo 1>&2 "Try '$0 --help' for more information"
75 exit 1
76 ;;
77
78esac
79
80# Run the given program, remember its exit status.
81"$@"; st=$?
82
83# If it succeeded, we are done.
84test $st -eq 0 && exit 0
85
86# Also exit now if we it failed (or wasn't found), and '--version' was
87# passed; such an option is passed most likely to detect whether the
88# program is present and works.
89case $2 in --version|--help) exit $st;; esac
90
91# Exit code 63 means version mismatch. This often happens when the user
92# tries to use an ancient version of a tool on a file that requires a
93# minimum version.
94if test $st -eq 63; then
95 msg="probably too old"
96elif test $st -eq 127; then
97 # Program was missing.
98 msg="missing on your system"
99else
100 # Program was found and executed, but failed. Give up.
101 exit $st
102fi
103
104perl_URL=http://www.perl.org/
105flex_URL=http://flex.sourceforge.net/
106gnu_software_URL=http://www.gnu.org/software
107
108program_details ()
109{
110 case $1 in
111 aclocal|automake)
112 echo "The '$1' program is part of the GNU Automake package:"
113 echo "<$gnu_software_URL/automake>"
114 echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
115 echo "<$gnu_software_URL/autoconf>"
116 echo "<$gnu_software_URL/m4/>"
117 echo "<$perl_URL>"
118 ;;
119 autoconf|autom4te|autoheader)
120 echo "The '$1' program is part of the GNU Autoconf package:"
121 echo "<$gnu_software_URL/autoconf/>"
122 echo "It also requires GNU m4 and Perl in order to run:"
123 echo "<$gnu_software_URL/m4/>"
124 echo "<$perl_URL>"
125 ;;
126 esac
127}
128
129give_advice ()
130{
131 # Normalize program name to check for.
132 normalized_program=`echo "$1" | sed '
133 s/^gnu-//; t
134 s/^gnu//; t
135 s/^g//; t'`
136
137 printf '%s\n' "'$1' is $msg."
138
139 configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
140 case $normalized_program in
141 autoconf*)
142 echo "You should only need it if you modified 'configure.ac',"
143 echo "or m4 files included by it."
144 program_details 'autoconf'
145 ;;
146 autoheader*)
147 echo "You should only need it if you modified 'acconfig.h' or"
148 echo "$configure_deps."
149 program_details 'autoheader'
150 ;;
151 automake*)
152 echo "You should only need it if you modified 'Makefile.am' or"
153 echo "$configure_deps."
154 program_details 'automake'
155 ;;
156 aclocal*)
157 echo "You should only need it if you modified 'acinclude.m4' or"
158 echo "$configure_deps."
159 program_details 'aclocal'
160 ;;
161 autom4te*)
162 echo "You might have modified some maintainer files that require"
163 echo "the 'autom4te' program to be rebuilt."
164 program_details 'autom4te'
165 ;;
166 bison*|yacc*)
167 echo "You should only need it if you modified a '.y' file."
168 echo "You may want to install the GNU Bison package:"
169 echo "<$gnu_software_URL/bison/>"
170 ;;
171 lex*|flex*)
172 echo "You should only need it if you modified a '.l' file."
173 echo "You may want to install the Fast Lexical Analyzer package:"
174 echo "<$flex_URL>"
175 ;;
176 help2man*)
177 echo "You should only need it if you modified a dependency" \
178 "of a man page."
179 echo "You may want to install the GNU Help2man package:"
180 echo "<$gnu_software_URL/help2man/>"
181 ;;
182 makeinfo*)
183 echo "You should only need it if you modified a '.texi' file, or"
184 echo "any other file indirectly affecting the aspect of the manual."
185 echo "You might want to install the Texinfo package:"
186 echo "<$gnu_software_URL/texinfo/>"
187 echo "The spurious makeinfo call might also be the consequence of"
188 echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
189 echo "want to install GNU make:"
190 echo "<$gnu_software_URL/make/>"
191 ;;
192 *)
193 echo "You might have modified some files without having the proper"
194 echo "tools for further handling them. Check the 'README' file, it"
195 echo "often tells you about the needed prerequisites for installing"
196 echo "this package. You may also peek at any GNU archive site, in"
197 echo "case some other package contains this missing '$1' program."
198 ;;
199 esac
200}
201
202give_advice "$1" | sed -e '1s/^/WARNING: /' \
203 -e '2,$s/^/ /' >&2
204
205# Propagate the correct exit status (expected to be 127 for a program
206# not found, 63 for a program that failed due to version mismatch).
207exit $st
208
209# Local variables:
210# eval: (add-hook 'write-file-hooks 'time-stamp)
211# time-stamp-start: "scriptversion="
212# time-stamp-format: "%:y-%02m-%02d.%02H"
213# time-stamp-time-zone: "UTC"
214# time-stamp-end: "; # UTC"
215# End:

Subscribers

People subscribed via source and target branches

to all changes: