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 | 1 | commit e5eb27494cd237e60645db4d7be5b4acf41cb5e0 | ||
6 | 2 | Author: Henrik Rydberg <rydberg@euromail.se> | ||
7 | 3 | Date: Wed Aug 22 22:20:16 2012 +0200 | ||
8 | 4 | |||
9 | 5 | Release mtdev-1.1.3 | ||
10 | 6 | |||
11 | 7 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> | ||
12 | 8 | |||
13 | 9 | commit 656d5c9d7e37a301afa3af9c2382d6b869f57ebf | ||
14 | 10 | Author: David Kozub <zub@linux.fjfi.cvut.cz> | ||
15 | 11 | Date: Tue May 29 22:53:21 2012 +0200 | ||
16 | 12 | |||
17 | 13 | Fix pc file to allow compiling with mtdev installed in non-std path. | ||
18 | 14 | |||
19 | 15 | The pkgconfig file does not specify the -I flag needed to be able to | ||
20 | 16 | compile with `pkg-config mtdev --cflags` when libmtdev is installed to | ||
21 | 17 | a directory that is not searched by the C compiler by default. | ||
22 | 18 | |||
23 | 19 | This patch fixes the issue. | ||
24 | 20 | |||
25 | 21 | Signed-off-by: David Kozub <zub@linux.fjfi.cvut.cz> | ||
26 | 22 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> | ||
27 | 23 | |||
28 | 1 | commit 5a6773f85a77e78dbbb915e32768aa24e1c83124 | 24 | commit 5a6773f85a77e78dbbb915e32768aa24e1c83124 |
29 | 2 | Author: Henrik Rydberg <rydberg@euromail.se> | 25 | Author: Henrik Rydberg <rydberg@euromail.se> |
30 | 3 | Date: Mon Feb 20 16:03:05 2012 +0100 | 26 | Date: Mon Feb 20 16:03:05 2012 +0100 |
31 | 4 | 27 | ||
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 @@ | |||
37 | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.12.3 from Makefile.am. |
38 | 2 | # @configure_input@ | 2 | # @configure_input@ |
39 | 3 | 3 | ||
43 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
44 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | 5 | |
42 | 6 | # Foundation, Inc. | ||
45 | 7 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
46 | 8 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
47 | 9 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
48 | @@ -16,6 +15,23 @@ | |||
49 | 16 | @SET_MAKE@ | 15 | @SET_MAKE@ |
50 | 17 | 16 | ||
51 | 18 | VPATH = @srcdir@ | 17 | VPATH = @srcdir@ |
52 | 18 | am__make_dryrun = \ | ||
53 | 19 | { \ | ||
54 | 20 | am__dry=no; \ | ||
55 | 21 | case $$MAKEFLAGS in \ | ||
56 | 22 | *\\[\ \ ]*) \ | ||
57 | 23 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
58 | 24 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
59 | 25 | *) \ | ||
60 | 26 | for am__flg in $$MAKEFLAGS; do \ | ||
61 | 27 | case $$am__flg in \ | ||
62 | 28 | *=*|--*) ;; \ | ||
63 | 29 | *n*) am__dry=yes; break;; \ | ||
64 | 30 | esac; \ | ||
65 | 31 | done;; \ | ||
66 | 32 | esac; \ | ||
67 | 33 | test $$am__dry = yes; \ | ||
68 | 34 | } | ||
69 | 19 | pkgdatadir = $(datadir)/@PACKAGE@ | 35 | pkgdatadir = $(datadir)/@PACKAGE@ |
70 | 20 | pkgincludedir = $(includedir)/@PACKAGE@ | 36 | pkgincludedir = $(includedir)/@PACKAGE@ |
71 | 21 | pkglibdir = $(libdir)/@PACKAGE@ | 37 | pkglibdir = $(libdir)/@PACKAGE@ |
72 | @@ -37,8 +53,12 @@ | |||
73 | 37 | subdir = . | 53 | subdir = . |
74 | 38 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | 54 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
75 | 39 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | 55 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
78 | 40 | $(srcdir)/mtdev.pc.in $(top_srcdir)/configure COPYING \ | 56 | $(srcdir)/mtdev.pc.in $(top_srcdir)/config-aux/config.guess \ |
79 | 41 | ChangeLog INSTALL config-aux/config.guess \ | 57 | $(top_srcdir)/config-aux/config.sub \ |
80 | 58 | $(top_srcdir)/config-aux/install-sh \ | ||
81 | 59 | $(top_srcdir)/config-aux/ltmain.sh \ | ||
82 | 60 | $(top_srcdir)/config-aux/missing $(top_srcdir)/configure \ | ||
83 | 61 | COPYING ChangeLog INSTALL config-aux/config.guess \ | ||
84 | 42 | config-aux/config.sub config-aux/depcomp config-aux/install-sh \ | 62 | config-aux/config.sub config-aux/depcomp config-aux/install-sh \ |
85 | 43 | config-aux/ltmain.sh config-aux/missing | 63 | config-aux/ltmain.sh config-aux/missing |
86 | 44 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 64 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
87 | @@ -60,6 +80,11 @@ | |||
88 | 60 | install-pdf-recursive install-ps-recursive install-recursive \ | 80 | install-pdf-recursive install-ps-recursive install-recursive \ |
89 | 61 | installcheck-recursive installdirs-recursive pdf-recursive \ | 81 | installcheck-recursive installdirs-recursive pdf-recursive \ |
90 | 62 | ps-recursive uninstall-recursive | 82 | ps-recursive uninstall-recursive |
91 | 83 | am__can_run_installinfo = \ | ||
92 | 84 | case $$AM_UPDATE_INFO_DIR in \ | ||
93 | 85 | n|no|NO) false;; \ | ||
94 | 86 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
95 | 87 | esac | ||
96 | 63 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | 88 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
97 | 64 | am__vpath_adj = case $$p in \ | 89 | am__vpath_adj = case $$p in \ |
98 | 65 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | 90 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
99 | @@ -93,9 +118,10 @@ | |||
100 | 93 | distclean-recursive maintainer-clean-recursive | 118 | distclean-recursive maintainer-clean-recursive |
101 | 94 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | 119 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
102 | 95 | $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | 120 | $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
104 | 96 | distdir dist dist-all distcheck | 121 | cscope distdir dist dist-all distcheck |
105 | 97 | ETAGS = etags | 122 | ETAGS = etags |
106 | 98 | CTAGS = ctags | 123 | CTAGS = ctags |
107 | 124 | CSCOPE = cscope | ||
108 | 99 | DIST_SUBDIRS = $(SUBDIRS) | 125 | DIST_SUBDIRS = $(SUBDIRS) |
109 | 100 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 126 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
110 | 101 | distdir = $(PACKAGE)-$(VERSION) | 127 | distdir = $(PACKAGE)-$(VERSION) |
111 | @@ -106,6 +132,7 @@ | |||
112 | 106 | && rm -rf "$(distdir)" \ | 132 | && rm -rf "$(distdir)" \ |
113 | 107 | || { sleep 5 && rm -rf "$(distdir)"; }; \ | 133 | || { sleep 5 && rm -rf "$(distdir)"; }; \ |
114 | 108 | else :; fi | 134 | else :; fi |
115 | 135 | am__post_remove_distdir = $(am__remove_distdir) | ||
116 | 109 | am__relativize = \ | 136 | am__relativize = \ |
117 | 110 | dir0=`pwd`; \ | 137 | dir0=`pwd`; \ |
118 | 111 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | 138 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
119 | @@ -133,6 +160,7 @@ | |||
120 | 133 | reldir="$$dir2" | 160 | reldir="$$dir2" |
121 | 134 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 | 161 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
122 | 135 | GZIP_ENV = --best | 162 | GZIP_ENV = --best |
123 | 163 | DIST_TARGETS = dist-bzip2 dist-gzip | ||
124 | 136 | distuninstallcheck_listfiles = find . -type f -print | 164 | distuninstallcheck_listfiles = find . -type f -print |
125 | 137 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | 165 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
126 | 138 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | 166 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
127 | @@ -322,8 +350,11 @@ | |||
128 | 322 | -rm -f libtool config.lt | 350 | -rm -f libtool config.lt |
129 | 323 | install-pkgconfigDATA: $(pkgconfig_DATA) | 351 | install-pkgconfigDATA: $(pkgconfig_DATA) |
130 | 324 | @$(NORMAL_INSTALL) | 352 | @$(NORMAL_INSTALL) |
131 | 325 | test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" | ||
132 | 326 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | 353 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
133 | 354 | if test -n "$$list"; then \ | ||
134 | 355 | echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ | ||
135 | 356 | $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ | ||
136 | 357 | fi; \ | ||
137 | 327 | for p in $$list; do \ | 358 | for p in $$list; do \ |
138 | 328 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 359 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
139 | 329 | echo "$$d$$p"; \ | 360 | echo "$$d$$p"; \ |
140 | @@ -340,12 +371,12 @@ | |||
141 | 340 | dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) | 371 | dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) |
142 | 341 | 372 | ||
143 | 342 | # This directory's subdirectories are mostly independent; you can cd | 373 | # This directory's subdirectories are mostly independent; you can cd |
150 | 343 | # into them and run `make' without going through this Makefile. | 374 | # into them and run 'make' without going through this Makefile. |
151 | 344 | # To change the values of `make' variables: instead of editing Makefiles, | 375 | # To change the values of 'make' variables: instead of editing Makefiles, |
152 | 345 | # (1) if the variable is set in `config.status', edit `config.status' | 376 | # (1) if the variable is set in 'config.status', edit 'config.status' |
153 | 346 | # (which will cause the Makefiles to be regenerated when you run `make'); | 377 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
154 | 347 | # (2) otherwise, pass the desired values on the `make' command line. | 378 | # (2) otherwise, pass the desired values on the 'make' command line. |
155 | 348 | $(RECURSIVE_TARGETS): | 379 | $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): |
156 | 349 | @fail= failcom='exit 1'; \ | 380 | @fail= failcom='exit 1'; \ |
157 | 350 | for f in x $$MAKEFLAGS; do \ | 381 | for f in x $$MAKEFLAGS; do \ |
158 | 351 | case $$f in \ | 382 | case $$f in \ |
159 | @@ -355,7 +386,11 @@ | |||
160 | 355 | done; \ | 386 | done; \ |
161 | 356 | dot_seen=no; \ | 387 | dot_seen=no; \ |
162 | 357 | target=`echo $@ | sed s/-recursive//`; \ | 388 | target=`echo $@ | sed s/-recursive//`; \ |
164 | 358 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 389 | case "$@" in \ |
165 | 390 | distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ | ||
166 | 391 | *) list='$(SUBDIRS)' ;; \ | ||
167 | 392 | esac; \ | ||
168 | 393 | for subdir in $$list; do \ | ||
169 | 359 | echo "Making $$target in $$subdir"; \ | 394 | echo "Making $$target in $$subdir"; \ |
170 | 360 | if test "$$subdir" = "."; then \ | 395 | if test "$$subdir" = "."; then \ |
171 | 361 | dot_seen=yes; \ | 396 | dot_seen=yes; \ |
172 | @@ -369,37 +404,6 @@ | |||
173 | 369 | if test "$$dot_seen" = "no"; then \ | 404 | if test "$$dot_seen" = "no"; then \ |
174 | 370 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ | 405 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
175 | 371 | fi; test -z "$$fail" | 406 | fi; test -z "$$fail" |
176 | 372 | |||
177 | 373 | $(RECURSIVE_CLEAN_TARGETS): | ||
178 | 374 | @fail= failcom='exit 1'; \ | ||
179 | 375 | for f in x $$MAKEFLAGS; do \ | ||
180 | 376 | case $$f in \ | ||
181 | 377 | *=* | --[!k]*);; \ | ||
182 | 378 | *k*) failcom='fail=yes';; \ | ||
183 | 379 | esac; \ | ||
184 | 380 | done; \ | ||
185 | 381 | dot_seen=no; \ | ||
186 | 382 | case "$@" in \ | ||
187 | 383 | distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ | ||
188 | 384 | *) list='$(SUBDIRS)' ;; \ | ||
189 | 385 | esac; \ | ||
190 | 386 | rev=''; for subdir in $$list; do \ | ||
191 | 387 | if test "$$subdir" = "."; then :; else \ | ||
192 | 388 | rev="$$subdir $$rev"; \ | ||
193 | 389 | fi; \ | ||
194 | 390 | done; \ | ||
195 | 391 | rev="$$rev ."; \ | ||
196 | 392 | target=`echo $@ | sed s/-recursive//`; \ | ||
197 | 393 | for subdir in $$rev; do \ | ||
198 | 394 | echo "Making $$target in $$subdir"; \ | ||
199 | 395 | if test "$$subdir" = "."; then \ | ||
200 | 396 | local_target="$$target-am"; \ | ||
201 | 397 | else \ | ||
202 | 398 | local_target="$$target"; \ | ||
203 | 399 | fi; \ | ||
204 | 400 | ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | ||
205 | 401 | || eval $$failcom; \ | ||
206 | 402 | done && test -z "$$fail" | ||
207 | 403 | tags-recursive: | 407 | tags-recursive: |
208 | 404 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 408 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
209 | 405 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | 409 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
210 | @@ -408,6 +412,10 @@ | |||
211 | 408 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 412 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
212 | 409 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | 413 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
213 | 410 | done | 414 | done |
214 | 415 | cscopelist-recursive: | ||
215 | 416 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
216 | 417 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ | ||
217 | 418 | done | ||
218 | 411 | 419 | ||
219 | 412 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | 420 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
220 | 413 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 421 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
221 | @@ -471,8 +479,32 @@ | |||
222 | 471 | && $(am__cd) $(top_srcdir) \ | 479 | && $(am__cd) $(top_srcdir) \ |
223 | 472 | && gtags -i $(GTAGS_ARGS) "$$here" | 480 | && gtags -i $(GTAGS_ARGS) "$$here" |
224 | 473 | 481 | ||
225 | 482 | cscope: cscope.files | ||
226 | 483 | test ! -s cscope.files \ | ||
227 | 484 | || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) | ||
228 | 485 | |||
229 | 486 | clean-cscope: | ||
230 | 487 | -rm -f cscope.files | ||
231 | 488 | |||
232 | 489 | cscope.files: clean-cscope cscopelist-recursive cscopelist | ||
233 | 490 | |||
234 | 491 | cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) | ||
235 | 492 | list='$(SOURCES) $(HEADERS) $(LISP)'; \ | ||
236 | 493 | case "$(srcdir)" in \ | ||
237 | 494 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ | ||
238 | 495 | *) sdir=$(subdir)/$(srcdir) ;; \ | ||
239 | 496 | esac; \ | ||
240 | 497 | for i in $$list; do \ | ||
241 | 498 | if test -f "$$i"; then \ | ||
242 | 499 | echo "$(subdir)/$$i"; \ | ||
243 | 500 | else \ | ||
244 | 501 | echo "$$sdir/$$i"; \ | ||
245 | 502 | fi; \ | ||
246 | 503 | done >> $(top_builddir)/cscope.files | ||
247 | 504 | |||
248 | 474 | distclean-tags: | 505 | distclean-tags: |
249 | 475 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | 506 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
250 | 507 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files | ||
251 | 476 | 508 | ||
252 | 477 | distdir: $(DISTFILES) | 509 | distdir: $(DISTFILES) |
253 | 478 | $(am__remove_distdir) | 510 | $(am__remove_distdir) |
254 | @@ -508,13 +540,10 @@ | |||
255 | 508 | done | 540 | done |
256 | 509 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | 541 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
257 | 510 | if test "$$subdir" = .; then :; else \ | 542 | if test "$$subdir" = .; then :; else \ |
265 | 511 | test -d "$(distdir)/$$subdir" \ | 543 | $(am__make_dryrun) \ |
266 | 512 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | 544 | || test -d "$(distdir)/$$subdir" \ |
267 | 513 | || exit 1; \ | 545 | || $(MKDIR_P) "$(distdir)/$$subdir" \ |
268 | 514 | fi; \ | 546 | || exit 1; \ |
262 | 515 | done | ||
263 | 516 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
264 | 517 | if test "$$subdir" = .; then :; else \ | ||
269 | 518 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | 547 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
270 | 519 | $(am__relativize); \ | 548 | $(am__relativize); \ |
271 | 520 | new_distdir=$$reldir; \ | 549 | new_distdir=$$reldir; \ |
272 | @@ -546,40 +575,35 @@ | |||
273 | 546 | || chmod -R a+r "$(distdir)" | 575 | || chmod -R a+r "$(distdir)" |
274 | 547 | dist-gzip: distdir | 576 | dist-gzip: distdir |
275 | 548 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 577 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
277 | 549 | $(am__remove_distdir) | 578 | $(am__post_remove_distdir) |
278 | 550 | dist-bzip2: distdir | 579 | dist-bzip2: distdir |
279 | 551 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 | 580 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
281 | 552 | $(am__remove_distdir) | 581 | $(am__post_remove_distdir) |
282 | 553 | 582 | ||
283 | 554 | dist-lzip: distdir | 583 | dist-lzip: distdir |
284 | 555 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz | 584 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
290 | 556 | $(am__remove_distdir) | 585 | $(am__post_remove_distdir) |
286 | 557 | |||
287 | 558 | dist-lzma: distdir | ||
288 | 559 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma | ||
289 | 560 | $(am__remove_distdir) | ||
291 | 561 | 586 | ||
292 | 562 | dist-xz: distdir | 587 | dist-xz: distdir |
293 | 563 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz | 588 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
295 | 564 | $(am__remove_distdir) | 589 | $(am__post_remove_distdir) |
296 | 565 | 590 | ||
297 | 566 | dist-tarZ: distdir | 591 | dist-tarZ: distdir |
298 | 567 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | 592 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
300 | 568 | $(am__remove_distdir) | 593 | $(am__post_remove_distdir) |
301 | 569 | 594 | ||
302 | 570 | dist-shar: distdir | 595 | dist-shar: distdir |
303 | 571 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz | 596 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
305 | 572 | $(am__remove_distdir) | 597 | $(am__post_remove_distdir) |
306 | 573 | 598 | ||
307 | 574 | dist-zip: distdir | 599 | dist-zip: distdir |
308 | 575 | -rm -f $(distdir).zip | 600 | -rm -f $(distdir).zip |
309 | 576 | zip -rq $(distdir).zip $(distdir) | 601 | zip -rq $(distdir).zip $(distdir) |
311 | 577 | $(am__remove_distdir) | 602 | $(am__post_remove_distdir) |
312 | 578 | 603 | ||
317 | 579 | dist dist-all: distdir | 604 | dist dist-all: |
318 | 580 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 605 | $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' |
319 | 581 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 | 606 | $(am__post_remove_distdir) |
316 | 582 | $(am__remove_distdir) | ||
320 | 583 | 607 | ||
321 | 584 | # This target untars the dist file and tries a VPATH configuration. Then | 608 | # This target untars the dist file and tries a VPATH configuration. Then |
322 | 585 | # it guarantees that the distribution is self-contained by making another | 609 | # it guarantees that the distribution is self-contained by making another |
323 | @@ -590,8 +614,6 @@ | |||
324 | 590 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ | 614 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
325 | 591 | *.tar.bz2*) \ | 615 | *.tar.bz2*) \ |
326 | 592 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ | 616 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
327 | 593 | *.tar.lzma*) \ | ||
328 | 594 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ | ||
329 | 595 | *.tar.lz*) \ | 617 | *.tar.lz*) \ |
330 | 596 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ | 618 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
331 | 597 | *.tar.xz*) \ | 619 | *.tar.xz*) \ |
332 | @@ -603,9 +625,9 @@ | |||
333 | 603 | *.zip*) \ | 625 | *.zip*) \ |
334 | 604 | unzip $(distdir).zip ;;\ | 626 | unzip $(distdir).zip ;;\ |
335 | 605 | esac | 627 | esac |
339 | 606 | chmod -R a-w $(distdir); chmod a+w $(distdir) | 628 | chmod -R a-w $(distdir) |
340 | 607 | mkdir $(distdir)/_build | 629 | chmod u+w $(distdir) |
341 | 608 | mkdir $(distdir)/_inst | 630 | mkdir $(distdir)/_build $(distdir)/_inst |
342 | 609 | chmod a-w $(distdir) | 631 | chmod a-w $(distdir) |
343 | 610 | test -d $(distdir)/_build || exit 0; \ | 632 | test -d $(distdir)/_build || exit 0; \ |
344 | 611 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ | 633 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
345 | @@ -637,7 +659,7 @@ | |||
346 | 637 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ | 659 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
347 | 638 | && cd "$$am__cwd" \ | 660 | && cd "$$am__cwd" \ |
348 | 639 | || exit 1 | 661 | || exit 1 |
350 | 640 | $(am__remove_distdir) | 662 | $(am__post_remove_distdir) |
351 | 641 | @(echo "$(distdir) archives ready for distribution: "; \ | 663 | @(echo "$(distdir) archives ready for distribution: "; \ |
352 | 642 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | 664 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
353 | 643 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | 665 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
354 | @@ -776,12 +798,14 @@ | |||
355 | 776 | uninstall-am: uninstall-pkgconfigDATA | 798 | uninstall-am: uninstall-pkgconfigDATA |
356 | 777 | 799 | ||
357 | 778 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ | 800 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
359 | 779 | ctags-recursive install-am install-strip tags-recursive | 801 | cscopelist-recursive ctags-recursive install-am install-strip \ |
360 | 802 | tags-recursive | ||
361 | 780 | 803 | ||
362 | 781 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 804 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
366 | 782 | all all-am am--refresh check check-am clean clean-generic \ | 805 | all all-am am--refresh check check-am clean clean-cscope \ |
367 | 783 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ | 806 | clean-generic clean-libtool cscope cscopelist \ |
368 | 784 | dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ | 807 | cscopelist-recursive ctags ctags-recursive dist dist-all \ |
369 | 808 | dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ | ||
370 | 785 | dist-xz dist-zip distcheck distclean distclean-generic \ | 809 | dist-xz dist-zip distcheck distclean distclean-generic \ |
371 | 786 | distclean-hdr distclean-libtool distclean-tags distcleancheck \ | 810 | distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
372 | 787 | distdir distuninstallcheck dvi dvi-am html html-am info \ | 811 | distdir distuninstallcheck dvi dvi-am html html-am info \ |
373 | 788 | 812 | ||
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 @@ | |||
383 | 1 | # generated automatically by aclocal 1.11.3 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.12.3 -*- Autoconf -*- |
384 | 2 | 2 | ||
385 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
386 | 4 | # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, | 4 | |
382 | 5 | # Inc. | ||
387 | 6 | # This file is free software; the Free Software Foundation | 5 | # This file is free software; the Free Software Foundation |
388 | 7 | # gives unlimited permission to copy and/or distribute it, | 6 | # gives unlimited permission to copy and/or distribute it, |
389 | 8 | # with or without modifications, as long as this notice is preserved. | 7 | # with or without modifications, as long as this notice is preserved. |
390 | @@ -14,11 +13,11 @@ | |||
391 | 14 | 13 | ||
392 | 15 | m4_ifndef([AC_AUTOCONF_VERSION], | 14 | m4_ifndef([AC_AUTOCONF_VERSION], |
393 | 16 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
396 | 17 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
397 | 18 | [m4_warning([this file was generated for autoconf 2.68. | 17 | [m4_warning([this file was generated for autoconf 2.69. |
398 | 19 | You have another version of autoconf. It may work, but is not guaranteed to. | 18 | You have another version of autoconf. It may work, but is not guaranteed to. |
399 | 20 | If you have problems, you may need to regenerate the build system entirely. | 19 | If you have problems, you may need to regenerate the build system entirely. |
401 | 21 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | 20 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
402 | 22 | 21 | ||
403 | 23 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 22 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
404 | 24 | # | 23 | # |
405 | @@ -8607,25 +8606,22 @@ | |||
406 | 8607 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) | 8606 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) |
407 | 8608 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | 8607 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
408 | 8609 | 8608 | ||
411 | 8610 | # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software | 8609 | # Copyright (C) 2002-2012 Free Software Foundation, Inc. |
410 | 8611 | # Foundation, Inc. | ||
412 | 8612 | # | 8610 | # |
413 | 8613 | # This file is free software; the Free Software Foundation | 8611 | # This file is free software; the Free Software Foundation |
414 | 8614 | # gives unlimited permission to copy and/or distribute it, | 8612 | # gives unlimited permission to copy and/or distribute it, |
415 | 8615 | # with or without modifications, as long as this notice is preserved. | 8613 | # with or without modifications, as long as this notice is preserved. |
416 | 8616 | 8614 | ||
417 | 8617 | # serial 1 | ||
418 | 8618 | |||
419 | 8619 | # AM_AUTOMAKE_VERSION(VERSION) | 8615 | # AM_AUTOMAKE_VERSION(VERSION) |
420 | 8620 | # ---------------------------- | 8616 | # ---------------------------- |
421 | 8621 | # Automake X.Y traces this macro to ensure aclocal.m4 has been | 8617 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
422 | 8622 | # generated from the m4 files accompanying Automake X.Y. | 8618 | # generated from the m4 files accompanying Automake X.Y. |
423 | 8623 | # (This private macro should not be called outside this file.) | 8619 | # (This private macro should not be called outside this file.) |
424 | 8624 | AC_DEFUN([AM_AUTOMAKE_VERSION], | 8620 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
426 | 8625 | [am__api_version='1.11' | 8621 | [am__api_version='1.12' |
427 | 8626 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 8622 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
428 | 8627 | dnl require some minimum version. Point them to the right macro. | 8623 | dnl require some minimum version. Point them to the right macro. |
430 | 8628 | m4_if([$1], [1.11.3], [], | 8624 | m4_if([$1], [1.12.3], [], |
431 | 8629 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 8625 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
432 | 8630 | ]) | 8626 | ]) |
433 | 8631 | 8627 | ||
434 | @@ -8641,24 +8637,22 @@ | |||
435 | 8641 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 8637 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
436 | 8642 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | 8638 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
437 | 8643 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 8639 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
439 | 8644 | [AM_AUTOMAKE_VERSION([1.11.3])dnl | 8640 | [AM_AUTOMAKE_VERSION([1.12.3])dnl |
440 | 8645 | m4_ifndef([AC_AUTOCONF_VERSION], | 8641 | m4_ifndef([AC_AUTOCONF_VERSION], |
441 | 8646 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 8642 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
442 | 8647 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | 8643 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
443 | 8648 | 8644 | ||
444 | 8649 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 8645 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
445 | 8650 | 8646 | ||
447 | 8651 | # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. | 8647 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
448 | 8652 | # | 8648 | # |
449 | 8653 | # This file is free software; the Free Software Foundation | 8649 | # This file is free software; the Free Software Foundation |
450 | 8654 | # gives unlimited permission to copy and/or distribute it, | 8650 | # gives unlimited permission to copy and/or distribute it, |
451 | 8655 | # with or without modifications, as long as this notice is preserved. | 8651 | # with or without modifications, as long as this notice is preserved. |
452 | 8656 | 8652 | ||
453 | 8657 | # serial 1 | ||
454 | 8658 | |||
455 | 8659 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | 8653 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
458 | 8660 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to | 8654 | # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
459 | 8661 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. | 8655 | # '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
460 | 8662 | # | 8656 | # |
461 | 8663 | # Of course, Automake must honor this variable whenever it calls a | 8657 | # Of course, Automake must honor this variable whenever it calls a |
462 | 8664 | # tool from the auxiliary directory. The problem is that $srcdir (and | 8658 | # tool from the auxiliary directory. The problem is that $srcdir (and |
463 | @@ -8677,7 +8671,7 @@ | |||
464 | 8677 | # | 8671 | # |
465 | 8678 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir | 8672 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
466 | 8679 | # are both prefixed by $srcdir. In an in-source build this is usually | 8673 | # are both prefixed by $srcdir. In an in-source build this is usually |
468 | 8680 | # harmless because $srcdir is `.', but things will broke when you | 8674 | # harmless because $srcdir is '.', but things will broke when you |
469 | 8681 | # start a VPATH build or use an absolute $srcdir. | 8675 | # start a VPATH build or use an absolute $srcdir. |
470 | 8682 | # | 8676 | # |
471 | 8683 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, | 8677 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
472 | @@ -8703,22 +8697,19 @@ | |||
473 | 8703 | 8697 | ||
474 | 8704 | # AM_CONDITIONAL -*- Autoconf -*- | 8698 | # AM_CONDITIONAL -*- Autoconf -*- |
475 | 8705 | 8699 | ||
478 | 8706 | # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 | 8700 | # Copyright (C) 1997-2012 Free Software Foundation, Inc. |
477 | 8707 | # Free Software Foundation, Inc. | ||
479 | 8708 | # | 8701 | # |
480 | 8709 | # This file is free software; the Free Software Foundation | 8702 | # This file is free software; the Free Software Foundation |
481 | 8710 | # gives unlimited permission to copy and/or distribute it, | 8703 | # gives unlimited permission to copy and/or distribute it, |
482 | 8711 | # with or without modifications, as long as this notice is preserved. | 8704 | # with or without modifications, as long as this notice is preserved. |
483 | 8712 | 8705 | ||
484 | 8713 | # serial 9 | ||
485 | 8714 | |||
486 | 8715 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) | 8706 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
487 | 8716 | # ------------------------------------- | 8707 | # ------------------------------------- |
488 | 8717 | # Define a conditional. | 8708 | # Define a conditional. |
489 | 8718 | AC_DEFUN([AM_CONDITIONAL], | 8709 | AC_DEFUN([AM_CONDITIONAL], |
493 | 8719 | [AC_PREREQ(2.52)dnl | 8710 | [AC_PREREQ([2.52])dnl |
494 | 8720 | ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], | 8711 | m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
495 | 8721 | [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl | 8712 | [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
496 | 8722 | AC_SUBST([$1_TRUE])dnl | 8713 | AC_SUBST([$1_TRUE])dnl |
497 | 8723 | AC_SUBST([$1_FALSE])dnl | 8714 | AC_SUBST([$1_FALSE])dnl |
498 | 8724 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl | 8715 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
499 | @@ -8737,16 +8728,14 @@ | |||
500 | 8737 | Usually this means the macro was only invoked conditionally.]]) | 8728 | Usually this means the macro was only invoked conditionally.]]) |
501 | 8738 | fi])]) | 8729 | fi])]) |
502 | 8739 | 8730 | ||
505 | 8740 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, | 8731 | # Copyright (C) 1999-2012 Free Software Foundation, Inc. |
504 | 8741 | # 2010, 2011 Free Software Foundation, Inc. | ||
506 | 8742 | # | 8732 | # |
507 | 8743 | # This file is free software; the Free Software Foundation | 8733 | # This file is free software; the Free Software Foundation |
508 | 8744 | # gives unlimited permission to copy and/or distribute it, | 8734 | # gives unlimited permission to copy and/or distribute it, |
509 | 8745 | # with or without modifications, as long as this notice is preserved. | 8735 | # with or without modifications, as long as this notice is preserved. |
510 | 8746 | 8736 | ||
511 | 8747 | # serial 12 | ||
512 | 8748 | 8737 | ||
514 | 8749 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | 8738 | # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
515 | 8750 | # written in clear, in which case automake, when reading aclocal.m4, | 8739 | # written in clear, in which case automake, when reading aclocal.m4, |
516 | 8751 | # will think it sees a *use*, and therefore will trigger all it's | 8740 | # will think it sees a *use*, and therefore will trigger all it's |
517 | 8752 | # C support machinery. Also note that it means that autoscan, seeing | 8741 | # C support machinery. Also note that it means that autoscan, seeing |
518 | @@ -8756,7 +8745,7 @@ | |||
519 | 8756 | # _AM_DEPENDENCIES(NAME) | 8745 | # _AM_DEPENDENCIES(NAME) |
520 | 8757 | # ---------------------- | 8746 | # ---------------------- |
521 | 8758 | # See how the compiler implements dependency checking. | 8747 | # See how the compiler implements dependency checking. |
523 | 8759 | # NAME is "CC", "CXX", "GCJ", or "OBJC". | 8748 | # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
524 | 8760 | # We try a few techniques and use that to set a single cache variable. | 8749 | # We try a few techniques and use that to set a single cache variable. |
525 | 8761 | # | 8750 | # |
526 | 8762 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was | 8751 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
527 | @@ -8769,12 +8758,13 @@ | |||
528 | 8769 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl | 8758 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
529 | 8770 | AC_REQUIRE([AM_DEP_TRACK])dnl | 8759 | AC_REQUIRE([AM_DEP_TRACK])dnl |
530 | 8771 | 8760 | ||
537 | 8772 | ifelse([$1], CC, [depcc="$CC" am_compiler_list=], | 8761 | m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
538 | 8773 | [$1], CXX, [depcc="$CXX" am_compiler_list=], | 8762 | [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
539 | 8774 | [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], | 8763 | [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
540 | 8775 | [$1], UPC, [depcc="$UPC" am_compiler_list=], | 8764 | [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
541 | 8776 | [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], | 8765 | [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
542 | 8777 | [depcc="$$1" am_compiler_list=]) | 8766 | [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
543 | 8767 | [depcc="$$1" am_compiler_list=]) | ||
544 | 8778 | 8768 | ||
545 | 8779 | AC_CACHE_CHECK([dependency style of $depcc], | 8769 | AC_CACHE_CHECK([dependency style of $depcc], |
546 | 8780 | [am_cv_$1_dependencies_compiler_type], | 8770 | [am_cv_$1_dependencies_compiler_type], |
547 | @@ -8782,8 +8772,8 @@ | |||
548 | 8782 | # We make a subdir and do the tests there. Otherwise we can end up | 8772 | # We make a subdir and do the tests there. Otherwise we can end up |
549 | 8783 | # making bogus files that we don't know about and never remove. For | 8773 | # making bogus files that we don't know about and never remove. For |
550 | 8784 | # instance it was reported that on HP-UX the gcc test will end up | 8774 | # instance it was reported that on HP-UX the gcc test will end up |
553 | 8785 | # making a dummy file named `D' -- because `-MD' means `put the output | 8775 | # making a dummy file named 'D' -- because '-MD' means "put the output |
554 | 8786 | # in D'. | 8776 | # in D". |
555 | 8787 | rm -rf conftest.dir | 8777 | rm -rf conftest.dir |
556 | 8788 | mkdir conftest.dir | 8778 | mkdir conftest.dir |
557 | 8789 | # Copy depcomp to subdir because otherwise we won't find it if we're | 8779 | # Copy depcomp to subdir because otherwise we won't find it if we're |
558 | @@ -8823,16 +8813,16 @@ | |||
559 | 8823 | : > sub/conftest.c | 8813 | : > sub/conftest.c |
560 | 8824 | for i in 1 2 3 4 5 6; do | 8814 | for i in 1 2 3 4 5 6; do |
561 | 8825 | echo '#include "conftst'$i'.h"' >> sub/conftest.c | 8815 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
565 | 8826 | # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | 8816 | # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
566 | 8827 | # Solaris 8's {/usr,}/bin/sh. | 8817 | # Solaris 10 /bin/sh. |
567 | 8828 | touch sub/conftst$i.h | 8818 | echo '/* dummy */' > sub/conftst$i.h |
568 | 8829 | done | 8819 | done |
569 | 8830 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | 8820 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
570 | 8831 | 8821 | ||
572 | 8832 | # We check with `-c' and `-o' for the sake of the "dashmstdout" | 8822 | # We check with '-c' and '-o' for the sake of the "dashmstdout" |
573 | 8833 | # mode. It turns out that the SunPro C++ compiler does not properly | 8823 | # mode. It turns out that the SunPro C++ compiler does not properly |
576 | 8834 | # handle `-M -o', and we need to detect this. Also, some Intel | 8824 | # handle '-M -o', and we need to detect this. Also, some Intel |
577 | 8835 | # versions had trouble with output in subdirs | 8825 | # versions had trouble with output in subdirs. |
578 | 8836 | am__obj=sub/conftest.${OBJEXT-o} | 8826 | am__obj=sub/conftest.${OBJEXT-o} |
579 | 8837 | am__minus_obj="-o $am__obj" | 8827 | am__minus_obj="-o $am__obj" |
580 | 8838 | case $depmode in | 8828 | case $depmode in |
581 | @@ -8841,8 +8831,8 @@ | |||
582 | 8841 | test "$am__universal" = false || continue | 8831 | test "$am__universal" = false || continue |
583 | 8842 | ;; | 8832 | ;; |
584 | 8843 | nosideeffect) | 8833 | nosideeffect) |
587 | 8844 | # after this tag, mechanisms are not by side-effect, so they'll | 8834 | # After this tag, mechanisms are not by side-effect, so they'll |
588 | 8845 | # only be used when explicitly requested | 8835 | # only be used when explicitly requested. |
589 | 8846 | if test "x$enable_dependency_tracking" = xyes; then | 8836 | if test "x$enable_dependency_tracking" = xyes; then |
590 | 8847 | continue | 8837 | continue |
591 | 8848 | else | 8838 | else |
592 | @@ -8850,7 +8840,7 @@ | |||
593 | 8850 | fi | 8840 | fi |
594 | 8851 | ;; | 8841 | ;; |
595 | 8852 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) | 8842 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
597 | 8853 | # This compiler won't grok `-c -o', but also, the minuso test has | 8843 | # This compiler won't grok '-c -o', but also, the minuso test has |
598 | 8854 | # not run yet. These depmodes are late enough in the game, and | 8844 | # not run yet. These depmodes are late enough in the game, and |
599 | 8855 | # so weak that their functioning should not be impacted. | 8845 | # so weak that their functioning should not be impacted. |
600 | 8856 | am__obj=conftest.${OBJEXT-o} | 8846 | am__obj=conftest.${OBJEXT-o} |
601 | @@ -8898,7 +8888,7 @@ | |||
602 | 8898 | # AM_SET_DEPDIR | 8888 | # AM_SET_DEPDIR |
603 | 8899 | # ------------- | 8889 | # ------------- |
604 | 8900 | # Choose a directory name for dependency files. | 8890 | # Choose a directory name for dependency files. |
606 | 8901 | # This macro is AC_REQUIREd in _AM_DEPENDENCIES | 8891 | # This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
607 | 8902 | AC_DEFUN([AM_SET_DEPDIR], | 8892 | AC_DEFUN([AM_SET_DEPDIR], |
608 | 8903 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl | 8893 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
609 | 8904 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl | 8894 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
610 | @@ -8908,9 +8898,13 @@ | |||
611 | 8908 | # AM_DEP_TRACK | 8898 | # AM_DEP_TRACK |
612 | 8909 | # ------------ | 8899 | # ------------ |
613 | 8910 | AC_DEFUN([AM_DEP_TRACK], | 8900 | AC_DEFUN([AM_DEP_TRACK], |
617 | 8911 | [AC_ARG_ENABLE(dependency-tracking, | 8901 | [AC_ARG_ENABLE([dependency-tracking], [dnl |
618 | 8912 | [ --disable-dependency-tracking speeds up one-time build | 8902 | AS_HELP_STRING( |
619 | 8913 | --enable-dependency-tracking do not reject slow dependency extractors]) | 8903 | [--enable-dependency-tracking], |
620 | 8904 | [do not reject slow dependency extractors]) | ||
621 | 8905 | AS_HELP_STRING( | ||
622 | 8906 | [--disable-dependency-tracking], | ||
623 | 8907 | [speeds up one-time build])]) | ||
624 | 8914 | if test "x$enable_dependency_tracking" != xno; then | 8908 | if test "x$enable_dependency_tracking" != xno; then |
625 | 8915 | am_depcomp="$ac_aux_dir/depcomp" | 8909 | am_depcomp="$ac_aux_dir/depcomp" |
626 | 8916 | AMDEPBACKSLASH='\' | 8910 | AMDEPBACKSLASH='\' |
627 | @@ -8925,14 +8919,12 @@ | |||
628 | 8925 | 8919 | ||
629 | 8926 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 8920 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
630 | 8927 | 8921 | ||
633 | 8928 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | 8922 | # Copyright (C) 1999-2012 Free Software Foundation, Inc. |
632 | 8929 | # Free Software Foundation, Inc. | ||
634 | 8930 | # | 8923 | # |
635 | 8931 | # This file is free software; the Free Software Foundation | 8924 | # This file is free software; the Free Software Foundation |
636 | 8932 | # gives unlimited permission to copy and/or distribute it, | 8925 | # gives unlimited permission to copy and/or distribute it, |
637 | 8933 | # with or without modifications, as long as this notice is preserved. | 8926 | # with or without modifications, as long as this notice is preserved. |
638 | 8934 | 8927 | ||
639 | 8935 | #serial 5 | ||
640 | 8936 | 8928 | ||
641 | 8937 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | 8929 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
642 | 8938 | # ------------------------------ | 8930 | # ------------------------------ |
643 | @@ -8951,7 +8943,7 @@ | |||
644 | 8951 | # Strip MF so we end up with the name of the file. | 8943 | # Strip MF so we end up with the name of the file. |
645 | 8952 | mf=`echo "$mf" | sed -e 's/:.*$//'` | 8944 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
646 | 8953 | # Check whether this is an Automake generated Makefile or not. | 8945 | # Check whether this is an Automake generated Makefile or not. |
648 | 8954 | # We used to match only the files named `Makefile.in', but | 8946 | # We used to match only the files named 'Makefile.in', but |
649 | 8955 | # some people rename them; so instead we look at the file content. | 8947 | # some people rename them; so instead we look at the file content. |
650 | 8956 | # Grep'ing the first line is not enough: some people post-process | 8948 | # Grep'ing the first line is not enough: some people post-process |
651 | 8957 | # each Makefile.in and add a new line on top of each file to say so. | 8949 | # each Makefile.in and add a new line on top of each file to say so. |
652 | @@ -8963,21 +8955,19 @@ | |||
653 | 8963 | continue | 8955 | continue |
654 | 8964 | fi | 8956 | fi |
655 | 8965 | # Extract the definition of DEPDIR, am__include, and am__quote | 8957 | # Extract the definition of DEPDIR, am__include, and am__quote |
657 | 8966 | # from the Makefile without running `make'. | 8958 | # from the Makefile without running 'make'. |
658 | 8967 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | 8959 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
659 | 8968 | test -z "$DEPDIR" && continue | 8960 | test -z "$DEPDIR" && continue |
660 | 8969 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | 8961 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
661 | 8970 | test -z "am__include" && continue | 8962 | test -z "am__include" && continue |
662 | 8971 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | 8963 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
663 | 8972 | # When using ansi2knr, U may be empty or an underscore; expand it | ||
664 | 8973 | U=`sed -n 's/^U = //p' < "$mf"` | ||
665 | 8974 | # Find all dependency output files, they are included files with | 8964 | # Find all dependency output files, they are included files with |
666 | 8975 | # $(DEPDIR) in their names. We invoke sed twice because it is the | 8965 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
667 | 8976 | # simplest approach to changing $(DEPDIR) to its actual value in the | 8966 | # simplest approach to changing $(DEPDIR) to its actual value in the |
668 | 8977 | # expansion. | 8967 | # expansion. |
669 | 8978 | for file in `sed -n " | 8968 | for file in `sed -n " |
670 | 8979 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | 8969 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
672 | 8980 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | 8970 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
673 | 8981 | # Make sure the directory exists. | 8971 | # Make sure the directory exists. |
674 | 8982 | test -f "$dirpart/$file" && continue | 8972 | test -f "$dirpart/$file" && continue |
675 | 8983 | fdir=`AS_DIRNAME(["$file"])` | 8973 | fdir=`AS_DIRNAME(["$file"])` |
676 | @@ -8995,7 +8985,7 @@ | |||
677 | 8995 | # This macro should only be invoked once -- use via AC_REQUIRE. | 8985 | # This macro should only be invoked once -- use via AC_REQUIRE. |
678 | 8996 | # | 8986 | # |
679 | 8997 | # This code is only required when automatic dependency tracking | 8987 | # This code is only required when automatic dependency tracking |
681 | 8998 | # is enabled. FIXME. This creates each `.P' file that we will | 8988 | # is enabled. FIXME. This creates each '.P' file that we will |
682 | 8999 | # need in order to bootstrap the dependency handling code. | 8989 | # need in order to bootstrap the dependency handling code. |
683 | 9000 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | 8990 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
684 | 9001 | [AC_CONFIG_COMMANDS([depfiles], | 8991 | [AC_CONFIG_COMMANDS([depfiles], |
685 | @@ -9005,15 +8995,12 @@ | |||
686 | 9005 | 8995 | ||
687 | 9006 | # Do all the work for Automake. -*- Autoconf -*- | 8996 | # Do all the work for Automake. -*- Autoconf -*- |
688 | 9007 | 8997 | ||
691 | 9008 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 8998 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
690 | 9009 | # 2005, 2006, 2008, 2009 Free Software Foundation, Inc. | ||
692 | 9010 | # | 8999 | # |
693 | 9011 | # This file is free software; the Free Software Foundation | 9000 | # This file is free software; the Free Software Foundation |
694 | 9012 | # gives unlimited permission to copy and/or distribute it, | 9001 | # gives unlimited permission to copy and/or distribute it, |
695 | 9013 | # with or without modifications, as long as this notice is preserved. | 9002 | # with or without modifications, as long as this notice is preserved. |
696 | 9014 | 9003 | ||
697 | 9015 | # serial 16 | ||
698 | 9016 | |||
699 | 9017 | # This macro actually does too much. Some checks are only needed if | 9004 | # This macro actually does too much. Some checks are only needed if |
700 | 9018 | # your package does certain things. But this isn't really a big deal. | 9005 | # your package does certain things. But this isn't really a big deal. |
701 | 9019 | 9006 | ||
702 | @@ -9058,31 +9045,41 @@ | |||
703 | 9058 | # Define the identity of the package. | 9045 | # Define the identity of the package. |
704 | 9059 | dnl Distinguish between old-style and new-style calls. | 9046 | dnl Distinguish between old-style and new-style calls. |
705 | 9060 | m4_ifval([$2], | 9047 | m4_ifval([$2], |
707 | 9061 | [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | 9048 | [AC_DIAGNOSE([obsolete], |
708 | 9049 | [$0: two- and three-arguments forms are deprecated. For more info, see: | ||
709 | 9050 | http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) | ||
710 | 9051 | m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | ||
711 | 9062 | AC_SUBST([PACKAGE], [$1])dnl | 9052 | AC_SUBST([PACKAGE], [$1])dnl |
712 | 9063 | AC_SUBST([VERSION], [$2])], | 9053 | AC_SUBST([VERSION], [$2])], |
713 | 9064 | [_AM_SET_OPTIONS([$1])dnl | 9054 | [_AM_SET_OPTIONS([$1])dnl |
714 | 9065 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | 9055 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
716 | 9066 | m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, | 9056 | m4_if( |
717 | 9057 | m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | ||
718 | 9058 | [ok:ok],, | ||
719 | 9067 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | 9059 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
720 | 9068 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | 9060 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
721 | 9069 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl | 9061 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
722 | 9070 | 9062 | ||
723 | 9071 | _AM_IF_OPTION([no-define],, | 9063 | _AM_IF_OPTION([no-define],, |
726 | 9072 | [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) | 9064 | [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
727 | 9073 | AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl | 9065 | AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
728 | 9074 | 9066 | ||
729 | 9075 | # Some tools Automake needs. | 9067 | # Some tools Automake needs. |
730 | 9076 | AC_REQUIRE([AM_SANITY_CHECK])dnl | 9068 | AC_REQUIRE([AM_SANITY_CHECK])dnl |
731 | 9077 | AC_REQUIRE([AC_ARG_PROGRAM])dnl | 9069 | AC_REQUIRE([AC_ARG_PROGRAM])dnl |
737 | 9078 | AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) | 9070 | AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
738 | 9079 | AM_MISSING_PROG(AUTOCONF, autoconf) | 9071 | AM_MISSING_PROG([AUTOCONF], [autoconf]) |
739 | 9080 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) | 9072 | AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
740 | 9081 | AM_MISSING_PROG(AUTOHEADER, autoheader) | 9073 | AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
741 | 9082 | AM_MISSING_PROG(MAKEINFO, makeinfo) | 9074 | AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
742 | 9083 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | 9075 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
743 | 9084 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | 9076 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
745 | 9085 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl | 9077 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
746 | 9078 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
747 | 9079 | # dies out for good. For more background, see: | ||
748 | 9080 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
749 | 9081 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
750 | 9082 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) | ||
751 | 9086 | # We need awk for the "check" target. The system "awk" is bad on | 9083 | # We need awk for the "check" target. The system "awk" is bad on |
752 | 9087 | # some platforms. | 9084 | # some platforms. |
753 | 9088 | AC_REQUIRE([AC_PROG_AWK])dnl | 9085 | AC_REQUIRE([AC_PROG_AWK])dnl |
754 | @@ -9093,28 +9090,35 @@ | |||
755 | 9093 | [_AM_PROG_TAR([v7])])]) | 9090 | [_AM_PROG_TAR([v7])])]) |
756 | 9094 | _AM_IF_OPTION([no-dependencies],, | 9091 | _AM_IF_OPTION([no-dependencies],, |
757 | 9095 | [AC_PROVIDE_IFELSE([AC_PROG_CC], | 9092 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
761 | 9096 | [_AM_DEPENDENCIES(CC)], | 9093 | [_AM_DEPENDENCIES([CC])], |
762 | 9097 | [define([AC_PROG_CC], | 9094 | [m4_define([AC_PROG_CC], |
763 | 9098 | defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl | 9095 | m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
764 | 9099 | AC_PROVIDE_IFELSE([AC_PROG_CXX], | 9096 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
768 | 9100 | [_AM_DEPENDENCIES(CXX)], | 9097 | [_AM_DEPENDENCIES([CXX])], |
769 | 9101 | [define([AC_PROG_CXX], | 9098 | [m4_define([AC_PROG_CXX], |
770 | 9102 | defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl | 9099 | m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
771 | 9103 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], | 9100 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
775 | 9104 | [_AM_DEPENDENCIES(OBJC)], | 9101 | [_AM_DEPENDENCIES([OBJC])], |
776 | 9105 | [define([AC_PROG_OBJC], | 9102 | [m4_define([AC_PROG_OBJC], |
777 | 9106 | defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl | 9103 | m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
778 | 9104 | dnl Support for Objective C++ was only introduced in Autoconf 2.65, | ||
779 | 9105 | dnl but we still cater to Autoconf 2.62. | ||
780 | 9106 | m4_ifdef([AC_PROG_OBJCXX], | ||
781 | 9107 | [AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], | ||
782 | 9108 | [_AM_DEPENDENCIES([OBJCXX])], | ||
783 | 9109 | [m4_define([AC_PROG_OBJCXX], | ||
784 | 9110 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl | ||
785 | 9107 | ]) | 9111 | ]) |
786 | 9108 | _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl | 9112 | _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
789 | 9109 | dnl The `parallel-tests' driver may need to know about EXEEXT, so add the | 9113 | dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |
790 | 9110 | dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | 9114 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
791 | 9111 | dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. | 9115 | dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
792 | 9112 | AC_CONFIG_COMMANDS_PRE(dnl | 9116 | AC_CONFIG_COMMANDS_PRE(dnl |
793 | 9113 | [m4_provide_if([_AM_COMPILER_EXEEXT], | 9117 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
794 | 9114 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | 9118 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
795 | 9115 | ]) | 9119 | ]) |
796 | 9116 | 9120 | ||
798 | 9117 | dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | 9121 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
799 | 9118 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | 9122 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
800 | 9119 | dnl mangled by Autoconf and run in a shell conditional statement. | 9123 | dnl mangled by Autoconf and run in a shell conditional statement. |
801 | 9120 | m4_define([_AC_COMPILER_EXEEXT], | 9124 | m4_define([_AC_COMPILER_EXEEXT], |
802 | @@ -9142,15 +9146,12 @@ | |||
803 | 9142 | done | 9146 | done |
804 | 9143 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | 9147 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
805 | 9144 | 9148 | ||
808 | 9145 | # Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, | 9149 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
807 | 9146 | # Inc. | ||
809 | 9147 | # | 9150 | # |
810 | 9148 | # This file is free software; the Free Software Foundation | 9151 | # This file is free software; the Free Software Foundation |
811 | 9149 | # gives unlimited permission to copy and/or distribute it, | 9152 | # gives unlimited permission to copy and/or distribute it, |
812 | 9150 | # with or without modifications, as long as this notice is preserved. | 9153 | # with or without modifications, as long as this notice is preserved. |
813 | 9151 | 9154 | ||
814 | 9152 | # serial 1 | ||
815 | 9153 | |||
816 | 9154 | # AM_PROG_INSTALL_SH | 9155 | # AM_PROG_INSTALL_SH |
817 | 9155 | # ------------------ | 9156 | # ------------------ |
818 | 9156 | # Define $install_sh. | 9157 | # Define $install_sh. |
819 | @@ -9164,16 +9165,14 @@ | |||
820 | 9164 | install_sh="\${SHELL} $am_aux_dir/install-sh" | 9165 | install_sh="\${SHELL} $am_aux_dir/install-sh" |
821 | 9165 | esac | 9166 | esac |
822 | 9166 | fi | 9167 | fi |
824 | 9167 | AC_SUBST(install_sh)]) | 9168 | AC_SUBST([install_sh])]) |
825 | 9168 | 9169 | ||
827 | 9169 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. | 9170 | # Copyright (C) 2003-2012 Free Software Foundation, Inc. |
828 | 9170 | # | 9171 | # |
829 | 9171 | # This file is free software; the Free Software Foundation | 9172 | # This file is free software; the Free Software Foundation |
830 | 9172 | # gives unlimited permission to copy and/or distribute it, | 9173 | # gives unlimited permission to copy and/or distribute it, |
831 | 9173 | # with or without modifications, as long as this notice is preserved. | 9174 | # with or without modifications, as long as this notice is preserved. |
832 | 9174 | 9175 | ||
833 | 9175 | # serial 2 | ||
834 | 9176 | |||
835 | 9177 | # Check whether the underlying file-system supports filenames | 9176 | # Check whether the underlying file-system supports filenames |
836 | 9178 | # with a leading dot. For instance MS-DOS doesn't. | 9177 | # with a leading dot. For instance MS-DOS doesn't. |
837 | 9179 | AC_DEFUN([AM_SET_LEADING_DOT], | 9178 | AC_DEFUN([AM_SET_LEADING_DOT], |
838 | @@ -9190,20 +9189,17 @@ | |||
839 | 9190 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | 9189 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
840 | 9191 | # From Jim Meyering | 9190 | # From Jim Meyering |
841 | 9192 | 9191 | ||
844 | 9193 | # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, | 9192 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
843 | 9194 | # 2011 Free Software Foundation, Inc. | ||
845 | 9195 | # | 9193 | # |
846 | 9196 | # This file is free software; the Free Software Foundation | 9194 | # This file is free software; the Free Software Foundation |
847 | 9197 | # gives unlimited permission to copy and/or distribute it, | 9195 | # gives unlimited permission to copy and/or distribute it, |
848 | 9198 | # with or without modifications, as long as this notice is preserved. | 9196 | # with or without modifications, as long as this notice is preserved. |
849 | 9199 | 9197 | ||
850 | 9200 | # serial 5 | ||
851 | 9201 | |||
852 | 9202 | # AM_MAINTAINER_MODE([DEFAULT-MODE]) | 9198 | # AM_MAINTAINER_MODE([DEFAULT-MODE]) |
853 | 9203 | # ---------------------------------- | 9199 | # ---------------------------------- |
854 | 9204 | # Control maintainer-specific portions of Makefiles. | 9200 | # Control maintainer-specific portions of Makefiles. |
857 | 9205 | # Default is to disable them, unless `enable' is passed literally. | 9201 | # Default is to disable them, unless 'enable' is passed literally. |
858 | 9206 | # For symmetry, `disable' may be passed as well. Anyway, the user | 9202 | # For symmetry, 'disable' may be passed as well. Anyway, the user |
859 | 9207 | # can override the default with the --enable/--disable switch. | 9203 | # can override the default with the --enable/--disable switch. |
860 | 9208 | AC_DEFUN([AM_MAINTAINER_MODE], | 9204 | AC_DEFUN([AM_MAINTAINER_MODE], |
861 | 9209 | [m4_case(m4_default([$1], [disable]), | 9205 | [m4_case(m4_default([$1], [disable]), |
862 | @@ -9214,10 +9210,11 @@ | |||
863 | 9214 | AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | 9210 | AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
864 | 9215 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed | 9211 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
865 | 9216 | AC_ARG_ENABLE([maintainer-mode], | 9212 | AC_ARG_ENABLE([maintainer-mode], |
870 | 9217 | [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful | 9213 | [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
871 | 9218 | (and sometimes confusing) to the casual installer], | 9214 | am_maintainer_other[ make rules and dependencies not useful |
872 | 9219 | [USE_MAINTAINER_MODE=$enableval], | 9215 | (and sometimes confusing) to the casual installer])], |
873 | 9220 | [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) | 9216 | [USE_MAINTAINER_MODE=$enableval], |
874 | 9217 | [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) | ||
875 | 9221 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) | 9218 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
876 | 9222 | AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) | 9219 | AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
877 | 9223 | MAINT=$MAINTAINER_MODE_TRUE | 9220 | MAINT=$MAINTAINER_MODE_TRUE |
878 | @@ -9229,14 +9226,12 @@ | |||
879 | 9229 | 9226 | ||
880 | 9230 | # Check to see how 'make' treats includes. -*- Autoconf -*- | 9227 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
881 | 9231 | 9228 | ||
883 | 9232 | # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. | 9229 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
884 | 9233 | # | 9230 | # |
885 | 9234 | # This file is free software; the Free Software Foundation | 9231 | # This file is free software; the Free Software Foundation |
886 | 9235 | # gives unlimited permission to copy and/or distribute it, | 9232 | # gives unlimited permission to copy and/or distribute it, |
887 | 9236 | # with or without modifications, as long as this notice is preserved. | 9233 | # with or without modifications, as long as this notice is preserved. |
888 | 9237 | 9234 | ||
889 | 9238 | # serial 4 | ||
890 | 9239 | |||
891 | 9240 | # AM_MAKE_INCLUDE() | 9235 | # AM_MAKE_INCLUDE() |
892 | 9241 | # ----------------- | 9236 | # ----------------- |
893 | 9242 | # Check to see how make treats includes. | 9237 | # Check to see how make treats includes. |
894 | @@ -9254,7 +9249,7 @@ | |||
895 | 9254 | _am_result=none | 9249 | _am_result=none |
896 | 9255 | # First try GNU make style include. | 9250 | # First try GNU make style include. |
897 | 9256 | echo "include confinc" > confmf | 9251 | echo "include confinc" > confmf |
899 | 9257 | # Ignore all kinds of additional output from `make'. | 9252 | # Ignore all kinds of additional output from 'make'. |
900 | 9258 | case `$am_make -s -f confmf 2> /dev/null` in #( | 9253 | case `$am_make -s -f confmf 2> /dev/null` in #( |
901 | 9259 | *the\ am__doit\ target*) | 9254 | *the\ am__doit\ target*) |
902 | 9260 | am__include=include | 9255 | am__include=include |
903 | @@ -9281,15 +9276,12 @@ | |||
904 | 9281 | 9276 | ||
905 | 9282 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | 9277 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
906 | 9283 | 9278 | ||
909 | 9284 | # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 | 9279 | # Copyright (C) 1997-2012 Free Software Foundation, Inc. |
908 | 9285 | # Free Software Foundation, Inc. | ||
910 | 9286 | # | 9280 | # |
911 | 9287 | # This file is free software; the Free Software Foundation | 9281 | # This file is free software; the Free Software Foundation |
912 | 9288 | # gives unlimited permission to copy and/or distribute it, | 9282 | # gives unlimited permission to copy and/or distribute it, |
913 | 9289 | # with or without modifications, as long as this notice is preserved. | 9283 | # with or without modifications, as long as this notice is preserved. |
914 | 9290 | 9284 | ||
915 | 9291 | # serial 6 | ||
916 | 9292 | |||
917 | 9293 | # AM_MISSING_PROG(NAME, PROGRAM) | 9285 | # AM_MISSING_PROG(NAME, PROGRAM) |
918 | 9294 | # ------------------------------ | 9286 | # ------------------------------ |
919 | 9295 | AC_DEFUN([AM_MISSING_PROG], | 9287 | AC_DEFUN([AM_MISSING_PROG], |
920 | @@ -9297,7 +9289,6 @@ | |||
921 | 9297 | $1=${$1-"${am_missing_run}$2"} | 9289 | $1=${$1-"${am_missing_run}$2"} |
922 | 9298 | AC_SUBST($1)]) | 9290 | AC_SUBST($1)]) |
923 | 9299 | 9291 | ||
924 | 9300 | |||
925 | 9301 | # AM_MISSING_HAS_RUN | 9292 | # AM_MISSING_HAS_RUN |
926 | 9302 | # ------------------ | 9293 | # ------------------ |
927 | 9303 | # Define MISSING if not defined so far and test if it supports --run. | 9294 | # Define MISSING if not defined so far and test if it supports --run. |
928 | @@ -9318,50 +9309,18 @@ | |||
929 | 9318 | am_missing_run="$MISSING --run " | 9309 | am_missing_run="$MISSING --run " |
930 | 9319 | else | 9310 | else |
931 | 9320 | am_missing_run= | 9311 | am_missing_run= |
933 | 9321 | AC_MSG_WARN([`missing' script is too old or missing]) | 9312 | AC_MSG_WARN(['missing' script is too old or missing]) |
934 | 9322 | fi | 9313 | fi |
935 | 9323 | ]) | 9314 | ]) |
936 | 9324 | 9315 | ||
937 | 9325 | # Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, | ||
938 | 9326 | # Inc. | ||
939 | 9327 | # | ||
940 | 9328 | # This file is free software; the Free Software Foundation | ||
941 | 9329 | # gives unlimited permission to copy and/or distribute it, | ||
942 | 9330 | # with or without modifications, as long as this notice is preserved. | ||
943 | 9331 | |||
944 | 9332 | # serial 1 | ||
945 | 9333 | |||
946 | 9334 | # AM_PROG_MKDIR_P | ||
947 | 9335 | # --------------- | ||
948 | 9336 | # Check for `mkdir -p'. | ||
949 | 9337 | AC_DEFUN([AM_PROG_MKDIR_P], | ||
950 | 9338 | [AC_PREREQ([2.60])dnl | ||
951 | 9339 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | ||
952 | 9340 | dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, | ||
953 | 9341 | dnl while keeping a definition of mkdir_p for backward compatibility. | ||
954 | 9342 | dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. | ||
955 | 9343 | dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of | ||
956 | 9344 | dnl Makefile.ins that do not define MKDIR_P, so we do our own | ||
957 | 9345 | dnl adjustment using top_builddir (which is defined more often than | ||
958 | 9346 | dnl MKDIR_P). | ||
959 | 9347 | AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl | ||
960 | 9348 | case $mkdir_p in | ||
961 | 9349 | [[\\/$]]* | ?:[[\\/]]*) ;; | ||
962 | 9350 | */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; | ||
963 | 9351 | esac | ||
964 | 9352 | ]) | ||
965 | 9353 | |||
966 | 9354 | # Helper functions for option handling. -*- Autoconf -*- | 9316 | # Helper functions for option handling. -*- Autoconf -*- |
967 | 9355 | 9317 | ||
970 | 9356 | # Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software | 9318 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
969 | 9357 | # Foundation, Inc. | ||
971 | 9358 | # | 9319 | # |
972 | 9359 | # This file is free software; the Free Software Foundation | 9320 | # This file is free software; the Free Software Foundation |
973 | 9360 | # gives unlimited permission to copy and/or distribute it, | 9321 | # gives unlimited permission to copy and/or distribute it, |
974 | 9361 | # with or without modifications, as long as this notice is preserved. | 9322 | # with or without modifications, as long as this notice is preserved. |
975 | 9362 | 9323 | ||
976 | 9363 | # serial 5 | ||
977 | 9364 | |||
978 | 9365 | # _AM_MANGLE_OPTION(NAME) | 9324 | # _AM_MANGLE_OPTION(NAME) |
979 | 9366 | # ----------------------- | 9325 | # ----------------------- |
980 | 9367 | AC_DEFUN([_AM_MANGLE_OPTION], | 9326 | AC_DEFUN([_AM_MANGLE_OPTION], |
981 | @@ -9371,7 +9330,7 @@ | |||
982 | 9371 | # -------------------- | 9330 | # -------------------- |
983 | 9372 | # Set option NAME. Presently that only means defining a flag for this option. | 9331 | # Set option NAME. Presently that only means defining a flag for this option. |
984 | 9373 | AC_DEFUN([_AM_SET_OPTION], | 9332 | AC_DEFUN([_AM_SET_OPTION], |
986 | 9374 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) | 9333 | [m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
987 | 9375 | 9334 | ||
988 | 9376 | # _AM_SET_OPTIONS(OPTIONS) | 9335 | # _AM_SET_OPTIONS(OPTIONS) |
989 | 9377 | # ------------------------ | 9336 | # ------------------------ |
990 | @@ -9387,22 +9346,16 @@ | |||
991 | 9387 | 9346 | ||
992 | 9388 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | 9347 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
993 | 9389 | 9348 | ||
996 | 9390 | # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 | 9349 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
995 | 9391 | # Free Software Foundation, Inc. | ||
997 | 9392 | # | 9350 | # |
998 | 9393 | # This file is free software; the Free Software Foundation | 9351 | # This file is free software; the Free Software Foundation |
999 | 9394 | # gives unlimited permission to copy and/or distribute it, | 9352 | # gives unlimited permission to copy and/or distribute it, |
1000 | 9395 | # with or without modifications, as long as this notice is preserved. | 9353 | # with or without modifications, as long as this notice is preserved. |
1001 | 9396 | 9354 | ||
1002 | 9397 | # serial 5 | ||
1003 | 9398 | |||
1004 | 9399 | # AM_SANITY_CHECK | 9355 | # AM_SANITY_CHECK |
1005 | 9400 | # --------------- | 9356 | # --------------- |
1006 | 9401 | AC_DEFUN([AM_SANITY_CHECK], | 9357 | AC_DEFUN([AM_SANITY_CHECK], |
1007 | 9402 | [AC_MSG_CHECKING([whether build environment is sane]) | 9358 | [AC_MSG_CHECKING([whether build environment is sane]) |
1008 | 9403 | # Just in case | ||
1009 | 9404 | sleep 1 | ||
1010 | 9405 | echo timestamp > conftest.file | ||
1011 | 9406 | # Reject unsafe characters in $srcdir or the absolute working directory | 9359 | # Reject unsafe characters in $srcdir or the absolute working directory |
1012 | 9407 | # name. Accept space and tab only in the latter. | 9360 | # name. Accept space and tab only in the latter. |
1013 | 9408 | am_lf=' | 9361 | am_lf=' |
1014 | @@ -9413,32 +9366,40 @@ | |||
1015 | 9413 | esac | 9366 | esac |
1016 | 9414 | case $srcdir in | 9367 | case $srcdir in |
1017 | 9415 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) | 9368 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
1019 | 9416 | AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; | 9369 | AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
1020 | 9417 | esac | 9370 | esac |
1021 | 9418 | 9371 | ||
1023 | 9419 | # Do `set' in a subshell so we don't clobber the current shell's | 9372 | # Do 'set' in a subshell so we don't clobber the current shell's |
1024 | 9420 | # arguments. Must try -L first in case configure is actually a | 9373 | # arguments. Must try -L first in case configure is actually a |
1025 | 9421 | # symlink; some systems play weird games with the mod time of symlinks | 9374 | # symlink; some systems play weird games with the mod time of symlinks |
1026 | 9422 | # (eg FreeBSD returns the mod time of the symlink's containing | 9375 | # (eg FreeBSD returns the mod time of the symlink's containing |
1027 | 9423 | # directory). | 9376 | # directory). |
1028 | 9424 | if ( | 9377 | if ( |
1046 | 9425 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | 9378 | am_has_slept=no |
1047 | 9426 | if test "$[*]" = "X"; then | 9379 | for am_try in 1 2; do |
1048 | 9427 | # -L didn't work. | 9380 | echo "timestamp, slept: $am_has_slept" > conftest.file |
1049 | 9428 | set X `ls -t "$srcdir/configure" conftest.file` | 9381 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
1050 | 9429 | fi | 9382 | if test "$[*]" = "X"; then |
1051 | 9430 | rm -f conftest.file | 9383 | # -L didn't work. |
1052 | 9431 | if test "$[*]" != "X $srcdir/configure conftest.file" \ | 9384 | set X `ls -t "$srcdir/configure" conftest.file` |
1053 | 9432 | && test "$[*]" != "X conftest.file $srcdir/configure"; then | 9385 | fi |
1054 | 9433 | 9386 | if test "$[*]" != "X $srcdir/configure conftest.file" \ | |
1055 | 9434 | # If neither matched, then we have a broken ls. This can happen | 9387 | && test "$[*]" != "X conftest.file $srcdir/configure"; then |
1056 | 9435 | # if, for instance, CONFIG_SHELL is bash and it inherits a | 9388 | |
1057 | 9436 | # broken ls alias from the environment. This has actually | 9389 | # If neither matched, then we have a broken ls. This can happen |
1058 | 9437 | # happened. Such a system could not be considered "sane". | 9390 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
1059 | 9438 | AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken | 9391 | # broken ls alias from the environment. This has actually |
1060 | 9439 | alias in your environment]) | 9392 | # happened. Such a system could not be considered "sane". |
1061 | 9440 | fi | 9393 | AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
1062 | 9441 | 9394 | alias in your environment]) | |
1063 | 9395 | fi | ||
1064 | 9396 | if test "$[2]" = conftest.file || test $am_try -eq 2; then | ||
1065 | 9397 | break | ||
1066 | 9398 | fi | ||
1067 | 9399 | # Just in case. | ||
1068 | 9400 | sleep 1 | ||
1069 | 9401 | am_has_slept=yes | ||
1070 | 9402 | done | ||
1071 | 9442 | test "$[2]" = conftest.file | 9403 | test "$[2]" = conftest.file |
1072 | 9443 | ) | 9404 | ) |
1073 | 9444 | then | 9405 | then |
1074 | @@ -9448,46 +9409,58 @@ | |||
1075 | 9448 | AC_MSG_ERROR([newly created file is older than distributed files! | 9409 | AC_MSG_ERROR([newly created file is older than distributed files! |
1076 | 9449 | Check your system clock]) | 9410 | Check your system clock]) |
1077 | 9450 | fi | 9411 | fi |
1079 | 9451 | AC_MSG_RESULT(yes)]) | 9412 | AC_MSG_RESULT([yes]) |
1080 | 9413 | # If we didn't sleep, we still need to ensure time stamps of config.status and | ||
1081 | 9414 | # generated files are strictly newer. | ||
1082 | 9415 | am_sleep_pid= | ||
1083 | 9416 | if grep 'slept: no' conftest.file >/dev/null 2>&1; then | ||
1084 | 9417 | ( sleep 1 ) & | ||
1085 | 9418 | am_sleep_pid=$! | ||
1086 | 9419 | fi | ||
1087 | 9420 | AC_CONFIG_COMMANDS_PRE( | ||
1088 | 9421 | [AC_MSG_CHECKING([that generated files are newer than configure]) | ||
1089 | 9422 | if test -n "$am_sleep_pid"; then | ||
1090 | 9423 | # Hide warnings about reused PIDs. | ||
1091 | 9424 | wait $am_sleep_pid 2>/dev/null | ||
1092 | 9425 | fi | ||
1093 | 9426 | AC_MSG_RESULT([done])]) | ||
1094 | 9427 | rm -f conftest.file | ||
1095 | 9428 | ]) | ||
1096 | 9452 | 9429 | ||
1098 | 9453 | # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. | 9430 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
1099 | 9454 | # | 9431 | # |
1100 | 9455 | # This file is free software; the Free Software Foundation | 9432 | # This file is free software; the Free Software Foundation |
1101 | 9456 | # gives unlimited permission to copy and/or distribute it, | 9433 | # gives unlimited permission to copy and/or distribute it, |
1102 | 9457 | # with or without modifications, as long as this notice is preserved. | 9434 | # with or without modifications, as long as this notice is preserved. |
1103 | 9458 | 9435 | ||
1104 | 9459 | # serial 1 | ||
1105 | 9460 | |||
1106 | 9461 | # AM_PROG_INSTALL_STRIP | 9436 | # AM_PROG_INSTALL_STRIP |
1107 | 9462 | # --------------------- | 9437 | # --------------------- |
1109 | 9463 | # One issue with vendor `install' (even GNU) is that you can't | 9438 | # One issue with vendor 'install' (even GNU) is that you can't |
1110 | 9464 | # specify the program used to strip binaries. This is especially | 9439 | # specify the program used to strip binaries. This is especially |
1111 | 9465 | # annoying in cross-compiling environments, where the build's strip | 9440 | # annoying in cross-compiling environments, where the build's strip |
1112 | 9466 | # is unlikely to handle the host's binaries. | 9441 | # is unlikely to handle the host's binaries. |
1113 | 9467 | # Fortunately install-sh will honor a STRIPPROG variable, so we | 9442 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
1115 | 9468 | # always use install-sh in `make install-strip', and initialize | 9443 | # always use install-sh in "make install-strip", and initialize |
1116 | 9469 | # STRIPPROG with the value of the STRIP variable (set by the user). | 9444 | # STRIPPROG with the value of the STRIP variable (set by the user). |
1117 | 9470 | AC_DEFUN([AM_PROG_INSTALL_STRIP], | 9445 | AC_DEFUN([AM_PROG_INSTALL_STRIP], |
1118 | 9471 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | 9446 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
1121 | 9472 | # Installed binaries are usually stripped using `strip' when the user | 9447 | # Installed binaries are usually stripped using 'strip' when the user |
1122 | 9473 | # run `make install-strip'. However `strip' might not be the right | 9448 | # run "make install-strip". However 'strip' might not be the right |
1123 | 9474 | # tool to use in cross-compilation environments, therefore Automake | 9449 | # tool to use in cross-compilation environments, therefore Automake |
1126 | 9475 | # will honor the `STRIP' environment variable to overrule this program. | 9450 | # will honor the 'STRIP' environment variable to overrule this program. |
1127 | 9476 | dnl Don't test for $cross_compiling = yes, because it might be `maybe'. | 9451 | dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
1128 | 9477 | if test "$cross_compiling" != no; then | 9452 | if test "$cross_compiling" != no; then |
1129 | 9478 | AC_CHECK_TOOL([STRIP], [strip], :) | 9453 | AC_CHECK_TOOL([STRIP], [strip], :) |
1130 | 9479 | fi | 9454 | fi |
1131 | 9480 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | 9455 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1132 | 9481 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | 9456 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1133 | 9482 | 9457 | ||
1135 | 9483 | # Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. | 9458 | # Copyright (C) 2006-2012 Free Software Foundation, Inc. |
1136 | 9484 | # | 9459 | # |
1137 | 9485 | # This file is free software; the Free Software Foundation | 9460 | # This file is free software; the Free Software Foundation |
1138 | 9486 | # gives unlimited permission to copy and/or distribute it, | 9461 | # gives unlimited permission to copy and/or distribute it, |
1139 | 9487 | # with or without modifications, as long as this notice is preserved. | 9462 | # with or without modifications, as long as this notice is preserved. |
1140 | 9488 | 9463 | ||
1141 | 9489 | # serial 3 | ||
1142 | 9490 | |||
1143 | 9491 | # _AM_SUBST_NOTMAKE(VARIABLE) | 9464 | # _AM_SUBST_NOTMAKE(VARIABLE) |
1144 | 9492 | # --------------------------- | 9465 | # --------------------------- |
1145 | 9493 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. | 9466 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
1146 | @@ -9501,18 +9474,16 @@ | |||
1147 | 9501 | 9474 | ||
1148 | 9502 | # Check how to create a tarball. -*- Autoconf -*- | 9475 | # Check how to create a tarball. -*- Autoconf -*- |
1149 | 9503 | 9476 | ||
1151 | 9504 | # Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. | 9477 | # Copyright (C) 2004-2012 Free Software Foundation, Inc. |
1152 | 9505 | # | 9478 | # |
1153 | 9506 | # This file is free software; the Free Software Foundation | 9479 | # This file is free software; the Free Software Foundation |
1154 | 9507 | # gives unlimited permission to copy and/or distribute it, | 9480 | # gives unlimited permission to copy and/or distribute it, |
1155 | 9508 | # with or without modifications, as long as this notice is preserved. | 9481 | # with or without modifications, as long as this notice is preserved. |
1156 | 9509 | 9482 | ||
1157 | 9510 | # serial 2 | ||
1158 | 9511 | |||
1159 | 9512 | # _AM_PROG_TAR(FORMAT) | 9483 | # _AM_PROG_TAR(FORMAT) |
1160 | 9513 | # -------------------- | 9484 | # -------------------- |
1161 | 9514 | # Check how to create a tarball in format FORMAT. | 9485 | # Check how to create a tarball in format FORMAT. |
1163 | 9515 | # FORMAT should be one of `v7', `ustar', or `pax'. | 9486 | # FORMAT should be one of 'v7', 'ustar', or 'pax'. |
1164 | 9516 | # | 9487 | # |
1165 | 9517 | # Substitute a variable $(am__tar) that is a command | 9488 | # Substitute a variable $(am__tar) that is a command |
1166 | 9518 | # writing to stdout a FORMAT-tarball containing the directory | 9489 | # writing to stdout a FORMAT-tarball containing the directory |
1167 | @@ -9535,7 +9506,7 @@ | |||
1168 | 9535 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | 9506 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1169 | 9536 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | 9507 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1170 | 9537 | # Do not fold the above two line into one, because Tru64 sh and | 9508 | # Do not fold the above two line into one, because Tru64 sh and |
1172 | 9538 | # Solaris sh will not grok spaces in the rhs of `-'. | 9509 | # Solaris sh will not grok spaces in the rhs of '-'. |
1173 | 9539 | for _am_tool in $_am_tools | 9510 | for _am_tool in $_am_tools |
1174 | 9540 | do | 9511 | do |
1175 | 9541 | case $_am_tool in | 9512 | case $_am_tool in |
1176 | 9542 | 9513 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1182 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
1189 | 3 | # Generated by GNU Autoconf 2.68 for Multitouch Protocol Translation Library 1.1.2. | 3 | # Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.3. |
1190 | 4 | # | 4 | # |
1191 | 5 | # | 5 | # |
1192 | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 6 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
1187 | 7 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software | ||
1188 | 8 | # Foundation, Inc. | ||
1193 | 9 | # | 7 | # |
1194 | 10 | # | 8 | # |
1195 | 11 | # This configure script is free software; the Free Software Foundation | 9 | # This configure script is free software; the Free Software Foundation |
1196 | @@ -134,6 +132,31 @@ | |||
1197 | 134 | # CDPATH. | 132 | # CDPATH. |
1198 | 135 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | 133 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1199 | 136 | 134 | ||
1200 | 135 | # Use a proper internal environment variable to ensure we don't fall | ||
1201 | 136 | # into an infinite loop, continuously re-executing ourselves. | ||
1202 | 137 | if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then | ||
1203 | 138 | _as_can_reexec=no; export _as_can_reexec; | ||
1204 | 139 | # We cannot yet assume a decent shell, so we have to provide a | ||
1205 | 140 | # neutralization value for shells without unset; and this also | ||
1206 | 141 | # works around shells that cannot unset nonexistent variables. | ||
1207 | 142 | # Preserve -v and -x to the replacement shell. | ||
1208 | 143 | BASH_ENV=/dev/null | ||
1209 | 144 | ENV=/dev/null | ||
1210 | 145 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | ||
1211 | 146 | case $- in # (((( | ||
1212 | 147 | *v*x* | *x*v* ) as_opts=-vx ;; | ||
1213 | 148 | *v* ) as_opts=-v ;; | ||
1214 | 149 | *x* ) as_opts=-x ;; | ||
1215 | 150 | * ) as_opts= ;; | ||
1216 | 151 | esac | ||
1217 | 152 | exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} | ||
1218 | 153 | # Admittedly, this is quite paranoid, since all the known shells bail | ||
1219 | 154 | # out after a failed `exec'. | ||
1220 | 155 | $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 | ||
1221 | 156 | as_fn_exit 255 | ||
1222 | 157 | fi | ||
1223 | 158 | # We don't want this to propagate to other subprocesses. | ||
1224 | 159 | { _as_can_reexec=; unset _as_can_reexec;} | ||
1225 | 137 | if test "x$CONFIG_SHELL" = x; then | 160 | if test "x$CONFIG_SHELL" = x; then |
1226 | 138 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : | 161 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
1227 | 139 | emulate sh | 162 | emulate sh |
1228 | @@ -167,7 +190,8 @@ | |||
1229 | 167 | else | 190 | else |
1230 | 168 | exitcode=1; echo positional parameters were not saved. | 191 | exitcode=1; echo positional parameters were not saved. |
1231 | 169 | fi | 192 | fi |
1233 | 170 | test x\$exitcode = x0 || exit 1" | 193 | test x\$exitcode = x0 || exit 1 |
1234 | 194 | test -x / || exit 1" | ||
1235 | 171 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO | 195 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
1236 | 172 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO | 196 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1237 | 173 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && | 197 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1238 | @@ -220,21 +244,25 @@ | |||
1239 | 220 | 244 | ||
1240 | 221 | 245 | ||
1241 | 222 | if test "x$CONFIG_SHELL" != x; then : | 246 | if test "x$CONFIG_SHELL" != x; then : |
1257 | 223 | # We cannot yet assume a decent shell, so we have to provide a | 247 | export CONFIG_SHELL |
1258 | 224 | # neutralization value for shells without unset; and this also | 248 | # We cannot yet assume a decent shell, so we have to provide a |
1259 | 225 | # works around shells that cannot unset nonexistent variables. | 249 | # neutralization value for shells without unset; and this also |
1260 | 226 | # Preserve -v and -x to the replacement shell. | 250 | # works around shells that cannot unset nonexistent variables. |
1261 | 227 | BASH_ENV=/dev/null | 251 | # Preserve -v and -x to the replacement shell. |
1262 | 228 | ENV=/dev/null | 252 | BASH_ENV=/dev/null |
1263 | 229 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | 253 | ENV=/dev/null |
1264 | 230 | export CONFIG_SHELL | 254 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1265 | 231 | case $- in # (((( | 255 | case $- in # (((( |
1266 | 232 | *v*x* | *x*v* ) as_opts=-vx ;; | 256 | *v*x* | *x*v* ) as_opts=-vx ;; |
1267 | 233 | *v* ) as_opts=-v ;; | 257 | *v* ) as_opts=-v ;; |
1268 | 234 | *x* ) as_opts=-x ;; | 258 | *x* ) as_opts=-x ;; |
1269 | 235 | * ) as_opts= ;; | 259 | * ) as_opts= ;; |
1270 | 236 | esac | 260 | esac |
1271 | 237 | exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} | 261 | exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
1272 | 262 | # Admittedly, this is quite paranoid, since all the known shells bail | ||
1273 | 263 | # out after a failed `exec'. | ||
1274 | 264 | $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 | ||
1275 | 265 | exit 255 | ||
1276 | 238 | fi | 266 | fi |
1277 | 239 | 267 | ||
1278 | 240 | if test x$as_have_required = xno; then : | 268 | if test x$as_have_required = xno; then : |
1279 | @@ -336,6 +364,14 @@ | |||
1280 | 336 | 364 | ||
1281 | 337 | 365 | ||
1282 | 338 | } # as_fn_mkdir_p | 366 | } # as_fn_mkdir_p |
1283 | 367 | |||
1284 | 368 | # as_fn_executable_p FILE | ||
1285 | 369 | # ----------------------- | ||
1286 | 370 | # Test if FILE is an executable regular file. | ||
1287 | 371 | as_fn_executable_p () | ||
1288 | 372 | { | ||
1289 | 373 | test -f "$1" && test -x "$1" | ||
1290 | 374 | } # as_fn_executable_p | ||
1291 | 339 | # as_fn_append VAR VALUE | 375 | # as_fn_append VAR VALUE |
1292 | 340 | # ---------------------- | 376 | # ---------------------- |
1293 | 341 | # Append the text in VALUE to the end of the definition contained in VAR. Take | 377 | # Append the text in VALUE to the end of the definition contained in VAR. Take |
1294 | @@ -457,6 +493,10 @@ | |||
1295 | 457 | chmod +x "$as_me.lineno" || | 493 | chmod +x "$as_me.lineno" || |
1296 | 458 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } | 494 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
1297 | 459 | 495 | ||
1298 | 496 | # If we had to re-execute with $CONFIG_SHELL, we're ensured to have | ||
1299 | 497 | # already done that, so ensure we don't try to do so again and fall | ||
1300 | 498 | # in an infinite loop. This has already happened in practice. | ||
1301 | 499 | _as_can_reexec=no; export _as_can_reexec | ||
1302 | 460 | # Don't try to exec as it changes $[0], causing all sort of problems | 500 | # Don't try to exec as it changes $[0], causing all sort of problems |
1303 | 461 | # (the dirname of $[0] is not the place where we might find the | 501 | # (the dirname of $[0] is not the place where we might find the |
1304 | 462 | # original and so on. Autoconf is especially sensitive to this). | 502 | # original and so on. Autoconf is especially sensitive to this). |
1305 | @@ -491,16 +531,16 @@ | |||
1306 | 491 | # ... but there are two gotchas: | 531 | # ... but there are two gotchas: |
1307 | 492 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | 532 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
1308 | 493 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | 533 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
1310 | 494 | # In both cases, we have to default to `cp -p'. | 534 | # In both cases, we have to default to `cp -pR'. |
1311 | 495 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | 535 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
1313 | 496 | as_ln_s='cp -p' | 536 | as_ln_s='cp -pR' |
1314 | 497 | elif ln conf$$.file conf$$ 2>/dev/null; then | 537 | elif ln conf$$.file conf$$ 2>/dev/null; then |
1315 | 498 | as_ln_s=ln | 538 | as_ln_s=ln |
1316 | 499 | else | 539 | else |
1318 | 500 | as_ln_s='cp -p' | 540 | as_ln_s='cp -pR' |
1319 | 501 | fi | 541 | fi |
1320 | 502 | else | 542 | else |
1322 | 503 | as_ln_s='cp -p' | 543 | as_ln_s='cp -pR' |
1323 | 504 | fi | 544 | fi |
1324 | 505 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | 545 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
1325 | 506 | rmdir conf$$.dir 2>/dev/null | 546 | rmdir conf$$.dir 2>/dev/null |
1326 | @@ -512,28 +552,8 @@ | |||
1327 | 512 | as_mkdir_p=false | 552 | as_mkdir_p=false |
1328 | 513 | fi | 553 | fi |
1329 | 514 | 554 | ||
1352 | 515 | if test -x / >/dev/null 2>&1; then | 555 | as_test_x='test -x' |
1353 | 516 | as_test_x='test -x' | 556 | as_executable_p=as_fn_executable_p |
1332 | 517 | else | ||
1333 | 518 | if ls -dL / >/dev/null 2>&1; then | ||
1334 | 519 | as_ls_L_option=L | ||
1335 | 520 | else | ||
1336 | 521 | as_ls_L_option= | ||
1337 | 522 | fi | ||
1338 | 523 | as_test_x=' | ||
1339 | 524 | eval sh -c '\'' | ||
1340 | 525 | if test -d "$1"; then | ||
1341 | 526 | test -d "$1/."; | ||
1342 | 527 | else | ||
1343 | 528 | case $1 in #( | ||
1344 | 529 | -*)set "./$1";; | ||
1345 | 530 | esac; | ||
1346 | 531 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | ||
1347 | 532 | ???[sx]*):;;*)false;;esac;fi | ||
1348 | 533 | '\'' sh | ||
1349 | 534 | ' | ||
1350 | 535 | fi | ||
1351 | 536 | as_executable_p=$as_test_x | ||
1354 | 537 | 557 | ||
1355 | 538 | # Sed expression to map a string onto a valid CPP name. | 558 | # Sed expression to map a string onto a valid CPP name. |
1356 | 539 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | 559 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
1357 | @@ -567,8 +587,8 @@ | |||
1358 | 567 | # Identity of this package. | 587 | # Identity of this package. |
1359 | 568 | PACKAGE_NAME='Multitouch Protocol Translation Library' | 588 | PACKAGE_NAME='Multitouch Protocol Translation Library' |
1360 | 569 | PACKAGE_TARNAME='mtdev' | 589 | PACKAGE_TARNAME='mtdev' |
1363 | 570 | PACKAGE_VERSION='1.1.2' | 590 | PACKAGE_VERSION='1.1.3' |
1364 | 571 | PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.2' | 591 | PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.3' |
1365 | 572 | PACKAGE_BUGREPORT='' | 592 | PACKAGE_BUGREPORT='' |
1366 | 573 | PACKAGE_URL='' | 593 | PACKAGE_URL='' |
1367 | 574 | 594 | ||
1368 | @@ -1202,8 +1222,6 @@ | |||
1369 | 1202 | if test "x$host_alias" != x; then | 1222 | if test "x$host_alias" != x; then |
1370 | 1203 | if test "x$build_alias" = x; then | 1223 | if test "x$build_alias" = x; then |
1371 | 1204 | cross_compiling=maybe | 1224 | cross_compiling=maybe |
1372 | 1205 | $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. | ||
1373 | 1206 | If a cross compiler is detected then cross compile mode will be used" >&2 | ||
1374 | 1207 | elif test "x$build_alias" != "x$host_alias"; then | 1225 | elif test "x$build_alias" != "x$host_alias"; then |
1375 | 1208 | cross_compiling=yes | 1226 | cross_compiling=yes |
1376 | 1209 | fi | 1227 | fi |
1377 | @@ -1289,7 +1307,7 @@ | |||
1378 | 1289 | # Omit some internal or obsolete options to make the list less imposing. | 1307 | # Omit some internal or obsolete options to make the list less imposing. |
1379 | 1290 | # This message is too long to be a string in the A/UX 3.1 sh. | 1308 | # This message is too long to be a string in the A/UX 3.1 sh. |
1380 | 1291 | cat <<_ACEOF | 1309 | cat <<_ACEOF |
1382 | 1292 | \`configure' configures Multitouch Protocol Translation Library 1.1.2 to adapt to many kinds of systems. | 1310 | \`configure' configures Multitouch Protocol Translation Library 1.1.3 to adapt to many kinds of systems. |
1383 | 1293 | 1311 | ||
1384 | 1294 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1312 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1385 | 1295 | 1313 | ||
1386 | @@ -1359,7 +1377,7 @@ | |||
1387 | 1359 | 1377 | ||
1388 | 1360 | if test -n "$ac_init_help"; then | 1378 | if test -n "$ac_init_help"; then |
1389 | 1361 | case $ac_init_help in | 1379 | case $ac_init_help in |
1391 | 1362 | short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.2:";; | 1380 | short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.3:";; |
1392 | 1363 | esac | 1381 | esac |
1393 | 1364 | cat <<\_ACEOF | 1382 | cat <<\_ACEOF |
1394 | 1365 | 1383 | ||
1395 | @@ -1367,14 +1385,17 @@ | |||
1396 | 1367 | --disable-option-checking ignore unrecognized --enable/--with options | 1385 | --disable-option-checking ignore unrecognized --enable/--with options |
1397 | 1368 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | 1386 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
1398 | 1369 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | 1387 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1401 | 1370 | --enable-maintainer-mode enable make rules and dependencies not useful | 1388 | --enable-maintainer-mode |
1402 | 1371 | (and sometimes confusing) to the casual installer | 1389 | enable make rules and dependencies not useful (and |
1403 | 1390 | sometimes confusing) to the casual installer | ||
1404 | 1372 | --enable-shared[=PKGS] build shared libraries [default=yes] | 1391 | --enable-shared[=PKGS] build shared libraries [default=yes] |
1405 | 1373 | --enable-static[=PKGS] build static libraries [default=yes] | 1392 | --enable-static[=PKGS] build static libraries [default=yes] |
1406 | 1374 | --enable-fast-install[=PKGS] | 1393 | --enable-fast-install[=PKGS] |
1407 | 1375 | optimize for fast installation [default=yes] | 1394 | optimize for fast installation [default=yes] |
1410 | 1376 | --disable-dependency-tracking speeds up one-time build | 1395 | --enable-dependency-tracking |
1411 | 1377 | --enable-dependency-tracking do not reject slow dependency extractors | 1396 | do not reject slow dependency extractors |
1412 | 1397 | --disable-dependency-tracking | ||
1413 | 1398 | speeds up one-time build | ||
1414 | 1378 | --disable-libtool-lock avoid locking (might break parallel builds) | 1399 | --disable-libtool-lock avoid locking (might break parallel builds) |
1415 | 1379 | 1400 | ||
1416 | 1380 | Optional Packages: | 1401 | Optional Packages: |
1417 | @@ -1462,10 +1483,10 @@ | |||
1418 | 1462 | test -n "$ac_init_help" && exit $ac_status | 1483 | test -n "$ac_init_help" && exit $ac_status |
1419 | 1463 | if $ac_init_version; then | 1484 | if $ac_init_version; then |
1420 | 1464 | cat <<\_ACEOF | 1485 | cat <<\_ACEOF |
1423 | 1465 | Multitouch Protocol Translation Library configure 1.1.2 | 1486 | Multitouch Protocol Translation Library configure 1.1.3 |
1424 | 1466 | generated by GNU Autoconf 2.68 | 1487 | generated by GNU Autoconf 2.69 |
1425 | 1467 | 1488 | ||
1427 | 1468 | Copyright (C) 2010 Free Software Foundation, Inc. | 1489 | Copyright (C) 2012 Free Software Foundation, Inc. |
1428 | 1469 | This configure script is free software; the Free Software Foundation | 1490 | This configure script is free software; the Free Software Foundation |
1429 | 1470 | gives unlimited permission to copy, distribute and modify it. | 1491 | gives unlimited permission to copy, distribute and modify it. |
1430 | 1471 | _ACEOF | 1492 | _ACEOF |
1431 | @@ -1541,7 +1562,7 @@ | |||
1432 | 1541 | test ! -s conftest.err | 1562 | test ! -s conftest.err |
1433 | 1542 | } && test -s conftest$ac_exeext && { | 1563 | } && test -s conftest$ac_exeext && { |
1434 | 1543 | test "$cross_compiling" = yes || | 1564 | test "$cross_compiling" = yes || |
1436 | 1544 | $as_test_x conftest$ac_exeext | 1565 | test -x conftest$ac_exeext |
1437 | 1545 | }; then : | 1566 | }; then : |
1438 | 1546 | ac_retval=0 | 1567 | ac_retval=0 |
1439 | 1547 | else | 1568 | else |
1440 | @@ -1740,8 +1761,8 @@ | |||
1441 | 1740 | This file contains any messages produced by compilers while | 1761 | This file contains any messages produced by compilers while |
1442 | 1741 | running configure, to aid debugging if configure makes a mistake. | 1762 | running configure, to aid debugging if configure makes a mistake. |
1443 | 1742 | 1763 | ||
1446 | 1743 | It was created by Multitouch Protocol Translation Library $as_me 1.1.2, which was | 1764 | It was created by Multitouch Protocol Translation Library $as_me 1.1.3, which was |
1447 | 1744 | generated by GNU Autoconf 2.68. Invocation command line was | 1765 | generated by GNU Autoconf 2.69. Invocation command line was |
1448 | 1745 | 1766 | ||
1449 | 1746 | $ $0 $@ | 1767 | $ $0 $@ |
1450 | 1747 | 1768 | ||
1451 | @@ -2122,7 +2143,7 @@ | |||
1452 | 2122 | 2143 | ||
1453 | 2123 | 2144 | ||
1454 | 2124 | # Initialize Automake | 2145 | # Initialize Automake |
1456 | 2125 | am__api_version='1.11' | 2146 | am__api_version='1.12' |
1457 | 2126 | 2147 | ||
1458 | 2127 | # Find a good install program. We prefer a C program (faster), | 2148 | # Find a good install program. We prefer a C program (faster), |
1459 | 2128 | # so one script is as good as another. But avoid the broken or | 2149 | # so one script is as good as another. But avoid the broken or |
1460 | @@ -2161,7 +2182,7 @@ | |||
1461 | 2161 | # by default. | 2182 | # by default. |
1462 | 2162 | for ac_prog in ginstall scoinst install; do | 2183 | for ac_prog in ginstall scoinst install; do |
1463 | 2163 | for ac_exec_ext in '' $ac_executable_extensions; do | 2184 | for ac_exec_ext in '' $ac_executable_extensions; do |
1465 | 2164 | if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | 2185 | if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
1466 | 2165 | if test $ac_prog = install && | 2186 | if test $ac_prog = install && |
1467 | 2166 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | 2187 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
1468 | 2167 | # AIX install. It has an incompatible calling convention. | 2188 | # AIX install. It has an incompatible calling convention. |
1469 | @@ -2219,9 +2240,6 @@ | |||
1470 | 2219 | 2240 | ||
1471 | 2220 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 | 2241 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
1472 | 2221 | $as_echo_n "checking whether build environment is sane... " >&6; } | 2242 | $as_echo_n "checking whether build environment is sane... " >&6; } |
1473 | 2222 | # Just in case | ||
1474 | 2223 | sleep 1 | ||
1475 | 2224 | echo timestamp > conftest.file | ||
1476 | 2225 | # Reject unsafe characters in $srcdir or the absolute working directory | 2243 | # Reject unsafe characters in $srcdir or the absolute working directory |
1477 | 2226 | # name. Accept space and tab only in the latter. | 2244 | # name. Accept space and tab only in the latter. |
1478 | 2227 | am_lf=' | 2245 | am_lf=' |
1479 | @@ -2232,32 +2250,40 @@ | |||
1480 | 2232 | esac | 2250 | esac |
1481 | 2233 | case $srcdir in | 2251 | case $srcdir in |
1482 | 2234 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) | 2252 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
1484 | 2235 | as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; | 2253 | as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; |
1485 | 2236 | esac | 2254 | esac |
1486 | 2237 | 2255 | ||
1488 | 2238 | # Do `set' in a subshell so we don't clobber the current shell's | 2256 | # Do 'set' in a subshell so we don't clobber the current shell's |
1489 | 2239 | # arguments. Must try -L first in case configure is actually a | 2257 | # arguments. Must try -L first in case configure is actually a |
1490 | 2240 | # symlink; some systems play weird games with the mod time of symlinks | 2258 | # symlink; some systems play weird games with the mod time of symlinks |
1491 | 2241 | # (eg FreeBSD returns the mod time of the symlink's containing | 2259 | # (eg FreeBSD returns the mod time of the symlink's containing |
1492 | 2242 | # directory). | 2260 | # directory). |
1493 | 2243 | if ( | 2261 | if ( |
1511 | 2244 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | 2262 | am_has_slept=no |
1512 | 2245 | if test "$*" = "X"; then | 2263 | for am_try in 1 2; do |
1513 | 2246 | # -L didn't work. | 2264 | echo "timestamp, slept: $am_has_slept" > conftest.file |
1514 | 2247 | set X `ls -t "$srcdir/configure" conftest.file` | 2265 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
1515 | 2248 | fi | 2266 | if test "$*" = "X"; then |
1516 | 2249 | rm -f conftest.file | 2267 | # -L didn't work. |
1517 | 2250 | if test "$*" != "X $srcdir/configure conftest.file" \ | 2268 | set X `ls -t "$srcdir/configure" conftest.file` |
1518 | 2251 | && test "$*" != "X conftest.file $srcdir/configure"; then | 2269 | fi |
1519 | 2252 | 2270 | if test "$*" != "X $srcdir/configure conftest.file" \ | |
1520 | 2253 | # If neither matched, then we have a broken ls. This can happen | 2271 | && test "$*" != "X conftest.file $srcdir/configure"; then |
1521 | 2254 | # if, for instance, CONFIG_SHELL is bash and it inherits a | 2272 | |
1522 | 2255 | # broken ls alias from the environment. This has actually | 2273 | # If neither matched, then we have a broken ls. This can happen |
1523 | 2256 | # happened. Such a system could not be considered "sane". | 2274 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
1524 | 2257 | as_fn_error $? "ls -t appears to fail. Make sure there is not a broken | 2275 | # broken ls alias from the environment. This has actually |
1525 | 2258 | alias in your environment" "$LINENO" 5 | 2276 | # happened. Such a system could not be considered "sane". |
1526 | 2259 | fi | 2277 | as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
1527 | 2260 | 2278 | alias in your environment" "$LINENO" 5 | |
1528 | 2279 | fi | ||
1529 | 2280 | if test "$2" = conftest.file || test $am_try -eq 2; then | ||
1530 | 2281 | break | ||
1531 | 2282 | fi | ||
1532 | 2283 | # Just in case. | ||
1533 | 2284 | sleep 1 | ||
1534 | 2285 | am_has_slept=yes | ||
1535 | 2286 | done | ||
1536 | 2261 | test "$2" = conftest.file | 2287 | test "$2" = conftest.file |
1537 | 2262 | ) | 2288 | ) |
1538 | 2263 | then | 2289 | then |
1539 | @@ -2269,6 +2295,16 @@ | |||
1540 | 2269 | fi | 2295 | fi |
1541 | 2270 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 2296 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1542 | 2271 | $as_echo "yes" >&6; } | 2297 | $as_echo "yes" >&6; } |
1543 | 2298 | # If we didn't sleep, we still need to ensure time stamps of config.status and | ||
1544 | 2299 | # generated files are strictly newer. | ||
1545 | 2300 | am_sleep_pid= | ||
1546 | 2301 | if grep 'slept: no' conftest.file >/dev/null 2>&1; then | ||
1547 | 2302 | ( sleep 1 ) & | ||
1548 | 2303 | am_sleep_pid=$! | ||
1549 | 2304 | fi | ||
1550 | 2305 | |||
1551 | 2306 | rm -f conftest.file | ||
1552 | 2307 | |||
1553 | 2272 | test "$program_prefix" != NONE && | 2308 | test "$program_prefix" != NONE && |
1554 | 2273 | program_transform_name="s&^&$program_prefix&;$program_transform_name" | 2309 | program_transform_name="s&^&$program_prefix&;$program_transform_name" |
1555 | 2274 | # Use a double $ so make ignores it. | 2310 | # Use a double $ so make ignores it. |
1556 | @@ -2295,8 +2331,8 @@ | |||
1557 | 2295 | am_missing_run="$MISSING --run " | 2331 | am_missing_run="$MISSING --run " |
1558 | 2296 | else | 2332 | else |
1559 | 2297 | am_missing_run= | 2333 | am_missing_run= |
1562 | 2298 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 | 2334 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 |
1563 | 2299 | $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} | 2335 | $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} |
1564 | 2300 | fi | 2336 | fi |
1565 | 2301 | 2337 | ||
1566 | 2302 | if test x"${install_sh}" != xset; then | 2338 | if test x"${install_sh}" != xset; then |
1567 | @@ -2308,10 +2344,10 @@ | |||
1568 | 2308 | esac | 2344 | esac |
1569 | 2309 | fi | 2345 | fi |
1570 | 2310 | 2346 | ||
1573 | 2311 | # Installed binaries are usually stripped using `strip' when the user | 2347 | # Installed binaries are usually stripped using 'strip' when the user |
1574 | 2312 | # run `make install-strip'. However `strip' might not be the right | 2348 | # run "make install-strip". However 'strip' might not be the right |
1575 | 2313 | # tool to use in cross-compilation environments, therefore Automake | 2349 | # tool to use in cross-compilation environments, therefore Automake |
1577 | 2314 | # will honor the `STRIP' environment variable to overrule this program. | 2350 | # will honor the 'STRIP' environment variable to overrule this program. |
1578 | 2315 | if test "$cross_compiling" != no; then | 2351 | if test "$cross_compiling" != no; then |
1579 | 2316 | if test -n "$ac_tool_prefix"; then | 2352 | if test -n "$ac_tool_prefix"; then |
1580 | 2317 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 2353 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
1581 | @@ -2330,7 +2366,7 @@ | |||
1582 | 2330 | IFS=$as_save_IFS | 2366 | IFS=$as_save_IFS |
1583 | 2331 | test -z "$as_dir" && as_dir=. | 2367 | test -z "$as_dir" && as_dir=. |
1584 | 2332 | for ac_exec_ext in '' $ac_executable_extensions; do | 2368 | for ac_exec_ext in '' $ac_executable_extensions; do |
1586 | 2333 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2369 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1587 | 2334 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | 2370 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
1588 | 2335 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2371 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1589 | 2336 | break 2 | 2372 | break 2 |
1590 | @@ -2370,7 +2406,7 @@ | |||
1591 | 2370 | IFS=$as_save_IFS | 2406 | IFS=$as_save_IFS |
1592 | 2371 | test -z "$as_dir" && as_dir=. | 2407 | test -z "$as_dir" && as_dir=. |
1593 | 2372 | for ac_exec_ext in '' $ac_executable_extensions; do | 2408 | for ac_exec_ext in '' $ac_executable_extensions; do |
1595 | 2373 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2409 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1596 | 2374 | ac_cv_prog_ac_ct_STRIP="strip" | 2410 | ac_cv_prog_ac_ct_STRIP="strip" |
1597 | 2375 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2411 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1598 | 2376 | break 2 | 2412 | break 2 |
1599 | @@ -2421,7 +2457,7 @@ | |||
1600 | 2421 | test -z "$as_dir" && as_dir=. | 2457 | test -z "$as_dir" && as_dir=. |
1601 | 2422 | for ac_prog in mkdir gmkdir; do | 2458 | for ac_prog in mkdir gmkdir; do |
1602 | 2423 | for ac_exec_ext in '' $ac_executable_extensions; do | 2459 | for ac_exec_ext in '' $ac_executable_extensions; do |
1604 | 2424 | { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue | 2460 | as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue |
1605 | 2425 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( | 2461 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
1606 | 2426 | 'mkdir (GNU coreutils) '* | \ | 2462 | 'mkdir (GNU coreutils) '* | \ |
1607 | 2427 | 'mkdir (coreutils) '* | \ | 2463 | 'mkdir (coreutils) '* | \ |
1608 | @@ -2450,12 +2486,6 @@ | |||
1609 | 2450 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 | 2486 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 |
1610 | 2451 | $as_echo "$MKDIR_P" >&6; } | 2487 | $as_echo "$MKDIR_P" >&6; } |
1611 | 2452 | 2488 | ||
1612 | 2453 | mkdir_p="$MKDIR_P" | ||
1613 | 2454 | case $mkdir_p in | ||
1614 | 2455 | [\\/$]* | ?:[\\/]*) ;; | ||
1615 | 2456 | */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; | ||
1616 | 2457 | esac | ||
1617 | 2458 | |||
1618 | 2459 | for ac_prog in gawk mawk nawk awk | 2489 | for ac_prog in gawk mawk nawk awk |
1619 | 2460 | do | 2490 | do |
1620 | 2461 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 2491 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
1621 | @@ -2474,7 +2504,7 @@ | |||
1622 | 2474 | IFS=$as_save_IFS | 2504 | IFS=$as_save_IFS |
1623 | 2475 | test -z "$as_dir" && as_dir=. | 2505 | test -z "$as_dir" && as_dir=. |
1624 | 2476 | for ac_exec_ext in '' $ac_executable_extensions; do | 2506 | for ac_exec_ext in '' $ac_executable_extensions; do |
1626 | 2477 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2507 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1627 | 2478 | ac_cv_prog_AWK="$ac_prog" | 2508 | ac_cv_prog_AWK="$ac_prog" |
1628 | 2479 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2509 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1629 | 2480 | break 2 | 2510 | break 2 |
1630 | @@ -2560,7 +2590,7 @@ | |||
1631 | 2560 | 2590 | ||
1632 | 2561 | # Define the identity of the package. | 2591 | # Define the identity of the package. |
1633 | 2562 | PACKAGE='mtdev' | 2592 | PACKAGE='mtdev' |
1635 | 2563 | VERSION='1.1.2' | 2593 | VERSION='1.1.3' |
1636 | 2564 | 2594 | ||
1637 | 2565 | 2595 | ||
1638 | 2566 | cat >>confdefs.h <<_ACEOF | 2596 | cat >>confdefs.h <<_ACEOF |
1639 | @@ -2588,6 +2618,12 @@ | |||
1640 | 2588 | 2618 | ||
1641 | 2589 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | 2619 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
1642 | 2590 | 2620 | ||
1643 | 2621 | # For better backward compatibility. To be removed once Automake 1.9.x | ||
1644 | 2622 | # dies out for good. For more background, see: | ||
1645 | 2623 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | ||
1646 | 2624 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | ||
1647 | 2625 | mkdir_p='$(MKDIR_P)' | ||
1648 | 2626 | |||
1649 | 2591 | # We need awk for the "check" target. The system "awk" is bad on | 2627 | # We need awk for the "check" target. The system "awk" is bad on |
1650 | 2592 | # some platforms. | 2628 | # some platforms. |
1651 | 2593 | # Always define AMTAR for backward compatibility. Yes, it's still used | 2629 | # Always define AMTAR for backward compatibility. Yes, it's still used |
1652 | @@ -2812,7 +2848,7 @@ | |||
1653 | 2812 | _am_result=none | 2848 | _am_result=none |
1654 | 2813 | # First try GNU make style include. | 2849 | # First try GNU make style include. |
1655 | 2814 | echo "include confinc" > confmf | 2850 | echo "include confinc" > confmf |
1657 | 2815 | # Ignore all kinds of additional output from `make'. | 2851 | # Ignore all kinds of additional output from 'make'. |
1658 | 2816 | case `$am_make -s -f confmf 2> /dev/null` in #( | 2852 | case `$am_make -s -f confmf 2> /dev/null` in #( |
1659 | 2817 | *the\ am__doit\ target*) | 2853 | *the\ am__doit\ target*) |
1660 | 2818 | am__include=include | 2854 | am__include=include |
1661 | @@ -2878,7 +2914,7 @@ | |||
1662 | 2878 | IFS=$as_save_IFS | 2914 | IFS=$as_save_IFS |
1663 | 2879 | test -z "$as_dir" && as_dir=. | 2915 | test -z "$as_dir" && as_dir=. |
1664 | 2880 | for ac_exec_ext in '' $ac_executable_extensions; do | 2916 | for ac_exec_ext in '' $ac_executable_extensions; do |
1666 | 2881 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2917 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1667 | 2882 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | 2918 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
1668 | 2883 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2919 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1669 | 2884 | break 2 | 2920 | break 2 |
1670 | @@ -2918,7 +2954,7 @@ | |||
1671 | 2918 | IFS=$as_save_IFS | 2954 | IFS=$as_save_IFS |
1672 | 2919 | test -z "$as_dir" && as_dir=. | 2955 | test -z "$as_dir" && as_dir=. |
1673 | 2920 | for ac_exec_ext in '' $ac_executable_extensions; do | 2956 | for ac_exec_ext in '' $ac_executable_extensions; do |
1675 | 2921 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2957 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1676 | 2922 | ac_cv_prog_ac_ct_CC="gcc" | 2958 | ac_cv_prog_ac_ct_CC="gcc" |
1677 | 2923 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2959 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1678 | 2924 | break 2 | 2960 | break 2 |
1679 | @@ -2971,7 +3007,7 @@ | |||
1680 | 2971 | IFS=$as_save_IFS | 3007 | IFS=$as_save_IFS |
1681 | 2972 | test -z "$as_dir" && as_dir=. | 3008 | test -z "$as_dir" && as_dir=. |
1682 | 2973 | for ac_exec_ext in '' $ac_executable_extensions; do | 3009 | for ac_exec_ext in '' $ac_executable_extensions; do |
1684 | 2974 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3010 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1685 | 2975 | ac_cv_prog_CC="${ac_tool_prefix}cc" | 3011 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
1686 | 2976 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3012 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1687 | 2977 | break 2 | 3013 | break 2 |
1688 | @@ -3012,7 +3048,7 @@ | |||
1689 | 3012 | IFS=$as_save_IFS | 3048 | IFS=$as_save_IFS |
1690 | 3013 | test -z "$as_dir" && as_dir=. | 3049 | test -z "$as_dir" && as_dir=. |
1691 | 3014 | for ac_exec_ext in '' $ac_executable_extensions; do | 3050 | for ac_exec_ext in '' $ac_executable_extensions; do |
1693 | 3015 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3051 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1694 | 3016 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | 3052 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
1695 | 3017 | ac_prog_rejected=yes | 3053 | ac_prog_rejected=yes |
1696 | 3018 | continue | 3054 | continue |
1697 | @@ -3070,7 +3106,7 @@ | |||
1698 | 3070 | IFS=$as_save_IFS | 3106 | IFS=$as_save_IFS |
1699 | 3071 | test -z "$as_dir" && as_dir=. | 3107 | test -z "$as_dir" && as_dir=. |
1700 | 3072 | for ac_exec_ext in '' $ac_executable_extensions; do | 3108 | for ac_exec_ext in '' $ac_executable_extensions; do |
1702 | 3073 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3109 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1703 | 3074 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | 3110 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
1704 | 3075 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3111 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1705 | 3076 | break 2 | 3112 | break 2 |
1706 | @@ -3114,7 +3150,7 @@ | |||
1707 | 3114 | IFS=$as_save_IFS | 3150 | IFS=$as_save_IFS |
1708 | 3115 | test -z "$as_dir" && as_dir=. | 3151 | test -z "$as_dir" && as_dir=. |
1709 | 3116 | for ac_exec_ext in '' $ac_executable_extensions; do | 3152 | for ac_exec_ext in '' $ac_executable_extensions; do |
1711 | 3117 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3153 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1712 | 3118 | ac_cv_prog_ac_ct_CC="$ac_prog" | 3154 | ac_cv_prog_ac_ct_CC="$ac_prog" |
1713 | 3119 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3155 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1714 | 3120 | break 2 | 3156 | break 2 |
1715 | @@ -3560,8 +3596,7 @@ | |||
1716 | 3560 | /* end confdefs.h. */ | 3596 | /* end confdefs.h. */ |
1717 | 3561 | #include <stdarg.h> | 3597 | #include <stdarg.h> |
1718 | 3562 | #include <stdio.h> | 3598 | #include <stdio.h> |
1721 | 3563 | #include <sys/types.h> | 3599 | struct stat; |
1720 | 3564 | #include <sys/stat.h> | ||
1722 | 3565 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ | 3600 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
1723 | 3566 | struct buf { int x; }; | 3601 | struct buf { int x; }; |
1724 | 3567 | FILE * (*rcsopen) (struct buf *, struct stat *, int); | 3602 | FILE * (*rcsopen) (struct buf *, struct stat *, int); |
1725 | @@ -3657,8 +3692,8 @@ | |||
1726 | 3657 | # We make a subdir and do the tests there. Otherwise we can end up | 3692 | # We make a subdir and do the tests there. Otherwise we can end up |
1727 | 3658 | # making bogus files that we don't know about and never remove. For | 3693 | # making bogus files that we don't know about and never remove. For |
1728 | 3659 | # instance it was reported that on HP-UX the gcc test will end up | 3694 | # instance it was reported that on HP-UX the gcc test will end up |
1731 | 3660 | # making a dummy file named `D' -- because `-MD' means `put the output | 3695 | # making a dummy file named 'D' -- because '-MD' means "put the output |
1732 | 3661 | # in D'. | 3696 | # in D". |
1733 | 3662 | rm -rf conftest.dir | 3697 | rm -rf conftest.dir |
1734 | 3663 | mkdir conftest.dir | 3698 | mkdir conftest.dir |
1735 | 3664 | # Copy depcomp to subdir because otherwise we won't find it if we're | 3699 | # Copy depcomp to subdir because otherwise we won't find it if we're |
1736 | @@ -3693,16 +3728,16 @@ | |||
1737 | 3693 | : > sub/conftest.c | 3728 | : > sub/conftest.c |
1738 | 3694 | for i in 1 2 3 4 5 6; do | 3729 | for i in 1 2 3 4 5 6; do |
1739 | 3695 | echo '#include "conftst'$i'.h"' >> sub/conftest.c | 3730 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
1743 | 3696 | # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | 3731 | # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
1744 | 3697 | # Solaris 8's {/usr,}/bin/sh. | 3732 | # Solaris 10 /bin/sh. |
1745 | 3698 | touch sub/conftst$i.h | 3733 | echo '/* dummy */' > sub/conftst$i.h |
1746 | 3699 | done | 3734 | done |
1747 | 3700 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | 3735 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
1748 | 3701 | 3736 | ||
1750 | 3702 | # We check with `-c' and `-o' for the sake of the "dashmstdout" | 3737 | # We check with '-c' and '-o' for the sake of the "dashmstdout" |
1751 | 3703 | # mode. It turns out that the SunPro C++ compiler does not properly | 3738 | # mode. It turns out that the SunPro C++ compiler does not properly |
1754 | 3704 | # handle `-M -o', and we need to detect this. Also, some Intel | 3739 | # handle '-M -o', and we need to detect this. Also, some Intel |
1755 | 3705 | # versions had trouble with output in subdirs | 3740 | # versions had trouble with output in subdirs. |
1756 | 3706 | am__obj=sub/conftest.${OBJEXT-o} | 3741 | am__obj=sub/conftest.${OBJEXT-o} |
1757 | 3707 | am__minus_obj="-o $am__obj" | 3742 | am__minus_obj="-o $am__obj" |
1758 | 3708 | case $depmode in | 3743 | case $depmode in |
1759 | @@ -3711,8 +3746,8 @@ | |||
1760 | 3711 | test "$am__universal" = false || continue | 3746 | test "$am__universal" = false || continue |
1761 | 3712 | ;; | 3747 | ;; |
1762 | 3713 | nosideeffect) | 3748 | nosideeffect) |
1765 | 3714 | # after this tag, mechanisms are not by side-effect, so they'll | 3749 | # After this tag, mechanisms are not by side-effect, so they'll |
1766 | 3715 | # only be used when explicitly requested | 3750 | # only be used when explicitly requested. |
1767 | 3716 | if test "x$enable_dependency_tracking" = xyes; then | 3751 | if test "x$enable_dependency_tracking" = xyes; then |
1768 | 3717 | continue | 3752 | continue |
1769 | 3718 | else | 3753 | else |
1770 | @@ -3720,7 +3755,7 @@ | |||
1771 | 3720 | fi | 3755 | fi |
1772 | 3721 | ;; | 3756 | ;; |
1773 | 3722 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) | 3757 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
1775 | 3723 | # This compiler won't grok `-c -o', but also, the minuso test has | 3758 | # This compiler won't grok '-c -o', but also, the minuso test has |
1776 | 3724 | # not run yet. These depmodes are late enough in the game, and | 3759 | # not run yet. These depmodes are late enough in the game, and |
1777 | 3725 | # so weak that their functioning should not be impacted. | 3760 | # so weak that their functioning should not be impacted. |
1778 | 3726 | am__obj=conftest.${OBJEXT-o} | 3761 | am__obj=conftest.${OBJEXT-o} |
1779 | @@ -3796,7 +3831,7 @@ | |||
1780 | 3796 | for ac_prog in sed gsed; do | 3831 | for ac_prog in sed gsed; do |
1781 | 3797 | for ac_exec_ext in '' $ac_executable_extensions; do | 3832 | for ac_exec_ext in '' $ac_executable_extensions; do |
1782 | 3798 | ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" | 3833 | ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" |
1784 | 3799 | { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue | 3834 | as_fn_executable_p "$ac_path_SED" || continue |
1785 | 3800 | # Check for GNU ac_path_SED and select it if it is found. | 3835 | # Check for GNU ac_path_SED and select it if it is found. |
1786 | 3801 | # Check for GNU $ac_path_SED | 3836 | # Check for GNU $ac_path_SED |
1787 | 3802 | case `"$ac_path_SED" --version 2>&1` in | 3837 | case `"$ac_path_SED" --version 2>&1` in |
1788 | @@ -3872,7 +3907,7 @@ | |||
1789 | 3872 | for ac_prog in grep ggrep; do | 3907 | for ac_prog in grep ggrep; do |
1790 | 3873 | for ac_exec_ext in '' $ac_executable_extensions; do | 3908 | for ac_exec_ext in '' $ac_executable_extensions; do |
1791 | 3874 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | 3909 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
1793 | 3875 | { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | 3910 | as_fn_executable_p "$ac_path_GREP" || continue |
1794 | 3876 | # Check for GNU ac_path_GREP and select it if it is found. | 3911 | # Check for GNU ac_path_GREP and select it if it is found. |
1795 | 3877 | # Check for GNU $ac_path_GREP | 3912 | # Check for GNU $ac_path_GREP |
1796 | 3878 | case `"$ac_path_GREP" --version 2>&1` in | 3913 | case `"$ac_path_GREP" --version 2>&1` in |
1797 | @@ -3938,7 +3973,7 @@ | |||
1798 | 3938 | for ac_prog in egrep; do | 3973 | for ac_prog in egrep; do |
1799 | 3939 | for ac_exec_ext in '' $ac_executable_extensions; do | 3974 | for ac_exec_ext in '' $ac_executable_extensions; do |
1800 | 3940 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | 3975 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
1802 | 3941 | { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | 3976 | as_fn_executable_p "$ac_path_EGREP" || continue |
1803 | 3942 | # Check for GNU ac_path_EGREP and select it if it is found. | 3977 | # Check for GNU ac_path_EGREP and select it if it is found. |
1804 | 3943 | # Check for GNU $ac_path_EGREP | 3978 | # Check for GNU $ac_path_EGREP |
1805 | 3944 | case `"$ac_path_EGREP" --version 2>&1` in | 3979 | case `"$ac_path_EGREP" --version 2>&1` in |
1806 | @@ -4005,7 +4040,7 @@ | |||
1807 | 4005 | for ac_prog in fgrep; do | 4040 | for ac_prog in fgrep; do |
1808 | 4006 | for ac_exec_ext in '' $ac_executable_extensions; do | 4041 | for ac_exec_ext in '' $ac_executable_extensions; do |
1809 | 4007 | ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" | 4042 | ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" |
1811 | 4008 | { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue | 4043 | as_fn_executable_p "$ac_path_FGREP" || continue |
1812 | 4009 | # Check for GNU ac_path_FGREP and select it if it is found. | 4044 | # Check for GNU ac_path_FGREP and select it if it is found. |
1813 | 4010 | # Check for GNU $ac_path_FGREP | 4045 | # Check for GNU $ac_path_FGREP |
1814 | 4011 | case `"$ac_path_FGREP" --version 2>&1` in | 4046 | case `"$ac_path_FGREP" --version 2>&1` in |
1815 | @@ -4261,7 +4296,7 @@ | |||
1816 | 4261 | IFS=$as_save_IFS | 4296 | IFS=$as_save_IFS |
1817 | 4262 | test -z "$as_dir" && as_dir=. | 4297 | test -z "$as_dir" && as_dir=. |
1818 | 4263 | for ac_exec_ext in '' $ac_executable_extensions; do | 4298 | for ac_exec_ext in '' $ac_executable_extensions; do |
1820 | 4264 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 4299 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1821 | 4265 | ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" | 4300 | ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" |
1822 | 4266 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4301 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1823 | 4267 | break 2 | 4302 | break 2 |
1824 | @@ -4305,7 +4340,7 @@ | |||
1825 | 4305 | IFS=$as_save_IFS | 4340 | IFS=$as_save_IFS |
1826 | 4306 | test -z "$as_dir" && as_dir=. | 4341 | test -z "$as_dir" && as_dir=. |
1827 | 4307 | for ac_exec_ext in '' $ac_executable_extensions; do | 4342 | for ac_exec_ext in '' $ac_executable_extensions; do |
1829 | 4308 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 4343 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1830 | 4309 | ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" | 4344 | ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" |
1831 | 4310 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4345 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1832 | 4311 | break 2 | 4346 | break 2 |
1833 | @@ -4729,7 +4764,7 @@ | |||
1834 | 4729 | IFS=$as_save_IFS | 4764 | IFS=$as_save_IFS |
1835 | 4730 | test -z "$as_dir" && as_dir=. | 4765 | test -z "$as_dir" && as_dir=. |
1836 | 4731 | for ac_exec_ext in '' $ac_executable_extensions; do | 4766 | for ac_exec_ext in '' $ac_executable_extensions; do |
1838 | 4732 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 4767 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1839 | 4733 | ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" | 4768 | ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" |
1840 | 4734 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4769 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1841 | 4735 | break 2 | 4770 | break 2 |
1842 | @@ -4769,7 +4804,7 @@ | |||
1843 | 4769 | IFS=$as_save_IFS | 4804 | IFS=$as_save_IFS |
1844 | 4770 | test -z "$as_dir" && as_dir=. | 4805 | test -z "$as_dir" && as_dir=. |
1845 | 4771 | for ac_exec_ext in '' $ac_executable_extensions; do | 4806 | for ac_exec_ext in '' $ac_executable_extensions; do |
1847 | 4772 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 4807 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1848 | 4773 | ac_cv_prog_ac_ct_OBJDUMP="objdump" | 4808 | ac_cv_prog_ac_ct_OBJDUMP="objdump" |
1849 | 4774 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4809 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1850 | 4775 | break 2 | 4810 | break 2 |
1851 | @@ -5075,7 +5110,7 @@ | |||
1852 | 5075 | IFS=$as_save_IFS | 5110 | IFS=$as_save_IFS |
1853 | 5076 | test -z "$as_dir" && as_dir=. | 5111 | test -z "$as_dir" && as_dir=. |
1854 | 5077 | for ac_exec_ext in '' $ac_executable_extensions; do | 5112 | for ac_exec_ext in '' $ac_executable_extensions; do |
1856 | 5078 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5113 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1857 | 5079 | ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | 5114 | ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
1858 | 5080 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5115 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1859 | 5081 | break 2 | 5116 | break 2 |
1860 | @@ -5115,7 +5150,7 @@ | |||
1861 | 5115 | IFS=$as_save_IFS | 5150 | IFS=$as_save_IFS |
1862 | 5116 | test -z "$as_dir" && as_dir=. | 5151 | test -z "$as_dir" && as_dir=. |
1863 | 5117 | for ac_exec_ext in '' $ac_executable_extensions; do | 5152 | for ac_exec_ext in '' $ac_executable_extensions; do |
1865 | 5118 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5153 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1866 | 5119 | ac_cv_prog_ac_ct_DLLTOOL="dlltool" | 5154 | ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
1867 | 5120 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5155 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1868 | 5121 | break 2 | 5156 | break 2 |
1869 | @@ -5219,7 +5254,7 @@ | |||
1870 | 5219 | IFS=$as_save_IFS | 5254 | IFS=$as_save_IFS |
1871 | 5220 | test -z "$as_dir" && as_dir=. | 5255 | test -z "$as_dir" && as_dir=. |
1872 | 5221 | for ac_exec_ext in '' $ac_executable_extensions; do | 5256 | for ac_exec_ext in '' $ac_executable_extensions; do |
1874 | 5222 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5257 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1875 | 5223 | ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | 5258 | ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
1876 | 5224 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5259 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1877 | 5225 | break 2 | 5260 | break 2 |
1878 | @@ -5263,7 +5298,7 @@ | |||
1879 | 5263 | IFS=$as_save_IFS | 5298 | IFS=$as_save_IFS |
1880 | 5264 | test -z "$as_dir" && as_dir=. | 5299 | test -z "$as_dir" && as_dir=. |
1881 | 5265 | for ac_exec_ext in '' $ac_executable_extensions; do | 5300 | for ac_exec_ext in '' $ac_executable_extensions; do |
1883 | 5266 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5301 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1884 | 5267 | ac_cv_prog_ac_ct_AR="$ac_prog" | 5302 | ac_cv_prog_ac_ct_AR="$ac_prog" |
1885 | 5268 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5303 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1886 | 5269 | break 2 | 5304 | break 2 |
1887 | @@ -5388,7 +5423,7 @@ | |||
1888 | 5388 | IFS=$as_save_IFS | 5423 | IFS=$as_save_IFS |
1889 | 5389 | test -z "$as_dir" && as_dir=. | 5424 | test -z "$as_dir" && as_dir=. |
1890 | 5390 | for ac_exec_ext in '' $ac_executable_extensions; do | 5425 | for ac_exec_ext in '' $ac_executable_extensions; do |
1892 | 5391 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5426 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1893 | 5392 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | 5427 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
1894 | 5393 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5428 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1895 | 5394 | break 2 | 5429 | break 2 |
1896 | @@ -5428,7 +5463,7 @@ | |||
1897 | 5428 | IFS=$as_save_IFS | 5463 | IFS=$as_save_IFS |
1898 | 5429 | test -z "$as_dir" && as_dir=. | 5464 | test -z "$as_dir" && as_dir=. |
1899 | 5430 | for ac_exec_ext in '' $ac_executable_extensions; do | 5465 | for ac_exec_ext in '' $ac_executable_extensions; do |
1901 | 5431 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5466 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1902 | 5432 | ac_cv_prog_ac_ct_STRIP="strip" | 5467 | ac_cv_prog_ac_ct_STRIP="strip" |
1903 | 5433 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5468 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1904 | 5434 | break 2 | 5469 | break 2 |
1905 | @@ -5487,7 +5522,7 @@ | |||
1906 | 5487 | IFS=$as_save_IFS | 5522 | IFS=$as_save_IFS |
1907 | 5488 | test -z "$as_dir" && as_dir=. | 5523 | test -z "$as_dir" && as_dir=. |
1908 | 5489 | for ac_exec_ext in '' $ac_executable_extensions; do | 5524 | for ac_exec_ext in '' $ac_executable_extensions; do |
1910 | 5490 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5525 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1911 | 5491 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | 5526 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
1912 | 5492 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5527 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1913 | 5493 | break 2 | 5528 | break 2 |
1914 | @@ -5527,7 +5562,7 @@ | |||
1915 | 5527 | IFS=$as_save_IFS | 5562 | IFS=$as_save_IFS |
1916 | 5528 | test -z "$as_dir" && as_dir=. | 5563 | test -z "$as_dir" && as_dir=. |
1917 | 5529 | for ac_exec_ext in '' $ac_executable_extensions; do | 5564 | for ac_exec_ext in '' $ac_executable_extensions; do |
1919 | 5530 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5565 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1920 | 5531 | ac_cv_prog_ac_ct_RANLIB="ranlib" | 5566 | ac_cv_prog_ac_ct_RANLIB="ranlib" |
1921 | 5532 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5567 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1922 | 5533 | break 2 | 5568 | break 2 |
1923 | @@ -6176,7 +6211,7 @@ | |||
1924 | 6176 | IFS=$as_save_IFS | 6211 | IFS=$as_save_IFS |
1925 | 6177 | test -z "$as_dir" && as_dir=. | 6212 | test -z "$as_dir" && as_dir=. |
1926 | 6178 | for ac_exec_ext in '' $ac_executable_extensions; do | 6213 | for ac_exec_ext in '' $ac_executable_extensions; do |
1928 | 6179 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6214 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1929 | 6180 | ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | 6215 | ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
1930 | 6181 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6216 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1931 | 6182 | break 2 | 6217 | break 2 |
1932 | @@ -6216,7 +6251,7 @@ | |||
1933 | 6216 | IFS=$as_save_IFS | 6251 | IFS=$as_save_IFS |
1934 | 6217 | test -z "$as_dir" && as_dir=. | 6252 | test -z "$as_dir" && as_dir=. |
1935 | 6218 | for ac_exec_ext in '' $ac_executable_extensions; do | 6253 | for ac_exec_ext in '' $ac_executable_extensions; do |
1937 | 6219 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6254 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1938 | 6220 | ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | 6255 | ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
1939 | 6221 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6256 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1940 | 6222 | break 2 | 6257 | break 2 |
1941 | @@ -6296,7 +6331,7 @@ | |||
1942 | 6296 | IFS=$as_save_IFS | 6331 | IFS=$as_save_IFS |
1943 | 6297 | test -z "$as_dir" && as_dir=. | 6332 | test -z "$as_dir" && as_dir=. |
1944 | 6298 | for ac_exec_ext in '' $ac_executable_extensions; do | 6333 | for ac_exec_ext in '' $ac_executable_extensions; do |
1946 | 6299 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6334 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1947 | 6300 | ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" | 6335 | ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" |
1948 | 6301 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6336 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1949 | 6302 | break 2 | 6337 | break 2 |
1950 | @@ -6336,7 +6371,7 @@ | |||
1951 | 6336 | IFS=$as_save_IFS | 6371 | IFS=$as_save_IFS |
1952 | 6337 | test -z "$as_dir" && as_dir=. | 6372 | test -z "$as_dir" && as_dir=. |
1953 | 6338 | for ac_exec_ext in '' $ac_executable_extensions; do | 6373 | for ac_exec_ext in '' $ac_executable_extensions; do |
1955 | 6339 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6374 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1956 | 6340 | ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" | 6375 | ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" |
1957 | 6341 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6376 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1958 | 6342 | break 2 | 6377 | break 2 |
1959 | @@ -6388,7 +6423,7 @@ | |||
1960 | 6388 | IFS=$as_save_IFS | 6423 | IFS=$as_save_IFS |
1961 | 6389 | test -z "$as_dir" && as_dir=. | 6424 | test -z "$as_dir" && as_dir=. |
1962 | 6390 | for ac_exec_ext in '' $ac_executable_extensions; do | 6425 | for ac_exec_ext in '' $ac_executable_extensions; do |
1964 | 6391 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6426 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1965 | 6392 | ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" | 6427 | ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" |
1966 | 6393 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6428 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1967 | 6394 | break 2 | 6429 | break 2 |
1968 | @@ -6428,7 +6463,7 @@ | |||
1969 | 6428 | IFS=$as_save_IFS | 6463 | IFS=$as_save_IFS |
1970 | 6429 | test -z "$as_dir" && as_dir=. | 6464 | test -z "$as_dir" && as_dir=. |
1971 | 6430 | for ac_exec_ext in '' $ac_executable_extensions; do | 6465 | for ac_exec_ext in '' $ac_executable_extensions; do |
1973 | 6431 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6466 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1974 | 6432 | ac_cv_prog_ac_ct_NMEDIT="nmedit" | 6467 | ac_cv_prog_ac_ct_NMEDIT="nmedit" |
1975 | 6433 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6468 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1976 | 6434 | break 2 | 6469 | break 2 |
1977 | @@ -6480,7 +6515,7 @@ | |||
1978 | 6480 | IFS=$as_save_IFS | 6515 | IFS=$as_save_IFS |
1979 | 6481 | test -z "$as_dir" && as_dir=. | 6516 | test -z "$as_dir" && as_dir=. |
1980 | 6482 | for ac_exec_ext in '' $ac_executable_extensions; do | 6517 | for ac_exec_ext in '' $ac_executable_extensions; do |
1982 | 6483 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6518 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1983 | 6484 | ac_cv_prog_LIPO="${ac_tool_prefix}lipo" | 6519 | ac_cv_prog_LIPO="${ac_tool_prefix}lipo" |
1984 | 6485 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6520 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1985 | 6486 | break 2 | 6521 | break 2 |
1986 | @@ -6520,7 +6555,7 @@ | |||
1987 | 6520 | IFS=$as_save_IFS | 6555 | IFS=$as_save_IFS |
1988 | 6521 | test -z "$as_dir" && as_dir=. | 6556 | test -z "$as_dir" && as_dir=. |
1989 | 6522 | for ac_exec_ext in '' $ac_executable_extensions; do | 6557 | for ac_exec_ext in '' $ac_executable_extensions; do |
1991 | 6523 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6558 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1992 | 6524 | ac_cv_prog_ac_ct_LIPO="lipo" | 6559 | ac_cv_prog_ac_ct_LIPO="lipo" |
1993 | 6525 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6560 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1994 | 6526 | break 2 | 6561 | break 2 |
1995 | @@ -6572,7 +6607,7 @@ | |||
1996 | 6572 | IFS=$as_save_IFS | 6607 | IFS=$as_save_IFS |
1997 | 6573 | test -z "$as_dir" && as_dir=. | 6608 | test -z "$as_dir" && as_dir=. |
1998 | 6574 | for ac_exec_ext in '' $ac_executable_extensions; do | 6609 | for ac_exec_ext in '' $ac_executable_extensions; do |
2000 | 6575 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6610 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2001 | 6576 | ac_cv_prog_OTOOL="${ac_tool_prefix}otool" | 6611 | ac_cv_prog_OTOOL="${ac_tool_prefix}otool" |
2002 | 6577 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6612 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2003 | 6578 | break 2 | 6613 | break 2 |
2004 | @@ -6612,7 +6647,7 @@ | |||
2005 | 6612 | IFS=$as_save_IFS | 6647 | IFS=$as_save_IFS |
2006 | 6613 | test -z "$as_dir" && as_dir=. | 6648 | test -z "$as_dir" && as_dir=. |
2007 | 6614 | for ac_exec_ext in '' $ac_executable_extensions; do | 6649 | for ac_exec_ext in '' $ac_executable_extensions; do |
2009 | 6615 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6650 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2010 | 6616 | ac_cv_prog_ac_ct_OTOOL="otool" | 6651 | ac_cv_prog_ac_ct_OTOOL="otool" |
2011 | 6617 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6652 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2012 | 6618 | break 2 | 6653 | break 2 |
2013 | @@ -6664,7 +6699,7 @@ | |||
2014 | 6664 | IFS=$as_save_IFS | 6699 | IFS=$as_save_IFS |
2015 | 6665 | test -z "$as_dir" && as_dir=. | 6700 | test -z "$as_dir" && as_dir=. |
2016 | 6666 | for ac_exec_ext in '' $ac_executable_extensions; do | 6701 | for ac_exec_ext in '' $ac_executable_extensions; do |
2018 | 6667 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6702 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2019 | 6668 | ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" | 6703 | ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" |
2020 | 6669 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6704 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2021 | 6670 | break 2 | 6705 | break 2 |
2022 | @@ -6704,7 +6739,7 @@ | |||
2023 | 6704 | IFS=$as_save_IFS | 6739 | IFS=$as_save_IFS |
2024 | 6705 | test -z "$as_dir" && as_dir=. | 6740 | test -z "$as_dir" && as_dir=. |
2025 | 6706 | for ac_exec_ext in '' $ac_executable_extensions; do | 6741 | for ac_exec_ext in '' $ac_executable_extensions; do |
2027 | 6707 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 6742 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2028 | 6708 | ac_cv_prog_ac_ct_OTOOL64="otool64" | 6743 | ac_cv_prog_ac_ct_OTOOL64="otool64" |
2029 | 6709 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6744 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2030 | 6710 | break 2 | 6745 | break 2 |
2031 | @@ -11211,7 +11246,7 @@ | |||
2032 | 11211 | IFS=$as_save_IFS | 11246 | IFS=$as_save_IFS |
2033 | 11212 | test -z "$as_dir" && as_dir=. | 11247 | test -z "$as_dir" && as_dir=. |
2034 | 11213 | for ac_exec_ext in '' $ac_executable_extensions; do | 11248 | for ac_exec_ext in '' $ac_executable_extensions; do |
2036 | 11214 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 11249 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2037 | 11215 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | 11250 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
2038 | 11216 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 11251 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2039 | 11217 | break 2 | 11252 | break 2 |
2040 | @@ -11251,7 +11286,7 @@ | |||
2041 | 11251 | IFS=$as_save_IFS | 11286 | IFS=$as_save_IFS |
2042 | 11252 | test -z "$as_dir" && as_dir=. | 11287 | test -z "$as_dir" && as_dir=. |
2043 | 11253 | for ac_exec_ext in '' $ac_executable_extensions; do | 11288 | for ac_exec_ext in '' $ac_executable_extensions; do |
2045 | 11254 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 11289 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2046 | 11255 | ac_cv_prog_ac_ct_CC="gcc" | 11290 | ac_cv_prog_ac_ct_CC="gcc" |
2047 | 11256 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 11291 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2048 | 11257 | break 2 | 11292 | break 2 |
2049 | @@ -11304,7 +11339,7 @@ | |||
2050 | 11304 | IFS=$as_save_IFS | 11339 | IFS=$as_save_IFS |
2051 | 11305 | test -z "$as_dir" && as_dir=. | 11340 | test -z "$as_dir" && as_dir=. |
2052 | 11306 | for ac_exec_ext in '' $ac_executable_extensions; do | 11341 | for ac_exec_ext in '' $ac_executable_extensions; do |
2054 | 11307 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 11342 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2055 | 11308 | ac_cv_prog_CC="${ac_tool_prefix}cc" | 11343 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
2056 | 11309 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 11344 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2057 | 11310 | break 2 | 11345 | break 2 |
2058 | @@ -11345,7 +11380,7 @@ | |||
2059 | 11345 | IFS=$as_save_IFS | 11380 | IFS=$as_save_IFS |
2060 | 11346 | test -z "$as_dir" && as_dir=. | 11381 | test -z "$as_dir" && as_dir=. |
2061 | 11347 | for ac_exec_ext in '' $ac_executable_extensions; do | 11382 | for ac_exec_ext in '' $ac_executable_extensions; do |
2063 | 11348 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 11383 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2064 | 11349 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | 11384 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
2065 | 11350 | ac_prog_rejected=yes | 11385 | ac_prog_rejected=yes |
2066 | 11351 | continue | 11386 | continue |
2067 | @@ -11403,7 +11438,7 @@ | |||
2068 | 11403 | IFS=$as_save_IFS | 11438 | IFS=$as_save_IFS |
2069 | 11404 | test -z "$as_dir" && as_dir=. | 11439 | test -z "$as_dir" && as_dir=. |
2070 | 11405 | for ac_exec_ext in '' $ac_executable_extensions; do | 11440 | for ac_exec_ext in '' $ac_executable_extensions; do |
2072 | 11406 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 11441 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2073 | 11407 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | 11442 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
2074 | 11408 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 11443 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2075 | 11409 | break 2 | 11444 | break 2 |
2076 | @@ -11447,7 +11482,7 @@ | |||
2077 | 11447 | IFS=$as_save_IFS | 11482 | IFS=$as_save_IFS |
2078 | 11448 | test -z "$as_dir" && as_dir=. | 11483 | test -z "$as_dir" && as_dir=. |
2079 | 11449 | for ac_exec_ext in '' $ac_executable_extensions; do | 11484 | for ac_exec_ext in '' $ac_executable_extensions; do |
2081 | 11450 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 11485 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2082 | 11451 | ac_cv_prog_ac_ct_CC="$ac_prog" | 11486 | ac_cv_prog_ac_ct_CC="$ac_prog" |
2083 | 11452 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 11487 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2084 | 11453 | break 2 | 11488 | break 2 |
2085 | @@ -11643,8 +11678,7 @@ | |||
2086 | 11643 | /* end confdefs.h. */ | 11678 | /* end confdefs.h. */ |
2087 | 11644 | #include <stdarg.h> | 11679 | #include <stdarg.h> |
2088 | 11645 | #include <stdio.h> | 11680 | #include <stdio.h> |
2091 | 11646 | #include <sys/types.h> | 11681 | struct stat; |
2090 | 11647 | #include <sys/stat.h> | ||
2092 | 11648 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ | 11682 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
2093 | 11649 | struct buf { int x; }; | 11683 | struct buf { int x; }; |
2094 | 11650 | FILE * (*rcsopen) (struct buf *, struct stat *, int); | 11684 | FILE * (*rcsopen) (struct buf *, struct stat *, int); |
2095 | @@ -11740,8 +11774,8 @@ | |||
2096 | 11740 | # We make a subdir and do the tests there. Otherwise we can end up | 11774 | # We make a subdir and do the tests there. Otherwise we can end up |
2097 | 11741 | # making bogus files that we don't know about and never remove. For | 11775 | # making bogus files that we don't know about and never remove. For |
2098 | 11742 | # instance it was reported that on HP-UX the gcc test will end up | 11776 | # instance it was reported that on HP-UX the gcc test will end up |
2101 | 11743 | # making a dummy file named `D' -- because `-MD' means `put the output | 11777 | # making a dummy file named 'D' -- because '-MD' means "put the output |
2102 | 11744 | # in D'. | 11778 | # in D". |
2103 | 11745 | rm -rf conftest.dir | 11779 | rm -rf conftest.dir |
2104 | 11746 | mkdir conftest.dir | 11780 | mkdir conftest.dir |
2105 | 11747 | # Copy depcomp to subdir because otherwise we won't find it if we're | 11781 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2106 | @@ -11776,16 +11810,16 @@ | |||
2107 | 11776 | : > sub/conftest.c | 11810 | : > sub/conftest.c |
2108 | 11777 | for i in 1 2 3 4 5 6; do | 11811 | for i in 1 2 3 4 5 6; do |
2109 | 11778 | echo '#include "conftst'$i'.h"' >> sub/conftest.c | 11812 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
2113 | 11779 | # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | 11813 | # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
2114 | 11780 | # Solaris 8's {/usr,}/bin/sh. | 11814 | # Solaris 10 /bin/sh. |
2115 | 11781 | touch sub/conftst$i.h | 11815 | echo '/* dummy */' > sub/conftst$i.h |
2116 | 11782 | done | 11816 | done |
2117 | 11783 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | 11817 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
2118 | 11784 | 11818 | ||
2120 | 11785 | # We check with `-c' and `-o' for the sake of the "dashmstdout" | 11819 | # We check with '-c' and '-o' for the sake of the "dashmstdout" |
2121 | 11786 | # mode. It turns out that the SunPro C++ compiler does not properly | 11820 | # mode. It turns out that the SunPro C++ compiler does not properly |
2124 | 11787 | # handle `-M -o', and we need to detect this. Also, some Intel | 11821 | # handle '-M -o', and we need to detect this. Also, some Intel |
2125 | 11788 | # versions had trouble with output in subdirs | 11822 | # versions had trouble with output in subdirs. |
2126 | 11789 | am__obj=sub/conftest.${OBJEXT-o} | 11823 | am__obj=sub/conftest.${OBJEXT-o} |
2127 | 11790 | am__minus_obj="-o $am__obj" | 11824 | am__minus_obj="-o $am__obj" |
2128 | 11791 | case $depmode in | 11825 | case $depmode in |
2129 | @@ -11794,8 +11828,8 @@ | |||
2130 | 11794 | test "$am__universal" = false || continue | 11828 | test "$am__universal" = false || continue |
2131 | 11795 | ;; | 11829 | ;; |
2132 | 11796 | nosideeffect) | 11830 | nosideeffect) |
2135 | 11797 | # after this tag, mechanisms are not by side-effect, so they'll | 11831 | # After this tag, mechanisms are not by side-effect, so they'll |
2136 | 11798 | # only be used when explicitly requested | 11832 | # only be used when explicitly requested. |
2137 | 11799 | if test "x$enable_dependency_tracking" = xyes; then | 11833 | if test "x$enable_dependency_tracking" = xyes; then |
2138 | 11800 | continue | 11834 | continue |
2139 | 11801 | else | 11835 | else |
2140 | @@ -11803,7 +11837,7 @@ | |||
2141 | 11803 | fi | 11837 | fi |
2142 | 11804 | ;; | 11838 | ;; |
2143 | 11805 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) | 11839 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2145 | 11806 | # This compiler won't grok `-c -o', but also, the minuso test has | 11840 | # This compiler won't grok '-c -o', but also, the minuso test has |
2146 | 11807 | # not run yet. These depmodes are late enough in the game, and | 11841 | # not run yet. These depmodes are late enough in the game, and |
2147 | 11808 | # so weak that their functioning should not be impacted. | 11842 | # so weak that their functioning should not be impacted. |
2148 | 11809 | am__obj=conftest.${OBJEXT-o} | 11843 | am__obj=conftest.${OBJEXT-o} |
2149 | @@ -11970,6 +12004,14 @@ | |||
2150 | 11970 | LTLIBOBJS=$ac_ltlibobjs | 12004 | LTLIBOBJS=$ac_ltlibobjs |
2151 | 11971 | 12005 | ||
2152 | 11972 | 12006 | ||
2153 | 12007 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 | ||
2154 | 12008 | $as_echo_n "checking that generated files are newer than configure... " >&6; } | ||
2155 | 12009 | if test -n "$am_sleep_pid"; then | ||
2156 | 12010 | # Hide warnings about reused PIDs. | ||
2157 | 12011 | wait $am_sleep_pid 2>/dev/null | ||
2158 | 12012 | fi | ||
2159 | 12013 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 | ||
2160 | 12014 | $as_echo "done" >&6; } | ||
2161 | 11973 | if test -n "$EXEEXT"; then | 12015 | if test -n "$EXEEXT"; then |
2162 | 11974 | am__EXEEXT_TRUE= | 12016 | am__EXEEXT_TRUE= |
2163 | 11975 | am__EXEEXT_FALSE='#' | 12017 | am__EXEEXT_FALSE='#' |
2164 | @@ -12292,16 +12334,16 @@ | |||
2165 | 12292 | # ... but there are two gotchas: | 12334 | # ... but there are two gotchas: |
2166 | 12293 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | 12335 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
2167 | 12294 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | 12336 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
2169 | 12295 | # In both cases, we have to default to `cp -p'. | 12337 | # In both cases, we have to default to `cp -pR'. |
2170 | 12296 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | 12338 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
2172 | 12297 | as_ln_s='cp -p' | 12339 | as_ln_s='cp -pR' |
2173 | 12298 | elif ln conf$$.file conf$$ 2>/dev/null; then | 12340 | elif ln conf$$.file conf$$ 2>/dev/null; then |
2174 | 12299 | as_ln_s=ln | 12341 | as_ln_s=ln |
2175 | 12300 | else | 12342 | else |
2177 | 12301 | as_ln_s='cp -p' | 12343 | as_ln_s='cp -pR' |
2178 | 12302 | fi | 12344 | fi |
2179 | 12303 | else | 12345 | else |
2181 | 12304 | as_ln_s='cp -p' | 12346 | as_ln_s='cp -pR' |
2182 | 12305 | fi | 12347 | fi |
2183 | 12306 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | 12348 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
2184 | 12307 | rmdir conf$$.dir 2>/dev/null | 12349 | rmdir conf$$.dir 2>/dev/null |
2185 | @@ -12361,28 +12403,16 @@ | |||
2186 | 12361 | as_mkdir_p=false | 12403 | as_mkdir_p=false |
2187 | 12362 | fi | 12404 | fi |
2188 | 12363 | 12405 | ||
2211 | 12364 | if test -x / >/dev/null 2>&1; then | 12406 | |
2212 | 12365 | as_test_x='test -x' | 12407 | # as_fn_executable_p FILE |
2213 | 12366 | else | 12408 | # ----------------------- |
2214 | 12367 | if ls -dL / >/dev/null 2>&1; then | 12409 | # Test if FILE is an executable regular file. |
2215 | 12368 | as_ls_L_option=L | 12410 | as_fn_executable_p () |
2216 | 12369 | else | 12411 | { |
2217 | 12370 | as_ls_L_option= | 12412 | test -f "$1" && test -x "$1" |
2218 | 12371 | fi | 12413 | } # as_fn_executable_p |
2219 | 12372 | as_test_x=' | 12414 | as_test_x='test -x' |
2220 | 12373 | eval sh -c '\'' | 12415 | as_executable_p=as_fn_executable_p |
2199 | 12374 | if test -d "$1"; then | ||
2200 | 12375 | test -d "$1/."; | ||
2201 | 12376 | else | ||
2202 | 12377 | case $1 in #( | ||
2203 | 12378 | -*)set "./$1";; | ||
2204 | 12379 | esac; | ||
2205 | 12380 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | ||
2206 | 12381 | ???[sx]*):;;*)false;;esac;fi | ||
2207 | 12382 | '\'' sh | ||
2208 | 12383 | ' | ||
2209 | 12384 | fi | ||
2210 | 12385 | as_executable_p=$as_test_x | ||
2221 | 12386 | 12416 | ||
2222 | 12387 | # Sed expression to map a string onto a valid CPP name. | 12417 | # Sed expression to map a string onto a valid CPP name. |
2223 | 12388 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | 12418 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
2224 | @@ -12403,8 +12433,8 @@ | |||
2225 | 12403 | # report actual input values of CONFIG_FILES etc. instead of their | 12433 | # report actual input values of CONFIG_FILES etc. instead of their |
2226 | 12404 | # values after options handling. | 12434 | # values after options handling. |
2227 | 12405 | ac_log=" | 12435 | ac_log=" |
2230 | 12406 | This file was extended by Multitouch Protocol Translation Library $as_me 1.1.2, which was | 12436 | This file was extended by Multitouch Protocol Translation Library $as_me 1.1.3, which was |
2231 | 12407 | generated by GNU Autoconf 2.68. Invocation command line was | 12437 | generated by GNU Autoconf 2.69. Invocation command line was |
2232 | 12408 | 12438 | ||
2233 | 12409 | CONFIG_FILES = $CONFIG_FILES | 12439 | CONFIG_FILES = $CONFIG_FILES |
2234 | 12410 | CONFIG_HEADERS = $CONFIG_HEADERS | 12440 | CONFIG_HEADERS = $CONFIG_HEADERS |
2235 | @@ -12469,11 +12499,11 @@ | |||
2236 | 12469 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 12499 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2237 | 12470 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 12500 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2238 | 12471 | ac_cs_version="\\ | 12501 | ac_cs_version="\\ |
2241 | 12472 | Multitouch Protocol Translation Library config.status 1.1.2 | 12502 | Multitouch Protocol Translation Library config.status 1.1.3 |
2242 | 12473 | configured by $0, generated by GNU Autoconf 2.68, | 12503 | configured by $0, generated by GNU Autoconf 2.69, |
2243 | 12474 | with options \\"\$ac_cs_config\\" | 12504 | with options \\"\$ac_cs_config\\" |
2244 | 12475 | 12505 | ||
2246 | 12476 | Copyright (C) 2010 Free Software Foundation, Inc. | 12506 | Copyright (C) 2012 Free Software Foundation, Inc. |
2247 | 12477 | This config.status script is free software; the Free Software Foundation | 12507 | This config.status script is free software; the Free Software Foundation |
2248 | 12478 | gives unlimited permission to copy, distribute and modify it." | 12508 | gives unlimited permission to copy, distribute and modify it." |
2249 | 12479 | 12509 | ||
2250 | @@ -12564,7 +12594,7 @@ | |||
2251 | 12564 | _ACEOF | 12594 | _ACEOF |
2252 | 12565 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 12595 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2253 | 12566 | if \$ac_cs_recheck; then | 12596 | if \$ac_cs_recheck; then |
2255 | 12567 | set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | 12597 | set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
2256 | 12568 | shift | 12598 | shift |
2257 | 12569 | \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 | 12599 | \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
2258 | 12570 | CONFIG_SHELL='$SHELL' | 12600 | CONFIG_SHELL='$SHELL' |
2259 | @@ -13491,7 +13521,7 @@ | |||
2260 | 13491 | # Strip MF so we end up with the name of the file. | 13521 | # Strip MF so we end up with the name of the file. |
2261 | 13492 | mf=`echo "$mf" | sed -e 's/:.*$//'` | 13522 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
2262 | 13493 | # Check whether this is an Automake generated Makefile or not. | 13523 | # Check whether this is an Automake generated Makefile or not. |
2264 | 13494 | # We used to match only the files named `Makefile.in', but | 13524 | # We used to match only the files named 'Makefile.in', but |
2265 | 13495 | # some people rename them; so instead we look at the file content. | 13525 | # some people rename them; so instead we look at the file content. |
2266 | 13496 | # Grep'ing the first line is not enough: some people post-process | 13526 | # Grep'ing the first line is not enough: some people post-process |
2267 | 13497 | # each Makefile.in and add a new line on top of each file to say so. | 13527 | # each Makefile.in and add a new line on top of each file to say so. |
2268 | @@ -13525,21 +13555,19 @@ | |||
2269 | 13525 | continue | 13555 | continue |
2270 | 13526 | fi | 13556 | fi |
2271 | 13527 | # Extract the definition of DEPDIR, am__include, and am__quote | 13557 | # Extract the definition of DEPDIR, am__include, and am__quote |
2273 | 13528 | # from the Makefile without running `make'. | 13558 | # from the Makefile without running 'make'. |
2274 | 13529 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | 13559 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2275 | 13530 | test -z "$DEPDIR" && continue | 13560 | test -z "$DEPDIR" && continue |
2276 | 13531 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | 13561 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2277 | 13532 | test -z "am__include" && continue | 13562 | test -z "am__include" && continue |
2278 | 13533 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | 13563 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2279 | 13534 | # When using ansi2knr, U may be empty or an underscore; expand it | ||
2280 | 13535 | U=`sed -n 's/^U = //p' < "$mf"` | ||
2281 | 13536 | # Find all dependency output files, they are included files with | 13564 | # Find all dependency output files, they are included files with |
2282 | 13537 | # $(DEPDIR) in their names. We invoke sed twice because it is the | 13565 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
2283 | 13538 | # simplest approach to changing $(DEPDIR) to its actual value in the | 13566 | # simplest approach to changing $(DEPDIR) to its actual value in the |
2284 | 13539 | # expansion. | 13567 | # expansion. |
2285 | 13540 | for file in `sed -n " | 13568 | for file in `sed -n " |
2286 | 13541 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | 13569 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
2288 | 13542 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | 13570 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
2289 | 13543 | # Make sure the directory exists. | 13571 | # Make sure the directory exists. |
2290 | 13544 | test -f "$dirpart/$file" && continue | 13572 | test -f "$dirpart/$file" && continue |
2291 | 13545 | fdir=`$as_dirname -- "$file" || | 13573 | fdir=`$as_dirname -- "$file" || |
2292 | 13546 | 13574 | ||
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 | 1 | # Initialize Autoconf | 1 | # Initialize Autoconf |
2298 | 2 | AC_PREREQ([2.60]) | 2 | AC_PREREQ([2.60]) |
2299 | 3 | AC_INIT([Multitouch Protocol Translation Library], | 3 | AC_INIT([Multitouch Protocol Translation Library], |
2301 | 4 | [1.1.2], | 4 | [1.1.3], |
2302 | 5 | [], | 5 | [], |
2303 | 6 | [mtdev]) | 6 | [mtdev]) |
2304 | 7 | AC_CONFIG_SRCDIR([Makefile.am]) | 7 | AC_CONFIG_SRCDIR([Makefile.am]) |
2305 | 8 | 8 | ||
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 | 1 | mtdev (1.1.3-1ubuntu1) saucy; urgency=low | ||
2311 | 2 | |||
2312 | 3 | * Merge from Debian unstable. Remaining changes: | ||
2313 | 4 | - debian/libmtdev1.links: Install apport hook links. | ||
2314 | 5 | |||
2315 | 6 | -- Logan Rosen <logan@ubuntu.com> Mon, 20 May 2013 21:16:05 -0400 | ||
2316 | 7 | |||
2317 | 8 | mtdev (1.1.3-1) unstable; urgency=low | ||
2318 | 9 | |||
2319 | 10 | * Upload to unstable. | ||
2320 | 11 | * Update debian/control. | ||
2321 | 12 | - Remove automake and libtool from Build-Depends and add dh-autoreconf. | ||
2322 | 13 | - Update Standards-Version to 3.9.4. | ||
2323 | 14 | * Update debian/rules. | ||
2324 | 15 | - Add rules/autoreconf.mk (Closes: #700019). | ||
2325 | 16 | - Remove document files from libmtdev1-udeb. | ||
2326 | 17 | |||
2327 | 18 | -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 08 May 2013 14:45:13 +0900 | ||
2328 | 19 | |||
2329 | 20 | mtdev (1.1.3-1~exp1) experimental; urgency=low | ||
2330 | 21 | |||
2331 | 22 | * New upstream release. | ||
2332 | 23 | * Update debian/control. | ||
2333 | 24 | - Fix typo. Thanks to Erik Esterer. (Closes: #685145) | ||
2334 | 25 | - Add Vcs-Git and Vcs-Browser field. | ||
2335 | 26 | |||
2336 | 27 | -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 05 Sep 2012 01:22:39 +0900 | ||
2337 | 28 | |||
2338 | 1 | mtdev (1.1.2-1ubuntu1) quantal; urgency=low | 29 | mtdev (1.1.2-1ubuntu1) quantal; urgency=low |
2339 | 2 | 30 | ||
2340 | 3 | * Merge from debian unstable. Remaining changes: | 31 | * Merge from debian unstable. Remaining changes: |
2341 | 4 | 32 | ||
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 | 8 | pkg-config, | 8 | pkg-config, |
2347 | 9 | quilt, | 9 | quilt, |
2348 | 10 | dpkg-dev (>= 1.14.17), | 10 | dpkg-dev (>= 1.14.17), |
2352 | 11 | automake, | 11 | dh-autoreconf (>= 7) |
2353 | 12 | libtool, | 12 | Standards-Version: 3.9.4 |
2351 | 13 | Standards-Version: 3.9.3 | ||
2354 | 14 | Homepage: http://bitmath.org/code/mtdev/ | 13 | Homepage: http://bitmath.org/code/mtdev/ |
2355 | 14 | Vcs-Git: git://anonscm.debian.org/collab-maint/mtdev.git | ||
2356 | 15 | Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mtdev.git | ||
2357 | 15 | 16 | ||
2358 | 16 | Package: libmtdev1 | 17 | Package: libmtdev1 |
2359 | 17 | Architecture: linux-any | 18 | Architecture: linux-any |
2360 | @@ -48,7 +49,7 @@ | |||
2361 | 48 | drivers that have not been updated to use the newer protocol. | 49 | drivers that have not been updated to use the newer protocol. |
2362 | 49 | . | 50 | . |
2363 | 50 | This package provides some test tools for the libmtdev library. | 51 | This package provides some test tools for the libmtdev library. |
2365 | 51 | + mtdev-test: prints the information comming from the kernel | 52 | + mtdev-test: prints the information coming from the kernel |
2366 | 52 | 53 | ||
2367 | 53 | Package: libmtdev1-udeb | 54 | Package: libmtdev1-udeb |
2368 | 54 | Section: debian-installer | 55 | Section: debian-installer |
2369 | 55 | 56 | ||
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 | 1 | #!/usr/bin/make -f | 1 | #!/usr/bin/make -f |
2375 | 2 | 2 | ||
2376 | 3 | include /usr/share/cdbs/1/rules/autoreconf.mk | ||
2377 | 3 | include /usr/share/cdbs/1/rules/debhelper.mk | 4 | include /usr/share/cdbs/1/rules/debhelper.mk |
2378 | 4 | include /usr/share/cdbs/1/rules/utils.mk | 5 | include /usr/share/cdbs/1/rules/utils.mk |
2379 | 5 | include /usr/share/cdbs/1/class/autotools.mk | 6 | include /usr/share/cdbs/1/class/autotools.mk |
2380 | @@ -22,3 +23,6 @@ | |||
2381 | 22 | find debian/tmp/usr/lib -name \*.a -exec rm {} \; | 23 | find debian/tmp/usr/lib -name \*.a -exec rm {} \; |
2382 | 23 | 24 | ||
2383 | 24 | common-binary-predeb-arch:: list-missing | 25 | common-binary-predeb-arch:: list-missing |
2384 | 26 | |||
2385 | 27 | binary-install/libmtdev1-udeb:: | ||
2386 | 28 | rm -rf debian/libmtdev1-udeb/usr/share/doc/libmtdev1-udeb | ||
2387 | 25 | 29 | ||
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 | 7 | Description: Multitouch Protocol Translation Library | 7 | Description: Multitouch Protocol Translation Library |
2393 | 8 | Version: @PACKAGE_VERSION@ | 8 | Version: @PACKAGE_VERSION@ |
2394 | 9 | Libs: -L${libdir} -lmtdev | 9 | Libs: -L${libdir} -lmtdev |
2395 | 10 | Cflags: -I${includedir} | ||
2396 | 10 | 11 | ||
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 @@ | |||
2402 | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.12.3 from Makefile.am. |
2403 | 2 | # @configure_input@ | 2 | # @configure_input@ |
2404 | 3 | 3 | ||
2408 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2409 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | 5 | |
2407 | 6 | # Foundation, Inc. | ||
2410 | 7 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
2411 | 8 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
2412 | 9 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
2413 | @@ -17,6 +16,23 @@ | |||
2414 | 17 | 16 | ||
2415 | 18 | 17 | ||
2416 | 19 | VPATH = @srcdir@ | 18 | VPATH = @srcdir@ |
2417 | 19 | am__make_dryrun = \ | ||
2418 | 20 | { \ | ||
2419 | 21 | am__dry=no; \ | ||
2420 | 22 | case $$MAKEFLAGS in \ | ||
2421 | 23 | *\\[\ \ ]*) \ | ||
2422 | 24 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
2423 | 25 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
2424 | 26 | *) \ | ||
2425 | 27 | for am__flg in $$MAKEFLAGS; do \ | ||
2426 | 28 | case $$am__flg in \ | ||
2427 | 29 | *=*|--*) ;; \ | ||
2428 | 30 | *n*) am__dry=yes; break;; \ | ||
2429 | 31 | esac; \ | ||
2430 | 32 | done;; \ | ||
2431 | 33 | esac; \ | ||
2432 | 34 | test $$am__dry = yes; \ | ||
2433 | 35 | } | ||
2434 | 20 | pkgdatadir = $(datadir)/@PACKAGE@ | 36 | pkgdatadir = $(datadir)/@PACKAGE@ |
2435 | 21 | pkgincludedir = $(includedir)/@PACKAGE@ | 37 | pkgincludedir = $(includedir)/@PACKAGE@ |
2436 | 22 | pkglibdir = $(libdir)/@PACKAGE@ | 38 | pkglibdir = $(libdir)/@PACKAGE@ |
2437 | @@ -37,7 +53,7 @@ | |||
2438 | 37 | host_triplet = @host@ | 53 | host_triplet = @host@ |
2439 | 38 | subdir = src | 54 | subdir = src |
2440 | 39 | DIST_COMMON = $(libmtdevinclude_HEADERS) $(srcdir)/Makefile.am \ | 55 | DIST_COMMON = $(libmtdevinclude_HEADERS) $(srcdir)/Makefile.am \ |
2442 | 40 | $(srcdir)/Makefile.in | 56 | $(srcdir)/Makefile.in $(top_srcdir)/config-aux/depcomp |
2443 | 41 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 57 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2444 | 42 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 58 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2445 | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 59 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2446 | @@ -98,6 +114,11 @@ | |||
2447 | 98 | $(LDFLAGS) -o $@ | 114 | $(LDFLAGS) -o $@ |
2448 | 99 | SOURCES = $(libmtdev_la_SOURCES) | 115 | SOURCES = $(libmtdev_la_SOURCES) |
2449 | 100 | DIST_SOURCES = $(libmtdev_la_SOURCES) | 116 | DIST_SOURCES = $(libmtdev_la_SOURCES) |
2450 | 117 | am__can_run_installinfo = \ | ||
2451 | 118 | case $$AM_UPDATE_INFO_DIR in \ | ||
2452 | 119 | n|no|NO) false;; \ | ||
2453 | 120 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
2454 | 121 | esac | ||
2455 | 101 | HEADERS = $(libmtdevinclude_HEADERS) | 122 | HEADERS = $(libmtdevinclude_HEADERS) |
2456 | 102 | ETAGS = etags | 123 | ETAGS = etags |
2457 | 103 | CTAGS = ctags | 124 | CTAGS = ctags |
2458 | @@ -277,7 +298,6 @@ | |||
2459 | 277 | $(am__aclocal_m4_deps): | 298 | $(am__aclocal_m4_deps): |
2460 | 278 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) | 299 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
2461 | 279 | @$(NORMAL_INSTALL) | 300 | @$(NORMAL_INSTALL) |
2462 | 280 | test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" | ||
2463 | 281 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | 301 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
2464 | 282 | list2=; for p in $$list; do \ | 302 | list2=; for p in $$list; do \ |
2465 | 283 | if test -f $$p; then \ | 303 | if test -f $$p; then \ |
2466 | @@ -285,6 +305,8 @@ | |||
2467 | 285 | else :; fi; \ | 305 | else :; fi; \ |
2468 | 286 | done; \ | 306 | done; \ |
2469 | 287 | test -z "$$list2" || { \ | 307 | test -z "$$list2" || { \ |
2470 | 308 | echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ | ||
2471 | 309 | $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ | ||
2472 | 288 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ | 310 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ |
2473 | 289 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ | 311 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ |
2474 | 290 | } | 312 | } |
2475 | @@ -300,12 +322,14 @@ | |||
2476 | 300 | 322 | ||
2477 | 301 | clean-libLTLIBRARIES: | 323 | clean-libLTLIBRARIES: |
2478 | 302 | -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) | 324 | -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) |
2485 | 303 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | 325 | @list='$(lib_LTLIBRARIES)'; \ |
2486 | 304 | dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ | 326 | locs=`for p in $$list; do echo $$p; done | \ |
2487 | 305 | test "$$dir" != "$$p" || dir=.; \ | 327 | sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ |
2488 | 306 | echo "rm -f \"$${dir}/so_locations\""; \ | 328 | sort -u`; \ |
2489 | 307 | rm -f "$${dir}/so_locations"; \ | 329 | test -z "$$locs" || { \ |
2490 | 308 | done | 330 | echo rm -f $${locs}; \ |
2491 | 331 | rm -f $${locs}; \ | ||
2492 | 332 | } | ||
2493 | 309 | libmtdev.la: $(libmtdev_la_OBJECTS) $(libmtdev_la_DEPENDENCIES) $(EXTRA_libmtdev_la_DEPENDENCIES) | 333 | libmtdev.la: $(libmtdev_la_OBJECTS) $(libmtdev_la_DEPENDENCIES) $(EXTRA_libmtdev_la_DEPENDENCIES) |
2494 | 310 | $(libmtdev_la_LINK) -rpath $(libdir) $(libmtdev_la_OBJECTS) $(libmtdev_la_LIBADD) $(LIBS) | 334 | $(libmtdev_la_LINK) -rpath $(libdir) $(libmtdev_la_OBJECTS) $(libmtdev_la_LIBADD) $(LIBS) |
2495 | 311 | 335 | ||
2496 | @@ -349,8 +373,11 @@ | |||
2497 | 349 | -rm -rf .libs _libs | 373 | -rm -rf .libs _libs |
2498 | 350 | install-libmtdevincludeHEADERS: $(libmtdevinclude_HEADERS) | 374 | install-libmtdevincludeHEADERS: $(libmtdevinclude_HEADERS) |
2499 | 351 | @$(NORMAL_INSTALL) | 375 | @$(NORMAL_INSTALL) |
2500 | 352 | test -z "$(libmtdevincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libmtdevincludedir)" | ||
2501 | 353 | @list='$(libmtdevinclude_HEADERS)'; test -n "$(libmtdevincludedir)" || list=; \ | 376 | @list='$(libmtdevinclude_HEADERS)'; test -n "$(libmtdevincludedir)" || list=; \ |
2502 | 377 | if test -n "$$list"; then \ | ||
2503 | 378 | echo " $(MKDIR_P) '$(DESTDIR)$(libmtdevincludedir)'"; \ | ||
2504 | 379 | $(MKDIR_P) "$(DESTDIR)$(libmtdevincludedir)" || exit 1; \ | ||
2505 | 380 | fi; \ | ||
2506 | 354 | for p in $$list; do \ | 381 | for p in $$list; do \ |
2507 | 355 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 382 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
2508 | 356 | echo "$$d$$p"; \ | 383 | echo "$$d$$p"; \ |
2509 | @@ -415,6 +442,20 @@ | |||
2510 | 415 | && $(am__cd) $(top_srcdir) \ | 442 | && $(am__cd) $(top_srcdir) \ |
2511 | 416 | && gtags -i $(GTAGS_ARGS) "$$here" | 443 | && gtags -i $(GTAGS_ARGS) "$$here" |
2512 | 417 | 444 | ||
2513 | 445 | cscopelist: $(HEADERS) $(SOURCES) $(LISP) | ||
2514 | 446 | list='$(SOURCES) $(HEADERS) $(LISP)'; \ | ||
2515 | 447 | case "$(srcdir)" in \ | ||
2516 | 448 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ | ||
2517 | 449 | *) sdir=$(subdir)/$(srcdir) ;; \ | ||
2518 | 450 | esac; \ | ||
2519 | 451 | for i in $$list; do \ | ||
2520 | 452 | if test -f "$$i"; then \ | ||
2521 | 453 | echo "$(subdir)/$$i"; \ | ||
2522 | 454 | else \ | ||
2523 | 455 | echo "$$sdir/$$i"; \ | ||
2524 | 456 | fi; \ | ||
2525 | 457 | done >> $(top_builddir)/cscope.files | ||
2526 | 458 | |||
2527 | 418 | distclean-tags: | 459 | distclean-tags: |
2528 | 419 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | 460 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
2529 | 420 | 461 | ||
2530 | @@ -560,7 +601,7 @@ | |||
2531 | 560 | .MAKE: install-am install-strip | 601 | .MAKE: install-am install-strip |
2532 | 561 | 602 | ||
2533 | 562 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | 603 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ |
2535 | 563 | clean-libLTLIBRARIES clean-libtool ctags distclean \ | 604 | clean-libLTLIBRARIES clean-libtool cscopelist ctags distclean \ |
2536 | 564 | distclean-compile distclean-generic distclean-libtool \ | 605 | distclean-compile distclean-generic distclean-libtool \ |
2537 | 565 | distclean-tags distdir dvi dvi-am html html-am info info-am \ | 606 | distclean-tags distdir dvi dvi-am html html-am info info-am \ |
2538 | 566 | install install-am install-data install-data-am install-dvi \ | 607 | install install-am install-data install-data-am install-dvi \ |
2539 | 567 | 608 | ||
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 @@ | |||
2545 | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.12.3 from Makefile.am. |
2546 | 2 | # @configure_input@ | 2 | # @configure_input@ |
2547 | 3 | 3 | ||
2551 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2552 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | 5 | |
2550 | 6 | # Foundation, Inc. | ||
2553 | 7 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
2554 | 8 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
2555 | 9 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
2556 | @@ -16,6 +15,23 @@ | |||
2557 | 16 | @SET_MAKE@ | 15 | @SET_MAKE@ |
2558 | 17 | 16 | ||
2559 | 18 | VPATH = @srcdir@ | 17 | VPATH = @srcdir@ |
2560 | 18 | am__make_dryrun = \ | ||
2561 | 19 | { \ | ||
2562 | 20 | am__dry=no; \ | ||
2563 | 21 | case $$MAKEFLAGS in \ | ||
2564 | 22 | *\\[\ \ ]*) \ | ||
2565 | 23 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
2566 | 24 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
2567 | 25 | *) \ | ||
2568 | 26 | for am__flg in $$MAKEFLAGS; do \ | ||
2569 | 27 | case $$am__flg in \ | ||
2570 | 28 | *=*|--*) ;; \ | ||
2571 | 29 | *n*) am__dry=yes; break;; \ | ||
2572 | 30 | esac; \ | ||
2573 | 31 | done;; \ | ||
2574 | 32 | esac; \ | ||
2575 | 33 | test $$am__dry = yes; \ | ||
2576 | 34 | } | ||
2577 | 19 | pkgdatadir = $(datadir)/@PACKAGE@ | 35 | pkgdatadir = $(datadir)/@PACKAGE@ |
2578 | 20 | pkgincludedir = $(includedir)/@PACKAGE@ | 36 | pkgincludedir = $(includedir)/@PACKAGE@ |
2579 | 21 | pkglibdir = $(libdir)/@PACKAGE@ | 37 | pkglibdir = $(libdir)/@PACKAGE@ |
2580 | @@ -38,7 +54,8 @@ | |||
2581 | 38 | mtdev-kernel$(EXEEXT) | 54 | mtdev-kernel$(EXEEXT) |
2582 | 39 | bin_PROGRAMS = mtdev-test$(EXEEXT) | 55 | bin_PROGRAMS = mtdev-test$(EXEEXT) |
2583 | 40 | subdir = test | 56 | subdir = test |
2585 | 41 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 57 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
2586 | 58 | $(top_srcdir)/config-aux/depcomp | ||
2587 | 42 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 59 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2588 | 43 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 60 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2589 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 61 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2590 | @@ -87,6 +104,11 @@ | |||
2591 | 87 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) | 104 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) |
2592 | 88 | DIST_SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ | 105 | DIST_SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ |
2593 | 89 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) | 106 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) |
2594 | 107 | am__can_run_installinfo = \ | ||
2595 | 108 | case $$AM_UPDATE_INFO_DIR in \ | ||
2596 | 109 | n|no|NO) false;; \ | ||
2597 | 110 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
2598 | 111 | esac | ||
2599 | 90 | ETAGS = etags | 112 | ETAGS = etags |
2600 | 91 | CTAGS = ctags | 113 | CTAGS = ctags |
2601 | 92 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 114 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2602 | @@ -249,8 +271,11 @@ | |||
2603 | 249 | $(am__aclocal_m4_deps): | 271 | $(am__aclocal_m4_deps): |
2604 | 250 | install-binPROGRAMS: $(bin_PROGRAMS) | 272 | install-binPROGRAMS: $(bin_PROGRAMS) |
2605 | 251 | @$(NORMAL_INSTALL) | 273 | @$(NORMAL_INSTALL) |
2606 | 252 | test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" | ||
2607 | 253 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ | 274 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
2608 | 275 | if test -n "$$list"; then \ | ||
2609 | 276 | echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ | ||
2610 | 277 | $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ | ||
2611 | 278 | fi; \ | ||
2612 | 254 | for p in $$list; do echo "$$p $$p"; done | \ | 279 | for p in $$list; do echo "$$p $$p"; done | \ |
2613 | 255 | sed 's/$(EXEEXT)$$//' | \ | 280 | sed 's/$(EXEEXT)$$//' | \ |
2614 | 256 | while read p p1; do if test -f $$p || test -f $$p1; \ | 281 | while read p p1; do if test -f $$p || test -f $$p1; \ |
2615 | @@ -399,6 +424,20 @@ | |||
2616 | 399 | && $(am__cd) $(top_srcdir) \ | 424 | && $(am__cd) $(top_srcdir) \ |
2617 | 400 | && gtags -i $(GTAGS_ARGS) "$$here" | 425 | && gtags -i $(GTAGS_ARGS) "$$here" |
2618 | 401 | 426 | ||
2619 | 427 | cscopelist: $(HEADERS) $(SOURCES) $(LISP) | ||
2620 | 428 | list='$(SOURCES) $(HEADERS) $(LISP)'; \ | ||
2621 | 429 | case "$(srcdir)" in \ | ||
2622 | 430 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ | ||
2623 | 431 | *) sdir=$(subdir)/$(srcdir) ;; \ | ||
2624 | 432 | esac; \ | ||
2625 | 433 | for i in $$list; do \ | ||
2626 | 434 | if test -f "$$i"; then \ | ||
2627 | 435 | echo "$(subdir)/$$i"; \ | ||
2628 | 436 | else \ | ||
2629 | 437 | echo "$$sdir/$$i"; \ | ||
2630 | 438 | fi; \ | ||
2631 | 439 | done >> $(top_builddir)/cscope.files | ||
2632 | 440 | |||
2633 | 402 | distclean-tags: | 441 | distclean-tags: |
2634 | 403 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | 442 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
2635 | 404 | 443 | ||
2636 | @@ -543,8 +582,8 @@ | |||
2637 | 543 | .MAKE: install-am install-strip | 582 | .MAKE: install-am install-strip |
2638 | 544 | 583 | ||
2639 | 545 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ | 584 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ |
2642 | 546 | clean-generic clean-libtool clean-noinstPROGRAMS ctags \ | 585 | clean-generic clean-libtool clean-noinstPROGRAMS cscopelist \ |
2643 | 547 | distclean distclean-compile distclean-generic \ | 586 | ctags distclean distclean-compile distclean-generic \ |
2644 | 548 | distclean-libtool distclean-tags distdir dvi dvi-am html \ | 587 | distclean-libtool distclean-tags distdir dvi dvi-am html \ |
2645 | 549 | html-am info info-am install install-am install-binPROGRAMS \ | 588 | html-am info info-am install install-am install-binPROGRAMS \ |
2646 | 550 | install-data install-data-am install-dvi install-dvi-am \ | 589 | install-data install-data-am install-dvi install-dvi-am \ |
Thanks! Sponsored.