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