Merge lp:~logan/ubuntu/raring/cpptest/1.1.2-0ubuntu1 into lp:ubuntu/raring/cpptest
- Raring (13.04)
- 1.1.2-0ubuntu1
- Merge into raring
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp:~logan/ubuntu/raring/cpptest/1.1.2-0ubuntu1 |
Merge into: | lp:ubuntu/raring/cpptest |
Diff against target: |
18770 lines (+6505/-3091) 31 files modified
AUTHORS (+5/-2) INSTALL.quick (+2/-2) Makefile.in (+141/-64) NEWS (+8/-0) README (+1/-1) aclocal.m4 (+1279/-609) config/config.guess (+146/-118) config/config.sub (+134/-75) config/depcomp (+133/-56) config/install-sh (+21/-14) config/ltmain.sh (+2120/-910) config/missing (+51/-97) configure (+2151/-1067) configure.ac (+1/-1) debian/Makefile (+5/-0) debian/changelog (+18/-0) debian/control (+1/-2) debian/copyright (+4/-3) debian/patches/03-create-test-makefile.patch (+0/-9) debian/patches/06-patch-makefile.in-not-to-build-examples.patch (+3/-3) debian/patches/series (+0/-1) debian/rules (+1/-1) debian/source/format (+1/-1) doc/Doxyfile (+1/-1) doc/Makefile.am (+0/-1) doc/Makefile.in (+51/-14) libcpptest.pc (+1/-1) libcpptest.pc.in (+3/-3) src/Makefile.in (+75/-23) src/cpptest-assert.h (+93/-0) test/Makefile.in (+55/-12) |
To merge this branch: | bzr merge lp:~logan/ubuntu/raring/cpptest/1.1.2-0ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+149667@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 'AUTHORS' |
2 | --- AUTHORS 2010-05-12 20:21:46 +0000 |
3 | +++ AUTHORS 2013-02-20 19:26:35 +0000 |
4 | @@ -1,4 +1,5 @@ |
5 | -Current maintainer |
6 | +Current maintainers |
7 | + Nate Gallaher <ngallaher@zoidberg.wp.comcast.net> |
8 | Sebastian Pipping <sebastian@pipping.org> |
9 | |
10 | Main author: |
11 | @@ -8,4 +9,6 @@ |
12 | David Morris - pkg-config and installation patches. |
13 | Robin Patenall - migration to XHTML 1.0 strict |
14 | Sebastian Pipping - several bugfixes |
15 | - |
16 | + Nate Gallaher - additional assertion macros |
17 | + Robert Buchholz - build system fixes |
18 | + Dagobert Michelsen - build system fixes |
19 | |
20 | === modified file 'INSTALL.quick' |
21 | --- INSTALL.quick 2010-05-12 20:21:46 +0000 |
22 | +++ INSTALL.quick 2013-02-20 19:26:35 +0000 |
23 | @@ -16,8 +16,8 @@ |
24 | Simple install procedure |
25 | ------------------------ |
26 | |
27 | - > gzip -cd cpptest-1.1.1.tar.gz | tar xvf - # unpack the sources |
28 | - > cd cpptest-1.1.1 # change to the its directory |
29 | + > gzip -cd cpptest-1.1.2.tar.gz | tar xvf - # unpack the sources |
30 | + > cd cpptest-1.1.2 # change to the its directory |
31 | > ./configure # run the 'configure' script |
32 | > make # build 'cpptest' |
33 | |
34 | |
35 | === modified file 'Makefile.in' |
36 | --- Makefile.in 2010-05-12 20:21:46 +0000 |
37 | +++ Makefile.in 2013-02-20 19:26:35 +0000 |
38 | @@ -1,9 +1,8 @@ |
39 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
40 | +# Makefile.in generated by automake 1.12.1 from Makefile.am. |
41 | # @configure_input@ |
42 | |
43 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
44 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
45 | -# Inc. |
46 | +# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
47 | + |
48 | # This Makefile.in is free software; the Free Software Foundation |
49 | # gives unlimited permission to copy and/or distribute it, |
50 | # with or without modifications, as long as this notice is preserved. |
51 | @@ -16,6 +15,23 @@ |
52 | @SET_MAKE@ |
53 | |
54 | VPATH = @srcdir@ |
55 | +am__make_dryrun = \ |
56 | + { \ |
57 | + am__dry=no; \ |
58 | + case $$MAKEFLAGS in \ |
59 | + *\\[\ \ ]*) \ |
60 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
61 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
62 | + *) \ |
63 | + for am__flg in $$MAKEFLAGS; do \ |
64 | + case $$am__flg in \ |
65 | + *=*|--*) ;; \ |
66 | + *n*) am__dry=yes; break;; \ |
67 | + esac; \ |
68 | + done;; \ |
69 | + esac; \ |
70 | + test $$am__dry = yes; \ |
71 | + } |
72 | pkgdatadir = $(datadir)/@PACKAGE@ |
73 | pkgincludedir = $(includedir)/@PACKAGE@ |
74 | pkglibdir = $(libdir)/@PACKAGE@ |
75 | @@ -39,10 +55,13 @@ |
76 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/INSTALL.quick.in \ |
77 | $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
78 | $(srcdir)/README.in $(srcdir)/libcpptest.pc.in \ |
79 | + $(top_srcdir)/config/config.guess \ |
80 | $(top_srcdir)/config/config.h.in \ |
81 | - $(top_srcdir)/config/stamp-h.in $(top_srcdir)/configure \ |
82 | - AUTHORS COPYING ChangeLog INSTALL NEWS config/config.guess \ |
83 | - config/config.sub config/depcomp config/install-sh \ |
84 | + $(top_srcdir)/config/config.sub \ |
85 | + $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ |
86 | + $(top_srcdir)/config/missing $(top_srcdir)/config/stamp-h.in \ |
87 | + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
88 | + config/config.guess config/config.sub config/install-sh \ |
89 | config/ltmain.sh config/missing |
90 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
91 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
92 | @@ -63,6 +82,11 @@ |
93 | install-pdf-recursive install-ps-recursive install-recursive \ |
94 | installcheck-recursive installdirs-recursive pdf-recursive \ |
95 | ps-recursive uninstall-recursive |
96 | +am__can_run_installinfo = \ |
97 | + case $$AM_UPDATE_INFO_DIR in \ |
98 | + n|no|NO) false;; \ |
99 | + *) (install-info --version) >/dev/null 2>&1;; \ |
100 | + esac |
101 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
102 | am__vpath_adj = case $$p in \ |
103 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
104 | @@ -84,23 +108,33 @@ |
105 | am__base_list = \ |
106 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
107 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
108 | +am__uninstall_files_from_dir = { \ |
109 | + test -z "$$files" \ |
110 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
111 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
112 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
113 | + } |
114 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" |
115 | DATA = $(pkgconfig_DATA) |
116 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
117 | distclean-recursive maintainer-clean-recursive |
118 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
119 | $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
120 | - distdir dist dist-all distcheck |
121 | + cscope distdir dist dist-all distcheck |
122 | ETAGS = etags |
123 | CTAGS = ctags |
124 | +CSCOPE = cscope |
125 | DIST_SUBDIRS = src test doc |
126 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
127 | distdir = $(PACKAGE)-$(VERSION) |
128 | top_distdir = $(distdir) |
129 | am__remove_distdir = \ |
130 | - { test ! -d "$(distdir)" \ |
131 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
132 | - && rm -fr "$(distdir)"; }; } |
133 | + if test -d "$(distdir)"; then \ |
134 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
135 | + && rm -rf "$(distdir)" \ |
136 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
137 | + else :; fi |
138 | +am__post_remove_distdir = $(am__remove_distdir) |
139 | am__relativize = \ |
140 | dir0=`pwd`; \ |
141 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
142 | @@ -128,7 +162,10 @@ |
143 | reldir="$$dir2" |
144 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip |
145 | GZIP_ENV = --best |
146 | +DIST_TARGETS = dist-gzip dist-zip |
147 | distuninstallcheck_listfiles = find . -type f -print |
148 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
149 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
150 | distcleancheck_listfiles = find . -type f -print |
151 | ACLOCAL = @ACLOCAL@ |
152 | AMTAR = @AMTAR@ |
153 | @@ -149,6 +186,7 @@ |
154 | CYGPATH_W = @CYGPATH_W@ |
155 | DEFS = @DEFS@ |
156 | DEPDIR = @DEPDIR@ |
157 | +DLLTOOL = @DLLTOOL@ |
158 | DSYMUTIL = @DSYMUTIL@ |
159 | DUMPBIN = @DUMPBIN@ |
160 | ECHO_C = @ECHO_C@ |
161 | @@ -173,6 +211,7 @@ |
162 | LTLIBOBJS = @LTLIBOBJS@ |
163 | LT_VERSION = @LT_VERSION@ |
164 | MAKEINFO = @MAKEINFO@ |
165 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
166 | MKDIR_P = @MKDIR_P@ |
167 | NM = @NM@ |
168 | NMEDIT = @NMEDIT@ |
169 | @@ -198,6 +237,7 @@ |
170 | abs_srcdir = @abs_srcdir@ |
171 | abs_top_builddir = @abs_top_builddir@ |
172 | abs_top_srcdir = @abs_top_srcdir@ |
173 | +ac_ct_AR = @ac_ct_AR@ |
174 | ac_ct_CC = @ac_ct_CC@ |
175 | ac_ct_CXX = @ac_ct_CXX@ |
176 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
177 | @@ -232,7 +272,6 @@ |
178 | localedir = @localedir@ |
179 | localstatedir = @localstatedir@ |
180 | mandir = @mandir@ |
181 | -mkdir_p = @mkdir_p@ |
182 | oldincludedir = @oldincludedir@ |
183 | pdfdir = @pdfdir@ |
184 | prefix = @prefix@ |
185 | @@ -293,7 +332,7 @@ |
186 | all: all-recursive |
187 | |
188 | .SUFFIXES: |
189 | -am--refresh: |
190 | +am--refresh: Makefile |
191 | @: |
192 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
193 | @for dep in $?; do \ |
194 | @@ -329,10 +368,8 @@ |
195 | $(am__aclocal_m4_deps): |
196 | |
197 | config/config.h: config/stamp-h1 |
198 | - @if test ! -f $@; then \ |
199 | - rm -f config/stamp-h1; \ |
200 | - $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \ |
201 | - else :; fi |
202 | + @if test ! -f $@; then rm -f config/stamp-h1; else :; fi |
203 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; else :; fi |
204 | |
205 | config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status |
206 | @rm -f config/stamp-h1 |
207 | @@ -363,8 +400,11 @@ |
208 | -rm -f libtool config.lt |
209 | install-pkgconfigDATA: $(pkgconfig_DATA) |
210 | @$(NORMAL_INSTALL) |
211 | - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
212 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
213 | + if test -n "$$list"; then \ |
214 | + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ |
215 | + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ |
216 | + fi; \ |
217 | for p in $$list; do \ |
218 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
219 | echo "$$d$$p"; \ |
220 | @@ -378,16 +418,14 @@ |
221 | @$(NORMAL_UNINSTALL) |
222 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
223 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
224 | - test -n "$$files" || exit 0; \ |
225 | - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
226 | - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
227 | + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) |
228 | |
229 | # This directory's subdirectories are mostly independent; you can cd |
230 | -# into them and run `make' without going through this Makefile. |
231 | -# To change the values of `make' variables: instead of editing Makefiles, |
232 | -# (1) if the variable is set in `config.status', edit `config.status' |
233 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
234 | -# (2) otherwise, pass the desired values on the `make' command line. |
235 | +# into them and run 'make' without going through this Makefile. |
236 | +# To change the values of 'make' variables: instead of editing Makefiles, |
237 | +# (1) if the variable is set in 'config.status', edit 'config.status' |
238 | +# (which will cause the Makefiles to be regenerated when you run 'make'); |
239 | +# (2) otherwise, pass the desired values on the 'make' command line. |
240 | $(RECURSIVE_TARGETS): |
241 | @fail= failcom='exit 1'; \ |
242 | for f in x $$MAKEFLAGS; do \ |
243 | @@ -451,6 +489,10 @@ |
244 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
245 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
246 | done |
247 | +cscopelist-recursive: |
248 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
249 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ |
250 | + done |
251 | |
252 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
253 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
254 | @@ -514,8 +556,32 @@ |
255 | && $(am__cd) $(top_srcdir) \ |
256 | && gtags -i $(GTAGS_ARGS) "$$here" |
257 | |
258 | +cscope: cscope.files |
259 | + test ! -s cscope.files \ |
260 | + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
261 | + |
262 | +clean-cscope: |
263 | + -rm -f cscope.files |
264 | + |
265 | +cscope.files: clean-cscope cscopelist-recursive cscopelist |
266 | + |
267 | +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) |
268 | + list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
269 | + case "$(srcdir)" in \ |
270 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
271 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
272 | + esac; \ |
273 | + for i in $$list; do \ |
274 | + if test -f "$$i"; then \ |
275 | + echo "$(subdir)/$$i"; \ |
276 | + else \ |
277 | + echo "$$sdir/$$i"; \ |
278 | + fi; \ |
279 | + done >> $(top_builddir)/cscope.files |
280 | + |
281 | distclean-tags: |
282 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
283 | + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
284 | |
285 | distdir: $(DISTFILES) |
286 | $(am__remove_distdir) |
287 | @@ -551,13 +617,10 @@ |
288 | done |
289 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
290 | if test "$$subdir" = .; then :; else \ |
291 | - test -d "$(distdir)/$$subdir" \ |
292 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
293 | - || exit 1; \ |
294 | - fi; \ |
295 | - done |
296 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
297 | - if test "$$subdir" = .; then :; else \ |
298 | + $(am__make_dryrun) \ |
299 | + || test -d "$(distdir)/$$subdir" \ |
300 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
301 | + || exit 1; \ |
302 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
303 | $(am__relativize); \ |
304 | new_distdir=$$reldir; \ |
305 | @@ -586,37 +649,35 @@ |
306 | || chmod -R a+r "$(distdir)" |
307 | dist-gzip: distdir |
308 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
309 | - $(am__remove_distdir) |
310 | + $(am__post_remove_distdir) |
311 | |
312 | dist-bzip2: distdir |
313 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
314 | - $(am__remove_distdir) |
315 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
316 | + $(am__post_remove_distdir) |
317 | |
318 | -dist-lzma: distdir |
319 | - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
320 | - $(am__remove_distdir) |
321 | +dist-lzip: distdir |
322 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
323 | + $(am__post_remove_distdir) |
324 | |
325 | dist-xz: distdir |
326 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
327 | - $(am__remove_distdir) |
328 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
329 | + $(am__post_remove_distdir) |
330 | |
331 | dist-tarZ: distdir |
332 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
333 | - $(am__remove_distdir) |
334 | + $(am__post_remove_distdir) |
335 | |
336 | dist-shar: distdir |
337 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
338 | - $(am__remove_distdir) |
339 | + $(am__post_remove_distdir) |
340 | dist-zip: distdir |
341 | -rm -f $(distdir).zip |
342 | zip -rq $(distdir).zip $(distdir) |
343 | - $(am__remove_distdir) |
344 | + $(am__post_remove_distdir) |
345 | |
346 | -dist dist-all: distdir |
347 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
348 | - -rm -f $(distdir).zip |
349 | - zip -rq $(distdir).zip $(distdir) |
350 | - $(am__remove_distdir) |
351 | +dist dist-all: |
352 | + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' |
353 | + $(am__post_remove_distdir) |
354 | |
355 | # This target untars the dist file and tries a VPATH configuration. Then |
356 | # it guarantees that the distribution is self-contained by making another |
357 | @@ -627,8 +688,8 @@ |
358 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
359 | *.tar.bz2*) \ |
360 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
361 | - *.tar.lzma*) \ |
362 | - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
363 | + *.tar.lz*) \ |
364 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
365 | *.tar.xz*) \ |
366 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
367 | *.tar.Z*) \ |
368 | @@ -648,6 +709,7 @@ |
369 | && am__cwd=`pwd` \ |
370 | && $(am__cd) $(distdir)/_build \ |
371 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
372 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
373 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
374 | && $(MAKE) $(AM_MAKEFLAGS) \ |
375 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
376 | @@ -671,13 +733,21 @@ |
377 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
378 | && cd "$$am__cwd" \ |
379 | || exit 1 |
380 | - $(am__remove_distdir) |
381 | + $(am__post_remove_distdir) |
382 | @(echo "$(distdir) archives ready for distribution: "; \ |
383 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
384 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
385 | distuninstallcheck: |
386 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
387 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
388 | + @test -n '$(distuninstallcheck_dir)' || { \ |
389 | + echo 'ERROR: trying to run $@ with an empty' \ |
390 | + '$$(distuninstallcheck_dir)' >&2; \ |
391 | + exit 1; \ |
392 | + }; \ |
393 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
394 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
395 | + exit 1; \ |
396 | + }; \ |
397 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
398 | || { echo "ERROR: files left after uninstall:" ; \ |
399 | if test -n "$(DESTDIR)"; then \ |
400 | echo " (check DESTDIR support)"; \ |
401 | @@ -711,10 +781,15 @@ |
402 | |
403 | installcheck: installcheck-recursive |
404 | install-strip: |
405 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
406 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
407 | - `test -z '$(STRIP)' || \ |
408 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
409 | + if test -z '$(STRIP)'; then \ |
410 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
411 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
412 | + install; \ |
413 | + else \ |
414 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
415 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
416 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
417 | + fi |
418 | mostlyclean-generic: |
419 | -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) |
420 | |
421 | @@ -800,14 +875,16 @@ |
422 | |
423 | uninstall-am: uninstall-pkgconfigDATA |
424 | |
425 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ |
426 | - install-am install-strip tags-recursive |
427 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ |
428 | + cscopelist-recursive ctags-recursive install-am install-strip \ |
429 | + tags-recursive |
430 | |
431 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
432 | - all all-am am--refresh check check-am clean clean-generic \ |
433 | - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
434 | - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
435 | - distcheck distclean distclean-generic distclean-hdr \ |
436 | + all all-am am--refresh check check-am clean clean-cscope \ |
437 | + clean-generic clean-libtool cscope cscopelist \ |
438 | + cscopelist-recursive ctags ctags-recursive dist dist-all \ |
439 | + dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ |
440 | + dist-zip distcheck distclean distclean-generic distclean-hdr \ |
441 | distclean-libtool distclean-tags distcleancheck distdir \ |
442 | distuninstallcheck dvi dvi-am html html-am info info-am \ |
443 | install install-am install-data install-data-am install-dvi \ |
444 | |
445 | === modified file 'NEWS' |
446 | --- NEWS 2010-05-12 20:21:46 +0000 |
447 | +++ NEWS 2013-02-20 19:26:35 +0000 |
448 | @@ -1,3 +1,11 @@ |
449 | +Release 1.1.2 -- Octobre 4 2012 |
450 | +------------------------------ |
451 | +- Fixed: Use @libdir@ for generation of libcpptest.pc (#3566605) |
452 | + Thanks for the patch to Dagobert Michelsen. |
453 | +- Fixed: Respect --htmldir |
454 | + Thanks for the patch to Robert Buchholz. |
455 | +- Note: soname remaining at 0:7:0 |
456 | + |
457 | Release 1.1.1 -- March 26 2010 |
458 | ------------------------------ |
459 | - Fixed: Suite no longer successful with uncaught exceptions (#2976484) |
460 | |
461 | === modified file 'README' |
462 | --- README 2010-05-12 20:21:46 +0000 |
463 | +++ README 2013-02-20 19:26:35 +0000 |
464 | @@ -11,7 +11,7 @@ |
465 | General information |
466 | =================== |
467 | |
468 | -This is CppTest version 1.1.1. CppTest is a portable and powerful, yet |
469 | +This is CppTest version 1.1.2. CppTest is a portable and powerful, yet |
470 | simple, unit testing framework for handling automated tests in C++. The focus |
471 | lies on usability and extendability. Several output formats are supported and |
472 | new ones are easily added. |
473 | |
474 | === modified file 'aclocal.m4' |
475 | --- aclocal.m4 2010-05-12 20:21:46 +0000 |
476 | +++ aclocal.m4 2013-02-20 19:26:35 +0000 |
477 | @@ -1,7 +1,7 @@ |
478 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
479 | - |
480 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
481 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
482 | +# generated automatically by aclocal 1.12.1 -*- Autoconf -*- |
483 | + |
484 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
485 | + |
486 | # This file is free software; the Free Software Foundation |
487 | # gives unlimited permission to copy and/or distribute it, |
488 | # with or without modifications, as long as this notice is preserved. |
489 | @@ -13,16 +13,17 @@ |
490 | |
491 | m4_ifndef([AC_AUTOCONF_VERSION], |
492 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
493 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
494 | -[m4_warning([this file was generated for autoconf 2.65. |
495 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
496 | +[m4_warning([this file was generated for autoconf 2.69. |
497 | You have another version of autoconf. It may work, but is not guaranteed to. |
498 | If you have problems, you may need to regenerate the build system entirely. |
499 | -To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
500 | +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
501 | |
502 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
503 | # |
504 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
505 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
506 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
507 | +# Foundation, Inc. |
508 | # Written by Gordon Matzigkeit, 1996 |
509 | # |
510 | # This file is free software; the Free Software Foundation gives |
511 | @@ -31,7 +32,8 @@ |
512 | |
513 | m4_define([_LT_COPYING], [dnl |
514 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
515 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
516 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
517 | +# Foundation, Inc. |
518 | # Written by Gordon Matzigkeit, 1996 |
519 | # |
520 | # This file is part of GNU Libtool. |
521 | @@ -58,7 +60,7 @@ |
522 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
523 | ]) |
524 | |
525 | -# serial 56 LT_INIT |
526 | +# serial 57 LT_INIT |
527 | |
528 | |
529 | # LT_PREREQ(VERSION) |
530 | @@ -165,6 +167,8 @@ |
531 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
532 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
533 | |
534 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
535 | +dnl |
536 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
537 | _LT_DECL([], [host], [0])dnl |
538 | _LT_DECL([], [host_os], [0])dnl |
539 | @@ -187,10 +191,13 @@ |
540 | dnl |
541 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
542 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
543 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl |
544 | m4_require([_LT_CMD_RELOAD])dnl |
545 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
546 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl |
547 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
548 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
549 | +m4_require([_LT_WITH_SYSROOT])dnl |
550 | |
551 | _LT_CONFIG_LIBTOOL_INIT([ |
552 | # See if we are running on zsh, and set the options which allow our |
553 | @@ -647,7 +654,7 @@ |
554 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
555 | configured by $[0], generated by m4_PACKAGE_STRING. |
556 | |
557 | -Copyright (C) 2009 Free Software Foundation, Inc. |
558 | +Copyright (C) 2011 Free Software Foundation, Inc. |
559 | This config.lt script is free software; the Free Software Foundation |
560 | gives unlimited permision to copy, distribute and modify it." |
561 | |
562 | @@ -761,15 +768,12 @@ |
563 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
564 | # text mode, it properly converts lines to CR/LF. This bash problem |
565 | # is reportedly fixed, but why not run on old versions too? |
566 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
567 | - || (rm -f "$cfgfile"; exit 1) |
568 | - |
569 | - _LT_PROG_XSI_SHELLFNS |
570 | - |
571 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
572 | - || (rm -f "$cfgfile"; exit 1) |
573 | - |
574 | - mv -f "$cfgfile" "$ofile" || |
575 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
576 | + || (rm -f "$cfgfile"; exit 1) |
577 | + |
578 | + _LT_PROG_REPLACE_SHELLFNS |
579 | + |
580 | + mv -f "$cfgfile" "$ofile" || |
581 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
582 | chmod +x "$ofile" |
583 | ], |
584 | @@ -814,6 +818,7 @@ |
585 | m4_case([$1], |
586 | [C], [_LT_LANG(C)], |
587 | [C++], [_LT_LANG(CXX)], |
588 | + [Go], [_LT_LANG(GO)], |
589 | [Java], [_LT_LANG(GCJ)], |
590 | [Fortran 77], [_LT_LANG(F77)], |
591 | [Fortran], [_LT_LANG(FC)], |
592 | @@ -835,6 +840,29 @@ |
593 | ])# _LT_LANG |
594 | |
595 | |
596 | +m4_ifndef([AC_PROG_GO], [ |
597 | +# NOTE: This macro has been submitted for inclusion into # |
598 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
599 | +# a released version of Autoconf we should remove this # |
600 | +# macro and use it instead. # |
601 | +m4_defun([AC_PROG_GO], |
602 | +[AC_LANG_PUSH(Go)dnl |
603 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
604 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
605 | +_AC_ARG_VAR_LDFLAGS()dnl |
606 | +AC_CHECK_TOOL(GOC, gccgo) |
607 | +if test -z "$GOC"; then |
608 | + if test -n "$ac_tool_prefix"; then |
609 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
610 | + fi |
611 | +fi |
612 | +if test -z "$GOC"; then |
613 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
614 | +fi |
615 | +])#m4_defun |
616 | +])#m4_ifndef |
617 | + |
618 | + |
619 | # _LT_LANG_DEFAULT_CONFIG |
620 | # ----------------------- |
621 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
622 | @@ -865,6 +893,10 @@ |
623 | m4_ifdef([LT_PROG_GCJ], |
624 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
625 | |
626 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
627 | + [LT_LANG(GO)], |
628 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
629 | + |
630 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
631 | [LT_LANG(RC)], |
632 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
633 | @@ -967,7 +999,13 @@ |
634 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
635 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
636 | _lt_result=$? |
637 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
638 | + # If there is a non-empty error log, and "single_module" |
639 | + # appears in it, assume the flag caused a linker warning |
640 | + if test -s conftest.err && $GREP single_module conftest.err; then |
641 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
642 | + # Otherwise, if the output was created with a 0 exit code from |
643 | + # the compiler, it worked. |
644 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
645 | lt_cv_apple_cc_single_mod=yes |
646 | else |
647 | cat conftest.err >&AS_MESSAGE_LOG_FD |
648 | @@ -975,6 +1013,7 @@ |
649 | rm -rf libconftest.dylib* |
650 | rm -f conftest.* |
651 | fi]) |
652 | + |
653 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
654 | [lt_cv_ld_exported_symbols_list], |
655 | [lt_cv_ld_exported_symbols_list=no |
656 | @@ -986,6 +1025,34 @@ |
657 | [lt_cv_ld_exported_symbols_list=no]) |
658 | LDFLAGS="$save_LDFLAGS" |
659 | ]) |
660 | + |
661 | + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
662 | + [lt_cv_ld_force_load=no |
663 | + cat > conftest.c << _LT_EOF |
664 | +int forced_loaded() { return 2;} |
665 | +_LT_EOF |
666 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD |
667 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
668 | + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
669 | + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
670 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
671 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
672 | + cat > conftest.c << _LT_EOF |
673 | +int main() { return 0;} |
674 | +_LT_EOF |
675 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
676 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
677 | + _lt_result=$? |
678 | + if test -s conftest.err && $GREP force_load conftest.err; then |
679 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
680 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
681 | + lt_cv_ld_force_load=yes |
682 | + else |
683 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
684 | + fi |
685 | + rm -f conftest.err libconftest.a conftest conftest.c |
686 | + rm -rf conftest.dSYM |
687 | + ]) |
688 | case $host_os in |
689 | rhapsody* | darwin1.[[012]]) |
690 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
691 | @@ -1013,7 +1080,7 @@ |
692 | else |
693 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
694 | fi |
695 | - if test "$DSYMUTIL" != ":"; then |
696 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
697 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
698 | else |
699 | _lt_dsymutil= |
700 | @@ -1023,8 +1090,8 @@ |
701 | ]) |
702 | |
703 | |
704 | -# _LT_DARWIN_LINKER_FEATURES |
705 | -# -------------------------- |
706 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
707 | +# --------------------------------- |
708 | # Checks for linker and compiler features on darwin |
709 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
710 | [ |
711 | @@ -1033,7 +1100,13 @@ |
712 | _LT_TAGVAR(hardcode_direct, $1)=no |
713 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
714 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
715 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
716 | + if test "$lt_cv_ld_force_load" = "yes"; then |
717 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
718 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
719 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
720 | + else |
721 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
722 | + fi |
723 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
724 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
725 | case $cc_basename in |
726 | @@ -1057,30 +1130,41 @@ |
727 | fi |
728 | ]) |
729 | |
730 | -# _LT_SYS_MODULE_PATH_AIX |
731 | -# ----------------------- |
732 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
733 | +# ---------------------------------- |
734 | # Links a minimal program and checks the executable |
735 | # for the system default hardcoded library path. In most cases, |
736 | # this is /usr/lib:/lib, but when the MPI compilers are used |
737 | # the location of the communication and MPI libs are included too. |
738 | # If we don't find anything, use the default library path according |
739 | # to the aix ld manual. |
740 | +# Store the results from the different compilers for each TAGNAME. |
741 | +# Allow to override them for all tags through lt_cv_aix_libpath. |
742 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
743 | [m4_require([_LT_DECL_SED])dnl |
744 | -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
745 | -lt_aix_libpath_sed=' |
746 | - /Import File Strings/,/^$/ { |
747 | - /^0/ { |
748 | - s/^0 *\(.*\)$/\1/ |
749 | - p |
750 | - } |
751 | - }' |
752 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
753 | -# Check for a 64-bit object if we didn't find anything. |
754 | -if test -z "$aix_libpath"; then |
755 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
756 | -fi],[]) |
757 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
758 | +if test "${lt_cv_aix_libpath+set}" = set; then |
759 | + aix_libpath=$lt_cv_aix_libpath |
760 | +else |
761 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
762 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
763 | + lt_aix_libpath_sed='[ |
764 | + /Import File Strings/,/^$/ { |
765 | + /^0/ { |
766 | + s/^0 *\([^ ]*\) *$/\1/ |
767 | + p |
768 | + } |
769 | + }]' |
770 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
771 | + # Check for a 64-bit object if we didn't find anything. |
772 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
773 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
774 | + fi],[]) |
775 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
776 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" |
777 | + fi |
778 | + ]) |
779 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) |
780 | +fi |
781 | ])# _LT_SYS_MODULE_PATH_AIX |
782 | |
783 | |
784 | @@ -1105,7 +1189,7 @@ |
785 | |
786 | AC_MSG_CHECKING([how to print strings]) |
787 | # Test print first, because it will be a builtin if present. |
788 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
789 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
790 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
791 | ECHO='print -r --' |
792 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
793 | @@ -1149,6 +1233,39 @@ |
794 | ])# _LT_PROG_ECHO_BACKSLASH |
795 | |
796 | |
797 | +# _LT_WITH_SYSROOT |
798 | +# ---------------- |
799 | +AC_DEFUN([_LT_WITH_SYSROOT], |
800 | +[AC_MSG_CHECKING([for sysroot]) |
801 | +AC_ARG_WITH([sysroot], |
802 | +[ --with-sysroot[=DIR] Search for dependent libraries within DIR |
803 | + (or the compiler's sysroot if not specified).], |
804 | +[], [with_sysroot=no]) |
805 | + |
806 | +dnl lt_sysroot will always be passed unquoted. We quote it here |
807 | +dnl in case the user passed a directory name. |
808 | +lt_sysroot= |
809 | +case ${with_sysroot} in #( |
810 | + yes) |
811 | + if test "$GCC" = yes; then |
812 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
813 | + fi |
814 | + ;; #( |
815 | + /*) |
816 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
817 | + ;; #( |
818 | + no|'') |
819 | + ;; #( |
820 | + *) |
821 | + AC_MSG_RESULT([${with_sysroot}]) |
822 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) |
823 | + ;; |
824 | +esac |
825 | + |
826 | + AC_MSG_RESULT([${lt_sysroot:-no}]) |
827 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl |
828 | +[dependent libraries, and in which our libraries should be installed.])]) |
829 | + |
830 | # _LT_ENABLE_LOCK |
831 | # --------------- |
832 | m4_defun([_LT_ENABLE_LOCK], |
833 | @@ -1177,7 +1294,7 @@ |
834 | ;; |
835 | *-*-irix6*) |
836 | # Find out which ABI we are using. |
837 | - echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
838 | + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
839 | if AC_TRY_EVAL(ac_compile); then |
840 | if test "$lt_cv_prog_gnu_ld" = yes; then |
841 | case `/usr/bin/file conftest.$ac_objext` in |
842 | @@ -1270,14 +1387,27 @@ |
843 | CFLAGS="$SAVE_CFLAGS" |
844 | fi |
845 | ;; |
846 | -sparc*-*solaris*) |
847 | +*-*solaris*) |
848 | # Find out which ABI we are using. |
849 | echo 'int i;' > conftest.$ac_ext |
850 | if AC_TRY_EVAL(ac_compile); then |
851 | case `/usr/bin/file conftest.o` in |
852 | *64-bit*) |
853 | case $lt_cv_prog_gnu_ld in |
854 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
855 | + yes*) |
856 | + case $host in |
857 | + i?86-*-solaris*) |
858 | + LD="${LD-ld} -m elf_x86_64" |
859 | + ;; |
860 | + sparc*-*-solaris*) |
861 | + LD="${LD-ld} -m elf64_sparc" |
862 | + ;; |
863 | + esac |
864 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
865 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
866 | + LD="${LD-ld}_sol2" |
867 | + fi |
868 | + ;; |
869 | *) |
870 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
871 | LD="${LD-ld} -64" |
872 | @@ -1295,14 +1425,47 @@ |
873 | ])# _LT_ENABLE_LOCK |
874 | |
875 | |
876 | +# _LT_PROG_AR |
877 | +# ----------- |
878 | +m4_defun([_LT_PROG_AR], |
879 | +[AC_CHECK_TOOLS(AR, [ar], false) |
880 | +: ${AR=ar} |
881 | +: ${AR_FLAGS=cru} |
882 | +_LT_DECL([], [AR], [1], [The archiver]) |
883 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
884 | + |
885 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], |
886 | + [lt_cv_ar_at_file=no |
887 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], |
888 | + [echo conftest.$ac_objext > conftest.lst |
889 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' |
890 | + AC_TRY_EVAL([lt_ar_try]) |
891 | + if test "$ac_status" -eq 0; then |
892 | + # Ensure the archiver fails upon bogus file names. |
893 | + rm -f conftest.$ac_objext libconftest.a |
894 | + AC_TRY_EVAL([lt_ar_try]) |
895 | + if test "$ac_status" -ne 0; then |
896 | + lt_cv_ar_at_file=@ |
897 | + fi |
898 | + fi |
899 | + rm -f conftest.* libconftest.a |
900 | + ]) |
901 | + ]) |
902 | + |
903 | +if test "x$lt_cv_ar_at_file" = xno; then |
904 | + archiver_list_spec= |
905 | +else |
906 | + archiver_list_spec=$lt_cv_ar_at_file |
907 | +fi |
908 | +_LT_DECL([], [archiver_list_spec], [1], |
909 | + [How to feed a file listing to the archiver]) |
910 | +])# _LT_PROG_AR |
911 | + |
912 | + |
913 | # _LT_CMD_OLD_ARCHIVE |
914 | # ------------------- |
915 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
916 | -[AC_CHECK_TOOL(AR, ar, false) |
917 | -test -z "$AR" && AR=ar |
918 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
919 | -_LT_DECL([], [AR], [1], [The archiver]) |
920 | -_LT_DECL([], [AR_FLAGS], [1]) |
921 | +[_LT_PROG_AR |
922 | |
923 | AC_CHECK_TOOL(STRIP, strip, :) |
924 | test -z "$STRIP" && STRIP=: |
925 | @@ -1321,13 +1484,13 @@ |
926 | if test -n "$RANLIB"; then |
927 | case $host_os in |
928 | openbsd*) |
929 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
930 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
931 | ;; |
932 | *) |
933 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
934 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
935 | ;; |
936 | esac |
937 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
938 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
939 | fi |
940 | |
941 | case $host_os in |
942 | @@ -1366,11 +1529,11 @@ |
943 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
944 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
945 | -e 's:$: $lt_compiler_flag:'` |
946 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
947 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
948 | (eval "$lt_compile" 2>conftest.err) |
949 | ac_status=$? |
950 | cat conftest.err >&AS_MESSAGE_LOG_FD |
951 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
952 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
953 | if (exit $ac_status) && test -s "$ac_outfile"; then |
954 | # The compiler can only warn and ignore the option if not recognized |
955 | # So say no if there are warnings other than the usual output. |
956 | @@ -1507,6 +1670,11 @@ |
957 | lt_cv_sys_max_cmd_len=196608 |
958 | ;; |
959 | |
960 | + os2*) |
961 | + # The test takes a long time on OS/2. |
962 | + lt_cv_sys_max_cmd_len=8192 |
963 | + ;; |
964 | + |
965 | osf*) |
966 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
967 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
968 | @@ -1546,7 +1714,7 @@ |
969 | # If test is not a shell built-in, we'll probably end up computing a |
970 | # maximum length that is only half of the actual maximum length, but |
971 | # we can't tell. |
972 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
973 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
974 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
975 | test $i != 17 # 1/2 MB should be enough |
976 | do |
977 | @@ -1598,7 +1766,7 @@ |
978 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
979 | lt_status=$lt_dlunknown |
980 | cat > conftest.$ac_ext <<_LT_EOF |
981 | -[#line __oline__ "configure" |
982 | +[#line $LINENO "configure" |
983 | #include "confdefs.h" |
984 | |
985 | #if HAVE_DLFCN_H |
986 | @@ -1639,7 +1807,13 @@ |
987 | # endif |
988 | #endif |
989 | |
990 | -void fnord() { int i=42;} |
991 | +/* When -fvisbility=hidden is used, assume the code has been annotated |
992 | + correspondingly for the symbols needed. */ |
993 | +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
994 | +int fnord () __attribute__((visibility("default"))); |
995 | +#endif |
996 | + |
997 | +int fnord () { return 42; } |
998 | int main () |
999 | { |
1000 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
1001 | @@ -1648,7 +1822,11 @@ |
1002 | if (self) |
1003 | { |
1004 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
1005 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
1006 | + else |
1007 | + { |
1008 | + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
1009 | + else puts (dlerror ()); |
1010 | + } |
1011 | /* dlclose (self); */ |
1012 | } |
1013 | else |
1014 | @@ -1824,11 +2002,11 @@ |
1015 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1016 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
1017 | -e 's:$: $lt_compiler_flag:'` |
1018 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
1019 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
1020 | (eval "$lt_compile" 2>out/conftest.err) |
1021 | ac_status=$? |
1022 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
1023 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
1024 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
1025 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1026 | then |
1027 | # The compiler can only warn and ignore the option if not recognized |
1028 | @@ -2082,7 +2260,7 @@ |
1029 | |
1030 | case $host_os in |
1031 | aix3*) |
1032 | - version_type=linux |
1033 | + version_type=linux # correct to gnu/linux during the next big refactor |
1034 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
1035 | shlibpath_var=LIBPATH |
1036 | |
1037 | @@ -2091,7 +2269,7 @@ |
1038 | ;; |
1039 | |
1040 | aix[[4-9]]*) |
1041 | - version_type=linux |
1042 | + version_type=linux # correct to gnu/linux during the next big refactor |
1043 | need_lib_prefix=no |
1044 | need_version=no |
1045 | hardcode_into_libs=yes |
1046 | @@ -2156,7 +2334,7 @@ |
1047 | ;; |
1048 | |
1049 | bsdi[[45]]*) |
1050 | - version_type=linux |
1051 | + version_type=linux # correct to gnu/linux during the next big refactor |
1052 | need_version=no |
1053 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1054 | soname_spec='${libname}${release}${shared_ext}$major' |
1055 | @@ -2175,8 +2353,9 @@ |
1056 | need_version=no |
1057 | need_lib_prefix=no |
1058 | |
1059 | - case $GCC,$host_os in |
1060 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
1061 | + case $GCC,$cc_basename in |
1062 | + yes,*) |
1063 | + # gcc |
1064 | library_names_spec='$libname.dll.a' |
1065 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
1066 | postinstall_cmds='base_file=`basename \${file}`~ |
1067 | @@ -2209,13 +2388,71 @@ |
1068 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1069 | ;; |
1070 | esac |
1071 | + dynamic_linker='Win32 ld.exe' |
1072 | + ;; |
1073 | + |
1074 | + *,cl*) |
1075 | + # Native MSVC |
1076 | + libname_spec='$name' |
1077 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1078 | + library_names_spec='${libname}.dll.lib' |
1079 | + |
1080 | + case $build_os in |
1081 | + mingw*) |
1082 | + sys_lib_search_path_spec= |
1083 | + lt_save_ifs=$IFS |
1084 | + IFS=';' |
1085 | + for lt_path in $LIB |
1086 | + do |
1087 | + IFS=$lt_save_ifs |
1088 | + # Let DOS variable expansion print the short 8.3 style file name. |
1089 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
1090 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
1091 | + done |
1092 | + IFS=$lt_save_ifs |
1093 | + # Convert to MSYS style. |
1094 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` |
1095 | + ;; |
1096 | + cygwin*) |
1097 | + # Convert to unix form, then to dos form, then back to unix form |
1098 | + # but this time dos style (no spaces!) so that the unix form looks |
1099 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
1100 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
1101 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
1102 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1103 | + ;; |
1104 | + *) |
1105 | + sys_lib_search_path_spec="$LIB" |
1106 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
1107 | + # It is most probably a Windows format PATH. |
1108 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
1109 | + else |
1110 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
1111 | + fi |
1112 | + # FIXME: find the short name or the path components, as spaces are |
1113 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
1114 | + ;; |
1115 | + esac |
1116 | + |
1117 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
1118 | + postinstall_cmds='base_file=`basename \${file}`~ |
1119 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
1120 | + dldir=$destdir/`dirname \$dlpath`~ |
1121 | + test -d \$dldir || mkdir -p \$dldir~ |
1122 | + $install_prog $dir/$dlname \$dldir/$dlname' |
1123 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
1124 | + dlpath=$dir/\$dldll~ |
1125 | + $RM \$dlpath' |
1126 | + shlibpath_overrides_runpath=yes |
1127 | + dynamic_linker='Win32 link.exe' |
1128 | ;; |
1129 | |
1130 | *) |
1131 | + # Assume MSVC wrapper |
1132 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
1133 | + dynamic_linker='Win32 ld.exe' |
1134 | ;; |
1135 | esac |
1136 | - dynamic_linker='Win32 ld.exe' |
1137 | # FIXME: first we should search . and the directory the executable is in |
1138 | shlibpath_var=PATH |
1139 | ;; |
1140 | @@ -2236,7 +2473,7 @@ |
1141 | ;; |
1142 | |
1143 | dgux*) |
1144 | - version_type=linux |
1145 | + version_type=linux # correct to gnu/linux during the next big refactor |
1146 | need_lib_prefix=no |
1147 | need_version=no |
1148 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
1149 | @@ -2244,10 +2481,6 @@ |
1150 | shlibpath_var=LD_LIBRARY_PATH |
1151 | ;; |
1152 | |
1153 | -freebsd1*) |
1154 | - dynamic_linker=no |
1155 | - ;; |
1156 | - |
1157 | freebsd* | dragonfly*) |
1158 | # DragonFly does not have aout. When/if they implement a new |
1159 | # versioning mechanism, adjust this. |
1160 | @@ -2255,7 +2488,7 @@ |
1161 | objformat=`/usr/bin/objformat` |
1162 | else |
1163 | case $host_os in |
1164 | - freebsd[[123]]*) objformat=aout ;; |
1165 | + freebsd[[23]].*) objformat=aout ;; |
1166 | *) objformat=elf ;; |
1167 | esac |
1168 | fi |
1169 | @@ -2286,7 +2519,7 @@ |
1170 | esac |
1171 | shlibpath_var=LD_LIBRARY_PATH |
1172 | case $host_os in |
1173 | - freebsd2*) |
1174 | + freebsd2.*) |
1175 | shlibpath_overrides_runpath=yes |
1176 | ;; |
1177 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
1178 | @@ -2306,12 +2539,26 @@ |
1179 | ;; |
1180 | |
1181 | gnu*) |
1182 | - version_type=linux |
1183 | + version_type=linux # correct to gnu/linux during the next big refactor |
1184 | need_lib_prefix=no |
1185 | need_version=no |
1186 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1187 | soname_spec='${libname}${release}${shared_ext}$major' |
1188 | shlibpath_var=LD_LIBRARY_PATH |
1189 | + shlibpath_overrides_runpath=no |
1190 | + hardcode_into_libs=yes |
1191 | + ;; |
1192 | + |
1193 | +haiku*) |
1194 | + version_type=linux # correct to gnu/linux during the next big refactor |
1195 | + need_lib_prefix=no |
1196 | + need_version=no |
1197 | + dynamic_linker="$host_os runtime_loader" |
1198 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1199 | + soname_spec='${libname}${release}${shared_ext}$major' |
1200 | + shlibpath_var=LIBRARY_PATH |
1201 | + shlibpath_overrides_runpath=yes |
1202 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
1203 | hardcode_into_libs=yes |
1204 | ;; |
1205 | |
1206 | @@ -2364,7 +2611,7 @@ |
1207 | ;; |
1208 | |
1209 | interix[[3-9]]*) |
1210 | - version_type=linux |
1211 | + version_type=linux # correct to gnu/linux during the next big refactor |
1212 | need_lib_prefix=no |
1213 | need_version=no |
1214 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1215 | @@ -2380,7 +2627,7 @@ |
1216 | nonstopux*) version_type=nonstopux ;; |
1217 | *) |
1218 | if test "$lt_cv_prog_gnu_ld" = yes; then |
1219 | - version_type=linux |
1220 | + version_type=linux # correct to gnu/linux during the next big refactor |
1221 | else |
1222 | version_type=irix |
1223 | fi ;; |
1224 | @@ -2417,9 +2664,9 @@ |
1225 | dynamic_linker=no |
1226 | ;; |
1227 | |
1228 | -# This must be Linux ELF. |
1229 | +# This must be glibc/ELF. |
1230 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1231 | - version_type=linux |
1232 | + version_type=linux # correct to gnu/linux during the next big refactor |
1233 | need_lib_prefix=no |
1234 | need_version=no |
1235 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1236 | @@ -2482,7 +2729,7 @@ |
1237 | ;; |
1238 | |
1239 | newsos6) |
1240 | - version_type=linux |
1241 | + version_type=linux # correct to gnu/linux during the next big refactor |
1242 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1243 | shlibpath_var=LD_LIBRARY_PATH |
1244 | shlibpath_overrides_runpath=yes |
1245 | @@ -2551,7 +2798,7 @@ |
1246 | ;; |
1247 | |
1248 | solaris*) |
1249 | - version_type=linux |
1250 | + version_type=linux # correct to gnu/linux during the next big refactor |
1251 | need_lib_prefix=no |
1252 | need_version=no |
1253 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1254 | @@ -2576,7 +2823,7 @@ |
1255 | ;; |
1256 | |
1257 | sysv4 | sysv4.3*) |
1258 | - version_type=linux |
1259 | + version_type=linux # correct to gnu/linux during the next big refactor |
1260 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1261 | soname_spec='${libname}${release}${shared_ext}$major' |
1262 | shlibpath_var=LD_LIBRARY_PATH |
1263 | @@ -2600,7 +2847,7 @@ |
1264 | |
1265 | sysv4*MP*) |
1266 | if test -d /usr/nec ;then |
1267 | - version_type=linux |
1268 | + version_type=linux # correct to gnu/linux during the next big refactor |
1269 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
1270 | soname_spec='$libname${shared_ext}.$major' |
1271 | shlibpath_var=LD_LIBRARY_PATH |
1272 | @@ -2631,7 +2878,7 @@ |
1273 | |
1274 | tpf*) |
1275 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
1276 | - version_type=linux |
1277 | + version_type=linux # correct to gnu/linux during the next big refactor |
1278 | need_lib_prefix=no |
1279 | need_version=no |
1280 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1281 | @@ -2641,7 +2888,7 @@ |
1282 | ;; |
1283 | |
1284 | uts4*) |
1285 | - version_type=linux |
1286 | + version_type=linux # correct to gnu/linux during the next big refactor |
1287 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1288 | soname_spec='${libname}${release}${shared_ext}$major' |
1289 | shlibpath_var=LD_LIBRARY_PATH |
1290 | @@ -2919,6 +3166,11 @@ |
1291 | esac |
1292 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
1293 | case $host_os in |
1294 | + cygwin* | mingw* | pw32* | cegcc*) |
1295 | + if test "$GCC" != yes; then |
1296 | + reload_cmds=false |
1297 | + fi |
1298 | + ;; |
1299 | darwin*) |
1300 | if test "$GCC" = yes; then |
1301 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
1302 | @@ -2980,11 +3232,13 @@ |
1303 | # Base MSYS/MinGW do not provide the 'file' command needed by |
1304 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
1305 | # unless we find 'file', for example because we are cross-compiling. |
1306 | - if ( file / ) >/dev/null 2>&1; then |
1307 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
1308 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
1309 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
1310 | lt_cv_file_magic_cmd='func_win32_libid' |
1311 | else |
1312 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
1313 | + # Keep this pattern in sync with the one in func_win32_libid. |
1314 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
1315 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
1316 | fi |
1317 | ;; |
1318 | @@ -3019,6 +3273,10 @@ |
1319 | lt_cv_deplibs_check_method=pass_all |
1320 | ;; |
1321 | |
1322 | +haiku*) |
1323 | + lt_cv_deplibs_check_method=pass_all |
1324 | + ;; |
1325 | + |
1326 | hpux10.20* | hpux11*) |
1327 | lt_cv_file_magic_cmd=/usr/bin/file |
1328 | case $host_cpu in |
1329 | @@ -3052,7 +3310,7 @@ |
1330 | lt_cv_deplibs_check_method=pass_all |
1331 | ;; |
1332 | |
1333 | -# This must be Linux ELF. |
1334 | +# This must be glibc/ELF. |
1335 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1336 | lt_cv_deplibs_check_method=pass_all |
1337 | ;; |
1338 | @@ -3131,6 +3389,21 @@ |
1339 | ;; |
1340 | esac |
1341 | ]) |
1342 | + |
1343 | +file_magic_glob= |
1344 | +want_nocaseglob=no |
1345 | +if test "$build" = "$host"; then |
1346 | + case $host_os in |
1347 | + mingw* | pw32*) |
1348 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
1349 | + want_nocaseglob=yes |
1350 | + else |
1351 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` |
1352 | + fi |
1353 | + ;; |
1354 | + esac |
1355 | +fi |
1356 | + |
1357 | file_magic_cmd=$lt_cv_file_magic_cmd |
1358 | deplibs_check_method=$lt_cv_deplibs_check_method |
1359 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
1360 | @@ -3138,7 +3411,11 @@ |
1361 | _LT_DECL([], [deplibs_check_method], [1], |
1362 | [Method to check whether dependent libraries are shared objects]) |
1363 | _LT_DECL([], [file_magic_cmd], [1], |
1364 | - [Command to use when deplibs_check_method == "file_magic"]) |
1365 | + [Command to use when deplibs_check_method = "file_magic"]) |
1366 | +_LT_DECL([], [file_magic_glob], [1], |
1367 | + [How to find potential files when deplibs_check_method = "file_magic"]) |
1368 | +_LT_DECL([], [want_nocaseglob], [1], |
1369 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) |
1370 | ])# _LT_CHECK_MAGIC_METHOD |
1371 | |
1372 | |
1373 | @@ -3220,13 +3497,13 @@ |
1374 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
1375 | [lt_cv_nm_interface="BSD nm" |
1376 | echo "int some_variable = 0;" > conftest.$ac_ext |
1377 | - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
1378 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
1379 | (eval "$ac_compile" 2>conftest.err) |
1380 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1381 | - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
1382 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
1383 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
1384 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1385 | - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) |
1386 | + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
1387 | cat conftest.out >&AS_MESSAGE_LOG_FD |
1388 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
1389 | lt_cv_nm_interface="MS dumpbin" |
1390 | @@ -3241,6 +3518,67 @@ |
1391 | dnl AC_DEFUN([AM_PROG_NM], []) |
1392 | dnl AC_DEFUN([AC_PROG_NM], []) |
1393 | |
1394 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
1395 | +# -------------------------------- |
1396 | +# how to determine the name of the shared library |
1397 | +# associated with a specific link library. |
1398 | +# -- PORTME fill in with the dynamic library characteristics |
1399 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], |
1400 | +[m4_require([_LT_DECL_EGREP]) |
1401 | +m4_require([_LT_DECL_OBJDUMP]) |
1402 | +m4_require([_LT_DECL_DLLTOOL]) |
1403 | +AC_CACHE_CHECK([how to associate runtime and link libraries], |
1404 | +lt_cv_sharedlib_from_linklib_cmd, |
1405 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' |
1406 | + |
1407 | +case $host_os in |
1408 | +cygwin* | mingw* | pw32* | cegcc*) |
1409 | + # two different shell functions defined in ltmain.sh |
1410 | + # decide which to use based on capabilities of $DLLTOOL |
1411 | + case `$DLLTOOL --help 2>&1` in |
1412 | + *--identify-strict*) |
1413 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
1414 | + ;; |
1415 | + *) |
1416 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
1417 | + ;; |
1418 | + esac |
1419 | + ;; |
1420 | +*) |
1421 | + # fallback: assume linklib IS sharedlib |
1422 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
1423 | + ;; |
1424 | +esac |
1425 | +]) |
1426 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
1427 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
1428 | + |
1429 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], |
1430 | + [Command to associate shared and link libraries]) |
1431 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
1432 | + |
1433 | + |
1434 | +# _LT_PATH_MANIFEST_TOOL |
1435 | +# ---------------------- |
1436 | +# locate the manifest tool |
1437 | +m4_defun([_LT_PATH_MANIFEST_TOOL], |
1438 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) |
1439 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
1440 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], |
1441 | + [lt_cv_path_mainfest_tool=no |
1442 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD |
1443 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
1444 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1445 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
1446 | + lt_cv_path_mainfest_tool=yes |
1447 | + fi |
1448 | + rm -f conftest*]) |
1449 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
1450 | + MANIFEST_TOOL=: |
1451 | +fi |
1452 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl |
1453 | +])# _LT_PATH_MANIFEST_TOOL |
1454 | + |
1455 | |
1456 | # LT_LIB_M |
1457 | # -------- |
1458 | @@ -3249,7 +3587,7 @@ |
1459 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1460 | LIBM= |
1461 | case $host in |
1462 | -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) |
1463 | +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
1464 | # These system don't have libm, or don't need it |
1465 | ;; |
1466 | *-ncr-sysv4.3*) |
1467 | @@ -3277,7 +3615,12 @@ |
1468 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
1469 | |
1470 | if test "$GCC" = yes; then |
1471 | - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' |
1472 | + case $cc_basename in |
1473 | + nvcc*) |
1474 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; |
1475 | + *) |
1476 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; |
1477 | + esac |
1478 | |
1479 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
1480 | lt_cv_prog_compiler_rtti_exceptions, |
1481 | @@ -3362,8 +3705,8 @@ |
1482 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
1483 | |
1484 | # Transform an extracted symbol line into symbol name and symbol address |
1485 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
1486 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
1487 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
1488 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
1489 | |
1490 | # Handle CRLF in mingw tool chain |
1491 | opt_cr= |
1492 | @@ -3387,6 +3730,7 @@ |
1493 | # which start with @ or ?. |
1494 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
1495 | " {last_section=section; section=\$ 3};"\ |
1496 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
1497 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
1498 | " \$ 0!~/External *\|/{next};"\ |
1499 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
1500 | @@ -3399,6 +3743,7 @@ |
1501 | else |
1502 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
1503 | fi |
1504 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
1505 | |
1506 | # Check to see that the pipe works correctly. |
1507 | pipe_works=no |
1508 | @@ -3432,6 +3777,18 @@ |
1509 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
1510 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
1511 | cat <<_LT_EOF > conftest.$ac_ext |
1512 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
1513 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
1514 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
1515 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
1516 | +# define LT@&t@_DLSYM_CONST |
1517 | +#elif defined(__osf__) |
1518 | +/* This system does not cope well with relocations in const data. */ |
1519 | +# define LT@&t@_DLSYM_CONST |
1520 | +#else |
1521 | +# define LT@&t@_DLSYM_CONST const |
1522 | +#endif |
1523 | + |
1524 | #ifdef __cplusplus |
1525 | extern "C" { |
1526 | #endif |
1527 | @@ -3443,7 +3800,7 @@ |
1528 | cat <<_LT_EOF >> conftest.$ac_ext |
1529 | |
1530 | /* The mapping between symbol names and symbols. */ |
1531 | -const struct { |
1532 | +LT@&t@_DLSYM_CONST struct { |
1533 | const char *name; |
1534 | void *address; |
1535 | } |
1536 | @@ -3469,15 +3826,15 @@ |
1537 | _LT_EOF |
1538 | # Now try linking the two files. |
1539 | mv conftest.$ac_objext conftstm.$ac_objext |
1540 | - lt_save_LIBS="$LIBS" |
1541 | - lt_save_CFLAGS="$CFLAGS" |
1542 | + lt_globsym_save_LIBS=$LIBS |
1543 | + lt_globsym_save_CFLAGS=$CFLAGS |
1544 | LIBS="conftstm.$ac_objext" |
1545 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
1546 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
1547 | pipe_works=yes |
1548 | fi |
1549 | - LIBS="$lt_save_LIBS" |
1550 | - CFLAGS="$lt_save_CFLAGS" |
1551 | + LIBS=$lt_globsym_save_LIBS |
1552 | + CFLAGS=$lt_globsym_save_CFLAGS |
1553 | else |
1554 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
1555 | fi |
1556 | @@ -3510,6 +3867,13 @@ |
1557 | AC_MSG_RESULT(ok) |
1558 | fi |
1559 | |
1560 | +# Response file support. |
1561 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
1562 | + nm_file_list_spec='@' |
1563 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then |
1564 | + nm_file_list_spec='@' |
1565 | +fi |
1566 | + |
1567 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
1568 | [Take the output of nm and produce a listing of raw symbols and C names]) |
1569 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
1570 | @@ -3520,6 +3884,8 @@ |
1571 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
1572 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
1573 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
1574 | +_LT_DECL([], [nm_file_list_spec], [1], |
1575 | + [Specify filename containing input files for $NM]) |
1576 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
1577 | |
1578 | |
1579 | @@ -3531,7 +3897,6 @@ |
1580 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1581 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
1582 | |
1583 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) |
1584 | m4_if([$1], [CXX], [ |
1585 | # C++ specific cases for pic, static, wl, etc. |
1586 | if test "$GXX" = yes; then |
1587 | @@ -3582,6 +3947,11 @@ |
1588 | # DJGPP does not support shared libraries at all |
1589 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1590 | ;; |
1591 | + haiku*) |
1592 | + # PIC is the default for Haiku. |
1593 | + # The "-static" flag exists, but is broken. |
1594 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
1595 | + ;; |
1596 | interix[[3-9]]*) |
1597 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
1598 | # Instead, we relocate shared libraries at runtime. |
1599 | @@ -3631,6 +4001,12 @@ |
1600 | ;; |
1601 | esac |
1602 | ;; |
1603 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
1604 | + # This hack is so that the source file can tell whether it is being |
1605 | + # built for inclusion in a dll (and should export symbols for example). |
1606 | + m4_if([$1], [GCJ], [], |
1607 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
1608 | + ;; |
1609 | dgux*) |
1610 | case $cc_basename in |
1611 | ec++*) |
1612 | @@ -3783,7 +4159,7 @@ |
1613 | ;; |
1614 | solaris*) |
1615 | case $cc_basename in |
1616 | - CC*) |
1617 | + CC* | sunCC*) |
1618 | # Sun C++ 4.2, 5.x and Centerline C++ |
1619 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1620 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1621 | @@ -3887,6 +4263,12 @@ |
1622 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
1623 | ;; |
1624 | |
1625 | + haiku*) |
1626 | + # PIC is the default for Haiku. |
1627 | + # The "-static" flag exists, but is broken. |
1628 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
1629 | + ;; |
1630 | + |
1631 | hpux*) |
1632 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
1633 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
1634 | @@ -3929,6 +4311,15 @@ |
1635 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
1636 | ;; |
1637 | esac |
1638 | + |
1639 | + case $cc_basename in |
1640 | + nvcc*) # Cuda Compiler Driver 2.2 |
1641 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
1642 | + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
1643 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" |
1644 | + fi |
1645 | + ;; |
1646 | + esac |
1647 | else |
1648 | # PORTME Check for flag to pass linker flags through the system compiler. |
1649 | case $host_os in |
1650 | @@ -3992,7 +4383,13 @@ |
1651 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
1652 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
1653 | ;; |
1654 | - pgcc* | pgf77* | pgf90* | pgf95*) |
1655 | + nagfor*) |
1656 | + # NAG Fortran compiler |
1657 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' |
1658 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
1659 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1660 | + ;; |
1661 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
1662 | # Portland Group compilers (*not* the Pentium gcc compiler, |
1663 | # which looks to be a dead project) |
1664 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1665 | @@ -4012,18 +4409,33 @@ |
1666 | ;; |
1667 | *) |
1668 | case `$CC -V 2>&1 | sed 5q` in |
1669 | - *Sun\ F* | *Sun*Fortran*) |
1670 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
1671 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
1672 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1673 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1674 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
1675 | ;; |
1676 | + *Sun\ F* | *Sun*Fortran*) |
1677 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1678 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1679 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
1680 | + ;; |
1681 | *Sun\ C*) |
1682 | # Sun C 5.9 |
1683 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1684 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1685 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1686 | ;; |
1687 | + *Intel*\ [[CF]]*Compiler*) |
1688 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1689 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
1690 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
1691 | + ;; |
1692 | + *Portland\ Group*) |
1693 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1694 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
1695 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1696 | + ;; |
1697 | esac |
1698 | ;; |
1699 | esac |
1700 | @@ -4054,7 +4466,7 @@ |
1701 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1702 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1703 | case $cc_basename in |
1704 | - f77* | f90* | f95*) |
1705 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
1706 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
1707 | *) |
1708 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
1709 | @@ -4111,9 +4523,11 @@ |
1710 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
1711 | ;; |
1712 | esac |
1713 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
1714 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
1715 | - [How to pass a linker flag through the compiler]) |
1716 | + |
1717 | +AC_CACHE_CHECK([for $compiler option to produce PIC], |
1718 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
1719 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
1720 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) |
1721 | |
1722 | # |
1723 | # Check to make sure the PIC flag actually works. |
1724 | @@ -4132,6 +4546,8 @@ |
1725 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
1726 | [Additional compiler flags for building library objects]) |
1727 | |
1728 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
1729 | + [How to pass a linker flag through the compiler]) |
1730 | # |
1731 | # Check to make sure the static flag actually works. |
1732 | # |
1733 | @@ -4152,6 +4568,7 @@ |
1734 | m4_defun([_LT_LINKER_SHLIBS], |
1735 | [AC_REQUIRE([LT_PATH_LD])dnl |
1736 | AC_REQUIRE([LT_PATH_NM])dnl |
1737 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
1738 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1739 | m4_require([_LT_DECL_EGREP])dnl |
1740 | m4_require([_LT_DECL_SED])dnl |
1741 | @@ -4160,6 +4577,7 @@ |
1742 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
1743 | m4_if([$1], [CXX], [ |
1744 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
1745 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
1746 | case $host_os in |
1747 | aix[[4-9]]*) |
1748 | # If we're using GNU nm, then we don't want the "-C" option. |
1749 | @@ -4174,15 +4592,22 @@ |
1750 | ;; |
1751 | pw32*) |
1752 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
1753 | - ;; |
1754 | + ;; |
1755 | cygwin* | mingw* | cegcc*) |
1756 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
1757 | - ;; |
1758 | + case $cc_basename in |
1759 | + cl*) |
1760 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
1761 | + ;; |
1762 | + *) |
1763 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
1764 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
1765 | + ;; |
1766 | + esac |
1767 | + ;; |
1768 | *) |
1769 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
1770 | - ;; |
1771 | + ;; |
1772 | esac |
1773 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
1774 | ], [ |
1775 | runpath_var= |
1776 | _LT_TAGVAR(allow_undefined_flag, $1)= |
1777 | @@ -4197,7 +4622,6 @@ |
1778 | _LT_TAGVAR(hardcode_direct, $1)=no |
1779 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1780 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1781 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
1782 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1783 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1784 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1785 | @@ -4289,6 +4713,7 @@ |
1786 | fi |
1787 | supports_anon_versioning=no |
1788 | case `$LD -v 2>&1` in |
1789 | + *GNU\ gold*) supports_anon_versioning=yes ;; |
1790 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
1791 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
1792 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
1793 | @@ -4349,7 +4774,8 @@ |
1794 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
1795 | _LT_TAGVAR(always_export_symbols, $1)=no |
1796 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1797 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
1798 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
1799 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
1800 | |
1801 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
1802 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
1803 | @@ -4367,6 +4793,11 @@ |
1804 | fi |
1805 | ;; |
1806 | |
1807 | + haiku*) |
1808 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1809 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
1810 | + ;; |
1811 | + |
1812 | interix[[3-9]]*) |
1813 | _LT_TAGVAR(hardcode_direct, $1)=no |
1814 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
1815 | @@ -4392,14 +4823,15 @@ |
1816 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
1817 | && test "$tmp_diet" = no |
1818 | then |
1819 | - tmp_addflag= |
1820 | + tmp_addflag=' $pic_flag' |
1821 | tmp_sharedflag='-shared' |
1822 | case $cc_basename,$host_cpu in |
1823 | pgcc*) # Portland Group C compiler |
1824 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1825 | tmp_addflag=' $pic_flag' |
1826 | ;; |
1827 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
1828 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
1829 | + # Portland Group f77 and f90 compilers |
1830 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1831 | tmp_addflag=' $pic_flag -Mnomain' ;; |
1832 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
1833 | @@ -4414,6 +4846,10 @@ |
1834 | xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
1835 | tmp_sharedflag='-qmkshrobj' |
1836 | tmp_addflag= ;; |
1837 | + nvcc*) # Cuda Compiler Driver 2.2 |
1838 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
1839 | + _LT_TAGVAR(compiler_needs_object, $1)=yes |
1840 | + ;; |
1841 | esac |
1842 | case `$CC -V 2>&1 | sed 5q` in |
1843 | *Sun\ C*) # Sun C 5.9 |
1844 | @@ -4436,14 +4872,13 @@ |
1845 | xlf* | bgf* | bgxlf* | mpixlf*) |
1846 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
1847 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
1848 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1849 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
1850 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
1851 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
1852 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
1853 | if test "x$supports_anon_versioning" = xyes; then |
1854 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
1855 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
1856 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
1857 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
1858 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
1859 | fi |
1860 | ;; |
1861 | esac |
1862 | @@ -4457,8 +4892,8 @@ |
1863 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
1864 | wlarc= |
1865 | else |
1866 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1867 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1868 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1869 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1870 | fi |
1871 | ;; |
1872 | |
1873 | @@ -4476,8 +4911,8 @@ |
1874 | |
1875 | _LT_EOF |
1876 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
1877 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1878 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1879 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1880 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1881 | else |
1882 | _LT_TAGVAR(ld_shlibs, $1)=no |
1883 | fi |
1884 | @@ -4523,8 +4958,8 @@ |
1885 | |
1886 | *) |
1887 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
1888 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1889 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1890 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1891 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
1892 | else |
1893 | _LT_TAGVAR(ld_shlibs, $1)=no |
1894 | fi |
1895 | @@ -4654,7 +5089,7 @@ |
1896 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
1897 | # Determine the default libpath from the value encoded in an |
1898 | # empty executable. |
1899 | - _LT_SYS_MODULE_PATH_AIX |
1900 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
1901 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
1902 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
1903 | else |
1904 | @@ -4665,7 +5100,7 @@ |
1905 | else |
1906 | # Determine the default libpath from the value encoded in an |
1907 | # empty executable. |
1908 | - _LT_SYS_MODULE_PATH_AIX |
1909 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
1910 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
1911 | # Warning - without using the other run time loading flags, |
1912 | # -berok will link without error, but may produce a broken library. |
1913 | @@ -4709,20 +5144,64 @@ |
1914 | # Microsoft Visual C++. |
1915 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
1916 | # no search path for DLLs. |
1917 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
1918 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
1919 | - # Tell ltmain to make .lib files, not .a files. |
1920 | - libext=lib |
1921 | - # Tell ltmain to make .dll files, not .so files. |
1922 | - shrext_cmds=".dll" |
1923 | - # FIXME: Setting linknames here is a bad hack. |
1924 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
1925 | - # The linker will automatically build a .lib file if we build a DLL. |
1926 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
1927 | - # FIXME: Should let the user specify the lib program. |
1928 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
1929 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
1930 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1931 | + case $cc_basename in |
1932 | + cl*) |
1933 | + # Native MSVC |
1934 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
1935 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
1936 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
1937 | + _LT_TAGVAR(file_list_spec, $1)='@' |
1938 | + # Tell ltmain to make .lib files, not .a files. |
1939 | + libext=lib |
1940 | + # Tell ltmain to make .dll files, not .so files. |
1941 | + shrext_cmds=".dll" |
1942 | + # FIXME: Setting linknames here is a bad hack. |
1943 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
1944 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
1945 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
1946 | + else |
1947 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
1948 | + fi~ |
1949 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
1950 | + linknames=' |
1951 | + # The linker will not automatically build a static lib if we build a DLL. |
1952 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
1953 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1954 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
1955 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
1956 | + # Don't use ranlib |
1957 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
1958 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
1959 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
1960 | + case $lt_outputfile in |
1961 | + *.exe|*.EXE) ;; |
1962 | + *) |
1963 | + lt_outputfile="$lt_outputfile.exe" |
1964 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
1965 | + ;; |
1966 | + esac~ |
1967 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
1968 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
1969 | + $RM "$lt_outputfile.manifest"; |
1970 | + fi' |
1971 | + ;; |
1972 | + *) |
1973 | + # Assume MSVC wrapper |
1974 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
1975 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
1976 | + # Tell ltmain to make .lib files, not .a files. |
1977 | + libext=lib |
1978 | + # Tell ltmain to make .dll files, not .so files. |
1979 | + shrext_cmds=".dll" |
1980 | + # FIXME: Setting linknames here is a bad hack. |
1981 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
1982 | + # The linker will automatically build a .lib file if we build a DLL. |
1983 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
1984 | + # FIXME: Should let the user specify the lib program. |
1985 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
1986 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1987 | + ;; |
1988 | + esac |
1989 | ;; |
1990 | |
1991 | darwin* | rhapsody*) |
1992 | @@ -4735,10 +5214,6 @@ |
1993 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
1994 | ;; |
1995 | |
1996 | - freebsd1*) |
1997 | - _LT_TAGVAR(ld_shlibs, $1)=no |
1998 | - ;; |
1999 | - |
2000 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
2001 | # support. Future versions do this automatically, but an explicit c++rt0.o |
2002 | # does not break anything, and helps significantly (at the cost of a little |
2003 | @@ -4751,7 +5226,7 @@ |
2004 | ;; |
2005 | |
2006 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
2007 | - freebsd2*) |
2008 | + freebsd2.*) |
2009 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
2010 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2011 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
2012 | @@ -4760,7 +5235,7 @@ |
2013 | |
2014 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
2015 | freebsd* | dragonfly*) |
2016 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
2017 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2018 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2019 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2020 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
2021 | @@ -4768,7 +5243,7 @@ |
2022 | |
2023 | hpux9*) |
2024 | if test "$GCC" = yes; then |
2025 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2026 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2027 | else |
2028 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2029 | fi |
2030 | @@ -4784,13 +5259,12 @@ |
2031 | |
2032 | hpux10*) |
2033 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
2034 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2035 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2036 | else |
2037 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
2038 | fi |
2039 | if test "$with_gnu_ld" = no; then |
2040 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
2041 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
2042 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
2043 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2044 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
2045 | @@ -4808,10 +5282,10 @@ |
2046 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2047 | ;; |
2048 | ia64*) |
2049 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
2050 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
2051 | ;; |
2052 | *) |
2053 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2054 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
2055 | ;; |
2056 | esac |
2057 | else |
2058 | @@ -4858,16 +5332,31 @@ |
2059 | |
2060 | irix5* | irix6* | nonstopux*) |
2061 | if test "$GCC" = yes; then |
2062 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2063 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2064 | # Try to use the -exported_symbol ld option, if it does not |
2065 | # work, assume that -exports_file does not work either and |
2066 | # implicitly export all symbols. |
2067 | - save_LDFLAGS="$LDFLAGS" |
2068 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
2069 | - AC_LINK_IFELSE(int foo(void) {}, |
2070 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
2071 | - ) |
2072 | - LDFLAGS="$save_LDFLAGS" |
2073 | + # This should be the same for all languages, so no per-tag cache variable. |
2074 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
2075 | + [lt_cv_irix_exported_symbol], |
2076 | + [save_LDFLAGS="$LDFLAGS" |
2077 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
2078 | + AC_LINK_IFELSE( |
2079 | + [AC_LANG_SOURCE( |
2080 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], |
2081 | + [C++], [[int foo (void) { return 0; }]], |
2082 | + [Fortran 77], [[ |
2083 | + subroutine foo |
2084 | + end]], |
2085 | + [Fortran], [[ |
2086 | + subroutine foo |
2087 | + end]])])], |
2088 | + [lt_cv_irix_exported_symbol=yes], |
2089 | + [lt_cv_irix_exported_symbol=no]) |
2090 | + LDFLAGS="$save_LDFLAGS"]) |
2091 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
2092 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
2093 | + fi |
2094 | else |
2095 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
2096 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
2097 | @@ -4952,7 +5441,7 @@ |
2098 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
2099 | if test "$GCC" = yes; then |
2100 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2101 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2102 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2103 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2104 | else |
2105 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
2106 | @@ -4971,9 +5460,9 @@ |
2107 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
2108 | if test "$GCC" = yes; then |
2109 | wlarc='${wl}' |
2110 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2111 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2112 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
2113 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
2114 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
2115 | else |
2116 | case `$CC -V 2>&1` in |
2117 | *"Compilers 5.0"*) |
2118 | @@ -5217,9 +5706,6 @@ |
2119 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
2120 | [Flag to hardcode $libdir into a binary during linking. |
2121 | This must work even if $libdir does not exist]) |
2122 | -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], |
2123 | - [[If ld is used when linking, flag to hardcode $libdir into a binary |
2124 | - during linking. This must work even if $libdir does not exist]]) |
2125 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
2126 | [Whether we need a single "-rpath" flag with a separated argument]) |
2127 | _LT_TAGDECL([], [hardcode_direct], [0], |
2128 | @@ -5245,8 +5731,6 @@ |
2129 | to runtime path list]) |
2130 | _LT_TAGDECL([], [link_all_deplibs], [0], |
2131 | [Whether libtool must link a program against all its dependency libraries]) |
2132 | -_LT_TAGDECL([], [fix_srcfile_path], [1], |
2133 | - [Fix the shell variable $srcfile for the compiler]) |
2134 | _LT_TAGDECL([], [always_export_symbols], [0], |
2135 | [Set to "yes" if exported symbols are required]) |
2136 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
2137 | @@ -5257,6 +5741,8 @@ |
2138 | [Symbols that must always be exported]) |
2139 | _LT_TAGDECL([], [prelink_cmds], [2], |
2140 | [Commands necessary for linking programs (against libraries) with templates]) |
2141 | +_LT_TAGDECL([], [postlink_cmds], [2], |
2142 | + [Commands necessary for finishing linking programs]) |
2143 | _LT_TAGDECL([], [file_list_spec], [1], |
2144 | [Specify filename containing input files]) |
2145 | dnl FIXME: Not yet implemented |
2146 | @@ -5354,6 +5840,7 @@ |
2147 | m4_defun([_LT_LANG_CXX_CONFIG], |
2148 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2149 | m4_require([_LT_DECL_EGREP])dnl |
2150 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
2151 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
2152 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
2153 | (test "X$CXX" != "Xg++"))) ; then |
2154 | @@ -5372,7 +5859,6 @@ |
2155 | _LT_TAGVAR(hardcode_direct, $1)=no |
2156 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2157 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2158 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
2159 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2160 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2161 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2162 | @@ -5415,6 +5901,7 @@ |
2163 | |
2164 | # Allow CC to be a program name with arguments. |
2165 | lt_save_CC=$CC |
2166 | + lt_save_CFLAGS=$CFLAGS |
2167 | lt_save_LD=$LD |
2168 | lt_save_GCC=$GCC |
2169 | GCC=$GXX |
2170 | @@ -5432,6 +5919,7 @@ |
2171 | fi |
2172 | test -z "${LDCXX+set}" || LD=$LDCXX |
2173 | CC=${CXX-"c++"} |
2174 | + CFLAGS=$CXXFLAGS |
2175 | compiler=$CC |
2176 | _LT_TAGVAR(compiler, $1)=$CC |
2177 | _LT_CC_BASENAME([$compiler]) |
2178 | @@ -5453,8 +5941,8 @@ |
2179 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
2180 | # archiving commands below assume that GNU ld is being used. |
2181 | if test "$with_gnu_ld" = yes; then |
2182 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2183 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2184 | + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2185 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
2186 | |
2187 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2188 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2189 | @@ -5486,7 +5974,7 @@ |
2190 | # Commands to make compiler produce verbose output that lists |
2191 | # what "hidden" libraries, object files and flags are used when |
2192 | # linking a shared library. |
2193 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
2194 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2195 | |
2196 | else |
2197 | GXX=no |
2198 | @@ -5595,7 +6083,7 @@ |
2199 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
2200 | # Determine the default libpath from the value encoded in an empty |
2201 | # executable. |
2202 | - _LT_SYS_MODULE_PATH_AIX |
2203 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
2204 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2205 | |
2206 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
2207 | @@ -5607,7 +6095,7 @@ |
2208 | else |
2209 | # Determine the default libpath from the value encoded in an |
2210 | # empty executable. |
2211 | - _LT_SYS_MODULE_PATH_AIX |
2212 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
2213 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2214 | # Warning - without using the other run time loading flags, |
2215 | # -berok will link without error, but may produce a broken library. |
2216 | @@ -5649,29 +6137,75 @@ |
2217 | ;; |
2218 | |
2219 | cygwin* | mingw* | pw32* | cegcc*) |
2220 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
2221 | - # as there is no search path for DLLs. |
2222 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
2223 | - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
2224 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2225 | - _LT_TAGVAR(always_export_symbols, $1)=no |
2226 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2227 | + case $GXX,$cc_basename in |
2228 | + ,cl* | no,cl*) |
2229 | + # Native MSVC |
2230 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
2231 | + # no search path for DLLs. |
2232 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
2233 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2234 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
2235 | + _LT_TAGVAR(file_list_spec, $1)='@' |
2236 | + # Tell ltmain to make .lib files, not .a files. |
2237 | + libext=lib |
2238 | + # Tell ltmain to make .dll files, not .so files. |
2239 | + shrext_cmds=".dll" |
2240 | + # FIXME: Setting linknames here is a bad hack. |
2241 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
2242 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2243 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
2244 | + else |
2245 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
2246 | + fi~ |
2247 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
2248 | + linknames=' |
2249 | + # The linker will not automatically build a static lib if we build a DLL. |
2250 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
2251 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2252 | + # Don't use ranlib |
2253 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
2254 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
2255 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
2256 | + case $lt_outputfile in |
2257 | + *.exe|*.EXE) ;; |
2258 | + *) |
2259 | + lt_outputfile="$lt_outputfile.exe" |
2260 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
2261 | + ;; |
2262 | + esac~ |
2263 | + func_to_tool_file "$lt_outputfile"~ |
2264 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
2265 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
2266 | + $RM "$lt_outputfile.manifest"; |
2267 | + fi' |
2268 | + ;; |
2269 | + *) |
2270 | + # g++ |
2271 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
2272 | + # as there is no search path for DLLs. |
2273 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
2274 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
2275 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2276 | + _LT_TAGVAR(always_export_symbols, $1)=no |
2277 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
2278 | |
2279 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2280 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2281 | - # If the export-symbols file already is a .def file (1st line |
2282 | - # is EXPORTS), use it as is; otherwise, prepend... |
2283 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2284 | - cp $export_symbols $output_objdir/$soname.def; |
2285 | - else |
2286 | - echo EXPORTS > $output_objdir/$soname.def; |
2287 | - cat $export_symbols >> $output_objdir/$soname.def; |
2288 | - fi~ |
2289 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2290 | - else |
2291 | - _LT_TAGVAR(ld_shlibs, $1)=no |
2292 | - fi |
2293 | - ;; |
2294 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2295 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2296 | + # If the export-symbols file already is a .def file (1st line |
2297 | + # is EXPORTS), use it as is; otherwise, prepend... |
2298 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2299 | + cp $export_symbols $output_objdir/$soname.def; |
2300 | + else |
2301 | + echo EXPORTS > $output_objdir/$soname.def; |
2302 | + cat $export_symbols >> $output_objdir/$soname.def; |
2303 | + fi~ |
2304 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2305 | + else |
2306 | + _LT_TAGVAR(ld_shlibs, $1)=no |
2307 | + fi |
2308 | + ;; |
2309 | + esac |
2310 | + ;; |
2311 | darwin* | rhapsody*) |
2312 | _LT_DARWIN_LINKER_FEATURES($1) |
2313 | ;; |
2314 | @@ -5694,7 +6228,7 @@ |
2315 | esac |
2316 | ;; |
2317 | |
2318 | - freebsd[[12]]*) |
2319 | + freebsd2.*) |
2320 | # C++ shared libraries reported to be fairly broken before |
2321 | # switch to ELF |
2322 | _LT_TAGVAR(ld_shlibs, $1)=no |
2323 | @@ -5713,6 +6247,11 @@ |
2324 | gnu*) |
2325 | ;; |
2326 | |
2327 | + haiku*) |
2328 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2329 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
2330 | + ;; |
2331 | + |
2332 | hpux9*) |
2333 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
2334 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
2335 | @@ -5741,7 +6280,7 @@ |
2336 | ;; |
2337 | *) |
2338 | if test "$GXX" = yes; then |
2339 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2340 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
2341 | else |
2342 | # FIXME: insert proper C++ library support |
2343 | _LT_TAGVAR(ld_shlibs, $1)=no |
2344 | @@ -5812,10 +6351,10 @@ |
2345 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2346 | ;; |
2347 | ia64*) |
2348 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2349 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2350 | ;; |
2351 | *) |
2352 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2353 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2354 | ;; |
2355 | esac |
2356 | fi |
2357 | @@ -5856,9 +6395,9 @@ |
2358 | *) |
2359 | if test "$GXX" = yes; then |
2360 | if test "$with_gnu_ld" = no; then |
2361 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2362 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2363 | else |
2364 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
2365 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
2366 | fi |
2367 | fi |
2368 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2369 | @@ -5924,26 +6463,26 @@ |
2370 | pgCC* | pgcpp*) |
2371 | # Portland Group C++ compiler |
2372 | case `$CC -V` in |
2373 | - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) |
2374 | + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
2375 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
2376 | rm -rf $tpldir~ |
2377 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
2378 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
2379 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
2380 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
2381 | rm -rf $tpldir~ |
2382 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
2383 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
2384 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
2385 | $RANLIB $oldlib' |
2386 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
2387 | rm -rf $tpldir~ |
2388 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
2389 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2390 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2391 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
2392 | rm -rf $tpldir~ |
2393 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
2394 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2395 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2396 | ;; |
2397 | - *) # Version 6 will use weak symbols |
2398 | + *) # Version 6 and above use weak symbols |
2399 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2400 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
2401 | ;; |
2402 | @@ -6136,7 +6675,7 @@ |
2403 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2404 | ;; |
2405 | *) |
2406 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2407 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
2408 | ;; |
2409 | esac |
2410 | |
2411 | @@ -6146,7 +6685,7 @@ |
2412 | # Commands to make compiler produce verbose output that lists |
2413 | # what "hidden" libraries, object files and flags are used when |
2414 | # linking a shared library. |
2415 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
2416 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2417 | |
2418 | else |
2419 | # FIXME: insert proper C++ library support |
2420 | @@ -6182,7 +6721,7 @@ |
2421 | |
2422 | solaris*) |
2423 | case $cc_basename in |
2424 | - CC*) |
2425 | + CC* | sunCC*) |
2426 | # Sun C++ 4.2, 5.x and Centerline C++ |
2427 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
2428 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
2429 | @@ -6223,14 +6762,14 @@ |
2430 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
2431 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
2432 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
2433 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
2434 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
2435 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
2436 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
2437 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
2438 | |
2439 | # Commands to make compiler produce verbose output that lists |
2440 | # what "hidden" libraries, object files and flags are used when |
2441 | # linking a shared library. |
2442 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
2443 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2444 | else |
2445 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
2446 | # platform. |
2447 | @@ -6241,7 +6780,7 @@ |
2448 | # Commands to make compiler produce verbose output that lists |
2449 | # what "hidden" libraries, object files and flags are used when |
2450 | # linking a shared library. |
2451 | - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
2452 | + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2453 | fi |
2454 | |
2455 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
2456 | @@ -6354,6 +6893,7 @@ |
2457 | fi # test -n "$compiler" |
2458 | |
2459 | CC=$lt_save_CC |
2460 | + CFLAGS=$lt_save_CFLAGS |
2461 | LDCXX=$LD |
2462 | LD=$lt_save_LD |
2463 | GCC=$lt_save_GCC |
2464 | @@ -6368,6 +6908,29 @@ |
2465 | ])# _LT_LANG_CXX_CONFIG |
2466 | |
2467 | |
2468 | +# _LT_FUNC_STRIPNAME_CNF |
2469 | +# ---------------------- |
2470 | +# func_stripname_cnf prefix suffix name |
2471 | +# strip PREFIX and SUFFIX off of NAME. |
2472 | +# PREFIX and SUFFIX must not contain globbing or regex special |
2473 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
2474 | +# dot (in which case that matches only a dot). |
2475 | +# |
2476 | +# This function is identical to the (non-XSI) version of func_stripname, |
2477 | +# except this one can be used by m4 code that may be executed by configure, |
2478 | +# rather than the libtool script. |
2479 | +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl |
2480 | +AC_REQUIRE([_LT_DECL_SED]) |
2481 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) |
2482 | +func_stripname_cnf () |
2483 | +{ |
2484 | + case ${2} in |
2485 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
2486 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
2487 | + esac |
2488 | +} # func_stripname_cnf |
2489 | +])# _LT_FUNC_STRIPNAME_CNF |
2490 | + |
2491 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
2492 | # --------------------------------- |
2493 | # Figure out "hidden" library dependencies from verbose |
2494 | @@ -6376,6 +6939,7 @@ |
2495 | # objects, libraries and library flags. |
2496 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
2497 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2498 | +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl |
2499 | # Dependencies to place before and after the object being linked: |
2500 | _LT_TAGVAR(predep_objects, $1)= |
2501 | _LT_TAGVAR(postdep_objects, $1)= |
2502 | @@ -6425,7 +6989,20 @@ |
2503 | } |
2504 | }; |
2505 | _LT_EOF |
2506 | +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF |
2507 | +package foo |
2508 | +func foo() { |
2509 | +} |
2510 | +_LT_EOF |
2511 | ]) |
2512 | + |
2513 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
2514 | +case "$CC $CFLAGS " in #( |
2515 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
2516 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
2517 | +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; |
2518 | +esac |
2519 | + |
2520 | dnl Parse the compiler output and extract the necessary |
2521 | dnl objects, libraries and library flags. |
2522 | if AC_TRY_EVAL(ac_compile); then |
2523 | @@ -6437,7 +7014,7 @@ |
2524 | pre_test_object_deps_done=no |
2525 | |
2526 | for p in `eval "$output_verbose_link_cmd"`; do |
2527 | - case $p in |
2528 | + case ${prev}${p} in |
2529 | |
2530 | -L* | -R* | -l*) |
2531 | # Some compilers place space between "-{L,R}" and the path. |
2532 | @@ -6446,13 +7023,22 @@ |
2533 | test $p = "-R"; then |
2534 | prev=$p |
2535 | continue |
2536 | - else |
2537 | - prev= |
2538 | fi |
2539 | |
2540 | + # Expand the sysroot to ease extracting the directories later. |
2541 | + if test -z "$prev"; then |
2542 | + case $p in |
2543 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
2544 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
2545 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
2546 | + esac |
2547 | + fi |
2548 | + case $p in |
2549 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
2550 | + esac |
2551 | if test "$pre_test_object_deps_done" = no; then |
2552 | - case $p in |
2553 | - -L* | -R*) |
2554 | + case ${prev} in |
2555 | + -L | -R) |
2556 | # Internal compiler library paths should come after those |
2557 | # provided the user. The postdeps already come after the |
2558 | # user supplied libs so there is no need to process them. |
2559 | @@ -6472,8 +7058,10 @@ |
2560 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
2561 | fi |
2562 | fi |
2563 | + prev= |
2564 | ;; |
2565 | |
2566 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
2567 | *.$objext) |
2568 | # This assumes that the test object file only shows up |
2569 | # once in the compiler output. |
2570 | @@ -6509,6 +7097,7 @@ |
2571 | fi |
2572 | |
2573 | $RM -f confest.$objext |
2574 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
2575 | |
2576 | # PORTME: override above test on systems where it is broken |
2577 | m4_if([$1], [CXX], |
2578 | @@ -6545,7 +7134,7 @@ |
2579 | |
2580 | solaris*) |
2581 | case $cc_basename in |
2582 | - CC*) |
2583 | + CC* | sunCC*) |
2584 | # The more standards-conforming stlport4 library is |
2585 | # incompatible with the Cstd library. Avoid specifying |
2586 | # it if it's in CXXFLAGS. Ignore libCrun as |
2587 | @@ -6608,7 +7197,6 @@ |
2588 | _LT_TAGVAR(hardcode_direct, $1)=no |
2589 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2590 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2591 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
2592 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2593 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2594 | _LT_TAGVAR(hardcode_automatic, $1)=no |
2595 | @@ -6658,7 +7246,9 @@ |
2596 | # Allow CC to be a program name with arguments. |
2597 | lt_save_CC="$CC" |
2598 | lt_save_GCC=$GCC |
2599 | + lt_save_CFLAGS=$CFLAGS |
2600 | CC=${F77-"f77"} |
2601 | + CFLAGS=$FFLAGS |
2602 | compiler=$CC |
2603 | _LT_TAGVAR(compiler, $1)=$CC |
2604 | _LT_CC_BASENAME([$compiler]) |
2605 | @@ -6712,6 +7302,7 @@ |
2606 | |
2607 | GCC=$lt_save_GCC |
2608 | CC="$lt_save_CC" |
2609 | + CFLAGS="$lt_save_CFLAGS" |
2610 | fi # test "$_lt_disable_F77" != yes |
2611 | |
2612 | AC_LANG_POP |
2613 | @@ -6738,7 +7329,6 @@ |
2614 | _LT_TAGVAR(hardcode_direct, $1)=no |
2615 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2616 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2617 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
2618 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2619 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2620 | _LT_TAGVAR(hardcode_automatic, $1)=no |
2621 | @@ -6788,7 +7378,9 @@ |
2622 | # Allow CC to be a program name with arguments. |
2623 | lt_save_CC="$CC" |
2624 | lt_save_GCC=$GCC |
2625 | + lt_save_CFLAGS=$CFLAGS |
2626 | CC=${FC-"f95"} |
2627 | + CFLAGS=$FCFLAGS |
2628 | compiler=$CC |
2629 | GCC=$ac_cv_fc_compiler_gnu |
2630 | |
2631 | @@ -6844,7 +7436,8 @@ |
2632 | fi # test -n "$compiler" |
2633 | |
2634 | GCC=$lt_save_GCC |
2635 | - CC="$lt_save_CC" |
2636 | + CC=$lt_save_CC |
2637 | + CFLAGS=$lt_save_CFLAGS |
2638 | fi # test "$_lt_disable_FC" != yes |
2639 | |
2640 | AC_LANG_POP |
2641 | @@ -6881,10 +7474,12 @@ |
2642 | _LT_LINKER_BOILERPLATE |
2643 | |
2644 | # Allow CC to be a program name with arguments. |
2645 | -lt_save_CC="$CC" |
2646 | +lt_save_CC=$CC |
2647 | +lt_save_CFLAGS=$CFLAGS |
2648 | lt_save_GCC=$GCC |
2649 | GCC=yes |
2650 | CC=${GCJ-"gcj"} |
2651 | +CFLAGS=$GCJFLAGS |
2652 | compiler=$CC |
2653 | _LT_TAGVAR(compiler, $1)=$CC |
2654 | _LT_TAGVAR(LD, $1)="$LD" |
2655 | @@ -6911,10 +7506,78 @@ |
2656 | AC_LANG_RESTORE |
2657 | |
2658 | GCC=$lt_save_GCC |
2659 | -CC="$lt_save_CC" |
2660 | +CC=$lt_save_CC |
2661 | +CFLAGS=$lt_save_CFLAGS |
2662 | ])# _LT_LANG_GCJ_CONFIG |
2663 | |
2664 | |
2665 | +# _LT_LANG_GO_CONFIG([TAG]) |
2666 | +# -------------------------- |
2667 | +# Ensure that the configuration variables for the GNU Go compiler |
2668 | +# are suitably defined. These variables are subsequently used by _LT_CONFIG |
2669 | +# to write the compiler configuration to `libtool'. |
2670 | +m4_defun([_LT_LANG_GO_CONFIG], |
2671 | +[AC_REQUIRE([LT_PROG_GO])dnl |
2672 | +AC_LANG_SAVE |
2673 | + |
2674 | +# Source file extension for Go test sources. |
2675 | +ac_ext=go |
2676 | + |
2677 | +# Object file extension for compiled Go test sources. |
2678 | +objext=o |
2679 | +_LT_TAGVAR(objext, $1)=$objext |
2680 | + |
2681 | +# Code to be used in simple compile tests |
2682 | +lt_simple_compile_test_code="package main; func main() { }" |
2683 | + |
2684 | +# Code to be used in simple link tests |
2685 | +lt_simple_link_test_code='package main; func main() { }' |
2686 | + |
2687 | +# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
2688 | +_LT_TAG_COMPILER |
2689 | + |
2690 | +# save warnings/boilerplate of simple test code |
2691 | +_LT_COMPILER_BOILERPLATE |
2692 | +_LT_LINKER_BOILERPLATE |
2693 | + |
2694 | +# Allow CC to be a program name with arguments. |
2695 | +lt_save_CC=$CC |
2696 | +lt_save_CFLAGS=$CFLAGS |
2697 | +lt_save_GCC=$GCC |
2698 | +GCC=yes |
2699 | +CC=${GOC-"gccgo"} |
2700 | +CFLAGS=$GOFLAGS |
2701 | +compiler=$CC |
2702 | +_LT_TAGVAR(compiler, $1)=$CC |
2703 | +_LT_TAGVAR(LD, $1)="$LD" |
2704 | +_LT_CC_BASENAME([$compiler]) |
2705 | + |
2706 | +# Go did not exist at the time GCC didn't implicitly link libc in. |
2707 | +_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
2708 | + |
2709 | +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
2710 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
2711 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
2712 | + |
2713 | +if test -n "$compiler"; then |
2714 | + _LT_COMPILER_NO_RTTI($1) |
2715 | + _LT_COMPILER_PIC($1) |
2716 | + _LT_COMPILER_C_O($1) |
2717 | + _LT_COMPILER_FILE_LOCKS($1) |
2718 | + _LT_LINKER_SHLIBS($1) |
2719 | + _LT_LINKER_HARDCODE_LIBPATH($1) |
2720 | + |
2721 | + _LT_CONFIG($1) |
2722 | +fi |
2723 | + |
2724 | +AC_LANG_RESTORE |
2725 | + |
2726 | +GCC=$lt_save_GCC |
2727 | +CC=$lt_save_CC |
2728 | +CFLAGS=$lt_save_CFLAGS |
2729 | +])# _LT_LANG_GO_CONFIG |
2730 | + |
2731 | + |
2732 | # _LT_LANG_RC_CONFIG([TAG]) |
2733 | # ------------------------- |
2734 | # Ensure that the configuration variables for the Windows resource compiler |
2735 | @@ -6946,9 +7609,11 @@ |
2736 | |
2737 | # Allow CC to be a program name with arguments. |
2738 | lt_save_CC="$CC" |
2739 | +lt_save_CFLAGS=$CFLAGS |
2740 | lt_save_GCC=$GCC |
2741 | GCC= |
2742 | CC=${RC-"windres"} |
2743 | +CFLAGS= |
2744 | compiler=$CC |
2745 | _LT_TAGVAR(compiler, $1)=$CC |
2746 | _LT_CC_BASENAME([$compiler]) |
2747 | @@ -6961,7 +7626,8 @@ |
2748 | |
2749 | GCC=$lt_save_GCC |
2750 | AC_LANG_RESTORE |
2751 | -CC="$lt_save_CC" |
2752 | +CC=$lt_save_CC |
2753 | +CFLAGS=$lt_save_CFLAGS |
2754 | ])# _LT_LANG_RC_CONFIG |
2755 | |
2756 | |
2757 | @@ -6981,6 +7647,13 @@ |
2758 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
2759 | |
2760 | |
2761 | +# LT_PROG_GO |
2762 | +# ---------- |
2763 | +AC_DEFUN([LT_PROG_GO], |
2764 | +[AC_CHECK_TOOL(GOC, gccgo,) |
2765 | +]) |
2766 | + |
2767 | + |
2768 | # LT_PROG_RC |
2769 | # ---------- |
2770 | AC_DEFUN([LT_PROG_RC], |
2771 | @@ -7020,6 +7693,15 @@ |
2772 | AC_SUBST([OBJDUMP]) |
2773 | ]) |
2774 | |
2775 | +# _LT_DECL_DLLTOOL |
2776 | +# ---------------- |
2777 | +# Ensure DLLTOOL variable is set. |
2778 | +m4_defun([_LT_DECL_DLLTOOL], |
2779 | +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
2780 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
2781 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) |
2782 | +AC_SUBST([DLLTOOL]) |
2783 | +]) |
2784 | |
2785 | # _LT_DECL_SED |
2786 | # ------------ |
2787 | @@ -7111,8 +7793,8 @@ |
2788 | # Try some XSI features |
2789 | xsi_shell=no |
2790 | ( _lt_dummy="a/b/c" |
2791 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
2792 | - = c,a/b,, \ |
2793 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
2794 | + = c,a/b,b/c, \ |
2795 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2796 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2797 | && xsi_shell=yes |
2798 | @@ -7151,220 +7833,177 @@ |
2799 | ])# _LT_CHECK_SHELL_FEATURES |
2800 | |
2801 | |
2802 | -# _LT_PROG_XSI_SHELLFNS |
2803 | -# --------------------- |
2804 | -# Bourne and XSI compatible variants of some useful shell functions. |
2805 | -m4_defun([_LT_PROG_XSI_SHELLFNS], |
2806 | -[case $xsi_shell in |
2807 | - yes) |
2808 | - cat << \_LT_EOF >> "$cfgfile" |
2809 | - |
2810 | -# func_dirname file append nondir_replacement |
2811 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
2812 | -# otherwise set result to NONDIR_REPLACEMENT. |
2813 | -func_dirname () |
2814 | -{ |
2815 | - case ${1} in |
2816 | - */*) func_dirname_result="${1%/*}${2}" ;; |
2817 | - * ) func_dirname_result="${3}" ;; |
2818 | - esac |
2819 | -} |
2820 | - |
2821 | -# func_basename file |
2822 | -func_basename () |
2823 | -{ |
2824 | - func_basename_result="${1##*/}" |
2825 | -} |
2826 | - |
2827 | -# func_dirname_and_basename file append nondir_replacement |
2828 | -# perform func_basename and func_dirname in a single function |
2829 | -# call: |
2830 | -# dirname: Compute the dirname of FILE. If nonempty, |
2831 | -# add APPEND to the result, otherwise set result |
2832 | -# to NONDIR_REPLACEMENT. |
2833 | -# value returned in "$func_dirname_result" |
2834 | -# basename: Compute filename of FILE. |
2835 | -# value retuned in "$func_basename_result" |
2836 | -# Implementation must be kept synchronized with func_dirname |
2837 | -# and func_basename. For efficiency, we do not delegate to |
2838 | -# those functions but instead duplicate the functionality here. |
2839 | -func_dirname_and_basename () |
2840 | -{ |
2841 | - case ${1} in |
2842 | - */*) func_dirname_result="${1%/*}${2}" ;; |
2843 | - * ) func_dirname_result="${3}" ;; |
2844 | - esac |
2845 | - func_basename_result="${1##*/}" |
2846 | -} |
2847 | - |
2848 | -# func_stripname prefix suffix name |
2849 | -# strip PREFIX and SUFFIX off of NAME. |
2850 | -# PREFIX and SUFFIX must not contain globbing or regex special |
2851 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
2852 | -# dot (in which case that matches only a dot). |
2853 | -func_stripname () |
2854 | -{ |
2855 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
2856 | - # positional parameters, so assign one to ordinary parameter first. |
2857 | - func_stripname_result=${3} |
2858 | - func_stripname_result=${func_stripname_result#"${1}"} |
2859 | - func_stripname_result=${func_stripname_result%"${2}"} |
2860 | -} |
2861 | - |
2862 | -# func_opt_split |
2863 | -func_opt_split () |
2864 | -{ |
2865 | - func_opt_split_opt=${1%%=*} |
2866 | - func_opt_split_arg=${1#*=} |
2867 | -} |
2868 | - |
2869 | -# func_lo2o object |
2870 | -func_lo2o () |
2871 | -{ |
2872 | - case ${1} in |
2873 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
2874 | - *) func_lo2o_result=${1} ;; |
2875 | - esac |
2876 | -} |
2877 | - |
2878 | -# func_xform libobj-or-source |
2879 | -func_xform () |
2880 | -{ |
2881 | - func_xform_result=${1%.*}.lo |
2882 | -} |
2883 | - |
2884 | -# func_arith arithmetic-term... |
2885 | -func_arith () |
2886 | -{ |
2887 | - func_arith_result=$(( $[*] )) |
2888 | -} |
2889 | - |
2890 | -# func_len string |
2891 | -# STRING may not start with a hyphen. |
2892 | -func_len () |
2893 | -{ |
2894 | - func_len_result=${#1} |
2895 | -} |
2896 | - |
2897 | -_LT_EOF |
2898 | - ;; |
2899 | - *) # Bourne compatible functions. |
2900 | - cat << \_LT_EOF >> "$cfgfile" |
2901 | - |
2902 | -# func_dirname file append nondir_replacement |
2903 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
2904 | -# otherwise set result to NONDIR_REPLACEMENT. |
2905 | -func_dirname () |
2906 | -{ |
2907 | - # Extract subdirectory from the argument. |
2908 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
2909 | - if test "X$func_dirname_result" = "X${1}"; then |
2910 | - func_dirname_result="${3}" |
2911 | - else |
2912 | - func_dirname_result="$func_dirname_result${2}" |
2913 | - fi |
2914 | -} |
2915 | - |
2916 | -# func_basename file |
2917 | -func_basename () |
2918 | -{ |
2919 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
2920 | -} |
2921 | - |
2922 | -dnl func_dirname_and_basename |
2923 | -dnl A portable version of this function is already defined in general.m4sh |
2924 | -dnl so there is no need for it here. |
2925 | - |
2926 | -# func_stripname prefix suffix name |
2927 | -# strip PREFIX and SUFFIX off of NAME. |
2928 | -# PREFIX and SUFFIX must not contain globbing or regex special |
2929 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
2930 | -# dot (in which case that matches only a dot). |
2931 | -# func_strip_suffix prefix name |
2932 | -func_stripname () |
2933 | -{ |
2934 | - case ${2} in |
2935 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
2936 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
2937 | - esac |
2938 | -} |
2939 | - |
2940 | -# sed scripts: |
2941 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' |
2942 | -my_sed_long_arg='1s/^-[[^=]]*=//' |
2943 | - |
2944 | -# func_opt_split |
2945 | -func_opt_split () |
2946 | -{ |
2947 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
2948 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
2949 | -} |
2950 | - |
2951 | -# func_lo2o object |
2952 | -func_lo2o () |
2953 | -{ |
2954 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
2955 | -} |
2956 | - |
2957 | -# func_xform libobj-or-source |
2958 | -func_xform () |
2959 | -{ |
2960 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` |
2961 | -} |
2962 | - |
2963 | -# func_arith arithmetic-term... |
2964 | -func_arith () |
2965 | -{ |
2966 | - func_arith_result=`expr "$[@]"` |
2967 | -} |
2968 | - |
2969 | -# func_len string |
2970 | -# STRING may not start with a hyphen. |
2971 | -func_len () |
2972 | -{ |
2973 | - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` |
2974 | -} |
2975 | - |
2976 | -_LT_EOF |
2977 | -esac |
2978 | - |
2979 | -case $lt_shell_append in |
2980 | - yes) |
2981 | - cat << \_LT_EOF >> "$cfgfile" |
2982 | - |
2983 | -# func_append var value |
2984 | -# Append VALUE to the end of shell variable VAR. |
2985 | -func_append () |
2986 | -{ |
2987 | - eval "$[1]+=\$[2]" |
2988 | -} |
2989 | -_LT_EOF |
2990 | - ;; |
2991 | - *) |
2992 | - cat << \_LT_EOF >> "$cfgfile" |
2993 | - |
2994 | -# func_append var value |
2995 | -# Append VALUE to the end of shell variable VAR. |
2996 | -func_append () |
2997 | -{ |
2998 | - eval "$[1]=\$$[1]\$[2]" |
2999 | -} |
3000 | - |
3001 | -_LT_EOF |
3002 | - ;; |
3003 | - esac |
3004 | -]) |
3005 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
3006 | +# ------------------------------------------------------ |
3007 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
3008 | +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
3009 | +m4_defun([_LT_PROG_FUNCTION_REPLACE], |
3010 | +[dnl { |
3011 | +sed -e '/^$1 ()$/,/^} # $1 /c\ |
3012 | +$1 ()\ |
3013 | +{\ |
3014 | +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
3015 | +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
3016 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3017 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3018 | +test 0 -eq $? || _lt_function_replace_fail=: |
3019 | +]) |
3020 | + |
3021 | + |
3022 | +# _LT_PROG_REPLACE_SHELLFNS |
3023 | +# ------------------------- |
3024 | +# Replace existing portable implementations of several shell functions with |
3025 | +# equivalent extended shell implementations where those features are available.. |
3026 | +m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
3027 | +[if test x"$xsi_shell" = xyes; then |
3028 | + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
3029 | + case ${1} in |
3030 | + */*) func_dirname_result="${1%/*}${2}" ;; |
3031 | + * ) func_dirname_result="${3}" ;; |
3032 | + esac]) |
3033 | + |
3034 | + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
3035 | + func_basename_result="${1##*/}"]) |
3036 | + |
3037 | + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
3038 | + case ${1} in |
3039 | + */*) func_dirname_result="${1%/*}${2}" ;; |
3040 | + * ) func_dirname_result="${3}" ;; |
3041 | + esac |
3042 | + func_basename_result="${1##*/}"]) |
3043 | + |
3044 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
3045 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
3046 | + # positional parameters, so assign one to ordinary parameter first. |
3047 | + func_stripname_result=${3} |
3048 | + func_stripname_result=${func_stripname_result#"${1}"} |
3049 | + func_stripname_result=${func_stripname_result%"${2}"}]) |
3050 | + |
3051 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
3052 | + func_split_long_opt_name=${1%%=*} |
3053 | + func_split_long_opt_arg=${1#*=}]) |
3054 | + |
3055 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
3056 | + func_split_short_opt_arg=${1#??} |
3057 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
3058 | + |
3059 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
3060 | + case ${1} in |
3061 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
3062 | + *) func_lo2o_result=${1} ;; |
3063 | + esac]) |
3064 | + |
3065 | + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
3066 | + |
3067 | + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) |
3068 | + |
3069 | + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) |
3070 | +fi |
3071 | + |
3072 | +if test x"$lt_shell_append" = xyes; then |
3073 | + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) |
3074 | + |
3075 | + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl |
3076 | + func_quote_for_eval "${2}" |
3077 | +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ |
3078 | + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) |
3079 | + |
3080 | + # Save a `func_append' function call where possible by direct use of '+=' |
3081 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
3082 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3083 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3084 | + test 0 -eq $? || _lt_function_replace_fail=: |
3085 | +else |
3086 | + # Save a `func_append' function call even when '+=' is not available |
3087 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
3088 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3089 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3090 | + test 0 -eq $? || _lt_function_replace_fail=: |
3091 | +fi |
3092 | + |
3093 | +if test x"$_lt_function_replace_fail" = x":"; then |
3094 | + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) |
3095 | +fi |
3096 | +]) |
3097 | + |
3098 | +# _LT_PATH_CONVERSION_FUNCTIONS |
3099 | +# ----------------------------- |
3100 | +# Determine which file name conversion functions should be used by |
3101 | +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed |
3102 | +# for certain cross-compile configurations and native mingw. |
3103 | +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], |
3104 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3105 | +AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
3106 | +AC_MSG_CHECKING([how to convert $build file names to $host format]) |
3107 | +AC_CACHE_VAL(lt_cv_to_host_file_cmd, |
3108 | +[case $host in |
3109 | + *-*-mingw* ) |
3110 | + case $build in |
3111 | + *-*-mingw* ) # actually msys |
3112 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
3113 | + ;; |
3114 | + *-*-cygwin* ) |
3115 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
3116 | + ;; |
3117 | + * ) # otherwise, assume *nix |
3118 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
3119 | + ;; |
3120 | + esac |
3121 | + ;; |
3122 | + *-*-cygwin* ) |
3123 | + case $build in |
3124 | + *-*-mingw* ) # actually msys |
3125 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
3126 | + ;; |
3127 | + *-*-cygwin* ) |
3128 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
3129 | + ;; |
3130 | + * ) # otherwise, assume *nix |
3131 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
3132 | + ;; |
3133 | + esac |
3134 | + ;; |
3135 | + * ) # unhandled hosts (and "normal" native builds) |
3136 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
3137 | + ;; |
3138 | +esac |
3139 | +]) |
3140 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
3141 | +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) |
3142 | +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], |
3143 | + [0], [convert $build file names to $host format])dnl |
3144 | + |
3145 | +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) |
3146 | +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, |
3147 | +[#assume ordinary cross tools, or native build. |
3148 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
3149 | +case $host in |
3150 | + *-*-mingw* ) |
3151 | + case $build in |
3152 | + *-*-mingw* ) # actually msys |
3153 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
3154 | + ;; |
3155 | + esac |
3156 | + ;; |
3157 | +esac |
3158 | +]) |
3159 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
3160 | +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) |
3161 | +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], |
3162 | + [0], [convert $build files to toolchain format])dnl |
3163 | +])# _LT_PATH_CONVERSION_FUNCTIONS |
3164 | |
3165 | # Helper functions for option handling. -*- Autoconf -*- |
3166 | # |
3167 | -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. |
3168 | +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, |
3169 | +# Inc. |
3170 | # Written by Gary V. Vaughan, 2004 |
3171 | # |
3172 | # This file is free software; the Free Software Foundation gives |
3173 | # unlimited permission to copy and/or distribute it, with or without |
3174 | # modifications, as long as this notice is preserved. |
3175 | |
3176 | -# serial 6 ltoptions.m4 |
3177 | +# serial 7 ltoptions.m4 |
3178 | |
3179 | # This is to help aclocal find these macros, as it can't see m4_define. |
3180 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
3181 | @@ -7487,13 +8126,13 @@ |
3182 | esac |
3183 | |
3184 | test -z "$AS" && AS=as |
3185 | -_LT_DECL([], [AS], [0], [Assembler program])dnl |
3186 | +_LT_DECL([], [AS], [1], [Assembler program])dnl |
3187 | |
3188 | test -z "$DLLTOOL" && DLLTOOL=dlltool |
3189 | -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl |
3190 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl |
3191 | |
3192 | test -z "$OBJDUMP" && OBJDUMP=objdump |
3193 | -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl |
3194 | +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl |
3195 | ])# win32-dll |
3196 | |
3197 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], |
3198 | @@ -7679,9 +8318,24 @@ |
3199 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
3200 | m4_define([_LT_WITH_PIC], |
3201 | [AC_ARG_WITH([pic], |
3202 | - [AS_HELP_STRING([--with-pic], |
3203 | + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], |
3204 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
3205 | - [pic_mode="$withval"], |
3206 | + [lt_p=${PACKAGE-default} |
3207 | + case $withval in |
3208 | + yes|no) pic_mode=$withval ;; |
3209 | + *) |
3210 | + pic_mode=default |
3211 | + # Look at the argument we got. We use all the common list separators. |
3212 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
3213 | + for lt_pkg in $withval; do |
3214 | + IFS="$lt_save_ifs" |
3215 | + if test "X$lt_pkg" = "X$lt_p"; then |
3216 | + pic_mode=yes |
3217 | + fi |
3218 | + done |
3219 | + IFS="$lt_save_ifs" |
3220 | + ;; |
3221 | + esac], |
3222 | [pic_mode=default]) |
3223 | |
3224 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) |
3225 | @@ -7851,17 +8505,17 @@ |
3226 | # unlimited permission to copy and/or distribute it, with or without |
3227 | # modifications, as long as this notice is preserved. |
3228 | |
3229 | -# Generated from ltversion.in. |
3230 | +# @configure_input@ |
3231 | |
3232 | -# serial 3111 ltversion.m4 |
3233 | +# serial 3337 ltversion.m4 |
3234 | # This file is part of GNU Libtool |
3235 | |
3236 | -m4_define([LT_PACKAGE_VERSION], [2.2.7a]) |
3237 | -m4_define([LT_PACKAGE_REVISION], [1.3111]) |
3238 | +m4_define([LT_PACKAGE_VERSION], [2.4.2]) |
3239 | +m4_define([LT_PACKAGE_REVISION], [1.3337]) |
3240 | |
3241 | AC_DEFUN([LTVERSION_VERSION], |
3242 | -[macro_version='2.2.7a' |
3243 | -macro_revision='1.3111' |
3244 | +[macro_version='2.4.2' |
3245 | +macro_revision='1.3337' |
3246 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
3247 | _LT_DECL(, macro_revision, 0) |
3248 | ]) |
3249 | @@ -7875,7 +8529,7 @@ |
3250 | # unlimited permission to copy and/or distribute it, with or without |
3251 | # modifications, as long as this notice is preserved. |
3252 | |
3253 | -# serial 4 lt~obsolete.m4 |
3254 | +# serial 5 lt~obsolete.m4 |
3255 | |
3256 | # These exist entirely to fool aclocal when bootstrapping libtool. |
3257 | # |
3258 | @@ -7965,22 +8619,24 @@ |
3259 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) |
3260 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
3261 | |
3262 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
3263 | +# Copyright (C) 2002-2012 Free Software Foundation, Inc. |
3264 | # |
3265 | # This file is free software; the Free Software Foundation |
3266 | # gives unlimited permission to copy and/or distribute it, |
3267 | # with or without modifications, as long as this notice is preserved. |
3268 | |
3269 | +# serial 8 |
3270 | + |
3271 | # AM_AUTOMAKE_VERSION(VERSION) |
3272 | # ---------------------------- |
3273 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
3274 | # generated from the m4 files accompanying Automake X.Y. |
3275 | # (This private macro should not be called outside this file.) |
3276 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
3277 | -[am__api_version='1.11' |
3278 | +[am__api_version='1.12' |
3279 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
3280 | dnl require some minimum version. Point them to the right macro. |
3281 | -m4_if([$1], [1.11.1], [], |
3282 | +m4_if([$1], [1.12.1], [], |
3283 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
3284 | ]) |
3285 | |
3286 | @@ -7996,22 +8652,24 @@ |
3287 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
3288 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
3289 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
3290 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
3291 | +[AM_AUTOMAKE_VERSION([1.12.1])dnl |
3292 | m4_ifndef([AC_AUTOCONF_VERSION], |
3293 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
3294 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
3295 | |
3296 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
3297 | |
3298 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
3299 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3300 | # |
3301 | # This file is free software; the Free Software Foundation |
3302 | # gives unlimited permission to copy and/or distribute it, |
3303 | # with or without modifications, as long as this notice is preserved. |
3304 | |
3305 | +# serial 2 |
3306 | + |
3307 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
3308 | -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
3309 | -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
3310 | +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
3311 | +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
3312 | # |
3313 | # Of course, Automake must honor this variable whenever it calls a |
3314 | # tool from the auxiliary directory. The problem is that $srcdir (and |
3315 | @@ -8030,7 +8688,7 @@ |
3316 | # |
3317 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
3318 | # are both prefixed by $srcdir. In an in-source build this is usually |
3319 | -# harmless because $srcdir is `.', but things will broke when you |
3320 | +# harmless because $srcdir is '.', but things will broke when you |
3321 | # start a VPATH build or use an absolute $srcdir. |
3322 | # |
3323 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
3324 | @@ -8056,22 +8714,21 @@ |
3325 | |
3326 | # AM_CONDITIONAL -*- Autoconf -*- |
3327 | |
3328 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
3329 | -# Free Software Foundation, Inc. |
3330 | +# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
3331 | # |
3332 | # This file is free software; the Free Software Foundation |
3333 | # gives unlimited permission to copy and/or distribute it, |
3334 | # with or without modifications, as long as this notice is preserved. |
3335 | |
3336 | -# serial 9 |
3337 | +# serial 10 |
3338 | |
3339 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
3340 | # ------------------------------------- |
3341 | # Define a conditional. |
3342 | AC_DEFUN([AM_CONDITIONAL], |
3343 | -[AC_PREREQ(2.52)dnl |
3344 | - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
3345 | - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
3346 | +[AC_PREREQ([2.52])dnl |
3347 | + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
3348 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
3349 | AC_SUBST([$1_TRUE])dnl |
3350 | AC_SUBST([$1_FALSE])dnl |
3351 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
3352 | @@ -8090,16 +8747,15 @@ |
3353 | Usually this means the macro was only invoked conditionally.]]) |
3354 | fi])]) |
3355 | |
3356 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
3357 | -# Free Software Foundation, Inc. |
3358 | +# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
3359 | # |
3360 | # This file is free software; the Free Software Foundation |
3361 | # gives unlimited permission to copy and/or distribute it, |
3362 | # with or without modifications, as long as this notice is preserved. |
3363 | |
3364 | -# serial 10 |
3365 | +# serial 17 |
3366 | |
3367 | -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
3368 | +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
3369 | # written in clear, in which case automake, when reading aclocal.m4, |
3370 | # will think it sees a *use*, and therefore will trigger all it's |
3371 | # C support machinery. Also note that it means that autoscan, seeing |
3372 | @@ -8109,7 +8765,7 @@ |
3373 | # _AM_DEPENDENCIES(NAME) |
3374 | # ---------------------- |
3375 | # See how the compiler implements dependency checking. |
3376 | -# NAME is "CC", "CXX", "GCJ", or "OBJC". |
3377 | +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
3378 | # We try a few techniques and use that to set a single cache variable. |
3379 | # |
3380 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
3381 | @@ -8122,12 +8778,13 @@ |
3382 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
3383 | AC_REQUIRE([AM_DEP_TRACK])dnl |
3384 | |
3385 | -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
3386 | - [$1], CXX, [depcc="$CXX" am_compiler_list=], |
3387 | - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
3388 | - [$1], UPC, [depcc="$UPC" am_compiler_list=], |
3389 | - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
3390 | - [depcc="$$1" am_compiler_list=]) |
3391 | +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
3392 | + [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
3393 | + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
3394 | + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
3395 | + [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
3396 | + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
3397 | + [depcc="$$1" am_compiler_list=]) |
3398 | |
3399 | AC_CACHE_CHECK([dependency style of $depcc], |
3400 | [am_cv_$1_dependencies_compiler_type], |
3401 | @@ -8135,8 +8792,9 @@ |
3402 | # We make a subdir and do the tests there. Otherwise we can end up |
3403 | # making bogus files that we don't know about and never remove. For |
3404 | # instance it was reported that on HP-UX the gcc test will end up |
3405 | - # making a dummy file named `D' -- because `-MD' means `put the output |
3406 | - # in D'. |
3407 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
3408 | + # in D". |
3409 | + rm -rf conftest.dir |
3410 | mkdir conftest.dir |
3411 | # Copy depcomp to subdir because otherwise we won't find it if we're |
3412 | # using a relative directory. |
3413 | @@ -8175,16 +8833,16 @@ |
3414 | : > sub/conftest.c |
3415 | for i in 1 2 3 4 5 6; do |
3416 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
3417 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
3418 | - # Solaris 8's {/usr,}/bin/sh. |
3419 | - touch sub/conftst$i.h |
3420 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
3421 | + # Solaris 10 /bin/sh. |
3422 | + echo '/* dummy */' > sub/conftst$i.h |
3423 | done |
3424 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
3425 | |
3426 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
3427 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
3428 | # mode. It turns out that the SunPro C++ compiler does not properly |
3429 | - # handle `-M -o', and we need to detect this. Also, some Intel |
3430 | - # versions had trouble with output in subdirs |
3431 | + # handle '-M -o', and we need to detect this. Also, some Intel |
3432 | + # versions had trouble with output in subdirs. |
3433 | am__obj=sub/conftest.${OBJEXT-o} |
3434 | am__minus_obj="-o $am__obj" |
3435 | case $depmode in |
3436 | @@ -8193,16 +8851,16 @@ |
3437 | test "$am__universal" = false || continue |
3438 | ;; |
3439 | nosideeffect) |
3440 | - # after this tag, mechanisms are not by side-effect, so they'll |
3441 | - # only be used when explicitly requested |
3442 | + # After this tag, mechanisms are not by side-effect, so they'll |
3443 | + # only be used when explicitly requested. |
3444 | if test "x$enable_dependency_tracking" = xyes; then |
3445 | continue |
3446 | else |
3447 | break |
3448 | fi |
3449 | ;; |
3450 | - msvisualcpp | msvcmsys) |
3451 | - # This compiler won't grok `-c -o', but also, the minuso test has |
3452 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
3453 | + # This compiler won't grok '-c -o', but also, the minuso test has |
3454 | # not run yet. These depmodes are late enough in the game, and |
3455 | # so weak that their functioning should not be impacted. |
3456 | am__obj=conftest.${OBJEXT-o} |
3457 | @@ -8250,7 +8908,7 @@ |
3458 | # AM_SET_DEPDIR |
3459 | # ------------- |
3460 | # Choose a directory name for dependency files. |
3461 | -# This macro is AC_REQUIREd in _AM_DEPENDENCIES |
3462 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
3463 | AC_DEFUN([AM_SET_DEPDIR], |
3464 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
3465 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
3466 | @@ -8260,28 +8918,34 @@ |
3467 | # AM_DEP_TRACK |
3468 | # ------------ |
3469 | AC_DEFUN([AM_DEP_TRACK], |
3470 | -[AC_ARG_ENABLE(dependency-tracking, |
3471 | -[ --disable-dependency-tracking speeds up one-time build |
3472 | - --enable-dependency-tracking do not reject slow dependency extractors]) |
3473 | +[AC_ARG_ENABLE([dependency-tracking], [dnl |
3474 | +AS_HELP_STRING( |
3475 | + [--enable-dependency-tracking], |
3476 | + [do not reject slow dependency extractors]) |
3477 | +AS_HELP_STRING( |
3478 | + [--disable-dependency-tracking], |
3479 | + [speeds up one-time build])]) |
3480 | if test "x$enable_dependency_tracking" != xno; then |
3481 | am_depcomp="$ac_aux_dir/depcomp" |
3482 | AMDEPBACKSLASH='\' |
3483 | + am__nodep='_no' |
3484 | fi |
3485 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
3486 | AC_SUBST([AMDEPBACKSLASH])dnl |
3487 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
3488 | +AC_SUBST([am__nodep])dnl |
3489 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
3490 | ]) |
3491 | |
3492 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
3493 | |
3494 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
3495 | -# Free Software Foundation, Inc. |
3496 | +# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
3497 | # |
3498 | # This file is free software; the Free Software Foundation |
3499 | # gives unlimited permission to copy and/or distribute it, |
3500 | # with or without modifications, as long as this notice is preserved. |
3501 | |
3502 | -#serial 5 |
3503 | +# serial 6 |
3504 | |
3505 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
3506 | # ------------------------------ |
3507 | @@ -8300,7 +8964,7 @@ |
3508 | # Strip MF so we end up with the name of the file. |
3509 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
3510 | # Check whether this is an Automake generated Makefile or not. |
3511 | - # We used to match only the files named `Makefile.in', but |
3512 | + # We used to match only the files named 'Makefile.in', but |
3513 | # some people rename them; so instead we look at the file content. |
3514 | # Grep'ing the first line is not enough: some people post-process |
3515 | # each Makefile.in and add a new line on top of each file to say so. |
3516 | @@ -8312,21 +8976,19 @@ |
3517 | continue |
3518 | fi |
3519 | # Extract the definition of DEPDIR, am__include, and am__quote |
3520 | - # from the Makefile without running `make'. |
3521 | + # from the Makefile without running 'make'. |
3522 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
3523 | test -z "$DEPDIR" && continue |
3524 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
3525 | test -z "am__include" && continue |
3526 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
3527 | - # When using ansi2knr, U may be empty or an underscore; expand it |
3528 | - U=`sed -n 's/^U = //p' < "$mf"` |
3529 | # Find all dependency output files, they are included files with |
3530 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
3531 | # simplest approach to changing $(DEPDIR) to its actual value in the |
3532 | # expansion. |
3533 | for file in `sed -n " |
3534 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
3535 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
3536 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
3537 | # Make sure the directory exists. |
3538 | test -f "$dirpart/$file" && continue |
3539 | fdir=`AS_DIRNAME(["$file"])` |
3540 | @@ -8344,7 +9006,7 @@ |
3541 | # This macro should only be invoked once -- use via AC_REQUIRE. |
3542 | # |
3543 | # This code is only required when automatic dependency tracking |
3544 | -# is enabled. FIXME. This creates each `.P' file that we will |
3545 | +# is enabled. FIXME. This creates each '.P' file that we will |
3546 | # need in order to bootstrap the dependency handling code. |
3547 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
3548 | [AC_CONFIG_COMMANDS([depfiles], |
3549 | @@ -8352,8 +9014,7 @@ |
3550 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
3551 | ]) |
3552 | |
3553 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 |
3554 | -# Free Software Foundation, Inc. |
3555 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
3556 | # |
3557 | # This file is free software; the Free Software Foundation |
3558 | # gives unlimited permission to copy and/or distribute it, |
3559 | @@ -8366,14 +9027,13 @@ |
3560 | |
3561 | # Do all the work for Automake. -*- Autoconf -*- |
3562 | |
3563 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
3564 | -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
3565 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
3566 | # |
3567 | # This file is free software; the Free Software Foundation |
3568 | # gives unlimited permission to copy and/or distribute it, |
3569 | # with or without modifications, as long as this notice is preserved. |
3570 | |
3571 | -# serial 16 |
3572 | +# serial 19 |
3573 | |
3574 | # This macro actually does too much. Some checks are only needed if |
3575 | # your package does certain things. But this isn't really a big deal. |
3576 | @@ -8419,31 +9079,36 @@ |
3577 | # Define the identity of the package. |
3578 | dnl Distinguish between old-style and new-style calls. |
3579 | m4_ifval([$2], |
3580 | -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
3581 | +[AC_DIAGNOSE([obsolete], |
3582 | +[$0: two- and three-arguments forms are deprecated. For more info, see: |
3583 | +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) |
3584 | +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
3585 | AC_SUBST([PACKAGE], [$1])dnl |
3586 | AC_SUBST([VERSION], [$2])], |
3587 | [_AM_SET_OPTIONS([$1])dnl |
3588 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
3589 | -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, |
3590 | +m4_if( |
3591 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
3592 | + [ok:ok],, |
3593 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
3594 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
3595 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
3596 | |
3597 | _AM_IF_OPTION([no-define],, |
3598 | -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) |
3599 | - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl |
3600 | +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
3601 | + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
3602 | |
3603 | # Some tools Automake needs. |
3604 | AC_REQUIRE([AM_SANITY_CHECK])dnl |
3605 | AC_REQUIRE([AC_ARG_PROGRAM])dnl |
3606 | -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) |
3607 | -AM_MISSING_PROG(AUTOCONF, autoconf) |
3608 | -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
3609 | -AM_MISSING_PROG(AUTOHEADER, autoheader) |
3610 | -AM_MISSING_PROG(MAKEINFO, makeinfo) |
3611 | +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
3612 | +AM_MISSING_PROG([AUTOCONF], [autoconf]) |
3613 | +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
3614 | +AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
3615 | +AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
3616 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
3617 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
3618 | -AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
3619 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
3620 | # We need awk for the "check" target. The system "awk" is bad on |
3621 | # some platforms. |
3622 | AC_REQUIRE([AC_PROG_AWK])dnl |
3623 | @@ -8454,28 +9119,35 @@ |
3624 | [_AM_PROG_TAR([v7])])]) |
3625 | _AM_IF_OPTION([no-dependencies],, |
3626 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
3627 | - [_AM_DEPENDENCIES(CC)], |
3628 | - [define([AC_PROG_CC], |
3629 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
3630 | + [_AM_DEPENDENCIES([CC])], |
3631 | + [m4_define([AC_PROG_CC], |
3632 | + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
3633 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
3634 | - [_AM_DEPENDENCIES(CXX)], |
3635 | - [define([AC_PROG_CXX], |
3636 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
3637 | + [_AM_DEPENDENCIES([CXX])], |
3638 | + [m4_define([AC_PROG_CXX], |
3639 | + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
3640 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
3641 | - [_AM_DEPENDENCIES(OBJC)], |
3642 | - [define([AC_PROG_OBJC], |
3643 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
3644 | + [_AM_DEPENDENCIES([OBJC])], |
3645 | + [m4_define([AC_PROG_OBJC], |
3646 | + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
3647 | +dnl Support for Objective C++ was only introduced in Autoconf 2.65, |
3648 | +dnl but we still cater to Autoconf 2.62. |
3649 | +m4_ifdef([AC_PROG_OBJCXX], |
3650 | +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
3651 | + [_AM_DEPENDENCIES([OBJCXX])], |
3652 | + [m4_define([AC_PROG_OBJCXX], |
3653 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl |
3654 | ]) |
3655 | _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
3656 | -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the |
3657 | -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
3658 | +dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |
3659 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
3660 | dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
3661 | AC_CONFIG_COMMANDS_PRE(dnl |
3662 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
3663 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
3664 | ]) |
3665 | |
3666 | -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
3667 | +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
3668 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
3669 | dnl mangled by Autoconf and run in a shell conditional statement. |
3670 | m4_define([_AC_COMPILER_EXEEXT], |
3671 | @@ -8503,12 +9175,14 @@ |
3672 | done |
3673 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
3674 | |
3675 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
3676 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3677 | # |
3678 | # This file is free software; the Free Software Foundation |
3679 | # gives unlimited permission to copy and/or distribute it, |
3680 | # with or without modifications, as long as this notice is preserved. |
3681 | |
3682 | +# serial 8 |
3683 | + |
3684 | # AM_PROG_INSTALL_SH |
3685 | # ------------------ |
3686 | # Define $install_sh. |
3687 | @@ -8522,9 +9196,9 @@ |
3688 | install_sh="\${SHELL} $am_aux_dir/install-sh" |
3689 | esac |
3690 | fi |
3691 | -AC_SUBST(install_sh)]) |
3692 | +AC_SUBST([install_sh])]) |
3693 | |
3694 | -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
3695 | +# Copyright (C) 2003-2012 Free Software Foundation, Inc. |
3696 | # |
3697 | # This file is free software; the Free Software Foundation |
3698 | # gives unlimited permission to copy and/or distribute it, |
3699 | @@ -8547,13 +9221,13 @@ |
3700 | |
3701 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
3702 | |
3703 | -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
3704 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3705 | # |
3706 | # This file is free software; the Free Software Foundation |
3707 | # gives unlimited permission to copy and/or distribute it, |
3708 | # with or without modifications, as long as this notice is preserved. |
3709 | |
3710 | -# serial 4 |
3711 | +# serial 5 |
3712 | |
3713 | # AM_MAKE_INCLUDE() |
3714 | # ----------------- |
3715 | @@ -8572,7 +9246,7 @@ |
3716 | _am_result=none |
3717 | # First try GNU make style include. |
3718 | echo "include confinc" > confmf |
3719 | -# Ignore all kinds of additional output from `make'. |
3720 | +# Ignore all kinds of additional output from 'make'. |
3721 | case `$am_make -s -f confmf 2> /dev/null` in #( |
3722 | *the\ am__doit\ target*) |
3723 | am__include=include |
3724 | @@ -8599,14 +9273,13 @@ |
3725 | |
3726 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
3727 | |
3728 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
3729 | -# Free Software Foundation, Inc. |
3730 | +# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
3731 | # |
3732 | # This file is free software; the Free Software Foundation |
3733 | # gives unlimited permission to copy and/or distribute it, |
3734 | # with or without modifications, as long as this notice is preserved. |
3735 | |
3736 | -# serial 6 |
3737 | +# serial 7 |
3738 | |
3739 | # AM_MISSING_PROG(NAME, PROGRAM) |
3740 | # ------------------------------ |
3741 | @@ -8636,45 +9309,19 @@ |
3742 | am_missing_run="$MISSING --run " |
3743 | else |
3744 | am_missing_run= |
3745 | - AC_MSG_WARN([`missing' script is too old or missing]) |
3746 | + AC_MSG_WARN(['missing' script is too old or missing]) |
3747 | fi |
3748 | ]) |
3749 | |
3750 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
3751 | -# |
3752 | -# This file is free software; the Free Software Foundation |
3753 | -# gives unlimited permission to copy and/or distribute it, |
3754 | -# with or without modifications, as long as this notice is preserved. |
3755 | - |
3756 | -# AM_PROG_MKDIR_P |
3757 | -# --------------- |
3758 | -# Check for `mkdir -p'. |
3759 | -AC_DEFUN([AM_PROG_MKDIR_P], |
3760 | -[AC_PREREQ([2.60])dnl |
3761 | -AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
3762 | -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
3763 | -dnl while keeping a definition of mkdir_p for backward compatibility. |
3764 | -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
3765 | -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
3766 | -dnl Makefile.ins that do not define MKDIR_P, so we do our own |
3767 | -dnl adjustment using top_builddir (which is defined more often than |
3768 | -dnl MKDIR_P). |
3769 | -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
3770 | -case $mkdir_p in |
3771 | - [[\\/$]]* | ?:[[\\/]]*) ;; |
3772 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
3773 | -esac |
3774 | -]) |
3775 | - |
3776 | # Helper functions for option handling. -*- Autoconf -*- |
3777 | |
3778 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
3779 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3780 | # |
3781 | # This file is free software; the Free Software Foundation |
3782 | # gives unlimited permission to copy and/or distribute it, |
3783 | # with or without modifications, as long as this notice is preserved. |
3784 | |
3785 | -# serial 4 |
3786 | +# serial 6 |
3787 | |
3788 | # _AM_MANGLE_OPTION(NAME) |
3789 | # ----------------------- |
3790 | @@ -8682,13 +9329,13 @@ |
3791 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
3792 | |
3793 | # _AM_SET_OPTION(NAME) |
3794 | -# ------------------------------ |
3795 | +# -------------------- |
3796 | # Set option NAME. Presently that only means defining a flag for this option. |
3797 | AC_DEFUN([_AM_SET_OPTION], |
3798 | -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
3799 | +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
3800 | |
3801 | # _AM_SET_OPTIONS(OPTIONS) |
3802 | -# ---------------------------------- |
3803 | +# ------------------------ |
3804 | # OPTIONS is a space-separated list of Automake options. |
3805 | AC_DEFUN([_AM_SET_OPTIONS], |
3806 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
3807 | @@ -8701,22 +9348,18 @@ |
3808 | |
3809 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
3810 | |
3811 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
3812 | -# Free Software Foundation, Inc. |
3813 | +# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
3814 | # |
3815 | # This file is free software; the Free Software Foundation |
3816 | # gives unlimited permission to copy and/or distribute it, |
3817 | # with or without modifications, as long as this notice is preserved. |
3818 | |
3819 | -# serial 5 |
3820 | +# serial 9 |
3821 | |
3822 | # AM_SANITY_CHECK |
3823 | # --------------- |
3824 | AC_DEFUN([AM_SANITY_CHECK], |
3825 | [AC_MSG_CHECKING([whether build environment is sane]) |
3826 | -# Just in case |
3827 | -sleep 1 |
3828 | -echo timestamp > conftest.file |
3829 | # Reject unsafe characters in $srcdir or the absolute working directory |
3830 | # name. Accept space and tab only in the latter. |
3831 | am_lf=' |
3832 | @@ -8727,32 +9370,40 @@ |
3833 | esac |
3834 | case $srcdir in |
3835 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
3836 | - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; |
3837 | + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
3838 | esac |
3839 | |
3840 | -# Do `set' in a subshell so we don't clobber the current shell's |
3841 | +# Do 'set' in a subshell so we don't clobber the current shell's |
3842 | # arguments. Must try -L first in case configure is actually a |
3843 | # symlink; some systems play weird games with the mod time of symlinks |
3844 | # (eg FreeBSD returns the mod time of the symlink's containing |
3845 | # directory). |
3846 | if ( |
3847 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
3848 | - if test "$[*]" = "X"; then |
3849 | - # -L didn't work. |
3850 | - set X `ls -t "$srcdir/configure" conftest.file` |
3851 | - fi |
3852 | - rm -f conftest.file |
3853 | - if test "$[*]" != "X $srcdir/configure conftest.file" \ |
3854 | - && test "$[*]" != "X conftest.file $srcdir/configure"; then |
3855 | - |
3856 | - # If neither matched, then we have a broken ls. This can happen |
3857 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
3858 | - # broken ls alias from the environment. This has actually |
3859 | - # happened. Such a system could not be considered "sane". |
3860 | - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
3861 | -alias in your environment]) |
3862 | - fi |
3863 | - |
3864 | + am_has_slept=no |
3865 | + for am_try in 1 2; do |
3866 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
3867 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
3868 | + if test "$[*]" = "X"; then |
3869 | + # -L didn't work. |
3870 | + set X `ls -t "$srcdir/configure" conftest.file` |
3871 | + fi |
3872 | + if test "$[*]" != "X $srcdir/configure conftest.file" \ |
3873 | + && test "$[*]" != "X conftest.file $srcdir/configure"; then |
3874 | + |
3875 | + # If neither matched, then we have a broken ls. This can happen |
3876 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
3877 | + # broken ls alias from the environment. This has actually |
3878 | + # happened. Such a system could not be considered "sane". |
3879 | + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
3880 | + alias in your environment]) |
3881 | + fi |
3882 | + if test "$[2]" = conftest.file || test $am_try -eq 2; then |
3883 | + break |
3884 | + fi |
3885 | + # Just in case. |
3886 | + sleep 1 |
3887 | + am_has_slept=yes |
3888 | + done |
3889 | test "$[2]" = conftest.file |
3890 | ) |
3891 | then |
3892 | @@ -8762,43 +9413,61 @@ |
3893 | AC_MSG_ERROR([newly created file is older than distributed files! |
3894 | Check your system clock]) |
3895 | fi |
3896 | -AC_MSG_RESULT(yes)]) |
3897 | +AC_MSG_RESULT([yes]) |
3898 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
3899 | +# generated files are strictly newer. |
3900 | +am_sleep_pid= |
3901 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
3902 | + ( sleep 1 ) & |
3903 | + am_sleep_pid=$! |
3904 | +fi |
3905 | +AC_CONFIG_COMMANDS_PRE( |
3906 | + [AC_MSG_CHECKING([that generated files are newer than configure]) |
3907 | + if test -n "$am_sleep_pid"; then |
3908 | + # Hide warnings about reused PIDs. |
3909 | + wait $am_sleep_pid 2>/dev/null |
3910 | + fi |
3911 | + AC_MSG_RESULT([done])]) |
3912 | +rm -f conftest.file |
3913 | +]) |
3914 | |
3915 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
3916 | +# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3917 | # |
3918 | # This file is free software; the Free Software Foundation |
3919 | # gives unlimited permission to copy and/or distribute it, |
3920 | # with or without modifications, as long as this notice is preserved. |
3921 | |
3922 | +# serial 2 |
3923 | + |
3924 | # AM_PROG_INSTALL_STRIP |
3925 | # --------------------- |
3926 | -# One issue with vendor `install' (even GNU) is that you can't |
3927 | +# One issue with vendor 'install' (even GNU) is that you can't |
3928 | # specify the program used to strip binaries. This is especially |
3929 | # annoying in cross-compiling environments, where the build's strip |
3930 | # is unlikely to handle the host's binaries. |
3931 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
3932 | -# always use install-sh in `make install-strip', and initialize |
3933 | +# always use install-sh in "make install-strip", and initialize |
3934 | # STRIPPROG with the value of the STRIP variable (set by the user). |
3935 | AC_DEFUN([AM_PROG_INSTALL_STRIP], |
3936 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
3937 | -# Installed binaries are usually stripped using `strip' when the user |
3938 | -# run `make install-strip'. However `strip' might not be the right |
3939 | +# Installed binaries are usually stripped using 'strip' when the user |
3940 | +# run "make install-strip". However 'strip' might not be the right |
3941 | # tool to use in cross-compilation environments, therefore Automake |
3942 | -# will honor the `STRIP' environment variable to overrule this program. |
3943 | -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. |
3944 | +# will honor the 'STRIP' environment variable to overrule this program. |
3945 | +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
3946 | if test "$cross_compiling" != no; then |
3947 | AC_CHECK_TOOL([STRIP], [strip], :) |
3948 | fi |
3949 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
3950 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
3951 | |
3952 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
3953 | +# Copyright (C) 2006-2012 Free Software Foundation, Inc. |
3954 | # |
3955 | # This file is free software; the Free Software Foundation |
3956 | # gives unlimited permission to copy and/or distribute it, |
3957 | # with or without modifications, as long as this notice is preserved. |
3958 | |
3959 | -# serial 2 |
3960 | +# serial 3 |
3961 | |
3962 | # _AM_SUBST_NOTMAKE(VARIABLE) |
3963 | # --------------------------- |
3964 | @@ -8807,24 +9476,24 @@ |
3965 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
3966 | |
3967 | # AM_SUBST_NOTMAKE(VARIABLE) |
3968 | -# --------------------------- |
3969 | +# -------------------------- |
3970 | # Public sister of _AM_SUBST_NOTMAKE. |
3971 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
3972 | |
3973 | # Check how to create a tarball. -*- Autoconf -*- |
3974 | |
3975 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
3976 | +# Copyright (C) 2004-2012 Free Software Foundation, Inc. |
3977 | # |
3978 | # This file is free software; the Free Software Foundation |
3979 | # gives unlimited permission to copy and/or distribute it, |
3980 | # with or without modifications, as long as this notice is preserved. |
3981 | |
3982 | -# serial 2 |
3983 | +# serial 3 |
3984 | |
3985 | # _AM_PROG_TAR(FORMAT) |
3986 | # -------------------- |
3987 | # Check how to create a tarball in format FORMAT. |
3988 | -# FORMAT should be one of `v7', `ustar', or `pax'. |
3989 | +# FORMAT should be one of 'v7', 'ustar', or 'pax'. |
3990 | # |
3991 | # Substitute a variable $(am__tar) that is a command |
3992 | # writing to stdout a FORMAT-tarball containing the directory |
3993 | @@ -8835,10 +9504,11 @@ |
3994 | # a tarball read from stdin. |
3995 | # $(am__untar) < result.tar |
3996 | AC_DEFUN([_AM_PROG_TAR], |
3997 | -[# Always define AMTAR for backward compatibility. |
3998 | -AM_MISSING_PROG([AMTAR], [tar]) |
3999 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
4000 | +# in the wild :-( We should find a proper way to deprecate it ... |
4001 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
4002 | m4_if([$1], [v7], |
4003 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
4004 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
4005 | [m4_case([$1], [ustar],, [pax],, |
4006 | [m4_fatal([Unknown tar format])]) |
4007 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
4008 | @@ -8846,7 +9516,7 @@ |
4009 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
4010 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
4011 | # Do not fold the above two line into one, because Tru64 sh and |
4012 | -# Solaris sh will not grok spaces in the rhs of `-'. |
4013 | +# Solaris sh will not grok spaces in the rhs of '-'. |
4014 | for _am_tool in $_am_tools |
4015 | do |
4016 | case $_am_tool in |
4017 | |
4018 | === modified file 'config/config.guess' |
4019 | --- config/config.guess 2010-05-12 20:21:46 +0000 |
4020 | +++ config/config.guess 2013-02-20 19:26:35 +0000 |
4021 | @@ -1,10 +1,10 @@ |
4022 | #! /bin/sh |
4023 | # Attempt to guess a canonical system name. |
4024 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4025 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
4026 | -# Free Software Foundation, Inc. |
4027 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
4028 | +# 2011, 2012 Free Software Foundation, Inc. |
4029 | |
4030 | -timestamp='2009-12-30' |
4031 | +timestamp='2012-02-10' |
4032 | |
4033 | # This file is free software; you can redistribute it and/or modify it |
4034 | # under the terms of the GNU General Public License as published by |
4035 | @@ -17,9 +17,7 @@ |
4036 | # General Public License for more details. |
4037 | # |
4038 | # You should have received a copy of the GNU General Public License |
4039 | -# along with this program; if not, write to the Free Software |
4040 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
4041 | -# 02110-1301, USA. |
4042 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
4043 | # |
4044 | # As a special exception to the GNU General Public License, if you |
4045 | # distribute this file as part of a program that contains a |
4046 | @@ -57,8 +55,8 @@ |
4047 | |
4048 | Originally written by Per Bothner. |
4049 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4050 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
4051 | -Software Foundation, Inc. |
4052 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
4053 | +Free Software Foundation, Inc. |
4054 | |
4055 | This is free software; see the source for copying conditions. There is NO |
4056 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4057 | @@ -168,7 +166,7 @@ |
4058 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
4059 | *:NetBSD:*:*) |
4060 | # NetBSD (nbsd) targets should (where applicable) match one or |
4061 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
4062 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
4063 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
4064 | # switched to ELF, *-*-netbsd* would select the old |
4065 | # object file format. This provides both forward |
4066 | @@ -204,7 +202,7 @@ |
4067 | fi |
4068 | ;; |
4069 | *) |
4070 | - os=netbsd |
4071 | + os=netbsd |
4072 | ;; |
4073 | esac |
4074 | # The OS release |
4075 | @@ -247,7 +245,7 @@ |
4076 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
4077 | ;; |
4078 | *5.*) |
4079 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
4080 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
4081 | ;; |
4082 | esac |
4083 | # According to Compaq, /usr/sbin/psrinfo has been available on |
4084 | @@ -293,7 +291,10 @@ |
4085 | # A Xn.n version is an unreleased experimental baselevel. |
4086 | # 1.2 uses "1.2" for uname -r. |
4087 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
4088 | - exit ;; |
4089 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
4090 | + exitcode=$? |
4091 | + trap '' 0 |
4092 | + exit $exitcode ;; |
4093 | Alpha\ *:Windows_NT*:*) |
4094 | # How do we know it's Interix rather than the generic POSIX subsystem? |
4095 | # Should we change UNAME_MACHINE based on the output of uname instead |
4096 | @@ -319,7 +320,7 @@ |
4097 | echo s390-ibm-zvmoe |
4098 | exit ;; |
4099 | *:OS400:*:*) |
4100 | - echo powerpc-ibm-os400 |
4101 | + echo powerpc-ibm-os400 |
4102 | exit ;; |
4103 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
4104 | echo arm-acorn-riscix${UNAME_RELEASE} |
4105 | @@ -418,23 +419,23 @@ |
4106 | # MiNT. But MiNT is downward compatible to TOS, so this should |
4107 | # be no problem. |
4108 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
4109 | - echo m68k-atari-mint${UNAME_RELEASE} |
4110 | + echo m68k-atari-mint${UNAME_RELEASE} |
4111 | exit ;; |
4112 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
4113 | echo m68k-atari-mint${UNAME_RELEASE} |
4114 | - exit ;; |
4115 | + exit ;; |
4116 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
4117 | - echo m68k-atari-mint${UNAME_RELEASE} |
4118 | + echo m68k-atari-mint${UNAME_RELEASE} |
4119 | exit ;; |
4120 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
4121 | - echo m68k-milan-mint${UNAME_RELEASE} |
4122 | - exit ;; |
4123 | + echo m68k-milan-mint${UNAME_RELEASE} |
4124 | + exit ;; |
4125 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
4126 | - echo m68k-hades-mint${UNAME_RELEASE} |
4127 | - exit ;; |
4128 | + echo m68k-hades-mint${UNAME_RELEASE} |
4129 | + exit ;; |
4130 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
4131 | - echo m68k-unknown-mint${UNAME_RELEASE} |
4132 | - exit ;; |
4133 | + echo m68k-unknown-mint${UNAME_RELEASE} |
4134 | + exit ;; |
4135 | m68k:machten:*:*) |
4136 | echo m68k-apple-machten${UNAME_RELEASE} |
4137 | exit ;; |
4138 | @@ -504,8 +505,8 @@ |
4139 | echo m88k-motorola-sysv3 |
4140 | exit ;; |
4141 | AViiON:dgux:*:*) |
4142 | - # DG/UX returns AViiON for all architectures |
4143 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
4144 | + # DG/UX returns AViiON for all architectures |
4145 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
4146 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
4147 | then |
4148 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
4149 | @@ -518,7 +519,7 @@ |
4150 | else |
4151 | echo i586-dg-dgux${UNAME_RELEASE} |
4152 | fi |
4153 | - exit ;; |
4154 | + exit ;; |
4155 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
4156 | echo m88k-dolphin-sysv3 |
4157 | exit ;; |
4158 | @@ -575,7 +576,7 @@ |
4159 | echo rs6000-ibm-aix3.2 |
4160 | fi |
4161 | exit ;; |
4162 | - *:AIX:*:[456]) |
4163 | + *:AIX:*:[4567]) |
4164 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
4165 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
4166 | IBM_ARCH=rs6000 |
4167 | @@ -618,52 +619,52 @@ |
4168 | 9000/[678][0-9][0-9]) |
4169 | if [ -x /usr/bin/getconf ]; then |
4170 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
4171 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
4172 | - case "${sc_cpu_version}" in |
4173 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
4174 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
4175 | - 532) # CPU_PA_RISC2_0 |
4176 | - case "${sc_kernel_bits}" in |
4177 | - 32) HP_ARCH="hppa2.0n" ;; |
4178 | - 64) HP_ARCH="hppa2.0w" ;; |
4179 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
4180 | + case "${sc_cpu_version}" in |
4181 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
4182 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
4183 | + 532) # CPU_PA_RISC2_0 |
4184 | + case "${sc_kernel_bits}" in |
4185 | + 32) HP_ARCH="hppa2.0n" ;; |
4186 | + 64) HP_ARCH="hppa2.0w" ;; |
4187 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
4188 | - esac ;; |
4189 | - esac |
4190 | + esac ;; |
4191 | + esac |
4192 | fi |
4193 | if [ "${HP_ARCH}" = "" ]; then |
4194 | eval $set_cc_for_build |
4195 | - sed 's/^ //' << EOF >$dummy.c |
4196 | - |
4197 | - #define _HPUX_SOURCE |
4198 | - #include <stdlib.h> |
4199 | - #include <unistd.h> |
4200 | - |
4201 | - int main () |
4202 | - { |
4203 | - #if defined(_SC_KERNEL_BITS) |
4204 | - long bits = sysconf(_SC_KERNEL_BITS); |
4205 | - #endif |
4206 | - long cpu = sysconf (_SC_CPU_VERSION); |
4207 | - |
4208 | - switch (cpu) |
4209 | - { |
4210 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
4211 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
4212 | - case CPU_PA_RISC2_0: |
4213 | - #if defined(_SC_KERNEL_BITS) |
4214 | - switch (bits) |
4215 | - { |
4216 | - case 64: puts ("hppa2.0w"); break; |
4217 | - case 32: puts ("hppa2.0n"); break; |
4218 | - default: puts ("hppa2.0"); break; |
4219 | - } break; |
4220 | - #else /* !defined(_SC_KERNEL_BITS) */ |
4221 | - puts ("hppa2.0"); break; |
4222 | - #endif |
4223 | - default: puts ("hppa1.0"); break; |
4224 | - } |
4225 | - exit (0); |
4226 | - } |
4227 | + sed 's/^ //' << EOF >$dummy.c |
4228 | + |
4229 | + #define _HPUX_SOURCE |
4230 | + #include <stdlib.h> |
4231 | + #include <unistd.h> |
4232 | + |
4233 | + int main () |
4234 | + { |
4235 | + #if defined(_SC_KERNEL_BITS) |
4236 | + long bits = sysconf(_SC_KERNEL_BITS); |
4237 | + #endif |
4238 | + long cpu = sysconf (_SC_CPU_VERSION); |
4239 | + |
4240 | + switch (cpu) |
4241 | + { |
4242 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
4243 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
4244 | + case CPU_PA_RISC2_0: |
4245 | + #if defined(_SC_KERNEL_BITS) |
4246 | + switch (bits) |
4247 | + { |
4248 | + case 64: puts ("hppa2.0w"); break; |
4249 | + case 32: puts ("hppa2.0n"); break; |
4250 | + default: puts ("hppa2.0"); break; |
4251 | + } break; |
4252 | + #else /* !defined(_SC_KERNEL_BITS) */ |
4253 | + puts ("hppa2.0"); break; |
4254 | + #endif |
4255 | + default: puts ("hppa1.0"); break; |
4256 | + } |
4257 | + exit (0); |
4258 | + } |
4259 | EOF |
4260 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
4261 | test -z "$HP_ARCH" && HP_ARCH=hppa |
4262 | @@ -754,22 +755,22 @@ |
4263 | exit ;; |
4264 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
4265 | echo c1-convex-bsd |
4266 | - exit ;; |
4267 | + exit ;; |
4268 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
4269 | if getsysinfo -f scalar_acc |
4270 | then echo c32-convex-bsd |
4271 | else echo c2-convex-bsd |
4272 | fi |
4273 | - exit ;; |
4274 | + exit ;; |
4275 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
4276 | echo c34-convex-bsd |
4277 | - exit ;; |
4278 | + exit ;; |
4279 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
4280 | echo c38-convex-bsd |
4281 | - exit ;; |
4282 | + exit ;; |
4283 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
4284 | echo c4-convex-bsd |
4285 | - exit ;; |
4286 | + exit ;; |
4287 | CRAY*Y-MP:*:*:*) |
4288 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
4289 | exit ;; |
4290 | @@ -793,14 +794,14 @@ |
4291 | exit ;; |
4292 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
4293 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
4294 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4295 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
4296 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4297 | - exit ;; |
4298 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4299 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
4300 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4301 | + exit ;; |
4302 | 5000:UNIX_System_V:4.*:*) |
4303 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4304 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
4305 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4306 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4307 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
4308 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4309 | exit ;; |
4310 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
4311 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
4312 | @@ -812,13 +813,12 @@ |
4313 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
4314 | exit ;; |
4315 | *:FreeBSD:*:*) |
4316 | - case ${UNAME_MACHINE} in |
4317 | - pc98) |
4318 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4319 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
4320 | + case ${UNAME_PROCESSOR} in |
4321 | amd64) |
4322 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4323 | *) |
4324 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4325 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4326 | esac |
4327 | exit ;; |
4328 | i*:CYGWIN*:*) |
4329 | @@ -827,15 +827,18 @@ |
4330 | *:MINGW*:*) |
4331 | echo ${UNAME_MACHINE}-pc-mingw32 |
4332 | exit ;; |
4333 | + i*:MSYS*:*) |
4334 | + echo ${UNAME_MACHINE}-pc-msys |
4335 | + exit ;; |
4336 | i*:windows32*:*) |
4337 | - # uname -m includes "-pc" on this system. |
4338 | - echo ${UNAME_MACHINE}-mingw32 |
4339 | + # uname -m includes "-pc" on this system. |
4340 | + echo ${UNAME_MACHINE}-mingw32 |
4341 | exit ;; |
4342 | i*:PW*:*) |
4343 | echo ${UNAME_MACHINE}-pc-pw32 |
4344 | exit ;; |
4345 | *:Interix*:*) |
4346 | - case ${UNAME_MACHINE} in |
4347 | + case ${UNAME_MACHINE} in |
4348 | x86) |
4349 | echo i586-pc-interix${UNAME_RELEASE} |
4350 | exit ;; |
4351 | @@ -881,6 +884,13 @@ |
4352 | i*86:Minix:*:*) |
4353 | echo ${UNAME_MACHINE}-pc-minix |
4354 | exit ;; |
4355 | + aarch64:Linux:*:*) |
4356 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4357 | + exit ;; |
4358 | + aarch64_be:Linux:*:*) |
4359 | + UNAME_MACHINE=aarch64_be |
4360 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4361 | + exit ;; |
4362 | alpha:Linux:*:*) |
4363 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
4364 | EV5) UNAME_MACHINE=alphaev5 ;; |
4365 | @@ -890,7 +900,7 @@ |
4366 | EV6) UNAME_MACHINE=alphaev6 ;; |
4367 | EV67) UNAME_MACHINE=alphaev67 ;; |
4368 | EV68*) UNAME_MACHINE=alphaev68 ;; |
4369 | - esac |
4370 | + esac |
4371 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
4372 | if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
4373 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4374 | @@ -902,20 +912,29 @@ |
4375 | then |
4376 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4377 | else |
4378 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi |
4379 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
4380 | + | grep -q __ARM_PCS_VFP |
4381 | + then |
4382 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi |
4383 | + else |
4384 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf |
4385 | + fi |
4386 | fi |
4387 | exit ;; |
4388 | avr32*:Linux:*:*) |
4389 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4390 | exit ;; |
4391 | cris:Linux:*:*) |
4392 | - echo cris-axis-linux-${LIBC} |
4393 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
4394 | exit ;; |
4395 | crisv32:Linux:*:*) |
4396 | - echo crisv32-axis-linux-${LIBC} |
4397 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
4398 | exit ;; |
4399 | frv:Linux:*:*) |
4400 | - echo frv-unknown-linux-${LIBC} |
4401 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4402 | + exit ;; |
4403 | + hexagon:Linux:*:*) |
4404 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4405 | exit ;; |
4406 | i*86:Linux:*:*) |
4407 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
4408 | @@ -949,7 +968,7 @@ |
4409 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
4410 | ;; |
4411 | or32:Linux:*:*) |
4412 | - echo or32-unknown-linux-${LIBC} |
4413 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4414 | exit ;; |
4415 | padre:Linux:*:*) |
4416 | echo sparc-unknown-linux-${LIBC} |
4417 | @@ -975,7 +994,7 @@ |
4418 | echo ${UNAME_MACHINE}-ibm-linux |
4419 | exit ;; |
4420 | sh64*:Linux:*:*) |
4421 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4422 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4423 | exit ;; |
4424 | sh*:Linux:*:*) |
4425 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4426 | @@ -983,14 +1002,17 @@ |
4427 | sparc:Linux:*:* | sparc64:Linux:*:*) |
4428 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4429 | exit ;; |
4430 | + tile*:Linux:*:*) |
4431 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4432 | + exit ;; |
4433 | vax:Linux:*:*) |
4434 | echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
4435 | exit ;; |
4436 | x86_64:Linux:*:*) |
4437 | - echo x86_64-unknown-linux-${LIBC} |
4438 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4439 | exit ;; |
4440 | xtensa*:Linux:*:*) |
4441 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4442 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4443 | exit ;; |
4444 | i*86:DYNIX/ptx:4*:*) |
4445 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
4446 | @@ -999,11 +1021,11 @@ |
4447 | echo i386-sequent-sysv4 |
4448 | exit ;; |
4449 | i*86:UNIX_SV:4.2MP:2.*) |
4450 | - # Unixware is an offshoot of SVR4, but it has its own version |
4451 | - # number series starting with 2... |
4452 | - # I am not positive that other SVR4 systems won't match this, |
4453 | + # Unixware is an offshoot of SVR4, but it has its own version |
4454 | + # number series starting with 2... |
4455 | + # I am not positive that other SVR4 systems won't match this, |
4456 | # I just have to hope. -- rms. |
4457 | - # Use sysv4.2uw... so that sysv4* matches it. |
4458 | + # Use sysv4.2uw... so that sysv4* matches it. |
4459 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
4460 | exit ;; |
4461 | i*86:OS/2:*:*) |
4462 | @@ -1035,7 +1057,7 @@ |
4463 | fi |
4464 | exit ;; |
4465 | i*86:*:5:[678]*) |
4466 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
4467 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
4468 | case `/bin/uname -X | grep "^Machine"` in |
4469 | *486*) UNAME_MACHINE=i486 ;; |
4470 | *Pentium) UNAME_MACHINE=i586 ;; |
4471 | @@ -1063,13 +1085,13 @@ |
4472 | exit ;; |
4473 | pc:*:*:*) |
4474 | # Left here for compatibility: |
4475 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
4476 | - # the processor, so we play safe by assuming i586. |
4477 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
4478 | + # the processor, so we play safe by assuming i586. |
4479 | # Note: whatever this is, it MUST be the same as what config.sub |
4480 | # prints for the "djgpp" host, or else GDB configury will decide that |
4481 | # this is a cross-build. |
4482 | echo i586-pc-msdosdjgpp |
4483 | - exit ;; |
4484 | + exit ;; |
4485 | Intel:Mach:3*:*) |
4486 | echo i386-pc-mach3 |
4487 | exit ;; |
4488 | @@ -1104,8 +1126,8 @@ |
4489 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
4490 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
4491 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
4492 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4493 | - && { echo i486-ncr-sysv4; exit; } ;; |
4494 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4495 | + && { echo i486-ncr-sysv4; exit; } ;; |
4496 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
4497 | OS_REL='.3' |
4498 | test -r /etc/.relid \ |
4499 | @@ -1148,10 +1170,10 @@ |
4500 | echo ns32k-sni-sysv |
4501 | fi |
4502 | exit ;; |
4503 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
4504 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
4505 | - echo i586-unisys-sysv4 |
4506 | - exit ;; |
4507 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
4508 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
4509 | + echo i586-unisys-sysv4 |
4510 | + exit ;; |
4511 | *:UNIX_System_V:4*:FTX*) |
4512 | # From Gerald Hewes <hewes@openmarket.com>. |
4513 | # How about differentiating between stratus architectures? -djm |
4514 | @@ -1177,11 +1199,11 @@ |
4515 | exit ;; |
4516 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
4517 | if [ -d /usr/nec ]; then |
4518 | - echo mips-nec-sysv${UNAME_RELEASE} |
4519 | + echo mips-nec-sysv${UNAME_RELEASE} |
4520 | else |
4521 | - echo mips-unknown-sysv${UNAME_RELEASE} |
4522 | + echo mips-unknown-sysv${UNAME_RELEASE} |
4523 | fi |
4524 | - exit ;; |
4525 | + exit ;; |
4526 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
4527 | echo powerpc-be-beos |
4528 | exit ;; |
4529 | @@ -1246,6 +1268,9 @@ |
4530 | *:QNX:*:4*) |
4531 | echo i386-pc-qnx |
4532 | exit ;; |
4533 | + NEO-?:NONSTOP_KERNEL:*:*) |
4534 | + echo neo-tandem-nsk${UNAME_RELEASE} |
4535 | + exit ;; |
4536 | NSE-?:NONSTOP_KERNEL:*:*) |
4537 | echo nse-tandem-nsk${UNAME_RELEASE} |
4538 | exit ;; |
4539 | @@ -1291,13 +1316,13 @@ |
4540 | echo pdp10-unknown-its |
4541 | exit ;; |
4542 | SEI:*:*:SEIUX) |
4543 | - echo mips-sei-seiux${UNAME_RELEASE} |
4544 | + echo mips-sei-seiux${UNAME_RELEASE} |
4545 | exit ;; |
4546 | *:DragonFly:*:*) |
4547 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
4548 | exit ;; |
4549 | *:*VMS:*:*) |
4550 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
4551 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
4552 | case "${UNAME_MACHINE}" in |
4553 | A*) echo alpha-dec-vms ; exit ;; |
4554 | I*) echo ia64-dec-vms ; exit ;; |
4555 | @@ -1315,6 +1340,9 @@ |
4556 | i*86:AROS:*:*) |
4557 | echo ${UNAME_MACHINE}-pc-aros |
4558 | exit ;; |
4559 | + x86_64:VMkernel:*:*) |
4560 | + echo ${UNAME_MACHINE}-unknown-esx |
4561 | + exit ;; |
4562 | esac |
4563 | |
4564 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
4565 | @@ -1337,11 +1365,11 @@ |
4566 | #include <sys/param.h> |
4567 | printf ("m68k-sony-newsos%s\n", |
4568 | #ifdef NEWSOS4 |
4569 | - "4" |
4570 | + "4" |
4571 | #else |
4572 | - "" |
4573 | + "" |
4574 | #endif |
4575 | - ); exit (0); |
4576 | + ); exit (0); |
4577 | #endif |
4578 | #endif |
4579 | |
4580 | |
4581 | === modified file 'config/config.sub' |
4582 | --- config/config.sub 2010-05-12 20:21:46 +0000 |
4583 | +++ config/config.sub 2013-02-20 19:26:35 +0000 |
4584 | @@ -1,10 +1,10 @@ |
4585 | #! /bin/sh |
4586 | # Configuration validation subroutine script. |
4587 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4588 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
4589 | -# Free Software Foundation, Inc. |
4590 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
4591 | +# 2011, 2012 Free Software Foundation, Inc. |
4592 | |
4593 | -timestamp='2010-01-22' |
4594 | +timestamp='2012-02-10' |
4595 | |
4596 | # This file is (in principle) common to ALL GNU software. |
4597 | # The presence of a machine in this file suggests that SOME GNU software |
4598 | @@ -21,9 +21,7 @@ |
4599 | # GNU General Public License for more details. |
4600 | # |
4601 | # You should have received a copy of the GNU General Public License |
4602 | -# along with this program; if not, write to the Free Software |
4603 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
4604 | -# 02110-1301, USA. |
4605 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
4606 | # |
4607 | # As a special exception to the GNU General Public License, if you |
4608 | # distribute this file as part of a program that contains a |
4609 | @@ -76,8 +74,8 @@ |
4610 | GNU config.sub ($timestamp) |
4611 | |
4612 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4613 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
4614 | -Software Foundation, Inc. |
4615 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
4616 | +Free Software Foundation, Inc. |
4617 | |
4618 | This is free software; see the source for copying conditions. There is NO |
4619 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4620 | @@ -124,13 +122,18 @@ |
4621 | # Here we must recognize all the valid KERNEL-OS combinations. |
4622 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
4623 | case $maybe_os in |
4624 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
4625 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
4626 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
4627 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
4628 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
4629 | kopensolaris*-gnu* | \ |
4630 | storm-chaos* | os2-emx* | rtmk-nova*) |
4631 | os=-$maybe_os |
4632 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
4633 | ;; |
4634 | + android-linux) |
4635 | + os=-linux-android |
4636 | + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
4637 | + ;; |
4638 | *) |
4639 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
4640 | if [ $basic_machine != $1 ] |
4641 | @@ -157,8 +160,8 @@ |
4642 | os= |
4643 | basic_machine=$1 |
4644 | ;; |
4645 | - -bluegene*) |
4646 | - os=-cnk |
4647 | + -bluegene*) |
4648 | + os=-cnk |
4649 | ;; |
4650 | -sim | -cisco | -oki | -wec | -winbond) |
4651 | os= |
4652 | @@ -174,10 +177,10 @@ |
4653 | os=-chorusos |
4654 | basic_machine=$1 |
4655 | ;; |
4656 | - -chorusrdb) |
4657 | - os=-chorusrdb |
4658 | + -chorusrdb) |
4659 | + os=-chorusrdb |
4660 | basic_machine=$1 |
4661 | - ;; |
4662 | + ;; |
4663 | -hiux*) |
4664 | os=-hiuxwe2 |
4665 | ;; |
4666 | @@ -246,17 +249,22 @@ |
4667 | # Some are omitted here because they have special meanings below. |
4668 | 1750a | 580 \ |
4669 | | a29k \ |
4670 | + | aarch64 | aarch64_be \ |
4671 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
4672 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
4673 | | am33_2.0 \ |
4674 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
4675 | + | be32 | be64 \ |
4676 | | bfin \ |
4677 | | c4x | clipper \ |
4678 | | d10v | d30v | dlx | dsp16xx | dvp \ |
4679 | + | epiphany \ |
4680 | | fido | fr30 | frv \ |
4681 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
4682 | + | hexagon \ |
4683 | | i370 | i860 | i960 | ia64 \ |
4684 | | ip2k | iq2000 \ |
4685 | + | le32 | le64 \ |
4686 | | lm32 \ |
4687 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
4688 | | maxq | mb | microblaze | mcore | mep | metag \ |
4689 | @@ -282,29 +290,39 @@ |
4690 | | moxie \ |
4691 | | mt \ |
4692 | | msp430 \ |
4693 | + | nds32 | nds32le | nds32be \ |
4694 | | nios | nios2 \ |
4695 | | ns16k | ns32k \ |
4696 | + | open8 \ |
4697 | | or32 \ |
4698 | | pdp10 | pdp11 | pj | pjl \ |
4699 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
4700 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4701 | | pyramid \ |
4702 | - | rx \ |
4703 | + | rl78 | rx \ |
4704 | | score \ |
4705 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
4706 | | sh64 | sh64le \ |
4707 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
4708 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
4709 | - | spu | strongarm \ |
4710 | - | tahoe | thumb | tic4x | tic80 | tron \ |
4711 | + | spu \ |
4712 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
4713 | | ubicom32 \ |
4714 | - | v850 | v850e \ |
4715 | + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
4716 | | we32k \ |
4717 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
4718 | + | x86 | xc16x | xstormy16 | xtensa \ |
4719 | | z8k | z80) |
4720 | basic_machine=$basic_machine-unknown |
4721 | ;; |
4722 | - m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
4723 | - # Motorola 68HC11/12. |
4724 | + c54x) |
4725 | + basic_machine=tic54x-unknown |
4726 | + ;; |
4727 | + c55x) |
4728 | + basic_machine=tic55x-unknown |
4729 | + ;; |
4730 | + c6x) |
4731 | + basic_machine=tic6x-unknown |
4732 | + ;; |
4733 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
4734 | basic_machine=$basic_machine-unknown |
4735 | os=-none |
4736 | ;; |
4737 | @@ -314,6 +332,21 @@ |
4738 | basic_machine=mt-unknown |
4739 | ;; |
4740 | |
4741 | + strongarm | thumb | xscale) |
4742 | + basic_machine=arm-unknown |
4743 | + ;; |
4744 | + xgate) |
4745 | + basic_machine=$basic_machine-unknown |
4746 | + os=-none |
4747 | + ;; |
4748 | + xscaleeb) |
4749 | + basic_machine=armeb-unknown |
4750 | + ;; |
4751 | + |
4752 | + xscaleel) |
4753 | + basic_machine=armel-unknown |
4754 | + ;; |
4755 | + |
4756 | # We use `pc' rather than `unknown' |
4757 | # because (1) that's what they normally are, and |
4758 | # (2) the word "unknown" tends to confuse beginning users. |
4759 | @@ -328,21 +361,25 @@ |
4760 | # Recognize the basic CPU types with company name. |
4761 | 580-* \ |
4762 | | a29k-* \ |
4763 | + | aarch64-* | aarch64_be-* \ |
4764 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
4765 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
4766 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
4767 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
4768 | | avr-* | avr32-* \ |
4769 | + | be32-* | be64-* \ |
4770 | | bfin-* | bs2000-* \ |
4771 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
4772 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
4773 | | clipper-* | craynv-* | cydra-* \ |
4774 | | d10v-* | d30v-* | dlx-* \ |
4775 | | elxsi-* \ |
4776 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
4777 | | h8300-* | h8500-* \ |
4778 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
4779 | + | hexagon-* \ |
4780 | | i*86-* | i860-* | i960-* | ia64-* \ |
4781 | | ip2k-* | iq2000-* \ |
4782 | + | le32-* | le64-* \ |
4783 | | lm32-* \ |
4784 | | m32c-* | m32r-* | m32rle-* \ |
4785 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
4786 | @@ -368,26 +405,29 @@ |
4787 | | mmix-* \ |
4788 | | mt-* \ |
4789 | | msp430-* \ |
4790 | + | nds32-* | nds32le-* | nds32be-* \ |
4791 | | nios-* | nios2-* \ |
4792 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4793 | + | open8-* \ |
4794 | | orion-* \ |
4795 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
4796 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
4797 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
4798 | | pyramid-* \ |
4799 | - | romp-* | rs6000-* | rx-* \ |
4800 | + | rl78-* | romp-* | rs6000-* | rx-* \ |
4801 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
4802 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
4803 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
4804 | | sparclite-* \ |
4805 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
4806 | - | tahoe-* | thumb-* \ |
4807 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
4808 | + | tahoe-* \ |
4809 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
4810 | - | tile-* | tilegx-* \ |
4811 | + | tile*-* \ |
4812 | | tron-* \ |
4813 | | ubicom32-* \ |
4814 | - | v850-* | v850e-* | vax-* \ |
4815 | + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
4816 | + | vax-* \ |
4817 | | we32k-* \ |
4818 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
4819 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
4820 | | xstormy16-* | xtensa*-* \ |
4821 | | ymp-* \ |
4822 | | z8k-* | z80-*) |
4823 | @@ -412,7 +452,7 @@ |
4824 | basic_machine=a29k-amd |
4825 | os=-udi |
4826 | ;; |
4827 | - abacus) |
4828 | + abacus) |
4829 | basic_machine=abacus-unknown |
4830 | ;; |
4831 | adobe68k) |
4832 | @@ -482,11 +522,20 @@ |
4833 | basic_machine=powerpc-ibm |
4834 | os=-cnk |
4835 | ;; |
4836 | + c54x-*) |
4837 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4838 | + ;; |
4839 | + c55x-*) |
4840 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4841 | + ;; |
4842 | + c6x-*) |
4843 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
4844 | + ;; |
4845 | c90) |
4846 | basic_machine=c90-cray |
4847 | os=-unicos |
4848 | ;; |
4849 | - cegcc) |
4850 | + cegcc) |
4851 | basic_machine=arm-unknown |
4852 | os=-cegcc |
4853 | ;; |
4854 | @@ -518,7 +567,7 @@ |
4855 | basic_machine=craynv-cray |
4856 | os=-unicosmp |
4857 | ;; |
4858 | - cr16) |
4859 | + cr16 | cr16-*) |
4860 | basic_machine=cr16-unknown |
4861 | os=-elf |
4862 | ;; |
4863 | @@ -676,7 +725,6 @@ |
4864 | i370-ibm* | ibm*) |
4865 | basic_machine=i370-ibm |
4866 | ;; |
4867 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
4868 | i*86v32) |
4869 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
4870 | os=-sysv32 |
4871 | @@ -734,7 +782,7 @@ |
4872 | basic_machine=ns32k-utek |
4873 | os=-sysv |
4874 | ;; |
4875 | - microblaze) |
4876 | + microblaze) |
4877 | basic_machine=microblaze-xilinx |
4878 | ;; |
4879 | mingw32) |
4880 | @@ -791,10 +839,18 @@ |
4881 | ms1-*) |
4882 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
4883 | ;; |
4884 | + msys) |
4885 | + basic_machine=i386-pc |
4886 | + os=-msys |
4887 | + ;; |
4888 | mvs) |
4889 | basic_machine=i370-ibm |
4890 | os=-mvs |
4891 | ;; |
4892 | + nacl) |
4893 | + basic_machine=le32-unknown |
4894 | + os=-nacl |
4895 | + ;; |
4896 | ncr3000) |
4897 | basic_machine=i486-ncr |
4898 | os=-sysv4 |
4899 | @@ -859,6 +915,12 @@ |
4900 | np1) |
4901 | basic_machine=np1-gould |
4902 | ;; |
4903 | + neo-tandem) |
4904 | + basic_machine=neo-tandem |
4905 | + ;; |
4906 | + nse-tandem) |
4907 | + basic_machine=nse-tandem |
4908 | + ;; |
4909 | nsr-tandem) |
4910 | basic_machine=nsr-tandem |
4911 | ;; |
4912 | @@ -941,9 +1003,10 @@ |
4913 | ;; |
4914 | power) basic_machine=power-ibm |
4915 | ;; |
4916 | - ppc) basic_machine=powerpc-unknown |
4917 | + ppc | ppcbe) basic_machine=powerpc-unknown |
4918 | ;; |
4919 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
4920 | + ppc-* | ppcbe-*) |
4921 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
4922 | ;; |
4923 | ppcle | powerpclittle | ppc-le | powerpc-little) |
4924 | basic_machine=powerpcle-unknown |
4925 | @@ -1037,6 +1100,9 @@ |
4926 | basic_machine=i860-stratus |
4927 | os=-sysv4 |
4928 | ;; |
4929 | + strongarm-* | thumb-*) |
4930 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
4931 | + ;; |
4932 | sun2) |
4933 | basic_machine=m68000-sun |
4934 | ;; |
4935 | @@ -1093,25 +1159,8 @@ |
4936 | basic_machine=t90-cray |
4937 | os=-unicos |
4938 | ;; |
4939 | - tic54x | c54x*) |
4940 | - basic_machine=tic54x-unknown |
4941 | - os=-coff |
4942 | - ;; |
4943 | - tic55x | c55x*) |
4944 | - basic_machine=tic55x-unknown |
4945 | - os=-coff |
4946 | - ;; |
4947 | - tic6x | c6x*) |
4948 | - basic_machine=tic6x-unknown |
4949 | - os=-coff |
4950 | - ;; |
4951 | - # This must be matched before tile*. |
4952 | - tilegx*) |
4953 | - basic_machine=tilegx-unknown |
4954 | - os=-linux-gnu |
4955 | - ;; |
4956 | tile*) |
4957 | - basic_machine=tile-unknown |
4958 | + basic_machine=$basic_machine-unknown |
4959 | os=-linux-gnu |
4960 | ;; |
4961 | tx39) |
4962 | @@ -1181,6 +1230,9 @@ |
4963 | xps | xps100) |
4964 | basic_machine=xps100-honeywell |
4965 | ;; |
4966 | + xscale-* | xscalee[bl]-*) |
4967 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
4968 | + ;; |
4969 | ymp) |
4970 | basic_machine=ymp-cray |
4971 | os=-unicos |
4972 | @@ -1278,11 +1330,11 @@ |
4973 | if [ x"$os" != x"" ] |
4974 | then |
4975 | case $os in |
4976 | - # First match some system type aliases |
4977 | - # that might get confused with valid system types. |
4978 | + # First match some system type aliases |
4979 | + # that might get confused with valid system types. |
4980 | # -solaris* is a basic system type, with this one exception. |
4981 | - -auroraux) |
4982 | - os=-auroraux |
4983 | + -auroraux) |
4984 | + os=-auroraux |
4985 | ;; |
4986 | -solaris1 | -solaris1.*) |
4987 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
4988 | @@ -1318,8 +1370,9 @@ |
4989 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
4990 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
4991 | | -chorusos* | -chorusrdb* | -cegcc* \ |
4992 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4993 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
4994 | + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4995 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
4996 | + | -linux-newlib* | -linux-uclibc* \ |
4997 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
4998 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
4999 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
5000 | @@ -1366,7 +1419,7 @@ |
The diff has been truncated for viewing.
Good work.