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 @@ | |||
6 | 1 | Current maintainer | 1 | Current maintainers |
7 | 2 | Nate Gallaher <ngallaher@zoidberg.wp.comcast.net> | ||
8 | 2 | Sebastian Pipping <sebastian@pipping.org> | 3 | Sebastian Pipping <sebastian@pipping.org> |
9 | 3 | 4 | ||
10 | 4 | Main author: | 5 | Main author: |
11 | @@ -8,4 +9,6 @@ | |||
12 | 8 | David Morris - pkg-config and installation patches. | 9 | David Morris - pkg-config and installation patches. |
13 | 9 | Robin Patenall - migration to XHTML 1.0 strict | 10 | Robin Patenall - migration to XHTML 1.0 strict |
14 | 10 | Sebastian Pipping - several bugfixes | 11 | Sebastian Pipping - several bugfixes |
16 | 11 | 12 | Nate Gallaher - additional assertion macros | |
17 | 13 | Robert Buchholz - build system fixes | ||
18 | 14 | Dagobert Michelsen - build system fixes | ||
19 | 12 | 15 | ||
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 | 16 | Simple install procedure | 16 | Simple install procedure |
25 | 17 | ------------------------ | 17 | ------------------------ |
26 | 18 | 18 | ||
29 | 19 | > gzip -cd cpptest-1.1.1.tar.gz | tar xvf - # unpack the sources | 19 | > gzip -cd cpptest-1.1.2.tar.gz | tar xvf - # unpack the sources |
30 | 20 | > cd cpptest-1.1.1 # change to the its directory | 20 | > cd cpptest-1.1.2 # change to the its directory |
31 | 21 | > ./configure # run the 'configure' script | 21 | > ./configure # run the 'configure' script |
32 | 22 | > make # build 'cpptest' | 22 | > make # build 'cpptest' |
33 | 23 | 23 | ||
34 | 24 | 24 | ||
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 @@ | |||
40 | 1 | # Makefile.in generated by automake 1.11.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.12.1 from Makefile.am. |
41 | 2 | # @configure_input@ | 2 | # @configure_input@ |
42 | 3 | 3 | ||
46 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
47 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | 5 | |
45 | 6 | # Inc. | ||
48 | 7 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
49 | 8 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
50 | 9 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
51 | @@ -16,6 +15,23 @@ | |||
52 | 16 | @SET_MAKE@ | 15 | @SET_MAKE@ |
53 | 17 | 16 | ||
54 | 18 | VPATH = @srcdir@ | 17 | VPATH = @srcdir@ |
55 | 18 | am__make_dryrun = \ | ||
56 | 19 | { \ | ||
57 | 20 | am__dry=no; \ | ||
58 | 21 | case $$MAKEFLAGS in \ | ||
59 | 22 | *\\[\ \ ]*) \ | ||
60 | 23 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
61 | 24 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
62 | 25 | *) \ | ||
63 | 26 | for am__flg in $$MAKEFLAGS; do \ | ||
64 | 27 | case $$am__flg in \ | ||
65 | 28 | *=*|--*) ;; \ | ||
66 | 29 | *n*) am__dry=yes; break;; \ | ||
67 | 30 | esac; \ | ||
68 | 31 | done;; \ | ||
69 | 32 | esac; \ | ||
70 | 33 | test $$am__dry = yes; \ | ||
71 | 34 | } | ||
72 | 19 | pkgdatadir = $(datadir)/@PACKAGE@ | 35 | pkgdatadir = $(datadir)/@PACKAGE@ |
73 | 20 | pkgincludedir = $(includedir)/@PACKAGE@ | 36 | pkgincludedir = $(includedir)/@PACKAGE@ |
74 | 21 | pkglibdir = $(libdir)/@PACKAGE@ | 37 | pkglibdir = $(libdir)/@PACKAGE@ |
75 | @@ -39,10 +55,13 @@ | |||
76 | 39 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/INSTALL.quick.in \ | 55 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/INSTALL.quick.in \ |
77 | 40 | $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | 56 | $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
78 | 41 | $(srcdir)/README.in $(srcdir)/libcpptest.pc.in \ | 57 | $(srcdir)/README.in $(srcdir)/libcpptest.pc.in \ |
79 | 58 | $(top_srcdir)/config/config.guess \ | ||
80 | 42 | $(top_srcdir)/config/config.h.in \ | 59 | $(top_srcdir)/config/config.h.in \ |
84 | 43 | $(top_srcdir)/config/stamp-h.in $(top_srcdir)/configure \ | 60 | $(top_srcdir)/config/config.sub \ |
85 | 44 | AUTHORS COPYING ChangeLog INSTALL NEWS config/config.guess \ | 61 | $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ |
86 | 45 | config/config.sub config/depcomp config/install-sh \ | 62 | $(top_srcdir)/config/missing $(top_srcdir)/config/stamp-h.in \ |
87 | 63 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ | ||
88 | 64 | config/config.guess config/config.sub config/install-sh \ | ||
89 | 46 | config/ltmain.sh config/missing | 65 | config/ltmain.sh config/missing |
90 | 47 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 66 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
91 | 48 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 67 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
92 | @@ -63,6 +82,11 @@ | |||
93 | 63 | install-pdf-recursive install-ps-recursive install-recursive \ | 82 | install-pdf-recursive install-ps-recursive install-recursive \ |
94 | 64 | installcheck-recursive installdirs-recursive pdf-recursive \ | 83 | installcheck-recursive installdirs-recursive pdf-recursive \ |
95 | 65 | ps-recursive uninstall-recursive | 84 | ps-recursive uninstall-recursive |
96 | 85 | am__can_run_installinfo = \ | ||
97 | 86 | case $$AM_UPDATE_INFO_DIR in \ | ||
98 | 87 | n|no|NO) false;; \ | ||
99 | 88 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
100 | 89 | esac | ||
101 | 66 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | 90 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
102 | 67 | am__vpath_adj = case $$p in \ | 91 | am__vpath_adj = case $$p in \ |
103 | 68 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | 92 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
104 | @@ -84,23 +108,33 @@ | |||
105 | 84 | am__base_list = \ | 108 | am__base_list = \ |
106 | 85 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | 109 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
107 | 86 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | 110 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
108 | 111 | am__uninstall_files_from_dir = { \ | ||
109 | 112 | test -z "$$files" \ | ||
110 | 113 | || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | ||
111 | 114 | || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | ||
112 | 115 | $(am__cd) "$$dir" && rm -f $$files; }; \ | ||
113 | 116 | } | ||
114 | 87 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" | 117 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" |
115 | 88 | DATA = $(pkgconfig_DATA) | 118 | DATA = $(pkgconfig_DATA) |
116 | 89 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | 119 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
117 | 90 | distclean-recursive maintainer-clean-recursive | 120 | distclean-recursive maintainer-clean-recursive |
118 | 91 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | 121 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
119 | 92 | $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | 122 | $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
121 | 93 | distdir dist dist-all distcheck | 123 | cscope distdir dist dist-all distcheck |
122 | 94 | ETAGS = etags | 124 | ETAGS = etags |
123 | 95 | CTAGS = ctags | 125 | CTAGS = ctags |
124 | 126 | CSCOPE = cscope | ||
125 | 96 | DIST_SUBDIRS = src test doc | 127 | DIST_SUBDIRS = src test doc |
126 | 97 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 128 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
127 | 98 | distdir = $(PACKAGE)-$(VERSION) | 129 | distdir = $(PACKAGE)-$(VERSION) |
128 | 99 | top_distdir = $(distdir) | 130 | top_distdir = $(distdir) |
129 | 100 | am__remove_distdir = \ | 131 | am__remove_distdir = \ |
133 | 101 | { test ! -d "$(distdir)" \ | 132 | if test -d "$(distdir)"; then \ |
134 | 102 | || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ | 133 | find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
135 | 103 | && rm -fr "$(distdir)"; }; } | 134 | && rm -rf "$(distdir)" \ |
136 | 135 | || { sleep 5 && rm -rf "$(distdir)"; }; \ | ||
137 | 136 | else :; fi | ||
138 | 137 | am__post_remove_distdir = $(am__remove_distdir) | ||
139 | 104 | am__relativize = \ | 138 | am__relativize = \ |
140 | 105 | dir0=`pwd`; \ | 139 | dir0=`pwd`; \ |
141 | 106 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | 140 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
142 | @@ -128,7 +162,10 @@ | |||
143 | 128 | reldir="$$dir2" | 162 | reldir="$$dir2" |
144 | 129 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip | 163 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip |
145 | 130 | GZIP_ENV = --best | 164 | GZIP_ENV = --best |
146 | 165 | DIST_TARGETS = dist-gzip dist-zip | ||
147 | 131 | distuninstallcheck_listfiles = find . -type f -print | 166 | distuninstallcheck_listfiles = find . -type f -print |
148 | 167 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | ||
149 | 168 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | ||
150 | 132 | distcleancheck_listfiles = find . -type f -print | 169 | distcleancheck_listfiles = find . -type f -print |
151 | 133 | ACLOCAL = @ACLOCAL@ | 170 | ACLOCAL = @ACLOCAL@ |
152 | 134 | AMTAR = @AMTAR@ | 171 | AMTAR = @AMTAR@ |
153 | @@ -149,6 +186,7 @@ | |||
154 | 149 | CYGPATH_W = @CYGPATH_W@ | 186 | CYGPATH_W = @CYGPATH_W@ |
155 | 150 | DEFS = @DEFS@ | 187 | DEFS = @DEFS@ |
156 | 151 | DEPDIR = @DEPDIR@ | 188 | DEPDIR = @DEPDIR@ |
157 | 189 | DLLTOOL = @DLLTOOL@ | ||
158 | 152 | DSYMUTIL = @DSYMUTIL@ | 190 | DSYMUTIL = @DSYMUTIL@ |
159 | 153 | DUMPBIN = @DUMPBIN@ | 191 | DUMPBIN = @DUMPBIN@ |
160 | 154 | ECHO_C = @ECHO_C@ | 192 | ECHO_C = @ECHO_C@ |
161 | @@ -173,6 +211,7 @@ | |||
162 | 173 | LTLIBOBJS = @LTLIBOBJS@ | 211 | LTLIBOBJS = @LTLIBOBJS@ |
163 | 174 | LT_VERSION = @LT_VERSION@ | 212 | LT_VERSION = @LT_VERSION@ |
164 | 175 | MAKEINFO = @MAKEINFO@ | 213 | MAKEINFO = @MAKEINFO@ |
165 | 214 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
166 | 176 | MKDIR_P = @MKDIR_P@ | 215 | MKDIR_P = @MKDIR_P@ |
167 | 177 | NM = @NM@ | 216 | NM = @NM@ |
168 | 178 | NMEDIT = @NMEDIT@ | 217 | NMEDIT = @NMEDIT@ |
169 | @@ -198,6 +237,7 @@ | |||
170 | 198 | abs_srcdir = @abs_srcdir@ | 237 | abs_srcdir = @abs_srcdir@ |
171 | 199 | abs_top_builddir = @abs_top_builddir@ | 238 | abs_top_builddir = @abs_top_builddir@ |
172 | 200 | abs_top_srcdir = @abs_top_srcdir@ | 239 | abs_top_srcdir = @abs_top_srcdir@ |
173 | 240 | ac_ct_AR = @ac_ct_AR@ | ||
174 | 201 | ac_ct_CC = @ac_ct_CC@ | 241 | ac_ct_CC = @ac_ct_CC@ |
175 | 202 | ac_ct_CXX = @ac_ct_CXX@ | 242 | ac_ct_CXX = @ac_ct_CXX@ |
176 | 203 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 243 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
177 | @@ -232,7 +272,6 @@ | |||
178 | 232 | localedir = @localedir@ | 272 | localedir = @localedir@ |
179 | 233 | localstatedir = @localstatedir@ | 273 | localstatedir = @localstatedir@ |
180 | 234 | mandir = @mandir@ | 274 | mandir = @mandir@ |
181 | 235 | mkdir_p = @mkdir_p@ | ||
182 | 236 | oldincludedir = @oldincludedir@ | 275 | oldincludedir = @oldincludedir@ |
183 | 237 | pdfdir = @pdfdir@ | 276 | pdfdir = @pdfdir@ |
184 | 238 | prefix = @prefix@ | 277 | prefix = @prefix@ |
185 | @@ -293,7 +332,7 @@ | |||
186 | 293 | all: all-recursive | 332 | all: all-recursive |
187 | 294 | 333 | ||
188 | 295 | .SUFFIXES: | 334 | .SUFFIXES: |
190 | 296 | am--refresh: | 335 | am--refresh: Makefile |
191 | 297 | @: | 336 | @: |
192 | 298 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | 337 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
193 | 299 | @for dep in $?; do \ | 338 | @for dep in $?; do \ |
194 | @@ -329,10 +368,8 @@ | |||
195 | 329 | $(am__aclocal_m4_deps): | 368 | $(am__aclocal_m4_deps): |
196 | 330 | 369 | ||
197 | 331 | config/config.h: config/stamp-h1 | 370 | config/config.h: config/stamp-h1 |
202 | 332 | @if test ! -f $@; then \ | 371 | @if test ! -f $@; then rm -f config/stamp-h1; else :; fi |
203 | 333 | rm -f config/stamp-h1; \ | 372 | @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; else :; fi |
200 | 334 | $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \ | ||
201 | 335 | else :; fi | ||
204 | 336 | 373 | ||
205 | 337 | config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status | 374 | config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status |
206 | 338 | @rm -f config/stamp-h1 | 375 | @rm -f config/stamp-h1 |
207 | @@ -363,8 +400,11 @@ | |||
208 | 363 | -rm -f libtool config.lt | 400 | -rm -f libtool config.lt |
209 | 364 | install-pkgconfigDATA: $(pkgconfig_DATA) | 401 | install-pkgconfigDATA: $(pkgconfig_DATA) |
210 | 365 | @$(NORMAL_INSTALL) | 402 | @$(NORMAL_INSTALL) |
211 | 366 | test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" | ||
212 | 367 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | 403 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
213 | 404 | if test -n "$$list"; then \ | ||
214 | 405 | echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ | ||
215 | 406 | $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ | ||
216 | 407 | fi; \ | ||
217 | 368 | for p in $$list; do \ | 408 | for p in $$list; do \ |
218 | 369 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 409 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
219 | 370 | echo "$$d$$p"; \ | 410 | echo "$$d$$p"; \ |
220 | @@ -378,16 +418,14 @@ | |||
221 | 378 | @$(NORMAL_UNINSTALL) | 418 | @$(NORMAL_UNINSTALL) |
222 | 379 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | 419 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
223 | 380 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | 420 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
227 | 381 | test -n "$$files" || exit 0; \ | 421 | dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) |
225 | 382 | echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ | ||
226 | 383 | cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files | ||
228 | 384 | 422 | ||
229 | 385 | # This directory's subdirectories are mostly independent; you can cd | 423 | # This directory's subdirectories are mostly independent; you can cd |
235 | 386 | # into them and run `make' without going through this Makefile. | 424 | # into them and run 'make' without going through this Makefile. |
236 | 387 | # To change the values of `make' variables: instead of editing Makefiles, | 425 | # To change the values of 'make' variables: instead of editing Makefiles, |
237 | 388 | # (1) if the variable is set in `config.status', edit `config.status' | 426 | # (1) if the variable is set in 'config.status', edit 'config.status' |
238 | 389 | # (which will cause the Makefiles to be regenerated when you run `make'); | 427 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
239 | 390 | # (2) otherwise, pass the desired values on the `make' command line. | 428 | # (2) otherwise, pass the desired values on the 'make' command line. |
240 | 391 | $(RECURSIVE_TARGETS): | 429 | $(RECURSIVE_TARGETS): |
241 | 392 | @fail= failcom='exit 1'; \ | 430 | @fail= failcom='exit 1'; \ |
242 | 393 | for f in x $$MAKEFLAGS; do \ | 431 | for f in x $$MAKEFLAGS; do \ |
243 | @@ -451,6 +489,10 @@ | |||
244 | 451 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 489 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
245 | 452 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | 490 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
246 | 453 | done | 491 | done |
247 | 492 | cscopelist-recursive: | ||
248 | 493 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
249 | 494 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ | ||
250 | 495 | done | ||
251 | 454 | 496 | ||
252 | 455 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | 497 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
253 | 456 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 498 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
254 | @@ -514,8 +556,32 @@ | |||
255 | 514 | && $(am__cd) $(top_srcdir) \ | 556 | && $(am__cd) $(top_srcdir) \ |
256 | 515 | && gtags -i $(GTAGS_ARGS) "$$here" | 557 | && gtags -i $(GTAGS_ARGS) "$$here" |
257 | 516 | 558 | ||
258 | 559 | cscope: cscope.files | ||
259 | 560 | test ! -s cscope.files \ | ||
260 | 561 | || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) | ||
261 | 562 | |||
262 | 563 | clean-cscope: | ||
263 | 564 | -rm -f cscope.files | ||
264 | 565 | |||
265 | 566 | cscope.files: clean-cscope cscopelist-recursive cscopelist | ||
266 | 567 | |||
267 | 568 | cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) | ||
268 | 569 | list='$(SOURCES) $(HEADERS) $(LISP)'; \ | ||
269 | 570 | case "$(srcdir)" in \ | ||
270 | 571 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ | ||
271 | 572 | *) sdir=$(subdir)/$(srcdir) ;; \ | ||
272 | 573 | esac; \ | ||
273 | 574 | for i in $$list; do \ | ||
274 | 575 | if test -f "$$i"; then \ | ||
275 | 576 | echo "$(subdir)/$$i"; \ | ||
276 | 577 | else \ | ||
277 | 578 | echo "$$sdir/$$i"; \ | ||
278 | 579 | fi; \ | ||
279 | 580 | done >> $(top_builddir)/cscope.files | ||
280 | 581 | |||
281 | 517 | distclean-tags: | 582 | distclean-tags: |
282 | 518 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | 583 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
283 | 584 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files | ||
284 | 519 | 585 | ||
285 | 520 | distdir: $(DISTFILES) | 586 | distdir: $(DISTFILES) |
286 | 521 | $(am__remove_distdir) | 587 | $(am__remove_distdir) |
287 | @@ -551,13 +617,10 @@ | |||
288 | 551 | done | 617 | done |
289 | 552 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | 618 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
290 | 553 | if test "$$subdir" = .; then :; else \ | 619 | if test "$$subdir" = .; then :; else \ |
298 | 554 | test -d "$(distdir)/$$subdir" \ | 620 | $(am__make_dryrun) \ |
299 | 555 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | 621 | || test -d "$(distdir)/$$subdir" \ |
300 | 556 | || exit 1; \ | 622 | || $(MKDIR_P) "$(distdir)/$$subdir" \ |
301 | 557 | fi; \ | 623 | || exit 1; \ |
295 | 558 | done | ||
296 | 559 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
297 | 560 | if test "$$subdir" = .; then :; else \ | ||
302 | 561 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | 624 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
303 | 562 | $(am__relativize); \ | 625 | $(am__relativize); \ |
304 | 563 | new_distdir=$$reldir; \ | 626 | new_distdir=$$reldir; \ |
305 | @@ -586,37 +649,35 @@ | |||
306 | 586 | || chmod -R a+r "$(distdir)" | 649 | || chmod -R a+r "$(distdir)" |
307 | 587 | dist-gzip: distdir | 650 | dist-gzip: distdir |
308 | 588 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 651 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
310 | 589 | $(am__remove_distdir) | 652 | $(am__post_remove_distdir) |
311 | 590 | 653 | ||
312 | 591 | dist-bzip2: distdir | 654 | dist-bzip2: distdir |
315 | 592 | tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 | 655 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
316 | 593 | $(am__remove_distdir) | 656 | $(am__post_remove_distdir) |
317 | 594 | 657 | ||
321 | 595 | dist-lzma: distdir | 658 | dist-lzip: distdir |
322 | 596 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma | 659 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
323 | 597 | $(am__remove_distdir) | 660 | $(am__post_remove_distdir) |
324 | 598 | 661 | ||
325 | 599 | dist-xz: distdir | 662 | dist-xz: distdir |
328 | 600 | tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz | 663 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
329 | 601 | $(am__remove_distdir) | 664 | $(am__post_remove_distdir) |
330 | 602 | 665 | ||
331 | 603 | dist-tarZ: distdir | 666 | dist-tarZ: distdir |
332 | 604 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | 667 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
334 | 605 | $(am__remove_distdir) | 668 | $(am__post_remove_distdir) |
335 | 606 | 669 | ||
336 | 607 | dist-shar: distdir | 670 | dist-shar: distdir |
337 | 608 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz | 671 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
339 | 609 | $(am__remove_distdir) | 672 | $(am__post_remove_distdir) |
340 | 610 | dist-zip: distdir | 673 | dist-zip: distdir |
341 | 611 | -rm -f $(distdir).zip | 674 | -rm -f $(distdir).zip |
342 | 612 | zip -rq $(distdir).zip $(distdir) | 675 | zip -rq $(distdir).zip $(distdir) |
344 | 613 | $(am__remove_distdir) | 676 | $(am__post_remove_distdir) |
345 | 614 | 677 | ||
351 | 615 | dist dist-all: distdir | 678 | dist dist-all: |
352 | 616 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 679 | $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' |
353 | 617 | -rm -f $(distdir).zip | 680 | $(am__post_remove_distdir) |
349 | 618 | zip -rq $(distdir).zip $(distdir) | ||
350 | 619 | $(am__remove_distdir) | ||
354 | 620 | 681 | ||
355 | 621 | # This target untars the dist file and tries a VPATH configuration. Then | 682 | # This target untars the dist file and tries a VPATH configuration. Then |
356 | 622 | # it guarantees that the distribution is self-contained by making another | 683 | # it guarantees that the distribution is self-contained by making another |
357 | @@ -627,8 +688,8 @@ | |||
358 | 627 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ | 688 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
359 | 628 | *.tar.bz2*) \ | 689 | *.tar.bz2*) \ |
360 | 629 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ | 690 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
363 | 630 | *.tar.lzma*) \ | 691 | *.tar.lz*) \ |
364 | 631 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ | 692 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
365 | 632 | *.tar.xz*) \ | 693 | *.tar.xz*) \ |
366 | 633 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ | 694 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
367 | 634 | *.tar.Z*) \ | 695 | *.tar.Z*) \ |
368 | @@ -648,6 +709,7 @@ | |||
369 | 648 | && am__cwd=`pwd` \ | 709 | && am__cwd=`pwd` \ |
370 | 649 | && $(am__cd) $(distdir)/_build \ | 710 | && $(am__cd) $(distdir)/_build \ |
371 | 650 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | 711 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
372 | 712 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ | ||
373 | 651 | $(DISTCHECK_CONFIGURE_FLAGS) \ | 713 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
374 | 652 | && $(MAKE) $(AM_MAKEFLAGS) \ | 714 | && $(MAKE) $(AM_MAKEFLAGS) \ |
375 | 653 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ | 715 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
376 | @@ -671,13 +733,21 @@ | |||
377 | 671 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ | 733 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
378 | 672 | && cd "$$am__cwd" \ | 734 | && cd "$$am__cwd" \ |
379 | 673 | || exit 1 | 735 | || exit 1 |
381 | 674 | $(am__remove_distdir) | 736 | $(am__post_remove_distdir) |
382 | 675 | @(echo "$(distdir) archives ready for distribution: "; \ | 737 | @(echo "$(distdir) archives ready for distribution: "; \ |
383 | 676 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | 738 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
384 | 677 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | 739 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
385 | 678 | distuninstallcheck: | 740 | distuninstallcheck: |
388 | 679 | @$(am__cd) '$(distuninstallcheck_dir)' \ | 741 | @test -n '$(distuninstallcheck_dir)' || { \ |
389 | 680 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ | 742 | echo 'ERROR: trying to run $@ with an empty' \ |
390 | 743 | '$$(distuninstallcheck_dir)' >&2; \ | ||
391 | 744 | exit 1; \ | ||
392 | 745 | }; \ | ||
393 | 746 | $(am__cd) '$(distuninstallcheck_dir)' || { \ | ||
394 | 747 | echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ | ||
395 | 748 | exit 1; \ | ||
396 | 749 | }; \ | ||
397 | 750 | test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ | ||
398 | 681 | || { echo "ERROR: files left after uninstall:" ; \ | 751 | || { echo "ERROR: files left after uninstall:" ; \ |
399 | 682 | if test -n "$(DESTDIR)"; then \ | 752 | if test -n "$(DESTDIR)"; then \ |
400 | 683 | echo " (check DESTDIR support)"; \ | 753 | echo " (check DESTDIR support)"; \ |
401 | @@ -711,10 +781,15 @@ | |||
402 | 711 | 781 | ||
403 | 712 | installcheck: installcheck-recursive | 782 | installcheck: installcheck-recursive |
404 | 713 | install-strip: | 783 | install-strip: |
409 | 714 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | 784 | if test -z '$(STRIP)'; then \ |
410 | 715 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | 785 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
411 | 716 | `test -z '$(STRIP)' || \ | 786 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
412 | 717 | echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | 787 | install; \ |
413 | 788 | else \ | ||
414 | 789 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
415 | 790 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
416 | 791 | "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | ||
417 | 792 | fi | ||
418 | 718 | mostlyclean-generic: | 793 | mostlyclean-generic: |
419 | 719 | -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) | 794 | -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) |
420 | 720 | 795 | ||
421 | @@ -800,14 +875,16 @@ | |||
422 | 800 | 875 | ||
423 | 801 | uninstall-am: uninstall-pkgconfigDATA | 876 | uninstall-am: uninstall-pkgconfigDATA |
424 | 802 | 877 | ||
427 | 803 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | 878 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ |
428 | 804 | install-am install-strip tags-recursive | 879 | cscopelist-recursive ctags-recursive install-am install-strip \ |
429 | 880 | tags-recursive | ||
430 | 805 | 881 | ||
431 | 806 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 882 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
436 | 807 | all all-am am--refresh check check-am clean clean-generic \ | 883 | all all-am am--refresh check check-am clean clean-cscope \ |
437 | 808 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ | 884 | clean-generic clean-libtool cscope cscopelist \ |
438 | 809 | dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ | 885 | cscopelist-recursive ctags ctags-recursive dist dist-all \ |
439 | 810 | distcheck distclean distclean-generic distclean-hdr \ | 886 | dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ |
440 | 887 | dist-zip distcheck distclean distclean-generic distclean-hdr \ | ||
441 | 811 | distclean-libtool distclean-tags distcleancheck distdir \ | 888 | distclean-libtool distclean-tags distcleancheck distdir \ |
442 | 812 | distuninstallcheck dvi dvi-am html html-am info info-am \ | 889 | distuninstallcheck dvi dvi-am html html-am info info-am \ |
443 | 813 | install install-am install-data install-data-am install-dvi \ | 890 | install install-am install-data install-data-am install-dvi \ |
444 | 814 | 891 | ||
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 | 1 | Release 1.1.2 -- Octobre 4 2012 | ||
450 | 2 | ------------------------------ | ||
451 | 3 | - Fixed: Use @libdir@ for generation of libcpptest.pc (#3566605) | ||
452 | 4 | Thanks for the patch to Dagobert Michelsen. | ||
453 | 5 | - Fixed: Respect --htmldir | ||
454 | 6 | Thanks for the patch to Robert Buchholz. | ||
455 | 7 | - Note: soname remaining at 0:7:0 | ||
456 | 8 | |||
457 | 1 | Release 1.1.1 -- March 26 2010 | 9 | Release 1.1.1 -- March 26 2010 |
458 | 2 | ------------------------------ | 10 | ------------------------------ |
459 | 3 | - Fixed: Suite no longer successful with uncaught exceptions (#2976484) | 11 | - Fixed: Suite no longer successful with uncaught exceptions (#2976484) |
460 | 4 | 12 | ||
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 | 11 | General information | 11 | General information |
466 | 12 | =================== | 12 | =================== |
467 | 13 | 13 | ||
469 | 14 | This is CppTest version 1.1.1. CppTest is a portable and powerful, yet | 14 | This is CppTest version 1.1.2. CppTest is a portable and powerful, yet |
470 | 15 | simple, unit testing framework for handling automated tests in C++. The focus | 15 | simple, unit testing framework for handling automated tests in C++. The focus |
471 | 16 | lies on usability and extendability. Several output formats are supported and | 16 | lies on usability and extendability. Several output formats are supported and |
472 | 17 | new ones are easily added. | 17 | new ones are easily added. |
473 | 18 | 18 | ||
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 @@ | |||
482 | 1 | # generated automatically by aclocal 1.11.1 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.12.1 -*- Autoconf -*- |
483 | 2 | 2 | ||
484 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
485 | 4 | # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 4 | |
486 | 5 | # This file is free software; the Free Software Foundation | 5 | # This file is free software; the Free Software Foundation |
487 | 6 | # gives unlimited permission to copy and/or distribute it, | 6 | # gives unlimited permission to copy and/or distribute it, |
488 | 7 | # with or without modifications, as long as this notice is preserved. | 7 | # with or without modifications, as long as this notice is preserved. |
489 | @@ -13,16 +13,17 @@ | |||
490 | 13 | 13 | ||
491 | 14 | m4_ifndef([AC_AUTOCONF_VERSION], | 14 | m4_ifndef([AC_AUTOCONF_VERSION], |
492 | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
495 | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
496 | 17 | [m4_warning([this file was generated for autoconf 2.65. | 17 | [m4_warning([this file was generated for autoconf 2.69. |
497 | 18 | You have another version of autoconf. It may work, but is not guaranteed to. | 18 | You have another version of autoconf. It may work, but is not guaranteed to. |
498 | 19 | If you have problems, you may need to regenerate the build system entirely. | 19 | If you have problems, you may need to regenerate the build system entirely. |
500 | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | 20 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
501 | 21 | 21 | ||
502 | 22 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 22 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
503 | 23 | # | 23 | # |
504 | 24 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 24 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
506 | 25 | # 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 25 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
507 | 26 | # Foundation, Inc. | ||
508 | 26 | # Written by Gordon Matzigkeit, 1996 | 27 | # Written by Gordon Matzigkeit, 1996 |
509 | 27 | # | 28 | # |
510 | 28 | # This file is free software; the Free Software Foundation gives | 29 | # This file is free software; the Free Software Foundation gives |
511 | @@ -31,7 +32,8 @@ | |||
512 | 31 | 32 | ||
513 | 32 | m4_define([_LT_COPYING], [dnl | 33 | m4_define([_LT_COPYING], [dnl |
514 | 33 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 34 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
516 | 34 | # 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 35 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
517 | 36 | # Foundation, Inc. | ||
518 | 35 | # Written by Gordon Matzigkeit, 1996 | 37 | # Written by Gordon Matzigkeit, 1996 |
519 | 36 | # | 38 | # |
520 | 37 | # This file is part of GNU Libtool. | 39 | # This file is part of GNU Libtool. |
521 | @@ -58,7 +60,7 @@ | |||
522 | 58 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 60 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
523 | 59 | ]) | 61 | ]) |
524 | 60 | 62 | ||
526 | 61 | # serial 56 LT_INIT | 63 | # serial 57 LT_INIT |
527 | 62 | 64 | ||
528 | 63 | 65 | ||
529 | 64 | # LT_PREREQ(VERSION) | 66 | # LT_PREREQ(VERSION) |
530 | @@ -165,6 +167,8 @@ | |||
531 | 165 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl | 167 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
532 | 166 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl | 168 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
533 | 167 | 169 | ||
534 | 170 | _LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl | ||
535 | 171 | dnl | ||
536 | 168 | _LT_DECL([], [host_alias], [0], [The host system])dnl | 172 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
537 | 169 | _LT_DECL([], [host], [0])dnl | 173 | _LT_DECL([], [host], [0])dnl |
538 | 170 | _LT_DECL([], [host_os], [0])dnl | 174 | _LT_DECL([], [host_os], [0])dnl |
539 | @@ -187,10 +191,13 @@ | |||
540 | 187 | dnl | 191 | dnl |
541 | 188 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 192 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
542 | 189 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | 193 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
543 | 194 | m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl | ||
544 | 190 | m4_require([_LT_CMD_RELOAD])dnl | 195 | m4_require([_LT_CMD_RELOAD])dnl |
545 | 191 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl | 196 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
546 | 197 | m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl | ||
547 | 192 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl | 198 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
548 | 193 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl | 199 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
549 | 200 | m4_require([_LT_WITH_SYSROOT])dnl | ||
550 | 194 | 201 | ||
551 | 195 | _LT_CONFIG_LIBTOOL_INIT([ | 202 | _LT_CONFIG_LIBTOOL_INIT([ |
552 | 196 | # See if we are running on zsh, and set the options which allow our | 203 | # See if we are running on zsh, and set the options which allow our |
553 | @@ -647,7 +654,7 @@ | |||
554 | 647 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 654 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
555 | 648 | configured by $[0], generated by m4_PACKAGE_STRING. | 655 | configured by $[0], generated by m4_PACKAGE_STRING. |
556 | 649 | 656 | ||
558 | 650 | Copyright (C) 2009 Free Software Foundation, Inc. | 657 | Copyright (C) 2011 Free Software Foundation, Inc. |
559 | 651 | This config.lt script is free software; the Free Software Foundation | 658 | This config.lt script is free software; the Free Software Foundation |
560 | 652 | gives unlimited permision to copy, distribute and modify it." | 659 | gives unlimited permision to copy, distribute and modify it." |
561 | 653 | 660 | ||
562 | @@ -761,15 +768,12 @@ | |||
563 | 761 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 768 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
564 | 762 | # text mode, it properly converts lines to CR/LF. This bash problem | 769 | # text mode, it properly converts lines to CR/LF. This bash problem |
565 | 763 | # is reportedly fixed, but why not run on old versions too? | 770 | # is reportedly fixed, but why not run on old versions too? |
575 | 764 | sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | 771 | sed '$q' "$ltmain" >> "$cfgfile" \ |
576 | 765 | || (rm -f "$cfgfile"; exit 1) | 772 | || (rm -f "$cfgfile"; exit 1) |
577 | 766 | 773 | ||
578 | 767 | _LT_PROG_XSI_SHELLFNS | 774 | _LT_PROG_REPLACE_SHELLFNS |
579 | 768 | 775 | ||
580 | 769 | sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 776 | mv -f "$cfgfile" "$ofile" || |
572 | 770 | || (rm -f "$cfgfile"; exit 1) | ||
573 | 771 | |||
574 | 772 | mv -f "$cfgfile" "$ofile" || | ||
581 | 773 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 777 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
582 | 774 | chmod +x "$ofile" | 778 | chmod +x "$ofile" |
583 | 775 | ], | 779 | ], |
584 | @@ -814,6 +818,7 @@ | |||
585 | 814 | m4_case([$1], | 818 | m4_case([$1], |
586 | 815 | [C], [_LT_LANG(C)], | 819 | [C], [_LT_LANG(C)], |
587 | 816 | [C++], [_LT_LANG(CXX)], | 820 | [C++], [_LT_LANG(CXX)], |
588 | 821 | [Go], [_LT_LANG(GO)], | ||
589 | 817 | [Java], [_LT_LANG(GCJ)], | 822 | [Java], [_LT_LANG(GCJ)], |
590 | 818 | [Fortran 77], [_LT_LANG(F77)], | 823 | [Fortran 77], [_LT_LANG(F77)], |
591 | 819 | [Fortran], [_LT_LANG(FC)], | 824 | [Fortran], [_LT_LANG(FC)], |
592 | @@ -835,6 +840,29 @@ | |||
593 | 835 | ])# _LT_LANG | 840 | ])# _LT_LANG |
594 | 836 | 841 | ||
595 | 837 | 842 | ||
596 | 843 | m4_ifndef([AC_PROG_GO], [ | ||
597 | 844 | # NOTE: This macro has been submitted for inclusion into # | ||
598 | 845 | # GNU Autoconf as AC_PROG_GO. When it is available in # | ||
599 | 846 | # a released version of Autoconf we should remove this # | ||
600 | 847 | # macro and use it instead. # | ||
601 | 848 | m4_defun([AC_PROG_GO], | ||
602 | 849 | [AC_LANG_PUSH(Go)dnl | ||
603 | 850 | AC_ARG_VAR([GOC], [Go compiler command])dnl | ||
604 | 851 | AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl | ||
605 | 852 | _AC_ARG_VAR_LDFLAGS()dnl | ||
606 | 853 | AC_CHECK_TOOL(GOC, gccgo) | ||
607 | 854 | if test -z "$GOC"; then | ||
608 | 855 | if test -n "$ac_tool_prefix"; then | ||
609 | 856 | AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) | ||
610 | 857 | fi | ||
611 | 858 | fi | ||
612 | 859 | if test -z "$GOC"; then | ||
613 | 860 | AC_CHECK_PROG(GOC, gccgo, gccgo, false) | ||
614 | 861 | fi | ||
615 | 862 | ])#m4_defun | ||
616 | 863 | ])#m4_ifndef | ||
617 | 864 | |||
618 | 865 | |||
619 | 838 | # _LT_LANG_DEFAULT_CONFIG | 866 | # _LT_LANG_DEFAULT_CONFIG |
620 | 839 | # ----------------------- | 867 | # ----------------------- |
621 | 840 | m4_defun([_LT_LANG_DEFAULT_CONFIG], | 868 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
622 | @@ -865,6 +893,10 @@ | |||
623 | 865 | m4_ifdef([LT_PROG_GCJ], | 893 | m4_ifdef([LT_PROG_GCJ], |
624 | 866 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) | 894 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
625 | 867 | 895 | ||
626 | 896 | AC_PROVIDE_IFELSE([AC_PROG_GO], | ||
627 | 897 | [LT_LANG(GO)], | ||
628 | 898 | [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) | ||
629 | 899 | |||
630 | 868 | AC_PROVIDE_IFELSE([LT_PROG_RC], | 900 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
631 | 869 | [LT_LANG(RC)], | 901 | [LT_LANG(RC)], |
632 | 870 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) | 902 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
633 | @@ -967,7 +999,13 @@ | |||
634 | 967 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | 999 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
635 | 968 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | 1000 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
636 | 969 | _lt_result=$? | 1001 | _lt_result=$? |
638 | 970 | if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | 1002 | # If there is a non-empty error log, and "single_module" |
639 | 1003 | # appears in it, assume the flag caused a linker warning | ||
640 | 1004 | if test -s conftest.err && $GREP single_module conftest.err; then | ||
641 | 1005 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
642 | 1006 | # Otherwise, if the output was created with a 0 exit code from | ||
643 | 1007 | # the compiler, it worked. | ||
644 | 1008 | elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
645 | 971 | lt_cv_apple_cc_single_mod=yes | 1009 | lt_cv_apple_cc_single_mod=yes |
646 | 972 | else | 1010 | else |
647 | 973 | cat conftest.err >&AS_MESSAGE_LOG_FD | 1011 | cat conftest.err >&AS_MESSAGE_LOG_FD |
648 | @@ -975,6 +1013,7 @@ | |||
649 | 975 | rm -rf libconftest.dylib* | 1013 | rm -rf libconftest.dylib* |
650 | 976 | rm -f conftest.* | 1014 | rm -f conftest.* |
651 | 977 | fi]) | 1015 | fi]) |
652 | 1016 | |||
653 | 978 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], | 1017 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
654 | 979 | [lt_cv_ld_exported_symbols_list], | 1018 | [lt_cv_ld_exported_symbols_list], |
655 | 980 | [lt_cv_ld_exported_symbols_list=no | 1019 | [lt_cv_ld_exported_symbols_list=no |
656 | @@ -986,6 +1025,34 @@ | |||
657 | 986 | [lt_cv_ld_exported_symbols_list=no]) | 1025 | [lt_cv_ld_exported_symbols_list=no]) |
658 | 987 | LDFLAGS="$save_LDFLAGS" | 1026 | LDFLAGS="$save_LDFLAGS" |
659 | 988 | ]) | 1027 | ]) |
660 | 1028 | |||
661 | 1029 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], | ||
662 | 1030 | [lt_cv_ld_force_load=no | ||
663 | 1031 | cat > conftest.c << _LT_EOF | ||
664 | 1032 | int forced_loaded() { return 2;} | ||
665 | 1033 | _LT_EOF | ||
666 | 1034 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD | ||
667 | 1035 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | ||
668 | 1036 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | ||
669 | 1037 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | ||
670 | 1038 | echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD | ||
671 | 1039 | $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD | ||
672 | 1040 | cat > conftest.c << _LT_EOF | ||
673 | 1041 | int main() { return 0;} | ||
674 | 1042 | _LT_EOF | ||
675 | 1043 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD | ||
676 | 1044 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | ||
677 | 1045 | _lt_result=$? | ||
678 | 1046 | if test -s conftest.err && $GREP force_load conftest.err; then | ||
679 | 1047 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
680 | 1048 | elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
681 | 1049 | lt_cv_ld_force_load=yes | ||
682 | 1050 | else | ||
683 | 1051 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
684 | 1052 | fi | ||
685 | 1053 | rm -f conftest.err libconftest.a conftest conftest.c | ||
686 | 1054 | rm -rf conftest.dSYM | ||
687 | 1055 | ]) | ||
688 | 989 | case $host_os in | 1056 | case $host_os in |
689 | 990 | rhapsody* | darwin1.[[012]]) | 1057 | rhapsody* | darwin1.[[012]]) |
690 | 991 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | 1058 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
691 | @@ -1013,7 +1080,7 @@ | |||
692 | 1013 | else | 1080 | else |
693 | 1014 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' | 1081 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
694 | 1015 | fi | 1082 | fi |
696 | 1016 | if test "$DSYMUTIL" != ":"; then | 1083 | if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
697 | 1017 | _lt_dsymutil='~$DSYMUTIL $lib || :' | 1084 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
698 | 1018 | else | 1085 | else |
699 | 1019 | _lt_dsymutil= | 1086 | _lt_dsymutil= |
700 | @@ -1023,8 +1090,8 @@ | |||
701 | 1023 | ]) | 1090 | ]) |
702 | 1024 | 1091 | ||
703 | 1025 | 1092 | ||
706 | 1026 | # _LT_DARWIN_LINKER_FEATURES | 1093 | # _LT_DARWIN_LINKER_FEATURES([TAG]) |
707 | 1027 | # -------------------------- | 1094 | # --------------------------------- |
708 | 1028 | # Checks for linker and compiler features on darwin | 1095 | # Checks for linker and compiler features on darwin |
709 | 1029 | m4_defun([_LT_DARWIN_LINKER_FEATURES], | 1096 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
710 | 1030 | [ | 1097 | [ |
711 | @@ -1033,7 +1100,13 @@ | |||
712 | 1033 | _LT_TAGVAR(hardcode_direct, $1)=no | 1100 | _LT_TAGVAR(hardcode_direct, $1)=no |
713 | 1034 | _LT_TAGVAR(hardcode_automatic, $1)=yes | 1101 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
714 | 1035 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 1102 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
716 | 1036 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | 1103 | if test "$lt_cv_ld_force_load" = "yes"; then |
717 | 1104 | _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 | 1105 | m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], | ||
719 | 1106 | [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) | ||
720 | 1107 | else | ||
721 | 1108 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | ||
722 | 1109 | fi | ||
723 | 1037 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 1110 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
724 | 1038 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" | 1111 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
725 | 1039 | case $cc_basename in | 1112 | case $cc_basename in |
726 | @@ -1057,30 +1130,41 @@ | |||
727 | 1057 | fi | 1130 | fi |
728 | 1058 | ]) | 1131 | ]) |
729 | 1059 | 1132 | ||
732 | 1060 | # _LT_SYS_MODULE_PATH_AIX | 1133 | # _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
733 | 1061 | # ----------------------- | 1134 | # ---------------------------------- |
734 | 1062 | # Links a minimal program and checks the executable | 1135 | # Links a minimal program and checks the executable |
735 | 1063 | # for the system default hardcoded library path. In most cases, | 1136 | # for the system default hardcoded library path. In most cases, |
736 | 1064 | # this is /usr/lib:/lib, but when the MPI compilers are used | 1137 | # this is /usr/lib:/lib, but when the MPI compilers are used |
737 | 1065 | # the location of the communication and MPI libs are included too. | 1138 | # the location of the communication and MPI libs are included too. |
738 | 1066 | # If we don't find anything, use the default library path according | 1139 | # If we don't find anything, use the default library path according |
739 | 1067 | # to the aix ld manual. | 1140 | # to the aix ld manual. |
740 | 1141 | # Store the results from the different compilers for each TAGNAME. | ||
741 | 1142 | # Allow to override them for all tags through lt_cv_aix_libpath. | ||
742 | 1068 | m4_defun([_LT_SYS_MODULE_PATH_AIX], | 1143 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
743 | 1069 | [m4_require([_LT_DECL_SED])dnl | 1144 | [m4_require([_LT_DECL_SED])dnl |
758 | 1070 | AC_LINK_IFELSE(AC_LANG_PROGRAM,[ | 1145 | if test "${lt_cv_aix_libpath+set}" = set; then |
759 | 1071 | lt_aix_libpath_sed=' | 1146 | aix_libpath=$lt_cv_aix_libpath |
760 | 1072 | /Import File Strings/,/^$/ { | 1147 | else |
761 | 1073 | /^0/ { | 1148 | AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
762 | 1074 | s/^0 *\(.*\)$/\1/ | 1149 | [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
763 | 1075 | p | 1150 | lt_aix_libpath_sed='[ |
764 | 1076 | } | 1151 | /Import File Strings/,/^$/ { |
765 | 1077 | }' | 1152 | /^0/ { |
766 | 1078 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 1153 | s/^0 *\([^ ]*\) *$/\1/ |
767 | 1079 | # Check for a 64-bit object if we didn't find anything. | 1154 | p |
768 | 1080 | if test -z "$aix_libpath"; then | 1155 | } |
769 | 1081 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 1156 | }]' |
770 | 1082 | fi],[]) | 1157 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
771 | 1083 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 1158 | # Check for a 64-bit object if we didn't find anything. |
772 | 1159 | if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
773 | 1160 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
774 | 1161 | fi],[]) | ||
775 | 1162 | if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
776 | 1163 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" | ||
777 | 1164 | fi | ||
778 | 1165 | ]) | ||
779 | 1166 | aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) | ||
780 | 1167 | fi | ||
781 | 1084 | ])# _LT_SYS_MODULE_PATH_AIX | 1168 | ])# _LT_SYS_MODULE_PATH_AIX |
782 | 1085 | 1169 | ||
783 | 1086 | 1170 | ||
784 | @@ -1105,7 +1189,7 @@ | |||
785 | 1105 | 1189 | ||
786 | 1106 | AC_MSG_CHECKING([how to print strings]) | 1190 | AC_MSG_CHECKING([how to print strings]) |
787 | 1107 | # Test print first, because it will be a builtin if present. | 1191 | # Test print first, because it will be a builtin if present. |
789 | 1108 | if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | 1192 | if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
790 | 1109 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 1193 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
791 | 1110 | ECHO='print -r --' | 1194 | ECHO='print -r --' |
792 | 1111 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 1195 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
793 | @@ -1149,6 +1233,39 @@ | |||
794 | 1149 | ])# _LT_PROG_ECHO_BACKSLASH | 1233 | ])# _LT_PROG_ECHO_BACKSLASH |
795 | 1150 | 1234 | ||
796 | 1151 | 1235 | ||
797 | 1236 | # _LT_WITH_SYSROOT | ||
798 | 1237 | # ---------------- | ||
799 | 1238 | AC_DEFUN([_LT_WITH_SYSROOT], | ||
800 | 1239 | [AC_MSG_CHECKING([for sysroot]) | ||
801 | 1240 | AC_ARG_WITH([sysroot], | ||
802 | 1241 | [ --with-sysroot[=DIR] Search for dependent libraries within DIR | ||
803 | 1242 | (or the compiler's sysroot if not specified).], | ||
804 | 1243 | [], [with_sysroot=no]) | ||
805 | 1244 | |||
806 | 1245 | dnl lt_sysroot will always be passed unquoted. We quote it here | ||
807 | 1246 | dnl in case the user passed a directory name. | ||
808 | 1247 | lt_sysroot= | ||
809 | 1248 | case ${with_sysroot} in #( | ||
810 | 1249 | yes) | ||
811 | 1250 | if test "$GCC" = yes; then | ||
812 | 1251 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
813 | 1252 | fi | ||
814 | 1253 | ;; #( | ||
815 | 1254 | /*) | ||
816 | 1255 | lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | ||
817 | 1256 | ;; #( | ||
818 | 1257 | no|'') | ||
819 | 1258 | ;; #( | ||
820 | 1259 | *) | ||
821 | 1260 | AC_MSG_RESULT([${with_sysroot}]) | ||
822 | 1261 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | ||
823 | 1262 | ;; | ||
824 | 1263 | esac | ||
825 | 1264 | |||
826 | 1265 | AC_MSG_RESULT([${lt_sysroot:-no}]) | ||
827 | 1266 | _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl | ||
828 | 1267 | [dependent libraries, and in which our libraries should be installed.])]) | ||
829 | 1268 | |||
830 | 1152 | # _LT_ENABLE_LOCK | 1269 | # _LT_ENABLE_LOCK |
831 | 1153 | # --------------- | 1270 | # --------------- |
832 | 1154 | m4_defun([_LT_ENABLE_LOCK], | 1271 | m4_defun([_LT_ENABLE_LOCK], |
833 | @@ -1177,7 +1294,7 @@ | |||
834 | 1177 | ;; | 1294 | ;; |
835 | 1178 | *-*-irix6*) | 1295 | *-*-irix6*) |
836 | 1179 | # Find out which ABI we are using. | 1296 | # Find out which ABI we are using. |
838 | 1180 | echo '[#]line __oline__ "configure"' > conftest.$ac_ext | 1297 | echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
839 | 1181 | if AC_TRY_EVAL(ac_compile); then | 1298 | if AC_TRY_EVAL(ac_compile); then |
840 | 1182 | if test "$lt_cv_prog_gnu_ld" = yes; then | 1299 | if test "$lt_cv_prog_gnu_ld" = yes; then |
841 | 1183 | case `/usr/bin/file conftest.$ac_objext` in | 1300 | case `/usr/bin/file conftest.$ac_objext` in |
842 | @@ -1270,14 +1387,27 @@ | |||
843 | 1270 | CFLAGS="$SAVE_CFLAGS" | 1387 | CFLAGS="$SAVE_CFLAGS" |
844 | 1271 | fi | 1388 | fi |
845 | 1272 | ;; | 1389 | ;; |
847 | 1273 | sparc*-*solaris*) | 1390 | *-*solaris*) |
848 | 1274 | # Find out which ABI we are using. | 1391 | # Find out which ABI we are using. |
849 | 1275 | echo 'int i;' > conftest.$ac_ext | 1392 | echo 'int i;' > conftest.$ac_ext |
850 | 1276 | if AC_TRY_EVAL(ac_compile); then | 1393 | if AC_TRY_EVAL(ac_compile); then |
851 | 1277 | case `/usr/bin/file conftest.o` in | 1394 | case `/usr/bin/file conftest.o` in |
852 | 1278 | *64-bit*) | 1395 | *64-bit*) |
853 | 1279 | case $lt_cv_prog_gnu_ld in | 1396 | case $lt_cv_prog_gnu_ld in |
855 | 1280 | yes*) LD="${LD-ld} -m elf64_sparc" ;; | 1397 | yes*) |
856 | 1398 | case $host in | ||
857 | 1399 | i?86-*-solaris*) | ||
858 | 1400 | LD="${LD-ld} -m elf_x86_64" | ||
859 | 1401 | ;; | ||
860 | 1402 | sparc*-*-solaris*) | ||
861 | 1403 | LD="${LD-ld} -m elf64_sparc" | ||
862 | 1404 | ;; | ||
863 | 1405 | esac | ||
864 | 1406 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
865 | 1407 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
866 | 1408 | LD="${LD-ld}_sol2" | ||
867 | 1409 | fi | ||
868 | 1410 | ;; | ||
869 | 1281 | *) | 1411 | *) |
870 | 1282 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | 1412 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
871 | 1283 | LD="${LD-ld} -64" | 1413 | LD="${LD-ld} -64" |
872 | @@ -1295,14 +1425,47 @@ | |||
873 | 1295 | ])# _LT_ENABLE_LOCK | 1425 | ])# _LT_ENABLE_LOCK |
874 | 1296 | 1426 | ||
875 | 1297 | 1427 | ||
876 | 1428 | # _LT_PROG_AR | ||
877 | 1429 | # ----------- | ||
878 | 1430 | m4_defun([_LT_PROG_AR], | ||
879 | 1431 | [AC_CHECK_TOOLS(AR, [ar], false) | ||
880 | 1432 | : ${AR=ar} | ||
881 | 1433 | : ${AR_FLAGS=cru} | ||
882 | 1434 | _LT_DECL([], [AR], [1], [The archiver]) | ||
883 | 1435 | _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) | ||
884 | 1436 | |||
885 | 1437 | AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], | ||
886 | 1438 | [lt_cv_ar_at_file=no | ||
887 | 1439 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM], | ||
888 | 1440 | [echo conftest.$ac_objext > conftest.lst | ||
889 | 1441 | lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' | ||
890 | 1442 | AC_TRY_EVAL([lt_ar_try]) | ||
891 | 1443 | if test "$ac_status" -eq 0; then | ||
892 | 1444 | # Ensure the archiver fails upon bogus file names. | ||
893 | 1445 | rm -f conftest.$ac_objext libconftest.a | ||
894 | 1446 | AC_TRY_EVAL([lt_ar_try]) | ||
895 | 1447 | if test "$ac_status" -ne 0; then | ||
896 | 1448 | lt_cv_ar_at_file=@ | ||
897 | 1449 | fi | ||
898 | 1450 | fi | ||
899 | 1451 | rm -f conftest.* libconftest.a | ||
900 | 1452 | ]) | ||
901 | 1453 | ]) | ||
902 | 1454 | |||
903 | 1455 | if test "x$lt_cv_ar_at_file" = xno; then | ||
904 | 1456 | archiver_list_spec= | ||
905 | 1457 | else | ||
906 | 1458 | archiver_list_spec=$lt_cv_ar_at_file | ||
907 | 1459 | fi | ||
908 | 1460 | _LT_DECL([], [archiver_list_spec], [1], | ||
909 | 1461 | [How to feed a file listing to the archiver]) | ||
910 | 1462 | ])# _LT_PROG_AR | ||
911 | 1463 | |||
912 | 1464 | |||
913 | 1298 | # _LT_CMD_OLD_ARCHIVE | 1465 | # _LT_CMD_OLD_ARCHIVE |
914 | 1299 | # ------------------- | 1466 | # ------------------- |
915 | 1300 | m4_defun([_LT_CMD_OLD_ARCHIVE], | 1467 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
921 | 1301 | [AC_CHECK_TOOL(AR, ar, false) | 1468 | [_LT_PROG_AR |
917 | 1302 | test -z "$AR" && AR=ar | ||
918 | 1303 | test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
919 | 1304 | _LT_DECL([], [AR], [1], [The archiver]) | ||
920 | 1305 | _LT_DECL([], [AR_FLAGS], [1]) | ||
922 | 1306 | 1469 | ||
923 | 1307 | AC_CHECK_TOOL(STRIP, strip, :) | 1470 | AC_CHECK_TOOL(STRIP, strip, :) |
924 | 1308 | test -z "$STRIP" && STRIP=: | 1471 | test -z "$STRIP" && STRIP=: |
925 | @@ -1321,13 +1484,13 @@ | |||
926 | 1321 | if test -n "$RANLIB"; then | 1484 | if test -n "$RANLIB"; then |
927 | 1322 | case $host_os in | 1485 | case $host_os in |
928 | 1323 | openbsd*) | 1486 | openbsd*) |
930 | 1324 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | 1487 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
931 | 1325 | ;; | 1488 | ;; |
932 | 1326 | *) | 1489 | *) |
934 | 1327 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | 1490 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
935 | 1328 | ;; | 1491 | ;; |
936 | 1329 | esac | 1492 | esac |
938 | 1330 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 1493 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
939 | 1331 | fi | 1494 | fi |
940 | 1332 | 1495 | ||
941 | 1333 | case $host_os in | 1496 | case $host_os in |
942 | @@ -1366,11 +1529,11 @@ | |||
943 | 1366 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 1529 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
944 | 1367 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 1530 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
945 | 1368 | -e 's:$: $lt_compiler_flag:'` | 1531 | -e 's:$: $lt_compiler_flag:'` |
947 | 1369 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 1532 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
948 | 1370 | (eval "$lt_compile" 2>conftest.err) | 1533 | (eval "$lt_compile" 2>conftest.err) |
949 | 1371 | ac_status=$? | 1534 | ac_status=$? |
950 | 1372 | cat conftest.err >&AS_MESSAGE_LOG_FD | 1535 | cat conftest.err >&AS_MESSAGE_LOG_FD |
952 | 1373 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 1536 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
953 | 1374 | if (exit $ac_status) && test -s "$ac_outfile"; then | 1537 | if (exit $ac_status) && test -s "$ac_outfile"; then |
954 | 1375 | # The compiler can only warn and ignore the option if not recognized | 1538 | # The compiler can only warn and ignore the option if not recognized |
955 | 1376 | # So say no if there are warnings other than the usual output. | 1539 | # So say no if there are warnings other than the usual output. |
956 | @@ -1507,6 +1670,11 @@ | |||
957 | 1507 | lt_cv_sys_max_cmd_len=196608 | 1670 | lt_cv_sys_max_cmd_len=196608 |
958 | 1508 | ;; | 1671 | ;; |
959 | 1509 | 1672 | ||
960 | 1673 | os2*) | ||
961 | 1674 | # The test takes a long time on OS/2. | ||
962 | 1675 | lt_cv_sys_max_cmd_len=8192 | ||
963 | 1676 | ;; | ||
964 | 1677 | |||
965 | 1510 | osf*) | 1678 | osf*) |
966 | 1511 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | 1679 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
967 | 1512 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | 1680 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
968 | @@ -1546,7 +1714,7 @@ | |||
969 | 1546 | # If test is not a shell built-in, we'll probably end up computing a | 1714 | # If test is not a shell built-in, we'll probably end up computing a |
970 | 1547 | # maximum length that is only half of the actual maximum length, but | 1715 | # maximum length that is only half of the actual maximum length, but |
971 | 1548 | # we can't tell. | 1716 | # we can't tell. |
973 | 1549 | while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | 1717 | while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
974 | 1550 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | 1718 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
975 | 1551 | test $i != 17 # 1/2 MB should be enough | 1719 | test $i != 17 # 1/2 MB should be enough |
976 | 1552 | do | 1720 | do |
977 | @@ -1598,7 +1766,7 @@ | |||
978 | 1598 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 1766 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
979 | 1599 | lt_status=$lt_dlunknown | 1767 | lt_status=$lt_dlunknown |
980 | 1600 | cat > conftest.$ac_ext <<_LT_EOF | 1768 | cat > conftest.$ac_ext <<_LT_EOF |
982 | 1601 | [#line __oline__ "configure" | 1769 | [#line $LINENO "configure" |
983 | 1602 | #include "confdefs.h" | 1770 | #include "confdefs.h" |
984 | 1603 | 1771 | ||
985 | 1604 | #if HAVE_DLFCN_H | 1772 | #if HAVE_DLFCN_H |
986 | @@ -1639,7 +1807,13 @@ | |||
987 | 1639 | # endif | 1807 | # endif |
988 | 1640 | #endif | 1808 | #endif |
989 | 1641 | 1809 | ||
991 | 1642 | void fnord() { int i=42;} | 1810 | /* When -fvisbility=hidden is used, assume the code has been annotated |
992 | 1811 | correspondingly for the symbols needed. */ | ||
993 | 1812 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
994 | 1813 | int fnord () __attribute__((visibility("default"))); | ||
995 | 1814 | #endif | ||
996 | 1815 | |||
997 | 1816 | int fnord () { return 42; } | ||
998 | 1643 | int main () | 1817 | int main () |
999 | 1644 | { | 1818 | { |
1000 | 1645 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1819 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
1001 | @@ -1648,7 +1822,11 @@ | |||
1002 | 1648 | if (self) | 1822 | if (self) |
1003 | 1649 | { | 1823 | { |
1004 | 1650 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; | 1824 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
1006 | 1651 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | 1825 | else |
1007 | 1826 | { | ||
1008 | 1827 | if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | ||
1009 | 1828 | else puts (dlerror ()); | ||
1010 | 1829 | } | ||
1011 | 1652 | /* dlclose (self); */ | 1830 | /* dlclose (self); */ |
1012 | 1653 | } | 1831 | } |
1013 | 1654 | else | 1832 | else |
1014 | @@ -1824,11 +2002,11 @@ | |||
1015 | 1824 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 2002 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1016 | 1825 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 2003 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
1017 | 1826 | -e 's:$: $lt_compiler_flag:'` | 2004 | -e 's:$: $lt_compiler_flag:'` |
1019 | 1827 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 2005 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
1020 | 1828 | (eval "$lt_compile" 2>out/conftest.err) | 2006 | (eval "$lt_compile" 2>out/conftest.err) |
1021 | 1829 | ac_status=$? | 2007 | ac_status=$? |
1022 | 1830 | cat out/conftest.err >&AS_MESSAGE_LOG_FD | 2008 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
1024 | 1831 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 2009 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
1025 | 1832 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 2010 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1026 | 1833 | then | 2011 | then |
1027 | 1834 | # The compiler can only warn and ignore the option if not recognized | 2012 | # The compiler can only warn and ignore the option if not recognized |
1028 | @@ -2082,7 +2260,7 @@ | |||
1029 | 2082 | 2260 | ||
1030 | 2083 | case $host_os in | 2261 | case $host_os in |
1031 | 2084 | aix3*) | 2262 | aix3*) |
1033 | 2085 | version_type=linux | 2263 | version_type=linux # correct to gnu/linux during the next big refactor |
1034 | 2086 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | 2264 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
1035 | 2087 | shlibpath_var=LIBPATH | 2265 | shlibpath_var=LIBPATH |
1036 | 2088 | 2266 | ||
1037 | @@ -2091,7 +2269,7 @@ | |||
1038 | 2091 | ;; | 2269 | ;; |
1039 | 2092 | 2270 | ||
1040 | 2093 | aix[[4-9]]*) | 2271 | aix[[4-9]]*) |
1042 | 2094 | version_type=linux | 2272 | version_type=linux # correct to gnu/linux during the next big refactor |
1043 | 2095 | need_lib_prefix=no | 2273 | need_lib_prefix=no |
1044 | 2096 | need_version=no | 2274 | need_version=no |
1045 | 2097 | hardcode_into_libs=yes | 2275 | hardcode_into_libs=yes |
1046 | @@ -2156,7 +2334,7 @@ | |||
1047 | 2156 | ;; | 2334 | ;; |
1048 | 2157 | 2335 | ||
1049 | 2158 | bsdi[[45]]*) | 2336 | bsdi[[45]]*) |
1051 | 2159 | version_type=linux | 2337 | version_type=linux # correct to gnu/linux during the next big refactor |
1052 | 2160 | need_version=no | 2338 | need_version=no |
1053 | 2161 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2339 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1054 | 2162 | soname_spec='${libname}${release}${shared_ext}$major' | 2340 | soname_spec='${libname}${release}${shared_ext}$major' |
1055 | @@ -2175,8 +2353,9 @@ | |||
1056 | 2175 | need_version=no | 2353 | need_version=no |
1057 | 2176 | need_lib_prefix=no | 2354 | need_lib_prefix=no |
1058 | 2177 | 2355 | ||
1061 | 2178 | case $GCC,$host_os in | 2356 | case $GCC,$cc_basename in |
1062 | 2179 | yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | 2357 | yes,*) |
1063 | 2358 | # gcc | ||
1064 | 2180 | library_names_spec='$libname.dll.a' | 2359 | library_names_spec='$libname.dll.a' |
1065 | 2181 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 2360 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
1066 | 2182 | postinstall_cmds='base_file=`basename \${file}`~ | 2361 | postinstall_cmds='base_file=`basename \${file}`~ |
1067 | @@ -2209,13 +2388,71 @@ | |||
1068 | 2209 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2388 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
1069 | 2210 | ;; | 2389 | ;; |
1070 | 2211 | esac | 2390 | esac |
1071 | 2391 | dynamic_linker='Win32 ld.exe' | ||
1072 | 2392 | ;; | ||
1073 | 2393 | |||
1074 | 2394 | *,cl*) | ||
1075 | 2395 | # Native MSVC | ||
1076 | 2396 | libname_spec='$name' | ||
1077 | 2397 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | ||
1078 | 2398 | library_names_spec='${libname}.dll.lib' | ||
1079 | 2399 | |||
1080 | 2400 | case $build_os in | ||
1081 | 2401 | mingw*) | ||
1082 | 2402 | sys_lib_search_path_spec= | ||
1083 | 2403 | lt_save_ifs=$IFS | ||
1084 | 2404 | IFS=';' | ||
1085 | 2405 | for lt_path in $LIB | ||
1086 | 2406 | do | ||
1087 | 2407 | IFS=$lt_save_ifs | ||
1088 | 2408 | # Let DOS variable expansion print the short 8.3 style file name. | ||
1089 | 2409 | lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
1090 | 2410 | sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
1091 | 2411 | done | ||
1092 | 2412 | IFS=$lt_save_ifs | ||
1093 | 2413 | # Convert to MSYS style. | ||
1094 | 2414 | 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 | 2415 | ;; | ||
1096 | 2416 | cygwin*) | ||
1097 | 2417 | # Convert to unix form, then to dos form, then back to unix form | ||
1098 | 2418 | # but this time dos style (no spaces!) so that the unix form looks | ||
1099 | 2419 | # like /cygdrive/c/PROGRA~1:/cygdr... | ||
1100 | 2420 | sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
1101 | 2421 | sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
1102 | 2422 | sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
1103 | 2423 | ;; | ||
1104 | 2424 | *) | ||
1105 | 2425 | sys_lib_search_path_spec="$LIB" | ||
1106 | 2426 | if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then | ||
1107 | 2427 | # It is most probably a Windows format PATH. | ||
1108 | 2428 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
1109 | 2429 | else | ||
1110 | 2430 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
1111 | 2431 | fi | ||
1112 | 2432 | # FIXME: find the short name or the path components, as spaces are | ||
1113 | 2433 | # common. (e.g. "Program Files" -> "PROGRA~1") | ||
1114 | 2434 | ;; | ||
1115 | 2435 | esac | ||
1116 | 2436 | |||
1117 | 2437 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
1118 | 2438 | postinstall_cmds='base_file=`basename \${file}`~ | ||
1119 | 2439 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
1120 | 2440 | dldir=$destdir/`dirname \$dlpath`~ | ||
1121 | 2441 | test -d \$dldir || mkdir -p \$dldir~ | ||
1122 | 2442 | $install_prog $dir/$dlname \$dldir/$dlname' | ||
1123 | 2443 | postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
1124 | 2444 | dlpath=$dir/\$dldll~ | ||
1125 | 2445 | $RM \$dlpath' | ||
1126 | 2446 | shlibpath_overrides_runpath=yes | ||
1127 | 2447 | dynamic_linker='Win32 link.exe' | ||
1128 | 2212 | ;; | 2448 | ;; |
1129 | 2213 | 2449 | ||
1130 | 2214 | *) | 2450 | *) |
1131 | 2451 | # Assume MSVC wrapper | ||
1132 | 2215 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' | 2452 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
1133 | 2453 | dynamic_linker='Win32 ld.exe' | ||
1134 | 2216 | ;; | 2454 | ;; |
1135 | 2217 | esac | 2455 | esac |
1136 | 2218 | dynamic_linker='Win32 ld.exe' | ||
1137 | 2219 | # FIXME: first we should search . and the directory the executable is in | 2456 | # FIXME: first we should search . and the directory the executable is in |
1138 | 2220 | shlibpath_var=PATH | 2457 | shlibpath_var=PATH |
1139 | 2221 | ;; | 2458 | ;; |
1140 | @@ -2236,7 +2473,7 @@ | |||
1141 | 2236 | ;; | 2473 | ;; |
1142 | 2237 | 2474 | ||
1143 | 2238 | dgux*) | 2475 | dgux*) |
1145 | 2239 | version_type=linux | 2476 | version_type=linux # correct to gnu/linux during the next big refactor |
1146 | 2240 | need_lib_prefix=no | 2477 | need_lib_prefix=no |
1147 | 2241 | need_version=no | 2478 | need_version=no |
1148 | 2242 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | 2479 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
1149 | @@ -2244,10 +2481,6 @@ | |||
1150 | 2244 | shlibpath_var=LD_LIBRARY_PATH | 2481 | shlibpath_var=LD_LIBRARY_PATH |
1151 | 2245 | ;; | 2482 | ;; |
1152 | 2246 | 2483 | ||
1153 | 2247 | freebsd1*) | ||
1154 | 2248 | dynamic_linker=no | ||
1155 | 2249 | ;; | ||
1156 | 2250 | |||
1157 | 2251 | freebsd* | dragonfly*) | 2484 | freebsd* | dragonfly*) |
1158 | 2252 | # DragonFly does not have aout. When/if they implement a new | 2485 | # DragonFly does not have aout. When/if they implement a new |
1159 | 2253 | # versioning mechanism, adjust this. | 2486 | # versioning mechanism, adjust this. |
1160 | @@ -2255,7 +2488,7 @@ | |||
1161 | 2255 | objformat=`/usr/bin/objformat` | 2488 | objformat=`/usr/bin/objformat` |
1162 | 2256 | else | 2489 | else |
1163 | 2257 | case $host_os in | 2490 | case $host_os in |
1165 | 2258 | freebsd[[123]]*) objformat=aout ;; | 2491 | freebsd[[23]].*) objformat=aout ;; |
1166 | 2259 | *) objformat=elf ;; | 2492 | *) objformat=elf ;; |
1167 | 2260 | esac | 2493 | esac |
1168 | 2261 | fi | 2494 | fi |
1169 | @@ -2286,7 +2519,7 @@ | |||
1170 | 2286 | esac | 2519 | esac |
1171 | 2287 | shlibpath_var=LD_LIBRARY_PATH | 2520 | shlibpath_var=LD_LIBRARY_PATH |
1172 | 2288 | case $host_os in | 2521 | case $host_os in |
1174 | 2289 | freebsd2*) | 2522 | freebsd2.*) |
1175 | 2290 | shlibpath_overrides_runpath=yes | 2523 | shlibpath_overrides_runpath=yes |
1176 | 2291 | ;; | 2524 | ;; |
1177 | 2292 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) | 2525 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
1178 | @@ -2306,12 +2539,26 @@ | |||
1179 | 2306 | ;; | 2539 | ;; |
1180 | 2307 | 2540 | ||
1181 | 2308 | gnu*) | 2541 | gnu*) |
1183 | 2309 | version_type=linux | 2542 | version_type=linux # correct to gnu/linux during the next big refactor |
1184 | 2310 | need_lib_prefix=no | 2543 | need_lib_prefix=no |
1185 | 2311 | need_version=no | 2544 | need_version=no |
1186 | 2312 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 2545 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1187 | 2313 | soname_spec='${libname}${release}${shared_ext}$major' | 2546 | soname_spec='${libname}${release}${shared_ext}$major' |
1188 | 2314 | shlibpath_var=LD_LIBRARY_PATH | 2547 | shlibpath_var=LD_LIBRARY_PATH |
1189 | 2548 | shlibpath_overrides_runpath=no | ||
1190 | 2549 | hardcode_into_libs=yes | ||
1191 | 2550 | ;; | ||
1192 | 2551 | |||
1193 | 2552 | haiku*) | ||
1194 | 2553 | version_type=linux # correct to gnu/linux during the next big refactor | ||
1195 | 2554 | need_lib_prefix=no | ||
1196 | 2555 | need_version=no | ||
1197 | 2556 | dynamic_linker="$host_os runtime_loader" | ||
1198 | 2557 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | ||
1199 | 2558 | soname_spec='${libname}${release}${shared_ext}$major' | ||
1200 | 2559 | shlibpath_var=LIBRARY_PATH | ||
1201 | 2560 | shlibpath_overrides_runpath=yes | ||
1202 | 2561 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
1203 | 2315 | hardcode_into_libs=yes | 2562 | hardcode_into_libs=yes |
1204 | 2316 | ;; | 2563 | ;; |
1205 | 2317 | 2564 | ||
1206 | @@ -2364,7 +2611,7 @@ | |||
1207 | 2364 | ;; | 2611 | ;; |
1208 | 2365 | 2612 | ||
1209 | 2366 | interix[[3-9]]*) | 2613 | interix[[3-9]]*) |
1211 | 2367 | version_type=linux | 2614 | version_type=linux # correct to gnu/linux during the next big refactor |
1212 | 2368 | need_lib_prefix=no | 2615 | need_lib_prefix=no |
1213 | 2369 | need_version=no | 2616 | need_version=no |
1214 | 2370 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 2617 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1215 | @@ -2380,7 +2627,7 @@ | |||
1216 | 2380 | nonstopux*) version_type=nonstopux ;; | 2627 | nonstopux*) version_type=nonstopux ;; |
1217 | 2381 | *) | 2628 | *) |
1218 | 2382 | if test "$lt_cv_prog_gnu_ld" = yes; then | 2629 | if test "$lt_cv_prog_gnu_ld" = yes; then |
1220 | 2383 | version_type=linux | 2630 | version_type=linux # correct to gnu/linux during the next big refactor |
1221 | 2384 | else | 2631 | else |
1222 | 2385 | version_type=irix | 2632 | version_type=irix |
1223 | 2386 | fi ;; | 2633 | fi ;; |
1224 | @@ -2417,9 +2664,9 @@ | |||
1225 | 2417 | dynamic_linker=no | 2664 | dynamic_linker=no |
1226 | 2418 | ;; | 2665 | ;; |
1227 | 2419 | 2666 | ||
1229 | 2420 | # This must be Linux ELF. | 2667 | # This must be glibc/ELF. |
1230 | 2421 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 2668 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1232 | 2422 | version_type=linux | 2669 | version_type=linux # correct to gnu/linux during the next big refactor |
1233 | 2423 | need_lib_prefix=no | 2670 | need_lib_prefix=no |
1234 | 2424 | need_version=no | 2671 | need_version=no |
1235 | 2425 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2672 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1236 | @@ -2482,7 +2729,7 @@ | |||
1237 | 2482 | ;; | 2729 | ;; |
1238 | 2483 | 2730 | ||
1239 | 2484 | newsos6) | 2731 | newsos6) |
1241 | 2485 | version_type=linux | 2732 | version_type=linux # correct to gnu/linux during the next big refactor |
1242 | 2486 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2733 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1243 | 2487 | shlibpath_var=LD_LIBRARY_PATH | 2734 | shlibpath_var=LD_LIBRARY_PATH |
1244 | 2488 | shlibpath_overrides_runpath=yes | 2735 | shlibpath_overrides_runpath=yes |
1245 | @@ -2551,7 +2798,7 @@ | |||
1246 | 2551 | ;; | 2798 | ;; |
1247 | 2552 | 2799 | ||
1248 | 2553 | solaris*) | 2800 | solaris*) |
1250 | 2554 | version_type=linux | 2801 | version_type=linux # correct to gnu/linux during the next big refactor |
1251 | 2555 | need_lib_prefix=no | 2802 | need_lib_prefix=no |
1252 | 2556 | need_version=no | 2803 | need_version=no |
1253 | 2557 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2804 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1254 | @@ -2576,7 +2823,7 @@ | |||
1255 | 2576 | ;; | 2823 | ;; |
1256 | 2577 | 2824 | ||
1257 | 2578 | sysv4 | sysv4.3*) | 2825 | sysv4 | sysv4.3*) |
1259 | 2579 | version_type=linux | 2826 | version_type=linux # correct to gnu/linux during the next big refactor |
1260 | 2580 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2827 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1261 | 2581 | soname_spec='${libname}${release}${shared_ext}$major' | 2828 | soname_spec='${libname}${release}${shared_ext}$major' |
1262 | 2582 | shlibpath_var=LD_LIBRARY_PATH | 2829 | shlibpath_var=LD_LIBRARY_PATH |
1263 | @@ -2600,7 +2847,7 @@ | |||
1264 | 2600 | 2847 | ||
1265 | 2601 | sysv4*MP*) | 2848 | sysv4*MP*) |
1266 | 2602 | if test -d /usr/nec ;then | 2849 | if test -d /usr/nec ;then |
1268 | 2603 | version_type=linux | 2850 | version_type=linux # correct to gnu/linux during the next big refactor |
1269 | 2604 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | 2851 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
1270 | 2605 | soname_spec='$libname${shared_ext}.$major' | 2852 | soname_spec='$libname${shared_ext}.$major' |
1271 | 2606 | shlibpath_var=LD_LIBRARY_PATH | 2853 | shlibpath_var=LD_LIBRARY_PATH |
1272 | @@ -2631,7 +2878,7 @@ | |||
1273 | 2631 | 2878 | ||
1274 | 2632 | tpf*) | 2879 | tpf*) |
1275 | 2633 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | 2880 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
1277 | 2634 | version_type=linux | 2881 | version_type=linux # correct to gnu/linux during the next big refactor |
1278 | 2635 | need_lib_prefix=no | 2882 | need_lib_prefix=no |
1279 | 2636 | need_version=no | 2883 | need_version=no |
1280 | 2637 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2884 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1281 | @@ -2641,7 +2888,7 @@ | |||
1282 | 2641 | ;; | 2888 | ;; |
1283 | 2642 | 2889 | ||
1284 | 2643 | uts4*) | 2890 | uts4*) |
1286 | 2644 | version_type=linux | 2891 | version_type=linux # correct to gnu/linux during the next big refactor |
1287 | 2645 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2892 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1288 | 2646 | soname_spec='${libname}${release}${shared_ext}$major' | 2893 | soname_spec='${libname}${release}${shared_ext}$major' |
1289 | 2647 | shlibpath_var=LD_LIBRARY_PATH | 2894 | shlibpath_var=LD_LIBRARY_PATH |
1290 | @@ -2919,6 +3166,11 @@ | |||
1291 | 2919 | esac | 3166 | esac |
1292 | 2920 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 3167 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
1293 | 2921 | case $host_os in | 3168 | case $host_os in |
1294 | 3169 | cygwin* | mingw* | pw32* | cegcc*) | ||
1295 | 3170 | if test "$GCC" != yes; then | ||
1296 | 3171 | reload_cmds=false | ||
1297 | 3172 | fi | ||
1298 | 3173 | ;; | ||
1299 | 2922 | darwin*) | 3174 | darwin*) |
1300 | 2923 | if test "$GCC" = yes; then | 3175 | if test "$GCC" = yes; then |
1301 | 2924 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 3176 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
1302 | @@ -2980,11 +3232,13 @@ | |||
1303 | 2980 | # Base MSYS/MinGW do not provide the 'file' command needed by | 3232 | # Base MSYS/MinGW do not provide the 'file' command needed by |
1304 | 2981 | # func_win32_libid shell function, so use a weaker test based on 'objdump', | 3233 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
1305 | 2982 | # unless we find 'file', for example because we are cross-compiling. | 3234 | # unless we find 'file', for example because we are cross-compiling. |
1307 | 2983 | if ( file / ) >/dev/null 2>&1; then | 3235 | # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
1308 | 3236 | if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then | ||
1309 | 2984 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 3237 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
1310 | 2985 | lt_cv_file_magic_cmd='func_win32_libid' | 3238 | lt_cv_file_magic_cmd='func_win32_libid' |
1311 | 2986 | else | 3239 | else |
1313 | 2987 | lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | 3240 | # Keep this pattern in sync with the one in func_win32_libid. |
1314 | 3241 | lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
1315 | 2988 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 3242 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
1316 | 2989 | fi | 3243 | fi |
1317 | 2990 | ;; | 3244 | ;; |
1318 | @@ -3019,6 +3273,10 @@ | |||
1319 | 3019 | lt_cv_deplibs_check_method=pass_all | 3273 | lt_cv_deplibs_check_method=pass_all |
1320 | 3020 | ;; | 3274 | ;; |
1321 | 3021 | 3275 | ||
1322 | 3276 | haiku*) | ||
1323 | 3277 | lt_cv_deplibs_check_method=pass_all | ||
1324 | 3278 | ;; | ||
1325 | 3279 | |||
1326 | 3022 | hpux10.20* | hpux11*) | 3280 | hpux10.20* | hpux11*) |
1327 | 3023 | lt_cv_file_magic_cmd=/usr/bin/file | 3281 | lt_cv_file_magic_cmd=/usr/bin/file |
1328 | 3024 | case $host_cpu in | 3282 | case $host_cpu in |
1329 | @@ -3052,7 +3310,7 @@ | |||
1330 | 3052 | lt_cv_deplibs_check_method=pass_all | 3310 | lt_cv_deplibs_check_method=pass_all |
1331 | 3053 | ;; | 3311 | ;; |
1332 | 3054 | 3312 | ||
1334 | 3055 | # This must be Linux ELF. | 3313 | # This must be glibc/ELF. |
1335 | 3056 | linux* | k*bsd*-gnu | kopensolaris*-gnu) | 3314 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1336 | 3057 | lt_cv_deplibs_check_method=pass_all | 3315 | lt_cv_deplibs_check_method=pass_all |
1337 | 3058 | ;; | 3316 | ;; |
1338 | @@ -3131,6 +3389,21 @@ | |||
1339 | 3131 | ;; | 3389 | ;; |
1340 | 3132 | esac | 3390 | esac |
1341 | 3133 | ]) | 3391 | ]) |
1342 | 3392 | |||
1343 | 3393 | file_magic_glob= | ||
1344 | 3394 | want_nocaseglob=no | ||
1345 | 3395 | if test "$build" = "$host"; then | ||
1346 | 3396 | case $host_os in | ||
1347 | 3397 | mingw* | pw32*) | ||
1348 | 3398 | if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
1349 | 3399 | want_nocaseglob=yes | ||
1350 | 3400 | else | ||
1351 | 3401 | file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` | ||
1352 | 3402 | fi | ||
1353 | 3403 | ;; | ||
1354 | 3404 | esac | ||
1355 | 3405 | fi | ||
1356 | 3406 | |||
1357 | 3134 | file_magic_cmd=$lt_cv_file_magic_cmd | 3407 | file_magic_cmd=$lt_cv_file_magic_cmd |
1358 | 3135 | deplibs_check_method=$lt_cv_deplibs_check_method | 3408 | deplibs_check_method=$lt_cv_deplibs_check_method |
1359 | 3136 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 3409 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
1360 | @@ -3138,7 +3411,11 @@ | |||
1361 | 3138 | _LT_DECL([], [deplibs_check_method], [1], | 3411 | _LT_DECL([], [deplibs_check_method], [1], |
1362 | 3139 | [Method to check whether dependent libraries are shared objects]) | 3412 | [Method to check whether dependent libraries are shared objects]) |
1363 | 3140 | _LT_DECL([], [file_magic_cmd], [1], | 3413 | _LT_DECL([], [file_magic_cmd], [1], |
1365 | 3141 | [Command to use when deplibs_check_method == "file_magic"]) | 3414 | [Command to use when deplibs_check_method = "file_magic"]) |
1366 | 3415 | _LT_DECL([], [file_magic_glob], [1], | ||
1367 | 3416 | [How to find potential files when deplibs_check_method = "file_magic"]) | ||
1368 | 3417 | _LT_DECL([], [want_nocaseglob], [1], | ||
1369 | 3418 | [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) | ||
1370 | 3142 | ])# _LT_CHECK_MAGIC_METHOD | 3419 | ])# _LT_CHECK_MAGIC_METHOD |
1371 | 3143 | 3420 | ||
1372 | 3144 | 3421 | ||
1373 | @@ -3220,13 +3497,13 @@ | |||
1374 | 3220 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], | 3497 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
1375 | 3221 | [lt_cv_nm_interface="BSD nm" | 3498 | [lt_cv_nm_interface="BSD nm" |
1376 | 3222 | echo "int some_variable = 0;" > conftest.$ac_ext | 3499 | echo "int some_variable = 0;" > conftest.$ac_ext |
1378 | 3223 | (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) | 3500 | (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
1379 | 3224 | (eval "$ac_compile" 2>conftest.err) | 3501 | (eval "$ac_compile" 2>conftest.err) |
1380 | 3225 | cat conftest.err >&AS_MESSAGE_LOG_FD | 3502 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1382 | 3226 | (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) | 3503 | (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
1383 | 3227 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 3504 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
1384 | 3228 | cat conftest.err >&AS_MESSAGE_LOG_FD | 3505 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1386 | 3229 | (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) | 3506 | (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
1387 | 3230 | cat conftest.out >&AS_MESSAGE_LOG_FD | 3507 | cat conftest.out >&AS_MESSAGE_LOG_FD |
1388 | 3231 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 3508 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
1389 | 3232 | lt_cv_nm_interface="MS dumpbin" | 3509 | lt_cv_nm_interface="MS dumpbin" |
1390 | @@ -3241,6 +3518,67 @@ | |||
1391 | 3241 | dnl AC_DEFUN([AM_PROG_NM], []) | 3518 | dnl AC_DEFUN([AM_PROG_NM], []) |
1392 | 3242 | dnl AC_DEFUN([AC_PROG_NM], []) | 3519 | dnl AC_DEFUN([AC_PROG_NM], []) |
1393 | 3243 | 3520 | ||
1394 | 3521 | # _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
1395 | 3522 | # -------------------------------- | ||
1396 | 3523 | # how to determine the name of the shared library | ||
1397 | 3524 | # associated with a specific link library. | ||
1398 | 3525 | # -- PORTME fill in with the dynamic library characteristics | ||
1399 | 3526 | m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], | ||
1400 | 3527 | [m4_require([_LT_DECL_EGREP]) | ||
1401 | 3528 | m4_require([_LT_DECL_OBJDUMP]) | ||
1402 | 3529 | m4_require([_LT_DECL_DLLTOOL]) | ||
1403 | 3530 | AC_CACHE_CHECK([how to associate runtime and link libraries], | ||
1404 | 3531 | lt_cv_sharedlib_from_linklib_cmd, | ||
1405 | 3532 | [lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
1406 | 3533 | |||
1407 | 3534 | case $host_os in | ||
1408 | 3535 | cygwin* | mingw* | pw32* | cegcc*) | ||
1409 | 3536 | # two different shell functions defined in ltmain.sh | ||
1410 | 3537 | # decide which to use based on capabilities of $DLLTOOL | ||
1411 | 3538 | case `$DLLTOOL --help 2>&1` in | ||
1412 | 3539 | *--identify-strict*) | ||
1413 | 3540 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
1414 | 3541 | ;; | ||
1415 | 3542 | *) | ||
1416 | 3543 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
1417 | 3544 | ;; | ||
1418 | 3545 | esac | ||
1419 | 3546 | ;; | ||
1420 | 3547 | *) | ||
1421 | 3548 | # fallback: assume linklib IS sharedlib | ||
1422 | 3549 | lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
1423 | 3550 | ;; | ||
1424 | 3551 | esac | ||
1425 | 3552 | ]) | ||
1426 | 3553 | sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
1427 | 3554 | test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
1428 | 3555 | |||
1429 | 3556 | _LT_DECL([], [sharedlib_from_linklib_cmd], [1], | ||
1430 | 3557 | [Command to associate shared and link libraries]) | ||
1431 | 3558 | ])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
1432 | 3559 | |||
1433 | 3560 | |||
1434 | 3561 | # _LT_PATH_MANIFEST_TOOL | ||
1435 | 3562 | # ---------------------- | ||
1436 | 3563 | # locate the manifest tool | ||
1437 | 3564 | m4_defun([_LT_PATH_MANIFEST_TOOL], | ||
1438 | 3565 | [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) | ||
1439 | 3566 | test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
1440 | 3567 | AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], | ||
1441 | 3568 | [lt_cv_path_mainfest_tool=no | ||
1442 | 3569 | echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD | ||
1443 | 3570 | $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
1444 | 3571 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1445 | 3572 | if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
1446 | 3573 | lt_cv_path_mainfest_tool=yes | ||
1447 | 3574 | fi | ||
1448 | 3575 | rm -f conftest*]) | ||
1449 | 3576 | if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
1450 | 3577 | MANIFEST_TOOL=: | ||
1451 | 3578 | fi | ||
1452 | 3579 | _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl | ||
1453 | 3580 | ])# _LT_PATH_MANIFEST_TOOL | ||
1454 | 3581 | |||
1455 | 3244 | 3582 | ||
1456 | 3245 | # LT_LIB_M | 3583 | # LT_LIB_M |
1457 | 3246 | # -------- | 3584 | # -------- |
1458 | @@ -3249,7 +3587,7 @@ | |||
1459 | 3249 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 3587 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1460 | 3250 | LIBM= | 3588 | LIBM= |
1461 | 3251 | case $host in | 3589 | case $host in |
1463 | 3252 | *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) | 3590 | *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
1464 | 3253 | # These system don't have libm, or don't need it | 3591 | # These system don't have libm, or don't need it |
1465 | 3254 | ;; | 3592 | ;; |
1466 | 3255 | *-ncr-sysv4.3*) | 3593 | *-ncr-sysv4.3*) |
1467 | @@ -3277,7 +3615,12 @@ | |||
1468 | 3277 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= | 3615 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
1469 | 3278 | 3616 | ||
1470 | 3279 | if test "$GCC" = yes; then | 3617 | if test "$GCC" = yes; then |
1472 | 3280 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' | 3618 | case $cc_basename in |
1473 | 3619 | nvcc*) | ||
1474 | 3620 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; | ||
1475 | 3621 | *) | ||
1476 | 3622 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; | ||
1477 | 3623 | esac | ||
1478 | 3281 | 3624 | ||
1479 | 3282 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], | 3625 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
1480 | 3283 | lt_cv_prog_compiler_rtti_exceptions, | 3626 | lt_cv_prog_compiler_rtti_exceptions, |
1481 | @@ -3362,8 +3705,8 @@ | |||
1482 | 3362 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 3705 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
1483 | 3363 | 3706 | ||
1484 | 3364 | # Transform an extracted symbol line into symbol name and symbol address | 3707 | # Transform an extracted symbol line into symbol name and symbol address |
1487 | 3365 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" | 3708 | 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 | 3366 | 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'" | 3709 | 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 | 3367 | 3710 | ||
1490 | 3368 | # Handle CRLF in mingw tool chain | 3711 | # Handle CRLF in mingw tool chain |
1491 | 3369 | opt_cr= | 3712 | opt_cr= |
1492 | @@ -3387,6 +3730,7 @@ | |||
1493 | 3387 | # which start with @ or ?. | 3730 | # which start with @ or ?. |
1494 | 3388 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ | 3731 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
1495 | 3389 | " {last_section=section; section=\$ 3};"\ | 3732 | " {last_section=section; section=\$ 3};"\ |
1496 | 3733 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
1497 | 3390 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | 3734 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
1498 | 3391 | " \$ 0!~/External *\|/{next};"\ | 3735 | " \$ 0!~/External *\|/{next};"\ |
1499 | 3392 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | 3736 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
1500 | @@ -3399,6 +3743,7 @@ | |||
1501 | 3399 | else | 3743 | else |
1502 | 3400 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 3744 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
1503 | 3401 | fi | 3745 | fi |
1504 | 3746 | lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
1505 | 3402 | 3747 | ||
1506 | 3403 | # Check to see that the pipe works correctly. | 3748 | # Check to see that the pipe works correctly. |
1507 | 3404 | pipe_works=no | 3749 | pipe_works=no |
1508 | @@ -3432,6 +3777,18 @@ | |||
1509 | 3432 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 3777 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
1510 | 3433 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 3778 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
1511 | 3434 | cat <<_LT_EOF > conftest.$ac_ext | 3779 | cat <<_LT_EOF > conftest.$ac_ext |
1512 | 3780 | /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
1513 | 3781 | #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
1514 | 3782 | /* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
1515 | 3783 | relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
1516 | 3784 | # define LT@&t@_DLSYM_CONST | ||
1517 | 3785 | #elif defined(__osf__) | ||
1518 | 3786 | /* This system does not cope well with relocations in const data. */ | ||
1519 | 3787 | # define LT@&t@_DLSYM_CONST | ||
1520 | 3788 | #else | ||
1521 | 3789 | # define LT@&t@_DLSYM_CONST const | ||
1522 | 3790 | #endif | ||
1523 | 3791 | |||
1524 | 3435 | #ifdef __cplusplus | 3792 | #ifdef __cplusplus |
1525 | 3436 | extern "C" { | 3793 | extern "C" { |
1526 | 3437 | #endif | 3794 | #endif |
1527 | @@ -3443,7 +3800,7 @@ | |||
1528 | 3443 | cat <<_LT_EOF >> conftest.$ac_ext | 3800 | cat <<_LT_EOF >> conftest.$ac_ext |
1529 | 3444 | 3801 | ||
1530 | 3445 | /* The mapping between symbol names and symbols. */ | 3802 | /* The mapping between symbol names and symbols. */ |
1532 | 3446 | const struct { | 3803 | LT@&t@_DLSYM_CONST struct { |
1533 | 3447 | const char *name; | 3804 | const char *name; |
1534 | 3448 | void *address; | 3805 | void *address; |
1535 | 3449 | } | 3806 | } |
1536 | @@ -3469,15 +3826,15 @@ | |||
1537 | 3469 | _LT_EOF | 3826 | _LT_EOF |
1538 | 3470 | # Now try linking the two files. | 3827 | # Now try linking the two files. |
1539 | 3471 | mv conftest.$ac_objext conftstm.$ac_objext | 3828 | mv conftest.$ac_objext conftstm.$ac_objext |
1542 | 3472 | lt_save_LIBS="$LIBS" | 3829 | lt_globsym_save_LIBS=$LIBS |
1543 | 3473 | lt_save_CFLAGS="$CFLAGS" | 3830 | lt_globsym_save_CFLAGS=$CFLAGS |
1544 | 3474 | LIBS="conftstm.$ac_objext" | 3831 | LIBS="conftstm.$ac_objext" |
1545 | 3475 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" | 3832 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
1546 | 3476 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then | 3833 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
1547 | 3477 | pipe_works=yes | 3834 | pipe_works=yes |
1548 | 3478 | fi | 3835 | fi |
1551 | 3479 | LIBS="$lt_save_LIBS" | 3836 | LIBS=$lt_globsym_save_LIBS |
1552 | 3480 | CFLAGS="$lt_save_CFLAGS" | 3837 | CFLAGS=$lt_globsym_save_CFLAGS |
1553 | 3481 | else | 3838 | else |
1554 | 3482 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD | 3839 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
1555 | 3483 | fi | 3840 | fi |
1556 | @@ -3510,6 +3867,13 @@ | |||
1557 | 3510 | AC_MSG_RESULT(ok) | 3867 | AC_MSG_RESULT(ok) |
1558 | 3511 | fi | 3868 | fi |
1559 | 3512 | 3869 | ||
1560 | 3870 | # Response file support. | ||
1561 | 3871 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
1562 | 3872 | nm_file_list_spec='@' | ||
1563 | 3873 | elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then | ||
1564 | 3874 | nm_file_list_spec='@' | ||
1565 | 3875 | fi | ||
1566 | 3876 | |||
1567 | 3513 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], | 3877 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
1568 | 3514 | [Take the output of nm and produce a listing of raw symbols and C names]) | 3878 | [Take the output of nm and produce a listing of raw symbols and C names]) |
1569 | 3515 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], | 3879 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
1570 | @@ -3520,6 +3884,8 @@ | |||
1571 | 3520 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], | 3884 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
1572 | 3521 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], | 3885 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
1573 | 3522 | [Transform the output of nm in a C name address pair when lib prefix is needed]) | 3886 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
1574 | 3887 | _LT_DECL([], [nm_file_list_spec], [1], | ||
1575 | 3888 | [Specify filename containing input files for $NM]) | ||
1576 | 3523 | ]) # _LT_CMD_GLOBAL_SYMBOLS | 3889 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
1577 | 3524 | 3890 | ||
1578 | 3525 | 3891 | ||
1579 | @@ -3531,7 +3897,6 @@ | |||
1580 | 3531 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3897 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1581 | 3532 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | 3898 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
1582 | 3533 | 3899 | ||
1583 | 3534 | AC_MSG_CHECKING([for $compiler option to produce PIC]) | ||
1584 | 3535 | m4_if([$1], [CXX], [ | 3900 | m4_if([$1], [CXX], [ |
1585 | 3536 | # C++ specific cases for pic, static, wl, etc. | 3901 | # C++ specific cases for pic, static, wl, etc. |
1586 | 3537 | if test "$GXX" = yes; then | 3902 | if test "$GXX" = yes; then |
1587 | @@ -3582,6 +3947,11 @@ | |||
1588 | 3582 | # DJGPP does not support shared libraries at all | 3947 | # DJGPP does not support shared libraries at all |
1589 | 3583 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3948 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
1590 | 3584 | ;; | 3949 | ;; |
1591 | 3950 | haiku*) | ||
1592 | 3951 | # PIC is the default for Haiku. | ||
1593 | 3952 | # The "-static" flag exists, but is broken. | ||
1594 | 3953 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
1595 | 3954 | ;; | ||
1596 | 3585 | interix[[3-9]]*) | 3955 | interix[[3-9]]*) |
1597 | 3586 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. | 3956 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
1598 | 3587 | # Instead, we relocate shared libraries at runtime. | 3957 | # Instead, we relocate shared libraries at runtime. |
1599 | @@ -3631,6 +4001,12 @@ | |||
1600 | 3631 | ;; | 4001 | ;; |
1601 | 3632 | esac | 4002 | esac |
1602 | 3633 | ;; | 4003 | ;; |
1603 | 4004 | mingw* | cygwin* | os2* | pw32* | cegcc*) | ||
1604 | 4005 | # This hack is so that the source file can tell whether it is being | ||
1605 | 4006 | # built for inclusion in a dll (and should export symbols for example). | ||
1606 | 4007 | m4_if([$1], [GCJ], [], | ||
1607 | 4008 | [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | ||
1608 | 4009 | ;; | ||
1609 | 3634 | dgux*) | 4010 | dgux*) |
1610 | 3635 | case $cc_basename in | 4011 | case $cc_basename in |
1611 | 3636 | ec++*) | 4012 | ec++*) |
1612 | @@ -3783,7 +4159,7 @@ | |||
1613 | 3783 | ;; | 4159 | ;; |
1614 | 3784 | solaris*) | 4160 | solaris*) |
1615 | 3785 | case $cc_basename in | 4161 | case $cc_basename in |
1617 | 3786 | CC*) | 4162 | CC* | sunCC*) |
1618 | 3787 | # Sun C++ 4.2, 5.x and Centerline C++ | 4163 | # Sun C++ 4.2, 5.x and Centerline C++ |
1619 | 3788 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4164 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1620 | 3789 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4165 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1621 | @@ -3887,6 +4263,12 @@ | |||
1622 | 3887 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' | 4263 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
1623 | 3888 | ;; | 4264 | ;; |
1624 | 3889 | 4265 | ||
1625 | 4266 | haiku*) | ||
1626 | 4267 | # PIC is the default for Haiku. | ||
1627 | 4268 | # The "-static" flag exists, but is broken. | ||
1628 | 4269 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
1629 | 4270 | ;; | ||
1630 | 4271 | |||
1631 | 3890 | hpux*) | 4272 | hpux*) |
1632 | 3891 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit | 4273 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
1633 | 3892 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag | 4274 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
1634 | @@ -3929,6 +4311,15 @@ | |||
1635 | 3929 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 4311 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
1636 | 3930 | ;; | 4312 | ;; |
1637 | 3931 | esac | 4313 | esac |
1638 | 4314 | |||
1639 | 4315 | case $cc_basename in | ||
1640 | 4316 | nvcc*) # Cuda Compiler Driver 2.2 | ||
1641 | 4317 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' | ||
1642 | 4318 | if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then | ||
1643 | 4319 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" | ||
1644 | 4320 | fi | ||
1645 | 4321 | ;; | ||
1646 | 4322 | esac | ||
1647 | 3932 | else | 4323 | else |
1648 | 3933 | # PORTME Check for flag to pass linker flags through the system compiler. | 4324 | # PORTME Check for flag to pass linker flags through the system compiler. |
1649 | 3934 | case $host_os in | 4325 | case $host_os in |
1650 | @@ -3992,7 +4383,13 @@ | |||
1651 | 3992 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' | 4383 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
1652 | 3993 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' | 4384 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
1653 | 3994 | ;; | 4385 | ;; |
1655 | 3995 | pgcc* | pgf77* | pgf90* | pgf95*) | 4386 | nagfor*) |
1656 | 4387 | # NAG Fortran compiler | ||
1657 | 4388 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' | ||
1658 | 4389 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' | ||
1659 | 4390 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
1660 | 4391 | ;; | ||
1661 | 4392 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
1662 | 3996 | # Portland Group compilers (*not* the Pentium gcc compiler, | 4393 | # Portland Group compilers (*not* the Pentium gcc compiler, |
1663 | 3997 | # which looks to be a dead project) | 4394 | # which looks to be a dead project) |
1664 | 3998 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4395 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1665 | @@ -4012,18 +4409,33 @@ | |||
1666 | 4012 | ;; | 4409 | ;; |
1667 | 4013 | *) | 4410 | *) |
1668 | 4014 | case `$CC -V 2>&1 | sed 5q` in | 4411 | case `$CC -V 2>&1 | sed 5q` in |
1670 | 4015 | *Sun\ F* | *Sun*Fortran*) | 4412 | *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
1671 | 4016 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | 4413 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
1672 | 4017 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4414 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1673 | 4018 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4415 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1674 | 4019 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | 4416 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
1675 | 4020 | ;; | 4417 | ;; |
1676 | 4418 | *Sun\ F* | *Sun*Fortran*) | ||
1677 | 4419 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
1678 | 4420 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
1679 | 4421 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' | ||
1680 | 4422 | ;; | ||
1681 | 4021 | *Sun\ C*) | 4423 | *Sun\ C*) |
1682 | 4022 | # Sun C 5.9 | 4424 | # Sun C 5.9 |
1683 | 4023 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4425 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1684 | 4024 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4426 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1685 | 4025 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4427 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1686 | 4026 | ;; | 4428 | ;; |
1687 | 4429 | *Intel*\ [[CF]]*Compiler*) | ||
1688 | 4430 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
1689 | 4431 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | ||
1690 | 4432 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
1691 | 4433 | ;; | ||
1692 | 4434 | *Portland\ Group*) | ||
1693 | 4435 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
1694 | 4436 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' | ||
1695 | 4437 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
1696 | 4438 | ;; | ||
1697 | 4027 | esac | 4439 | esac |
1698 | 4028 | ;; | 4440 | ;; |
1699 | 4029 | esac | 4441 | esac |
1700 | @@ -4054,7 +4466,7 @@ | |||
1701 | 4054 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4466 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1702 | 4055 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4467 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1703 | 4056 | case $cc_basename in | 4468 | case $cc_basename in |
1705 | 4057 | f77* | f90* | f95*) | 4469 | f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
1706 | 4058 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; | 4470 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
1707 | 4059 | *) | 4471 | *) |
1708 | 4060 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; | 4472 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
1709 | @@ -4111,9 +4523,11 @@ | |||
1710 | 4111 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" | 4523 | _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 | 4112 | ;; | 4524 | ;; |
1712 | 4113 | esac | 4525 | esac |
1716 | 4114 | AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | 4526 | |
1717 | 4115 | _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | 4527 | AC_CACHE_CHECK([for $compiler option to produce PIC], |
1718 | 4116 | [How to pass a linker flag through the compiler]) | 4528 | [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
1719 | 4529 | [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | ||
1720 | 4530 | _LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) | ||
1721 | 4117 | 4531 | ||
1722 | 4118 | # | 4532 | # |
1723 | 4119 | # Check to make sure the PIC flag actually works. | 4533 | # Check to make sure the PIC flag actually works. |
1724 | @@ -4132,6 +4546,8 @@ | |||
1725 | 4132 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], | 4546 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
1726 | 4133 | [Additional compiler flags for building library objects]) | 4547 | [Additional compiler flags for building library objects]) |
1727 | 4134 | 4548 | ||
1728 | 4549 | _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | ||
1729 | 4550 | [How to pass a linker flag through the compiler]) | ||
1730 | 4135 | # | 4551 | # |
1731 | 4136 | # Check to make sure the static flag actually works. | 4552 | # Check to make sure the static flag actually works. |
1732 | 4137 | # | 4553 | # |
1733 | @@ -4152,6 +4568,7 @@ | |||
1734 | 4152 | m4_defun([_LT_LINKER_SHLIBS], | 4568 | m4_defun([_LT_LINKER_SHLIBS], |
1735 | 4153 | [AC_REQUIRE([LT_PATH_LD])dnl | 4569 | [AC_REQUIRE([LT_PATH_LD])dnl |
1736 | 4154 | AC_REQUIRE([LT_PATH_NM])dnl | 4570 | AC_REQUIRE([LT_PATH_NM])dnl |
1737 | 4571 | m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
1738 | 4155 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 4572 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1739 | 4156 | m4_require([_LT_DECL_EGREP])dnl | 4573 | m4_require([_LT_DECL_EGREP])dnl |
1740 | 4157 | m4_require([_LT_DECL_SED])dnl | 4574 | m4_require([_LT_DECL_SED])dnl |
1741 | @@ -4160,6 +4577,7 @@ | |||
1742 | 4160 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | 4577 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
1743 | 4161 | m4_if([$1], [CXX], [ | 4578 | m4_if([$1], [CXX], [ |
1744 | 4162 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4579 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
1745 | 4580 | _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
1746 | 4163 | case $host_os in | 4581 | case $host_os in |
1747 | 4164 | aix[[4-9]]*) | 4582 | aix[[4-9]]*) |
1748 | 4165 | # If we're using GNU nm, then we don't want the "-C" option. | 4583 | # If we're using GNU nm, then we don't want the "-C" option. |
1749 | @@ -4174,15 +4592,22 @@ | |||
1750 | 4174 | ;; | 4592 | ;; |
1751 | 4175 | pw32*) | 4593 | pw32*) |
1752 | 4176 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 4594 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
1754 | 4177 | ;; | 4595 | ;; |
1755 | 4178 | cygwin* | mingw* | cegcc*) | 4596 | cygwin* | mingw* | cegcc*) |
1758 | 4179 | _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' | 4597 | case $cc_basename in |
1759 | 4180 | ;; | 4598 | cl*) |
1760 | 4599 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
1761 | 4600 | ;; | ||
1762 | 4601 | *) | ||
1763 | 4602 | _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 | 4603 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
1765 | 4604 | ;; | ||
1766 | 4605 | esac | ||
1767 | 4606 | ;; | ||
1768 | 4181 | *) | 4607 | *) |
1769 | 4182 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4608 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
1771 | 4183 | ;; | 4609 | ;; |
1772 | 4184 | esac | 4610 | esac |
1773 | 4185 | _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
1774 | 4186 | ], [ | 4611 | ], [ |
1775 | 4187 | runpath_var= | 4612 | runpath_var= |
1776 | 4188 | _LT_TAGVAR(allow_undefined_flag, $1)= | 4613 | _LT_TAGVAR(allow_undefined_flag, $1)= |
1777 | @@ -4197,7 +4622,6 @@ | |||
1778 | 4197 | _LT_TAGVAR(hardcode_direct, $1)=no | 4622 | _LT_TAGVAR(hardcode_direct, $1)=no |
1779 | 4198 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 4623 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1780 | 4199 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4624 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1781 | 4200 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
1782 | 4201 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 4625 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1783 | 4202 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 4626 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1784 | 4203 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 4627 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1785 | @@ -4289,6 +4713,7 @@ | |||
1786 | 4289 | fi | 4713 | fi |
1787 | 4290 | supports_anon_versioning=no | 4714 | supports_anon_versioning=no |
1788 | 4291 | case `$LD -v 2>&1` in | 4715 | case `$LD -v 2>&1` in |
1789 | 4716 | *GNU\ gold*) supports_anon_versioning=yes ;; | ||
1790 | 4292 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 | 4717 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
1791 | 4293 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... | 4718 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
1792 | 4294 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... | 4719 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
1793 | @@ -4349,7 +4774,8 @@ | |||
1794 | 4349 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 4774 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
1795 | 4350 | _LT_TAGVAR(always_export_symbols, $1)=no | 4775 | _LT_TAGVAR(always_export_symbols, $1)=no |
1796 | 4351 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 4776 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1798 | 4352 | _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' | 4777 | _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 | 4778 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
1800 | 4353 | 4779 | ||
1801 | 4354 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 4780 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
1802 | 4355 | _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' | 4781 | _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 | 4367 | fi | 4793 | fi |
1805 | 4368 | ;; | 4794 | ;; |
1806 | 4369 | 4795 | ||
1807 | 4796 | haiku*) | ||
1808 | 4797 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
1809 | 4798 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
1810 | 4799 | ;; | ||
1811 | 4800 | |||
1812 | 4370 | interix[[3-9]]*) | 4801 | interix[[3-9]]*) |
1813 | 4371 | _LT_TAGVAR(hardcode_direct, $1)=no | 4802 | _LT_TAGVAR(hardcode_direct, $1)=no |
1814 | 4372 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 4803 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
1815 | @@ -4392,14 +4823,15 @@ | |||
1816 | 4392 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 4823 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
1817 | 4393 | && test "$tmp_diet" = no | 4824 | && test "$tmp_diet" = no |
1818 | 4394 | then | 4825 | then |
1820 | 4395 | tmp_addflag= | 4826 | tmp_addflag=' $pic_flag' |
1821 | 4396 | tmp_sharedflag='-shared' | 4827 | tmp_sharedflag='-shared' |
1822 | 4397 | case $cc_basename,$host_cpu in | 4828 | case $cc_basename,$host_cpu in |
1823 | 4398 | pgcc*) # Portland Group C compiler | 4829 | pgcc*) # Portland Group C compiler |
1824 | 4399 | _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' | 4830 | _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 | 4400 | tmp_addflag=' $pic_flag' | 4831 | tmp_addflag=' $pic_flag' |
1826 | 4401 | ;; | 4832 | ;; |
1828 | 4402 | pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers | 4833 | pgf77* | pgf90* | pgf95* | pgfortran*) |
1829 | 4834 | # Portland Group f77 and f90 compilers | ||
1830 | 4403 | _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' | 4835 | _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 | 4404 | tmp_addflag=' $pic_flag -Mnomain' ;; | 4836 | tmp_addflag=' $pic_flag -Mnomain' ;; |
1832 | 4405 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 | 4837 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
1833 | @@ -4414,6 +4846,10 @@ | |||
1834 | 4414 | xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) | 4846 | xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
1835 | 4415 | tmp_sharedflag='-qmkshrobj' | 4847 | tmp_sharedflag='-qmkshrobj' |
1836 | 4416 | tmp_addflag= ;; | 4848 | tmp_addflag= ;; |
1837 | 4849 | nvcc*) # Cuda Compiler Driver 2.2 | ||
1838 | 4850 | _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 | 4851 | _LT_TAGVAR(compiler_needs_object, $1)=yes | ||
1840 | 4852 | ;; | ||
1841 | 4417 | esac | 4853 | esac |
1842 | 4418 | case `$CC -V 2>&1 | sed 5q` in | 4854 | case `$CC -V 2>&1 | sed 5q` in |
1843 | 4419 | *Sun\ C*) # Sun C 5.9 | 4855 | *Sun\ C*) # Sun C 5.9 |
1844 | @@ -4436,14 +4872,13 @@ | |||
1845 | 4436 | xlf* | bgf* | bgxlf* | mpixlf*) | 4872 | xlf* | bgf* | bgxlf* | mpixlf*) |
1846 | 4437 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 4873 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
1847 | 4438 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 4874 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
1851 | 4439 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4875 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
1852 | 4440 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | 4876 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
1850 | 4441 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
1853 | 4442 | if test "x$supports_anon_versioning" = xyes; then | 4877 | if test "x$supports_anon_versioning" = xyes; then |
1854 | 4443 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | 4878 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
1855 | 4444 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 4879 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
1856 | 4445 | echo "local: *; };" >> $output_objdir/$libname.ver~ | 4880 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
1858 | 4446 | $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | 4881 | $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
1859 | 4447 | fi | 4882 | fi |
1860 | 4448 | ;; | 4883 | ;; |
1861 | 4449 | esac | 4884 | esac |
1862 | @@ -4457,8 +4892,8 @@ | |||
1863 | 4457 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4892 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
1864 | 4458 | wlarc= | 4893 | wlarc= |
1865 | 4459 | else | 4894 | else |
1868 | 4460 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4895 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1869 | 4461 | _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' | 4896 | _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 | 4462 | fi | 4897 | fi |
1871 | 4463 | ;; | 4898 | ;; |
1872 | 4464 | 4899 | ||
1873 | @@ -4476,8 +4911,8 @@ | |||
1874 | 4476 | 4911 | ||
1875 | 4477 | _LT_EOF | 4912 | _LT_EOF |
1876 | 4478 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4913 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
1879 | 4479 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4914 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1880 | 4480 | _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' | 4915 | _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 | 4481 | else | 4916 | else |
1882 | 4482 | _LT_TAGVAR(ld_shlibs, $1)=no | 4917 | _LT_TAGVAR(ld_shlibs, $1)=no |
1883 | 4483 | fi | 4918 | fi |
1884 | @@ -4523,8 +4958,8 @@ | |||
1885 | 4523 | 4958 | ||
1886 | 4524 | *) | 4959 | *) |
1887 | 4525 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4960 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
1890 | 4526 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4961 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1891 | 4527 | _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' | 4962 | _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 | 4528 | else | 4963 | else |
1893 | 4529 | _LT_TAGVAR(ld_shlibs, $1)=no | 4964 | _LT_TAGVAR(ld_shlibs, $1)=no |
1894 | 4530 | fi | 4965 | fi |
1895 | @@ -4654,7 +5089,7 @@ | |||
1896 | 4654 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 5089 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
1897 | 4655 | # Determine the default libpath from the value encoded in an | 5090 | # Determine the default libpath from the value encoded in an |
1898 | 4656 | # empty executable. | 5091 | # empty executable. |
1900 | 4657 | _LT_SYS_MODULE_PATH_AIX | 5092 | _LT_SYS_MODULE_PATH_AIX([$1]) |
1901 | 4658 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5093 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
1902 | 4659 | _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" | 5094 | _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 | 4660 | else | 5095 | else |
1904 | @@ -4665,7 +5100,7 @@ | |||
1905 | 4665 | else | 5100 | else |
1906 | 4666 | # Determine the default libpath from the value encoded in an | 5101 | # Determine the default libpath from the value encoded in an |
1907 | 4667 | # empty executable. | 5102 | # empty executable. |
1909 | 4668 | _LT_SYS_MODULE_PATH_AIX | 5103 | _LT_SYS_MODULE_PATH_AIX([$1]) |
1910 | 4669 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5104 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
1911 | 4670 | # Warning - without using the other run time loading flags, | 5105 | # Warning - without using the other run time loading flags, |
1912 | 4671 | # -berok will link without error, but may produce a broken library. | 5106 | # -berok will link without error, but may produce a broken library. |
1913 | @@ -4709,20 +5144,64 @@ | |||
1914 | 4709 | # Microsoft Visual C++. | 5144 | # Microsoft Visual C++. |
1915 | 4710 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 5145 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
1916 | 4711 | # no search path for DLLs. | 5146 | # no search path for DLLs. |
1931 | 4712 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | 5147 | case $cc_basename in |
1932 | 4713 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 5148 | cl*) |
1933 | 4714 | # Tell ltmain to make .lib files, not .a files. | 5149 | # Native MSVC |
1934 | 4715 | libext=lib | 5150 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
1935 | 4716 | # Tell ltmain to make .dll files, not .so files. | 5151 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
1936 | 4717 | shrext_cmds=".dll" | 5152 | _LT_TAGVAR(always_export_symbols, $1)=yes |
1937 | 4718 | # FIXME: Setting linknames here is a bad hack. | 5153 | _LT_TAGVAR(file_list_spec, $1)='@' |
1938 | 4719 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | 5154 | # Tell ltmain to make .lib files, not .a files. |
1939 | 4720 | # The linker will automatically build a .lib file if we build a DLL. | 5155 | libext=lib |
1940 | 4721 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | 5156 | # Tell ltmain to make .dll files, not .so files. |
1941 | 4722 | # FIXME: Should let the user specify the lib program. | 5157 | shrext_cmds=".dll" |
1942 | 4723 | _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | 5158 | # FIXME: Setting linknames here is a bad hack. |
1943 | 4724 | _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' | 5159 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
1944 | 4725 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 5160 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
1945 | 5161 | sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
1946 | 5162 | else | ||
1947 | 5163 | sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
1948 | 5164 | fi~ | ||
1949 | 5165 | $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 | 5166 | linknames=' | ||
1951 | 5167 | # The linker will not automatically build a static lib if we build a DLL. | ||
1952 | 5168 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
1953 | 5169 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
1954 | 5170 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
1955 | 5171 | _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 | 5172 | # Don't use ranlib | ||
1957 | 5173 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
1958 | 5174 | _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
1959 | 5175 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
1960 | 5176 | case $lt_outputfile in | ||
1961 | 5177 | *.exe|*.EXE) ;; | ||
1962 | 5178 | *) | ||
1963 | 5179 | lt_outputfile="$lt_outputfile.exe" | ||
1964 | 5180 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
1965 | 5181 | ;; | ||
1966 | 5182 | esac~ | ||
1967 | 5183 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
1968 | 5184 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
1969 | 5185 | $RM "$lt_outputfile.manifest"; | ||
1970 | 5186 | fi' | ||
1971 | 5187 | ;; | ||
1972 | 5188 | *) | ||
1973 | 5189 | # Assume MSVC wrapper | ||
1974 | 5190 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | ||
1975 | 5191 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
1976 | 5192 | # Tell ltmain to make .lib files, not .a files. | ||
1977 | 5193 | libext=lib | ||
1978 | 5194 | # Tell ltmain to make .dll files, not .so files. | ||
1979 | 5195 | shrext_cmds=".dll" | ||
1980 | 5196 | # FIXME: Setting linknames here is a bad hack. | ||
1981 | 5197 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
1982 | 5198 | # The linker will automatically build a .lib file if we build a DLL. | ||
1983 | 5199 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
1984 | 5200 | # FIXME: Should let the user specify the lib program. | ||
1985 | 5201 | _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
1986 | 5202 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
1987 | 5203 | ;; | ||
1988 | 5204 | esac | ||
1989 | 4726 | ;; | 5205 | ;; |
1990 | 4727 | 5206 | ||
1991 | 4728 | darwin* | rhapsody*) | 5207 | darwin* | rhapsody*) |
1992 | @@ -4735,10 +5214,6 @@ | |||
1993 | 4735 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 5214 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
1994 | 4736 | ;; | 5215 | ;; |
1995 | 4737 | 5216 | ||
1996 | 4738 | freebsd1*) | ||
1997 | 4739 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
1998 | 4740 | ;; | ||
1999 | 4741 | |||
2000 | 4742 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | 5217 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
2001 | 4743 | # support. Future versions do this automatically, but an explicit c++rt0.o | 5218 | # support. Future versions do this automatically, but an explicit c++rt0.o |
2002 | 4744 | # does not break anything, and helps significantly (at the cost of a little | 5219 | # does not break anything, and helps significantly (at the cost of a little |
2003 | @@ -4751,7 +5226,7 @@ | |||
2004 | 4751 | ;; | 5226 | ;; |
2005 | 4752 | 5227 | ||
2006 | 4753 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | 5228 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
2008 | 4754 | freebsd2*) | 5229 | freebsd2.*) |
2009 | 4755 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | 5230 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
2010 | 4756 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5231 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2011 | 4757 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 5232 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
2012 | @@ -4760,7 +5235,7 @@ | |||
2013 | 4760 | 5235 | ||
2014 | 4761 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 5236 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
2015 | 4762 | freebsd* | dragonfly*) | 5237 | freebsd* | dragonfly*) |
2017 | 4763 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | 5238 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
2018 | 4764 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 5239 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
2019 | 4765 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5240 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2020 | 4766 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 5241 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
2021 | @@ -4768,7 +5243,7 @@ | |||
2022 | 4768 | 5243 | ||
2023 | 4769 | hpux9*) | 5244 | hpux9*) |
2024 | 4770 | if test "$GCC" = yes; then | 5245 | if test "$GCC" = yes; then |
2026 | 4771 | _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' | 5246 | _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 | 4772 | else | 5247 | else |
2028 | 4773 | _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' | 5248 | _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 | 4774 | fi | 5249 | fi |
2030 | @@ -4784,13 +5259,12 @@ | |||
2031 | 4784 | 5259 | ||
2032 | 4785 | hpux10*) | 5260 | hpux10*) |
2033 | 4786 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 5261 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
2035 | 4787 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5262 | _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 | 4788 | else | 5263 | else |
2037 | 4789 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 5264 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
2038 | 4790 | fi | 5265 | fi |
2039 | 4791 | if test "$with_gnu_ld" = no; then | 5266 | if test "$with_gnu_ld" = no; then |
2040 | 4792 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 5267 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
2041 | 4793 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' | ||
2042 | 4794 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 5268 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
2043 | 4795 | _LT_TAGVAR(hardcode_direct, $1)=yes | 5269 | _LT_TAGVAR(hardcode_direct, $1)=yes |
2044 | 4796 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes | 5270 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
2045 | @@ -4808,10 +5282,10 @@ | |||
2046 | 4808 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 5282 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2047 | 4809 | ;; | 5283 | ;; |
2048 | 4810 | ia64*) | 5284 | ia64*) |
2050 | 4811 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 5285 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
2051 | 4812 | ;; | 5286 | ;; |
2052 | 4813 | *) | 5287 | *) |
2054 | 4814 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5288 | _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 | 4815 | ;; | 5289 | ;; |
2056 | 4816 | esac | 5290 | esac |
2057 | 4817 | else | 5291 | else |
2058 | @@ -4858,16 +5332,31 @@ | |||
2059 | 4858 | 5332 | ||
2060 | 4859 | irix5* | irix6* | nonstopux*) | 5333 | irix5* | irix6* | nonstopux*) |
2061 | 4860 | if test "$GCC" = yes; then | 5334 | if test "$GCC" = yes; then |
2063 | 4861 | _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' | 5335 | _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 | 4862 | # Try to use the -exported_symbol ld option, if it does not | 5336 | # Try to use the -exported_symbol ld option, if it does not |
2065 | 4863 | # work, assume that -exports_file does not work either and | 5337 | # work, assume that -exports_file does not work either and |
2066 | 4864 | # implicitly export all symbols. | 5338 | # implicitly export all symbols. |
2073 | 4865 | save_LDFLAGS="$LDFLAGS" | 5339 | # This should be the same for all languages, so no per-tag cache variable. |
2074 | 4866 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | 5340 | AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
2075 | 4867 | AC_LINK_IFELSE(int foo(void) {}, | 5341 | [lt_cv_irix_exported_symbol], |
2076 | 4868 | _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' | 5342 | [save_LDFLAGS="$LDFLAGS" |
2077 | 4869 | ) | 5343 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
2078 | 4870 | LDFLAGS="$save_LDFLAGS" | 5344 | AC_LINK_IFELSE( |
2079 | 5345 | [AC_LANG_SOURCE( | ||
2080 | 5346 | [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], | ||
2081 | 5347 | [C++], [[int foo (void) { return 0; }]], | ||
2082 | 5348 | [Fortran 77], [[ | ||
2083 | 5349 | subroutine foo | ||
2084 | 5350 | end]], | ||
2085 | 5351 | [Fortran], [[ | ||
2086 | 5352 | subroutine foo | ||
2087 | 5353 | end]])])], | ||
2088 | 5354 | [lt_cv_irix_exported_symbol=yes], | ||
2089 | 5355 | [lt_cv_irix_exported_symbol=no]) | ||
2090 | 5356 | LDFLAGS="$save_LDFLAGS"]) | ||
2091 | 5357 | if test "$lt_cv_irix_exported_symbol" = yes; then | ||
2092 | 5358 | _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 | 5359 | fi | ||
2094 | 4871 | else | 5360 | else |
2095 | 4872 | _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' | 5361 | _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 | 4873 | _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' | 5362 | _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 | 4952 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 5441 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
2099 | 4953 | if test "$GCC" = yes; then | 5442 | if test "$GCC" = yes; then |
2100 | 4954 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 5443 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
2102 | 4955 | _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' | 5444 | _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 | 4956 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5445 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2104 | 4957 | else | 5446 | else |
2105 | 4958 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 5447 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
2106 | @@ -4971,9 +5460,9 @@ | |||
2107 | 4971 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' | 5460 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
2108 | 4972 | if test "$GCC" = yes; then | 5461 | if test "$GCC" = yes; then |
2109 | 4973 | wlarc='${wl}' | 5462 | wlarc='${wl}' |
2111 | 4974 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 5463 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
2112 | 4975 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 5464 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
2114 | 4976 | $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | 5465 | $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 | 4977 | else | 5466 | else |
2116 | 4978 | case `$CC -V 2>&1` in | 5467 | case `$CC -V 2>&1` in |
2117 | 4979 | *"Compilers 5.0"*) | 5468 | *"Compilers 5.0"*) |
2118 | @@ -5217,9 +5706,6 @@ | |||
2119 | 5217 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], | 5706 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
2120 | 5218 | [Flag to hardcode $libdir into a binary during linking. | 5707 | [Flag to hardcode $libdir into a binary during linking. |
2121 | 5219 | This must work even if $libdir does not exist]) | 5708 | This must work even if $libdir does not exist]) |
2122 | 5220 | _LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], | ||
2123 | 5221 | [[If ld is used when linking, flag to hardcode $libdir into a binary | ||
2124 | 5222 | during linking. This must work even if $libdir does not exist]]) | ||
2125 | 5223 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], | 5709 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
2126 | 5224 | [Whether we need a single "-rpath" flag with a separated argument]) | 5710 | [Whether we need a single "-rpath" flag with a separated argument]) |
2127 | 5225 | _LT_TAGDECL([], [hardcode_direct], [0], | 5711 | _LT_TAGDECL([], [hardcode_direct], [0], |
2128 | @@ -5245,8 +5731,6 @@ | |||
2129 | 5245 | to runtime path list]) | 5731 | to runtime path list]) |
2130 | 5246 | _LT_TAGDECL([], [link_all_deplibs], [0], | 5732 | _LT_TAGDECL([], [link_all_deplibs], [0], |
2131 | 5247 | [Whether libtool must link a program against all its dependency libraries]) | 5733 | [Whether libtool must link a program against all its dependency libraries]) |
2132 | 5248 | _LT_TAGDECL([], [fix_srcfile_path], [1], | ||
2133 | 5249 | [Fix the shell variable $srcfile for the compiler]) | ||
2134 | 5250 | _LT_TAGDECL([], [always_export_symbols], [0], | 5734 | _LT_TAGDECL([], [always_export_symbols], [0], |
2135 | 5251 | [Set to "yes" if exported symbols are required]) | 5735 | [Set to "yes" if exported symbols are required]) |
2136 | 5252 | _LT_TAGDECL([], [export_symbols_cmds], [2], | 5736 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
2137 | @@ -5257,6 +5741,8 @@ | |||
2138 | 5257 | [Symbols that must always be exported]) | 5741 | [Symbols that must always be exported]) |
2139 | 5258 | _LT_TAGDECL([], [prelink_cmds], [2], | 5742 | _LT_TAGDECL([], [prelink_cmds], [2], |
2140 | 5259 | [Commands necessary for linking programs (against libraries) with templates]) | 5743 | [Commands necessary for linking programs (against libraries) with templates]) |
2141 | 5744 | _LT_TAGDECL([], [postlink_cmds], [2], | ||
2142 | 5745 | [Commands necessary for finishing linking programs]) | ||
2143 | 5260 | _LT_TAGDECL([], [file_list_spec], [1], | 5746 | _LT_TAGDECL([], [file_list_spec], [1], |
2144 | 5261 | [Specify filename containing input files]) | 5747 | [Specify filename containing input files]) |
2145 | 5262 | dnl FIXME: Not yet implemented | 5748 | dnl FIXME: Not yet implemented |
2146 | @@ -5354,6 +5840,7 @@ | |||
2147 | 5354 | m4_defun([_LT_LANG_CXX_CONFIG], | 5840 | m4_defun([_LT_LANG_CXX_CONFIG], |
2148 | 5355 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 5841 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2149 | 5356 | m4_require([_LT_DECL_EGREP])dnl | 5842 | m4_require([_LT_DECL_EGREP])dnl |
2150 | 5843 | m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
2151 | 5357 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 5844 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
2152 | 5358 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 5845 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
2153 | 5359 | (test "X$CXX" != "Xg++"))) ; then | 5846 | (test "X$CXX" != "Xg++"))) ; then |
2154 | @@ -5372,7 +5859,6 @@ | |||
2155 | 5372 | _LT_TAGVAR(hardcode_direct, $1)=no | 5859 | _LT_TAGVAR(hardcode_direct, $1)=no |
2156 | 5373 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 5860 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2157 | 5374 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 5861 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2158 | 5375 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
2159 | 5376 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 5862 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2160 | 5377 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 5863 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2161 | 5378 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 5864 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2162 | @@ -5415,6 +5901,7 @@ | |||
2163 | 5415 | 5901 | ||
2164 | 5416 | # Allow CC to be a program name with arguments. | 5902 | # Allow CC to be a program name with arguments. |
2165 | 5417 | lt_save_CC=$CC | 5903 | lt_save_CC=$CC |
2166 | 5904 | lt_save_CFLAGS=$CFLAGS | ||
2167 | 5418 | lt_save_LD=$LD | 5905 | lt_save_LD=$LD |
2168 | 5419 | lt_save_GCC=$GCC | 5906 | lt_save_GCC=$GCC |
2169 | 5420 | GCC=$GXX | 5907 | GCC=$GXX |
2170 | @@ -5432,6 +5919,7 @@ | |||
2171 | 5432 | fi | 5919 | fi |
2172 | 5433 | test -z "${LDCXX+set}" || LD=$LDCXX | 5920 | test -z "${LDCXX+set}" || LD=$LDCXX |
2173 | 5434 | CC=${CXX-"c++"} | 5921 | CC=${CXX-"c++"} |
2174 | 5922 | CFLAGS=$CXXFLAGS | ||
2175 | 5435 | compiler=$CC | 5923 | compiler=$CC |
2176 | 5436 | _LT_TAGVAR(compiler, $1)=$CC | 5924 | _LT_TAGVAR(compiler, $1)=$CC |
2177 | 5437 | _LT_CC_BASENAME([$compiler]) | 5925 | _LT_CC_BASENAME([$compiler]) |
2178 | @@ -5453,8 +5941,8 @@ | |||
2179 | 5453 | # Check if GNU C++ uses GNU ld as the underlying linker, since the | 5941 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
2180 | 5454 | # archiving commands below assume that GNU ld is being used. | 5942 | # archiving commands below assume that GNU ld is being used. |
2181 | 5455 | if test "$with_gnu_ld" = yes; then | 5943 | if test "$with_gnu_ld" = yes; then |
2184 | 5456 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' | 5944 | _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 | 5457 | _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' | 5945 | _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 | 5458 | 5946 | ||
2187 | 5459 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5947 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
2188 | 5460 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 5948 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
2189 | @@ -5486,7 +5974,7 @@ | |||
2190 | 5486 | # Commands to make compiler produce verbose output that lists | 5974 | # Commands to make compiler produce verbose output that lists |
2191 | 5487 | # what "hidden" libraries, object files and flags are used when | 5975 | # what "hidden" libraries, object files and flags are used when |
2192 | 5488 | # linking a shared library. | 5976 | # linking a shared library. |
2194 | 5489 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 5977 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2195 | 5490 | 5978 | ||
2196 | 5491 | else | 5979 | else |
2197 | 5492 | GXX=no | 5980 | GXX=no |
2198 | @@ -5595,7 +6083,7 @@ | |||
2199 | 5595 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 6083 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
2200 | 5596 | # Determine the default libpath from the value encoded in an empty | 6084 | # Determine the default libpath from the value encoded in an empty |
2201 | 5597 | # executable. | 6085 | # executable. |
2203 | 5598 | _LT_SYS_MODULE_PATH_AIX | 6086 | _LT_SYS_MODULE_PATH_AIX([$1]) |
2204 | 5599 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 6087 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2205 | 5600 | 6088 | ||
2206 | 5601 | _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" | 6089 | _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 | 5607 | else | 6095 | else |
2209 | 5608 | # Determine the default libpath from the value encoded in an | 6096 | # Determine the default libpath from the value encoded in an |
2210 | 5609 | # empty executable. | 6097 | # empty executable. |
2212 | 5610 | _LT_SYS_MODULE_PATH_AIX | 6098 | _LT_SYS_MODULE_PATH_AIX([$1]) |
2213 | 5611 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 6099 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
2214 | 5612 | # Warning - without using the other run time loading flags, | 6100 | # Warning - without using the other run time loading flags, |
2215 | 5613 | # -berok will link without error, but may produce a broken library. | 6101 | # -berok will link without error, but may produce a broken library. |
2216 | @@ -5649,29 +6137,75 @@ | |||
2217 | 5649 | ;; | 6137 | ;; |
2218 | 5650 | 6138 | ||
2219 | 5651 | cygwin* | mingw* | pw32* | cegcc*) | 6139 | cygwin* | mingw* | pw32* | cegcc*) |
2227 | 5652 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 6140 | case $GXX,$cc_basename in |
2228 | 5653 | # as there is no search path for DLLs. | 6141 | ,cl* | no,cl*) |
2229 | 5654 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 6142 | # Native MSVC |
2230 | 5655 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | 6143 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
2231 | 5656 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 6144 | # no search path for DLLs. |
2232 | 5657 | _LT_TAGVAR(always_export_symbols, $1)=no | 6145 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
2233 | 5658 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 6146 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
2234 | 6147 | _LT_TAGVAR(always_export_symbols, $1)=yes | ||
2235 | 6148 | _LT_TAGVAR(file_list_spec, $1)='@' | ||
2236 | 6149 | # Tell ltmain to make .lib files, not .a files. | ||
2237 | 6150 | libext=lib | ||
2238 | 6151 | # Tell ltmain to make .dll files, not .so files. | ||
2239 | 6152 | shrext_cmds=".dll" | ||
2240 | 6153 | # FIXME: Setting linknames here is a bad hack. | ||
2241 | 6154 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
2242 | 6155 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
2243 | 6156 | $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
2244 | 6157 | else | ||
2245 | 6158 | $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
2246 | 6159 | fi~ | ||
2247 | 6160 | $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 | 6161 | linknames=' | ||
2249 | 6162 | # The linker will not automatically build a static lib if we build a DLL. | ||
2250 | 6163 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
2251 | 6164 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
2252 | 6165 | # Don't use ranlib | ||
2253 | 6166 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
2254 | 6167 | _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
2255 | 6168 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
2256 | 6169 | case $lt_outputfile in | ||
2257 | 6170 | *.exe|*.EXE) ;; | ||
2258 | 6171 | *) | ||
2259 | 6172 | lt_outputfile="$lt_outputfile.exe" | ||
2260 | 6173 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
2261 | 6174 | ;; | ||
2262 | 6175 | esac~ | ||
2263 | 6176 | func_to_tool_file "$lt_outputfile"~ | ||
2264 | 6177 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
2265 | 6178 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
2266 | 6179 | $RM "$lt_outputfile.manifest"; | ||
2267 | 6180 | fi' | ||
2268 | 6181 | ;; | ||
2269 | 6182 | *) | ||
2270 | 6183 | # g++ | ||
2271 | 6184 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | ||
2272 | 6185 | # as there is no search path for DLLs. | ||
2273 | 6186 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | ||
2274 | 6187 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
2275 | 6188 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
2276 | 6189 | _LT_TAGVAR(always_export_symbols, $1)=no | ||
2277 | 6190 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
2278 | 5659 | 6191 | ||
2294 | 5660 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 6192 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2295 | 5661 | _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' | 6193 | _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 | 5662 | # If the export-symbols file already is a .def file (1st line | 6194 | # If the export-symbols file already is a .def file (1st line |
2297 | 5663 | # is EXPORTS), use it as is; otherwise, prepend... | 6195 | # is EXPORTS), use it as is; otherwise, prepend... |
2298 | 5664 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | 6196 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
2299 | 5665 | cp $export_symbols $output_objdir/$soname.def; | 6197 | cp $export_symbols $output_objdir/$soname.def; |
2300 | 5666 | else | 6198 | else |
2301 | 5667 | echo EXPORTS > $output_objdir/$soname.def; | 6199 | echo EXPORTS > $output_objdir/$soname.def; |
2302 | 5668 | cat $export_symbols >> $output_objdir/$soname.def; | 6200 | cat $export_symbols >> $output_objdir/$soname.def; |
2303 | 5669 | fi~ | 6201 | fi~ |
2304 | 5670 | $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' | 6202 | $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 | 5671 | else | 6203 | else |
2306 | 5672 | _LT_TAGVAR(ld_shlibs, $1)=no | 6204 | _LT_TAGVAR(ld_shlibs, $1)=no |
2307 | 5673 | fi | 6205 | fi |
2308 | 5674 | ;; | 6206 | ;; |
2309 | 6207 | esac | ||
2310 | 6208 | ;; | ||
2311 | 5675 | darwin* | rhapsody*) | 6209 | darwin* | rhapsody*) |
2312 | 5676 | _LT_DARWIN_LINKER_FEATURES($1) | 6210 | _LT_DARWIN_LINKER_FEATURES($1) |
2313 | 5677 | ;; | 6211 | ;; |
2314 | @@ -5694,7 +6228,7 @@ | |||
2315 | 5694 | esac | 6228 | esac |
2316 | 5695 | ;; | 6229 | ;; |
2317 | 5696 | 6230 | ||
2319 | 5697 | freebsd[[12]]*) | 6231 | freebsd2.*) |
2320 | 5698 | # C++ shared libraries reported to be fairly broken before | 6232 | # C++ shared libraries reported to be fairly broken before |
2321 | 5699 | # switch to ELF | 6233 | # switch to ELF |
2322 | 5700 | _LT_TAGVAR(ld_shlibs, $1)=no | 6234 | _LT_TAGVAR(ld_shlibs, $1)=no |
2323 | @@ -5713,6 +6247,11 @@ | |||
2324 | 5713 | gnu*) | 6247 | gnu*) |
2325 | 5714 | ;; | 6248 | ;; |
2326 | 5715 | 6249 | ||
2327 | 6250 | haiku*) | ||
2328 | 6251 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
2329 | 6252 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
2330 | 6253 | ;; | ||
2331 | 6254 | |||
2332 | 5716 | hpux9*) | 6255 | hpux9*) |
2333 | 5717 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 6256 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
2334 | 5718 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 6257 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
2335 | @@ -5741,7 +6280,7 @@ | |||
2336 | 5741 | ;; | 6280 | ;; |
2337 | 5742 | *) | 6281 | *) |
2338 | 5743 | if test "$GXX" = yes; then | 6282 | if test "$GXX" = yes; then |
2340 | 5744 | _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' | 6283 | _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 | 5745 | else | 6284 | else |
2342 | 5746 | # FIXME: insert proper C++ library support | 6285 | # FIXME: insert proper C++ library support |
2343 | 5747 | _LT_TAGVAR(ld_shlibs, $1)=no | 6286 | _LT_TAGVAR(ld_shlibs, $1)=no |
2344 | @@ -5812,10 +6351,10 @@ | |||
2345 | 5812 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 6351 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
2346 | 5813 | ;; | 6352 | ;; |
2347 | 5814 | ia64*) | 6353 | ia64*) |
2349 | 5815 | _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' | 6354 | _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 | 5816 | ;; | 6355 | ;; |
2351 | 5817 | *) | 6356 | *) |
2353 | 5818 | _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' | 6357 | _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 | 5819 | ;; | 6358 | ;; |
2355 | 5820 | esac | 6359 | esac |
2356 | 5821 | fi | 6360 | fi |
2357 | @@ -5856,9 +6395,9 @@ | |||
2358 | 5856 | *) | 6395 | *) |
2359 | 5857 | if test "$GXX" = yes; then | 6396 | if test "$GXX" = yes; then |
2360 | 5858 | if test "$with_gnu_ld" = no; then | 6397 | if test "$with_gnu_ld" = no; then |
2362 | 5859 | _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' | 6398 | _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 | 5860 | else | 6399 | else |
2365 | 5861 | _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' | 6400 | _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 | 5862 | fi | 6401 | fi |
2367 | 5863 | fi | 6402 | fi |
2368 | 5864 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 6403 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2369 | @@ -5924,26 +6463,26 @@ | |||
2370 | 5924 | pgCC* | pgcpp*) | 6463 | pgCC* | pgcpp*) |
2371 | 5925 | # Portland Group C++ compiler | 6464 | # Portland Group C++ compiler |
2372 | 5926 | case `$CC -V` in | 6465 | case `$CC -V` in |
2374 | 5927 | *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) | 6466 | *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
2375 | 5928 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ | 6467 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
2376 | 5929 | rm -rf $tpldir~ | 6468 | rm -rf $tpldir~ |
2377 | 5930 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 6469 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
2379 | 5931 | compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' | 6470 | compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
2380 | 5932 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ | 6471 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
2381 | 5933 | rm -rf $tpldir~ | 6472 | rm -rf $tpldir~ |
2382 | 5934 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ | 6473 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
2384 | 5935 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ | 6474 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
2385 | 5936 | $RANLIB $oldlib' | 6475 | $RANLIB $oldlib' |
2386 | 5937 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ | 6476 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
2387 | 5938 | rm -rf $tpldir~ | 6477 | rm -rf $tpldir~ |
2388 | 5939 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 6478 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
2390 | 5940 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 6479 | $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 | 5941 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ | 6480 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
2392 | 5942 | rm -rf $tpldir~ | 6481 | rm -rf $tpldir~ |
2393 | 5943 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 6482 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
2395 | 5944 | $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' | 6483 | $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 | 5945 | ;; | 6484 | ;; |
2398 | 5946 | *) # Version 6 will use weak symbols | 6485 | *) # Version 6 and above use weak symbols |
2399 | 5947 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 6486 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
2400 | 5948 | _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' | 6487 | _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 | 5949 | ;; | 6488 | ;; |
2402 | @@ -6136,7 +6675,7 @@ | |||
2403 | 6136 | _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' | 6675 | _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 | 6137 | ;; | 6676 | ;; |
2405 | 6138 | *) | 6677 | *) |
2407 | 6139 | _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' | 6678 | _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 | 6140 | ;; | 6679 | ;; |
2409 | 6141 | esac | 6680 | esac |
2410 | 6142 | 6681 | ||
2411 | @@ -6146,7 +6685,7 @@ | |||
2412 | 6146 | # Commands to make compiler produce verbose output that lists | 6685 | # Commands to make compiler produce verbose output that lists |
2413 | 6147 | # what "hidden" libraries, object files and flags are used when | 6686 | # what "hidden" libraries, object files and flags are used when |
2414 | 6148 | # linking a shared library. | 6687 | # linking a shared library. |
2416 | 6149 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6688 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2417 | 6150 | 6689 | ||
2418 | 6151 | else | 6690 | else |
2419 | 6152 | # FIXME: insert proper C++ library support | 6691 | # FIXME: insert proper C++ library support |
2420 | @@ -6182,7 +6721,7 @@ | |||
2421 | 6182 | 6721 | ||
2422 | 6183 | solaris*) | 6722 | solaris*) |
2423 | 6184 | case $cc_basename in | 6723 | case $cc_basename in |
2425 | 6185 | CC*) | 6724 | CC* | sunCC*) |
2426 | 6186 | # Sun C++ 4.2, 5.x and Centerline C++ | 6725 | # Sun C++ 4.2, 5.x and Centerline C++ |
2427 | 6187 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | 6726 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
2428 | 6188 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | 6727 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
2429 | @@ -6223,14 +6762,14 @@ | |||
2430 | 6223 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 6762 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
2431 | 6224 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' | 6763 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
2432 | 6225 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 6764 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
2434 | 6226 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | 6765 | _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 | 6227 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 6766 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
2437 | 6228 | $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | 6767 | $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
2438 | 6229 | 6768 | ||
2439 | 6230 | # Commands to make compiler produce verbose output that lists | 6769 | # Commands to make compiler produce verbose output that lists |
2440 | 6231 | # what "hidden" libraries, object files and flags are used when | 6770 | # what "hidden" libraries, object files and flags are used when |
2441 | 6232 | # linking a shared library. | 6771 | # linking a shared library. |
2443 | 6233 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6772 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2444 | 6234 | else | 6773 | else |
2445 | 6235 | # g++ 2.7 appears to require `-G' NOT `-shared' on this | 6774 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
2446 | 6236 | # platform. | 6775 | # platform. |
2447 | @@ -6241,7 +6780,7 @@ | |||
2448 | 6241 | # Commands to make compiler produce verbose output that lists | 6780 | # Commands to make compiler produce verbose output that lists |
2449 | 6242 | # what "hidden" libraries, object files and flags are used when | 6781 | # what "hidden" libraries, object files and flags are used when |
2450 | 6243 | # linking a shared library. | 6782 | # linking a shared library. |
2452 | 6244 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6783 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
2453 | 6245 | fi | 6784 | fi |
2454 | 6246 | 6785 | ||
2455 | 6247 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' | 6786 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
2456 | @@ -6354,6 +6893,7 @@ | |||
2457 | 6354 | fi # test -n "$compiler" | 6893 | fi # test -n "$compiler" |
2458 | 6355 | 6894 | ||
2459 | 6356 | CC=$lt_save_CC | 6895 | CC=$lt_save_CC |
2460 | 6896 | CFLAGS=$lt_save_CFLAGS | ||
2461 | 6357 | LDCXX=$LD | 6897 | LDCXX=$LD |
2462 | 6358 | LD=$lt_save_LD | 6898 | LD=$lt_save_LD |
2463 | 6359 | GCC=$lt_save_GCC | 6899 | GCC=$lt_save_GCC |
2464 | @@ -6368,6 +6908,29 @@ | |||
2465 | 6368 | ])# _LT_LANG_CXX_CONFIG | 6908 | ])# _LT_LANG_CXX_CONFIG |
2466 | 6369 | 6909 | ||
2467 | 6370 | 6910 | ||
2468 | 6911 | # _LT_FUNC_STRIPNAME_CNF | ||
2469 | 6912 | # ---------------------- | ||
2470 | 6913 | # func_stripname_cnf prefix suffix name | ||
2471 | 6914 | # strip PREFIX and SUFFIX off of NAME. | ||
2472 | 6915 | # PREFIX and SUFFIX must not contain globbing or regex special | ||
2473 | 6916 | # characters, hashes, percent signs, but SUFFIX may contain a leading | ||
2474 | 6917 | # dot (in which case that matches only a dot). | ||
2475 | 6918 | # | ||
2476 | 6919 | # This function is identical to the (non-XSI) version of func_stripname, | ||
2477 | 6920 | # except this one can be used by m4 code that may be executed by configure, | ||
2478 | 6921 | # rather than the libtool script. | ||
2479 | 6922 | m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl | ||
2480 | 6923 | AC_REQUIRE([_LT_DECL_SED]) | ||
2481 | 6924 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) | ||
2482 | 6925 | func_stripname_cnf () | ||
2483 | 6926 | { | ||
2484 | 6927 | case ${2} in | ||
2485 | 6928 | .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
2486 | 6929 | *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
2487 | 6930 | esac | ||
2488 | 6931 | } # func_stripname_cnf | ||
2489 | 6932 | ])# _LT_FUNC_STRIPNAME_CNF | ||
2490 | 6933 | |||
2491 | 6371 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) | 6934 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
2492 | 6372 | # --------------------------------- | 6935 | # --------------------------------- |
2493 | 6373 | # Figure out "hidden" library dependencies from verbose | 6936 | # Figure out "hidden" library dependencies from verbose |
2494 | @@ -6376,6 +6939,7 @@ | |||
2495 | 6376 | # objects, libraries and library flags. | 6939 | # objects, libraries and library flags. |
2496 | 6377 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], | 6940 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
2497 | 6378 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 6941 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2498 | 6942 | AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl | ||
2499 | 6379 | # Dependencies to place before and after the object being linked: | 6943 | # Dependencies to place before and after the object being linked: |
2500 | 6380 | _LT_TAGVAR(predep_objects, $1)= | 6944 | _LT_TAGVAR(predep_objects, $1)= |
2501 | 6381 | _LT_TAGVAR(postdep_objects, $1)= | 6945 | _LT_TAGVAR(postdep_objects, $1)= |
2502 | @@ -6425,7 +6989,20 @@ | |||
2503 | 6425 | } | 6989 | } |
2504 | 6426 | }; | 6990 | }; |
2505 | 6427 | _LT_EOF | 6991 | _LT_EOF |
2506 | 6992 | ], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF | ||
2507 | 6993 | package foo | ||
2508 | 6994 | func foo() { | ||
2509 | 6995 | } | ||
2510 | 6996 | _LT_EOF | ||
2511 | 6428 | ]) | 6997 | ]) |
2512 | 6998 | |||
2513 | 6999 | _lt_libdeps_save_CFLAGS=$CFLAGS | ||
2514 | 7000 | case "$CC $CFLAGS " in #( | ||
2515 | 7001 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
2516 | 7002 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
2517 | 7003 | *\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; | ||
2518 | 7004 | esac | ||
2519 | 7005 | |||
2520 | 6429 | dnl Parse the compiler output and extract the necessary | 7006 | dnl Parse the compiler output and extract the necessary |
2521 | 6430 | dnl objects, libraries and library flags. | 7007 | dnl objects, libraries and library flags. |
2522 | 6431 | if AC_TRY_EVAL(ac_compile); then | 7008 | if AC_TRY_EVAL(ac_compile); then |
2523 | @@ -6437,7 +7014,7 @@ | |||
2524 | 6437 | pre_test_object_deps_done=no | 7014 | pre_test_object_deps_done=no |
2525 | 6438 | 7015 | ||
2526 | 6439 | for p in `eval "$output_verbose_link_cmd"`; do | 7016 | for p in `eval "$output_verbose_link_cmd"`; do |
2528 | 6440 | case $p in | 7017 | case ${prev}${p} in |
2529 | 6441 | 7018 | ||
2530 | 6442 | -L* | -R* | -l*) | 7019 | -L* | -R* | -l*) |
2531 | 6443 | # Some compilers place space between "-{L,R}" and the path. | 7020 | # Some compilers place space between "-{L,R}" and the path. |
2532 | @@ -6446,13 +7023,22 @@ | |||
2533 | 6446 | test $p = "-R"; then | 7023 | test $p = "-R"; then |
2534 | 6447 | prev=$p | 7024 | prev=$p |
2535 | 6448 | continue | 7025 | continue |
2536 | 6449 | else | ||
2537 | 6450 | prev= | ||
2538 | 6451 | fi | 7026 | fi |
2539 | 6452 | 7027 | ||
2540 | 7028 | # Expand the sysroot to ease extracting the directories later. | ||
2541 | 7029 | if test -z "$prev"; then | ||
2542 | 7030 | case $p in | ||
2543 | 7031 | -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | ||
2544 | 7032 | -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | ||
2545 | 7033 | -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | ||
2546 | 7034 | esac | ||
2547 | 7035 | fi | ||
2548 | 7036 | case $p in | ||
2549 | 7037 | =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | ||
2550 | 7038 | esac | ||
2551 | 6453 | if test "$pre_test_object_deps_done" = no; then | 7039 | if test "$pre_test_object_deps_done" = no; then |
2554 | 6454 | case $p in | 7040 | case ${prev} in |
2555 | 6455 | -L* | -R*) | 7041 | -L | -R) |
2556 | 6456 | # Internal compiler library paths should come after those | 7042 | # Internal compiler library paths should come after those |
2557 | 6457 | # provided the user. The postdeps already come after the | 7043 | # provided the user. The postdeps already come after the |
2558 | 6458 | # user supplied libs so there is no need to process them. | 7044 | # user supplied libs so there is no need to process them. |
2559 | @@ -6472,8 +7058,10 @@ | |||
2560 | 6472 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" | 7058 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
2561 | 6473 | fi | 7059 | fi |
2562 | 6474 | fi | 7060 | fi |
2563 | 7061 | prev= | ||
2564 | 6475 | ;; | 7062 | ;; |
2565 | 6476 | 7063 | ||
2566 | 7064 | *.lto.$objext) ;; # Ignore GCC LTO objects | ||
2567 | 6477 | *.$objext) | 7065 | *.$objext) |
2568 | 6478 | # This assumes that the test object file only shows up | 7066 | # This assumes that the test object file only shows up |
2569 | 6479 | # once in the compiler output. | 7067 | # once in the compiler output. |
2570 | @@ -6509,6 +7097,7 @@ | |||
2571 | 6509 | fi | 7097 | fi |
2572 | 6510 | 7098 | ||
2573 | 6511 | $RM -f confest.$objext | 7099 | $RM -f confest.$objext |
2574 | 7100 | CFLAGS=$_lt_libdeps_save_CFLAGS | ||
2575 | 6512 | 7101 | ||
2576 | 6513 | # PORTME: override above test on systems where it is broken | 7102 | # PORTME: override above test on systems where it is broken |
2577 | 6514 | m4_if([$1], [CXX], | 7103 | m4_if([$1], [CXX], |
2578 | @@ -6545,7 +7134,7 @@ | |||
2579 | 6545 | 7134 | ||
2580 | 6546 | solaris*) | 7135 | solaris*) |
2581 | 6547 | case $cc_basename in | 7136 | case $cc_basename in |
2583 | 6548 | CC*) | 7137 | CC* | sunCC*) |
2584 | 6549 | # The more standards-conforming stlport4 library is | 7138 | # The more standards-conforming stlport4 library is |
2585 | 6550 | # incompatible with the Cstd library. Avoid specifying | 7139 | # incompatible with the Cstd library. Avoid specifying |
2586 | 6551 | # it if it's in CXXFLAGS. Ignore libCrun as | 7140 | # it if it's in CXXFLAGS. Ignore libCrun as |
2587 | @@ -6608,7 +7197,6 @@ | |||
2588 | 6608 | _LT_TAGVAR(hardcode_direct, $1)=no | 7197 | _LT_TAGVAR(hardcode_direct, $1)=no |
2589 | 6609 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 7198 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2590 | 6610 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 7199 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2591 | 6611 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
2592 | 6612 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 7200 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2593 | 6613 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 7201 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2594 | 6614 | _LT_TAGVAR(hardcode_automatic, $1)=no | 7202 | _LT_TAGVAR(hardcode_automatic, $1)=no |
2595 | @@ -6658,7 +7246,9 @@ | |||
2596 | 6658 | # Allow CC to be a program name with arguments. | 7246 | # Allow CC to be a program name with arguments. |
2597 | 6659 | lt_save_CC="$CC" | 7247 | lt_save_CC="$CC" |
2598 | 6660 | lt_save_GCC=$GCC | 7248 | lt_save_GCC=$GCC |
2599 | 7249 | lt_save_CFLAGS=$CFLAGS | ||
2600 | 6661 | CC=${F77-"f77"} | 7250 | CC=${F77-"f77"} |
2601 | 7251 | CFLAGS=$FFLAGS | ||
2602 | 6662 | compiler=$CC | 7252 | compiler=$CC |
2603 | 6663 | _LT_TAGVAR(compiler, $1)=$CC | 7253 | _LT_TAGVAR(compiler, $1)=$CC |
2604 | 6664 | _LT_CC_BASENAME([$compiler]) | 7254 | _LT_CC_BASENAME([$compiler]) |
2605 | @@ -6712,6 +7302,7 @@ | |||
2606 | 6712 | 7302 | ||
2607 | 6713 | GCC=$lt_save_GCC | 7303 | GCC=$lt_save_GCC |
2608 | 6714 | CC="$lt_save_CC" | 7304 | CC="$lt_save_CC" |
2609 | 7305 | CFLAGS="$lt_save_CFLAGS" | ||
2610 | 6715 | fi # test "$_lt_disable_F77" != yes | 7306 | fi # test "$_lt_disable_F77" != yes |
2611 | 6716 | 7307 | ||
2612 | 6717 | AC_LANG_POP | 7308 | AC_LANG_POP |
2613 | @@ -6738,7 +7329,6 @@ | |||
2614 | 6738 | _LT_TAGVAR(hardcode_direct, $1)=no | 7329 | _LT_TAGVAR(hardcode_direct, $1)=no |
2615 | 6739 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 7330 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
2616 | 6740 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 7331 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
2617 | 6741 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
2618 | 6742 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 7332 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
2619 | 6743 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 7333 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
2620 | 6744 | _LT_TAGVAR(hardcode_automatic, $1)=no | 7334 | _LT_TAGVAR(hardcode_automatic, $1)=no |
2621 | @@ -6788,7 +7378,9 @@ | |||
2622 | 6788 | # Allow CC to be a program name with arguments. | 7378 | # Allow CC to be a program name with arguments. |
2623 | 6789 | lt_save_CC="$CC" | 7379 | lt_save_CC="$CC" |
2624 | 6790 | lt_save_GCC=$GCC | 7380 | lt_save_GCC=$GCC |
2625 | 7381 | lt_save_CFLAGS=$CFLAGS | ||
2626 | 6791 | CC=${FC-"f95"} | 7382 | CC=${FC-"f95"} |
2627 | 7383 | CFLAGS=$FCFLAGS | ||
2628 | 6792 | compiler=$CC | 7384 | compiler=$CC |
2629 | 6793 | GCC=$ac_cv_fc_compiler_gnu | 7385 | GCC=$ac_cv_fc_compiler_gnu |
2630 | 6794 | 7386 | ||
2631 | @@ -6844,7 +7436,8 @@ | |||
2632 | 6844 | fi # test -n "$compiler" | 7436 | fi # test -n "$compiler" |
2633 | 6845 | 7437 | ||
2634 | 6846 | GCC=$lt_save_GCC | 7438 | GCC=$lt_save_GCC |
2636 | 6847 | CC="$lt_save_CC" | 7439 | CC=$lt_save_CC |
2637 | 7440 | CFLAGS=$lt_save_CFLAGS | ||
2638 | 6848 | fi # test "$_lt_disable_FC" != yes | 7441 | fi # test "$_lt_disable_FC" != yes |
2639 | 6849 | 7442 | ||
2640 | 6850 | AC_LANG_POP | 7443 | AC_LANG_POP |
2641 | @@ -6881,10 +7474,12 @@ | |||
2642 | 6881 | _LT_LINKER_BOILERPLATE | 7474 | _LT_LINKER_BOILERPLATE |
2643 | 6882 | 7475 | ||
2644 | 6883 | # Allow CC to be a program name with arguments. | 7476 | # Allow CC to be a program name with arguments. |
2646 | 6884 | lt_save_CC="$CC" | 7477 | lt_save_CC=$CC |
2647 | 7478 | lt_save_CFLAGS=$CFLAGS | ||
2648 | 6885 | lt_save_GCC=$GCC | 7479 | lt_save_GCC=$GCC |
2649 | 6886 | GCC=yes | 7480 | GCC=yes |
2650 | 6887 | CC=${GCJ-"gcj"} | 7481 | CC=${GCJ-"gcj"} |
2651 | 7482 | CFLAGS=$GCJFLAGS | ||
2652 | 6888 | compiler=$CC | 7483 | compiler=$CC |
2653 | 6889 | _LT_TAGVAR(compiler, $1)=$CC | 7484 | _LT_TAGVAR(compiler, $1)=$CC |
2654 | 6890 | _LT_TAGVAR(LD, $1)="$LD" | 7485 | _LT_TAGVAR(LD, $1)="$LD" |
2655 | @@ -6911,10 +7506,78 @@ | |||
2656 | 6911 | AC_LANG_RESTORE | 7506 | AC_LANG_RESTORE |
2657 | 6912 | 7507 | ||
2658 | 6913 | GCC=$lt_save_GCC | 7508 | GCC=$lt_save_GCC |
2660 | 6914 | CC="$lt_save_CC" | 7509 | CC=$lt_save_CC |
2661 | 7510 | CFLAGS=$lt_save_CFLAGS | ||
2662 | 6915 | ])# _LT_LANG_GCJ_CONFIG | 7511 | ])# _LT_LANG_GCJ_CONFIG |
2663 | 6916 | 7512 | ||
2664 | 6917 | 7513 | ||
2665 | 7514 | # _LT_LANG_GO_CONFIG([TAG]) | ||
2666 | 7515 | # -------------------------- | ||
2667 | 7516 | # Ensure that the configuration variables for the GNU Go compiler | ||
2668 | 7517 | # are suitably defined. These variables are subsequently used by _LT_CONFIG | ||
2669 | 7518 | # to write the compiler configuration to `libtool'. | ||
2670 | 7519 | m4_defun([_LT_LANG_GO_CONFIG], | ||
2671 | 7520 | [AC_REQUIRE([LT_PROG_GO])dnl | ||
2672 | 7521 | AC_LANG_SAVE | ||
2673 | 7522 | |||
2674 | 7523 | # Source file extension for Go test sources. | ||
2675 | 7524 | ac_ext=go | ||
2676 | 7525 | |||
2677 | 7526 | # Object file extension for compiled Go test sources. | ||
2678 | 7527 | objext=o | ||
2679 | 7528 | _LT_TAGVAR(objext, $1)=$objext | ||
2680 | 7529 | |||
2681 | 7530 | # Code to be used in simple compile tests | ||
2682 | 7531 | lt_simple_compile_test_code="package main; func main() { }" | ||
2683 | 7532 | |||
2684 | 7533 | # Code to be used in simple link tests | ||
2685 | 7534 | lt_simple_link_test_code='package main; func main() { }' | ||
2686 | 7535 | |||
2687 | 7536 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. | ||
2688 | 7537 | _LT_TAG_COMPILER | ||
2689 | 7538 | |||
2690 | 7539 | # save warnings/boilerplate of simple test code | ||
2691 | 7540 | _LT_COMPILER_BOILERPLATE | ||
2692 | 7541 | _LT_LINKER_BOILERPLATE | ||
2693 | 7542 | |||
2694 | 7543 | # Allow CC to be a program name with arguments. | ||
2695 | 7544 | lt_save_CC=$CC | ||
2696 | 7545 | lt_save_CFLAGS=$CFLAGS | ||
2697 | 7546 | lt_save_GCC=$GCC | ||
2698 | 7547 | GCC=yes | ||
2699 | 7548 | CC=${GOC-"gccgo"} | ||
2700 | 7549 | CFLAGS=$GOFLAGS | ||
2701 | 7550 | compiler=$CC | ||
2702 | 7551 | _LT_TAGVAR(compiler, $1)=$CC | ||
2703 | 7552 | _LT_TAGVAR(LD, $1)="$LD" | ||
2704 | 7553 | _LT_CC_BASENAME([$compiler]) | ||
2705 | 7554 | |||
2706 | 7555 | # Go did not exist at the time GCC didn't implicitly link libc in. | ||
2707 | 7556 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | ||
2708 | 7557 | |||
2709 | 7558 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | ||
2710 | 7559 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
2711 | 7560 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
2712 | 7561 | |||
2713 | 7562 | if test -n "$compiler"; then | ||
2714 | 7563 | _LT_COMPILER_NO_RTTI($1) | ||
2715 | 7564 | _LT_COMPILER_PIC($1) | ||
2716 | 7565 | _LT_COMPILER_C_O($1) | ||
2717 | 7566 | _LT_COMPILER_FILE_LOCKS($1) | ||
2718 | 7567 | _LT_LINKER_SHLIBS($1) | ||
2719 | 7568 | _LT_LINKER_HARDCODE_LIBPATH($1) | ||
2720 | 7569 | |||
2721 | 7570 | _LT_CONFIG($1) | ||
2722 | 7571 | fi | ||
2723 | 7572 | |||
2724 | 7573 | AC_LANG_RESTORE | ||
2725 | 7574 | |||
2726 | 7575 | GCC=$lt_save_GCC | ||
2727 | 7576 | CC=$lt_save_CC | ||
2728 | 7577 | CFLAGS=$lt_save_CFLAGS | ||
2729 | 7578 | ])# _LT_LANG_GO_CONFIG | ||
2730 | 7579 | |||
2731 | 7580 | |||
2732 | 6918 | # _LT_LANG_RC_CONFIG([TAG]) | 7581 | # _LT_LANG_RC_CONFIG([TAG]) |
2733 | 6919 | # ------------------------- | 7582 | # ------------------------- |
2734 | 6920 | # Ensure that the configuration variables for the Windows resource compiler | 7583 | # Ensure that the configuration variables for the Windows resource compiler |
2735 | @@ -6946,9 +7609,11 @@ | |||
2736 | 6946 | 7609 | ||
2737 | 6947 | # Allow CC to be a program name with arguments. | 7610 | # Allow CC to be a program name with arguments. |
2738 | 6948 | lt_save_CC="$CC" | 7611 | lt_save_CC="$CC" |
2739 | 7612 | lt_save_CFLAGS=$CFLAGS | ||
2740 | 6949 | lt_save_GCC=$GCC | 7613 | lt_save_GCC=$GCC |
2741 | 6950 | GCC= | 7614 | GCC= |
2742 | 6951 | CC=${RC-"windres"} | 7615 | CC=${RC-"windres"} |
2743 | 7616 | CFLAGS= | ||
2744 | 6952 | compiler=$CC | 7617 | compiler=$CC |
2745 | 6953 | _LT_TAGVAR(compiler, $1)=$CC | 7618 | _LT_TAGVAR(compiler, $1)=$CC |
2746 | 6954 | _LT_CC_BASENAME([$compiler]) | 7619 | _LT_CC_BASENAME([$compiler]) |
2747 | @@ -6961,7 +7626,8 @@ | |||
2748 | 6961 | 7626 | ||
2749 | 6962 | GCC=$lt_save_GCC | 7627 | GCC=$lt_save_GCC |
2750 | 6963 | AC_LANG_RESTORE | 7628 | AC_LANG_RESTORE |
2752 | 6964 | CC="$lt_save_CC" | 7629 | CC=$lt_save_CC |
2753 | 7630 | CFLAGS=$lt_save_CFLAGS | ||
2754 | 6965 | ])# _LT_LANG_RC_CONFIG | 7631 | ])# _LT_LANG_RC_CONFIG |
2755 | 6966 | 7632 | ||
2756 | 6967 | 7633 | ||
2757 | @@ -6981,6 +7647,13 @@ | |||
2758 | 6981 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) | 7647 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
2759 | 6982 | 7648 | ||
2760 | 6983 | 7649 | ||
2761 | 7650 | # LT_PROG_GO | ||
2762 | 7651 | # ---------- | ||
2763 | 7652 | AC_DEFUN([LT_PROG_GO], | ||
2764 | 7653 | [AC_CHECK_TOOL(GOC, gccgo,) | ||
2765 | 7654 | ]) | ||
2766 | 7655 | |||
2767 | 7656 | |||
2768 | 6984 | # LT_PROG_RC | 7657 | # LT_PROG_RC |
2769 | 6985 | # ---------- | 7658 | # ---------- |
2770 | 6986 | AC_DEFUN([LT_PROG_RC], | 7659 | AC_DEFUN([LT_PROG_RC], |
2771 | @@ -7020,6 +7693,15 @@ | |||
2772 | 7020 | AC_SUBST([OBJDUMP]) | 7693 | AC_SUBST([OBJDUMP]) |
2773 | 7021 | ]) | 7694 | ]) |
2774 | 7022 | 7695 | ||
2775 | 7696 | # _LT_DECL_DLLTOOL | ||
2776 | 7697 | # ---------------- | ||
2777 | 7698 | # Ensure DLLTOOL variable is set. | ||
2778 | 7699 | m4_defun([_LT_DECL_DLLTOOL], | ||
2779 | 7700 | [AC_CHECK_TOOL(DLLTOOL, dlltool, false) | ||
2780 | 7701 | test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
2781 | 7702 | _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) | ||
2782 | 7703 | AC_SUBST([DLLTOOL]) | ||
2783 | 7704 | ]) | ||
2784 | 7023 | 7705 | ||
2785 | 7024 | # _LT_DECL_SED | 7706 | # _LT_DECL_SED |
2786 | 7025 | # ------------ | 7707 | # ------------ |
2787 | @@ -7111,8 +7793,8 @@ | |||
2788 | 7111 | # Try some XSI features | 7793 | # Try some XSI features |
2789 | 7112 | xsi_shell=no | 7794 | xsi_shell=no |
2790 | 7113 | ( _lt_dummy="a/b/c" | 7795 | ( _lt_dummy="a/b/c" |
2793 | 7114 | test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | 7796 | test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
2794 | 7115 | = c,a/b,, \ | 7797 | = c,a/b,b/c, \ |
2795 | 7116 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 7798 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2796 | 7117 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 7799 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2797 | 7118 | && xsi_shell=yes | 7800 | && xsi_shell=yes |
2798 | @@ -7151,220 +7833,177 @@ | |||
2799 | 7151 | ])# _LT_CHECK_SHELL_FEATURES | 7833 | ])# _LT_CHECK_SHELL_FEATURES |
2800 | 7152 | 7834 | ||
2801 | 7153 | 7835 | ||
3005 | 7154 | # _LT_PROG_XSI_SHELLFNS | 7836 | # _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
3006 | 7155 | # --------------------- | 7837 | # ------------------------------------------------------ |
3007 | 7156 | # Bourne and XSI compatible variants of some useful shell functions. | 7838 | # In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
3008 | 7157 | m4_defun([_LT_PROG_XSI_SHELLFNS], | 7839 | # '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
3009 | 7158 | [case $xsi_shell in | 7840 | m4_defun([_LT_PROG_FUNCTION_REPLACE], |
3010 | 7159 | yes) | 7841 | [dnl { |
3011 | 7160 | cat << \_LT_EOF >> "$cfgfile" | 7842 | sed -e '/^$1 ()$/,/^} # $1 /c\ |
3012 | 7161 | 7843 | $1 ()\ | |
3013 | 7162 | # func_dirname file append nondir_replacement | 7844 | {\ |
3014 | 7163 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | 7845 | m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
3015 | 7164 | # otherwise set result to NONDIR_REPLACEMENT. | 7846 | } # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
3016 | 7165 | func_dirname () | 7847 | && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3017 | 7166 | { | 7848 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3018 | 7167 | case ${1} in | 7849 | test 0 -eq $? || _lt_function_replace_fail=: |
3019 | 7168 | */*) func_dirname_result="${1%/*}${2}" ;; | 7850 | ]) |
3020 | 7169 | * ) func_dirname_result="${3}" ;; | 7851 | |
3021 | 7170 | esac | 7852 | |
3022 | 7171 | } | 7853 | # _LT_PROG_REPLACE_SHELLFNS |
3023 | 7172 | 7854 | # ------------------------- | |
3024 | 7173 | # func_basename file | 7855 | # Replace existing portable implementations of several shell functions with |
3025 | 7174 | func_basename () | 7856 | # equivalent extended shell implementations where those features are available.. |
3026 | 7175 | { | 7857 | m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
3027 | 7176 | func_basename_result="${1##*/}" | 7858 | [if test x"$xsi_shell" = xyes; then |
3028 | 7177 | } | 7859 | _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
3029 | 7178 | 7860 | case ${1} in | |
3030 | 7179 | # func_dirname_and_basename file append nondir_replacement | 7861 | */*) func_dirname_result="${1%/*}${2}" ;; |
3031 | 7180 | # perform func_basename and func_dirname in a single function | 7862 | * ) func_dirname_result="${3}" ;; |
3032 | 7181 | # call: | 7863 | esac]) |
3033 | 7182 | # dirname: Compute the dirname of FILE. If nonempty, | 7864 | |
3034 | 7183 | # add APPEND to the result, otherwise set result | 7865 | _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
3035 | 7184 | # to NONDIR_REPLACEMENT. | 7866 | func_basename_result="${1##*/}"]) |
3036 | 7185 | # value returned in "$func_dirname_result" | 7867 | |
3037 | 7186 | # basename: Compute filename of FILE. | 7868 | _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
3038 | 7187 | # value retuned in "$func_basename_result" | 7869 | case ${1} in |
3039 | 7188 | # Implementation must be kept synchronized with func_dirname | 7870 | */*) func_dirname_result="${1%/*}${2}" ;; |
3040 | 7189 | # and func_basename. For efficiency, we do not delegate to | 7871 | * ) func_dirname_result="${3}" ;; |
3041 | 7190 | # those functions but instead duplicate the functionality here. | 7872 | esac |
3042 | 7191 | func_dirname_and_basename () | 7873 | func_basename_result="${1##*/}"]) |
3043 | 7192 | { | 7874 | |
3044 | 7193 | case ${1} in | 7875 | _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
3045 | 7194 | */*) func_dirname_result="${1%/*}${2}" ;; | 7876 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
3046 | 7195 | * ) func_dirname_result="${3}" ;; | 7877 | # positional parameters, so assign one to ordinary parameter first. |
3047 | 7196 | esac | 7878 | func_stripname_result=${3} |
3048 | 7197 | func_basename_result="${1##*/}" | 7879 | func_stripname_result=${func_stripname_result#"${1}"} |
3049 | 7198 | } | 7880 | func_stripname_result=${func_stripname_result%"${2}"}]) |
3050 | 7199 | 7881 | ||
3051 | 7200 | # func_stripname prefix suffix name | 7882 | _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
3052 | 7201 | # strip PREFIX and SUFFIX off of NAME. | 7883 | func_split_long_opt_name=${1%%=*} |
3053 | 7202 | # PREFIX and SUFFIX must not contain globbing or regex special | 7884 | func_split_long_opt_arg=${1#*=}]) |
3054 | 7203 | # characters, hashes, percent signs, but SUFFIX may contain a leading | 7885 | |
3055 | 7204 | # dot (in which case that matches only a dot). | 7886 | _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
3056 | 7205 | func_stripname () | 7887 | func_split_short_opt_arg=${1#??} |
3057 | 7206 | { | 7888 | func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
3058 | 7207 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | 7889 | |
3059 | 7208 | # positional parameters, so assign one to ordinary parameter first. | 7890 | _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
3060 | 7209 | func_stripname_result=${3} | 7891 | case ${1} in |
3061 | 7210 | func_stripname_result=${func_stripname_result#"${1}"} | 7892 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
3062 | 7211 | func_stripname_result=${func_stripname_result%"${2}"} | 7893 | *) func_lo2o_result=${1} ;; |
3063 | 7212 | } | 7894 | esac]) |
3064 | 7213 | 7895 | ||
3065 | 7214 | # func_opt_split | 7896 | _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
3066 | 7215 | func_opt_split () | 7897 | |
3067 | 7216 | { | 7898 | _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) |
3068 | 7217 | func_opt_split_opt=${1%%=*} | 7899 | |
3069 | 7218 | func_opt_split_arg=${1#*=} | 7900 | _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) |
3070 | 7219 | } | 7901 | fi |
3071 | 7220 | 7902 | ||
3072 | 7221 | # func_lo2o object | 7903 | if test x"$lt_shell_append" = xyes; then |
3073 | 7222 | func_lo2o () | 7904 | _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) |
3074 | 7223 | { | 7905 | |
3075 | 7224 | case ${1} in | 7906 | _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl |
3076 | 7225 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | 7907 | func_quote_for_eval "${2}" |
3077 | 7226 | *) func_lo2o_result=${1} ;; | 7908 | dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ |
3078 | 7227 | esac | 7909 | eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) |
3079 | 7228 | } | 7910 | |
3080 | 7229 | 7911 | # Save a `func_append' function call where possible by direct use of '+=' | |
3081 | 7230 | # func_xform libobj-or-source | 7912 | sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
3082 | 7231 | func_xform () | 7913 | && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3083 | 7232 | { | 7914 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3084 | 7233 | func_xform_result=${1%.*}.lo | 7915 | test 0 -eq $? || _lt_function_replace_fail=: |
3085 | 7234 | } | 7916 | else |
3086 | 7235 | 7917 | # Save a `func_append' function call even when '+=' is not available | |
3087 | 7236 | # func_arith arithmetic-term... | 7918 | sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
3088 | 7237 | func_arith () | 7919 | && mv -f "$cfgfile.tmp" "$cfgfile" \ |
3089 | 7238 | { | 7920 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
3090 | 7239 | func_arith_result=$(( $[*] )) | 7921 | test 0 -eq $? || _lt_function_replace_fail=: |
3091 | 7240 | } | 7922 | fi |
3092 | 7241 | 7923 | ||
3093 | 7242 | # func_len string | 7924 | if test x"$_lt_function_replace_fail" = x":"; then |
3094 | 7243 | # STRING may not start with a hyphen. | 7925 | AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) |
3095 | 7244 | func_len () | 7926 | fi |
3096 | 7245 | { | 7927 | ]) |
3097 | 7246 | func_len_result=${#1} | 7928 | |
3098 | 7247 | } | 7929 | # _LT_PATH_CONVERSION_FUNCTIONS |
3099 | 7248 | 7930 | # ----------------------------- | |
3100 | 7249 | _LT_EOF | 7931 | # Determine which file name conversion functions should be used by |
3101 | 7250 | ;; | 7932 | # func_to_host_file (and, implicitly, by func_to_host_path). These are needed |
3102 | 7251 | *) # Bourne compatible functions. | 7933 | # for certain cross-compile configurations and native mingw. |
3103 | 7252 | cat << \_LT_EOF >> "$cfgfile" | 7934 | m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], |
3104 | 7253 | 7935 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | |
3105 | 7254 | # func_dirname file append nondir_replacement | 7936 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
3106 | 7255 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | 7937 | AC_MSG_CHECKING([how to convert $build file names to $host format]) |
3107 | 7256 | # otherwise set result to NONDIR_REPLACEMENT. | 7938 | AC_CACHE_VAL(lt_cv_to_host_file_cmd, |
3108 | 7257 | func_dirname () | 7939 | [case $host in |
3109 | 7258 | { | 7940 | *-*-mingw* ) |
3110 | 7259 | # Extract subdirectory from the argument. | 7941 | case $build in |
3111 | 7260 | func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | 7942 | *-*-mingw* ) # actually msys |
3112 | 7261 | if test "X$func_dirname_result" = "X${1}"; then | 7943 | lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
3113 | 7262 | func_dirname_result="${3}" | 7944 | ;; |
3114 | 7263 | else | 7945 | *-*-cygwin* ) |
3115 | 7264 | func_dirname_result="$func_dirname_result${2}" | 7946 | lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
3116 | 7265 | fi | 7947 | ;; |
3117 | 7266 | } | 7948 | * ) # otherwise, assume *nix |
3118 | 7267 | 7949 | lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | |
3119 | 7268 | # func_basename file | 7950 | ;; |
3120 | 7269 | func_basename () | 7951 | esac |
3121 | 7270 | { | 7952 | ;; |
3122 | 7271 | func_basename_result=`$ECHO "${1}" | $SED "$basename"` | 7953 | *-*-cygwin* ) |
3123 | 7272 | } | 7954 | case $build in |
3124 | 7273 | 7955 | *-*-mingw* ) # actually msys | |
3125 | 7274 | dnl func_dirname_and_basename | 7956 | lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
3126 | 7275 | dnl A portable version of this function is already defined in general.m4sh | 7957 | ;; |
3127 | 7276 | dnl so there is no need for it here. | 7958 | *-*-cygwin* ) |
3128 | 7277 | 7959 | lt_cv_to_host_file_cmd=func_convert_file_noop | |
3129 | 7278 | # func_stripname prefix suffix name | 7960 | ;; |
3130 | 7279 | # strip PREFIX and SUFFIX off of NAME. | 7961 | * ) # otherwise, assume *nix |
3131 | 7280 | # PREFIX and SUFFIX must not contain globbing or regex special | 7962 | lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
3132 | 7281 | # characters, hashes, percent signs, but SUFFIX may contain a leading | 7963 | ;; |
3133 | 7282 | # dot (in which case that matches only a dot). | 7964 | esac |
3134 | 7283 | # func_strip_suffix prefix name | 7965 | ;; |
3135 | 7284 | func_stripname () | 7966 | * ) # unhandled hosts (and "normal" native builds) |
3136 | 7285 | { | 7967 | lt_cv_to_host_file_cmd=func_convert_file_noop |
3137 | 7286 | case ${2} in | 7968 | ;; |
3138 | 7287 | .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | 7969 | esac |
3139 | 7288 | *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | 7970 | ]) |
3140 | 7289 | esac | 7971 | to_host_file_cmd=$lt_cv_to_host_file_cmd |
3141 | 7290 | } | 7972 | AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) |
3142 | 7291 | 7973 | _LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], | |
3143 | 7292 | # sed scripts: | 7974 | [0], [convert $build file names to $host format])dnl |
3144 | 7293 | my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' | 7975 | |
3145 | 7294 | my_sed_long_arg='1s/^-[[^=]]*=//' | 7976 | AC_MSG_CHECKING([how to convert $build file names to toolchain format]) |
3146 | 7295 | 7977 | AC_CACHE_VAL(lt_cv_to_tool_file_cmd, | |
3147 | 7296 | # func_opt_split | 7978 | [#assume ordinary cross tools, or native build. |
3148 | 7297 | func_opt_split () | 7979 | lt_cv_to_tool_file_cmd=func_convert_file_noop |
3149 | 7298 | { | 7980 | case $host in |
3150 | 7299 | func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | 7981 | *-*-mingw* ) |
3151 | 7300 | func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | 7982 | case $build in |
3152 | 7301 | } | 7983 | *-*-mingw* ) # actually msys |
3153 | 7302 | 7984 | lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | |
3154 | 7303 | # func_lo2o object | 7985 | ;; |
3155 | 7304 | func_lo2o () | 7986 | esac |
3156 | 7305 | { | 7987 | ;; |
3157 | 7306 | func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | 7988 | esac |
3158 | 7307 | } | 7989 | ]) |
3159 | 7308 | 7990 | to_tool_file_cmd=$lt_cv_to_tool_file_cmd | |
3160 | 7309 | # func_xform libobj-or-source | 7991 | AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) |
3161 | 7310 | func_xform () | 7992 | _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], |
3162 | 7311 | { | 7993 | [0], [convert $build files to toolchain format])dnl |
3163 | 7312 | func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` | 7994 | ])# _LT_PATH_CONVERSION_FUNCTIONS |
2961 | 7313 | } | ||
2962 | 7314 | |||
2963 | 7315 | # func_arith arithmetic-term... | ||
2964 | 7316 | func_arith () | ||
2965 | 7317 | { | ||
2966 | 7318 | func_arith_result=`expr "$[@]"` | ||
2967 | 7319 | } | ||
2968 | 7320 | |||
2969 | 7321 | # func_len string | ||
2970 | 7322 | # STRING may not start with a hyphen. | ||
2971 | 7323 | func_len () | ||
2972 | 7324 | { | ||
2973 | 7325 | func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
2974 | 7326 | } | ||
2975 | 7327 | |||
2976 | 7328 | _LT_EOF | ||
2977 | 7329 | esac | ||
2978 | 7330 | |||
2979 | 7331 | case $lt_shell_append in | ||
2980 | 7332 | yes) | ||
2981 | 7333 | cat << \_LT_EOF >> "$cfgfile" | ||
2982 | 7334 | |||
2983 | 7335 | # func_append var value | ||
2984 | 7336 | # Append VALUE to the end of shell variable VAR. | ||
2985 | 7337 | func_append () | ||
2986 | 7338 | { | ||
2987 | 7339 | eval "$[1]+=\$[2]" | ||
2988 | 7340 | } | ||
2989 | 7341 | _LT_EOF | ||
2990 | 7342 | ;; | ||
2991 | 7343 | *) | ||
2992 | 7344 | cat << \_LT_EOF >> "$cfgfile" | ||
2993 | 7345 | |||
2994 | 7346 | # func_append var value | ||
2995 | 7347 | # Append VALUE to the end of shell variable VAR. | ||
2996 | 7348 | func_append () | ||
2997 | 7349 | { | ||
2998 | 7350 | eval "$[1]=\$$[1]\$[2]" | ||
2999 | 7351 | } | ||
3000 | 7352 | |||
3001 | 7353 | _LT_EOF | ||
3002 | 7354 | ;; | ||
3003 | 7355 | esac | ||
3004 | 7356 | ]) | ||
3164 | 7357 | 7995 | ||
3165 | 7358 | # Helper functions for option handling. -*- Autoconf -*- | 7996 | # Helper functions for option handling. -*- Autoconf -*- |
3166 | 7359 | # | 7997 | # |
3168 | 7360 | # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. | 7998 | # Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, |
3169 | 7999 | # Inc. | ||
3170 | 7361 | # Written by Gary V. Vaughan, 2004 | 8000 | # Written by Gary V. Vaughan, 2004 |
3171 | 7362 | # | 8001 | # |
3172 | 7363 | # This file is free software; the Free Software Foundation gives | 8002 | # This file is free software; the Free Software Foundation gives |
3173 | 7364 | # unlimited permission to copy and/or distribute it, with or without | 8003 | # unlimited permission to copy and/or distribute it, with or without |
3174 | 7365 | # modifications, as long as this notice is preserved. | 8004 | # modifications, as long as this notice is preserved. |
3175 | 7366 | 8005 | ||
3177 | 7367 | # serial 6 ltoptions.m4 | 8006 | # serial 7 ltoptions.m4 |
3178 | 7368 | 8007 | ||
3179 | 7369 | # This is to help aclocal find these macros, as it can't see m4_define. | 8008 | # This is to help aclocal find these macros, as it can't see m4_define. |
3180 | 7370 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) | 8009 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
3181 | @@ -7487,13 +8126,13 @@ | |||
3182 | 7487 | esac | 8126 | esac |
3183 | 7488 | 8127 | ||
3184 | 7489 | test -z "$AS" && AS=as | 8128 | test -z "$AS" && AS=as |
3186 | 7490 | _LT_DECL([], [AS], [0], [Assembler program])dnl | 8129 | _LT_DECL([], [AS], [1], [Assembler program])dnl |
3187 | 7491 | 8130 | ||
3188 | 7492 | test -z "$DLLTOOL" && DLLTOOL=dlltool | 8131 | test -z "$DLLTOOL" && DLLTOOL=dlltool |
3190 | 7493 | _LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl | 8132 | _LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl |
3191 | 7494 | 8133 | ||
3192 | 7495 | test -z "$OBJDUMP" && OBJDUMP=objdump | 8134 | test -z "$OBJDUMP" && OBJDUMP=objdump |
3194 | 7496 | _LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl | 8135 | _LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl |
3195 | 7497 | ])# win32-dll | 8136 | ])# win32-dll |
3196 | 7498 | 8137 | ||
3197 | 7499 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], | 8138 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], |
3198 | @@ -7679,9 +8318,24 @@ | |||
3199 | 7679 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. | 8318 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
3200 | 7680 | m4_define([_LT_WITH_PIC], | 8319 | m4_define([_LT_WITH_PIC], |
3201 | 7681 | [AC_ARG_WITH([pic], | 8320 | [AC_ARG_WITH([pic], |
3203 | 7682 | [AS_HELP_STRING([--with-pic], | 8321 | [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], |
3204 | 7683 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], | 8322 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
3206 | 7684 | [pic_mode="$withval"], | 8323 | [lt_p=${PACKAGE-default} |
3207 | 8324 | case $withval in | ||
3208 | 8325 | yes|no) pic_mode=$withval ;; | ||
3209 | 8326 | *) | ||
3210 | 8327 | pic_mode=default | ||
3211 | 8328 | # Look at the argument we got. We use all the common list separators. | ||
3212 | 8329 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | ||
3213 | 8330 | for lt_pkg in $withval; do | ||
3214 | 8331 | IFS="$lt_save_ifs" | ||
3215 | 8332 | if test "X$lt_pkg" = "X$lt_p"; then | ||
3216 | 8333 | pic_mode=yes | ||
3217 | 8334 | fi | ||
3218 | 8335 | done | ||
3219 | 8336 | IFS="$lt_save_ifs" | ||
3220 | 8337 | ;; | ||
3221 | 8338 | esac], | ||
3222 | 7685 | [pic_mode=default]) | 8339 | [pic_mode=default]) |
3223 | 7686 | 8340 | ||
3224 | 7687 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) | 8341 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) |
3225 | @@ -7851,17 +8505,17 @@ | |||
3226 | 7851 | # unlimited permission to copy and/or distribute it, with or without | 8505 | # unlimited permission to copy and/or distribute it, with or without |
3227 | 7852 | # modifications, as long as this notice is preserved. | 8506 | # modifications, as long as this notice is preserved. |
3228 | 7853 | 8507 | ||
3230 | 7854 | # Generated from ltversion.in. | 8508 | # @configure_input@ |
3231 | 7855 | 8509 | ||
3233 | 7856 | # serial 3111 ltversion.m4 | 8510 | # serial 3337 ltversion.m4 |
3234 | 7857 | # This file is part of GNU Libtool | 8511 | # This file is part of GNU Libtool |
3235 | 7858 | 8512 | ||
3238 | 7859 | m4_define([LT_PACKAGE_VERSION], [2.2.7a]) | 8513 | m4_define([LT_PACKAGE_VERSION], [2.4.2]) |
3239 | 7860 | m4_define([LT_PACKAGE_REVISION], [1.3111]) | 8514 | m4_define([LT_PACKAGE_REVISION], [1.3337]) |
3240 | 7861 | 8515 | ||
3241 | 7862 | AC_DEFUN([LTVERSION_VERSION], | 8516 | AC_DEFUN([LTVERSION_VERSION], |
3244 | 7863 | [macro_version='2.2.7a' | 8517 | [macro_version='2.4.2' |
3245 | 7864 | macro_revision='1.3111' | 8518 | macro_revision='1.3337' |
3246 | 7865 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | 8519 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
3247 | 7866 | _LT_DECL(, macro_revision, 0) | 8520 | _LT_DECL(, macro_revision, 0) |
3248 | 7867 | ]) | 8521 | ]) |
3249 | @@ -7875,7 +8529,7 @@ | |||
3250 | 7875 | # unlimited permission to copy and/or distribute it, with or without | 8529 | # unlimited permission to copy and/or distribute it, with or without |
3251 | 7876 | # modifications, as long as this notice is preserved. | 8530 | # modifications, as long as this notice is preserved. |
3252 | 7877 | 8531 | ||
3254 | 7878 | # serial 4 lt~obsolete.m4 | 8532 | # serial 5 lt~obsolete.m4 |
3255 | 7879 | 8533 | ||
3256 | 7880 | # These exist entirely to fool aclocal when bootstrapping libtool. | 8534 | # These exist entirely to fool aclocal when bootstrapping libtool. |
3257 | 7881 | # | 8535 | # |
3258 | @@ -7965,22 +8619,24 @@ | |||
3259 | 7965 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) | 8619 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) |
3260 | 7966 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | 8620 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
3261 | 7967 | 8621 | ||
3263 | 7968 | # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 8622 | # Copyright (C) 2002-2012 Free Software Foundation, Inc. |
3264 | 7969 | # | 8623 | # |
3265 | 7970 | # This file is free software; the Free Software Foundation | 8624 | # This file is free software; the Free Software Foundation |
3266 | 7971 | # gives unlimited permission to copy and/or distribute it, | 8625 | # gives unlimited permission to copy and/or distribute it, |
3267 | 7972 | # with or without modifications, as long as this notice is preserved. | 8626 | # with or without modifications, as long as this notice is preserved. |
3268 | 7973 | 8627 | ||
3269 | 8628 | # serial 8 | ||
3270 | 8629 | |||
3271 | 7974 | # AM_AUTOMAKE_VERSION(VERSION) | 8630 | # AM_AUTOMAKE_VERSION(VERSION) |
3272 | 7975 | # ---------------------------- | 8631 | # ---------------------------- |
3273 | 7976 | # Automake X.Y traces this macro to ensure aclocal.m4 has been | 8632 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
3274 | 7977 | # generated from the m4 files accompanying Automake X.Y. | 8633 | # generated from the m4 files accompanying Automake X.Y. |
3275 | 7978 | # (This private macro should not be called outside this file.) | 8634 | # (This private macro should not be called outside this file.) |
3276 | 7979 | AC_DEFUN([AM_AUTOMAKE_VERSION], | 8635 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
3278 | 7980 | [am__api_version='1.11' | 8636 | [am__api_version='1.12' |
3279 | 7981 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 8637 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
3280 | 7982 | dnl require some minimum version. Point them to the right macro. | 8638 | dnl require some minimum version. Point them to the right macro. |
3282 | 7983 | m4_if([$1], [1.11.1], [], | 8639 | m4_if([$1], [1.12.1], [], |
3283 | 7984 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 8640 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
3284 | 7985 | ]) | 8641 | ]) |
3285 | 7986 | 8642 | ||
3286 | @@ -7996,22 +8652,24 @@ | |||
3287 | 7996 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 8652 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
3288 | 7997 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | 8653 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
3289 | 7998 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 8654 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
3291 | 7999 | [AM_AUTOMAKE_VERSION([1.11.1])dnl | 8655 | [AM_AUTOMAKE_VERSION([1.12.1])dnl |
3292 | 8000 | m4_ifndef([AC_AUTOCONF_VERSION], | 8656 | m4_ifndef([AC_AUTOCONF_VERSION], |
3293 | 8001 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 8657 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
3294 | 8002 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | 8658 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
3295 | 8003 | 8659 | ||
3296 | 8004 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 8660 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
3297 | 8005 | 8661 | ||
3299 | 8006 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | 8662 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3300 | 8007 | # | 8663 | # |
3301 | 8008 | # This file is free software; the Free Software Foundation | 8664 | # This file is free software; the Free Software Foundation |
3302 | 8009 | # gives unlimited permission to copy and/or distribute it, | 8665 | # gives unlimited permission to copy and/or distribute it, |
3303 | 8010 | # with or without modifications, as long as this notice is preserved. | 8666 | # with or without modifications, as long as this notice is preserved. |
3304 | 8011 | 8667 | ||
3305 | 8668 | # serial 2 | ||
3306 | 8669 | |||
3307 | 8012 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | 8670 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
3310 | 8013 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to | 8671 | # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
3311 | 8014 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. | 8672 | # '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
3312 | 8015 | # | 8673 | # |
3313 | 8016 | # Of course, Automake must honor this variable whenever it calls a | 8674 | # Of course, Automake must honor this variable whenever it calls a |
3314 | 8017 | # tool from the auxiliary directory. The problem is that $srcdir (and | 8675 | # tool from the auxiliary directory. The problem is that $srcdir (and |
3315 | @@ -8030,7 +8688,7 @@ | |||
3316 | 8030 | # | 8688 | # |
3317 | 8031 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir | 8689 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
3318 | 8032 | # are both prefixed by $srcdir. In an in-source build this is usually | 8690 | # are both prefixed by $srcdir. In an in-source build this is usually |
3320 | 8033 | # harmless because $srcdir is `.', but things will broke when you | 8691 | # harmless because $srcdir is '.', but things will broke when you |
3321 | 8034 | # start a VPATH build or use an absolute $srcdir. | 8692 | # start a VPATH build or use an absolute $srcdir. |
3322 | 8035 | # | 8693 | # |
3323 | 8036 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, | 8694 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
3324 | @@ -8056,22 +8714,21 @@ | |||
3325 | 8056 | 8714 | ||
3326 | 8057 | # AM_CONDITIONAL -*- Autoconf -*- | 8715 | # AM_CONDITIONAL -*- Autoconf -*- |
3327 | 8058 | 8716 | ||
3330 | 8059 | # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 | 8717 | # Copyright (C) 1997-2012 Free Software Foundation, Inc. |
3329 | 8060 | # Free Software Foundation, Inc. | ||
3331 | 8061 | # | 8718 | # |
3332 | 8062 | # This file is free software; the Free Software Foundation | 8719 | # This file is free software; the Free Software Foundation |
3333 | 8063 | # gives unlimited permission to copy and/or distribute it, | 8720 | # gives unlimited permission to copy and/or distribute it, |
3334 | 8064 | # with or without modifications, as long as this notice is preserved. | 8721 | # with or without modifications, as long as this notice is preserved. |
3335 | 8065 | 8722 | ||
3337 | 8066 | # serial 9 | 8723 | # serial 10 |
3338 | 8067 | 8724 | ||
3339 | 8068 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) | 8725 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
3340 | 8069 | # ------------------------------------- | 8726 | # ------------------------------------- |
3341 | 8070 | # Define a conditional. | 8727 | # Define a conditional. |
3342 | 8071 | AC_DEFUN([AM_CONDITIONAL], | 8728 | AC_DEFUN([AM_CONDITIONAL], |
3346 | 8072 | [AC_PREREQ(2.52)dnl | 8729 | [AC_PREREQ([2.52])dnl |
3347 | 8073 | ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], | 8730 | m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
3348 | 8074 | [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl | 8731 | [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
3349 | 8075 | AC_SUBST([$1_TRUE])dnl | 8732 | AC_SUBST([$1_TRUE])dnl |
3350 | 8076 | AC_SUBST([$1_FALSE])dnl | 8733 | AC_SUBST([$1_FALSE])dnl |
3351 | 8077 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl | 8734 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
3352 | @@ -8090,16 +8747,15 @@ | |||
3353 | 8090 | Usually this means the macro was only invoked conditionally.]]) | 8747 | Usually this means the macro was only invoked conditionally.]]) |
3354 | 8091 | fi])]) | 8748 | fi])]) |
3355 | 8092 | 8749 | ||
3358 | 8093 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 | 8750 | # Copyright (C) 1999-2012 Free Software Foundation, Inc. |
3357 | 8094 | # Free Software Foundation, Inc. | ||
3359 | 8095 | # | 8751 | # |
3360 | 8096 | # This file is free software; the Free Software Foundation | 8752 | # This file is free software; the Free Software Foundation |
3361 | 8097 | # gives unlimited permission to copy and/or distribute it, | 8753 | # gives unlimited permission to copy and/or distribute it, |
3362 | 8098 | # with or without modifications, as long as this notice is preserved. | 8754 | # with or without modifications, as long as this notice is preserved. |
3363 | 8099 | 8755 | ||
3365 | 8100 | # serial 10 | 8756 | # serial 17 |
3366 | 8101 | 8757 | ||
3368 | 8102 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | 8758 | # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
3369 | 8103 | # written in clear, in which case automake, when reading aclocal.m4, | 8759 | # written in clear, in which case automake, when reading aclocal.m4, |
3370 | 8104 | # will think it sees a *use*, and therefore will trigger all it's | 8760 | # will think it sees a *use*, and therefore will trigger all it's |
3371 | 8105 | # C support machinery. Also note that it means that autoscan, seeing | 8761 | # C support machinery. Also note that it means that autoscan, seeing |
3372 | @@ -8109,7 +8765,7 @@ | |||
3373 | 8109 | # _AM_DEPENDENCIES(NAME) | 8765 | # _AM_DEPENDENCIES(NAME) |
3374 | 8110 | # ---------------------- | 8766 | # ---------------------- |
3375 | 8111 | # See how the compiler implements dependency checking. | 8767 | # See how the compiler implements dependency checking. |
3377 | 8112 | # NAME is "CC", "CXX", "GCJ", or "OBJC". | 8768 | # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
3378 | 8113 | # We try a few techniques and use that to set a single cache variable. | 8769 | # We try a few techniques and use that to set a single cache variable. |
3379 | 8114 | # | 8770 | # |
3380 | 8115 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was | 8771 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
3381 | @@ -8122,12 +8778,13 @@ | |||
3382 | 8122 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl | 8778 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
3383 | 8123 | AC_REQUIRE([AM_DEP_TRACK])dnl | 8779 | AC_REQUIRE([AM_DEP_TRACK])dnl |
3384 | 8124 | 8780 | ||
3391 | 8125 | ifelse([$1], CC, [depcc="$CC" am_compiler_list=], | 8781 | m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
3392 | 8126 | [$1], CXX, [depcc="$CXX" am_compiler_list=], | 8782 | [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
3393 | 8127 | [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], | 8783 | [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
3394 | 8128 | [$1], UPC, [depcc="$UPC" am_compiler_list=], | 8784 | [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
3395 | 8129 | [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], | 8785 | [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
3396 | 8130 | [depcc="$$1" am_compiler_list=]) | 8786 | [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
3397 | 8787 | [depcc="$$1" am_compiler_list=]) | ||
3398 | 8131 | 8788 | ||
3399 | 8132 | AC_CACHE_CHECK([dependency style of $depcc], | 8789 | AC_CACHE_CHECK([dependency style of $depcc], |
3400 | 8133 | [am_cv_$1_dependencies_compiler_type], | 8790 | [am_cv_$1_dependencies_compiler_type], |
3401 | @@ -8135,8 +8792,9 @@ | |||
3402 | 8135 | # We make a subdir and do the tests there. Otherwise we can end up | 8792 | # We make a subdir and do the tests there. Otherwise we can end up |
3403 | 8136 | # making bogus files that we don't know about and never remove. For | 8793 | # making bogus files that we don't know about and never remove. For |
3404 | 8137 | # instance it was reported that on HP-UX the gcc test will end up | 8794 | # instance it was reported that on HP-UX the gcc test will end up |
3407 | 8138 | # making a dummy file named `D' -- because `-MD' means `put the output | 8795 | # making a dummy file named 'D' -- because '-MD' means "put the output |
3408 | 8139 | # in D'. | 8796 | # in D". |
3409 | 8797 | rm -rf conftest.dir | ||
3410 | 8140 | mkdir conftest.dir | 8798 | mkdir conftest.dir |
3411 | 8141 | # Copy depcomp to subdir because otherwise we won't find it if we're | 8799 | # Copy depcomp to subdir because otherwise we won't find it if we're |
3412 | 8142 | # using a relative directory. | 8800 | # using a relative directory. |
3413 | @@ -8175,16 +8833,16 @@ | |||
3414 | 8175 | : > sub/conftest.c | 8833 | : > sub/conftest.c |
3415 | 8176 | for i in 1 2 3 4 5 6; do | 8834 | for i in 1 2 3 4 5 6; do |
3416 | 8177 | echo '#include "conftst'$i'.h"' >> sub/conftest.c | 8835 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
3420 | 8178 | # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | 8836 | # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
3421 | 8179 | # Solaris 8's {/usr,}/bin/sh. | 8837 | # Solaris 10 /bin/sh. |
3422 | 8180 | touch sub/conftst$i.h | 8838 | echo '/* dummy */' > sub/conftst$i.h |
3423 | 8181 | done | 8839 | done |
3424 | 8182 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | 8840 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
3425 | 8183 | 8841 | ||
3427 | 8184 | # We check with `-c' and `-o' for the sake of the "dashmstdout" | 8842 | # We check with '-c' and '-o' for the sake of the "dashmstdout" |
3428 | 8185 | # mode. It turns out that the SunPro C++ compiler does not properly | 8843 | # mode. It turns out that the SunPro C++ compiler does not properly |
3431 | 8186 | # handle `-M -o', and we need to detect this. Also, some Intel | 8844 | # handle '-M -o', and we need to detect this. Also, some Intel |
3432 | 8187 | # versions had trouble with output in subdirs | 8845 | # versions had trouble with output in subdirs. |
3433 | 8188 | am__obj=sub/conftest.${OBJEXT-o} | 8846 | am__obj=sub/conftest.${OBJEXT-o} |
3434 | 8189 | am__minus_obj="-o $am__obj" | 8847 | am__minus_obj="-o $am__obj" |
3435 | 8190 | case $depmode in | 8848 | case $depmode in |
3436 | @@ -8193,16 +8851,16 @@ | |||
3437 | 8193 | test "$am__universal" = false || continue | 8851 | test "$am__universal" = false || continue |
3438 | 8194 | ;; | 8852 | ;; |
3439 | 8195 | nosideeffect) | 8853 | nosideeffect) |
3442 | 8196 | # after this tag, mechanisms are not by side-effect, so they'll | 8854 | # After this tag, mechanisms are not by side-effect, so they'll |
3443 | 8197 | # only be used when explicitly requested | 8855 | # only be used when explicitly requested. |
3444 | 8198 | if test "x$enable_dependency_tracking" = xyes; then | 8856 | if test "x$enable_dependency_tracking" = xyes; then |
3445 | 8199 | continue | 8857 | continue |
3446 | 8200 | else | 8858 | else |
3447 | 8201 | break | 8859 | break |
3448 | 8202 | fi | 8860 | fi |
3449 | 8203 | ;; | 8861 | ;; |
3452 | 8204 | msvisualcpp | msvcmsys) | 8862 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
3453 | 8205 | # This compiler won't grok `-c -o', but also, the minuso test has | 8863 | # This compiler won't grok '-c -o', but also, the minuso test has |
3454 | 8206 | # not run yet. These depmodes are late enough in the game, and | 8864 | # not run yet. These depmodes are late enough in the game, and |
3455 | 8207 | # so weak that their functioning should not be impacted. | 8865 | # so weak that their functioning should not be impacted. |
3456 | 8208 | am__obj=conftest.${OBJEXT-o} | 8866 | am__obj=conftest.${OBJEXT-o} |
3457 | @@ -8250,7 +8908,7 @@ | |||
3458 | 8250 | # AM_SET_DEPDIR | 8908 | # AM_SET_DEPDIR |
3459 | 8251 | # ------------- | 8909 | # ------------- |
3460 | 8252 | # Choose a directory name for dependency files. | 8910 | # Choose a directory name for dependency files. |
3462 | 8253 | # This macro is AC_REQUIREd in _AM_DEPENDENCIES | 8911 | # This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
3463 | 8254 | AC_DEFUN([AM_SET_DEPDIR], | 8912 | AC_DEFUN([AM_SET_DEPDIR], |
3464 | 8255 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl | 8913 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
3465 | 8256 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl | 8914 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
3466 | @@ -8260,28 +8918,34 @@ | |||
3467 | 8260 | # AM_DEP_TRACK | 8918 | # AM_DEP_TRACK |
3468 | 8261 | # ------------ | 8919 | # ------------ |
3469 | 8262 | AC_DEFUN([AM_DEP_TRACK], | 8920 | AC_DEFUN([AM_DEP_TRACK], |
3473 | 8263 | [AC_ARG_ENABLE(dependency-tracking, | 8921 | [AC_ARG_ENABLE([dependency-tracking], [dnl |
3474 | 8264 | [ --disable-dependency-tracking speeds up one-time build | 8922 | AS_HELP_STRING( |
3475 | 8265 | --enable-dependency-tracking do not reject slow dependency extractors]) | 8923 | [--enable-dependency-tracking], |
3476 | 8924 | [do not reject slow dependency extractors]) | ||
3477 | 8925 | AS_HELP_STRING( | ||
3478 | 8926 | [--disable-dependency-tracking], | ||
3479 | 8927 | [speeds up one-time build])]) | ||
3480 | 8266 | if test "x$enable_dependency_tracking" != xno; then | 8928 | if test "x$enable_dependency_tracking" != xno; then |
3481 | 8267 | am_depcomp="$ac_aux_dir/depcomp" | 8929 | am_depcomp="$ac_aux_dir/depcomp" |
3482 | 8268 | AMDEPBACKSLASH='\' | 8930 | AMDEPBACKSLASH='\' |
3483 | 8931 | am__nodep='_no' | ||
3484 | 8269 | fi | 8932 | fi |
3485 | 8270 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | 8933 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
3486 | 8271 | AC_SUBST([AMDEPBACKSLASH])dnl | 8934 | AC_SUBST([AMDEPBACKSLASH])dnl |
3487 | 8272 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl | 8935 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
3488 | 8936 | AC_SUBST([am__nodep])dnl | ||
3489 | 8937 | _AM_SUBST_NOTMAKE([am__nodep])dnl | ||
3490 | 8273 | ]) | 8938 | ]) |
3491 | 8274 | 8939 | ||
3492 | 8275 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 8940 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
3493 | 8276 | 8941 | ||
3496 | 8277 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | 8942 | # Copyright (C) 1999-2012 Free Software Foundation, Inc. |
3495 | 8278 | # Free Software Foundation, Inc. | ||
3497 | 8279 | # | 8943 | # |
3498 | 8280 | # This file is free software; the Free Software Foundation | 8944 | # This file is free software; the Free Software Foundation |
3499 | 8281 | # gives unlimited permission to copy and/or distribute it, | 8945 | # gives unlimited permission to copy and/or distribute it, |
3500 | 8282 | # with or without modifications, as long as this notice is preserved. | 8946 | # with or without modifications, as long as this notice is preserved. |
3501 | 8283 | 8947 | ||
3503 | 8284 | #serial 5 | 8948 | # serial 6 |
3504 | 8285 | 8949 | ||
3505 | 8286 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | 8950 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
3506 | 8287 | # ------------------------------ | 8951 | # ------------------------------ |
3507 | @@ -8300,7 +8964,7 @@ | |||
3508 | 8300 | # Strip MF so we end up with the name of the file. | 8964 | # Strip MF so we end up with the name of the file. |
3509 | 8301 | mf=`echo "$mf" | sed -e 's/:.*$//'` | 8965 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
3510 | 8302 | # Check whether this is an Automake generated Makefile or not. | 8966 | # Check whether this is an Automake generated Makefile or not. |
3512 | 8303 | # We used to match only the files named `Makefile.in', but | 8967 | # We used to match only the files named 'Makefile.in', but |
3513 | 8304 | # some people rename them; so instead we look at the file content. | 8968 | # some people rename them; so instead we look at the file content. |
3514 | 8305 | # Grep'ing the first line is not enough: some people post-process | 8969 | # Grep'ing the first line is not enough: some people post-process |
3515 | 8306 | # each Makefile.in and add a new line on top of each file to say so. | 8970 | # each Makefile.in and add a new line on top of each file to say so. |
3516 | @@ -8312,21 +8976,19 @@ | |||
3517 | 8312 | continue | 8976 | continue |
3518 | 8313 | fi | 8977 | fi |
3519 | 8314 | # Extract the definition of DEPDIR, am__include, and am__quote | 8978 | # Extract the definition of DEPDIR, am__include, and am__quote |
3521 | 8315 | # from the Makefile without running `make'. | 8979 | # from the Makefile without running 'make'. |
3522 | 8316 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | 8980 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
3523 | 8317 | test -z "$DEPDIR" && continue | 8981 | test -z "$DEPDIR" && continue |
3524 | 8318 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | 8982 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
3525 | 8319 | test -z "am__include" && continue | 8983 | test -z "am__include" && continue |
3526 | 8320 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | 8984 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
3527 | 8321 | # When using ansi2knr, U may be empty or an underscore; expand it | ||
3528 | 8322 | U=`sed -n 's/^U = //p' < "$mf"` | ||
3529 | 8323 | # Find all dependency output files, they are included files with | 8985 | # Find all dependency output files, they are included files with |
3530 | 8324 | # $(DEPDIR) in their names. We invoke sed twice because it is the | 8986 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
3531 | 8325 | # simplest approach to changing $(DEPDIR) to its actual value in the | 8987 | # simplest approach to changing $(DEPDIR) to its actual value in the |
3532 | 8326 | # expansion. | 8988 | # expansion. |
3533 | 8327 | for file in `sed -n " | 8989 | for file in `sed -n " |
3534 | 8328 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | 8990 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
3536 | 8329 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | 8991 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
3537 | 8330 | # Make sure the directory exists. | 8992 | # Make sure the directory exists. |
3538 | 8331 | test -f "$dirpart/$file" && continue | 8993 | test -f "$dirpart/$file" && continue |
3539 | 8332 | fdir=`AS_DIRNAME(["$file"])` | 8994 | fdir=`AS_DIRNAME(["$file"])` |
3540 | @@ -8344,7 +9006,7 @@ | |||
3541 | 8344 | # This macro should only be invoked once -- use via AC_REQUIRE. | 9006 | # This macro should only be invoked once -- use via AC_REQUIRE. |
3542 | 8345 | # | 9007 | # |
3543 | 8346 | # This code is only required when automatic dependency tracking | 9008 | # This code is only required when automatic dependency tracking |
3545 | 8347 | # is enabled. FIXME. This creates each `.P' file that we will | 9009 | # is enabled. FIXME. This creates each '.P' file that we will |
3546 | 8348 | # need in order to bootstrap the dependency handling code. | 9010 | # need in order to bootstrap the dependency handling code. |
3547 | 8349 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | 9011 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
3548 | 8350 | [AC_CONFIG_COMMANDS([depfiles], | 9012 | [AC_CONFIG_COMMANDS([depfiles], |
3549 | @@ -8352,8 +9014,7 @@ | |||
3550 | 8352 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | 9014 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
3551 | 8353 | ]) | 9015 | ]) |
3552 | 8354 | 9016 | ||
3555 | 8355 | # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 | 9017 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
3554 | 8356 | # Free Software Foundation, Inc. | ||
3556 | 8357 | # | 9018 | # |
3557 | 8358 | # This file is free software; the Free Software Foundation | 9019 | # This file is free software; the Free Software Foundation |
3558 | 8359 | # gives unlimited permission to copy and/or distribute it, | 9020 | # gives unlimited permission to copy and/or distribute it, |
3559 | @@ -8366,14 +9027,13 @@ | |||
3560 | 8366 | 9027 | ||
3561 | 8367 | # Do all the work for Automake. -*- Autoconf -*- | 9028 | # Do all the work for Automake. -*- Autoconf -*- |
3562 | 8368 | 9029 | ||
3565 | 8369 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 9030 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
3564 | 8370 | # 2005, 2006, 2008, 2009 Free Software Foundation, Inc. | ||
3566 | 8371 | # | 9031 | # |
3567 | 8372 | # This file is free software; the Free Software Foundation | 9032 | # This file is free software; the Free Software Foundation |
3568 | 8373 | # gives unlimited permission to copy and/or distribute it, | 9033 | # gives unlimited permission to copy and/or distribute it, |
3569 | 8374 | # with or without modifications, as long as this notice is preserved. | 9034 | # with or without modifications, as long as this notice is preserved. |
3570 | 8375 | 9035 | ||
3572 | 8376 | # serial 16 | 9036 | # serial 19 |
3573 | 8377 | 9037 | ||
3574 | 8378 | # This macro actually does too much. Some checks are only needed if | 9038 | # This macro actually does too much. Some checks are only needed if |
3575 | 8379 | # your package does certain things. But this isn't really a big deal. | 9039 | # your package does certain things. But this isn't really a big deal. |
3576 | @@ -8419,31 +9079,36 @@ | |||
3577 | 8419 | # Define the identity of the package. | 9079 | # Define the identity of the package. |
3578 | 8420 | dnl Distinguish between old-style and new-style calls. | 9080 | dnl Distinguish between old-style and new-style calls. |
3579 | 8421 | m4_ifval([$2], | 9081 | m4_ifval([$2], |
3581 | 8422 | [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | 9082 | [AC_DIAGNOSE([obsolete], |
3582 | 9083 | [$0: two- and three-arguments forms are deprecated. For more info, see: | ||
3583 | 9084 | http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) | ||
3584 | 9085 | m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | ||
3585 | 8423 | AC_SUBST([PACKAGE], [$1])dnl | 9086 | AC_SUBST([PACKAGE], [$1])dnl |
3586 | 8424 | AC_SUBST([VERSION], [$2])], | 9087 | AC_SUBST([VERSION], [$2])], |
3587 | 8425 | [_AM_SET_OPTIONS([$1])dnl | 9088 | [_AM_SET_OPTIONS([$1])dnl |
3588 | 8426 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | 9089 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
3590 | 8427 | m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, | 9090 | m4_if( |
3591 | 9091 | m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | ||
3592 | 9092 | [ok:ok],, | ||
3593 | 8428 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | 9093 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
3594 | 8429 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | 9094 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
3595 | 8430 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl | 9095 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
3596 | 8431 | 9096 | ||
3597 | 8432 | _AM_IF_OPTION([no-define],, | 9097 | _AM_IF_OPTION([no-define],, |
3600 | 8433 | [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) | 9098 | [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
3601 | 8434 | AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl | 9099 | AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
3602 | 8435 | 9100 | ||
3603 | 8436 | # Some tools Automake needs. | 9101 | # Some tools Automake needs. |
3604 | 8437 | AC_REQUIRE([AM_SANITY_CHECK])dnl | 9102 | AC_REQUIRE([AM_SANITY_CHECK])dnl |
3605 | 8438 | AC_REQUIRE([AC_ARG_PROGRAM])dnl | 9103 | AC_REQUIRE([AC_ARG_PROGRAM])dnl |
3611 | 8439 | AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) | 9104 | AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
3612 | 8440 | AM_MISSING_PROG(AUTOCONF, autoconf) | 9105 | AM_MISSING_PROG([AUTOCONF], [autoconf]) |
3613 | 8441 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) | 9106 | AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
3614 | 8442 | AM_MISSING_PROG(AUTOHEADER, autoheader) | 9107 | AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
3615 | 8443 | AM_MISSING_PROG(MAKEINFO, makeinfo) | 9108 | AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
3616 | 8444 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | 9109 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
3617 | 8445 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | 9110 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
3619 | 8446 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl | 9111 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
3620 | 8447 | # We need awk for the "check" target. The system "awk" is bad on | 9112 | # We need awk for the "check" target. The system "awk" is bad on |
3621 | 8448 | # some platforms. | 9113 | # some platforms. |
3622 | 8449 | AC_REQUIRE([AC_PROG_AWK])dnl | 9114 | AC_REQUIRE([AC_PROG_AWK])dnl |
3623 | @@ -8454,28 +9119,35 @@ | |||
3624 | 8454 | [_AM_PROG_TAR([v7])])]) | 9119 | [_AM_PROG_TAR([v7])])]) |
3625 | 8455 | _AM_IF_OPTION([no-dependencies],, | 9120 | _AM_IF_OPTION([no-dependencies],, |
3626 | 8456 | [AC_PROVIDE_IFELSE([AC_PROG_CC], | 9121 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
3630 | 8457 | [_AM_DEPENDENCIES(CC)], | 9122 | [_AM_DEPENDENCIES([CC])], |
3631 | 8458 | [define([AC_PROG_CC], | 9123 | [m4_define([AC_PROG_CC], |
3632 | 8459 | defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl | 9124 | m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
3633 | 8460 | AC_PROVIDE_IFELSE([AC_PROG_CXX], | 9125 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
3637 | 8461 | [_AM_DEPENDENCIES(CXX)], | 9126 | [_AM_DEPENDENCIES([CXX])], |
3638 | 8462 | [define([AC_PROG_CXX], | 9127 | [m4_define([AC_PROG_CXX], |
3639 | 8463 | defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl | 9128 | m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
3640 | 8464 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], | 9129 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
3644 | 8465 | [_AM_DEPENDENCIES(OBJC)], | 9130 | [_AM_DEPENDENCIES([OBJC])], |
3645 | 8466 | [define([AC_PROG_OBJC], | 9131 | [m4_define([AC_PROG_OBJC], |
3646 | 8467 | defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl | 9132 | m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
3647 | 9133 | dnl Support for Objective C++ was only introduced in Autoconf 2.65, | ||
3648 | 9134 | dnl but we still cater to Autoconf 2.62. | ||
3649 | 9135 | m4_ifdef([AC_PROG_OBJCXX], | ||
3650 | 9136 | [AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], | ||
3651 | 9137 | [_AM_DEPENDENCIES([OBJCXX])], | ||
3652 | 9138 | [m4_define([AC_PROG_OBJCXX], | ||
3653 | 9139 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl | ||
3654 | 8468 | ]) | 9140 | ]) |
3655 | 8469 | _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl | 9141 | _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
3658 | 8470 | dnl The `parallel-tests' driver may need to know about EXEEXT, so add the | 9142 | dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |
3659 | 8471 | dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | 9143 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
3660 | 8472 | dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. | 9144 | dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
3661 | 8473 | AC_CONFIG_COMMANDS_PRE(dnl | 9145 | AC_CONFIG_COMMANDS_PRE(dnl |
3662 | 8474 | [m4_provide_if([_AM_COMPILER_EXEEXT], | 9146 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
3663 | 8475 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | 9147 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
3664 | 8476 | ]) | 9148 | ]) |
3665 | 8477 | 9149 | ||
3667 | 8478 | dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | 9150 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
3668 | 8479 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | 9151 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
3669 | 8480 | dnl mangled by Autoconf and run in a shell conditional statement. | 9152 | dnl mangled by Autoconf and run in a shell conditional statement. |
3670 | 8481 | m4_define([_AC_COMPILER_EXEEXT], | 9153 | m4_define([_AC_COMPILER_EXEEXT], |
3671 | @@ -8503,12 +9175,14 @@ | |||
3672 | 8503 | done | 9175 | done |
3673 | 8504 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | 9176 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
3674 | 8505 | 9177 | ||
3676 | 8506 | # Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. | 9178 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3677 | 8507 | # | 9179 | # |
3678 | 8508 | # This file is free software; the Free Software Foundation | 9180 | # This file is free software; the Free Software Foundation |
3679 | 8509 | # gives unlimited permission to copy and/or distribute it, | 9181 | # gives unlimited permission to copy and/or distribute it, |
3680 | 8510 | # with or without modifications, as long as this notice is preserved. | 9182 | # with or without modifications, as long as this notice is preserved. |
3681 | 8511 | 9183 | ||
3682 | 9184 | # serial 8 | ||
3683 | 9185 | |||
3684 | 8512 | # AM_PROG_INSTALL_SH | 9186 | # AM_PROG_INSTALL_SH |
3685 | 8513 | # ------------------ | 9187 | # ------------------ |
3686 | 8514 | # Define $install_sh. | 9188 | # Define $install_sh. |
3687 | @@ -8522,9 +9196,9 @@ | |||
3688 | 8522 | install_sh="\${SHELL} $am_aux_dir/install-sh" | 9196 | install_sh="\${SHELL} $am_aux_dir/install-sh" |
3689 | 8523 | esac | 9197 | esac |
3690 | 8524 | fi | 9198 | fi |
3692 | 8525 | AC_SUBST(install_sh)]) | 9199 | AC_SUBST([install_sh])]) |
3693 | 8526 | 9200 | ||
3695 | 8527 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. | 9201 | # Copyright (C) 2003-2012 Free Software Foundation, Inc. |
3696 | 8528 | # | 9202 | # |
3697 | 8529 | # This file is free software; the Free Software Foundation | 9203 | # This file is free software; the Free Software Foundation |
3698 | 8530 | # gives unlimited permission to copy and/or distribute it, | 9204 | # gives unlimited permission to copy and/or distribute it, |
3699 | @@ -8547,13 +9221,13 @@ | |||
3700 | 8547 | 9221 | ||
3701 | 8548 | # Check to see how 'make' treats includes. -*- Autoconf -*- | 9222 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
3702 | 8549 | 9223 | ||
3704 | 8550 | # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. | 9224 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3705 | 8551 | # | 9225 | # |
3706 | 8552 | # This file is free software; the Free Software Foundation | 9226 | # This file is free software; the Free Software Foundation |
3707 | 8553 | # gives unlimited permission to copy and/or distribute it, | 9227 | # gives unlimited permission to copy and/or distribute it, |
3708 | 8554 | # with or without modifications, as long as this notice is preserved. | 9228 | # with or without modifications, as long as this notice is preserved. |
3709 | 8555 | 9229 | ||
3711 | 8556 | # serial 4 | 9230 | # serial 5 |
3712 | 8557 | 9231 | ||
3713 | 8558 | # AM_MAKE_INCLUDE() | 9232 | # AM_MAKE_INCLUDE() |
3714 | 8559 | # ----------------- | 9233 | # ----------------- |
3715 | @@ -8572,7 +9246,7 @@ | |||
3716 | 8572 | _am_result=none | 9246 | _am_result=none |
3717 | 8573 | # First try GNU make style include. | 9247 | # First try GNU make style include. |
3718 | 8574 | echo "include confinc" > confmf | 9248 | echo "include confinc" > confmf |
3720 | 8575 | # Ignore all kinds of additional output from `make'. | 9249 | # Ignore all kinds of additional output from 'make'. |
3721 | 8576 | case `$am_make -s -f confmf 2> /dev/null` in #( | 9250 | case `$am_make -s -f confmf 2> /dev/null` in #( |
3722 | 8577 | *the\ am__doit\ target*) | 9251 | *the\ am__doit\ target*) |
3723 | 8578 | am__include=include | 9252 | am__include=include |
3724 | @@ -8599,14 +9273,13 @@ | |||
3725 | 8599 | 9273 | ||
3726 | 8600 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | 9274 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
3727 | 8601 | 9275 | ||
3730 | 8602 | # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 | 9276 | # Copyright (C) 1997-2012 Free Software Foundation, Inc. |
3729 | 8603 | # Free Software Foundation, Inc. | ||
3731 | 8604 | # | 9277 | # |
3732 | 8605 | # This file is free software; the Free Software Foundation | 9278 | # This file is free software; the Free Software Foundation |
3733 | 8606 | # gives unlimited permission to copy and/or distribute it, | 9279 | # gives unlimited permission to copy and/or distribute it, |
3734 | 8607 | # with or without modifications, as long as this notice is preserved. | 9280 | # with or without modifications, as long as this notice is preserved. |
3735 | 8608 | 9281 | ||
3737 | 8609 | # serial 6 | 9282 | # serial 7 |
3738 | 8610 | 9283 | ||
3739 | 8611 | # AM_MISSING_PROG(NAME, PROGRAM) | 9284 | # AM_MISSING_PROG(NAME, PROGRAM) |
3740 | 8612 | # ------------------------------ | 9285 | # ------------------------------ |
3741 | @@ -8636,45 +9309,19 @@ | |||
3742 | 8636 | am_missing_run="$MISSING --run " | 9309 | am_missing_run="$MISSING --run " |
3743 | 8637 | else | 9310 | else |
3744 | 8638 | am_missing_run= | 9311 | am_missing_run= |
3746 | 8639 | AC_MSG_WARN([`missing' script is too old or missing]) | 9312 | AC_MSG_WARN(['missing' script is too old or missing]) |
3747 | 8640 | fi | 9313 | fi |
3748 | 8641 | ]) | 9314 | ]) |
3749 | 8642 | 9315 | ||
3750 | 8643 | # Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | ||
3751 | 8644 | # | ||
3752 | 8645 | # This file is free software; the Free Software Foundation | ||
3753 | 8646 | # gives unlimited permission to copy and/or distribute it, | ||
3754 | 8647 | # with or without modifications, as long as this notice is preserved. | ||
3755 | 8648 | |||
3756 | 8649 | # AM_PROG_MKDIR_P | ||
3757 | 8650 | # --------------- | ||
3758 | 8651 | # Check for `mkdir -p'. | ||
3759 | 8652 | AC_DEFUN([AM_PROG_MKDIR_P], | ||
3760 | 8653 | [AC_PREREQ([2.60])dnl | ||
3761 | 8654 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl | ||
3762 | 8655 | dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, | ||
3763 | 8656 | dnl while keeping a definition of mkdir_p for backward compatibility. | ||
3764 | 8657 | dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. | ||
3765 | 8658 | dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of | ||
3766 | 8659 | dnl Makefile.ins that do not define MKDIR_P, so we do our own | ||
3767 | 8660 | dnl adjustment using top_builddir (which is defined more often than | ||
3768 | 8661 | dnl MKDIR_P). | ||
3769 | 8662 | AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl | ||
3770 | 8663 | case $mkdir_p in | ||
3771 | 8664 | [[\\/$]]* | ?:[[\\/]]*) ;; | ||
3772 | 8665 | */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; | ||
3773 | 8666 | esac | ||
3774 | 8667 | ]) | ||
3775 | 8668 | |||
3776 | 8669 | # Helper functions for option handling. -*- Autoconf -*- | 9316 | # Helper functions for option handling. -*- Autoconf -*- |
3777 | 8670 | 9317 | ||
3779 | 8671 | # Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. | 9318 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3780 | 8672 | # | 9319 | # |
3781 | 8673 | # This file is free software; the Free Software Foundation | 9320 | # This file is free software; the Free Software Foundation |
3782 | 8674 | # gives unlimited permission to copy and/or distribute it, | 9321 | # gives unlimited permission to copy and/or distribute it, |
3783 | 8675 | # with or without modifications, as long as this notice is preserved. | 9322 | # with or without modifications, as long as this notice is preserved. |
3784 | 8676 | 9323 | ||
3786 | 8677 | # serial 4 | 9324 | # serial 6 |
3787 | 8678 | 9325 | ||
3788 | 8679 | # _AM_MANGLE_OPTION(NAME) | 9326 | # _AM_MANGLE_OPTION(NAME) |
3789 | 8680 | # ----------------------- | 9327 | # ----------------------- |
3790 | @@ -8682,13 +9329,13 @@ | |||
3791 | 8682 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | 9329 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
3792 | 8683 | 9330 | ||
3793 | 8684 | # _AM_SET_OPTION(NAME) | 9331 | # _AM_SET_OPTION(NAME) |
3795 | 8685 | # ------------------------------ | 9332 | # -------------------- |
3796 | 8686 | # Set option NAME. Presently that only means defining a flag for this option. | 9333 | # Set option NAME. Presently that only means defining a flag for this option. |
3797 | 8687 | AC_DEFUN([_AM_SET_OPTION], | 9334 | AC_DEFUN([_AM_SET_OPTION], |
3799 | 8688 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) | 9335 | [m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
3800 | 8689 | 9336 | ||
3801 | 8690 | # _AM_SET_OPTIONS(OPTIONS) | 9337 | # _AM_SET_OPTIONS(OPTIONS) |
3803 | 8691 | # ---------------------------------- | 9338 | # ------------------------ |
3804 | 8692 | # OPTIONS is a space-separated list of Automake options. | 9339 | # OPTIONS is a space-separated list of Automake options. |
3805 | 8693 | AC_DEFUN([_AM_SET_OPTIONS], | 9340 | AC_DEFUN([_AM_SET_OPTIONS], |
3806 | 8694 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | 9341 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
3807 | @@ -8701,22 +9348,18 @@ | |||
3808 | 8701 | 9348 | ||
3809 | 8702 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | 9349 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
3810 | 8703 | 9350 | ||
3813 | 8704 | # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 | 9351 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
3812 | 8705 | # Free Software Foundation, Inc. | ||
3814 | 8706 | # | 9352 | # |
3815 | 8707 | # This file is free software; the Free Software Foundation | 9353 | # This file is free software; the Free Software Foundation |
3816 | 8708 | # gives unlimited permission to copy and/or distribute it, | 9354 | # gives unlimited permission to copy and/or distribute it, |
3817 | 8709 | # with or without modifications, as long as this notice is preserved. | 9355 | # with or without modifications, as long as this notice is preserved. |
3818 | 8710 | 9356 | ||
3820 | 8711 | # serial 5 | 9357 | # serial 9 |
3821 | 8712 | 9358 | ||
3822 | 8713 | # AM_SANITY_CHECK | 9359 | # AM_SANITY_CHECK |
3823 | 8714 | # --------------- | 9360 | # --------------- |
3824 | 8715 | AC_DEFUN([AM_SANITY_CHECK], | 9361 | AC_DEFUN([AM_SANITY_CHECK], |
3825 | 8716 | [AC_MSG_CHECKING([whether build environment is sane]) | 9362 | [AC_MSG_CHECKING([whether build environment is sane]) |
3826 | 8717 | # Just in case | ||
3827 | 8718 | sleep 1 | ||
3828 | 8719 | echo timestamp > conftest.file | ||
3829 | 8720 | # Reject unsafe characters in $srcdir or the absolute working directory | 9363 | # Reject unsafe characters in $srcdir or the absolute working directory |
3830 | 8721 | # name. Accept space and tab only in the latter. | 9364 | # name. Accept space and tab only in the latter. |
3831 | 8722 | am_lf=' | 9365 | am_lf=' |
3832 | @@ -8727,32 +9370,40 @@ | |||
3833 | 8727 | esac | 9370 | esac |
3834 | 8728 | case $srcdir in | 9371 | case $srcdir in |
3835 | 8729 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) | 9372 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
3837 | 8730 | AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; | 9373 | AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
3838 | 8731 | esac | 9374 | esac |
3839 | 8732 | 9375 | ||
3841 | 8733 | # Do `set' in a subshell so we don't clobber the current shell's | 9376 | # Do 'set' in a subshell so we don't clobber the current shell's |
3842 | 8734 | # arguments. Must try -L first in case configure is actually a | 9377 | # arguments. Must try -L first in case configure is actually a |
3843 | 8735 | # symlink; some systems play weird games with the mod time of symlinks | 9378 | # symlink; some systems play weird games with the mod time of symlinks |
3844 | 8736 | # (eg FreeBSD returns the mod time of the symlink's containing | 9379 | # (eg FreeBSD returns the mod time of the symlink's containing |
3845 | 8737 | # directory). | 9380 | # directory). |
3846 | 8738 | if ( | 9381 | if ( |
3864 | 8739 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | 9382 | am_has_slept=no |
3865 | 8740 | if test "$[*]" = "X"; then | 9383 | for am_try in 1 2; do |
3866 | 8741 | # -L didn't work. | 9384 | echo "timestamp, slept: $am_has_slept" > conftest.file |
3867 | 8742 | set X `ls -t "$srcdir/configure" conftest.file` | 9385 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
3868 | 8743 | fi | 9386 | if test "$[*]" = "X"; then |
3869 | 8744 | rm -f conftest.file | 9387 | # -L didn't work. |
3870 | 8745 | if test "$[*]" != "X $srcdir/configure conftest.file" \ | 9388 | set X `ls -t "$srcdir/configure" conftest.file` |
3871 | 8746 | && test "$[*]" != "X conftest.file $srcdir/configure"; then | 9389 | fi |
3872 | 8747 | 9390 | if test "$[*]" != "X $srcdir/configure conftest.file" \ | |
3873 | 8748 | # If neither matched, then we have a broken ls. This can happen | 9391 | && test "$[*]" != "X conftest.file $srcdir/configure"; then |
3874 | 8749 | # if, for instance, CONFIG_SHELL is bash and it inherits a | 9392 | |
3875 | 8750 | # broken ls alias from the environment. This has actually | 9393 | # If neither matched, then we have a broken ls. This can happen |
3876 | 8751 | # happened. Such a system could not be considered "sane". | 9394 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
3877 | 8752 | AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken | 9395 | # broken ls alias from the environment. This has actually |
3878 | 8753 | alias in your environment]) | 9396 | # happened. Such a system could not be considered "sane". |
3879 | 8754 | fi | 9397 | AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
3880 | 8755 | 9398 | alias in your environment]) | |
3881 | 9399 | fi | ||
3882 | 9400 | if test "$[2]" = conftest.file || test $am_try -eq 2; then | ||
3883 | 9401 | break | ||
3884 | 9402 | fi | ||
3885 | 9403 | # Just in case. | ||
3886 | 9404 | sleep 1 | ||
3887 | 9405 | am_has_slept=yes | ||
3888 | 9406 | done | ||
3889 | 8756 | test "$[2]" = conftest.file | 9407 | test "$[2]" = conftest.file |
3890 | 8757 | ) | 9408 | ) |
3891 | 8758 | then | 9409 | then |
3892 | @@ -8762,43 +9413,61 @@ | |||
3893 | 8762 | AC_MSG_ERROR([newly created file is older than distributed files! | 9413 | AC_MSG_ERROR([newly created file is older than distributed files! |
3894 | 8763 | Check your system clock]) | 9414 | Check your system clock]) |
3895 | 8764 | fi | 9415 | fi |
3897 | 8765 | AC_MSG_RESULT(yes)]) | 9416 | AC_MSG_RESULT([yes]) |
3898 | 9417 | # If we didn't sleep, we still need to ensure time stamps of config.status and | ||
3899 | 9418 | # generated files are strictly newer. | ||
3900 | 9419 | am_sleep_pid= | ||
3901 | 9420 | if grep 'slept: no' conftest.file >/dev/null 2>&1; then | ||
3902 | 9421 | ( sleep 1 ) & | ||
3903 | 9422 | am_sleep_pid=$! | ||
3904 | 9423 | fi | ||
3905 | 9424 | AC_CONFIG_COMMANDS_PRE( | ||
3906 | 9425 | [AC_MSG_CHECKING([that generated files are newer than configure]) | ||
3907 | 9426 | if test -n "$am_sleep_pid"; then | ||
3908 | 9427 | # Hide warnings about reused PIDs. | ||
3909 | 9428 | wait $am_sleep_pid 2>/dev/null | ||
3910 | 9429 | fi | ||
3911 | 9430 | AC_MSG_RESULT([done])]) | ||
3912 | 9431 | rm -f conftest.file | ||
3913 | 9432 | ]) | ||
3914 | 8766 | 9433 | ||
3916 | 8767 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | 9434 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. |
3917 | 8768 | # | 9435 | # |
3918 | 8769 | # This file is free software; the Free Software Foundation | 9436 | # This file is free software; the Free Software Foundation |
3919 | 8770 | # gives unlimited permission to copy and/or distribute it, | 9437 | # gives unlimited permission to copy and/or distribute it, |
3920 | 8771 | # with or without modifications, as long as this notice is preserved. | 9438 | # with or without modifications, as long as this notice is preserved. |
3921 | 8772 | 9439 | ||
3922 | 9440 | # serial 2 | ||
3923 | 9441 | |||
3924 | 8773 | # AM_PROG_INSTALL_STRIP | 9442 | # AM_PROG_INSTALL_STRIP |
3925 | 8774 | # --------------------- | 9443 | # --------------------- |
3927 | 8775 | # One issue with vendor `install' (even GNU) is that you can't | 9444 | # One issue with vendor 'install' (even GNU) is that you can't |
3928 | 8776 | # specify the program used to strip binaries. This is especially | 9445 | # specify the program used to strip binaries. This is especially |
3929 | 8777 | # annoying in cross-compiling environments, where the build's strip | 9446 | # annoying in cross-compiling environments, where the build's strip |
3930 | 8778 | # is unlikely to handle the host's binaries. | 9447 | # is unlikely to handle the host's binaries. |
3931 | 8779 | # Fortunately install-sh will honor a STRIPPROG variable, so we | 9448 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
3933 | 8780 | # always use install-sh in `make install-strip', and initialize | 9449 | # always use install-sh in "make install-strip", and initialize |
3934 | 8781 | # STRIPPROG with the value of the STRIP variable (set by the user). | 9450 | # STRIPPROG with the value of the STRIP variable (set by the user). |
3935 | 8782 | AC_DEFUN([AM_PROG_INSTALL_STRIP], | 9451 | AC_DEFUN([AM_PROG_INSTALL_STRIP], |
3936 | 8783 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | 9452 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
3939 | 8784 | # Installed binaries are usually stripped using `strip' when the user | 9453 | # Installed binaries are usually stripped using 'strip' when the user |
3940 | 8785 | # run `make install-strip'. However `strip' might not be the right | 9454 | # run "make install-strip". However 'strip' might not be the right |
3941 | 8786 | # tool to use in cross-compilation environments, therefore Automake | 9455 | # tool to use in cross-compilation environments, therefore Automake |
3944 | 8787 | # will honor the `STRIP' environment variable to overrule this program. | 9456 | # will honor the 'STRIP' environment variable to overrule this program. |
3945 | 8788 | dnl Don't test for $cross_compiling = yes, because it might be `maybe'. | 9457 | dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
3946 | 8789 | if test "$cross_compiling" != no; then | 9458 | if test "$cross_compiling" != no; then |
3947 | 8790 | AC_CHECK_TOOL([STRIP], [strip], :) | 9459 | AC_CHECK_TOOL([STRIP], [strip], :) |
3948 | 8791 | fi | 9460 | fi |
3949 | 8792 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | 9461 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
3950 | 8793 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | 9462 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
3951 | 8794 | 9463 | ||
3953 | 8795 | # Copyright (C) 2006, 2008 Free Software Foundation, Inc. | 9464 | # Copyright (C) 2006-2012 Free Software Foundation, Inc. |
3954 | 8796 | # | 9465 | # |
3955 | 8797 | # This file is free software; the Free Software Foundation | 9466 | # This file is free software; the Free Software Foundation |
3956 | 8798 | # gives unlimited permission to copy and/or distribute it, | 9467 | # gives unlimited permission to copy and/or distribute it, |
3957 | 8799 | # with or without modifications, as long as this notice is preserved. | 9468 | # with or without modifications, as long as this notice is preserved. |
3958 | 8800 | 9469 | ||
3960 | 8801 | # serial 2 | 9470 | # serial 3 |
3961 | 8802 | 9471 | ||
3962 | 8803 | # _AM_SUBST_NOTMAKE(VARIABLE) | 9472 | # _AM_SUBST_NOTMAKE(VARIABLE) |
3963 | 8804 | # --------------------------- | 9473 | # --------------------------- |
3964 | @@ -8807,24 +9476,24 @@ | |||
3965 | 8807 | AC_DEFUN([_AM_SUBST_NOTMAKE]) | 9476 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
3966 | 8808 | 9477 | ||
3967 | 8809 | # AM_SUBST_NOTMAKE(VARIABLE) | 9478 | # AM_SUBST_NOTMAKE(VARIABLE) |
3969 | 8810 | # --------------------------- | 9479 | # -------------------------- |
3970 | 8811 | # Public sister of _AM_SUBST_NOTMAKE. | 9480 | # Public sister of _AM_SUBST_NOTMAKE. |
3971 | 8812 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | 9481 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
3972 | 8813 | 9482 | ||
3973 | 8814 | # Check how to create a tarball. -*- Autoconf -*- | 9483 | # Check how to create a tarball. -*- Autoconf -*- |
3974 | 8815 | 9484 | ||
3976 | 8816 | # Copyright (C) 2004, 2005 Free Software Foundation, Inc. | 9485 | # Copyright (C) 2004-2012 Free Software Foundation, Inc. |
3977 | 8817 | # | 9486 | # |
3978 | 8818 | # This file is free software; the Free Software Foundation | 9487 | # This file is free software; the Free Software Foundation |
3979 | 8819 | # gives unlimited permission to copy and/or distribute it, | 9488 | # gives unlimited permission to copy and/or distribute it, |
3980 | 8820 | # with or without modifications, as long as this notice is preserved. | 9489 | # with or without modifications, as long as this notice is preserved. |
3981 | 8821 | 9490 | ||
3983 | 8822 | # serial 2 | 9491 | # serial 3 |
3984 | 8823 | 9492 | ||
3985 | 8824 | # _AM_PROG_TAR(FORMAT) | 9493 | # _AM_PROG_TAR(FORMAT) |
3986 | 8825 | # -------------------- | 9494 | # -------------------- |
3987 | 8826 | # Check how to create a tarball in format FORMAT. | 9495 | # Check how to create a tarball in format FORMAT. |
3989 | 8827 | # FORMAT should be one of `v7', `ustar', or `pax'. | 9496 | # FORMAT should be one of 'v7', 'ustar', or 'pax'. |
3990 | 8828 | # | 9497 | # |
3991 | 8829 | # Substitute a variable $(am__tar) that is a command | 9498 | # Substitute a variable $(am__tar) that is a command |
3992 | 8830 | # writing to stdout a FORMAT-tarball containing the directory | 9499 | # writing to stdout a FORMAT-tarball containing the directory |
3993 | @@ -8835,10 +9504,11 @@ | |||
3994 | 8835 | # a tarball read from stdin. | 9504 | # a tarball read from stdin. |
3995 | 8836 | # $(am__untar) < result.tar | 9505 | # $(am__untar) < result.tar |
3996 | 8837 | AC_DEFUN([_AM_PROG_TAR], | 9506 | AC_DEFUN([_AM_PROG_TAR], |
3999 | 8838 | [# Always define AMTAR for backward compatibility. | 9507 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
4000 | 8839 | AM_MISSING_PROG([AMTAR], [tar]) | 9508 | # in the wild :-( We should find a proper way to deprecate it ... |
4001 | 9509 | AC_SUBST([AMTAR], ['$${TAR-tar}']) | ||
4002 | 8840 | m4_if([$1], [v7], | 9510 | m4_if([$1], [v7], |
4004 | 8841 | [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], | 9511 | [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
4005 | 8842 | [m4_case([$1], [ustar],, [pax],, | 9512 | [m4_case([$1], [ustar],, [pax],, |
4006 | 8843 | [m4_fatal([Unknown tar format])]) | 9513 | [m4_fatal([Unknown tar format])]) |
4007 | 8844 | AC_MSG_CHECKING([how to create a $1 tar archive]) | 9514 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
4008 | @@ -8846,7 +9516,7 @@ | |||
4009 | 8846 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | 9516 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
4010 | 8847 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | 9517 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
4011 | 8848 | # Do not fold the above two line into one, because Tru64 sh and | 9518 | # Do not fold the above two line into one, because Tru64 sh and |
4013 | 8849 | # Solaris sh will not grok spaces in the rhs of `-'. | 9519 | # Solaris sh will not grok spaces in the rhs of '-'. |
4014 | 8850 | for _am_tool in $_am_tools | 9520 | for _am_tool in $_am_tools |
4015 | 8851 | do | 9521 | do |
4016 | 8852 | case $_am_tool in | 9522 | case $_am_tool in |
4017 | 8853 | 9523 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
4023 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
4024 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4027 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
4028 | 5 | # Free Software Foundation, Inc. | 5 | # 2011, 2012 Free Software Foundation, Inc. |
4029 | 6 | 6 | ||
4031 | 7 | timestamp='2009-12-30' | 7 | timestamp='2012-02-10' |
4032 | 8 | 8 | ||
4033 | 9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
4034 | 10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
4035 | @@ -17,9 +17,7 @@ | |||
4036 | 17 | # General Public License for more details. | 17 | # General Public License for more details. |
4037 | 18 | # | 18 | # |
4038 | 19 | # You should have received a copy of the GNU General Public License | 19 | # You should have received a copy of the GNU General Public License |
4042 | 20 | # along with this program; if not, write to the Free Software | 20 | # along with this program; if not, see <http://www.gnu.org/licenses/>. |
4040 | 21 | # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA | ||
4041 | 22 | # 02110-1301, USA. | ||
4043 | 23 | # | 21 | # |
4044 | 24 | # As a special exception to the GNU General Public License, if you | 22 | # As a special exception to the GNU General Public License, if you |
4045 | 25 | # distribute this file as part of a program that contains a | 23 | # distribute this file as part of a program that contains a |
4046 | @@ -57,8 +55,8 @@ | |||
4047 | 57 | 55 | ||
4048 | 58 | Originally written by Per Bothner. | 56 | Originally written by Per Bothner. |
4049 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 57 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4052 | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 58 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
4053 | 61 | Software Foundation, Inc. | 59 | Free Software Foundation, Inc. |
4054 | 62 | 60 | ||
4055 | 63 | This is free software; see the source for copying conditions. There is NO | 61 | This is free software; see the source for copying conditions. There is NO |
4056 | 64 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 62 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4057 | @@ -168,7 +166,7 @@ | |||
4058 | 168 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 166 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
4059 | 169 | *:NetBSD:*:*) | 167 | *:NetBSD:*:*) |
4060 | 170 | # NetBSD (nbsd) targets should (where applicable) match one or | 168 | # NetBSD (nbsd) targets should (where applicable) match one or |
4062 | 171 | # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, | 169 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
4063 | 172 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently | 170 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
4064 | 173 | # switched to ELF, *-*-netbsd* would select the old | 171 | # switched to ELF, *-*-netbsd* would select the old |
4065 | 174 | # object file format. This provides both forward | 172 | # object file format. This provides both forward |
4066 | @@ -204,7 +202,7 @@ | |||
4067 | 204 | fi | 202 | fi |
4068 | 205 | ;; | 203 | ;; |
4069 | 206 | *) | 204 | *) |
4071 | 207 | os=netbsd | 205 | os=netbsd |
4072 | 208 | ;; | 206 | ;; |
4073 | 209 | esac | 207 | esac |
4074 | 210 | # The OS release | 208 | # The OS release |
4075 | @@ -247,7 +245,7 @@ | |||
4076 | 247 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` | 245 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
4077 | 248 | ;; | 246 | ;; |
4078 | 249 | *5.*) | 247 | *5.*) |
4080 | 250 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` | 248 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
4081 | 251 | ;; | 249 | ;; |
4082 | 252 | esac | 250 | esac |
4083 | 253 | # According to Compaq, /usr/sbin/psrinfo has been available on | 251 | # According to Compaq, /usr/sbin/psrinfo has been available on |
4084 | @@ -293,7 +291,10 @@ | |||
4085 | 293 | # A Xn.n version is an unreleased experimental baselevel. | 291 | # A Xn.n version is an unreleased experimental baselevel. |
4086 | 294 | # 1.2 uses "1.2" for uname -r. | 292 | # 1.2 uses "1.2" for uname -r. |
4087 | 295 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 293 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
4089 | 296 | exit ;; | 294 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
4090 | 295 | exitcode=$? | ||
4091 | 296 | trap '' 0 | ||
4092 | 297 | exit $exitcode ;; | ||
4093 | 297 | Alpha\ *:Windows_NT*:*) | 298 | Alpha\ *:Windows_NT*:*) |
4094 | 298 | # How do we know it's Interix rather than the generic POSIX subsystem? | 299 | # How do we know it's Interix rather than the generic POSIX subsystem? |
4095 | 299 | # Should we change UNAME_MACHINE based on the output of uname instead | 300 | # Should we change UNAME_MACHINE based on the output of uname instead |
4096 | @@ -319,7 +320,7 @@ | |||
4097 | 319 | echo s390-ibm-zvmoe | 320 | echo s390-ibm-zvmoe |
4098 | 320 | exit ;; | 321 | exit ;; |
4099 | 321 | *:OS400:*:*) | 322 | *:OS400:*:*) |
4101 | 322 | echo powerpc-ibm-os400 | 323 | echo powerpc-ibm-os400 |
4102 | 323 | exit ;; | 324 | exit ;; |
4103 | 324 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | 325 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
4104 | 325 | echo arm-acorn-riscix${UNAME_RELEASE} | 326 | echo arm-acorn-riscix${UNAME_RELEASE} |
4105 | @@ -418,23 +419,23 @@ | |||
4106 | 418 | # MiNT. But MiNT is downward compatible to TOS, so this should | 419 | # MiNT. But MiNT is downward compatible to TOS, so this should |
4107 | 419 | # be no problem. | 420 | # be no problem. |
4108 | 420 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) | 421 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
4110 | 421 | echo m68k-atari-mint${UNAME_RELEASE} | 422 | echo m68k-atari-mint${UNAME_RELEASE} |
4111 | 422 | exit ;; | 423 | exit ;; |
4112 | 423 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) | 424 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
4113 | 424 | echo m68k-atari-mint${UNAME_RELEASE} | 425 | echo m68k-atari-mint${UNAME_RELEASE} |
4115 | 425 | exit ;; | 426 | exit ;; |
4116 | 426 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) | 427 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
4118 | 427 | echo m68k-atari-mint${UNAME_RELEASE} | 428 | echo m68k-atari-mint${UNAME_RELEASE} |
4119 | 428 | exit ;; | 429 | exit ;; |
4120 | 429 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) | 430 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
4123 | 430 | echo m68k-milan-mint${UNAME_RELEASE} | 431 | echo m68k-milan-mint${UNAME_RELEASE} |
4124 | 431 | exit ;; | 432 | exit ;; |
4125 | 432 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) | 433 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
4128 | 433 | echo m68k-hades-mint${UNAME_RELEASE} | 434 | echo m68k-hades-mint${UNAME_RELEASE} |
4129 | 434 | exit ;; | 435 | exit ;; |
4130 | 435 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 436 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
4133 | 436 | echo m68k-unknown-mint${UNAME_RELEASE} | 437 | echo m68k-unknown-mint${UNAME_RELEASE} |
4134 | 437 | exit ;; | 438 | exit ;; |
4135 | 438 | m68k:machten:*:*) | 439 | m68k:machten:*:*) |
4136 | 439 | echo m68k-apple-machten${UNAME_RELEASE} | 440 | echo m68k-apple-machten${UNAME_RELEASE} |
4137 | 440 | exit ;; | 441 | exit ;; |
4138 | @@ -504,8 +505,8 @@ | |||
4139 | 504 | echo m88k-motorola-sysv3 | 505 | echo m88k-motorola-sysv3 |
4140 | 505 | exit ;; | 506 | exit ;; |
4141 | 506 | AViiON:dgux:*:*) | 507 | AViiON:dgux:*:*) |
4144 | 507 | # DG/UX returns AViiON for all architectures | 508 | # DG/UX returns AViiON for all architectures |
4145 | 508 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 509 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
4146 | 509 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] | 510 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
4147 | 510 | then | 511 | then |
4148 | 511 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ | 512 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
4149 | @@ -518,7 +519,7 @@ | |||
4150 | 518 | else | 519 | else |
4151 | 519 | echo i586-dg-dgux${UNAME_RELEASE} | 520 | echo i586-dg-dgux${UNAME_RELEASE} |
4152 | 520 | fi | 521 | fi |
4154 | 521 | exit ;; | 522 | exit ;; |
4155 | 522 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) | 523 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
4156 | 523 | echo m88k-dolphin-sysv3 | 524 | echo m88k-dolphin-sysv3 |
4157 | 524 | exit ;; | 525 | exit ;; |
4158 | @@ -575,7 +576,7 @@ | |||
4159 | 575 | echo rs6000-ibm-aix3.2 | 576 | echo rs6000-ibm-aix3.2 |
4160 | 576 | fi | 577 | fi |
4161 | 577 | exit ;; | 578 | exit ;; |
4163 | 578 | *:AIX:*:[456]) | 579 | *:AIX:*:[4567]) |
4164 | 579 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 580 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
4165 | 580 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 581 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
4166 | 581 | IBM_ARCH=rs6000 | 582 | IBM_ARCH=rs6000 |
4167 | @@ -618,52 +619,52 @@ | |||
4168 | 618 | 9000/[678][0-9][0-9]) | 619 | 9000/[678][0-9][0-9]) |
4169 | 619 | if [ -x /usr/bin/getconf ]; then | 620 | if [ -x /usr/bin/getconf ]; then |
4170 | 620 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 621 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
4179 | 621 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | 622 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
4180 | 622 | case "${sc_cpu_version}" in | 623 | case "${sc_cpu_version}" in |
4181 | 623 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 | 624 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
4182 | 624 | 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 | 625 | 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
4183 | 625 | 532) # CPU_PA_RISC2_0 | 626 | 532) # CPU_PA_RISC2_0 |
4184 | 626 | case "${sc_kernel_bits}" in | 627 | case "${sc_kernel_bits}" in |
4185 | 627 | 32) HP_ARCH="hppa2.0n" ;; | 628 | 32) HP_ARCH="hppa2.0n" ;; |
4186 | 628 | 64) HP_ARCH="hppa2.0w" ;; | 629 | 64) HP_ARCH="hppa2.0w" ;; |
4187 | 629 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 | 630 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
4190 | 630 | esac ;; | 631 | esac ;; |
4191 | 631 | esac | 632 | esac |
4192 | 632 | fi | 633 | fi |
4193 | 633 | if [ "${HP_ARCH}" = "" ]; then | 634 | if [ "${HP_ARCH}" = "" ]; then |
4194 | 634 | eval $set_cc_for_build | 635 | eval $set_cc_for_build |
4227 | 635 | sed 's/^ //' << EOF >$dummy.c | 636 | sed 's/^ //' << EOF >$dummy.c |
4228 | 636 | 637 | ||
4229 | 637 | #define _HPUX_SOURCE | 638 | #define _HPUX_SOURCE |
4230 | 638 | #include <stdlib.h> | 639 | #include <stdlib.h> |
4231 | 639 | #include <unistd.h> | 640 | #include <unistd.h> |
4232 | 640 | 641 | ||
4233 | 641 | int main () | 642 | int main () |
4234 | 642 | { | 643 | { |
4235 | 643 | #if defined(_SC_KERNEL_BITS) | 644 | #if defined(_SC_KERNEL_BITS) |
4236 | 644 | long bits = sysconf(_SC_KERNEL_BITS); | 645 | long bits = sysconf(_SC_KERNEL_BITS); |
4237 | 645 | #endif | 646 | #endif |
4238 | 646 | long cpu = sysconf (_SC_CPU_VERSION); | 647 | long cpu = sysconf (_SC_CPU_VERSION); |
4239 | 647 | 648 | ||
4240 | 648 | switch (cpu) | 649 | switch (cpu) |
4241 | 649 | { | 650 | { |
4242 | 650 | case CPU_PA_RISC1_0: puts ("hppa1.0"); break; | 651 | case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
4243 | 651 | case CPU_PA_RISC1_1: puts ("hppa1.1"); break; | 652 | case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
4244 | 652 | case CPU_PA_RISC2_0: | 653 | case CPU_PA_RISC2_0: |
4245 | 653 | #if defined(_SC_KERNEL_BITS) | 654 | #if defined(_SC_KERNEL_BITS) |
4246 | 654 | switch (bits) | 655 | switch (bits) |
4247 | 655 | { | 656 | { |
4248 | 656 | case 64: puts ("hppa2.0w"); break; | 657 | case 64: puts ("hppa2.0w"); break; |
4249 | 657 | case 32: puts ("hppa2.0n"); break; | 658 | case 32: puts ("hppa2.0n"); break; |
4250 | 658 | default: puts ("hppa2.0"); break; | 659 | default: puts ("hppa2.0"); break; |
4251 | 659 | } break; | 660 | } break; |
4252 | 660 | #else /* !defined(_SC_KERNEL_BITS) */ | 661 | #else /* !defined(_SC_KERNEL_BITS) */ |
4253 | 661 | puts ("hppa2.0"); break; | 662 | puts ("hppa2.0"); break; |
4254 | 662 | #endif | 663 | #endif |
4255 | 663 | default: puts ("hppa1.0"); break; | 664 | default: puts ("hppa1.0"); break; |
4256 | 664 | } | 665 | } |
4257 | 665 | exit (0); | 666 | exit (0); |
4258 | 666 | } | 667 | } |
4259 | 667 | EOF | 668 | EOF |
4260 | 668 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | 669 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
4261 | 669 | test -z "$HP_ARCH" && HP_ARCH=hppa | 670 | test -z "$HP_ARCH" && HP_ARCH=hppa |
4262 | @@ -754,22 +755,22 @@ | |||
4263 | 754 | exit ;; | 755 | exit ;; |
4264 | 755 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) | 756 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
4265 | 756 | echo c1-convex-bsd | 757 | echo c1-convex-bsd |
4267 | 757 | exit ;; | 758 | exit ;; |
4268 | 758 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) | 759 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
4269 | 759 | if getsysinfo -f scalar_acc | 760 | if getsysinfo -f scalar_acc |
4270 | 760 | then echo c32-convex-bsd | 761 | then echo c32-convex-bsd |
4271 | 761 | else echo c2-convex-bsd | 762 | else echo c2-convex-bsd |
4272 | 762 | fi | 763 | fi |
4274 | 763 | exit ;; | 764 | exit ;; |
4275 | 764 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) | 765 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
4276 | 765 | echo c34-convex-bsd | 766 | echo c34-convex-bsd |
4278 | 766 | exit ;; | 767 | exit ;; |
4279 | 767 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) | 768 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
4280 | 768 | echo c38-convex-bsd | 769 | echo c38-convex-bsd |
4282 | 769 | exit ;; | 770 | exit ;; |
4283 | 770 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) | 771 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
4284 | 771 | echo c4-convex-bsd | 772 | echo c4-convex-bsd |
4286 | 772 | exit ;; | 773 | exit ;; |
4287 | 773 | CRAY*Y-MP:*:*:*) | 774 | CRAY*Y-MP:*:*:*) |
4288 | 774 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 775 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
4289 | 775 | exit ;; | 776 | exit ;; |
4290 | @@ -793,14 +794,14 @@ | |||
4291 | 793 | exit ;; | 794 | exit ;; |
4292 | 794 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | 795 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
4293 | 795 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 796 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
4298 | 796 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | 797 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4299 | 797 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | 798 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
4300 | 798 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 799 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4301 | 799 | exit ;; | 800 | exit ;; |
4302 | 800 | 5000:UNIX_System_V:4.*:*) | 801 | 5000:UNIX_System_V:4.*:*) |
4306 | 801 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | 802 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4307 | 802 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` | 803 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
4308 | 803 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 804 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4309 | 804 | exit ;; | 805 | exit ;; |
4310 | 805 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | 806 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
4311 | 806 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | 807 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
4312 | @@ -812,13 +813,12 @@ | |||
4313 | 812 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | 813 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
4314 | 813 | exit ;; | 814 | exit ;; |
4315 | 814 | *:FreeBSD:*:*) | 815 | *:FreeBSD:*:*) |
4319 | 815 | case ${UNAME_MACHINE} in | 816 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
4320 | 816 | pc98) | 817 | case ${UNAME_PROCESSOR} in |
4318 | 817 | echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
4321 | 818 | amd64) | 818 | amd64) |
4322 | 819 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | 819 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4323 | 820 | *) | 820 | *) |
4325 | 821 | echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | 821 | echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
4326 | 822 | esac | 822 | esac |
4327 | 823 | exit ;; | 823 | exit ;; |
4328 | 824 | i*:CYGWIN*:*) | 824 | i*:CYGWIN*:*) |
4329 | @@ -827,15 +827,18 @@ | |||
4330 | 827 | *:MINGW*:*) | 827 | *:MINGW*:*) |
4331 | 828 | echo ${UNAME_MACHINE}-pc-mingw32 | 828 | echo ${UNAME_MACHINE}-pc-mingw32 |
4332 | 829 | exit ;; | 829 | exit ;; |
4333 | 830 | i*:MSYS*:*) | ||
4334 | 831 | echo ${UNAME_MACHINE}-pc-msys | ||
4335 | 832 | exit ;; | ||
4336 | 830 | i*:windows32*:*) | 833 | i*:windows32*:*) |
4339 | 831 | # uname -m includes "-pc" on this system. | 834 | # uname -m includes "-pc" on this system. |
4340 | 832 | echo ${UNAME_MACHINE}-mingw32 | 835 | echo ${UNAME_MACHINE}-mingw32 |
4341 | 833 | exit ;; | 836 | exit ;; |
4342 | 834 | i*:PW*:*) | 837 | i*:PW*:*) |
4343 | 835 | echo ${UNAME_MACHINE}-pc-pw32 | 838 | echo ${UNAME_MACHINE}-pc-pw32 |
4344 | 836 | exit ;; | 839 | exit ;; |
4345 | 837 | *:Interix*:*) | 840 | *:Interix*:*) |
4347 | 838 | case ${UNAME_MACHINE} in | 841 | case ${UNAME_MACHINE} in |
4348 | 839 | x86) | 842 | x86) |
4349 | 840 | echo i586-pc-interix${UNAME_RELEASE} | 843 | echo i586-pc-interix${UNAME_RELEASE} |
4350 | 841 | exit ;; | 844 | exit ;; |
4351 | @@ -881,6 +884,13 @@ | |||
4352 | 881 | i*86:Minix:*:*) | 884 | i*86:Minix:*:*) |
4353 | 882 | echo ${UNAME_MACHINE}-pc-minix | 885 | echo ${UNAME_MACHINE}-pc-minix |
4354 | 883 | exit ;; | 886 | exit ;; |
4355 | 887 | aarch64:Linux:*:*) | ||
4356 | 888 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
4357 | 889 | exit ;; | ||
4358 | 890 | aarch64_be:Linux:*:*) | ||
4359 | 891 | UNAME_MACHINE=aarch64_be | ||
4360 | 892 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
4361 | 893 | exit ;; | ||
4362 | 884 | alpha:Linux:*:*) | 894 | alpha:Linux:*:*) |
4363 | 885 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 895 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
4364 | 886 | EV5) UNAME_MACHINE=alphaev5 ;; | 896 | EV5) UNAME_MACHINE=alphaev5 ;; |
4365 | @@ -890,7 +900,7 @@ | |||
4366 | 890 | EV6) UNAME_MACHINE=alphaev6 ;; | 900 | EV6) UNAME_MACHINE=alphaev6 ;; |
4367 | 891 | EV67) UNAME_MACHINE=alphaev67 ;; | 901 | EV67) UNAME_MACHINE=alphaev67 ;; |
4368 | 892 | EV68*) UNAME_MACHINE=alphaev68 ;; | 902 | EV68*) UNAME_MACHINE=alphaev68 ;; |
4370 | 893 | esac | 903 | esac |
4371 | 894 | objdump --private-headers /bin/sh | grep -q ld.so.1 | 904 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
4372 | 895 | if test "$?" = 0 ; then LIBC="gnulibc1" ; fi | 905 | if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
4373 | 896 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 906 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4374 | @@ -902,20 +912,29 @@ | |||
4375 | 902 | then | 912 | then |
4376 | 903 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 913 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4377 | 904 | else | 914 | else |
4379 | 905 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi | 915 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
4380 | 916 | | grep -q __ARM_PCS_VFP | ||
4381 | 917 | then | ||
4382 | 918 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi | ||
4383 | 919 | else | ||
4384 | 920 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf | ||
4385 | 921 | fi | ||
4386 | 906 | fi | 922 | fi |
4387 | 907 | exit ;; | 923 | exit ;; |
4388 | 908 | avr32*:Linux:*:*) | 924 | avr32*:Linux:*:*) |
4389 | 909 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 925 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4390 | 910 | exit ;; | 926 | exit ;; |
4391 | 911 | cris:Linux:*:*) | 927 | cris:Linux:*:*) |
4393 | 912 | echo cris-axis-linux-${LIBC} | 928 | echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
4394 | 913 | exit ;; | 929 | exit ;; |
4395 | 914 | crisv32:Linux:*:*) | 930 | crisv32:Linux:*:*) |
4397 | 915 | echo crisv32-axis-linux-${LIBC} | 931 | echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
4398 | 916 | exit ;; | 932 | exit ;; |
4399 | 917 | frv:Linux:*:*) | 933 | frv:Linux:*:*) |
4401 | 918 | echo frv-unknown-linux-${LIBC} | 934 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4402 | 935 | exit ;; | ||
4403 | 936 | hexagon:Linux:*:*) | ||
4404 | 937 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
4405 | 919 | exit ;; | 938 | exit ;; |
4406 | 920 | i*86:Linux:*:*) | 939 | i*86:Linux:*:*) |
4407 | 921 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} | 940 | echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
4408 | @@ -949,7 +968,7 @@ | |||
4409 | 949 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | 968 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
4410 | 950 | ;; | 969 | ;; |
4411 | 951 | or32:Linux:*:*) | 970 | or32:Linux:*:*) |
4413 | 952 | echo or32-unknown-linux-${LIBC} | 971 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4414 | 953 | exit ;; | 972 | exit ;; |
4415 | 954 | padre:Linux:*:*) | 973 | padre:Linux:*:*) |
4416 | 955 | echo sparc-unknown-linux-${LIBC} | 974 | echo sparc-unknown-linux-${LIBC} |
4417 | @@ -975,7 +994,7 @@ | |||
4418 | 975 | echo ${UNAME_MACHINE}-ibm-linux | 994 | echo ${UNAME_MACHINE}-ibm-linux |
4419 | 976 | exit ;; | 995 | exit ;; |
4420 | 977 | sh64*:Linux:*:*) | 996 | sh64*:Linux:*:*) |
4422 | 978 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 997 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4423 | 979 | exit ;; | 998 | exit ;; |
4424 | 980 | sh*:Linux:*:*) | 999 | sh*:Linux:*:*) |
4425 | 981 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1000 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4426 | @@ -983,14 +1002,17 @@ | |||
4427 | 983 | sparc:Linux:*:* | sparc64:Linux:*:*) | 1002 | sparc:Linux:*:* | sparc64:Linux:*:*) |
4428 | 984 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1003 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4429 | 985 | exit ;; | 1004 | exit ;; |
4430 | 1005 | tile*:Linux:*:*) | ||
4431 | 1006 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
4432 | 1007 | exit ;; | ||
4433 | 986 | vax:Linux:*:*) | 1008 | vax:Linux:*:*) |
4434 | 987 | echo ${UNAME_MACHINE}-dec-linux-${LIBC} | 1009 | echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
4435 | 988 | exit ;; | 1010 | exit ;; |
4436 | 989 | x86_64:Linux:*:*) | 1011 | x86_64:Linux:*:*) |
4438 | 990 | echo x86_64-unknown-linux-${LIBC} | 1012 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4439 | 991 | exit ;; | 1013 | exit ;; |
4440 | 992 | xtensa*:Linux:*:*) | 1014 | xtensa*:Linux:*:*) |
4442 | 993 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | 1015 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
4443 | 994 | exit ;; | 1016 | exit ;; |
4444 | 995 | i*86:DYNIX/ptx:4*:*) | 1017 | i*86:DYNIX/ptx:4*:*) |
4445 | 996 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 1018 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
4446 | @@ -999,11 +1021,11 @@ | |||
4447 | 999 | echo i386-sequent-sysv4 | 1021 | echo i386-sequent-sysv4 |
4448 | 1000 | exit ;; | 1022 | exit ;; |
4449 | 1001 | i*86:UNIX_SV:4.2MP:2.*) | 1023 | i*86:UNIX_SV:4.2MP:2.*) |
4453 | 1002 | # Unixware is an offshoot of SVR4, but it has its own version | 1024 | # Unixware is an offshoot of SVR4, but it has its own version |
4454 | 1003 | # number series starting with 2... | 1025 | # number series starting with 2... |
4455 | 1004 | # I am not positive that other SVR4 systems won't match this, | 1026 | # I am not positive that other SVR4 systems won't match this, |
4456 | 1005 | # I just have to hope. -- rms. | 1027 | # I just have to hope. -- rms. |
4458 | 1006 | # Use sysv4.2uw... so that sysv4* matches it. | 1028 | # Use sysv4.2uw... so that sysv4* matches it. |
4459 | 1007 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | 1029 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
4460 | 1008 | exit ;; | 1030 | exit ;; |
4461 | 1009 | i*86:OS/2:*:*) | 1031 | i*86:OS/2:*:*) |
4462 | @@ -1035,7 +1057,7 @@ | |||
4463 | 1035 | fi | 1057 | fi |
4464 | 1036 | exit ;; | 1058 | exit ;; |
4465 | 1037 | i*86:*:5:[678]*) | 1059 | i*86:*:5:[678]*) |
4467 | 1038 | # UnixWare 7.x, OpenUNIX and OpenServer 6. | 1060 | # UnixWare 7.x, OpenUNIX and OpenServer 6. |
4468 | 1039 | case `/bin/uname -X | grep "^Machine"` in | 1061 | case `/bin/uname -X | grep "^Machine"` in |
4469 | 1040 | *486*) UNAME_MACHINE=i486 ;; | 1062 | *486*) UNAME_MACHINE=i486 ;; |
4470 | 1041 | *Pentium) UNAME_MACHINE=i586 ;; | 1063 | *Pentium) UNAME_MACHINE=i586 ;; |
4471 | @@ -1063,13 +1085,13 @@ | |||
4472 | 1063 | exit ;; | 1085 | exit ;; |
4473 | 1064 | pc:*:*:*) | 1086 | pc:*:*:*) |
4474 | 1065 | # Left here for compatibility: | 1087 | # Left here for compatibility: |
4477 | 1066 | # uname -m prints for DJGPP always 'pc', but it prints nothing about | 1088 | # uname -m prints for DJGPP always 'pc', but it prints nothing about |
4478 | 1067 | # the processor, so we play safe by assuming i586. | 1089 | # the processor, so we play safe by assuming i586. |
4479 | 1068 | # Note: whatever this is, it MUST be the same as what config.sub | 1090 | # Note: whatever this is, it MUST be the same as what config.sub |
4480 | 1069 | # prints for the "djgpp" host, or else GDB configury will decide that | 1091 | # prints for the "djgpp" host, or else GDB configury will decide that |
4481 | 1070 | # this is a cross-build. | 1092 | # this is a cross-build. |
4482 | 1071 | echo i586-pc-msdosdjgpp | 1093 | echo i586-pc-msdosdjgpp |
4484 | 1072 | exit ;; | 1094 | exit ;; |
4485 | 1073 | Intel:Mach:3*:*) | 1095 | Intel:Mach:3*:*) |
4486 | 1074 | echo i386-pc-mach3 | 1096 | echo i386-pc-mach3 |
4487 | 1075 | exit ;; | 1097 | exit ;; |
4488 | @@ -1104,8 +1126,8 @@ | |||
4489 | 1104 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1126 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
4490 | 1105 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1127 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
4491 | 1106 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1128 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
4494 | 1107 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1129 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
4495 | 1108 | && { echo i486-ncr-sysv4; exit; } ;; | 1130 | && { echo i486-ncr-sysv4; exit; } ;; |
4496 | 1109 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) | 1131 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
4497 | 1110 | OS_REL='.3' | 1132 | OS_REL='.3' |
4498 | 1111 | test -r /etc/.relid \ | 1133 | test -r /etc/.relid \ |
4499 | @@ -1148,10 +1170,10 @@ | |||
4500 | 1148 | echo ns32k-sni-sysv | 1170 | echo ns32k-sni-sysv |
4501 | 1149 | fi | 1171 | fi |
4502 | 1150 | exit ;; | 1172 | exit ;; |
4507 | 1151 | PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort | 1173 | PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
4508 | 1152 | # says <Richard.M.Bartel@ccMail.Census.GOV> | 1174 | # says <Richard.M.Bartel@ccMail.Census.GOV> |
4509 | 1153 | echo i586-unisys-sysv4 | 1175 | echo i586-unisys-sysv4 |
4510 | 1154 | exit ;; | 1176 | exit ;; |
4511 | 1155 | *:UNIX_System_V:4*:FTX*) | 1177 | *:UNIX_System_V:4*:FTX*) |
4512 | 1156 | # From Gerald Hewes <hewes@openmarket.com>. | 1178 | # From Gerald Hewes <hewes@openmarket.com>. |
4513 | 1157 | # How about differentiating between stratus architectures? -djm | 1179 | # How about differentiating between stratus architectures? -djm |
4514 | @@ -1177,11 +1199,11 @@ | |||
4515 | 1177 | exit ;; | 1199 | exit ;; |
4516 | 1178 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) | 1200 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
4517 | 1179 | if [ -d /usr/nec ]; then | 1201 | if [ -d /usr/nec ]; then |
4519 | 1180 | echo mips-nec-sysv${UNAME_RELEASE} | 1202 | echo mips-nec-sysv${UNAME_RELEASE} |
4520 | 1181 | else | 1203 | else |
4522 | 1182 | echo mips-unknown-sysv${UNAME_RELEASE} | 1204 | echo mips-unknown-sysv${UNAME_RELEASE} |
4523 | 1183 | fi | 1205 | fi |
4525 | 1184 | exit ;; | 1206 | exit ;; |
4526 | 1185 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. | 1207 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
4527 | 1186 | echo powerpc-be-beos | 1208 | echo powerpc-be-beos |
4528 | 1187 | exit ;; | 1209 | exit ;; |
4529 | @@ -1246,6 +1268,9 @@ | |||
4530 | 1246 | *:QNX:*:4*) | 1268 | *:QNX:*:4*) |
4531 | 1247 | echo i386-pc-qnx | 1269 | echo i386-pc-qnx |
4532 | 1248 | exit ;; | 1270 | exit ;; |
4533 | 1271 | NEO-?:NONSTOP_KERNEL:*:*) | ||
4534 | 1272 | echo neo-tandem-nsk${UNAME_RELEASE} | ||
4535 | 1273 | exit ;; | ||
4536 | 1249 | NSE-?:NONSTOP_KERNEL:*:*) | 1274 | NSE-?:NONSTOP_KERNEL:*:*) |
4537 | 1250 | echo nse-tandem-nsk${UNAME_RELEASE} | 1275 | echo nse-tandem-nsk${UNAME_RELEASE} |
4538 | 1251 | exit ;; | 1276 | exit ;; |
4539 | @@ -1291,13 +1316,13 @@ | |||
4540 | 1291 | echo pdp10-unknown-its | 1316 | echo pdp10-unknown-its |
4541 | 1292 | exit ;; | 1317 | exit ;; |
4542 | 1293 | SEI:*:*:SEIUX) | 1318 | SEI:*:*:SEIUX) |
4544 | 1294 | echo mips-sei-seiux${UNAME_RELEASE} | 1319 | echo mips-sei-seiux${UNAME_RELEASE} |
4545 | 1295 | exit ;; | 1320 | exit ;; |
4546 | 1296 | *:DragonFly:*:*) | 1321 | *:DragonFly:*:*) |
4547 | 1297 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 1322 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
4548 | 1298 | exit ;; | 1323 | exit ;; |
4549 | 1299 | *:*VMS:*:*) | 1324 | *:*VMS:*:*) |
4551 | 1300 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1325 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
4552 | 1301 | case "${UNAME_MACHINE}" in | 1326 | case "${UNAME_MACHINE}" in |
4553 | 1302 | A*) echo alpha-dec-vms ; exit ;; | 1327 | A*) echo alpha-dec-vms ; exit ;; |
4554 | 1303 | I*) echo ia64-dec-vms ; exit ;; | 1328 | I*) echo ia64-dec-vms ; exit ;; |
4555 | @@ -1315,6 +1340,9 @@ | |||
4556 | 1315 | i*86:AROS:*:*) | 1340 | i*86:AROS:*:*) |
4557 | 1316 | echo ${UNAME_MACHINE}-pc-aros | 1341 | echo ${UNAME_MACHINE}-pc-aros |
4558 | 1317 | exit ;; | 1342 | exit ;; |
4559 | 1343 | x86_64:VMkernel:*:*) | ||
4560 | 1344 | echo ${UNAME_MACHINE}-unknown-esx | ||
4561 | 1345 | exit ;; | ||
4562 | 1318 | esac | 1346 | esac |
4563 | 1319 | 1347 | ||
4564 | 1320 | #echo '(No uname command or uname output not recognized.)' 1>&2 | 1348 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
4565 | @@ -1337,11 +1365,11 @@ | |||
4566 | 1337 | #include <sys/param.h> | 1365 | #include <sys/param.h> |
4567 | 1338 | printf ("m68k-sony-newsos%s\n", | 1366 | printf ("m68k-sony-newsos%s\n", |
4568 | 1339 | #ifdef NEWSOS4 | 1367 | #ifdef NEWSOS4 |
4570 | 1340 | "4" | 1368 | "4" |
4571 | 1341 | #else | 1369 | #else |
4573 | 1342 | "" | 1370 | "" |
4574 | 1343 | #endif | 1371 | #endif |
4576 | 1344 | ); exit (0); | 1372 | ); exit (0); |
4577 | 1345 | #endif | 1373 | #endif |
4578 | 1346 | #endif | 1374 | #endif |
4579 | 1347 | 1375 | ||
4580 | 1348 | 1376 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
4586 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
4587 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4590 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
4591 | 5 | # Free Software Foundation, Inc. | 5 | # 2011, 2012 Free Software Foundation, Inc. |
4592 | 6 | 6 | ||
4594 | 7 | timestamp='2010-01-22' | 7 | timestamp='2012-02-10' |
4595 | 8 | 8 | ||
4596 | 9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
4597 | 10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
4598 | @@ -21,9 +21,7 @@ | |||
4599 | 21 | # GNU General Public License for more details. | 21 | # GNU General Public License for more details. |
4600 | 22 | # | 22 | # |
4601 | 23 | # You should have received a copy of the GNU General Public License | 23 | # You should have received a copy of the GNU General Public License |
4605 | 24 | # along with this program; if not, write to the Free Software | 24 | # along with this program; if not, see <http://www.gnu.org/licenses/>. |
4603 | 25 | # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA | ||
4604 | 26 | # 02110-1301, USA. | ||
4606 | 27 | # | 25 | # |
4607 | 28 | # As a special exception to the GNU General Public License, if you | 26 | # As a special exception to the GNU General Public License, if you |
4608 | 29 | # distribute this file as part of a program that contains a | 27 | # distribute this file as part of a program that contains a |
4609 | @@ -76,8 +74,8 @@ | |||
4610 | 76 | GNU config.sub ($timestamp) | 74 | GNU config.sub ($timestamp) |
4611 | 77 | 75 | ||
4612 | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 76 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
4615 | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 77 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
4616 | 80 | Software Foundation, Inc. | 78 | Free Software Foundation, Inc. |
4617 | 81 | 79 | ||
4618 | 82 | This is free software; see the source for copying conditions. There is NO | 80 | This is free software; see the source for copying conditions. There is NO |
4619 | 83 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 81 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4620 | @@ -124,13 +122,18 @@ | |||
4621 | 124 | # Here we must recognize all the valid KERNEL-OS combinations. | 122 | # Here we must recognize all the valid KERNEL-OS combinations. |
4622 | 125 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 123 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
4623 | 126 | case $maybe_os in | 124 | case $maybe_os in |
4626 | 127 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ | 125 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
4627 | 128 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ | 126 | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
4628 | 127 | knetbsd*-gnu* | netbsd*-gnu* | \ | ||
4629 | 129 | kopensolaris*-gnu* | \ | 128 | kopensolaris*-gnu* | \ |
4630 | 130 | storm-chaos* | os2-emx* | rtmk-nova*) | 129 | storm-chaos* | os2-emx* | rtmk-nova*) |
4631 | 131 | os=-$maybe_os | 130 | os=-$maybe_os |
4632 | 132 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 131 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
4633 | 133 | ;; | 132 | ;; |
4634 | 133 | android-linux) | ||
4635 | 134 | os=-linux-android | ||
4636 | 135 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | ||
4637 | 136 | ;; | ||
4638 | 134 | *) | 137 | *) |
4639 | 135 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` | 138 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
4640 | 136 | if [ $basic_machine != $1 ] | 139 | if [ $basic_machine != $1 ] |
4641 | @@ -157,8 +160,8 @@ | |||
4642 | 157 | os= | 160 | os= |
4643 | 158 | basic_machine=$1 | 161 | basic_machine=$1 |
4644 | 159 | ;; | 162 | ;; |
4647 | 160 | -bluegene*) | 163 | -bluegene*) |
4648 | 161 | os=-cnk | 164 | os=-cnk |
4649 | 162 | ;; | 165 | ;; |
4650 | 163 | -sim | -cisco | -oki | -wec | -winbond) | 166 | -sim | -cisco | -oki | -wec | -winbond) |
4651 | 164 | os= | 167 | os= |
4652 | @@ -174,10 +177,10 @@ | |||
4653 | 174 | os=-chorusos | 177 | os=-chorusos |
4654 | 175 | basic_machine=$1 | 178 | basic_machine=$1 |
4655 | 176 | ;; | 179 | ;; |
4658 | 177 | -chorusrdb) | 180 | -chorusrdb) |
4659 | 178 | os=-chorusrdb | 181 | os=-chorusrdb |
4660 | 179 | basic_machine=$1 | 182 | basic_machine=$1 |
4662 | 180 | ;; | 183 | ;; |
4663 | 181 | -hiux*) | 184 | -hiux*) |
4664 | 182 | os=-hiuxwe2 | 185 | os=-hiuxwe2 |
4665 | 183 | ;; | 186 | ;; |
4666 | @@ -246,17 +249,22 @@ | |||
4667 | 246 | # Some are omitted here because they have special meanings below. | 249 | # Some are omitted here because they have special meanings below. |
4668 | 247 | 1750a | 580 \ | 250 | 1750a | 580 \ |
4669 | 248 | | a29k \ | 251 | | a29k \ |
4670 | 252 | | aarch64 | aarch64_be \ | ||
4671 | 249 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | 253 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
4672 | 250 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | 254 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
4673 | 251 | | am33_2.0 \ | 255 | | am33_2.0 \ |
4674 | 252 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | 256 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
4675 | 257 | | be32 | be64 \ | ||
4676 | 253 | | bfin \ | 258 | | bfin \ |
4677 | 254 | | c4x | clipper \ | 259 | | c4x | clipper \ |
4678 | 255 | | d10v | d30v | dlx | dsp16xx | dvp \ | 260 | | d10v | d30v | dlx | dsp16xx | dvp \ |
4679 | 261 | | epiphany \ | ||
4680 | 256 | | fido | fr30 | frv \ | 262 | | fido | fr30 | frv \ |
4681 | 257 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | 263 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
4682 | 264 | | hexagon \ | ||
4683 | 258 | | i370 | i860 | i960 | ia64 \ | 265 | | i370 | i860 | i960 | ia64 \ |
4684 | 259 | | ip2k | iq2000 \ | 266 | | ip2k | iq2000 \ |
4685 | 267 | | le32 | le64 \ | ||
4686 | 260 | | lm32 \ | 268 | | lm32 \ |
4687 | 261 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | 269 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
4688 | 262 | | maxq | mb | microblaze | mcore | mep | metag \ | 270 | | maxq | mb | microblaze | mcore | mep | metag \ |
4689 | @@ -282,29 +290,39 @@ | |||
4690 | 282 | | moxie \ | 290 | | moxie \ |
4691 | 283 | | mt \ | 291 | | mt \ |
4692 | 284 | | msp430 \ | 292 | | msp430 \ |
4693 | 293 | | nds32 | nds32le | nds32be \ | ||
4694 | 285 | | nios | nios2 \ | 294 | | nios | nios2 \ |
4695 | 286 | | ns16k | ns32k \ | 295 | | ns16k | ns32k \ |
4696 | 296 | | open8 \ | ||
4697 | 287 | | or32 \ | 297 | | or32 \ |
4698 | 288 | | pdp10 | pdp11 | pj | pjl \ | 298 | | pdp10 | pdp11 | pj | pjl \ |
4700 | 289 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 299 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4701 | 290 | | pyramid \ | 300 | | pyramid \ |
4703 | 291 | | rx \ | 301 | | rl78 | rx \ |
4704 | 292 | | score \ | 302 | | score \ |
4705 | 293 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 303 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
4706 | 294 | | sh64 | sh64le \ | 304 | | sh64 | sh64le \ |
4707 | 295 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 305 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
4708 | 296 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 306 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
4711 | 297 | | spu | strongarm \ | 307 | | spu \ |
4712 | 298 | | tahoe | thumb | tic4x | tic80 | tron \ | 308 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
4713 | 299 | | ubicom32 \ | 309 | | ubicom32 \ |
4715 | 300 | | v850 | v850e \ | 310 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
4716 | 301 | | we32k \ | 311 | | we32k \ |
4718 | 302 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | 312 | | x86 | xc16x | xstormy16 | xtensa \ |
4719 | 303 | | z8k | z80) | 313 | | z8k | z80) |
4720 | 304 | basic_machine=$basic_machine-unknown | 314 | basic_machine=$basic_machine-unknown |
4721 | 305 | ;; | 315 | ;; |
4724 | 306 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) | 316 | c54x) |
4725 | 307 | # Motorola 68HC11/12. | 317 | basic_machine=tic54x-unknown |
4726 | 318 | ;; | ||
4727 | 319 | c55x) | ||
4728 | 320 | basic_machine=tic55x-unknown | ||
4729 | 321 | ;; | ||
4730 | 322 | c6x) | ||
4731 | 323 | basic_machine=tic6x-unknown | ||
4732 | 324 | ;; | ||
4733 | 325 | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) | ||
4734 | 308 | basic_machine=$basic_machine-unknown | 326 | basic_machine=$basic_machine-unknown |
4735 | 309 | os=-none | 327 | os=-none |
4736 | 310 | ;; | 328 | ;; |
4737 | @@ -314,6 +332,21 @@ | |||
4738 | 314 | basic_machine=mt-unknown | 332 | basic_machine=mt-unknown |
4739 | 315 | ;; | 333 | ;; |
4740 | 316 | 334 | ||
4741 | 335 | strongarm | thumb | xscale) | ||
4742 | 336 | basic_machine=arm-unknown | ||
4743 | 337 | ;; | ||
4744 | 338 | xgate) | ||
4745 | 339 | basic_machine=$basic_machine-unknown | ||
4746 | 340 | os=-none | ||
4747 | 341 | ;; | ||
4748 | 342 | xscaleeb) | ||
4749 | 343 | basic_machine=armeb-unknown | ||
4750 | 344 | ;; | ||
4751 | 345 | |||
4752 | 346 | xscaleel) | ||
4753 | 347 | basic_machine=armel-unknown | ||
4754 | 348 | ;; | ||
4755 | 349 | |||
4756 | 317 | # We use `pc' rather than `unknown' | 350 | # We use `pc' rather than `unknown' |
4757 | 318 | # because (1) that's what they normally are, and | 351 | # because (1) that's what they normally are, and |
4758 | 319 | # (2) the word "unknown" tends to confuse beginning users. | 352 | # (2) the word "unknown" tends to confuse beginning users. |
4759 | @@ -328,21 +361,25 @@ | |||
4760 | 328 | # Recognize the basic CPU types with company name. | 361 | # Recognize the basic CPU types with company name. |
4761 | 329 | 580-* \ | 362 | 580-* \ |
4762 | 330 | | a29k-* \ | 363 | | a29k-* \ |
4763 | 364 | | aarch64-* | aarch64_be-* \ | ||
4764 | 331 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | 365 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
4765 | 332 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | 366 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
4766 | 333 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | 367 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
4767 | 334 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | 368 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
4768 | 335 | | avr-* | avr32-* \ | 369 | | avr-* | avr32-* \ |
4769 | 370 | | be32-* | be64-* \ | ||
4770 | 336 | | bfin-* | bs2000-* \ | 371 | | bfin-* | bs2000-* \ |
4772 | 337 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | 372 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
4773 | 338 | | clipper-* | craynv-* | cydra-* \ | 373 | | clipper-* | craynv-* | cydra-* \ |
4774 | 339 | | d10v-* | d30v-* | dlx-* \ | 374 | | d10v-* | d30v-* | dlx-* \ |
4775 | 340 | | elxsi-* \ | 375 | | elxsi-* \ |
4776 | 341 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | 376 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
4777 | 342 | | h8300-* | h8500-* \ | 377 | | h8300-* | h8500-* \ |
4778 | 343 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | 378 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
4779 | 379 | | hexagon-* \ | ||
4780 | 344 | | i*86-* | i860-* | i960-* | ia64-* \ | 380 | | i*86-* | i860-* | i960-* | ia64-* \ |
4781 | 345 | | ip2k-* | iq2000-* \ | 381 | | ip2k-* | iq2000-* \ |
4782 | 382 | | le32-* | le64-* \ | ||
4783 | 346 | | lm32-* \ | 383 | | lm32-* \ |
4784 | 347 | | m32c-* | m32r-* | m32rle-* \ | 384 | | m32c-* | m32r-* | m32rle-* \ |
4785 | 348 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | 385 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
4786 | @@ -368,26 +405,29 @@ | |||
4787 | 368 | | mmix-* \ | 405 | | mmix-* \ |
4788 | 369 | | mt-* \ | 406 | | mt-* \ |
4789 | 370 | | msp430-* \ | 407 | | msp430-* \ |
4790 | 408 | | nds32-* | nds32le-* | nds32be-* \ | ||
4791 | 371 | | nios-* | nios2-* \ | 409 | | nios-* | nios2-* \ |
4792 | 372 | | none-* | np1-* | ns16k-* | ns32k-* \ | 410 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4793 | 411 | | open8-* \ | ||
4794 | 373 | | orion-* \ | 412 | | orion-* \ |
4795 | 374 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 413 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
4797 | 375 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 414 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
4798 | 376 | | pyramid-* \ | 415 | | pyramid-* \ |
4800 | 377 | | romp-* | rs6000-* | rx-* \ | 416 | | rl78-* | romp-* | rs6000-* | rx-* \ |
4801 | 378 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 417 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
4802 | 379 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 418 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
4803 | 380 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 419 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
4804 | 381 | | sparclite-* \ | 420 | | sparclite-* \ |
4807 | 382 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 421 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
4808 | 383 | | tahoe-* | thumb-* \ | 422 | | tahoe-* \ |
4809 | 384 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | 423 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
4811 | 385 | | tile-* | tilegx-* \ | 424 | | tile*-* \ |
4812 | 386 | | tron-* \ | 425 | | tron-* \ |
4813 | 387 | | ubicom32-* \ | 426 | | ubicom32-* \ |
4815 | 388 | | v850-* | v850e-* | vax-* \ | 427 | | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
4816 | 428 | | vax-* \ | ||
4817 | 389 | | we32k-* \ | 429 | | we32k-* \ |
4819 | 390 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | 430 | | x86-* | x86_64-* | xc16x-* | xps100-* \ |
4820 | 391 | | xstormy16-* | xtensa*-* \ | 431 | | xstormy16-* | xtensa*-* \ |
4821 | 392 | | ymp-* \ | 432 | | ymp-* \ |
4822 | 393 | | z8k-* | z80-*) | 433 | | z8k-* | z80-*) |
4823 | @@ -412,7 +452,7 @@ | |||
4824 | 412 | basic_machine=a29k-amd | 452 | basic_machine=a29k-amd |
4825 | 413 | os=-udi | 453 | os=-udi |
4826 | 414 | ;; | 454 | ;; |
4828 | 415 | abacus) | 455 | abacus) |
4829 | 416 | basic_machine=abacus-unknown | 456 | basic_machine=abacus-unknown |
4830 | 417 | ;; | 457 | ;; |
4831 | 418 | adobe68k) | 458 | adobe68k) |
4832 | @@ -482,11 +522,20 @@ | |||
4833 | 482 | basic_machine=powerpc-ibm | 522 | basic_machine=powerpc-ibm |
4834 | 483 | os=-cnk | 523 | os=-cnk |
4835 | 484 | ;; | 524 | ;; |
4836 | 525 | c54x-*) | ||
4837 | 526 | basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4838 | 527 | ;; | ||
4839 | 528 | c55x-*) | ||
4840 | 529 | basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4841 | 530 | ;; | ||
4842 | 531 | c6x-*) | ||
4843 | 532 | basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4844 | 533 | ;; | ||
4845 | 485 | c90) | 534 | c90) |
4846 | 486 | basic_machine=c90-cray | 535 | basic_machine=c90-cray |
4847 | 487 | os=-unicos | 536 | os=-unicos |
4848 | 488 | ;; | 537 | ;; |
4850 | 489 | cegcc) | 538 | cegcc) |
4851 | 490 | basic_machine=arm-unknown | 539 | basic_machine=arm-unknown |
4852 | 491 | os=-cegcc | 540 | os=-cegcc |
4853 | 492 | ;; | 541 | ;; |
4854 | @@ -518,7 +567,7 @@ | |||
4855 | 518 | basic_machine=craynv-cray | 567 | basic_machine=craynv-cray |
4856 | 519 | os=-unicosmp | 568 | os=-unicosmp |
4857 | 520 | ;; | 569 | ;; |
4859 | 521 | cr16) | 570 | cr16 | cr16-*) |
4860 | 522 | basic_machine=cr16-unknown | 571 | basic_machine=cr16-unknown |
4861 | 523 | os=-elf | 572 | os=-elf |
4862 | 524 | ;; | 573 | ;; |
4863 | @@ -676,7 +725,6 @@ | |||
4864 | 676 | i370-ibm* | ibm*) | 725 | i370-ibm* | ibm*) |
4865 | 677 | basic_machine=i370-ibm | 726 | basic_machine=i370-ibm |
4866 | 678 | ;; | 727 | ;; |
4867 | 679 | # I'm not sure what "Sysv32" means. Should this be sysv3.2? | ||
4868 | 680 | i*86v32) | 728 | i*86v32) |
4869 | 681 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 729 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
4870 | 682 | os=-sysv32 | 730 | os=-sysv32 |
4871 | @@ -734,7 +782,7 @@ | |||
4872 | 734 | basic_machine=ns32k-utek | 782 | basic_machine=ns32k-utek |
4873 | 735 | os=-sysv | 783 | os=-sysv |
4874 | 736 | ;; | 784 | ;; |
4876 | 737 | microblaze) | 785 | microblaze) |
4877 | 738 | basic_machine=microblaze-xilinx | 786 | basic_machine=microblaze-xilinx |
4878 | 739 | ;; | 787 | ;; |
4879 | 740 | mingw32) | 788 | mingw32) |
4880 | @@ -791,10 +839,18 @@ | |||
4881 | 791 | ms1-*) | 839 | ms1-*) |
4882 | 792 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` | 840 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
4883 | 793 | ;; | 841 | ;; |
4884 | 842 | msys) | ||
4885 | 843 | basic_machine=i386-pc | ||
4886 | 844 | os=-msys | ||
4887 | 845 | ;; | ||
4888 | 794 | mvs) | 846 | mvs) |
4889 | 795 | basic_machine=i370-ibm | 847 | basic_machine=i370-ibm |
4890 | 796 | os=-mvs | 848 | os=-mvs |
4891 | 797 | ;; | 849 | ;; |
4892 | 850 | nacl) | ||
4893 | 851 | basic_machine=le32-unknown | ||
4894 | 852 | os=-nacl | ||
4895 | 853 | ;; | ||
4896 | 798 | ncr3000) | 854 | ncr3000) |
4897 | 799 | basic_machine=i486-ncr | 855 | basic_machine=i486-ncr |
4898 | 800 | os=-sysv4 | 856 | os=-sysv4 |
4899 | @@ -859,6 +915,12 @@ | |||
4900 | 859 | np1) | 915 | np1) |
4901 | 860 | basic_machine=np1-gould | 916 | basic_machine=np1-gould |
4902 | 861 | ;; | 917 | ;; |
4903 | 918 | neo-tandem) | ||
4904 | 919 | basic_machine=neo-tandem | ||
4905 | 920 | ;; | ||
4906 | 921 | nse-tandem) | ||
4907 | 922 | basic_machine=nse-tandem | ||
4908 | 923 | ;; | ||
4909 | 862 | nsr-tandem) | 924 | nsr-tandem) |
4910 | 863 | basic_machine=nsr-tandem | 925 | basic_machine=nsr-tandem |
4911 | 864 | ;; | 926 | ;; |
4912 | @@ -941,9 +1003,10 @@ | |||
4913 | 941 | ;; | 1003 | ;; |
4914 | 942 | power) basic_machine=power-ibm | 1004 | power) basic_machine=power-ibm |
4915 | 943 | ;; | 1005 | ;; |
4917 | 944 | ppc) basic_machine=powerpc-unknown | 1006 | ppc | ppcbe) basic_machine=powerpc-unknown |
4918 | 945 | ;; | 1007 | ;; |
4920 | 946 | ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 1008 | ppc-* | ppcbe-*) |
4921 | 1009 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4922 | 947 | ;; | 1010 | ;; |
4923 | 948 | ppcle | powerpclittle | ppc-le | powerpc-little) | 1011 | ppcle | powerpclittle | ppc-le | powerpc-little) |
4924 | 949 | basic_machine=powerpcle-unknown | 1012 | basic_machine=powerpcle-unknown |
4925 | @@ -1037,6 +1100,9 @@ | |||
4926 | 1037 | basic_machine=i860-stratus | 1100 | basic_machine=i860-stratus |
4927 | 1038 | os=-sysv4 | 1101 | os=-sysv4 |
4928 | 1039 | ;; | 1102 | ;; |
4929 | 1103 | strongarm-* | thumb-*) | ||
4930 | 1104 | basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
4931 | 1105 | ;; | ||
4932 | 1040 | sun2) | 1106 | sun2) |
4933 | 1041 | basic_machine=m68000-sun | 1107 | basic_machine=m68000-sun |
4934 | 1042 | ;; | 1108 | ;; |
4935 | @@ -1093,25 +1159,8 @@ | |||
4936 | 1093 | basic_machine=t90-cray | 1159 | basic_machine=t90-cray |
4937 | 1094 | os=-unicos | 1160 | os=-unicos |
4938 | 1095 | ;; | 1161 | ;; |
4939 | 1096 | tic54x | c54x*) | ||
4940 | 1097 | basic_machine=tic54x-unknown | ||
4941 | 1098 | os=-coff | ||
4942 | 1099 | ;; | ||
4943 | 1100 | tic55x | c55x*) | ||
4944 | 1101 | basic_machine=tic55x-unknown | ||
4945 | 1102 | os=-coff | ||
4946 | 1103 | ;; | ||
4947 | 1104 | tic6x | c6x*) | ||
4948 | 1105 | basic_machine=tic6x-unknown | ||
4949 | 1106 | os=-coff | ||
4950 | 1107 | ;; | ||
4951 | 1108 | # This must be matched before tile*. | ||
4952 | 1109 | tilegx*) | ||
4953 | 1110 | basic_machine=tilegx-unknown | ||
4954 | 1111 | os=-linux-gnu | ||
4955 | 1112 | ;; | ||
4956 | 1113 | tile*) | 1162 | tile*) |
4958 | 1114 | basic_machine=tile-unknown | 1163 | basic_machine=$basic_machine-unknown |
4959 | 1115 | os=-linux-gnu | 1164 | os=-linux-gnu |
4960 | 1116 | ;; | 1165 | ;; |
4961 | 1117 | tx39) | 1166 | tx39) |
4962 | @@ -1181,6 +1230,9 @@ | |||
4963 | 1181 | xps | xps100) | 1230 | xps | xps100) |
4964 | 1182 | basic_machine=xps100-honeywell | 1231 | basic_machine=xps100-honeywell |
4965 | 1183 | ;; | 1232 | ;; |
4966 | 1233 | xscale-* | xscalee[bl]-*) | ||
4967 | 1234 | basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` | ||
4968 | 1235 | ;; | ||
4969 | 1184 | ymp) | 1236 | ymp) |
4970 | 1185 | basic_machine=ymp-cray | 1237 | basic_machine=ymp-cray |
4971 | 1186 | os=-unicos | 1238 | os=-unicos |
4972 | @@ -1278,11 +1330,11 @@ | |||
4973 | 1278 | if [ x"$os" != x"" ] | 1330 | if [ x"$os" != x"" ] |
4974 | 1279 | then | 1331 | then |
4975 | 1280 | case $os in | 1332 | case $os in |
4978 | 1281 | # First match some system type aliases | 1333 | # First match some system type aliases |
4979 | 1282 | # that might get confused with valid system types. | 1334 | # that might get confused with valid system types. |
4980 | 1283 | # -solaris* is a basic system type, with this one exception. | 1335 | # -solaris* is a basic system type, with this one exception. |
4983 | 1284 | -auroraux) | 1336 | -auroraux) |
4984 | 1285 | os=-auroraux | 1337 | os=-auroraux |
4985 | 1286 | ;; | 1338 | ;; |
4986 | 1287 | -solaris1 | -solaris1.*) | 1339 | -solaris1 | -solaris1.*) |
4987 | 1288 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1340 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
4988 | @@ -1318,8 +1370,9 @@ | |||
4989 | 1318 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | 1370 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
4990 | 1319 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1371 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
4991 | 1320 | | -chorusos* | -chorusrdb* | -cegcc* \ | 1372 | | -chorusos* | -chorusrdb* | -cegcc* \ |
4994 | 1321 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1373 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4995 | 1322 | | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | 1374 | | -mingw32* | -linux-gnu* | -linux-android* \ |
4996 | 1375 | | -linux-newlib* | -linux-uclibc* \ | ||
4997 | 1323 | | -uxpv* | -beos* | -mpeix* | -udk* \ | 1376 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
4998 | 1324 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1377 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
4999 | 1325 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1378 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
5000 | @@ -1366,7 +1419,7 @@ |
The diff has been truncated for viewing.
Good work.