Merge lp:~logan/ubuntu/saucy/mtdev/1.1.3-1ubuntu1 into lp:ubuntu/saucy/mtdev
- Saucy (13.10)
- 1.1.3-1ubuntu1
- Merge into saucy
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp:~logan/ubuntu/saucy/mtdev/1.1.3-1ubuntu1 |
Merge into: | lp:ubuntu/saucy/mtdev |
Diff against target: |
2646 lines (+668/-508) 11 files modified
ChangeLog (+23/-0) Makefile.in (+102/-78) aclocal.m4 (+166/-195) configure (+236/-208) configure.ac (+1/-1) debian/changelog (+28/-0) debian/control (+5/-4) debian/rules (+4/-0) mtdev.pc.in (+1/-0) src/Makefile.in (+55/-14) test/Makefile.in (+47/-8) |
To merge this branch: | bzr merge lp:~logan/ubuntu/saucy/mtdev/1.1.3-1ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Review via email: mp+164822@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2012-03-02 15:29:50 +0000 |
3 | +++ ChangeLog 2013-05-21 01:25:34 +0000 |
4 | @@ -1,3 +1,26 @@ |
5 | +commit e5eb27494cd237e60645db4d7be5b4acf41cb5e0 |
6 | +Author: Henrik Rydberg <rydberg@euromail.se> |
7 | +Date: Wed Aug 22 22:20:16 2012 +0200 |
8 | + |
9 | + Release mtdev-1.1.3 |
10 | + |
11 | + Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
12 | + |
13 | +commit 656d5c9d7e37a301afa3af9c2382d6b869f57ebf |
14 | +Author: David Kozub <zub@linux.fjfi.cvut.cz> |
15 | +Date: Tue May 29 22:53:21 2012 +0200 |
16 | + |
17 | + Fix pc file to allow compiling with mtdev installed in non-std path. |
18 | + |
19 | + The pkgconfig file does not specify the -I flag needed to be able to |
20 | + compile with `pkg-config mtdev --cflags` when libmtdev is installed to |
21 | + a directory that is not searched by the C compiler by default. |
22 | + |
23 | + This patch fixes the issue. |
24 | + |
25 | + Signed-off-by: David Kozub <zub@linux.fjfi.cvut.cz> |
26 | + Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
27 | + |
28 | commit 5a6773f85a77e78dbbb915e32768aa24e1c83124 |
29 | Author: Henrik Rydberg <rydberg@euromail.se> |
30 | Date: Mon Feb 20 16:03:05 2012 +0100 |
31 | |
32 | === modified file 'Makefile.in' |
33 | --- Makefile.in 2012-03-02 15:29:50 +0000 |
34 | +++ Makefile.in 2013-05-21 01:25:34 +0000 |
35 | @@ -1,9 +1,8 @@ |
36 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
37 | +# Makefile.in generated by automake 1.12.3 from Makefile.am. |
38 | # @configure_input@ |
39 | |
40 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
41 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
42 | -# Foundation, Inc. |
43 | +# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
44 | + |
45 | # This Makefile.in is free software; the Free Software Foundation |
46 | # gives unlimited permission to copy and/or distribute it, |
47 | # with or without modifications, as long as this notice is preserved. |
48 | @@ -16,6 +15,23 @@ |
49 | @SET_MAKE@ |
50 | |
51 | VPATH = @srcdir@ |
52 | +am__make_dryrun = \ |
53 | + { \ |
54 | + am__dry=no; \ |
55 | + case $$MAKEFLAGS in \ |
56 | + *\\[\ \ ]*) \ |
57 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
58 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
59 | + *) \ |
60 | + for am__flg in $$MAKEFLAGS; do \ |
61 | + case $$am__flg in \ |
62 | + *=*|--*) ;; \ |
63 | + *n*) am__dry=yes; break;; \ |
64 | + esac; \ |
65 | + done;; \ |
66 | + esac; \ |
67 | + test $$am__dry = yes; \ |
68 | + } |
69 | pkgdatadir = $(datadir)/@PACKAGE@ |
70 | pkgincludedir = $(includedir)/@PACKAGE@ |
71 | pkglibdir = $(libdir)/@PACKAGE@ |
72 | @@ -37,8 +53,12 @@ |
73 | subdir = . |
74 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
75 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
76 | - $(srcdir)/mtdev.pc.in $(top_srcdir)/configure COPYING \ |
77 | - ChangeLog INSTALL config-aux/config.guess \ |
78 | + $(srcdir)/mtdev.pc.in $(top_srcdir)/config-aux/config.guess \ |
79 | + $(top_srcdir)/config-aux/config.sub \ |
80 | + $(top_srcdir)/config-aux/install-sh \ |
81 | + $(top_srcdir)/config-aux/ltmain.sh \ |
82 | + $(top_srcdir)/config-aux/missing $(top_srcdir)/configure \ |
83 | + COPYING ChangeLog INSTALL config-aux/config.guess \ |
84 | config-aux/config.sub config-aux/depcomp config-aux/install-sh \ |
85 | config-aux/ltmain.sh config-aux/missing |
86 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
87 | @@ -60,6 +80,11 @@ |
88 | install-pdf-recursive install-ps-recursive install-recursive \ |
89 | installcheck-recursive installdirs-recursive pdf-recursive \ |
90 | ps-recursive uninstall-recursive |
91 | +am__can_run_installinfo = \ |
92 | + case $$AM_UPDATE_INFO_DIR in \ |
93 | + n|no|NO) false;; \ |
94 | + *) (install-info --version) >/dev/null 2>&1;; \ |
95 | + esac |
96 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
97 | am__vpath_adj = case $$p in \ |
98 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
99 | @@ -93,9 +118,10 @@ |
100 | distclean-recursive maintainer-clean-recursive |
101 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
102 | $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
103 | - distdir dist dist-all distcheck |
104 | + cscope distdir dist dist-all distcheck |
105 | ETAGS = etags |
106 | CTAGS = ctags |
107 | +CSCOPE = cscope |
108 | DIST_SUBDIRS = $(SUBDIRS) |
109 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
110 | distdir = $(PACKAGE)-$(VERSION) |
111 | @@ -106,6 +132,7 @@ |
112 | && rm -rf "$(distdir)" \ |
113 | || { sleep 5 && rm -rf "$(distdir)"; }; \ |
114 | else :; fi |
115 | +am__post_remove_distdir = $(am__remove_distdir) |
116 | am__relativize = \ |
117 | dir0=`pwd`; \ |
118 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
119 | @@ -133,6 +160,7 @@ |
120 | reldir="$$dir2" |
121 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
122 | GZIP_ENV = --best |
123 | +DIST_TARGETS = dist-bzip2 dist-gzip |
124 | distuninstallcheck_listfiles = find . -type f -print |
125 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
126 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
127 | @@ -322,8 +350,11 @@ |
128 | -rm -f libtool config.lt |
129 | install-pkgconfigDATA: $(pkgconfig_DATA) |
130 | @$(NORMAL_INSTALL) |
131 | - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
132 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
133 | + if test -n "$$list"; then \ |
134 | + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ |
135 | + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ |
136 | + fi; \ |
137 | for p in $$list; do \ |
138 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
139 | echo "$$d$$p"; \ |
140 | @@ -340,12 +371,12 @@ |
141 | dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) |
142 | |
143 | # This directory's subdirectories are mostly independent; you can cd |
144 | -# into them and run `make' without going through this Makefile. |
145 | -# To change the values of `make' variables: instead of editing Makefiles, |
146 | -# (1) if the variable is set in `config.status', edit `config.status' |
147 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
148 | -# (2) otherwise, pass the desired values on the `make' command line. |
149 | -$(RECURSIVE_TARGETS): |
150 | +# into them and run 'make' without going through this Makefile. |
151 | +# To change the values of 'make' variables: instead of editing Makefiles, |
152 | +# (1) if the variable is set in 'config.status', edit 'config.status' |
153 | +# (which will cause the Makefiles to be regenerated when you run 'make'); |
154 | +# (2) otherwise, pass the desired values on the 'make' command line. |
155 | +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): |
156 | @fail= failcom='exit 1'; \ |
157 | for f in x $$MAKEFLAGS; do \ |
158 | case $$f in \ |
159 | @@ -355,7 +386,11 @@ |
160 | done; \ |
161 | dot_seen=no; \ |
162 | target=`echo $@ | sed s/-recursive//`; \ |
163 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
164 | + case "$@" in \ |
165 | + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
166 | + *) list='$(SUBDIRS)' ;; \ |
167 | + esac; \ |
168 | + for subdir in $$list; do \ |
169 | echo "Making $$target in $$subdir"; \ |
170 | if test "$$subdir" = "."; then \ |
171 | dot_seen=yes; \ |
172 | @@ -369,37 +404,6 @@ |
173 | if test "$$dot_seen" = "no"; then \ |
174 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
175 | fi; test -z "$$fail" |
176 | - |
177 | -$(RECURSIVE_CLEAN_TARGETS): |
178 | - @fail= failcom='exit 1'; \ |
179 | - for f in x $$MAKEFLAGS; do \ |
180 | - case $$f in \ |
181 | - *=* | --[!k]*);; \ |
182 | - *k*) failcom='fail=yes';; \ |
183 | - esac; \ |
184 | - done; \ |
185 | - dot_seen=no; \ |
186 | - case "$@" in \ |
187 | - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
188 | - *) list='$(SUBDIRS)' ;; \ |
189 | - esac; \ |
190 | - rev=''; for subdir in $$list; do \ |
191 | - if test "$$subdir" = "."; then :; else \ |
192 | - rev="$$subdir $$rev"; \ |
193 | - fi; \ |
194 | - done; \ |
195 | - rev="$$rev ."; \ |
196 | - target=`echo $@ | sed s/-recursive//`; \ |
197 | - for subdir in $$rev; do \ |
198 | - echo "Making $$target in $$subdir"; \ |
199 | - if test "$$subdir" = "."; then \ |
200 | - local_target="$$target-am"; \ |
201 | - else \ |
202 | - local_target="$$target"; \ |
203 | - fi; \ |
204 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
205 | - || eval $$failcom; \ |
206 | - done && test -z "$$fail" |
207 | tags-recursive: |
208 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
209 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
210 | @@ -408,6 +412,10 @@ |
211 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
212 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
213 | done |
214 | +cscopelist-recursive: |
215 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
216 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ |
217 | + done |
218 | |
219 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
220 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
221 | @@ -471,8 +479,32 @@ |
222 | && $(am__cd) $(top_srcdir) \ |
223 | && gtags -i $(GTAGS_ARGS) "$$here" |
224 | |
225 | +cscope: cscope.files |
226 | + test ! -s cscope.files \ |
227 | + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
228 | + |
229 | +clean-cscope: |
230 | + -rm -f cscope.files |
231 | + |
232 | +cscope.files: clean-cscope cscopelist-recursive cscopelist |
233 | + |
234 | +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) |
235 | + list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
236 | + case "$(srcdir)" in \ |
237 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
238 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
239 | + esac; \ |
240 | + for i in $$list; do \ |
241 | + if test -f "$$i"; then \ |
242 | + echo "$(subdir)/$$i"; \ |
243 | + else \ |
244 | + echo "$$sdir/$$i"; \ |
245 | + fi; \ |
246 | + done >> $(top_builddir)/cscope.files |
247 | + |
248 | distclean-tags: |
249 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
250 | + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
251 | |
252 | distdir: $(DISTFILES) |
253 | $(am__remove_distdir) |
254 | @@ -508,13 +540,10 @@ |
255 | done |
256 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
257 | if test "$$subdir" = .; then :; else \ |
258 | - test -d "$(distdir)/$$subdir" \ |
259 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
260 | - || exit 1; \ |
261 | - fi; \ |
262 | - done |
263 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
264 | - if test "$$subdir" = .; then :; else \ |
265 | + $(am__make_dryrun) \ |
266 | + || test -d "$(distdir)/$$subdir" \ |
267 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
268 | + || exit 1; \ |
269 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
270 | $(am__relativize); \ |
271 | new_distdir=$$reldir; \ |
272 | @@ -546,40 +575,35 @@ |
273 | || chmod -R a+r "$(distdir)" |
274 | dist-gzip: distdir |
275 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
276 | - $(am__remove_distdir) |
277 | + $(am__post_remove_distdir) |
278 | dist-bzip2: distdir |
279 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
280 | - $(am__remove_distdir) |
281 | + $(am__post_remove_distdir) |
282 | |
283 | dist-lzip: distdir |
284 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
285 | - $(am__remove_distdir) |
286 | - |
287 | -dist-lzma: distdir |
288 | - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
289 | - $(am__remove_distdir) |
290 | + $(am__post_remove_distdir) |
291 | |
292 | dist-xz: distdir |
293 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
294 | - $(am__remove_distdir) |
295 | + $(am__post_remove_distdir) |
296 | |
297 | dist-tarZ: distdir |
298 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
299 | - $(am__remove_distdir) |
300 | + $(am__post_remove_distdir) |
301 | |
302 | dist-shar: distdir |
303 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
304 | - $(am__remove_distdir) |
305 | + $(am__post_remove_distdir) |
306 | |
307 | dist-zip: distdir |
308 | -rm -f $(distdir).zip |
309 | zip -rq $(distdir).zip $(distdir) |
310 | - $(am__remove_distdir) |
311 | + $(am__post_remove_distdir) |
312 | |
313 | -dist dist-all: distdir |
314 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
315 | - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
316 | - $(am__remove_distdir) |
317 | +dist dist-all: |
318 | + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' |
319 | + $(am__post_remove_distdir) |
320 | |
321 | # This target untars the dist file and tries a VPATH configuration. Then |
322 | # it guarantees that the distribution is self-contained by making another |
323 | @@ -590,8 +614,6 @@ |
324 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
325 | *.tar.bz2*) \ |
326 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
327 | - *.tar.lzma*) \ |
328 | - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
329 | *.tar.lz*) \ |
330 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
331 | *.tar.xz*) \ |
332 | @@ -603,9 +625,9 @@ |
333 | *.zip*) \ |
334 | unzip $(distdir).zip ;;\ |
335 | esac |
336 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
337 | - mkdir $(distdir)/_build |
338 | - mkdir $(distdir)/_inst |
339 | + chmod -R a-w $(distdir) |
340 | + chmod u+w $(distdir) |
341 | + mkdir $(distdir)/_build $(distdir)/_inst |
342 | chmod a-w $(distdir) |
343 | test -d $(distdir)/_build || exit 0; \ |
344 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
345 | @@ -637,7 +659,7 @@ |
346 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
347 | && cd "$$am__cwd" \ |
348 | || exit 1 |
349 | - $(am__remove_distdir) |
350 | + $(am__post_remove_distdir) |
351 | @(echo "$(distdir) archives ready for distribution: "; \ |
352 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
353 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
354 | @@ -776,12 +798,14 @@ |
355 | uninstall-am: uninstall-pkgconfigDATA |
356 | |
357 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
358 | - ctags-recursive install-am install-strip tags-recursive |
359 | + cscopelist-recursive ctags-recursive install-am install-strip \ |
360 | + tags-recursive |
361 | |
362 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
363 | - all all-am am--refresh check check-am clean clean-generic \ |
364 | - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
365 | - dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ |
366 | + all all-am am--refresh check check-am clean clean-cscope \ |
367 | + clean-generic clean-libtool cscope cscopelist \ |
368 | + cscopelist-recursive ctags ctags-recursive dist dist-all \ |
369 | + dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ |
370 | dist-xz dist-zip distcheck distclean distclean-generic \ |
371 | distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
372 | distdir distuninstallcheck dvi dvi-am html html-am info \ |
373 | |
374 | === modified file 'aclocal.m4' |
375 | --- aclocal.m4 2012-03-02 15:29:50 +0000 |
376 | +++ aclocal.m4 2013-05-21 01:25:34 +0000 |
377 | @@ -1,8 +1,7 @@ |
378 | -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
379 | - |
380 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
381 | -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
382 | -# Inc. |
383 | +# generated automatically by aclocal 1.12.3 -*- Autoconf -*- |
384 | + |
385 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
386 | + |
387 | # This file is free software; the Free Software Foundation |
388 | # gives unlimited permission to copy and/or distribute it, |
389 | # with or without modifications, as long as this notice is preserved. |
390 | @@ -14,11 +13,11 @@ |
391 | |
392 | m4_ifndef([AC_AUTOCONF_VERSION], |
393 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
394 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
395 | -[m4_warning([this file was generated for autoconf 2.68. |
396 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
397 | +[m4_warning([this file was generated for autoconf 2.69. |
398 | You have another version of autoconf. It may work, but is not guaranteed to. |
399 | If you have problems, you may need to regenerate the build system entirely. |
400 | -To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
401 | +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
402 | |
403 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
404 | # |
405 | @@ -8607,25 +8606,22 @@ |
406 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) |
407 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
408 | |
409 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
410 | -# Foundation, Inc. |
411 | +# Copyright (C) 2002-2012 Free Software Foundation, Inc. |
412 | # |
413 | # This file is free software; the Free Software Foundation |
414 | # gives unlimited permission to copy and/or distribute it, |
415 | # with or without modifications, as long as this notice is preserved. |
416 | |
417 | -# serial 1 |
418 | - |
419 | # AM_AUTOMAKE_VERSION(VERSION) |
420 | # ---------------------------- |
421 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
422 | # generated from the m4 files accompanying Automake X.Y. |
423 | # (This private macro should not be called outside this file.) |
424 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
425 | -[am__api_version='1.11' |
426 | +[am__api_version='1.12' |
427 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
428 | dnl require some minimum version. Point them to the right macro. |
429 | -m4_if([$1], [1.11.3], [], |
430 | +m4_if([$1], [1.12.3], [], |
431 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
432 | ]) |
433 | |
434 | @@ -8641,24 +8637,22 @@ |
435 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
436 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
437 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
438 | -[AM_AUTOMAKE_VERSION([1.11.3])dnl |
439 | +[AM_AUTOMAKE_VERSION([1.12.3])dnl |
440 | m4_ifndef([AC_AUTOCONF_VERSION], |
441 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
442 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
443 | |
444 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
445 | |
446 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
447 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
448 | # |
449 | # This file is free software; the Free Software Foundation |
450 | # gives unlimited permission to copy and/or distribute it, |
451 | # with or without modifications, as long as this notice is preserved. |
452 | |
453 | -# serial 1 |
454 | - |
455 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
456 | -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
457 | -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
458 | +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
459 | +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
460 | # |
461 | # Of course, Automake must honor this variable whenever it calls a |
462 | # tool from the auxiliary directory. The problem is that $srcdir (and |
463 | @@ -8677,7 +8671,7 @@ |
464 | # |
465 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
466 | # are both prefixed by $srcdir. In an in-source build this is usually |
467 | -# harmless because $srcdir is `.', but things will broke when you |
468 | +# harmless because $srcdir is '.', but things will broke when you |
469 | # start a VPATH build or use an absolute $srcdir. |
470 | # |
471 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
472 | @@ -8703,22 +8697,19 @@ |
473 | |
474 | # AM_CONDITIONAL -*- Autoconf -*- |
475 | |
476 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
477 | -# Free Software Foundation, Inc. |
478 | +# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
479 | # |
480 | # This file is free software; the Free Software Foundation |
481 | # gives unlimited permission to copy and/or distribute it, |
482 | # with or without modifications, as long as this notice is preserved. |
483 | |
484 | -# serial 9 |
485 | - |
486 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
487 | # ------------------------------------- |
488 | # Define a conditional. |
489 | AC_DEFUN([AM_CONDITIONAL], |
490 | -[AC_PREREQ(2.52)dnl |
491 | - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
492 | - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
493 | +[AC_PREREQ([2.52])dnl |
494 | + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
495 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
496 | AC_SUBST([$1_TRUE])dnl |
497 | AC_SUBST([$1_FALSE])dnl |
498 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
499 | @@ -8737,16 +8728,14 @@ |
500 | Usually this means the macro was only invoked conditionally.]]) |
501 | fi])]) |
502 | |
503 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
504 | -# 2010, 2011 Free Software Foundation, Inc. |
505 | +# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
506 | # |
507 | # This file is free software; the Free Software Foundation |
508 | # gives unlimited permission to copy and/or distribute it, |
509 | # with or without modifications, as long as this notice is preserved. |
510 | |
511 | -# serial 12 |
512 | |
513 | -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
514 | +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
515 | # written in clear, in which case automake, when reading aclocal.m4, |
516 | # will think it sees a *use*, and therefore will trigger all it's |
517 | # C support machinery. Also note that it means that autoscan, seeing |
518 | @@ -8756,7 +8745,7 @@ |
519 | # _AM_DEPENDENCIES(NAME) |
520 | # ---------------------- |
521 | # See how the compiler implements dependency checking. |
522 | -# NAME is "CC", "CXX", "GCJ", or "OBJC". |
523 | +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
524 | # We try a few techniques and use that to set a single cache variable. |
525 | # |
526 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
527 | @@ -8769,12 +8758,13 @@ |
528 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
529 | AC_REQUIRE([AM_DEP_TRACK])dnl |
530 | |
531 | -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
532 | - [$1], CXX, [depcc="$CXX" am_compiler_list=], |
533 | - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
534 | - [$1], UPC, [depcc="$UPC" am_compiler_list=], |
535 | - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
536 | - [depcc="$$1" am_compiler_list=]) |
537 | +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
538 | + [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
539 | + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
540 | + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
541 | + [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
542 | + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
543 | + [depcc="$$1" am_compiler_list=]) |
544 | |
545 | AC_CACHE_CHECK([dependency style of $depcc], |
546 | [am_cv_$1_dependencies_compiler_type], |
547 | @@ -8782,8 +8772,8 @@ |
548 | # We make a subdir and do the tests there. Otherwise we can end up |
549 | # making bogus files that we don't know about and never remove. For |
550 | # instance it was reported that on HP-UX the gcc test will end up |
551 | - # making a dummy file named `D' -- because `-MD' means `put the output |
552 | - # in D'. |
553 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
554 | + # in D". |
555 | rm -rf conftest.dir |
556 | mkdir conftest.dir |
557 | # Copy depcomp to subdir because otherwise we won't find it if we're |
558 | @@ -8823,16 +8813,16 @@ |
559 | : > sub/conftest.c |
560 | for i in 1 2 3 4 5 6; do |
561 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
562 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
563 | - # Solaris 8's {/usr,}/bin/sh. |
564 | - touch sub/conftst$i.h |
565 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
566 | + # Solaris 10 /bin/sh. |
567 | + echo '/* dummy */' > sub/conftst$i.h |
568 | done |
569 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
570 | |
571 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
572 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
573 | # mode. It turns out that the SunPro C++ compiler does not properly |
574 | - # handle `-M -o', and we need to detect this. Also, some Intel |
575 | - # versions had trouble with output in subdirs |
576 | + # handle '-M -o', and we need to detect this. Also, some Intel |
577 | + # versions had trouble with output in subdirs. |
578 | am__obj=sub/conftest.${OBJEXT-o} |
579 | am__minus_obj="-o $am__obj" |
580 | case $depmode in |
581 | @@ -8841,8 +8831,8 @@ |
582 | test "$am__universal" = false || continue |
583 | ;; |
584 | nosideeffect) |
585 | - # after this tag, mechanisms are not by side-effect, so they'll |
586 | - # only be used when explicitly requested |
587 | + # After this tag, mechanisms are not by side-effect, so they'll |
588 | + # only be used when explicitly requested. |
589 | if test "x$enable_dependency_tracking" = xyes; then |
590 | continue |
591 | else |
592 | @@ -8850,7 +8840,7 @@ |
593 | fi |
594 | ;; |
595 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
596 | - # This compiler won't grok `-c -o', but also, the minuso test has |
597 | + # This compiler won't grok '-c -o', but also, the minuso test has |
598 | # not run yet. These depmodes are late enough in the game, and |
599 | # so weak that their functioning should not be impacted. |
600 | am__obj=conftest.${OBJEXT-o} |
601 | @@ -8898,7 +8888,7 @@ |
602 | # AM_SET_DEPDIR |
603 | # ------------- |
604 | # Choose a directory name for dependency files. |
605 | -# This macro is AC_REQUIREd in _AM_DEPENDENCIES |
606 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
607 | AC_DEFUN([AM_SET_DEPDIR], |
608 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
609 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
610 | @@ -8908,9 +8898,13 @@ |
611 | # AM_DEP_TRACK |
612 | # ------------ |
613 | AC_DEFUN([AM_DEP_TRACK], |
614 | -[AC_ARG_ENABLE(dependency-tracking, |
615 | -[ --disable-dependency-tracking speeds up one-time build |
616 | - --enable-dependency-tracking do not reject slow dependency extractors]) |
617 | +[AC_ARG_ENABLE([dependency-tracking], [dnl |
618 | +AS_HELP_STRING( |
619 | + [--enable-dependency-tracking], |
620 | + [do not reject slow dependency extractors]) |
621 | +AS_HELP_STRING( |
622 | + [--disable-dependency-tracking], |
623 | + [speeds up one-time build])]) |
624 | if test "x$enable_dependency_tracking" != xno; then |
625 | am_depcomp="$ac_aux_dir/depcomp" |
626 | AMDEPBACKSLASH='\' |
627 | @@ -8925,14 +8919,12 @@ |
628 | |
629 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
630 | |
631 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
632 | -# Free Software Foundation, Inc. |
633 | +# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
634 | # |
635 | # This file is free software; the Free Software Foundation |
636 | # gives unlimited permission to copy and/or distribute it, |
637 | # with or without modifications, as long as this notice is preserved. |
638 | |
639 | -#serial 5 |
640 | |
641 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
642 | # ------------------------------ |
643 | @@ -8951,7 +8943,7 @@ |
644 | # Strip MF so we end up with the name of the file. |
645 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
646 | # Check whether this is an Automake generated Makefile or not. |
647 | - # We used to match only the files named `Makefile.in', but |
648 | + # We used to match only the files named 'Makefile.in', but |
649 | # some people rename them; so instead we look at the file content. |
650 | # Grep'ing the first line is not enough: some people post-process |
651 | # each Makefile.in and add a new line on top of each file to say so. |
652 | @@ -8963,21 +8955,19 @@ |
653 | continue |
654 | fi |
655 | # Extract the definition of DEPDIR, am__include, and am__quote |
656 | - # from the Makefile without running `make'. |
657 | + # from the Makefile without running 'make'. |
658 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
659 | test -z "$DEPDIR" && continue |
660 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
661 | test -z "am__include" && continue |
662 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
663 | - # When using ansi2knr, U may be empty or an underscore; expand it |
664 | - U=`sed -n 's/^U = //p' < "$mf"` |
665 | # Find all dependency output files, they are included files with |
666 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
667 | # simplest approach to changing $(DEPDIR) to its actual value in the |
668 | # expansion. |
669 | for file in `sed -n " |
670 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
671 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
672 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
673 | # Make sure the directory exists. |
674 | test -f "$dirpart/$file" && continue |
675 | fdir=`AS_DIRNAME(["$file"])` |
676 | @@ -8995,7 +8985,7 @@ |
677 | # This macro should only be invoked once -- use via AC_REQUIRE. |
678 | # |
679 | # This code is only required when automatic dependency tracking |
680 | -# is enabled. FIXME. This creates each `.P' file that we will |
681 | +# is enabled. FIXME. This creates each '.P' file that we will |
682 | # need in order to bootstrap the dependency handling code. |
683 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
684 | [AC_CONFIG_COMMANDS([depfiles], |
685 | @@ -9005,15 +8995,12 @@ |
686 | |
687 | # Do all the work for Automake. -*- Autoconf -*- |
688 | |
689 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
690 | -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
691 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
692 | # |
693 | # This file is free software; the Free Software Foundation |
694 | # gives unlimited permission to copy and/or distribute it, |
695 | # with or without modifications, as long as this notice is preserved. |
696 | |
697 | -# serial 16 |
698 | - |
699 | # This macro actually does too much. Some checks are only needed if |
700 | # your package does certain things. But this isn't really a big deal. |
701 | |
702 | @@ -9058,31 +9045,41 @@ |
703 | # Define the identity of the package. |
704 | dnl Distinguish between old-style and new-style calls. |
705 | m4_ifval([$2], |
706 | -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
707 | +[AC_DIAGNOSE([obsolete], |
708 | +[$0: two- and three-arguments forms are deprecated. For more info, see: |
709 | +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) |
710 | +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
711 | AC_SUBST([PACKAGE], [$1])dnl |
712 | AC_SUBST([VERSION], [$2])], |
713 | [_AM_SET_OPTIONS([$1])dnl |
714 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
715 | -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, |
716 | +m4_if( |
717 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
718 | + [ok:ok],, |
719 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
720 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
721 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
722 | |
723 | _AM_IF_OPTION([no-define],, |
724 | -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) |
725 | - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl |
726 | +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
727 | + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
728 | |
729 | # Some tools Automake needs. |
730 | AC_REQUIRE([AM_SANITY_CHECK])dnl |
731 | AC_REQUIRE([AC_ARG_PROGRAM])dnl |
732 | -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) |
733 | -AM_MISSING_PROG(AUTOCONF, autoconf) |
734 | -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
735 | -AM_MISSING_PROG(AUTOHEADER, autoheader) |
736 | -AM_MISSING_PROG(MAKEINFO, makeinfo) |
737 | +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
738 | +AM_MISSING_PROG([AUTOCONF], [autoconf]) |
739 | +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
740 | +AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
741 | +AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
742 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
743 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
744 | -AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
745 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
746 | +# For better backward compatibility. To be removed once Automake 1.9.x |
747 | +# dies out for good. For more background, see: |
748 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
749 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
750 | +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
751 | # We need awk for the "check" target. The system "awk" is bad on |
752 | # some platforms. |
753 | AC_REQUIRE([AC_PROG_AWK])dnl |
754 | @@ -9093,28 +9090,35 @@ |
755 | [_AM_PROG_TAR([v7])])]) |
756 | _AM_IF_OPTION([no-dependencies],, |
757 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
758 | - [_AM_DEPENDENCIES(CC)], |
759 | - [define([AC_PROG_CC], |
760 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
761 | + [_AM_DEPENDENCIES([CC])], |
762 | + [m4_define([AC_PROG_CC], |
763 | + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
764 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
765 | - [_AM_DEPENDENCIES(CXX)], |
766 | - [define([AC_PROG_CXX], |
767 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
768 | + [_AM_DEPENDENCIES([CXX])], |
769 | + [m4_define([AC_PROG_CXX], |
770 | + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
771 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
772 | - [_AM_DEPENDENCIES(OBJC)], |
773 | - [define([AC_PROG_OBJC], |
774 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
775 | + [_AM_DEPENDENCIES([OBJC])], |
776 | + [m4_define([AC_PROG_OBJC], |
777 | + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
778 | +dnl Support for Objective C++ was only introduced in Autoconf 2.65, |
779 | +dnl but we still cater to Autoconf 2.62. |
780 | +m4_ifdef([AC_PROG_OBJCXX], |
781 | +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
782 | + [_AM_DEPENDENCIES([OBJCXX])], |
783 | + [m4_define([AC_PROG_OBJCXX], |
784 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl |
785 | ]) |
786 | _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
787 | -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the |
788 | -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
789 | +dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |
790 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
791 | dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
792 | AC_CONFIG_COMMANDS_PRE(dnl |
793 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
794 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
795 | ]) |
796 | |
797 | -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
798 | +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
799 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
800 | dnl mangled by Autoconf and run in a shell conditional statement. |
801 | m4_define([_AC_COMPILER_EXEEXT], |
802 | @@ -9142,15 +9146,12 @@ |
803 | done |
804 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
805 | |
806 | -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
807 | -# Inc. |
808 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
809 | # |
810 | # This file is free software; the Free Software Foundation |
811 | # gives unlimited permission to copy and/or distribute it, |
812 | # with or without modifications, as long as this notice is preserved. |
813 | |
814 | -# serial 1 |
815 | - |
816 | # AM_PROG_INSTALL_SH |
817 | # ------------------ |
818 | # Define $install_sh. |
819 | @@ -9164,16 +9165,14 @@ |
820 | install_sh="\${SHELL} $am_aux_dir/install-sh" |
821 | esac |
822 | fi |
823 | -AC_SUBST(install_sh)]) |
824 | +AC_SUBST([install_sh])]) |
825 | |
826 | -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
827 | +# Copyright (C) 2003-2012 Free Software Foundation, Inc. |
828 | # |
829 | # This file is free software; the Free Software Foundation |
830 | # gives unlimited permission to copy and/or distribute it, |
831 | # with or without modifications, as long as this notice is preserved. |
832 | |
833 | -# serial 2 |
834 | - |
835 | # Check whether the underlying file-system supports filenames |
836 | # with a leading dot. For instance MS-DOS doesn't. |
837 | AC_DEFUN([AM_SET_LEADING_DOT], |
838 | @@ -9190,20 +9189,17 @@ |
839 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
840 | # From Jim Meyering |
841 | |
842 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
843 | -# 2011 Free Software Foundation, Inc. |
844 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
845 | # |
846 | # This file is free software; the Free Software Foundation |
847 | # gives unlimited permission to copy and/or distribute it, |
848 | # with or without modifications, as long as this notice is preserved. |
849 | |
850 | -# serial 5 |
851 | - |
852 | # AM_MAINTAINER_MODE([DEFAULT-MODE]) |
853 | # ---------------------------------- |
854 | # Control maintainer-specific portions of Makefiles. |
855 | -# Default is to disable them, unless `enable' is passed literally. |
856 | -# For symmetry, `disable' may be passed as well. Anyway, the user |
857 | +# Default is to disable them, unless 'enable' is passed literally. |
858 | +# For symmetry, 'disable' may be passed as well. Anyway, the user |
859 | # can override the default with the --enable/--disable switch. |
860 | AC_DEFUN([AM_MAINTAINER_MODE], |
861 | [m4_case(m4_default([$1], [disable]), |
862 | @@ -9214,10 +9210,11 @@ |
863 | AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
864 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
865 | AC_ARG_ENABLE([maintainer-mode], |
866 | -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
867 | - (and sometimes confusing) to the casual installer], |
868 | - [USE_MAINTAINER_MODE=$enableval], |
869 | - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
870 | + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
871 | + am_maintainer_other[ make rules and dependencies not useful |
872 | + (and sometimes confusing) to the casual installer])], |
873 | + [USE_MAINTAINER_MODE=$enableval], |
874 | + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
875 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
876 | AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
877 | MAINT=$MAINTAINER_MODE_TRUE |
878 | @@ -9229,14 +9226,12 @@ |
879 | |
880 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
881 | |
882 | -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
883 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
884 | # |
885 | # This file is free software; the Free Software Foundation |
886 | # gives unlimited permission to copy and/or distribute it, |
887 | # with or without modifications, as long as this notice is preserved. |
888 | |
889 | -# serial 4 |
890 | - |
891 | # AM_MAKE_INCLUDE() |
892 | # ----------------- |
893 | # Check to see how make treats includes. |
894 | @@ -9254,7 +9249,7 @@ |
895 | _am_result=none |
896 | # First try GNU make style include. |
897 | echo "include confinc" > confmf |
898 | -# Ignore all kinds of additional output from `make'. |
899 | +# Ignore all kinds of additional output from 'make'. |
900 | case `$am_make -s -f confmf 2> /dev/null` in #( |
901 | *the\ am__doit\ target*) |
902 | am__include=include |
903 | @@ -9281,15 +9276,12 @@ |
904 | |
905 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
906 | |
907 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
908 | -# Free Software Foundation, Inc. |
909 | +# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
910 | # |
911 | # This file is free software; the Free Software Foundation |
912 | # gives unlimited permission to copy and/or distribute it, |
913 | # with or without modifications, as long as this notice is preserved. |
914 | |
915 | -# serial 6 |
916 | - |
917 | # AM_MISSING_PROG(NAME, PROGRAM) |
918 | # ------------------------------ |
919 | AC_DEFUN([AM_MISSING_PROG], |
920 | @@ -9297,7 +9289,6 @@ |
921 | $1=${$1-"${am_missing_run}$2"} |
922 | AC_SUBST($1)]) |
923 | |
924 | - |
925 | # AM_MISSING_HAS_RUN |
926 | # ------------------ |
927 | # Define MISSING if not defined so far and test if it supports --run. |
928 | @@ -9318,50 +9309,18 @@ |
929 | am_missing_run="$MISSING --run " |
930 | else |
931 | am_missing_run= |
932 | - AC_MSG_WARN([`missing' script is too old or missing]) |
933 | + AC_MSG_WARN(['missing' script is too old or missing]) |
934 | fi |
935 | ]) |
936 | |
937 | -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
938 | -# Inc. |
939 | -# |
940 | -# This file is free software; the Free Software Foundation |
941 | -# gives unlimited permission to copy and/or distribute it, |
942 | -# with or without modifications, as long as this notice is preserved. |
943 | - |
944 | -# serial 1 |
945 | - |
946 | -# AM_PROG_MKDIR_P |
947 | -# --------------- |
948 | -# Check for `mkdir -p'. |
949 | -AC_DEFUN([AM_PROG_MKDIR_P], |
950 | -[AC_PREREQ([2.60])dnl |
951 | -AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
952 | -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
953 | -dnl while keeping a definition of mkdir_p for backward compatibility. |
954 | -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
955 | -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
956 | -dnl Makefile.ins that do not define MKDIR_P, so we do our own |
957 | -dnl adjustment using top_builddir (which is defined more often than |
958 | -dnl MKDIR_P). |
959 | -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
960 | -case $mkdir_p in |
961 | - [[\\/$]]* | ?:[[\\/]]*) ;; |
962 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
963 | -esac |
964 | -]) |
965 | - |
966 | # Helper functions for option handling. -*- Autoconf -*- |
967 | |
968 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
969 | -# Foundation, Inc. |
970 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
971 | # |
972 | # This file is free software; the Free Software Foundation |
973 | # gives unlimited permission to copy and/or distribute it, |
974 | # with or without modifications, as long as this notice is preserved. |
975 | |
976 | -# serial 5 |
977 | - |
978 | # _AM_MANGLE_OPTION(NAME) |
979 | # ----------------------- |
980 | AC_DEFUN([_AM_MANGLE_OPTION], |
981 | @@ -9371,7 +9330,7 @@ |
982 | # -------------------- |
983 | # Set option NAME. Presently that only means defining a flag for this option. |
984 | AC_DEFUN([_AM_SET_OPTION], |
985 | -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
986 | +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
987 | |
988 | # _AM_SET_OPTIONS(OPTIONS) |
989 | # ------------------------ |
990 | @@ -9387,22 +9346,16 @@ |
991 | |
992 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
993 | |
994 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
995 | -# Free Software Foundation, Inc. |
996 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
997 | # |
998 | # This file is free software; the Free Software Foundation |
999 | # gives unlimited permission to copy and/or distribute it, |
1000 | # with or without modifications, as long as this notice is preserved. |
1001 | |
1002 | -# serial 5 |
1003 | - |
1004 | # AM_SANITY_CHECK |
1005 | # --------------- |
1006 | AC_DEFUN([AM_SANITY_CHECK], |
1007 | [AC_MSG_CHECKING([whether build environment is sane]) |
1008 | -# Just in case |
1009 | -sleep 1 |
1010 | -echo timestamp > conftest.file |
1011 | # Reject unsafe characters in $srcdir or the absolute working directory |
1012 | # name. Accept space and tab only in the latter. |
1013 | am_lf=' |
1014 | @@ -9413,32 +9366,40 @@ |
1015 | esac |
1016 | case $srcdir in |
1017 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
1018 | - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; |
1019 | + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
1020 | esac |
1021 | |
1022 | -# Do `set' in a subshell so we don't clobber the current shell's |
1023 | +# Do 'set' in a subshell so we don't clobber the current shell's |
1024 | # arguments. Must try -L first in case configure is actually a |
1025 | # symlink; some systems play weird games with the mod time of symlinks |
1026 | # (eg FreeBSD returns the mod time of the symlink's containing |
1027 | # directory). |
1028 | if ( |
1029 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
1030 | - if test "$[*]" = "X"; then |
1031 | - # -L didn't work. |
1032 | - set X `ls -t "$srcdir/configure" conftest.file` |
1033 | - fi |
1034 | - rm -f conftest.file |
1035 | - if test "$[*]" != "X $srcdir/configure conftest.file" \ |
1036 | - && test "$[*]" != "X conftest.file $srcdir/configure"; then |
1037 | - |
1038 | - # If neither matched, then we have a broken ls. This can happen |
1039 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
1040 | - # broken ls alias from the environment. This has actually |
1041 | - # happened. Such a system could not be considered "sane". |
1042 | - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
1043 | -alias in your environment]) |
1044 | - fi |
1045 | - |
1046 | + am_has_slept=no |
1047 | + for am_try in 1 2; do |
1048 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
1049 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
1050 | + if test "$[*]" = "X"; then |
1051 | + # -L didn't work. |
1052 | + set X `ls -t "$srcdir/configure" conftest.file` |
1053 | + fi |
1054 | + if test "$[*]" != "X $srcdir/configure conftest.file" \ |
1055 | + && test "$[*]" != "X conftest.file $srcdir/configure"; then |
1056 | + |
1057 | + # If neither matched, then we have a broken ls. This can happen |
1058 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
1059 | + # broken ls alias from the environment. This has actually |
1060 | + # happened. Such a system could not be considered "sane". |
1061 | + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
1062 | + alias in your environment]) |
1063 | + fi |
1064 | + if test "$[2]" = conftest.file || test $am_try -eq 2; then |
1065 | + break |
1066 | + fi |
1067 | + # Just in case. |
1068 | + sleep 1 |
1069 | + am_has_slept=yes |
1070 | + done |
1071 | test "$[2]" = conftest.file |
1072 | ) |
1073 | then |
1074 | @@ -9448,46 +9409,58 @@ |
1075 | AC_MSG_ERROR([newly created file is older than distributed files! |
1076 | Check your system clock]) |
1077 | fi |
1078 | -AC_MSG_RESULT(yes)]) |
1079 | +AC_MSG_RESULT([yes]) |
1080 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
1081 | +# generated files are strictly newer. |
1082 | +am_sleep_pid= |
1083 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
1084 | + ( sleep 1 ) & |
1085 | + am_sleep_pid=$! |
1086 | +fi |
1087 | +AC_CONFIG_COMMANDS_PRE( |
1088 | + [AC_MSG_CHECKING([that generated files are newer than configure]) |
1089 | + if test -n "$am_sleep_pid"; then |
1090 | + # Hide warnings about reused PIDs. |
1091 | + wait $am_sleep_pid 2>/dev/null |
1092 | + fi |
1093 | + AC_MSG_RESULT([done])]) |
1094 | +rm -f conftest.file |
1095 | +]) |
1096 | |
1097 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1098 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
1099 | # |
1100 | # This file is free software; the Free Software Foundation |
1101 | # gives unlimited permission to copy and/or distribute it, |
1102 | # with or without modifications, as long as this notice is preserved. |
1103 | |
1104 | -# serial 1 |
1105 | - |
1106 | # AM_PROG_INSTALL_STRIP |
1107 | # --------------------- |
1108 | -# One issue with vendor `install' (even GNU) is that you can't |
1109 | +# One issue with vendor 'install' (even GNU) is that you can't |
1110 | # specify the program used to strip binaries. This is especially |
1111 | # annoying in cross-compiling environments, where the build's strip |
1112 | # is unlikely to handle the host's binaries. |
1113 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
1114 | -# always use install-sh in `make install-strip', and initialize |
1115 | +# always use install-sh in "make install-strip", and initialize |
1116 | # STRIPPROG with the value of the STRIP variable (set by the user). |
1117 | AC_DEFUN([AM_PROG_INSTALL_STRIP], |
1118 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
1119 | -# Installed binaries are usually stripped using `strip' when the user |
1120 | -# run `make install-strip'. However `strip' might not be the right |
1121 | +# Installed binaries are usually stripped using 'strip' when the user |
1122 | +# run "make install-strip". However 'strip' might not be the right |
1123 | # tool to use in cross-compilation environments, therefore Automake |
1124 | -# will honor the `STRIP' environment variable to overrule this program. |
1125 | -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. |
1126 | +# will honor the 'STRIP' environment variable to overrule this program. |
1127 | +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
1128 | if test "$cross_compiling" != no; then |
1129 | AC_CHECK_TOOL([STRIP], [strip], :) |
1130 | fi |
1131 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1132 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1133 | |
1134 | -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
1135 | +# Copyright (C) 2006-2012 Free Software Foundation, Inc. |
1136 | # |
1137 | # This file is free software; the Free Software Foundation |
1138 | # gives unlimited permission to copy and/or distribute it, |
1139 | # with or without modifications, as long as this notice is preserved. |
1140 | |
1141 | -# serial 3 |
1142 | - |
1143 | # _AM_SUBST_NOTMAKE(VARIABLE) |
1144 | # --------------------------- |
1145 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
1146 | @@ -9501,18 +9474,16 @@ |
1147 | |
1148 | # Check how to create a tarball. -*- Autoconf -*- |
1149 | |
1150 | -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
1151 | +# Copyright (C) 2004-2012 Free Software Foundation, Inc. |
1152 | # |
1153 | # This file is free software; the Free Software Foundation |
1154 | # gives unlimited permission to copy and/or distribute it, |
1155 | # with or without modifications, as long as this notice is preserved. |
1156 | |
1157 | -# serial 2 |
1158 | - |
1159 | # _AM_PROG_TAR(FORMAT) |
1160 | # -------------------- |
1161 | # Check how to create a tarball in format FORMAT. |
1162 | -# FORMAT should be one of `v7', `ustar', or `pax'. |
1163 | +# FORMAT should be one of 'v7', 'ustar', or 'pax'. |
1164 | # |
1165 | # Substitute a variable $(am__tar) that is a command |
1166 | # writing to stdout a FORMAT-tarball containing the directory |
1167 | @@ -9535,7 +9506,7 @@ |
1168 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1169 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1170 | # Do not fold the above two line into one, because Tru64 sh and |
1171 | -# Solaris sh will not grok spaces in the rhs of `-'. |
1172 | +# Solaris sh will not grok spaces in the rhs of '-'. |
1173 | for _am_tool in $_am_tools |
1174 | do |
1175 | case $_am_tool in |
1176 | |
1177 | === modified file 'configure' |
1178 | --- configure 2012-03-02 15:29:50 +0000 |
1179 | +++ configure 2013-05-21 01:25:34 +0000 |
1180 | @@ -1,11 +1,9 @@ |
1181 | #! /bin/sh |
1182 | # Guess values for system-dependent variables and create Makefiles. |
1183 | -# Generated by GNU Autoconf 2.68 for Multitouch Protocol Translation Library 1.1.2. |
1184 | -# |
1185 | -# |
1186 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
1187 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
1188 | -# Foundation, Inc. |
1189 | +# Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.3. |
1190 | +# |
1191 | +# |
1192 | +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
1193 | # |
1194 | # |
1195 | # This configure script is free software; the Free Software Foundation |
1196 | @@ -134,6 +132,31 @@ |
1197 | # CDPATH. |
1198 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1199 | |
1200 | +# Use a proper internal environment variable to ensure we don't fall |
1201 | + # into an infinite loop, continuously re-executing ourselves. |
1202 | + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then |
1203 | + _as_can_reexec=no; export _as_can_reexec; |
1204 | + # We cannot yet assume a decent shell, so we have to provide a |
1205 | +# neutralization value for shells without unset; and this also |
1206 | +# works around shells that cannot unset nonexistent variables. |
1207 | +# Preserve -v and -x to the replacement shell. |
1208 | +BASH_ENV=/dev/null |
1209 | +ENV=/dev/null |
1210 | +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1211 | +case $- in # (((( |
1212 | + *v*x* | *x*v* ) as_opts=-vx ;; |
1213 | + *v* ) as_opts=-v ;; |
1214 | + *x* ) as_opts=-x ;; |
1215 | + * ) as_opts= ;; |
1216 | +esac |
1217 | +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
1218 | +# Admittedly, this is quite paranoid, since all the known shells bail |
1219 | +# out after a failed `exec'. |
1220 | +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
1221 | +as_fn_exit 255 |
1222 | + fi |
1223 | + # We don't want this to propagate to other subprocesses. |
1224 | + { _as_can_reexec=; unset _as_can_reexec;} |
1225 | if test "x$CONFIG_SHELL" = x; then |
1226 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
1227 | emulate sh |
1228 | @@ -167,7 +190,8 @@ |
1229 | else |
1230 | exitcode=1; echo positional parameters were not saved. |
1231 | fi |
1232 | -test x\$exitcode = x0 || exit 1" |
1233 | +test x\$exitcode = x0 || exit 1 |
1234 | +test -x / || exit 1" |
1235 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
1236 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1237 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1238 | @@ -220,21 +244,25 @@ |
1239 | |
1240 | |
1241 | if test "x$CONFIG_SHELL" != x; then : |
1242 | - # We cannot yet assume a decent shell, so we have to provide a |
1243 | - # neutralization value for shells without unset; and this also |
1244 | - # works around shells that cannot unset nonexistent variables. |
1245 | - # Preserve -v and -x to the replacement shell. |
1246 | - BASH_ENV=/dev/null |
1247 | - ENV=/dev/null |
1248 | - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1249 | - export CONFIG_SHELL |
1250 | - case $- in # (((( |
1251 | - *v*x* | *x*v* ) as_opts=-vx ;; |
1252 | - *v* ) as_opts=-v ;; |
1253 | - *x* ) as_opts=-x ;; |
1254 | - * ) as_opts= ;; |
1255 | - esac |
1256 | - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
1257 | + export CONFIG_SHELL |
1258 | + # We cannot yet assume a decent shell, so we have to provide a |
1259 | +# neutralization value for shells without unset; and this also |
1260 | +# works around shells that cannot unset nonexistent variables. |
1261 | +# Preserve -v and -x to the replacement shell. |
1262 | +BASH_ENV=/dev/null |
1263 | +ENV=/dev/null |
1264 | +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1265 | +case $- in # (((( |
1266 | + *v*x* | *x*v* ) as_opts=-vx ;; |
1267 | + *v* ) as_opts=-v ;; |
1268 | + *x* ) as_opts=-x ;; |
1269 | + * ) as_opts= ;; |
1270 | +esac |
1271 | +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
1272 | +# Admittedly, this is quite paranoid, since all the known shells bail |
1273 | +# out after a failed `exec'. |
1274 | +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
1275 | +exit 255 |
1276 | fi |
1277 | |
1278 | if test x$as_have_required = xno; then : |
1279 | @@ -336,6 +364,14 @@ |
1280 | |
1281 | |
1282 | } # as_fn_mkdir_p |
1283 | + |
1284 | +# as_fn_executable_p FILE |
1285 | +# ----------------------- |
1286 | +# Test if FILE is an executable regular file. |
1287 | +as_fn_executable_p () |
1288 | +{ |
1289 | + test -f "$1" && test -x "$1" |
1290 | +} # as_fn_executable_p |
1291 | # as_fn_append VAR VALUE |
1292 | # ---------------------- |
1293 | # Append the text in VALUE to the end of the definition contained in VAR. Take |
1294 | @@ -457,6 +493,10 @@ |
1295 | chmod +x "$as_me.lineno" || |
1296 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
1297 | |
1298 | + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have |
1299 | + # already done that, so ensure we don't try to do so again and fall |
1300 | + # in an infinite loop. This has already happened in practice. |
1301 | + _as_can_reexec=no; export _as_can_reexec |
1302 | # Don't try to exec as it changes $[0], causing all sort of problems |
1303 | # (the dirname of $[0] is not the place where we might find the |
1304 | # original and so on. Autoconf is especially sensitive to this). |
1305 | @@ -491,16 +531,16 @@ |
1306 | # ... but there are two gotchas: |
1307 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
1308 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
1309 | - # In both cases, we have to default to `cp -p'. |
1310 | + # In both cases, we have to default to `cp -pR'. |
1311 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
1312 | - as_ln_s='cp -p' |
1313 | + as_ln_s='cp -pR' |
1314 | elif ln conf$$.file conf$$ 2>/dev/null; then |
1315 | as_ln_s=ln |
1316 | else |
1317 | - as_ln_s='cp -p' |
1318 | + as_ln_s='cp -pR' |
1319 | fi |
1320 | else |
1321 | - as_ln_s='cp -p' |
1322 | + as_ln_s='cp -pR' |
1323 | fi |
1324 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
1325 | rmdir conf$$.dir 2>/dev/null |
1326 | @@ -512,28 +552,8 @@ |
1327 | as_mkdir_p=false |
1328 | fi |
1329 | |
1330 | -if test -x / >/dev/null 2>&1; then |
1331 | - as_test_x='test -x' |
1332 | -else |
1333 | - if ls -dL / >/dev/null 2>&1; then |
1334 | - as_ls_L_option=L |
1335 | - else |
1336 | - as_ls_L_option= |
1337 | - fi |
1338 | - as_test_x=' |
1339 | - eval sh -c '\'' |
1340 | - if test -d "$1"; then |
1341 | - test -d "$1/."; |
1342 | - else |
1343 | - case $1 in #( |
1344 | - -*)set "./$1";; |
1345 | - esac; |
1346 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
1347 | - ???[sx]*):;;*)false;;esac;fi |
1348 | - '\'' sh |
1349 | - ' |
1350 | -fi |
1351 | -as_executable_p=$as_test_x |
1352 | +as_test_x='test -x' |
1353 | +as_executable_p=as_fn_executable_p |
1354 | |
1355 | # Sed expression to map a string onto a valid CPP name. |
1356 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
1357 | @@ -567,8 +587,8 @@ |
1358 | # Identity of this package. |
1359 | PACKAGE_NAME='Multitouch Protocol Translation Library' |
1360 | PACKAGE_TARNAME='mtdev' |
1361 | -PACKAGE_VERSION='1.1.2' |
1362 | -PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.2' |
1363 | +PACKAGE_VERSION='1.1.3' |
1364 | +PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.3' |
1365 | PACKAGE_BUGREPORT='' |
1366 | PACKAGE_URL='' |
1367 | |
1368 | @@ -1202,8 +1222,6 @@ |
1369 | if test "x$host_alias" != x; then |
1370 | if test "x$build_alias" = x; then |
1371 | cross_compiling=maybe |
1372 | - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
1373 | - If a cross compiler is detected then cross compile mode will be used" >&2 |
1374 | elif test "x$build_alias" != "x$host_alias"; then |
1375 | cross_compiling=yes |
1376 | fi |
1377 | @@ -1289,7 +1307,7 @@ |
1378 | # Omit some internal or obsolete options to make the list less imposing. |
1379 | # This message is too long to be a string in the A/UX 3.1 sh. |
1380 | cat <<_ACEOF |
1381 | -\`configure' configures Multitouch Protocol Translation Library 1.1.2 to adapt to many kinds of systems. |
1382 | +\`configure' configures Multitouch Protocol Translation Library 1.1.3 to adapt to many kinds of systems. |
1383 | |
1384 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1385 | |
1386 | @@ -1359,7 +1377,7 @@ |
1387 | |
1388 | if test -n "$ac_init_help"; then |
1389 | case $ac_init_help in |
1390 | - short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.2:";; |
1391 | + short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.3:";; |
1392 | esac |
1393 | cat <<\_ACEOF |
1394 | |
1395 | @@ -1367,14 +1385,17 @@ |
1396 | --disable-option-checking ignore unrecognized --enable/--with options |
1397 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
1398 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1399 | - --enable-maintainer-mode enable make rules and dependencies not useful |
1400 | - (and sometimes confusing) to the casual installer |
1401 | + --enable-maintainer-mode |
1402 | + enable make rules and dependencies not useful (and |
1403 | + sometimes confusing) to the casual installer |
1404 | --enable-shared[=PKGS] build shared libraries [default=yes] |
1405 | --enable-static[=PKGS] build static libraries [default=yes] |
1406 | --enable-fast-install[=PKGS] |
1407 | optimize for fast installation [default=yes] |
1408 | - --disable-dependency-tracking speeds up one-time build |
1409 | - --enable-dependency-tracking do not reject slow dependency extractors |
1410 | + --enable-dependency-tracking |
1411 | + do not reject slow dependency extractors |
1412 | + --disable-dependency-tracking |
1413 | + speeds up one-time build |
1414 | --disable-libtool-lock avoid locking (might break parallel builds) |
1415 | |
1416 | Optional Packages: |
1417 | @@ -1462,10 +1483,10 @@ |
1418 | test -n "$ac_init_help" && exit $ac_status |
1419 | if $ac_init_version; then |
1420 | cat <<\_ACEOF |
1421 | -Multitouch Protocol Translation Library configure 1.1.2 |
1422 | -generated by GNU Autoconf 2.68 |
1423 | +Multitouch Protocol Translation Library configure 1.1.3 |
1424 | +generated by GNU Autoconf 2.69 |
1425 | |
1426 | -Copyright (C) 2010 Free Software Foundation, Inc. |
1427 | +Copyright (C) 2012 Free Software Foundation, Inc. |
1428 | This configure script is free software; the Free Software Foundation |
1429 | gives unlimited permission to copy, distribute and modify it. |
1430 | _ACEOF |
1431 | @@ -1541,7 +1562,7 @@ |
1432 | test ! -s conftest.err |
1433 | } && test -s conftest$ac_exeext && { |
1434 | test "$cross_compiling" = yes || |
1435 | - $as_test_x conftest$ac_exeext |
1436 | + test -x conftest$ac_exeext |
1437 | }; then : |
1438 | ac_retval=0 |
1439 | else |
1440 | @@ -1740,8 +1761,8 @@ |
1441 | This file contains any messages produced by compilers while |
1442 | running configure, to aid debugging if configure makes a mistake. |
1443 | |
1444 | -It was created by Multitouch Protocol Translation Library $as_me 1.1.2, which was |
1445 | -generated by GNU Autoconf 2.68. Invocation command line was |
1446 | +It was created by Multitouch Protocol Translation Library $as_me 1.1.3, which was |
1447 | +generated by GNU Autoconf 2.69. Invocation command line was |
1448 | |
1449 | $ $0 $@ |
1450 | |
1451 | @@ -2122,7 +2143,7 @@ |
1452 | |
1453 | |
1454 | # Initialize Automake |
1455 | -am__api_version='1.11' |
1456 | +am__api_version='1.12' |
1457 | |
1458 | # Find a good install program. We prefer a C program (faster), |
1459 | # so one script is as good as another. But avoid the broken or |
1460 | @@ -2161,7 +2182,7 @@ |
1461 | # by default. |
1462 | for ac_prog in ginstall scoinst install; do |
1463 | for ac_exec_ext in '' $ac_executable_extensions; do |
1464 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
1465 | + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
1466 | if test $ac_prog = install && |
1467 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
1468 | # AIX install. It has an incompatible calling convention. |
1469 | @@ -2219,9 +2240,6 @@ |
1470 | |
1471 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
1472 | $as_echo_n "checking whether build environment is sane... " >&6; } |
1473 | -# Just in case |
1474 | -sleep 1 |
1475 | -echo timestamp > conftest.file |
1476 | # Reject unsafe characters in $srcdir or the absolute working directory |
1477 | # name. Accept space and tab only in the latter. |
1478 | am_lf=' |
1479 | @@ -2232,32 +2250,40 @@ |
1480 | esac |
1481 | case $srcdir in |
1482 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
1483 | - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
1484 | + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; |
1485 | esac |
1486 | |
1487 | -# Do `set' in a subshell so we don't clobber the current shell's |
1488 | +# Do 'set' in a subshell so we don't clobber the current shell's |
1489 | # arguments. Must try -L first in case configure is actually a |
1490 | # symlink; some systems play weird games with the mod time of symlinks |
1491 | # (eg FreeBSD returns the mod time of the symlink's containing |
1492 | # directory). |
1493 | if ( |
1494 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
1495 | - if test "$*" = "X"; then |
1496 | - # -L didn't work. |
1497 | - set X `ls -t "$srcdir/configure" conftest.file` |
1498 | - fi |
1499 | - rm -f conftest.file |
1500 | - if test "$*" != "X $srcdir/configure conftest.file" \ |
1501 | - && test "$*" != "X conftest.file $srcdir/configure"; then |
1502 | - |
1503 | - # If neither matched, then we have a broken ls. This can happen |
1504 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
1505 | - # broken ls alias from the environment. This has actually |
1506 | - # happened. Such a system could not be considered "sane". |
1507 | - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
1508 | -alias in your environment" "$LINENO" 5 |
1509 | - fi |
1510 | - |
1511 | + am_has_slept=no |
1512 | + for am_try in 1 2; do |
1513 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
1514 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
1515 | + if test "$*" = "X"; then |
1516 | + # -L didn't work. |
1517 | + set X `ls -t "$srcdir/configure" conftest.file` |
1518 | + fi |
1519 | + if test "$*" != "X $srcdir/configure conftest.file" \ |
1520 | + && test "$*" != "X conftest.file $srcdir/configure"; then |
1521 | + |
1522 | + # If neither matched, then we have a broken ls. This can happen |
1523 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
1524 | + # broken ls alias from the environment. This has actually |
1525 | + # happened. Such a system could not be considered "sane". |
1526 | + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
1527 | + alias in your environment" "$LINENO" 5 |
1528 | + fi |
1529 | + if test "$2" = conftest.file || test $am_try -eq 2; then |
1530 | + break |
1531 | + fi |
1532 | + # Just in case. |
1533 | + sleep 1 |
1534 | + am_has_slept=yes |
1535 | + done |
1536 | test "$2" = conftest.file |
1537 | ) |
1538 | then |
1539 | @@ -2269,6 +2295,16 @@ |
1540 | fi |
1541 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1542 | $as_echo "yes" >&6; } |
1543 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
1544 | +# generated files are strictly newer. |
1545 | +am_sleep_pid= |
1546 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
1547 | + ( sleep 1 ) & |
1548 | + am_sleep_pid=$! |
1549 | +fi |
1550 | + |
1551 | +rm -f conftest.file |
1552 | + |
1553 | test "$program_prefix" != NONE && |
1554 | program_transform_name="s&^&$program_prefix&;$program_transform_name" |
1555 | # Use a double $ so make ignores it. |
1556 | @@ -2295,8 +2331,8 @@ |
1557 | am_missing_run="$MISSING --run " |
1558 | else |
1559 | am_missing_run= |
1560 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 |
1561 | -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} |
1562 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 |
1563 | +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} |
1564 | fi |
1565 | |
1566 | if test x"${install_sh}" != xset; then |
1567 | @@ -2308,10 +2344,10 @@ |
1568 | esac |
1569 | fi |
1570 | |
1571 | -# Installed binaries are usually stripped using `strip' when the user |
1572 | -# run `make install-strip'. However `strip' might not be the right |
1573 | +# Installed binaries are usually stripped using 'strip' when the user |
1574 | +# run "make install-strip". However 'strip' might not be the right |
1575 | # tool to use in cross-compilation environments, therefore Automake |
1576 | -# will honor the `STRIP' environment variable to overrule this program. |
1577 | +# will honor the 'STRIP' environment variable to overrule this program. |
1578 | if test "$cross_compiling" != no; then |
1579 | if test -n "$ac_tool_prefix"; then |
1580 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
1581 | @@ -2330,7 +2366,7 @@ |
1582 | IFS=$as_save_IFS |
1583 | test -z "$as_dir" && as_dir=. |
1584 | for ac_exec_ext in '' $ac_executable_extensions; do |
1585 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1586 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1587 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
1588 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1589 | break 2 |
1590 | @@ -2370,7 +2406,7 @@ |
1591 | IFS=$as_save_IFS |
1592 | test -z "$as_dir" && as_dir=. |
1593 | for ac_exec_ext in '' $ac_executable_extensions; do |
1594 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1595 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1596 | ac_cv_prog_ac_ct_STRIP="strip" |
1597 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1598 | break 2 |
1599 | @@ -2421,7 +2457,7 @@ |
1600 | test -z "$as_dir" && as_dir=. |
1601 | for ac_prog in mkdir gmkdir; do |
1602 | for ac_exec_ext in '' $ac_executable_extensions; do |
1603 | - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
1604 | + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue |
1605 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
1606 | 'mkdir (GNU coreutils) '* | \ |
1607 | 'mkdir (coreutils) '* | \ |
1608 | @@ -2450,12 +2486,6 @@ |
1609 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 |
1610 | $as_echo "$MKDIR_P" >&6; } |
1611 | |
1612 | -mkdir_p="$MKDIR_P" |
1613 | -case $mkdir_p in |
1614 | - [\\/$]* | ?:[\\/]*) ;; |
1615 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
1616 | -esac |
1617 | - |
1618 | for ac_prog in gawk mawk nawk awk |
1619 | do |
1620 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
1621 | @@ -2474,7 +2504,7 @@ |
1622 | IFS=$as_save_IFS |
1623 | test -z "$as_dir" && as_dir=. |
1624 | for ac_exec_ext in '' $ac_executable_extensions; do |
1625 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1626 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1627 | ac_cv_prog_AWK="$ac_prog" |
1628 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1629 | break 2 |
1630 | @@ -2560,7 +2590,7 @@ |
1631 | |
1632 | # Define the identity of the package. |
1633 | PACKAGE='mtdev' |
1634 | - VERSION='1.1.2' |
1635 | + VERSION='1.1.3' |
1636 | |
1637 | |
1638 | cat >>confdefs.h <<_ACEOF |
1639 | @@ -2588,6 +2618,12 @@ |
1640 | |
1641 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
1642 | |
1643 | +# For better backward compatibility. To be removed once Automake 1.9.x |
1644 | +# dies out for good. For more background, see: |
1645 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
1646 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
1647 | +mkdir_p='$(MKDIR_P)' |
1648 | + |
1649 | # We need awk for the "check" target. The system "awk" is bad on |
1650 | # some platforms. |
1651 | # Always define AMTAR for backward compatibility. Yes, it's still used |
1652 | @@ -2812,7 +2848,7 @@ |
1653 | _am_result=none |
1654 | # First try GNU make style include. |
1655 | echo "include confinc" > confmf |
1656 | -# Ignore all kinds of additional output from `make'. |
1657 | +# Ignore all kinds of additional output from 'make'. |
1658 | case `$am_make -s -f confmf 2> /dev/null` in #( |
1659 | *the\ am__doit\ target*) |
1660 | am__include=include |
1661 | @@ -2878,7 +2914,7 @@ |
1662 | IFS=$as_save_IFS |
1663 | test -z "$as_dir" && as_dir=. |
1664 | for ac_exec_ext in '' $ac_executable_extensions; do |
1665 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1666 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1667 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
1668 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1669 | break 2 |
1670 | @@ -2918,7 +2954,7 @@ |
1671 | IFS=$as_save_IFS |
1672 | test -z "$as_dir" && as_dir=. |
1673 | for ac_exec_ext in '' $ac_executable_extensions; do |
1674 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1675 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1676 | ac_cv_prog_ac_ct_CC="gcc" |
1677 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1678 | break 2 |
1679 | @@ -2971,7 +3007,7 @@ |
1680 | IFS=$as_save_IFS |
1681 | test -z "$as_dir" && as_dir=. |
1682 | for ac_exec_ext in '' $ac_executable_extensions; do |
1683 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1684 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1685 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
1686 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1687 | break 2 |
1688 | @@ -3012,7 +3048,7 @@ |
1689 | IFS=$as_save_IFS |
1690 | test -z "$as_dir" && as_dir=. |
1691 | for ac_exec_ext in '' $ac_executable_extensions; do |
1692 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1693 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1694 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
1695 | ac_prog_rejected=yes |
1696 | continue |
1697 | @@ -3070,7 +3106,7 @@ |
1698 | IFS=$as_save_IFS |
1699 | test -z "$as_dir" && as_dir=. |
1700 | for ac_exec_ext in '' $ac_executable_extensions; do |
1701 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1702 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1703 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
1704 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1705 | break 2 |
1706 | @@ -3114,7 +3150,7 @@ |
1707 | IFS=$as_save_IFS |
1708 | test -z "$as_dir" && as_dir=. |
1709 | for ac_exec_ext in '' $ac_executable_extensions; do |
1710 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1711 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1712 | ac_cv_prog_ac_ct_CC="$ac_prog" |
1713 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1714 | break 2 |
1715 | @@ -3560,8 +3596,7 @@ |
1716 | /* end confdefs.h. */ |
1717 | #include <stdarg.h> |
1718 | #include <stdio.h> |
1719 | -#include <sys/types.h> |
1720 | -#include <sys/stat.h> |
1721 | +struct stat; |
1722 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
1723 | struct buf { int x; }; |
1724 | FILE * (*rcsopen) (struct buf *, struct stat *, int); |
1725 | @@ -3657,8 +3692,8 @@ |
1726 | # We make a subdir and do the tests there. Otherwise we can end up |
1727 | # making bogus files that we don't know about and never remove. For |
1728 | # instance it was reported that on HP-UX the gcc test will end up |
1729 | - # making a dummy file named `D' -- because `-MD' means `put the output |
1730 | - # in D'. |
1731 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
1732 | + # in D". |
1733 | rm -rf conftest.dir |
1734 | mkdir conftest.dir |
1735 | # Copy depcomp to subdir because otherwise we won't find it if we're |
1736 | @@ -3693,16 +3728,16 @@ |
1737 | : > sub/conftest.c |
1738 | for i in 1 2 3 4 5 6; do |
1739 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
1740 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
1741 | - # Solaris 8's {/usr,}/bin/sh. |
1742 | - touch sub/conftst$i.h |
1743 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
1744 | + # Solaris 10 /bin/sh. |
1745 | + echo '/* dummy */' > sub/conftst$i.h |
1746 | done |
1747 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
1748 | |
1749 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
1750 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
1751 | # mode. It turns out that the SunPro C++ compiler does not properly |
1752 | - # handle `-M -o', and we need to detect this. Also, some Intel |
1753 | - # versions had trouble with output in subdirs |
1754 | + # handle '-M -o', and we need to detect this. Also, some Intel |
1755 | + # versions had trouble with output in subdirs. |
1756 | am__obj=sub/conftest.${OBJEXT-o} |
1757 | am__minus_obj="-o $am__obj" |
1758 | case $depmode in |
1759 | @@ -3711,8 +3746,8 @@ |
1760 | test "$am__universal" = false || continue |
1761 | ;; |
1762 | nosideeffect) |
1763 | - # after this tag, mechanisms are not by side-effect, so they'll |
1764 | - # only be used when explicitly requested |
1765 | + # After this tag, mechanisms are not by side-effect, so they'll |
1766 | + # only be used when explicitly requested. |
1767 | if test "x$enable_dependency_tracking" = xyes; then |
1768 | continue |
1769 | else |
1770 | @@ -3720,7 +3755,7 @@ |
1771 | fi |
1772 | ;; |
1773 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
1774 | - # This compiler won't grok `-c -o', but also, the minuso test has |
1775 | + # This compiler won't grok '-c -o', but also, the minuso test has |
1776 | # not run yet. These depmodes are late enough in the game, and |
1777 | # so weak that their functioning should not be impacted. |
1778 | am__obj=conftest.${OBJEXT-o} |
1779 | @@ -3796,7 +3831,7 @@ |
1780 | for ac_prog in sed gsed; do |
1781 | for ac_exec_ext in '' $ac_executable_extensions; do |
1782 | ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" |
1783 | - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue |
1784 | + as_fn_executable_p "$ac_path_SED" || continue |
1785 | # Check for GNU ac_path_SED and select it if it is found. |
1786 | # Check for GNU $ac_path_SED |
1787 | case `"$ac_path_SED" --version 2>&1` in |
1788 | @@ -3872,7 +3907,7 @@ |
1789 | for ac_prog in grep ggrep; do |
1790 | for ac_exec_ext in '' $ac_executable_extensions; do |
1791 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
1792 | - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
1793 | + as_fn_executable_p "$ac_path_GREP" || continue |
1794 | # Check for GNU ac_path_GREP and select it if it is found. |
1795 | # Check for GNU $ac_path_GREP |
1796 | case `"$ac_path_GREP" --version 2>&1` in |
1797 | @@ -3938,7 +3973,7 @@ |
1798 | for ac_prog in egrep; do |
1799 | for ac_exec_ext in '' $ac_executable_extensions; do |
1800 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
1801 | - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
1802 | + as_fn_executable_p "$ac_path_EGREP" || continue |
1803 | # Check for GNU ac_path_EGREP and select it if it is found. |
1804 | # Check for GNU $ac_path_EGREP |
1805 | case `"$ac_path_EGREP" --version 2>&1` in |
1806 | @@ -4005,7 +4040,7 @@ |
1807 | for ac_prog in fgrep; do |
1808 | for ac_exec_ext in '' $ac_executable_extensions; do |
1809 | ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" |
1810 | - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue |
1811 | + as_fn_executable_p "$ac_path_FGREP" || continue |
1812 | # Check for GNU ac_path_FGREP and select it if it is found. |
1813 | # Check for GNU $ac_path_FGREP |
1814 | case `"$ac_path_FGREP" --version 2>&1` in |
1815 | @@ -4261,7 +4296,7 @@ |
1816 | IFS=$as_save_IFS |
1817 | test -z "$as_dir" && as_dir=. |
1818 | for ac_exec_ext in '' $ac_executable_extensions; do |
1819 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1820 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1821 | ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" |
1822 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1823 | break 2 |
1824 | @@ -4305,7 +4340,7 @@ |
1825 | IFS=$as_save_IFS |
1826 | test -z "$as_dir" && as_dir=. |
1827 | for ac_exec_ext in '' $ac_executable_extensions; do |
1828 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1829 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1830 | ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" |
1831 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1832 | break 2 |
1833 | @@ -4729,7 +4764,7 @@ |
1834 | IFS=$as_save_IFS |
1835 | test -z "$as_dir" && as_dir=. |
1836 | for ac_exec_ext in '' $ac_executable_extensions; do |
1837 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1838 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1839 | ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" |
1840 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1841 | break 2 |
1842 | @@ -4769,7 +4804,7 @@ |
1843 | IFS=$as_save_IFS |
1844 | test -z "$as_dir" && as_dir=. |
1845 | for ac_exec_ext in '' $ac_executable_extensions; do |
1846 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1847 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1848 | ac_cv_prog_ac_ct_OBJDUMP="objdump" |
1849 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1850 | break 2 |
1851 | @@ -5075,7 +5110,7 @@ |
1852 | IFS=$as_save_IFS |
1853 | test -z "$as_dir" && as_dir=. |
1854 | for ac_exec_ext in '' $ac_executable_extensions; do |
1855 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1856 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1857 | ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
1858 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1859 | break 2 |
1860 | @@ -5115,7 +5150,7 @@ |
1861 | IFS=$as_save_IFS |
1862 | test -z "$as_dir" && as_dir=. |
1863 | for ac_exec_ext in '' $ac_executable_extensions; do |
1864 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1865 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1866 | ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
1867 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1868 | break 2 |
1869 | @@ -5219,7 +5254,7 @@ |
1870 | IFS=$as_save_IFS |
1871 | test -z "$as_dir" && as_dir=. |
1872 | for ac_exec_ext in '' $ac_executable_extensions; do |
1873 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1874 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1875 | ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
1876 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1877 | break 2 |
1878 | @@ -5263,7 +5298,7 @@ |
1879 | IFS=$as_save_IFS |
1880 | test -z "$as_dir" && as_dir=. |
1881 | for ac_exec_ext in '' $ac_executable_extensions; do |
1882 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1883 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1884 | ac_cv_prog_ac_ct_AR="$ac_prog" |
1885 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1886 | break 2 |
1887 | @@ -5388,7 +5423,7 @@ |
1888 | IFS=$as_save_IFS |
1889 | test -z "$as_dir" && as_dir=. |
1890 | for ac_exec_ext in '' $ac_executable_extensions; do |
1891 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1892 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1893 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
1894 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1895 | break 2 |
1896 | @@ -5428,7 +5463,7 @@ |
1897 | IFS=$as_save_IFS |
1898 | test -z "$as_dir" && as_dir=. |
1899 | for ac_exec_ext in '' $ac_executable_extensions; do |
1900 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1901 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1902 | ac_cv_prog_ac_ct_STRIP="strip" |
1903 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1904 | break 2 |
1905 | @@ -5487,7 +5522,7 @@ |
1906 | IFS=$as_save_IFS |
1907 | test -z "$as_dir" && as_dir=. |
1908 | for ac_exec_ext in '' $ac_executable_extensions; do |
1909 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1910 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1911 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
1912 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1913 | break 2 |
1914 | @@ -5527,7 +5562,7 @@ |
1915 | IFS=$as_save_IFS |
1916 | test -z "$as_dir" && as_dir=. |
1917 | for ac_exec_ext in '' $ac_executable_extensions; do |
1918 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1919 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1920 | ac_cv_prog_ac_ct_RANLIB="ranlib" |
1921 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1922 | break 2 |
1923 | @@ -6176,7 +6211,7 @@ |
1924 | IFS=$as_save_IFS |
1925 | test -z "$as_dir" && as_dir=. |
1926 | for ac_exec_ext in '' $ac_executable_extensions; do |
1927 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1928 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1929 | ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
1930 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1931 | break 2 |
1932 | @@ -6216,7 +6251,7 @@ |
1933 | IFS=$as_save_IFS |
1934 | test -z "$as_dir" && as_dir=. |
1935 | for ac_exec_ext in '' $ac_executable_extensions; do |
1936 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1937 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1938 | ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
1939 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1940 | break 2 |
1941 | @@ -6296,7 +6331,7 @@ |
1942 | IFS=$as_save_IFS |
1943 | test -z "$as_dir" && as_dir=. |
1944 | for ac_exec_ext in '' $ac_executable_extensions; do |
1945 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1946 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1947 | ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" |
1948 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1949 | break 2 |
1950 | @@ -6336,7 +6371,7 @@ |
1951 | IFS=$as_save_IFS |
1952 | test -z "$as_dir" && as_dir=. |
1953 | for ac_exec_ext in '' $ac_executable_extensions; do |
1954 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1955 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1956 | ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" |
1957 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1958 | break 2 |
1959 | @@ -6388,7 +6423,7 @@ |
1960 | IFS=$as_save_IFS |
1961 | test -z "$as_dir" && as_dir=. |
1962 | for ac_exec_ext in '' $ac_executable_extensions; do |
1963 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1964 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1965 | ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" |
1966 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1967 | break 2 |
1968 | @@ -6428,7 +6463,7 @@ |
1969 | IFS=$as_save_IFS |
1970 | test -z "$as_dir" && as_dir=. |
1971 | for ac_exec_ext in '' $ac_executable_extensions; do |
1972 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1973 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1974 | ac_cv_prog_ac_ct_NMEDIT="nmedit" |
1975 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1976 | break 2 |
1977 | @@ -6480,7 +6515,7 @@ |
1978 | IFS=$as_save_IFS |
1979 | test -z "$as_dir" && as_dir=. |
1980 | for ac_exec_ext in '' $ac_executable_extensions; do |
1981 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1982 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1983 | ac_cv_prog_LIPO="${ac_tool_prefix}lipo" |
1984 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1985 | break 2 |
1986 | @@ -6520,7 +6555,7 @@ |
1987 | IFS=$as_save_IFS |
1988 | test -z "$as_dir" && as_dir=. |
1989 | for ac_exec_ext in '' $ac_executable_extensions; do |
1990 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1991 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1992 | ac_cv_prog_ac_ct_LIPO="lipo" |
1993 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1994 | break 2 |
1995 | @@ -6572,7 +6607,7 @@ |
1996 | IFS=$as_save_IFS |
1997 | test -z "$as_dir" && as_dir=. |
1998 | for ac_exec_ext in '' $ac_executable_extensions; do |
1999 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2000 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2001 | ac_cv_prog_OTOOL="${ac_tool_prefix}otool" |
2002 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2003 | break 2 |
2004 | @@ -6612,7 +6647,7 @@ |
2005 | IFS=$as_save_IFS |
2006 | test -z "$as_dir" && as_dir=. |
2007 | for ac_exec_ext in '' $ac_executable_extensions; do |
2008 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2009 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2010 | ac_cv_prog_ac_ct_OTOOL="otool" |
2011 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2012 | break 2 |
2013 | @@ -6664,7 +6699,7 @@ |
2014 | IFS=$as_save_IFS |
2015 | test -z "$as_dir" && as_dir=. |
2016 | for ac_exec_ext in '' $ac_executable_extensions; do |
2017 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2018 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2019 | ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" |
2020 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2021 | break 2 |
2022 | @@ -6704,7 +6739,7 @@ |
2023 | IFS=$as_save_IFS |
2024 | test -z "$as_dir" && as_dir=. |
2025 | for ac_exec_ext in '' $ac_executable_extensions; do |
2026 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2027 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2028 | ac_cv_prog_ac_ct_OTOOL64="otool64" |
2029 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2030 | break 2 |
2031 | @@ -11211,7 +11246,7 @@ |
2032 | IFS=$as_save_IFS |
2033 | test -z "$as_dir" && as_dir=. |
2034 | for ac_exec_ext in '' $ac_executable_extensions; do |
2035 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2036 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2037 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
2038 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2039 | break 2 |
2040 | @@ -11251,7 +11286,7 @@ |
2041 | IFS=$as_save_IFS |
2042 | test -z "$as_dir" && as_dir=. |
2043 | for ac_exec_ext in '' $ac_executable_extensions; do |
2044 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2045 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2046 | ac_cv_prog_ac_ct_CC="gcc" |
2047 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2048 | break 2 |
2049 | @@ -11304,7 +11339,7 @@ |
2050 | IFS=$as_save_IFS |
2051 | test -z "$as_dir" && as_dir=. |
2052 | for ac_exec_ext in '' $ac_executable_extensions; do |
2053 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2054 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2055 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
2056 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2057 | break 2 |
2058 | @@ -11345,7 +11380,7 @@ |
2059 | IFS=$as_save_IFS |
2060 | test -z "$as_dir" && as_dir=. |
2061 | for ac_exec_ext in '' $ac_executable_extensions; do |
2062 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2063 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2064 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
2065 | ac_prog_rejected=yes |
2066 | continue |
2067 | @@ -11403,7 +11438,7 @@ |
2068 | IFS=$as_save_IFS |
2069 | test -z "$as_dir" && as_dir=. |
2070 | for ac_exec_ext in '' $ac_executable_extensions; do |
2071 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2072 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2073 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
2074 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2075 | break 2 |
2076 | @@ -11447,7 +11482,7 @@ |
2077 | IFS=$as_save_IFS |
2078 | test -z "$as_dir" && as_dir=. |
2079 | for ac_exec_ext in '' $ac_executable_extensions; do |
2080 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2081 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2082 | ac_cv_prog_ac_ct_CC="$ac_prog" |
2083 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2084 | break 2 |
2085 | @@ -11643,8 +11678,7 @@ |
2086 | /* end confdefs.h. */ |
2087 | #include <stdarg.h> |
2088 | #include <stdio.h> |
2089 | -#include <sys/types.h> |
2090 | -#include <sys/stat.h> |
2091 | +struct stat; |
2092 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
2093 | struct buf { int x; }; |
2094 | FILE * (*rcsopen) (struct buf *, struct stat *, int); |
2095 | @@ -11740,8 +11774,8 @@ |
2096 | # We make a subdir and do the tests there. Otherwise we can end up |
2097 | # making bogus files that we don't know about and never remove. For |
2098 | # instance it was reported that on HP-UX the gcc test will end up |
2099 | - # making a dummy file named `D' -- because `-MD' means `put the output |
2100 | - # in D'. |
2101 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
2102 | + # in D". |
2103 | rm -rf conftest.dir |
2104 | mkdir conftest.dir |
2105 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2106 | @@ -11776,16 +11810,16 @@ |
2107 | : > sub/conftest.c |
2108 | for i in 1 2 3 4 5 6; do |
2109 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
2110 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
2111 | - # Solaris 8's {/usr,}/bin/sh. |
2112 | - touch sub/conftst$i.h |
2113 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
2114 | + # Solaris 10 /bin/sh. |
2115 | + echo '/* dummy */' > sub/conftst$i.h |
2116 | done |
2117 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
2118 | |
2119 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
2120 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
2121 | # mode. It turns out that the SunPro C++ compiler does not properly |
2122 | - # handle `-M -o', and we need to detect this. Also, some Intel |
2123 | - # versions had trouble with output in subdirs |
2124 | + # handle '-M -o', and we need to detect this. Also, some Intel |
2125 | + # versions had trouble with output in subdirs. |
2126 | am__obj=sub/conftest.${OBJEXT-o} |
2127 | am__minus_obj="-o $am__obj" |
2128 | case $depmode in |
2129 | @@ -11794,8 +11828,8 @@ |
2130 | test "$am__universal" = false || continue |
2131 | ;; |
2132 | nosideeffect) |
2133 | - # after this tag, mechanisms are not by side-effect, so they'll |
2134 | - # only be used when explicitly requested |
2135 | + # After this tag, mechanisms are not by side-effect, so they'll |
2136 | + # only be used when explicitly requested. |
2137 | if test "x$enable_dependency_tracking" = xyes; then |
2138 | continue |
2139 | else |
2140 | @@ -11803,7 +11837,7 @@ |
2141 | fi |
2142 | ;; |
2143 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2144 | - # This compiler won't grok `-c -o', but also, the minuso test has |
2145 | + # This compiler won't grok '-c -o', but also, the minuso test has |
2146 | # not run yet. These depmodes are late enough in the game, and |
2147 | # so weak that their functioning should not be impacted. |
2148 | am__obj=conftest.${OBJEXT-o} |
2149 | @@ -11970,6 +12004,14 @@ |
2150 | LTLIBOBJS=$ac_ltlibobjs |
2151 | |
2152 | |
2153 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 |
2154 | +$as_echo_n "checking that generated files are newer than configure... " >&6; } |
2155 | + if test -n "$am_sleep_pid"; then |
2156 | + # Hide warnings about reused PIDs. |
2157 | + wait $am_sleep_pid 2>/dev/null |
2158 | + fi |
2159 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 |
2160 | +$as_echo "done" >&6; } |
2161 | if test -n "$EXEEXT"; then |
2162 | am__EXEEXT_TRUE= |
2163 | am__EXEEXT_FALSE='#' |
2164 | @@ -12292,16 +12334,16 @@ |
2165 | # ... but there are two gotchas: |
2166 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
2167 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
2168 | - # In both cases, we have to default to `cp -p'. |
2169 | + # In both cases, we have to default to `cp -pR'. |
2170 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
2171 | - as_ln_s='cp -p' |
2172 | + as_ln_s='cp -pR' |
2173 | elif ln conf$$.file conf$$ 2>/dev/null; then |
2174 | as_ln_s=ln |
2175 | else |
2176 | - as_ln_s='cp -p' |
2177 | + as_ln_s='cp -pR' |
2178 | fi |
2179 | else |
2180 | - as_ln_s='cp -p' |
2181 | + as_ln_s='cp -pR' |
2182 | fi |
2183 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
2184 | rmdir conf$$.dir 2>/dev/null |
2185 | @@ -12361,28 +12403,16 @@ |
2186 | as_mkdir_p=false |
2187 | fi |
2188 | |
2189 | -if test -x / >/dev/null 2>&1; then |
2190 | - as_test_x='test -x' |
2191 | -else |
2192 | - if ls -dL / >/dev/null 2>&1; then |
2193 | - as_ls_L_option=L |
2194 | - else |
2195 | - as_ls_L_option= |
2196 | - fi |
2197 | - as_test_x=' |
2198 | - eval sh -c '\'' |
2199 | - if test -d "$1"; then |
2200 | - test -d "$1/."; |
2201 | - else |
2202 | - case $1 in #( |
2203 | - -*)set "./$1";; |
2204 | - esac; |
2205 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
2206 | - ???[sx]*):;;*)false;;esac;fi |
2207 | - '\'' sh |
2208 | - ' |
2209 | -fi |
2210 | -as_executable_p=$as_test_x |
2211 | + |
2212 | +# as_fn_executable_p FILE |
2213 | +# ----------------------- |
2214 | +# Test if FILE is an executable regular file. |
2215 | +as_fn_executable_p () |
2216 | +{ |
2217 | + test -f "$1" && test -x "$1" |
2218 | +} # as_fn_executable_p |
2219 | +as_test_x='test -x' |
2220 | +as_executable_p=as_fn_executable_p |
2221 | |
2222 | # Sed expression to map a string onto a valid CPP name. |
2223 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
2224 | @@ -12403,8 +12433,8 @@ |
2225 | # report actual input values of CONFIG_FILES etc. instead of their |
2226 | # values after options handling. |
2227 | ac_log=" |
2228 | -This file was extended by Multitouch Protocol Translation Library $as_me 1.1.2, which was |
2229 | -generated by GNU Autoconf 2.68. Invocation command line was |
2230 | +This file was extended by Multitouch Protocol Translation Library $as_me 1.1.3, which was |
2231 | +generated by GNU Autoconf 2.69. Invocation command line was |
2232 | |
2233 | CONFIG_FILES = $CONFIG_FILES |
2234 | CONFIG_HEADERS = $CONFIG_HEADERS |
2235 | @@ -12469,11 +12499,11 @@ |
2236 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2237 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2238 | ac_cs_version="\\ |
2239 | -Multitouch Protocol Translation Library config.status 1.1.2 |
2240 | -configured by $0, generated by GNU Autoconf 2.68, |
2241 | +Multitouch Protocol Translation Library config.status 1.1.3 |
2242 | +configured by $0, generated by GNU Autoconf 2.69, |
2243 | with options \\"\$ac_cs_config\\" |
2244 | |
2245 | -Copyright (C) 2010 Free Software Foundation, Inc. |
2246 | +Copyright (C) 2012 Free Software Foundation, Inc. |
2247 | This config.status script is free software; the Free Software Foundation |
2248 | gives unlimited permission to copy, distribute and modify it." |
2249 | |
2250 | @@ -12564,7 +12594,7 @@ |
2251 | _ACEOF |
2252 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2253 | if \$ac_cs_recheck; then |
2254 | - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
2255 | + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
2256 | shift |
2257 | \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
2258 | CONFIG_SHELL='$SHELL' |
2259 | @@ -13491,7 +13521,7 @@ |
2260 | # Strip MF so we end up with the name of the file. |
2261 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
2262 | # Check whether this is an Automake generated Makefile or not. |
2263 | - # We used to match only the files named `Makefile.in', but |
2264 | + # We used to match only the files named 'Makefile.in', but |
2265 | # some people rename them; so instead we look at the file content. |
2266 | # Grep'ing the first line is not enough: some people post-process |
2267 | # each Makefile.in and add a new line on top of each file to say so. |
2268 | @@ -13525,21 +13555,19 @@ |
2269 | continue |
2270 | fi |
2271 | # Extract the definition of DEPDIR, am__include, and am__quote |
2272 | - # from the Makefile without running `make'. |
2273 | + # from the Makefile without running 'make'. |
2274 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2275 | test -z "$DEPDIR" && continue |
2276 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2277 | test -z "am__include" && continue |
2278 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2279 | - # When using ansi2knr, U may be empty or an underscore; expand it |
2280 | - U=`sed -n 's/^U = //p' < "$mf"` |
2281 | # Find all dependency output files, they are included files with |
2282 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
2283 | # simplest approach to changing $(DEPDIR) to its actual value in the |
2284 | # expansion. |
2285 | for file in `sed -n " |
2286 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
2287 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
2288 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
2289 | # Make sure the directory exists. |
2290 | test -f "$dirpart/$file" && continue |
2291 | fdir=`$as_dirname -- "$file" || |
2292 | |
2293 | === modified file 'configure.ac' |
2294 | --- configure.ac 2012-03-02 15:29:50 +0000 |
2295 | +++ configure.ac 2013-05-21 01:25:34 +0000 |
2296 | @@ -1,7 +1,7 @@ |
2297 | # Initialize Autoconf |
2298 | AC_PREREQ([2.60]) |
2299 | AC_INIT([Multitouch Protocol Translation Library], |
2300 | - [1.1.2], |
2301 | + [1.1.3], |
2302 | [], |
2303 | [mtdev]) |
2304 | AC_CONFIG_SRCDIR([Makefile.am]) |
2305 | |
2306 | === modified file 'debian/changelog' |
2307 | --- debian/changelog 2012-08-17 13:56:10 +0000 |
2308 | +++ debian/changelog 2013-05-21 01:25:34 +0000 |
2309 | @@ -1,3 +1,31 @@ |
2310 | +mtdev (1.1.3-1ubuntu1) saucy; urgency=low |
2311 | + |
2312 | + * Merge from Debian unstable. Remaining changes: |
2313 | + - debian/libmtdev1.links: Install apport hook links. |
2314 | + |
2315 | + -- Logan Rosen <logan@ubuntu.com> Mon, 20 May 2013 21:16:05 -0400 |
2316 | + |
2317 | +mtdev (1.1.3-1) unstable; urgency=low |
2318 | + |
2319 | + * Upload to unstable. |
2320 | + * Update debian/control. |
2321 | + - Remove automake and libtool from Build-Depends and add dh-autoreconf. |
2322 | + - Update Standards-Version to 3.9.4. |
2323 | + * Update debian/rules. |
2324 | + - Add rules/autoreconf.mk (Closes: #700019). |
2325 | + - Remove document files from libmtdev1-udeb. |
2326 | + |
2327 | + -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 08 May 2013 14:45:13 +0900 |
2328 | + |
2329 | +mtdev (1.1.3-1~exp1) experimental; urgency=low |
2330 | + |
2331 | + * New upstream release. |
2332 | + * Update debian/control. |
2333 | + - Fix typo. Thanks to Erik Esterer. (Closes: #685145) |
2334 | + - Add Vcs-Git and Vcs-Browser field. |
2335 | + |
2336 | + -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 05 Sep 2012 01:22:39 +0900 |
2337 | + |
2338 | mtdev (1.1.2-1ubuntu1) quantal; urgency=low |
2339 | |
2340 | * Merge from debian unstable. Remaining changes: |
2341 | |
2342 | === modified file 'debian/control' |
2343 | --- debian/control 2012-08-17 13:56:10 +0000 |
2344 | +++ debian/control 2013-05-21 01:25:34 +0000 |
2345 | @@ -8,10 +8,11 @@ |
2346 | pkg-config, |
2347 | quilt, |
2348 | dpkg-dev (>= 1.14.17), |
2349 | - automake, |
2350 | - libtool, |
2351 | -Standards-Version: 3.9.3 |
2352 | + dh-autoreconf (>= 7) |
2353 | +Standards-Version: 3.9.4 |
2354 | Homepage: http://bitmath.org/code/mtdev/ |
2355 | +Vcs-Git: git://anonscm.debian.org/collab-maint/mtdev.git |
2356 | +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mtdev.git |
2357 | |
2358 | Package: libmtdev1 |
2359 | Architecture: linux-any |
2360 | @@ -48,7 +49,7 @@ |
2361 | drivers that have not been updated to use the newer protocol. |
2362 | . |
2363 | This package provides some test tools for the libmtdev library. |
2364 | - + mtdev-test: prints the information comming from the kernel |
2365 | + + mtdev-test: prints the information coming from the kernel |
2366 | |
2367 | Package: libmtdev1-udeb |
2368 | Section: debian-installer |
2369 | |
2370 | === modified file 'debian/rules' |
2371 | --- debian/rules 2012-03-02 15:29:50 +0000 |
2372 | +++ debian/rules 2013-05-21 01:25:34 +0000 |
2373 | @@ -1,5 +1,6 @@ |
2374 | #!/usr/bin/make -f |
2375 | |
2376 | +include /usr/share/cdbs/1/rules/autoreconf.mk |
2377 | include /usr/share/cdbs/1/rules/debhelper.mk |
2378 | include /usr/share/cdbs/1/rules/utils.mk |
2379 | include /usr/share/cdbs/1/class/autotools.mk |
2380 | @@ -22,3 +23,6 @@ |
2381 | find debian/tmp/usr/lib -name \*.a -exec rm {} \; |
2382 | |
2383 | common-binary-predeb-arch:: list-missing |
2384 | + |
2385 | +binary-install/libmtdev1-udeb:: |
2386 | + rm -rf debian/libmtdev1-udeb/usr/share/doc/libmtdev1-udeb |
2387 | |
2388 | === modified file 'mtdev.pc.in' |
2389 | --- mtdev.pc.in 2010-07-20 14:27:57 +0000 |
2390 | +++ mtdev.pc.in 2013-05-21 01:25:34 +0000 |
2391 | @@ -7,3 +7,4 @@ |
2392 | Description: Multitouch Protocol Translation Library |
2393 | Version: @PACKAGE_VERSION@ |
2394 | Libs: -L${libdir} -lmtdev |
2395 | +Cflags: -I${includedir} |
2396 | |
2397 | === modified file 'src/Makefile.in' |
2398 | --- src/Makefile.in 2012-03-02 15:29:50 +0000 |
2399 | +++ src/Makefile.in 2013-05-21 01:25:34 +0000 |
2400 | @@ -1,9 +1,8 @@ |
2401 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
2402 | +# Makefile.in generated by automake 1.12.3 from Makefile.am. |
2403 | # @configure_input@ |
2404 | |
2405 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
2406 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
2407 | -# Foundation, Inc. |
2408 | +# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2409 | + |
2410 | # This Makefile.in is free software; the Free Software Foundation |
2411 | # gives unlimited permission to copy and/or distribute it, |
2412 | # with or without modifications, as long as this notice is preserved. |
2413 | @@ -17,6 +16,23 @@ |
2414 | |
2415 | |
2416 | VPATH = @srcdir@ |
2417 | +am__make_dryrun = \ |
2418 | + { \ |
2419 | + am__dry=no; \ |
2420 | + case $$MAKEFLAGS in \ |
2421 | + *\\[\ \ ]*) \ |
2422 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2423 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2424 | + *) \ |
2425 | + for am__flg in $$MAKEFLAGS; do \ |
2426 | + case $$am__flg in \ |
2427 | + *=*|--*) ;; \ |
2428 | + *n*) am__dry=yes; break;; \ |
2429 | + esac; \ |
2430 | + done;; \ |
2431 | + esac; \ |
2432 | + test $$am__dry = yes; \ |
2433 | + } |
2434 | pkgdatadir = $(datadir)/@PACKAGE@ |
2435 | pkgincludedir = $(includedir)/@PACKAGE@ |
2436 | pkglibdir = $(libdir)/@PACKAGE@ |
2437 | @@ -37,7 +53,7 @@ |
2438 | host_triplet = @host@ |
2439 | subdir = src |
2440 | DIST_COMMON = $(libmtdevinclude_HEADERS) $(srcdir)/Makefile.am \ |
2441 | - $(srcdir)/Makefile.in |
2442 | + $(srcdir)/Makefile.in $(top_srcdir)/config-aux/depcomp |
2443 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2444 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2445 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2446 | @@ -98,6 +114,11 @@ |
2447 | $(LDFLAGS) -o $@ |
2448 | SOURCES = $(libmtdev_la_SOURCES) |
2449 | DIST_SOURCES = $(libmtdev_la_SOURCES) |
2450 | +am__can_run_installinfo = \ |
2451 | + case $$AM_UPDATE_INFO_DIR in \ |
2452 | + n|no|NO) false;; \ |
2453 | + *) (install-info --version) >/dev/null 2>&1;; \ |
2454 | + esac |
2455 | HEADERS = $(libmtdevinclude_HEADERS) |
2456 | ETAGS = etags |
2457 | CTAGS = ctags |
2458 | @@ -277,7 +298,6 @@ |
2459 | $(am__aclocal_m4_deps): |
2460 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
2461 | @$(NORMAL_INSTALL) |
2462 | - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
2463 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
2464 | list2=; for p in $$list; do \ |
2465 | if test -f $$p; then \ |
2466 | @@ -285,6 +305,8 @@ |
2467 | else :; fi; \ |
2468 | done; \ |
2469 | test -z "$$list2" || { \ |
2470 | + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ |
2471 | + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ |
2472 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ |
2473 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ |
2474 | } |
2475 | @@ -300,12 +322,14 @@ |
2476 | |
2477 | clean-libLTLIBRARIES: |
2478 | -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) |
2479 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
2480 | - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ |
2481 | - test "$$dir" != "$$p" || dir=.; \ |
2482 | - echo "rm -f \"$${dir}/so_locations\""; \ |
2483 | - rm -f "$${dir}/so_locations"; \ |
2484 | - done |
2485 | + @list='$(lib_LTLIBRARIES)'; \ |
2486 | + locs=`for p in $$list; do echo $$p; done | \ |
2487 | + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ |
2488 | + sort -u`; \ |
2489 | + test -z "$$locs" || { \ |
2490 | + echo rm -f $${locs}; \ |
2491 | + rm -f $${locs}; \ |
2492 | + } |
2493 | libmtdev.la: $(libmtdev_la_OBJECTS) $(libmtdev_la_DEPENDENCIES) $(EXTRA_libmtdev_la_DEPENDENCIES) |
2494 | $(libmtdev_la_LINK) -rpath $(libdir) $(libmtdev_la_OBJECTS) $(libmtdev_la_LIBADD) $(LIBS) |
2495 | |
2496 | @@ -349,8 +373,11 @@ |
2497 | -rm -rf .libs _libs |
2498 | install-libmtdevincludeHEADERS: $(libmtdevinclude_HEADERS) |
2499 | @$(NORMAL_INSTALL) |
2500 | - test -z "$(libmtdevincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libmtdevincludedir)" |
2501 | @list='$(libmtdevinclude_HEADERS)'; test -n "$(libmtdevincludedir)" || list=; \ |
2502 | + if test -n "$$list"; then \ |
2503 | + echo " $(MKDIR_P) '$(DESTDIR)$(libmtdevincludedir)'"; \ |
2504 | + $(MKDIR_P) "$(DESTDIR)$(libmtdevincludedir)" || exit 1; \ |
2505 | + fi; \ |
2506 | for p in $$list; do \ |
2507 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
2508 | echo "$$d$$p"; \ |
2509 | @@ -415,6 +442,20 @@ |
2510 | && $(am__cd) $(top_srcdir) \ |
2511 | && gtags -i $(GTAGS_ARGS) "$$here" |
2512 | |
2513 | +cscopelist: $(HEADERS) $(SOURCES) $(LISP) |
2514 | + list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
2515 | + case "$(srcdir)" in \ |
2516 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
2517 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
2518 | + esac; \ |
2519 | + for i in $$list; do \ |
2520 | + if test -f "$$i"; then \ |
2521 | + echo "$(subdir)/$$i"; \ |
2522 | + else \ |
2523 | + echo "$$sdir/$$i"; \ |
2524 | + fi; \ |
2525 | + done >> $(top_builddir)/cscope.files |
2526 | + |
2527 | distclean-tags: |
2528 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
2529 | |
2530 | @@ -560,7 +601,7 @@ |
2531 | .MAKE: install-am install-strip |
2532 | |
2533 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ |
2534 | - clean-libLTLIBRARIES clean-libtool ctags distclean \ |
2535 | + clean-libLTLIBRARIES clean-libtool cscopelist ctags distclean \ |
2536 | distclean-compile distclean-generic distclean-libtool \ |
2537 | distclean-tags distdir dvi dvi-am html html-am info info-am \ |
2538 | install install-am install-data install-data-am install-dvi \ |
2539 | |
2540 | === modified file 'test/Makefile.in' |
2541 | --- test/Makefile.in 2012-03-02 15:29:50 +0000 |
2542 | +++ test/Makefile.in 2013-05-21 01:25:34 +0000 |
2543 | @@ -1,9 +1,8 @@ |
2544 | -# Makefile.in generated by automake 1.11.3 from Makefile.am. |
2545 | +# Makefile.in generated by automake 1.12.3 from Makefile.am. |
2546 | # @configure_input@ |
2547 | |
2548 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
2549 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
2550 | -# Foundation, Inc. |
2551 | +# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2552 | + |
2553 | # This Makefile.in is free software; the Free Software Foundation |
2554 | # gives unlimited permission to copy and/or distribute it, |
2555 | # with or without modifications, as long as this notice is preserved. |
2556 | @@ -16,6 +15,23 @@ |
2557 | @SET_MAKE@ |
2558 | |
2559 | VPATH = @srcdir@ |
2560 | +am__make_dryrun = \ |
2561 | + { \ |
2562 | + am__dry=no; \ |
2563 | + case $$MAKEFLAGS in \ |
2564 | + *\\[\ \ ]*) \ |
2565 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2566 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2567 | + *) \ |
2568 | + for am__flg in $$MAKEFLAGS; do \ |
2569 | + case $$am__flg in \ |
2570 | + *=*|--*) ;; \ |
2571 | + *n*) am__dry=yes; break;; \ |
2572 | + esac; \ |
2573 | + done;; \ |
2574 | + esac; \ |
2575 | + test $$am__dry = yes; \ |
2576 | + } |
2577 | pkgdatadir = $(datadir)/@PACKAGE@ |
2578 | pkgincludedir = $(includedir)/@PACKAGE@ |
2579 | pkglibdir = $(libdir)/@PACKAGE@ |
2580 | @@ -38,7 +54,8 @@ |
2581 | mtdev-kernel$(EXEEXT) |
2582 | bin_PROGRAMS = mtdev-test$(EXEEXT) |
2583 | subdir = test |
2584 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
2585 | +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
2586 | + $(top_srcdir)/config-aux/depcomp |
2587 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2588 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2589 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2590 | @@ -87,6 +104,11 @@ |
2591 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) |
2592 | DIST_SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ |
2593 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) |
2594 | +am__can_run_installinfo = \ |
2595 | + case $$AM_UPDATE_INFO_DIR in \ |
2596 | + n|no|NO) false;; \ |
2597 | + *) (install-info --version) >/dev/null 2>&1;; \ |
2598 | + esac |
2599 | ETAGS = etags |
2600 | CTAGS = ctags |
2601 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2602 | @@ -249,8 +271,11 @@ |
2603 | $(am__aclocal_m4_deps): |
2604 | install-binPROGRAMS: $(bin_PROGRAMS) |
2605 | @$(NORMAL_INSTALL) |
2606 | - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
2607 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
2608 | + if test -n "$$list"; then \ |
2609 | + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
2610 | + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
2611 | + fi; \ |
2612 | for p in $$list; do echo "$$p $$p"; done | \ |
2613 | sed 's/$(EXEEXT)$$//' | \ |
2614 | while read p p1; do if test -f $$p || test -f $$p1; \ |
2615 | @@ -399,6 +424,20 @@ |
2616 | && $(am__cd) $(top_srcdir) \ |
2617 | && gtags -i $(GTAGS_ARGS) "$$here" |
2618 | |
2619 | +cscopelist: $(HEADERS) $(SOURCES) $(LISP) |
2620 | + list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
2621 | + case "$(srcdir)" in \ |
2622 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
2623 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
2624 | + esac; \ |
2625 | + for i in $$list; do \ |
2626 | + if test -f "$$i"; then \ |
2627 | + echo "$(subdir)/$$i"; \ |
2628 | + else \ |
2629 | + echo "$$sdir/$$i"; \ |
2630 | + fi; \ |
2631 | + done >> $(top_builddir)/cscope.files |
2632 | + |
2633 | distclean-tags: |
2634 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
2635 | |
2636 | @@ -543,8 +582,8 @@ |
2637 | .MAKE: install-am install-strip |
2638 | |
2639 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ |
2640 | - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ |
2641 | - distclean distclean-compile distclean-generic \ |
2642 | + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist \ |
2643 | + ctags distclean distclean-compile distclean-generic \ |
2644 | distclean-libtool distclean-tags distdir dvi dvi-am html \ |
2645 | html-am info info-am install install-am install-binPROGRAMS \ |
2646 | install-data install-data-am install-dvi install-dvi-am \ |
Thanks! Sponsored.