Merge lp:~noskcaj/ubuntu/trusty/ogmrip-oggz/merge into lp:ubuntu/trusty/ogmrip-oggz
- Trusty (14.04)
- merge
- Merge into trusty
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp:~noskcaj/ubuntu/trusty/ogmrip-oggz/merge |
Merge into: | lp:ubuntu/trusty/ogmrip-oggz |
Diff against target: |
19417 lines (+6926/-4035) 25 files modified
ChangeLog (+28/-4) Makefile.in (+23/-10) aclocal.m4 (+50/-43) config.guess (+253/-269) config.sub (+177/-72) configure (+2173/-1249) configure.in (+7/-3) data/Makefile.am (+1/-1) data/Makefile.in (+16/-4) debian/changelog (+20/-0) debian/compat (+1/-1) debian/control (+5/-4) debian/rules (+16/-73) debian/source/format (+1/-0) ltmain.sh (+2631/-1408) m4/intltool.m4 (+48/-27) m4/libtool.m4 (+1277/-809) m4/ltoptions.m4 (+7/-6) m4/ltversion.m4 (+6/-6) m4/lt~obsolete.m4 (+9/-3) po/Makefile.in.in (+9/-4) po/fr.po (+7/-2) src/Makefile.am (+2/-2) src/Makefile.in (+17/-5) src/ogmrip-oggz.c (+142/-30) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/ogmrip-oggz/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+195704@code.launchpad.net |
Commit message
Description of the change
Merge from deb-multimedia
To post a comment you must log in.
Unmerged revisions
- 5. By Jackson Doak
-
* Merge from deb-multimedia
* Add -f to rm in debian/rules, fixes ftbfs
* Use dh-autoreconf - 4. By Jackson Doak
-
Sync from deb-multimedia
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2009-12-25 18:35:56 +0000 |
3 | +++ ChangeLog 2013-11-19 05:32:50 +0000 |
4 | @@ -1,11 +1,35 @@ |
5 | +19 May 2012 Olivier Rolland <billl@users.sf.net> |
6 | + |
7 | + Released OGMRipOggz 0.3 |
8 | + |
9 | +09 Jan 2010 Olivier Rolland <billl@users.sf.net> |
10 | + |
11 | + * src/ogmrip-oggz.c |
12 | + |
13 | + Added Kate subtitles support |
14 | + |
15 | +05 Jan 2010 Olivier Rolland <billl@users.sf.net> |
16 | + |
17 | + * configure.in |
18 | + * data/Makefile.am |
19 | + * src/Makefile.am |
20 | + |
21 | + Improved plugins and profiles support |
22 | + |
23 | 25 Dec 2009 Olivier Rolland <billl@users.sf.net> |
24 | |
25 | Released ogmrip-oggz 0.2 |
26 | |
27 | -25 Dec 2009 Olivier Rolland <billl@users.sf.net> |
28 | - |
29 | - * src/ogmrip-oggz.c |
30 | - |
31 | +08 Dec 2009 Olivier Rolland <billl@users.sf.net> |
32 | + |
33 | + * src/ogmrip-oggz.c |
34 | + |
35 | + Synchronized with trunk |
36 | + |
37 | +09 Oct 2009 Olivier Rolland <billl@users.sf.net> |
38 | + |
39 | + * src/ogmrip-oggz.c |
40 | + |
41 | Added oggz-merge support |
42 | |
43 | 15 Jul 2009 Olivier Rolland <billl@users.sf.net> |
44 | |
45 | === modified file 'Makefile.in' |
46 | --- Makefile.in 2009-12-25 18:35:56 +0000 |
47 | +++ Makefile.in 2013-11-19 05:32:50 +0000 |
48 | @@ -1,4 +1,4 @@ |
49 | -# Makefile.in generated by automake 1.11 from Makefile.am. |
50 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. |
51 | # @configure_input@ |
52 | |
53 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
54 | @@ -106,6 +106,7 @@ |
55 | ACLOCAL = @ACLOCAL@ |
56 | ALL_LINGUAS = @ALL_LINGUAS@ |
57 | AMTAR = @AMTAR@ |
58 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
59 | AR = @AR@ |
60 | AUTOCONF = @AUTOCONF@ |
61 | AUTOHEADER = @AUTOHEADER@ |
62 | @@ -122,6 +123,7 @@ |
63 | DATADIRNAME = @DATADIRNAME@ |
64 | DEFS = @DEFS@ |
65 | DEPDIR = @DEPDIR@ |
66 | +DLLTOOL = @DLLTOOL@ |
67 | DSYMUTIL = @DSYMUTIL@ |
68 | DUMPBIN = @DUMPBIN@ |
69 | ECHO_C = @ECHO_C@ |
70 | @@ -145,6 +147,10 @@ |
71 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
72 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
73 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
74 | +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
75 | +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
76 | +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
77 | +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
78 | LD = @LD@ |
79 | LDFLAGS = @LDFLAGS@ |
80 | LIBOBJS = @LIBOBJS@ |
81 | @@ -155,6 +161,7 @@ |
82 | LTLIBOBJS = @LTLIBOBJS@ |
83 | MAINT = @MAINT@ |
84 | MAKEINFO = @MAKEINFO@ |
85 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
86 | MKDIR_P = @MKDIR_P@ |
87 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
88 | MSGFMT = @MSGFMT@ |
89 | @@ -166,7 +173,8 @@ |
90 | OBJEXT = @OBJEXT@ |
91 | OGMRIP_CFLAGS = @OGMRIP_CFLAGS@ |
92 | OGMRIP_LIBS = @OGMRIP_LIBS@ |
93 | -OGMRIP_PREFIX = @OGMRIP_PREFIX@ |
94 | +OGMRIP_PLUGDIR = @OGMRIP_PLUGDIR@ |
95 | +OGMRIP_PROFDIR = @OGMRIP_PROFDIR@ |
96 | OTOOL = @OTOOL@ |
97 | OTOOL64 = @OTOOL64@ |
98 | PACKAGE = @PACKAGE@ |
99 | @@ -178,6 +186,8 @@ |
100 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
101 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
102 | PKG_CONFIG = @PKG_CONFIG@ |
103 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
104 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
105 | POFILES = @POFILES@ |
106 | POSUB = @POSUB@ |
107 | PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ |
108 | @@ -194,6 +204,7 @@ |
109 | abs_srcdir = @abs_srcdir@ |
110 | abs_top_builddir = @abs_top_builddir@ |
111 | abs_top_srcdir = @abs_top_srcdir@ |
112 | +ac_ct_AR = @ac_ct_AR@ |
113 | ac_ct_CC = @ac_ct_CC@ |
114 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
115 | am__include = @am__include@ |
116 | @@ -222,11 +233,12 @@ |
117 | includedir = @includedir@ |
118 | infodir = @infodir@ |
119 | install_sh = @install_sh@ |
120 | +intltool__v_merge_options_ = @intltool__v_merge_options_@ |
121 | +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
122 | libdir = @libdir@ |
123 | libexecdir = @libexecdir@ |
124 | localedir = @localedir@ |
125 | localstatedir = @localstatedir@ |
126 | -lt_ECHO = @lt_ECHO@ |
127 | mandir = @mandir@ |
128 | mkdir_p = @mkdir_p@ |
129 | oldincludedir = @oldincludedir@ |
130 | @@ -297,7 +309,7 @@ |
131 | # (which will cause the Makefiles to be regenerated when you run `make'); |
132 | # (2) otherwise, pass the desired values on the `make' command line. |
133 | $(RECURSIVE_TARGETS): |
134 | - @failcom='exit 1'; \ |
135 | + @fail= failcom='exit 1'; \ |
136 | for f in x $$MAKEFLAGS; do \ |
137 | case $$f in \ |
138 | *=* | --[!k]*);; \ |
139 | @@ -322,7 +334,7 @@ |
140 | fi; test -z "$$fail" |
141 | |
142 | $(RECURSIVE_CLEAN_TARGETS): |
143 | - @failcom='exit 1'; \ |
144 | + @fail= failcom='exit 1'; \ |
145 | for f in x $$MAKEFLAGS; do \ |
146 | case $$f in \ |
147 | *=* | --[!k]*);; \ |
148 | @@ -486,7 +498,8 @@ |
149 | fi; \ |
150 | done |
151 | -test -n "$(am__skip_mode_fix)" \ |
152 | - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ |
153 | + || find "$(distdir)" -type d ! -perm -755 \ |
154 | + -exec chmod u+rwx,go+rx {} \; -o \ |
155 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
156 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
157 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
158 | @@ -530,17 +543,17 @@ |
159 | distcheck: dist |
160 | case '$(DIST_ARCHIVES)' in \ |
161 | *.tar.gz*) \ |
162 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
163 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
164 | *.tar.bz2*) \ |
165 | - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
166 | + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
167 | *.tar.lzma*) \ |
168 | - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ |
169 | + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
170 | *.tar.xz*) \ |
171 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
172 | *.tar.Z*) \ |
173 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
174 | *.shar.gz*) \ |
175 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ |
176 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
177 | *.zip*) \ |
178 | unzip $(distdir).zip ;;\ |
179 | esac |
180 | |
181 | === modified file 'aclocal.m4' |
182 | --- aclocal.m4 2009-12-25 18:35:56 +0000 |
183 | +++ aclocal.m4 2013-11-19 05:32:50 +0000 |
184 | @@ -1,4 +1,4 @@ |
185 | -# generated automatically by aclocal 1.11 -*- Autoconf -*- |
186 | +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
187 | |
188 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
189 | # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
190 | @@ -13,8 +13,8 @@ |
191 | |
192 | m4_ifndef([AC_AUTOCONF_VERSION], |
193 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
194 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, |
195 | -[m4_warning([this file was generated for autoconf 2.64. |
196 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
197 | +[m4_warning([this file was generated for autoconf 2.68. |
198 | You have another version of autoconf. It may work, but is not guaranteed to. |
199 | If you have problems, you may need to regenerate the build system entirely. |
200 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
201 | @@ -260,6 +260,10 @@ |
202 | [CATOBJEXT=.mo |
203 | DATADIRNAME=lib]) |
204 | ;; |
205 | + *-*-openbsd*) |
206 | + CATOBJEXT=.mo |
207 | + DATADIRNAME=share |
208 | + ;; |
209 | *) |
210 | CATOBJEXT=.mo |
211 | DATADIRNAME=lib |
212 | @@ -301,7 +305,7 @@ |
213 | |
214 | dnl These rules are solely for the distribution goal. While doing this |
215 | dnl we only have to keep exactly one list of the available catalogs |
216 | - dnl in configure.in. |
217 | + dnl in configure.ac. |
218 | for lang in $ALL_LINGUAS; do |
219 | GMOFILES="$GMOFILES $lang.gmo" |
220 | POFILES="$POFILES $lang.po" |
221 | @@ -430,7 +434,7 @@ |
222 | dnl |
223 | dnl Now the definitions that aclocal will find |
224 | dnl |
225 | -ifdef(glib_configure_in,[],[ |
226 | +ifdef(glib_configure_ac,[],[ |
227 | AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) |
228 | AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) |
229 | ])dnl |
230 | @@ -452,8 +456,9 @@ |
231 | fi]) |
232 | |
233 | |
234 | -# nls.m4 serial 3 (gettext-0.15) |
235 | -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. |
236 | +# nls.m4 serial 5 (gettext-0.18) |
237 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, |
238 | +dnl Inc. |
239 | dnl This file is free software; the Free Software Foundation |
240 | dnl gives unlimited permission to copy and/or distribute it, |
241 | dnl with or without modifications, as long as this notice is preserved. |
242 | @@ -471,20 +476,21 @@ |
243 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
244 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
245 | |
246 | -AC_PREREQ(2.50) |
247 | +AC_PREREQ([2.50]) |
248 | |
249 | AC_DEFUN([AM_NLS], |
250 | [ |
251 | AC_MSG_CHECKING([whether NLS is requested]) |
252 | dnl Default is enabled NLS |
253 | - AC_ARG_ENABLE(nls, |
254 | + AC_ARG_ENABLE([nls], |
255 | [ --disable-nls do not use Native Language Support], |
256 | USE_NLS=$enableval, USE_NLS=yes) |
257 | - AC_MSG_RESULT($USE_NLS) |
258 | - AC_SUBST(USE_NLS) |
259 | + AC_MSG_RESULT([$USE_NLS]) |
260 | + AC_SUBST([USE_NLS]) |
261 | ]) |
262 | |
263 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
264 | +# serial 1 (pkg-config-0.24) |
265 | # |
266 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
267 | # |
268 | @@ -511,8 +517,12 @@ |
269 | # ---------------------------------- |
270 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
271 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
272 | -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
273 | -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl |
274 | +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
275 | +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
276 | +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
277 | +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
278 | +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
279 | + |
280 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
281 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
282 | fi |
283 | @@ -525,7 +535,6 @@ |
284 | AC_MSG_RESULT([no]) |
285 | PKG_CONFIG="" |
286 | fi |
287 | - |
288 | fi[]dnl |
289 | ])# PKG_PROG_PKG_CONFIG |
290 | |
291 | @@ -534,34 +543,32 @@ |
292 | # Check to see whether a particular set of modules exists. Similar |
293 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. |
294 | # |
295 | -# |
296 | -# Similar to PKG_CHECK_MODULES, make sure that the first instance of |
297 | -# this or PKG_CHECK_MODULES is called, or make sure to call |
298 | -# PKG_CHECK_EXISTS manually |
299 | +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
300 | +# only at the first occurence in configure.ac, so if the first place |
301 | +# it's called might be skipped (such as if it is within an "if", you |
302 | +# have to call PKG_CHECK_EXISTS manually |
303 | # -------------------------------------------------------------- |
304 | AC_DEFUN([PKG_CHECK_EXISTS], |
305 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
306 | if test -n "$PKG_CONFIG" && \ |
307 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
308 | - m4_ifval([$2], [$2], [:]) |
309 | + m4_default([$2], [:]) |
310 | m4_ifvaln([$3], [else |
311 | $3])dnl |
312 | fi]) |
313 | |
314 | - |
315 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
316 | # --------------------------------------------- |
317 | m4_define([_PKG_CONFIG], |
318 | -[if test -n "$PKG_CONFIG"; then |
319 | - if test -n "$$1"; then |
320 | - pkg_cv_[]$1="$$1" |
321 | - else |
322 | - PKG_CHECK_EXISTS([$3], |
323 | - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
324 | - [pkg_failed=yes]) |
325 | - fi |
326 | -else |
327 | - pkg_failed=untried |
328 | +[if test -n "$$1"; then |
329 | + pkg_cv_[]$1="$$1" |
330 | + elif test -n "$PKG_CONFIG"; then |
331 | + PKG_CHECK_EXISTS([$3], |
332 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
333 | + test "x$?" != "x0" && pkg_failed=yes ], |
334 | + [pkg_failed=yes]) |
335 | + else |
336 | + pkg_failed=untried |
337 | fi[]dnl |
338 | ])# _PKG_CONFIG |
339 | |
340 | @@ -603,16 +610,17 @@ |
341 | See the pkg-config man page for more details.]) |
342 | |
343 | if test $pkg_failed = yes; then |
344 | + AC_MSG_RESULT([no]) |
345 | _PKG_SHORT_ERRORS_SUPPORTED |
346 | if test $_pkg_short_errors_supported = yes; then |
347 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` |
348 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
349 | else |
350 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` |
351 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
352 | fi |
353 | # Put the nasty error message in config.log where it belongs |
354 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
355 | |
356 | - ifelse([$4], , [AC_MSG_ERROR(dnl |
357 | + m4_default([$4], [AC_MSG_ERROR( |
358 | [Package requirements ($2) were not met: |
359 | |
360 | $$1_PKG_ERRORS |
361 | @@ -620,25 +628,24 @@ |
362 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
363 | installed software in a non-standard prefix. |
364 | |
365 | -_PKG_TEXT |
366 | -])], |
367 | - [AC_MSG_RESULT([no]) |
368 | - $4]) |
369 | +_PKG_TEXT])[]dnl |
370 | + ]) |
371 | elif test $pkg_failed = untried; then |
372 | - ifelse([$4], , [AC_MSG_FAILURE(dnl |
373 | + AC_MSG_RESULT([no]) |
374 | + m4_default([$4], [AC_MSG_FAILURE( |
375 | [The pkg-config script could not be found or is too old. Make sure it |
376 | is in your PATH or set the PKG_CONFIG environment variable to the full |
377 | path to pkg-config. |
378 | |
379 | _PKG_TEXT |
380 | |
381 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
382 | - [$4]) |
383 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
384 | + ]) |
385 | else |
386 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
387 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
388 | AC_MSG_RESULT([yes]) |
389 | - ifelse([$3], , :, [$3]) |
390 | + $3 |
391 | fi[]dnl |
392 | ])# PKG_CHECK_MODULES |
393 | |
394 | @@ -657,7 +664,7 @@ |
395 | [am__api_version='1.11' |
396 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
397 | dnl require some minimum version. Point them to the right macro. |
398 | -m4_if([$1], [1.11], [], |
399 | +m4_if([$1], [1.11.1], [], |
400 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
401 | ]) |
402 | |
403 | @@ -673,7 +680,7 @@ |
404 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
405 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
406 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
407 | -[AM_AUTOMAKE_VERSION([1.11])dnl |
408 | +[AM_AUTOMAKE_VERSION([1.11.1])dnl |
409 | m4_ifndef([AC_AUTOCONF_VERSION], |
410 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
411 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
412 | |
413 | === modified file 'config.guess' |
414 | --- config.guess 2009-12-25 18:35:56 +0000 |
415 | +++ config.guess 2013-11-19 05:32:50 +0000 |
416 | @@ -1,10 +1,10 @@ |
417 | #! /bin/sh |
418 | # Attempt to guess a canonical system name. |
419 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
420 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
421 | -# Free Software Foundation, Inc. |
422 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
423 | +# 2011, 2012 Free Software Foundation, Inc. |
424 | |
425 | -timestamp='2009-04-27' |
426 | +timestamp='2012-02-10' |
427 | |
428 | # This file is free software; you can redistribute it and/or modify it |
429 | # under the terms of the GNU General Public License as published by |
430 | @@ -17,9 +17,7 @@ |
431 | # General Public License for more details. |
432 | # |
433 | # You should have received a copy of the GNU General Public License |
434 | -# along with this program; if not, write to the Free Software |
435 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
436 | -# 02110-1301, USA. |
437 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
438 | # |
439 | # As a special exception to the GNU General Public License, if you |
440 | # distribute this file as part of a program that contains a |
441 | @@ -27,16 +25,16 @@ |
442 | # the same distribution terms that you use for the rest of that program. |
443 | |
444 | |
445 | -# Originally written by Per Bothner <per@bothner.com>. |
446 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
447 | -# diff and a properly formatted ChangeLog entry. |
448 | +# Originally written by Per Bothner. Please send patches (context |
449 | +# diff format) to <config-patches@gnu.org> and include a ChangeLog |
450 | +# entry. |
451 | # |
452 | # This script attempts to guess a canonical system name similar to |
453 | # config.sub. If it succeeds, it prints the system name on stdout, and |
454 | # exits with 0. Otherwise, it exits with 1. |
455 | # |
456 | -# The plan is that this can be called by configure scripts if you |
457 | -# don't specify an explicit build system type. |
458 | +# You can get the latest version of this script from: |
459 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
460 | |
461 | me=`echo "$0" | sed -e 's,.*/,,'` |
462 | |
463 | @@ -56,8 +54,9 @@ |
464 | GNU config.guess ($timestamp) |
465 | |
466 | Originally written by Per Bothner. |
467 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
468 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
469 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
470 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
471 | +Free Software Foundation, Inc. |
472 | |
473 | This is free software; see the source for copying conditions. There is NO |
474 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
475 | @@ -139,12 +138,35 @@ |
476 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
477 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
478 | |
479 | +case "${UNAME_SYSTEM}" in |
480 | +Linux|GNU/*) |
481 | + eval $set_cc_for_build |
482 | + cat <<-EOF > $dummy.c |
483 | + #include <features.h> |
484 | + #ifdef __UCLIBC__ |
485 | + # ifdef __UCLIBC_CONFIG_VERSION__ |
486 | + LIBC=uclibc __UCLIBC_CONFIG_VERSION__ |
487 | + # else |
488 | + LIBC=uclibc |
489 | + # endif |
490 | + #else |
491 | + # ifdef __dietlibc__ |
492 | + LIBC=dietlibc |
493 | + # else |
494 | + LIBC=gnu |
495 | + # endif |
496 | + #endif |
497 | + EOF |
498 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
499 | + ;; |
500 | +esac |
501 | + |
502 | # Note: order is significant - the case branches are not exclusive. |
503 | |
504 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
505 | *:NetBSD:*:*) |
506 | # NetBSD (nbsd) targets should (where applicable) match one or |
507 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
508 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
509 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
510 | # switched to ELF, *-*-netbsd* would select the old |
511 | # object file format. This provides both forward |
512 | @@ -170,7 +192,7 @@ |
513 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
514 | eval $set_cc_for_build |
515 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
516 | - | grep __ELF__ >/dev/null |
517 | + | grep -q __ELF__ |
518 | then |
519 | # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). |
520 | # Return netbsd for either. FIX? |
521 | @@ -180,7 +202,7 @@ |
522 | fi |
523 | ;; |
524 | *) |
525 | - os=netbsd |
526 | + os=netbsd |
527 | ;; |
528 | esac |
529 | # The OS release |
530 | @@ -223,7 +245,7 @@ |
531 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
532 | ;; |
533 | *5.*) |
534 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
535 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
536 | ;; |
537 | esac |
538 | # According to Compaq, /usr/sbin/psrinfo has been available on |
539 | @@ -269,7 +291,10 @@ |
540 | # A Xn.n version is an unreleased experimental baselevel. |
541 | # 1.2 uses "1.2" for uname -r. |
542 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
543 | - exit ;; |
544 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
545 | + exitcode=$? |
546 | + trap '' 0 |
547 | + exit $exitcode ;; |
548 | Alpha\ *:Windows_NT*:*) |
549 | # How do we know it's Interix rather than the generic POSIX subsystem? |
550 | # Should we change UNAME_MACHINE based on the output of uname instead |
551 | @@ -295,7 +320,7 @@ |
552 | echo s390-ibm-zvmoe |
553 | exit ;; |
554 | *:OS400:*:*) |
555 | - echo powerpc-ibm-os400 |
556 | + echo powerpc-ibm-os400 |
557 | exit ;; |
558 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
559 | echo arm-acorn-riscix${UNAME_RELEASE} |
560 | @@ -333,6 +358,9 @@ |
561 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
562 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
563 | exit ;; |
564 | + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
565 | + echo i386-pc-auroraux${UNAME_RELEASE} |
566 | + exit ;; |
567 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
568 | eval $set_cc_for_build |
569 | SUN_ARCH="i386" |
570 | @@ -391,23 +419,23 @@ |
571 | # MiNT. But MiNT is downward compatible to TOS, so this should |
572 | # be no problem. |
573 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
574 | - echo m68k-atari-mint${UNAME_RELEASE} |
575 | + echo m68k-atari-mint${UNAME_RELEASE} |
576 | exit ;; |
577 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
578 | echo m68k-atari-mint${UNAME_RELEASE} |
579 | - exit ;; |
580 | + exit ;; |
581 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
582 | - echo m68k-atari-mint${UNAME_RELEASE} |
583 | + echo m68k-atari-mint${UNAME_RELEASE} |
584 | exit ;; |
585 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
586 | - echo m68k-milan-mint${UNAME_RELEASE} |
587 | - exit ;; |
588 | + echo m68k-milan-mint${UNAME_RELEASE} |
589 | + exit ;; |
590 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
591 | - echo m68k-hades-mint${UNAME_RELEASE} |
592 | - exit ;; |
593 | + echo m68k-hades-mint${UNAME_RELEASE} |
594 | + exit ;; |
595 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
596 | - echo m68k-unknown-mint${UNAME_RELEASE} |
597 | - exit ;; |
598 | + echo m68k-unknown-mint${UNAME_RELEASE} |
599 | + exit ;; |
600 | m68k:machten:*:*) |
601 | echo m68k-apple-machten${UNAME_RELEASE} |
602 | exit ;; |
603 | @@ -477,8 +505,8 @@ |
604 | echo m88k-motorola-sysv3 |
605 | exit ;; |
606 | AViiON:dgux:*:*) |
607 | - # DG/UX returns AViiON for all architectures |
608 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
609 | + # DG/UX returns AViiON for all architectures |
610 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
611 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
612 | then |
613 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
614 | @@ -491,7 +519,7 @@ |
615 | else |
616 | echo i586-dg-dgux${UNAME_RELEASE} |
617 | fi |
618 | - exit ;; |
619 | + exit ;; |
620 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
621 | echo m88k-dolphin-sysv3 |
622 | exit ;; |
623 | @@ -548,7 +576,7 @@ |
624 | echo rs6000-ibm-aix3.2 |
625 | fi |
626 | exit ;; |
627 | - *:AIX:*:[456]) |
628 | + *:AIX:*:[4567]) |
629 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
630 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
631 | IBM_ARCH=rs6000 |
632 | @@ -591,52 +619,52 @@ |
633 | 9000/[678][0-9][0-9]) |
634 | if [ -x /usr/bin/getconf ]; then |
635 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
636 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
637 | - case "${sc_cpu_version}" in |
638 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
639 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
640 | - 532) # CPU_PA_RISC2_0 |
641 | - case "${sc_kernel_bits}" in |
642 | - 32) HP_ARCH="hppa2.0n" ;; |
643 | - 64) HP_ARCH="hppa2.0w" ;; |
644 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
645 | + case "${sc_cpu_version}" in |
646 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
647 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
648 | + 532) # CPU_PA_RISC2_0 |
649 | + case "${sc_kernel_bits}" in |
650 | + 32) HP_ARCH="hppa2.0n" ;; |
651 | + 64) HP_ARCH="hppa2.0w" ;; |
652 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
653 | - esac ;; |
654 | - esac |
655 | + esac ;; |
656 | + esac |
657 | fi |
658 | if [ "${HP_ARCH}" = "" ]; then |
659 | eval $set_cc_for_build |
660 | - sed 's/^ //' << EOF >$dummy.c |
661 | - |
662 | - #define _HPUX_SOURCE |
663 | - #include <stdlib.h> |
664 | - #include <unistd.h> |
665 | - |
666 | - int main () |
667 | - { |
668 | - #if defined(_SC_KERNEL_BITS) |
669 | - long bits = sysconf(_SC_KERNEL_BITS); |
670 | - #endif |
671 | - long cpu = sysconf (_SC_CPU_VERSION); |
672 | - |
673 | - switch (cpu) |
674 | - { |
675 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
676 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
677 | - case CPU_PA_RISC2_0: |
678 | - #if defined(_SC_KERNEL_BITS) |
679 | - switch (bits) |
680 | - { |
681 | - case 64: puts ("hppa2.0w"); break; |
682 | - case 32: puts ("hppa2.0n"); break; |
683 | - default: puts ("hppa2.0"); break; |
684 | - } break; |
685 | - #else /* !defined(_SC_KERNEL_BITS) */ |
686 | - puts ("hppa2.0"); break; |
687 | - #endif |
688 | - default: puts ("hppa1.0"); break; |
689 | - } |
690 | - exit (0); |
691 | - } |
692 | + sed 's/^ //' << EOF >$dummy.c |
693 | + |
694 | + #define _HPUX_SOURCE |
695 | + #include <stdlib.h> |
696 | + #include <unistd.h> |
697 | + |
698 | + int main () |
699 | + { |
700 | + #if defined(_SC_KERNEL_BITS) |
701 | + long bits = sysconf(_SC_KERNEL_BITS); |
702 | + #endif |
703 | + long cpu = sysconf (_SC_CPU_VERSION); |
704 | + |
705 | + switch (cpu) |
706 | + { |
707 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
708 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
709 | + case CPU_PA_RISC2_0: |
710 | + #if defined(_SC_KERNEL_BITS) |
711 | + switch (bits) |
712 | + { |
713 | + case 64: puts ("hppa2.0w"); break; |
714 | + case 32: puts ("hppa2.0n"); break; |
715 | + default: puts ("hppa2.0"); break; |
716 | + } break; |
717 | + #else /* !defined(_SC_KERNEL_BITS) */ |
718 | + puts ("hppa2.0"); break; |
719 | + #endif |
720 | + default: puts ("hppa1.0"); break; |
721 | + } |
722 | + exit (0); |
723 | + } |
724 | EOF |
725 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
726 | test -z "$HP_ARCH" && HP_ARCH=hppa |
727 | @@ -656,7 +684,7 @@ |
728 | # => hppa64-hp-hpux11.23 |
729 | |
730 | if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
731 | - grep __LP64__ >/dev/null |
732 | + grep -q __LP64__ |
733 | then |
734 | HP_ARCH="hppa2.0w" |
735 | else |
736 | @@ -727,22 +755,22 @@ |
737 | exit ;; |
738 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
739 | echo c1-convex-bsd |
740 | - exit ;; |
741 | + exit ;; |
742 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
743 | if getsysinfo -f scalar_acc |
744 | then echo c32-convex-bsd |
745 | else echo c2-convex-bsd |
746 | fi |
747 | - exit ;; |
748 | + exit ;; |
749 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
750 | echo c34-convex-bsd |
751 | - exit ;; |
752 | + exit ;; |
753 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
754 | echo c38-convex-bsd |
755 | - exit ;; |
756 | + exit ;; |
757 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
758 | echo c4-convex-bsd |
759 | - exit ;; |
760 | + exit ;; |
761 | CRAY*Y-MP:*:*:*) |
762 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
763 | exit ;; |
764 | @@ -766,14 +794,14 @@ |
765 | exit ;; |
766 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
767 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
768 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
769 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
770 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
771 | - exit ;; |
772 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
773 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
774 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
775 | + exit ;; |
776 | 5000:UNIX_System_V:4.*:*) |
777 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
778 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
779 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
780 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
781 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
782 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
783 | exit ;; |
784 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
785 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
786 | @@ -785,13 +813,12 @@ |
787 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
788 | exit ;; |
789 | *:FreeBSD:*:*) |
790 | - case ${UNAME_MACHINE} in |
791 | - pc98) |
792 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
793 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
794 | + case ${UNAME_PROCESSOR} in |
795 | amd64) |
796 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
797 | *) |
798 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
799 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
800 | esac |
801 | exit ;; |
802 | i*:CYGWIN*:*) |
803 | @@ -800,19 +827,22 @@ |
804 | *:MINGW*:*) |
805 | echo ${UNAME_MACHINE}-pc-mingw32 |
806 | exit ;; |
807 | + i*:MSYS*:*) |
808 | + echo ${UNAME_MACHINE}-pc-msys |
809 | + exit ;; |
810 | i*:windows32*:*) |
811 | - # uname -m includes "-pc" on this system. |
812 | - echo ${UNAME_MACHINE}-mingw32 |
813 | + # uname -m includes "-pc" on this system. |
814 | + echo ${UNAME_MACHINE}-mingw32 |
815 | exit ;; |
816 | i*:PW*:*) |
817 | echo ${UNAME_MACHINE}-pc-pw32 |
818 | exit ;; |
819 | - *:Interix*:[3456]*) |
820 | - case ${UNAME_MACHINE} in |
821 | + *:Interix*:*) |
822 | + case ${UNAME_MACHINE} in |
823 | x86) |
824 | echo i586-pc-interix${UNAME_RELEASE} |
825 | exit ;; |
826 | - EM64T | authenticamd | genuineintel) |
827 | + authenticamd | genuineintel | EM64T) |
828 | echo x86_64-unknown-interix${UNAME_RELEASE} |
829 | exit ;; |
830 | IA64) |
831 | @@ -822,6 +852,9 @@ |
832 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
833 | echo i${UNAME_MACHINE}-pc-mks |
834 | exit ;; |
835 | + 8664:Windows_NT:*) |
836 | + echo x86_64-pc-mks |
837 | + exit ;; |
838 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
839 | # How do we know it's Interix rather than the generic POSIX subsystem? |
840 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
841 | @@ -842,210 +875,145 @@ |
842 | exit ;; |
843 | *:GNU:*:*) |
844 | # the GNU system |
845 | - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
846 | + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
847 | exit ;; |
848 | *:GNU/*:*:*) |
849 | # other systems with GNU libc and userland |
850 | - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
851 | + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} |
852 | exit ;; |
853 | i*86:Minix:*:*) |
854 | echo ${UNAME_MACHINE}-pc-minix |
855 | exit ;; |
856 | + aarch64:Linux:*:*) |
857 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
858 | + exit ;; |
859 | + aarch64_be:Linux:*:*) |
860 | + UNAME_MACHINE=aarch64_be |
861 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
862 | + exit ;; |
863 | + alpha:Linux:*:*) |
864 | + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
865 | + EV5) UNAME_MACHINE=alphaev5 ;; |
866 | + EV56) UNAME_MACHINE=alphaev56 ;; |
867 | + PCA56) UNAME_MACHINE=alphapca56 ;; |
868 | + PCA57) UNAME_MACHINE=alphapca56 ;; |
869 | + EV6) UNAME_MACHINE=alphaev6 ;; |
870 | + EV67) UNAME_MACHINE=alphaev67 ;; |
871 | + EV68*) UNAME_MACHINE=alphaev68 ;; |
872 | + esac |
873 | + objdump --private-headers /bin/sh | grep -q ld.so.1 |
874 | + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
875 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
876 | + exit ;; |
877 | arm*:Linux:*:*) |
878 | eval $set_cc_for_build |
879 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
880 | | grep -q __ARM_EABI__ |
881 | then |
882 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
883 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
884 | else |
885 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
886 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
887 | + | grep -q __ARM_PCS_VFP |
888 | + then |
889 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi |
890 | + else |
891 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf |
892 | + fi |
893 | fi |
894 | exit ;; |
895 | avr32*:Linux:*:*) |
896 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
897 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
898 | exit ;; |
899 | cris:Linux:*:*) |
900 | - echo cris-axis-linux-gnu |
901 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
902 | exit ;; |
903 | crisv32:Linux:*:*) |
904 | - echo crisv32-axis-linux-gnu |
905 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
906 | exit ;; |
907 | frv:Linux:*:*) |
908 | - echo frv-unknown-linux-gnu |
909 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
910 | + exit ;; |
911 | + hexagon:Linux:*:*) |
912 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
913 | + exit ;; |
914 | + i*86:Linux:*:*) |
915 | + echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
916 | exit ;; |
917 | ia64:Linux:*:*) |
918 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
919 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
920 | exit ;; |
921 | m32r*:Linux:*:*) |
922 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
923 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
924 | exit ;; |
925 | m68*:Linux:*:*) |
926 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
927 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
928 | exit ;; |
929 | - mips:Linux:*:*) |
930 | - eval $set_cc_for_build |
931 | - sed 's/^ //' << EOF >$dummy.c |
932 | - #undef CPU |
933 | - #undef mips |
934 | - #undef mipsel |
935 | - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
936 | - CPU=mipsel |
937 | - #else |
938 | - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
939 | - CPU=mips |
940 | - #else |
941 | - CPU= |
942 | - #endif |
943 | - #endif |
944 | -EOF |
945 | - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
946 | - /^CPU/{ |
947 | - s: ::g |
948 | - p |
949 | - }'`" |
950 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
951 | - ;; |
952 | - mips64:Linux:*:*) |
953 | - eval $set_cc_for_build |
954 | - sed 's/^ //' << EOF >$dummy.c |
955 | - #undef CPU |
956 | - #undef mips64 |
957 | - #undef mips64el |
958 | - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
959 | - CPU=mips64el |
960 | - #else |
961 | - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
962 | - CPU=mips64 |
963 | - #else |
964 | - CPU= |
965 | - #endif |
966 | - #endif |
967 | -EOF |
968 | - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
969 | - /^CPU/{ |
970 | - s: ::g |
971 | - p |
972 | - }'`" |
973 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
974 | + mips:Linux:*:* | mips64:Linux:*:*) |
975 | + eval $set_cc_for_build |
976 | + sed 's/^ //' << EOF >$dummy.c |
977 | + #undef CPU |
978 | + #undef ${UNAME_MACHINE} |
979 | + #undef ${UNAME_MACHINE}el |
980 | + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
981 | + CPU=${UNAME_MACHINE}el |
982 | + #else |
983 | + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
984 | + CPU=${UNAME_MACHINE} |
985 | + #else |
986 | + CPU= |
987 | + #endif |
988 | + #endif |
989 | +EOF |
990 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
991 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
992 | ;; |
993 | or32:Linux:*:*) |
994 | - echo or32-unknown-linux-gnu |
995 | - exit ;; |
996 | - ppc:Linux:*:*) |
997 | - echo powerpc-unknown-linux-gnu |
998 | - exit ;; |
999 | - ppc64:Linux:*:*) |
1000 | - echo powerpc64-unknown-linux-gnu |
1001 | - exit ;; |
1002 | - alpha:Linux:*:*) |
1003 | - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1004 | - EV5) UNAME_MACHINE=alphaev5 ;; |
1005 | - EV56) UNAME_MACHINE=alphaev56 ;; |
1006 | - PCA56) UNAME_MACHINE=alphapca56 ;; |
1007 | - PCA57) UNAME_MACHINE=alphapca56 ;; |
1008 | - EV6) UNAME_MACHINE=alphaev6 ;; |
1009 | - EV67) UNAME_MACHINE=alphaev67 ;; |
1010 | - EV68*) UNAME_MACHINE=alphaev68 ;; |
1011 | - esac |
1012 | - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null |
1013 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
1014 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
1015 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1016 | exit ;; |
1017 | padre:Linux:*:*) |
1018 | - echo sparc-unknown-linux-gnu |
1019 | + echo sparc-unknown-linux-${LIBC} |
1020 | + exit ;; |
1021 | + parisc64:Linux:*:* | hppa64:Linux:*:*) |
1022 | + echo hppa64-unknown-linux-${LIBC} |
1023 | exit ;; |
1024 | parisc:Linux:*:* | hppa:Linux:*:*) |
1025 | # Look for CPU level |
1026 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
1027 | - PA7*) echo hppa1.1-unknown-linux-gnu ;; |
1028 | - PA8*) echo hppa2.0-unknown-linux-gnu ;; |
1029 | - *) echo hppa-unknown-linux-gnu ;; |
1030 | + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; |
1031 | + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; |
1032 | + *) echo hppa-unknown-linux-${LIBC} ;; |
1033 | esac |
1034 | exit ;; |
1035 | - parisc64:Linux:*:* | hppa64:Linux:*:*) |
1036 | - echo hppa64-unknown-linux-gnu |
1037 | + ppc64:Linux:*:*) |
1038 | + echo powerpc64-unknown-linux-${LIBC} |
1039 | + exit ;; |
1040 | + ppc:Linux:*:*) |
1041 | + echo powerpc-unknown-linux-${LIBC} |
1042 | exit ;; |
1043 | s390:Linux:*:* | s390x:Linux:*:*) |
1044 | echo ${UNAME_MACHINE}-ibm-linux |
1045 | exit ;; |
1046 | sh64*:Linux:*:*) |
1047 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1048 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1049 | exit ;; |
1050 | sh*:Linux:*:*) |
1051 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1052 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1053 | exit ;; |
1054 | sparc:Linux:*:* | sparc64:Linux:*:*) |
1055 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1056 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1057 | + exit ;; |
1058 | + tile*:Linux:*:*) |
1059 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1060 | exit ;; |
1061 | vax:Linux:*:*) |
1062 | - echo ${UNAME_MACHINE}-dec-linux-gnu |
1063 | + echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
1064 | exit ;; |
1065 | x86_64:Linux:*:*) |
1066 | - echo x86_64-unknown-linux-gnu |
1067 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1068 | exit ;; |
1069 | xtensa*:Linux:*:*) |
1070 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1071 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1072 | exit ;; |
1073 | - i*86:Linux:*:*) |
1074 | - # The BFD linker knows what the default object file format is, so |
1075 | - # first see if it will tell us. cd to the root directory to prevent |
1076 | - # problems with other programs or directories called `ld' in the path. |
1077 | - # Set LC_ALL=C to ensure ld outputs messages in English. |
1078 | - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ |
1079 | - | sed -ne '/supported targets:/!d |
1080 | - s/[ ][ ]*/ /g |
1081 | - s/.*supported targets: *// |
1082 | - s/ .*// |
1083 | - p'` |
1084 | - case "$ld_supported_targets" in |
1085 | - elf32-i386) |
1086 | - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
1087 | - ;; |
1088 | - a.out-i386-linux) |
1089 | - echo "${UNAME_MACHINE}-pc-linux-gnuaout" |
1090 | - exit ;; |
1091 | - "") |
1092 | - # Either a pre-BFD a.out linker (linux-gnuoldld) or |
1093 | - # one that does not give us useful --help. |
1094 | - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" |
1095 | - exit ;; |
1096 | - esac |
1097 | - # Determine whether the default compiler is a.out or elf |
1098 | - eval $set_cc_for_build |
1099 | - sed 's/^ //' << EOF >$dummy.c |
1100 | - #include <features.h> |
1101 | - #ifdef __ELF__ |
1102 | - # ifdef __GLIBC__ |
1103 | - # if __GLIBC__ >= 2 |
1104 | - LIBC=gnu |
1105 | - # else |
1106 | - LIBC=gnulibc1 |
1107 | - # endif |
1108 | - # else |
1109 | - LIBC=gnulibc1 |
1110 | - # endif |
1111 | - #else |
1112 | - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) |
1113 | - LIBC=gnu |
1114 | - #else |
1115 | - LIBC=gnuaout |
1116 | - #endif |
1117 | - #endif |
1118 | - #ifdef __dietlibc__ |
1119 | - LIBC=dietlibc |
1120 | - #endif |
1121 | -EOF |
1122 | - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
1123 | - /^LIBC/{ |
1124 | - s: ::g |
1125 | - p |
1126 | - }'`" |
1127 | - test x"${LIBC}" != x && { |
1128 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
1129 | - exit |
1130 | - } |
1131 | - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } |
1132 | - ;; |
1133 | i*86:DYNIX/ptx:4*:*) |
1134 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1135 | # earlier versions are messed up and put the nodename in both |
1136 | @@ -1053,11 +1021,11 @@ |
1137 | echo i386-sequent-sysv4 |
1138 | exit ;; |
1139 | i*86:UNIX_SV:4.2MP:2.*) |
1140 | - # Unixware is an offshoot of SVR4, but it has its own version |
1141 | - # number series starting with 2... |
1142 | - # I am not positive that other SVR4 systems won't match this, |
1143 | + # Unixware is an offshoot of SVR4, but it has its own version |
1144 | + # number series starting with 2... |
1145 | + # I am not positive that other SVR4 systems won't match this, |
1146 | # I just have to hope. -- rms. |
1147 | - # Use sysv4.2uw... so that sysv4* matches it. |
1148 | + # Use sysv4.2uw... so that sysv4* matches it. |
1149 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
1150 | exit ;; |
1151 | i*86:OS/2:*:*) |
1152 | @@ -1074,7 +1042,7 @@ |
1153 | i*86:syllable:*:*) |
1154 | echo ${UNAME_MACHINE}-pc-syllable |
1155 | exit ;; |
1156 | - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) |
1157 | + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
1158 | echo i386-unknown-lynxos${UNAME_RELEASE} |
1159 | exit ;; |
1160 | i*86:*DOS:*:*) |
1161 | @@ -1089,7 +1057,7 @@ |
1162 | fi |
1163 | exit ;; |
1164 | i*86:*:5:[678]*) |
1165 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1166 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1167 | case `/bin/uname -X | grep "^Machine"` in |
1168 | *486*) UNAME_MACHINE=i486 ;; |
1169 | *Pentium) UNAME_MACHINE=i586 ;; |
1170 | @@ -1117,13 +1085,13 @@ |
1171 | exit ;; |
1172 | pc:*:*:*) |
1173 | # Left here for compatibility: |
1174 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1175 | - # the processor, so we play safe by assuming i586. |
1176 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1177 | + # the processor, so we play safe by assuming i586. |
1178 | # Note: whatever this is, it MUST be the same as what config.sub |
1179 | # prints for the "djgpp" host, or else GDB configury will decide that |
1180 | # this is a cross-build. |
1181 | echo i586-pc-msdosdjgpp |
1182 | - exit ;; |
1183 | + exit ;; |
1184 | Intel:Mach:3*:*) |
1185 | echo i386-pc-mach3 |
1186 | exit ;; |
1187 | @@ -1158,8 +1126,8 @@ |
1188 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1189 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
1190 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1191 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1192 | - && { echo i486-ncr-sysv4; exit; } ;; |
1193 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1194 | + && { echo i486-ncr-sysv4; exit; } ;; |
1195 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
1196 | OS_REL='.3' |
1197 | test -r /etc/.relid \ |
1198 | @@ -1182,7 +1150,7 @@ |
1199 | rs6000:LynxOS:2.*:*) |
1200 | echo rs6000-unknown-lynxos${UNAME_RELEASE} |
1201 | exit ;; |
1202 | - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) |
1203 | + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
1204 | echo powerpc-unknown-lynxos${UNAME_RELEASE} |
1205 | exit ;; |
1206 | SM[BE]S:UNIX_SV:*:*) |
1207 | @@ -1202,10 +1170,10 @@ |
1208 | echo ns32k-sni-sysv |
1209 | fi |
1210 | exit ;; |
1211 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1212 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
1213 | - echo i586-unisys-sysv4 |
1214 | - exit ;; |
1215 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1216 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
1217 | + echo i586-unisys-sysv4 |
1218 | + exit ;; |
1219 | *:UNIX_System_V:4*:FTX*) |
1220 | # From Gerald Hewes <hewes@openmarket.com>. |
1221 | # How about differentiating between stratus architectures? -djm |
1222 | @@ -1231,11 +1199,11 @@ |
1223 | exit ;; |
1224 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1225 | if [ -d /usr/nec ]; then |
1226 | - echo mips-nec-sysv${UNAME_RELEASE} |
1227 | + echo mips-nec-sysv${UNAME_RELEASE} |
1228 | else |
1229 | - echo mips-unknown-sysv${UNAME_RELEASE} |
1230 | + echo mips-unknown-sysv${UNAME_RELEASE} |
1231 | fi |
1232 | - exit ;; |
1233 | + exit ;; |
1234 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1235 | echo powerpc-be-beos |
1236 | exit ;; |
1237 | @@ -1275,6 +1243,16 @@ |
1238 | *:Darwin:*:*) |
1239 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1240 | case $UNAME_PROCESSOR in |
1241 | + i386) |
1242 | + eval $set_cc_for_build |
1243 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1244 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1245 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1246 | + grep IS_64BIT_ARCH >/dev/null |
1247 | + then |
1248 | + UNAME_PROCESSOR="x86_64" |
1249 | + fi |
1250 | + fi ;; |
1251 | unknown) UNAME_PROCESSOR=powerpc ;; |
1252 | esac |
1253 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
1254 | @@ -1290,6 +1268,9 @@ |
1255 | *:QNX:*:4*) |
1256 | echo i386-pc-qnx |
1257 | exit ;; |
1258 | + NEO-?:NONSTOP_KERNEL:*:*) |
1259 | + echo neo-tandem-nsk${UNAME_RELEASE} |
1260 | + exit ;; |
1261 | NSE-?:NONSTOP_KERNEL:*:*) |
1262 | echo nse-tandem-nsk${UNAME_RELEASE} |
1263 | exit ;; |
1264 | @@ -1335,13 +1316,13 @@ |
1265 | echo pdp10-unknown-its |
1266 | exit ;; |
1267 | SEI:*:*:SEIUX) |
1268 | - echo mips-sei-seiux${UNAME_RELEASE} |
1269 | + echo mips-sei-seiux${UNAME_RELEASE} |
1270 | exit ;; |
1271 | *:DragonFly:*:*) |
1272 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
1273 | exit ;; |
1274 | *:*VMS:*:*) |
1275 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1276 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1277 | case "${UNAME_MACHINE}" in |
1278 | A*) echo alpha-dec-vms ; exit ;; |
1279 | I*) echo ia64-dec-vms ; exit ;; |
1280 | @@ -1359,6 +1340,9 @@ |
1281 | i*86:AROS:*:*) |
1282 | echo ${UNAME_MACHINE}-pc-aros |
1283 | exit ;; |
1284 | + x86_64:VMkernel:*:*) |
1285 | + echo ${UNAME_MACHINE}-unknown-esx |
1286 | + exit ;; |
1287 | esac |
1288 | |
1289 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
1290 | @@ -1381,11 +1365,11 @@ |
1291 | #include <sys/param.h> |
1292 | printf ("m68k-sony-newsos%s\n", |
1293 | #ifdef NEWSOS4 |
1294 | - "4" |
1295 | + "4" |
1296 | #else |
1297 | - "" |
1298 | + "" |
1299 | #endif |
1300 | - ); exit (0); |
1301 | + ); exit (0); |
1302 | #endif |
1303 | #endif |
1304 | |
1305 | |
1306 | === modified file 'config.sub' |
1307 | --- config.sub 2009-12-25 18:35:56 +0000 |
1308 | +++ config.sub 2013-11-19 05:32:50 +0000 |
1309 | @@ -1,10 +1,10 @@ |
1310 | #! /bin/sh |
1311 | # Configuration validation subroutine script. |
1312 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1313 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
1314 | -# Free Software Foundation, Inc. |
1315 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1316 | +# 2011, 2012 Free Software Foundation, Inc. |
1317 | |
1318 | -timestamp='2009-04-17' |
1319 | +timestamp='2012-02-10' |
1320 | |
1321 | # This file is (in principle) common to ALL GNU software. |
1322 | # The presence of a machine in this file suggests that SOME GNU software |
1323 | @@ -21,9 +21,7 @@ |
1324 | # GNU General Public License for more details. |
1325 | # |
1326 | # You should have received a copy of the GNU General Public License |
1327 | -# along with this program; if not, write to the Free Software |
1328 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
1329 | -# 02110-1301, USA. |
1330 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
1331 | # |
1332 | # As a special exception to the GNU General Public License, if you |
1333 | # distribute this file as part of a program that contains a |
1334 | @@ -32,13 +30,16 @@ |
1335 | |
1336 | |
1337 | # Please send patches to <config-patches@gnu.org>. Submit a context |
1338 | -# diff and a properly formatted ChangeLog entry. |
1339 | +# diff and a properly formatted GNU ChangeLog entry. |
1340 | # |
1341 | # Configuration subroutine to validate and canonicalize a configuration type. |
1342 | # Supply the specified configuration type as an argument. |
1343 | # If it is invalid, we print an error message on stderr and exit with code 1. |
1344 | # Otherwise, we print the canonical config type on stdout and succeed. |
1345 | |
1346 | +# You can get the latest version of this script from: |
1347 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
1348 | + |
1349 | # This file is supposed to be the same for all GNU packages |
1350 | # and recognize all the CPU types, system types and aliases |
1351 | # that are meaningful with *any* GNU software. |
1352 | @@ -72,8 +73,9 @@ |
1353 | version="\ |
1354 | GNU config.sub ($timestamp) |
1355 | |
1356 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
1357 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
1358 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1359 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1360 | +Free Software Foundation, Inc. |
1361 | |
1362 | This is free software; see the source for copying conditions. There is NO |
1363 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1364 | @@ -120,13 +122,18 @@ |
1365 | # Here we must recognize all the valid KERNEL-OS combinations. |
1366 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1367 | case $maybe_os in |
1368 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
1369 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
1370 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1371 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1372 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
1373 | kopensolaris*-gnu* | \ |
1374 | storm-chaos* | os2-emx* | rtmk-nova*) |
1375 | os=-$maybe_os |
1376 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
1377 | ;; |
1378 | + android-linux) |
1379 | + os=-linux-android |
1380 | + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
1381 | + ;; |
1382 | *) |
1383 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
1384 | if [ $basic_machine != $1 ] |
1385 | @@ -149,10 +156,13 @@ |
1386 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
1387 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
1388 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
1389 | - -apple | -axis | -knuth | -cray) |
1390 | + -apple | -axis | -knuth | -cray | -microblaze) |
1391 | os= |
1392 | basic_machine=$1 |
1393 | ;; |
1394 | + -bluegene*) |
1395 | + os=-cnk |
1396 | + ;; |
1397 | -sim | -cisco | -oki | -wec | -winbond) |
1398 | os= |
1399 | basic_machine=$1 |
1400 | @@ -167,10 +177,10 @@ |
1401 | os=-chorusos |
1402 | basic_machine=$1 |
1403 | ;; |
1404 | - -chorusrdb) |
1405 | - os=-chorusrdb |
1406 | + -chorusrdb) |
1407 | + os=-chorusrdb |
1408 | basic_machine=$1 |
1409 | - ;; |
1410 | + ;; |
1411 | -hiux*) |
1412 | os=-hiuxwe2 |
1413 | ;; |
1414 | @@ -239,17 +249,22 @@ |
1415 | # Some are omitted here because they have special meanings below. |
1416 | 1750a | 580 \ |
1417 | | a29k \ |
1418 | + | aarch64 | aarch64_be \ |
1419 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
1420 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
1421 | | am33_2.0 \ |
1422 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
1423 | + | be32 | be64 \ |
1424 | | bfin \ |
1425 | | c4x | clipper \ |
1426 | - | d10v | d30v | dlx | dsp16xx \ |
1427 | + | d10v | d30v | dlx | dsp16xx | dvp \ |
1428 | + | epiphany \ |
1429 | | fido | fr30 | frv \ |
1430 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
1431 | + | hexagon \ |
1432 | | i370 | i860 | i960 | ia64 \ |
1433 | | ip2k | iq2000 \ |
1434 | + | le32 | le64 \ |
1435 | | lm32 \ |
1436 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1437 | | maxq | mb | microblaze | mcore | mep | metag \ |
1438 | @@ -275,27 +290,39 @@ |
1439 | | moxie \ |
1440 | | mt \ |
1441 | | msp430 \ |
1442 | + | nds32 | nds32le | nds32be \ |
1443 | | nios | nios2 \ |
1444 | | ns16k | ns32k \ |
1445 | + | open8 \ |
1446 | | or32 \ |
1447 | | pdp10 | pdp11 | pj | pjl \ |
1448 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
1449 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
1450 | | pyramid \ |
1451 | + | rl78 | rx \ |
1452 | | score \ |
1453 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
1454 | | sh64 | sh64le \ |
1455 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
1456 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
1457 | - | spu | strongarm \ |
1458 | - | tahoe | thumb | tic4x | tic80 | tron \ |
1459 | - | v850 | v850e \ |
1460 | + | spu \ |
1461 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
1462 | + | ubicom32 \ |
1463 | + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
1464 | | we32k \ |
1465 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
1466 | + | x86 | xc16x | xstormy16 | xtensa \ |
1467 | | z8k | z80) |
1468 | basic_machine=$basic_machine-unknown |
1469 | ;; |
1470 | - m6811 | m68hc11 | m6812 | m68hc12) |
1471 | - # Motorola 68HC11/12. |
1472 | + c54x) |
1473 | + basic_machine=tic54x-unknown |
1474 | + ;; |
1475 | + c55x) |
1476 | + basic_machine=tic55x-unknown |
1477 | + ;; |
1478 | + c6x) |
1479 | + basic_machine=tic6x-unknown |
1480 | + ;; |
1481 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
1482 | basic_machine=$basic_machine-unknown |
1483 | os=-none |
1484 | ;; |
1485 | @@ -305,6 +332,21 @@ |
1486 | basic_machine=mt-unknown |
1487 | ;; |
1488 | |
1489 | + strongarm | thumb | xscale) |
1490 | + basic_machine=arm-unknown |
1491 | + ;; |
1492 | + xgate) |
1493 | + basic_machine=$basic_machine-unknown |
1494 | + os=-none |
1495 | + ;; |
1496 | + xscaleeb) |
1497 | + basic_machine=armeb-unknown |
1498 | + ;; |
1499 | + |
1500 | + xscaleel) |
1501 | + basic_machine=armel-unknown |
1502 | + ;; |
1503 | + |
1504 | # We use `pc' rather than `unknown' |
1505 | # because (1) that's what they normally are, and |
1506 | # (2) the word "unknown" tends to confuse beginning users. |
1507 | @@ -319,25 +361,29 @@ |
1508 | # Recognize the basic CPU types with company name. |
1509 | 580-* \ |
1510 | | a29k-* \ |
1511 | + | aarch64-* | aarch64_be-* \ |
1512 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
1513 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
1514 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
1515 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
1516 | | avr-* | avr32-* \ |
1517 | + | be32-* | be64-* \ |
1518 | | bfin-* | bs2000-* \ |
1519 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
1520 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
1521 | | clipper-* | craynv-* | cydra-* \ |
1522 | | d10v-* | d30v-* | dlx-* \ |
1523 | | elxsi-* \ |
1524 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
1525 | | h8300-* | h8500-* \ |
1526 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
1527 | + | hexagon-* \ |
1528 | | i*86-* | i860-* | i960-* | ia64-* \ |
1529 | | ip2k-* | iq2000-* \ |
1530 | + | le32-* | le64-* \ |
1531 | | lm32-* \ |
1532 | | m32c-* | m32r-* | m32rle-* \ |
1533 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
1534 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
1535 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
1536 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
1537 | | mips16-* \ |
1538 | | mips64-* | mips64el-* \ |
1539 | @@ -359,24 +405,29 @@ |
1540 | | mmix-* \ |
1541 | | mt-* \ |
1542 | | msp430-* \ |
1543 | + | nds32-* | nds32le-* | nds32be-* \ |
1544 | | nios-* | nios2-* \ |
1545 | | none-* | np1-* | ns16k-* | ns32k-* \ |
1546 | + | open8-* \ |
1547 | | orion-* \ |
1548 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
1549 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
1550 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
1551 | | pyramid-* \ |
1552 | - | romp-* | rs6000-* \ |
1553 | + | rl78-* | romp-* | rs6000-* | rx-* \ |
1554 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
1555 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
1556 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
1557 | | sparclite-* \ |
1558 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
1559 | - | tahoe-* | thumb-* \ |
1560 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
1561 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
1562 | + | tahoe-* \ |
1563 | + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
1564 | + | tile*-* \ |
1565 | | tron-* \ |
1566 | - | v850-* | v850e-* | vax-* \ |
1567 | + | ubicom32-* \ |
1568 | + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
1569 | + | vax-* \ |
1570 | | we32k-* \ |
1571 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
1572 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
1573 | | xstormy16-* | xtensa*-* \ |
1574 | | ymp-* \ |
1575 | | z8k-* | z80-*) |
1576 | @@ -401,7 +452,7 @@ |
1577 | basic_machine=a29k-amd |
1578 | os=-udi |
1579 | ;; |
1580 | - abacus) |
1581 | + abacus) |
1582 | basic_machine=abacus-unknown |
1583 | ;; |
1584 | adobe68k) |
1585 | @@ -467,11 +518,24 @@ |
1586 | basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
1587 | os=-linux |
1588 | ;; |
1589 | + bluegene*) |
1590 | + basic_machine=powerpc-ibm |
1591 | + os=-cnk |
1592 | + ;; |
1593 | + c54x-*) |
1594 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1595 | + ;; |
1596 | + c55x-*) |
1597 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1598 | + ;; |
1599 | + c6x-*) |
1600 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1601 | + ;; |
1602 | c90) |
1603 | basic_machine=c90-cray |
1604 | os=-unicos |
1605 | ;; |
1606 | - cegcc) |
1607 | + cegcc) |
1608 | basic_machine=arm-unknown |
1609 | os=-cegcc |
1610 | ;; |
1611 | @@ -503,7 +567,7 @@ |
1612 | basic_machine=craynv-cray |
1613 | os=-unicosmp |
1614 | ;; |
1615 | - cr16) |
1616 | + cr16 | cr16-*) |
1617 | basic_machine=cr16-unknown |
1618 | os=-elf |
1619 | ;; |
1620 | @@ -661,7 +725,6 @@ |
1621 | i370-ibm* | ibm*) |
1622 | basic_machine=i370-ibm |
1623 | ;; |
1624 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
1625 | i*86v32) |
1626 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
1627 | os=-sysv32 |
1628 | @@ -719,6 +782,9 @@ |
1629 | basic_machine=ns32k-utek |
1630 | os=-sysv |
1631 | ;; |
1632 | + microblaze) |
1633 | + basic_machine=microblaze-xilinx |
1634 | + ;; |
1635 | mingw32) |
1636 | basic_machine=i386-pc |
1637 | os=-mingw32 |
1638 | @@ -734,6 +800,24 @@ |
1639 | basic_machine=m68k-atari |
1640 | os=-mint |
1641 | ;; |
1642 | + mipsEE* | ee | ps2) |
1643 | + basic_machine=mips64r5900el-scei |
1644 | + case $os in |
1645 | + -linux*) |
1646 | + ;; |
1647 | + *) |
1648 | + os=-elf |
1649 | + ;; |
1650 | + esac |
1651 | + ;; |
1652 | + iop) |
1653 | + basic_machine=mipsel-scei |
1654 | + os=-irx |
1655 | + ;; |
1656 | + dvp) |
1657 | + basic_machine=dvp-scei |
1658 | + os=-elf |
1659 | + ;; |
1660 | mips3*-*) |
1661 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` |
1662 | ;; |
1663 | @@ -755,10 +839,18 @@ |
1664 | ms1-*) |
1665 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
1666 | ;; |
1667 | + msys) |
1668 | + basic_machine=i386-pc |
1669 | + os=-msys |
1670 | + ;; |
1671 | mvs) |
1672 | basic_machine=i370-ibm |
1673 | os=-mvs |
1674 | ;; |
1675 | + nacl) |
1676 | + basic_machine=le32-unknown |
1677 | + os=-nacl |
1678 | + ;; |
1679 | ncr3000) |
1680 | basic_machine=i486-ncr |
1681 | os=-sysv4 |
1682 | @@ -823,6 +915,12 @@ |
1683 | np1) |
1684 | basic_machine=np1-gould |
1685 | ;; |
1686 | + neo-tandem) |
1687 | + basic_machine=neo-tandem |
1688 | + ;; |
1689 | + nse-tandem) |
1690 | + basic_machine=nse-tandem |
1691 | + ;; |
1692 | nsr-tandem) |
1693 | basic_machine=nsr-tandem |
1694 | ;; |
1695 | @@ -905,9 +1003,10 @@ |
1696 | ;; |
1697 | power) basic_machine=power-ibm |
1698 | ;; |
1699 | - ppc) basic_machine=powerpc-unknown |
1700 | + ppc | ppcbe) basic_machine=powerpc-unknown |
1701 | ;; |
1702 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
1703 | + ppc-* | ppcbe-*) |
1704 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
1705 | ;; |
1706 | ppcle | powerpclittle | ppc-le | powerpc-little) |
1707 | basic_machine=powerpcle-unknown |
1708 | @@ -1001,6 +1100,9 @@ |
1709 | basic_machine=i860-stratus |
1710 | os=-sysv4 |
1711 | ;; |
1712 | + strongarm-* | thumb-*) |
1713 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
1714 | + ;; |
1715 | sun2) |
1716 | basic_machine=m68000-sun |
1717 | ;; |
1718 | @@ -1057,20 +1159,8 @@ |
1719 | basic_machine=t90-cray |
1720 | os=-unicos |
1721 | ;; |
1722 | - tic54x | c54x*) |
1723 | - basic_machine=tic54x-unknown |
1724 | - os=-coff |
1725 | - ;; |
1726 | - tic55x | c55x*) |
1727 | - basic_machine=tic55x-unknown |
1728 | - os=-coff |
1729 | - ;; |
1730 | - tic6x | c6x*) |
1731 | - basic_machine=tic6x-unknown |
1732 | - os=-coff |
1733 | - ;; |
1734 | tile*) |
1735 | - basic_machine=tile-unknown |
1736 | + basic_machine=$basic_machine-unknown |
1737 | os=-linux-gnu |
1738 | ;; |
1739 | tx39) |
1740 | @@ -1140,6 +1230,9 @@ |
1741 | xps | xps100) |
1742 | basic_machine=xps100-honeywell |
1743 | ;; |
1744 | + xscale-* | xscalee[bl]-*) |
1745 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
1746 | + ;; |
1747 | ymp) |
1748 | basic_machine=ymp-cray |
1749 | os=-unicos |
1750 | @@ -1237,9 +1330,12 @@ |
1751 | if [ x"$os" != x"" ] |
1752 | then |
1753 | case $os in |
1754 | - # First match some system type aliases |
1755 | - # that might get confused with valid system types. |
1756 | + # First match some system type aliases |
1757 | + # that might get confused with valid system types. |
1758 | # -solaris* is a basic system type, with this one exception. |
1759 | + -auroraux) |
1760 | + os=-auroraux |
1761 | + ;; |
1762 | -solaris1 | -solaris1.*) |
1763 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
1764 | ;; |
1765 | @@ -1260,9 +1356,9 @@ |
1766 | # Each alternative MUST END IN A *, to match a version number. |
1767 | # -sysv* is not here because it comes later, after sysvr4. |
1768 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
1769 | - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ |
1770 | - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
1771 | - | -kopensolaris* \ |
1772 | + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
1773 | + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
1774 | + | -sym* | -kopensolaris* \ |
1775 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
1776 | | -aos* | -aros* \ |
1777 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
1778 | @@ -1274,16 +1370,17 @@ |
1779 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
1780 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1781 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1782 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1783 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
1784 | + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1785 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
1786 | + | -linux-newlib* | -linux-uclibc* \ |
1787 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1788 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1789 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1790 | - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
1791 | + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ |
1792 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
1793 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
1794 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
1795 | - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
1796 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
1797 | # Remember, each alternative MUST END IN *, to match a version number. |
1798 | ;; |
1799 | -qnx*) |
1800 | @@ -1322,7 +1419,7 @@ |
1801 | -opened*) |
1802 | os=-openedition |
1803 | ;; |
1804 | - -os400*) |
1805 | + -os400*) |
1806 | os=-os400 |
1807 | ;; |
1808 | -wince*) |
1809 | @@ -1371,7 +1468,7 @@ |
1810 | -sinix*) |
1811 | os=-sysv4 |
1812 | ;; |
1813 | - -tpf*) |
1814 | + -tpf*) |
1815 | os=-tpf |
1816 | ;; |
1817 | -triton*) |
1818 | @@ -1416,6 +1513,8 @@ |
1819 | -dicos*) |
1820 | os=-dicos |
1821 | ;; |
1822 | + -nacl*) |
1823 | + ;; |
1824 | -none) |
1825 | ;; |
1826 | *) |
1827 | @@ -1438,10 +1537,10 @@ |
1828 | # system, and we'll never get to this point. |
1829 | |
1830 | case $basic_machine in |
1831 | - score-*) |
1832 | + score-*) |
1833 | os=-elf |
1834 | ;; |
1835 | - spu-*) |
1836 | + spu-*) |
1837 | os=-elf |
1838 | ;; |
1839 | *-acorn) |
1840 | @@ -1453,8 +1552,17 @@ |
1841 | arm*-semi) |
1842 | os=-aout |
1843 | ;; |
1844 | - c4x-* | tic4x-*) |
1845 | - os=-coff |
1846 | + c4x-* | tic4x-*) |
1847 | + os=-coff |
1848 | + ;; |
1849 | + tic54x-*) |
1850 | + os=-coff |
1851 | + ;; |
1852 | + tic55x-*) |
1853 | + os=-coff |
1854 | + ;; |
1855 | + tic6x-*) |
1856 | + os=-coff |
1857 | ;; |
1858 | # This must come before the *-dec entry. |
1859 | pdp10-*) |
1860 | @@ -1474,14 +1582,11 @@ |
1861 | ;; |
1862 | m68000-sun) |
1863 | os=-sunos3 |
1864 | - # This also exists in the configure program, but was not the |
1865 | - # default. |
1866 | - # os=-sunos4 |
1867 | ;; |
1868 | m68*-cisco) |
1869 | os=-aout |
1870 | ;; |
1871 | - mep-*) |
1872 | + mep-*) |
1873 | os=-elf |
1874 | ;; |
1875 | mips*-cisco) |
1876 | @@ -1508,7 +1613,7 @@ |
1877 | *-ibm) |
1878 | os=-aix |
1879 | ;; |
1880 | - *-knuth) |
1881 | + *-knuth) |
1882 | os=-mmixware |
1883 | ;; |
1884 | *-wec) |
1885 | @@ -1613,7 +1718,7 @@ |
1886 | -sunos*) |
1887 | vendor=sun |
1888 | ;; |
1889 | - -aix*) |
1890 | + -cnk*|-aix*) |
1891 | vendor=ibm |
1892 | ;; |
1893 | -beos*) |
1894 | |
1895 | === modified file 'configure' |
1896 | --- configure 2009-12-25 18:35:56 +0000 |
1897 | +++ configure 2013-11-19 05:32:50 +0000 |
1898 | @@ -1,11 +1,13 @@ |
1899 | #! /bin/sh |
1900 | # Guess values for system-dependent variables and create Makefiles. |
1901 | -# Generated by GNU Autoconf 2.64 for OGMRipOggz 0.2. |
1902 | +# Generated by GNU Autoconf 2.68 for OGMRipOggz 0.3. |
1903 | +# |
1904 | # |
1905 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
1906 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software |
1907 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
1908 | # Foundation, Inc. |
1909 | # |
1910 | +# |
1911 | # This configure script is free software; the Free Software Foundation |
1912 | # gives unlimited permission to copy, distribute and modify it. |
1913 | ## -------------------- ## |
1914 | @@ -87,6 +89,7 @@ |
1915 | IFS=" "" $as_nl" |
1916 | |
1917 | # Find who we are. Look in the path if we contain no directory separator. |
1918 | +as_myself= |
1919 | case $0 in #(( |
1920 | *[\\/]* ) as_myself=$0 ;; |
1921 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1922 | @@ -169,6 +172,14 @@ |
1923 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1924 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1925 | test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 |
1926 | + |
1927 | + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( |
1928 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
1929 | + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO |
1930 | + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO |
1931 | + PATH=/empty FPATH=/empty; export PATH FPATH |
1932 | + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ |
1933 | + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 |
1934 | test \$(( 1 + 1 )) = 2 || exit 1" |
1935 | if (eval "$as_required") 2>/dev/null; then : |
1936 | as_have_required=yes |
1937 | @@ -212,11 +223,18 @@ |
1938 | # We cannot yet assume a decent shell, so we have to provide a |
1939 | # neutralization value for shells without unset; and this also |
1940 | # works around shells that cannot unset nonexistent variables. |
1941 | + # Preserve -v and -x to the replacement shell. |
1942 | BASH_ENV=/dev/null |
1943 | ENV=/dev/null |
1944 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1945 | export CONFIG_SHELL |
1946 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
1947 | + case $- in # (((( |
1948 | + *v*x* | *x*v* ) as_opts=-vx ;; |
1949 | + *v* ) as_opts=-v ;; |
1950 | + *x* ) as_opts=-x ;; |
1951 | + * ) as_opts= ;; |
1952 | + esac |
1953 | + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
1954 | fi |
1955 | |
1956 | if test x$as_have_required = xno; then : |
1957 | @@ -314,7 +332,7 @@ |
1958 | test -d "$as_dir" && break |
1959 | done |
1960 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
1961 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
1962 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
1963 | |
1964 | |
1965 | } # as_fn_mkdir_p |
1966 | @@ -354,19 +372,19 @@ |
1967 | fi # as_fn_arith |
1968 | |
1969 | |
1970 | -# as_fn_error ERROR [LINENO LOG_FD] |
1971 | -# --------------------------------- |
1972 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
1973 | +# ---------------------------------------- |
1974 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
1975 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
1976 | -# script with status $?, using 1 if that was 0. |
1977 | +# script with STATUS, using 1 if that was 0. |
1978 | as_fn_error () |
1979 | { |
1980 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
1981 | - if test "$3"; then |
1982 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1983 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
1984 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
1985 | + if test "$4"; then |
1986 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1987 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
1988 | fi |
1989 | - $as_echo "$as_me: error: $1" >&2 |
1990 | + $as_echo "$as_me: error: $2" >&2 |
1991 | as_fn_exit $as_status |
1992 | } # as_fn_error |
1993 | |
1994 | @@ -523,160 +541,14 @@ |
1995 | # Sed expression to map a string onto a valid variable name. |
1996 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
1997 | |
1998 | - |
1999 | - |
2000 | -# Check that we are running under the correct shell. |
2001 | SHELL=${CONFIG_SHELL-/bin/sh} |
2002 | |
2003 | -case X$lt_ECHO in |
2004 | -X*--fallback-echo) |
2005 | - # Remove one level of quotation (which was required for Make). |
2006 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` |
2007 | - ;; |
2008 | -esac |
2009 | - |
2010 | -ECHO=${lt_ECHO-echo} |
2011 | -if test "X$1" = X--no-reexec; then |
2012 | - # Discard the --no-reexec flag, and continue. |
2013 | - shift |
2014 | -elif test "X$1" = X--fallback-echo; then |
2015 | - # Avoid inline document here, it may be left over |
2016 | - : |
2017 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
2018 | - # Yippee, $ECHO works! |
2019 | - : |
2020 | -else |
2021 | - # Restart under the correct shell. |
2022 | - exec $SHELL "$0" --no-reexec ${1+"$@"} |
2023 | -fi |
2024 | - |
2025 | -if test "X$1" = X--fallback-echo; then |
2026 | - # used as fallback echo |
2027 | - shift |
2028 | - cat <<_LT_EOF |
2029 | -$* |
2030 | -_LT_EOF |
2031 | - exit 0 |
2032 | -fi |
2033 | - |
2034 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
2035 | -# if CDPATH is set. |
2036 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
2037 | - |
2038 | -if test -z "$lt_ECHO"; then |
2039 | - if test "X${echo_test_string+set}" != Xset; then |
2040 | - # find a string as large as possible, as long as the shell can cope with it |
2041 | - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do |
2042 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
2043 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
2044 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
2045 | - then |
2046 | - break |
2047 | - fi |
2048 | - done |
2049 | - fi |
2050 | - |
2051 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2052 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2053 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2054 | - : |
2055 | - else |
2056 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
2057 | - # backslashes. This makes it impossible to quote backslashes using |
2058 | - # echo "$something" | sed 's/\\/\\\\/g' |
2059 | - # |
2060 | - # So, first we look for a working echo in the user's PATH. |
2061 | - |
2062 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2063 | - for dir in $PATH /usr/ucb; do |
2064 | - IFS="$lt_save_ifs" |
2065 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
2066 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
2067 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
2068 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2069 | - ECHO="$dir/echo" |
2070 | - break |
2071 | - fi |
2072 | - done |
2073 | - IFS="$lt_save_ifs" |
2074 | - |
2075 | - if test "X$ECHO" = Xecho; then |
2076 | - # We didn't find a better echo, so look for alternatives. |
2077 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
2078 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
2079 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2080 | - # This shell has a builtin print -r that does the trick. |
2081 | - ECHO='print -r' |
2082 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
2083 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
2084 | - # If we have ksh, try running configure again with it. |
2085 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
2086 | - export ORIGINAL_CONFIG_SHELL |
2087 | - CONFIG_SHELL=/bin/ksh |
2088 | - export CONFIG_SHELL |
2089 | - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} |
2090 | - else |
2091 | - # Try using printf. |
2092 | - ECHO='printf %s\n' |
2093 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2094 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2095 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2096 | - # Cool, printf works |
2097 | - : |
2098 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && |
2099 | - test "X$echo_testing_string" = 'X\t' && |
2100 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2101 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2102 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
2103 | - export CONFIG_SHELL |
2104 | - SHELL="$CONFIG_SHELL" |
2105 | - export SHELL |
2106 | - ECHO="$CONFIG_SHELL $0 --fallback-echo" |
2107 | - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && |
2108 | - test "X$echo_testing_string" = 'X\t' && |
2109 | - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2110 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2111 | - ECHO="$CONFIG_SHELL $0 --fallback-echo" |
2112 | - else |
2113 | - # maybe with a smaller string... |
2114 | - prev=: |
2115 | - |
2116 | - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do |
2117 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
2118 | - then |
2119 | - break |
2120 | - fi |
2121 | - prev="$cmd" |
2122 | - done |
2123 | - |
2124 | - if test "$prev" != 'sed 50q "$0"'; then |
2125 | - echo_test_string=`eval $prev` |
2126 | - export echo_test_string |
2127 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} |
2128 | - else |
2129 | - # Oops. We lost completely, so just stick with echo. |
2130 | - ECHO=echo |
2131 | - fi |
2132 | - fi |
2133 | - fi |
2134 | - fi |
2135 | - fi |
2136 | -fi |
2137 | - |
2138 | -# Copy echo and quote the copy suitably for passing to libtool from |
2139 | -# the Makefile, instead of quoting the original, which is used later. |
2140 | -lt_ECHO=$ECHO |
2141 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then |
2142 | - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" |
2143 | -fi |
2144 | - |
2145 | - |
2146 | - |
2147 | - |
2148 | -exec 7<&0 </dev/null 6>&1 |
2149 | + |
2150 | +test -n "$DJDIR" || exec 7<&0 </dev/null |
2151 | +exec 6>&1 |
2152 | |
2153 | # Name of the host. |
2154 | -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
2155 | +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
2156 | # so uname gets run too. |
2157 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
2158 | |
2159 | @@ -695,8 +567,8 @@ |
2160 | # Identity of this package. |
2161 | PACKAGE_NAME='OGMRipOggz' |
2162 | PACKAGE_TARNAME='ogmripoggz' |
2163 | -PACKAGE_VERSION='0.2' |
2164 | -PACKAGE_STRING='OGMRipOggz 0.2' |
2165 | +PACKAGE_VERSION='0.3' |
2166 | +PACKAGE_STRING='OGMRipOggz 0.3' |
2167 | PACKAGE_BUGREPORT='' |
2168 | PACKAGE_URL='' |
2169 | |
2170 | @@ -763,6 +635,13 @@ |
2171 | INTLTOOL_KEYS_RULE |
2172 | INTLTOOL_DIRECTORY_RULE |
2173 | INTLTOOL_DESKTOP_RULE |
2174 | +intltool__v_merge_options_0 |
2175 | +intltool__v_merge_options_ |
2176 | +INTLTOOL_V_MERGE_OPTIONS |
2177 | +INTLTOOL__v_MERGE_0 |
2178 | +INTLTOOL__v_MERGE_ |
2179 | +INTLTOOL_V_MERGE |
2180 | +AM_DEFAULT_VERBOSITY |
2181 | INTLTOOL_EXTRACT |
2182 | INTLTOOL_MERGE |
2183 | INTLTOOL_UPDATE |
2184 | @@ -783,9 +662,12 @@ |
2185 | MSGFMT |
2186 | USE_NLS |
2187 | GETTEXT_PACKAGE |
2188 | -OGMRIP_PREFIX |
2189 | +OGMRIP_PROFDIR |
2190 | +OGMRIP_PLUGDIR |
2191 | OGMRIP_LIBS |
2192 | OGMRIP_CFLAGS |
2193 | +PKG_CONFIG_LIBDIR |
2194 | +PKG_CONFIG_PATH |
2195 | PKG_CONFIG |
2196 | MAINT |
2197 | MAINTAINER_MODE_FALSE |
2198 | @@ -796,9 +678,11 @@ |
2199 | LIPO |
2200 | NMEDIT |
2201 | DSYMUTIL |
2202 | -lt_ECHO |
2203 | +MANIFEST_TOOL |
2204 | RANLIB |
2205 | +ac_ct_AR |
2206 | AR |
2207 | +DLLTOOL |
2208 | OBJDUMP |
2209 | LN_S |
2210 | NM |
2211 | @@ -904,6 +788,7 @@ |
2212 | with_pic |
2213 | enable_fast_install |
2214 | with_gnu_ld |
2215 | +with_sysroot |
2216 | enable_libtool_lock |
2217 | enable_maintainer_mode |
2218 | enable_nls |
2219 | @@ -918,6 +803,8 @@ |
2220 | CPPFLAGS |
2221 | CPP |
2222 | PKG_CONFIG |
2223 | +PKG_CONFIG_PATH |
2224 | +PKG_CONFIG_LIBDIR |
2225 | OGMRIP_CFLAGS |
2226 | OGMRIP_LIBS' |
2227 | |
2228 | @@ -982,8 +869,9 @@ |
2229 | fi |
2230 | |
2231 | case $ac_option in |
2232 | - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
2233 | - *) ac_optarg=yes ;; |
2234 | + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
2235 | + *=) ac_optarg= ;; |
2236 | + *) ac_optarg=yes ;; |
2237 | esac |
2238 | |
2239 | # Accept the important Cygnus configure options, so we can diagnose typos. |
2240 | @@ -1028,7 +916,7 @@ |
2241 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
2242 | # Reject names that are not valid shell variable names. |
2243 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2244 | - as_fn_error "invalid feature name: $ac_useropt" |
2245 | + as_fn_error $? "invalid feature name: $ac_useropt" |
2246 | ac_useropt_orig=$ac_useropt |
2247 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2248 | case $ac_user_opts in |
2249 | @@ -1054,7 +942,7 @@ |
2250 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
2251 | # Reject names that are not valid shell variable names. |
2252 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2253 | - as_fn_error "invalid feature name: $ac_useropt" |
2254 | + as_fn_error $? "invalid feature name: $ac_useropt" |
2255 | ac_useropt_orig=$ac_useropt |
2256 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2257 | case $ac_user_opts in |
2258 | @@ -1258,7 +1146,7 @@ |
2259 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
2260 | # Reject names that are not valid shell variable names. |
2261 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2262 | - as_fn_error "invalid package name: $ac_useropt" |
2263 | + as_fn_error $? "invalid package name: $ac_useropt" |
2264 | ac_useropt_orig=$ac_useropt |
2265 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2266 | case $ac_user_opts in |
2267 | @@ -1274,7 +1162,7 @@ |
2268 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
2269 | # Reject names that are not valid shell variable names. |
2270 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2271 | - as_fn_error "invalid package name: $ac_useropt" |
2272 | + as_fn_error $? "invalid package name: $ac_useropt" |
2273 | ac_useropt_orig=$ac_useropt |
2274 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2275 | case $ac_user_opts in |
2276 | @@ -1304,8 +1192,8 @@ |
2277 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
2278 | x_libraries=$ac_optarg ;; |
2279 | |
2280 | - -*) as_fn_error "unrecognized option: \`$ac_option' |
2281 | -Try \`$0 --help' for more information." |
2282 | + -*) as_fn_error $? "unrecognized option: \`$ac_option' |
2283 | +Try \`$0 --help' for more information" |
2284 | ;; |
2285 | |
2286 | *=*) |
2287 | @@ -1313,7 +1201,7 @@ |
2288 | # Reject names that are not valid shell variable names. |
2289 | case $ac_envvar in #( |
2290 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
2291 | - as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
2292 | + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
2293 | esac |
2294 | eval $ac_envvar=\$ac_optarg |
2295 | export $ac_envvar ;; |
2296 | @@ -1323,7 +1211,7 @@ |
2297 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
2298 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
2299 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
2300 | - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
2301 | + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" |
2302 | ;; |
2303 | |
2304 | esac |
2305 | @@ -1331,13 +1219,13 @@ |
2306 | |
2307 | if test -n "$ac_prev"; then |
2308 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
2309 | - as_fn_error "missing argument to $ac_option" |
2310 | + as_fn_error $? "missing argument to $ac_option" |
2311 | fi |
2312 | |
2313 | if test -n "$ac_unrecognized_opts"; then |
2314 | case $enable_option_checking in |
2315 | no) ;; |
2316 | - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
2317 | + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
2318 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
2319 | esac |
2320 | fi |
2321 | @@ -1360,7 +1248,7 @@ |
2322 | [\\/$]* | ?:[\\/]* ) continue;; |
2323 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
2324 | esac |
2325 | - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
2326 | + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
2327 | done |
2328 | |
2329 | # There might be people who depend on the old broken behavior: `$host' |
2330 | @@ -1374,8 +1262,8 @@ |
2331 | if test "x$host_alias" != x; then |
2332 | if test "x$build_alias" = x; then |
2333 | cross_compiling=maybe |
2334 | - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
2335 | - If a cross compiler is detected then cross compile mode will be used." >&2 |
2336 | + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
2337 | + If a cross compiler is detected then cross compile mode will be used" >&2 |
2338 | elif test "x$build_alias" != "x$host_alias"; then |
2339 | cross_compiling=yes |
2340 | fi |
2341 | @@ -1390,9 +1278,9 @@ |
2342 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
2343 | ac_ls_di=`ls -di .` && |
2344 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
2345 | - as_fn_error "working directory cannot be determined" |
2346 | + as_fn_error $? "working directory cannot be determined" |
2347 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
2348 | - as_fn_error "pwd does not report name of working directory" |
2349 | + as_fn_error $? "pwd does not report name of working directory" |
2350 | |
2351 | |
2352 | # Find the source files, if location was not specified. |
2353 | @@ -1431,11 +1319,11 @@ |
2354 | fi |
2355 | if test ! -r "$srcdir/$ac_unique_file"; then |
2356 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
2357 | - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
2358 | + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
2359 | fi |
2360 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
2361 | ac_abs_confdir=`( |
2362 | - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
2363 | + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
2364 | pwd)` |
2365 | # When building in place, set srcdir=. |
2366 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
2367 | @@ -1461,7 +1349,7 @@ |
2368 | # Omit some internal or obsolete options to make the list less imposing. |
2369 | # This message is too long to be a string in the A/UX 3.1 sh. |
2370 | cat <<_ACEOF |
2371 | -\`configure' configures OGMRipOggz 0.2 to adapt to many kinds of systems. |
2372 | +\`configure' configures OGMRipOggz 0.3 to adapt to many kinds of systems. |
2373 | |
2374 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2375 | |
2376 | @@ -1475,7 +1363,7 @@ |
2377 | --help=short display options specific to this package |
2378 | --help=recursive display the short help of all the included packages |
2379 | -V, --version display version information and exit |
2380 | - -q, --quiet, --silent do not print \`checking...' messages |
2381 | + -q, --quiet, --silent do not print \`checking ...' messages |
2382 | --cache-file=FILE cache test results in FILE [disabled] |
2383 | -C, --config-cache alias for \`--cache-file=config.cache' |
2384 | -n, --no-create do not create output files |
2385 | @@ -1531,7 +1419,7 @@ |
2386 | |
2387 | if test -n "$ac_init_help"; then |
2388 | case $ac_init_help in |
2389 | - short | recursive ) echo "Configuration of OGMRipOggz 0.2:";; |
2390 | + short | recursive ) echo "Configuration of OGMRipOggz 0.3:";; |
2391 | esac |
2392 | cat <<\_ACEOF |
2393 | |
2394 | @@ -1556,6 +1444,8 @@ |
2395 | --with-pic try to use only PIC/non-PIC objects [default=use |
2396 | both] |
2397 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
2398 | + --with-sysroot=DIR Search for dependent libraries within DIR |
2399 | + (or the compiler's sysroot if not specified). |
2400 | |
2401 | Some influential environment variables: |
2402 | CC C compiler command |
2403 | @@ -1563,10 +1453,14 @@ |
2404 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
2405 | nonstandard directory <lib dir> |
2406 | LIBS libraries to pass to the linker, e.g. -l<library> |
2407 | - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if |
2408 | + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
2409 | you have headers in a nonstandard directory <include dir> |
2410 | CPP C preprocessor |
2411 | PKG_CONFIG path to pkg-config utility |
2412 | + PKG_CONFIG_PATH |
2413 | + directories to add to pkg-config's search path |
2414 | + PKG_CONFIG_LIBDIR |
2415 | + path overriding pkg-config's built-in search path |
2416 | OGMRIP_CFLAGS |
2417 | C compiler flags for OGMRIP, overriding pkg-config |
2418 | OGMRIP_LIBS linker flags for OGMRIP, overriding pkg-config |
2419 | @@ -1637,10 +1531,10 @@ |
2420 | test -n "$ac_init_help" && exit $ac_status |
2421 | if $ac_init_version; then |
2422 | cat <<\_ACEOF |
2423 | -OGMRipOggz configure 0.2 |
2424 | -generated by GNU Autoconf 2.64 |
2425 | +OGMRipOggz configure 0.3 |
2426 | +generated by GNU Autoconf 2.68 |
2427 | |
2428 | -Copyright (C) 2009 Free Software Foundation, Inc. |
2429 | +Copyright (C) 2010 Free Software Foundation, Inc. |
2430 | This configure script is free software; the Free Software Foundation |
2431 | gives unlimited permission to copy, distribute and modify it. |
2432 | _ACEOF |
2433 | @@ -1684,8 +1578,8 @@ |
2434 | |
2435 | ac_retval=1 |
2436 | fi |
2437 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2438 | - return $ac_retval |
2439 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2440 | + as_fn_set_status $ac_retval |
2441 | |
2442 | } # ac_fn_c_try_compile |
2443 | |
2444 | @@ -1730,8 +1624,8 @@ |
2445 | # interfere with the next link command; also delete a directory that is |
2446 | # left behind by Apple's compiler. We do this before executing the actions. |
2447 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
2448 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2449 | - return $ac_retval |
2450 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2451 | + as_fn_set_status $ac_retval |
2452 | |
2453 | } # ac_fn_c_try_link |
2454 | |
2455 | @@ -1744,7 +1638,7 @@ |
2456 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2457 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2458 | $as_echo_n "checking for $2... " >&6; } |
2459 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2460 | +if eval \${$3+:} false; then : |
2461 | $as_echo_n "(cached) " >&6 |
2462 | else |
2463 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2464 | @@ -1762,7 +1656,7 @@ |
2465 | eval ac_res=\$$3 |
2466 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2467 | $as_echo "$ac_res" >&6; } |
2468 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2469 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2470 | |
2471 | } # ac_fn_c_check_header_compile |
2472 | |
2473 | @@ -1787,7 +1681,7 @@ |
2474 | mv -f conftest.er1 conftest.err |
2475 | fi |
2476 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2477 | - test $ac_status = 0; } >/dev/null && { |
2478 | + test $ac_status = 0; } > conftest.i && { |
2479 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
2480 | test ! -s conftest.err |
2481 | }; then : |
2482 | @@ -1798,8 +1692,8 @@ |
2483 | |
2484 | ac_retval=1 |
2485 | fi |
2486 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2487 | - return $ac_retval |
2488 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2489 | + as_fn_set_status $ac_retval |
2490 | |
2491 | } # ac_fn_c_try_cpp |
2492 | |
2493 | @@ -1840,8 +1734,8 @@ |
2494 | ac_retval=$ac_status |
2495 | fi |
2496 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
2497 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2498 | - return $ac_retval |
2499 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2500 | + as_fn_set_status $ac_retval |
2501 | |
2502 | } # ac_fn_c_try_run |
2503 | |
2504 | @@ -1853,7 +1747,7 @@ |
2505 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2506 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2507 | $as_echo_n "checking for $2... " >&6; } |
2508 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2509 | +if eval \${$3+:} false; then : |
2510 | $as_echo_n "(cached) " >&6 |
2511 | else |
2512 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2513 | @@ -1908,7 +1802,7 @@ |
2514 | eval ac_res=\$$3 |
2515 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2516 | $as_echo "$ac_res" >&6; } |
2517 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2518 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2519 | |
2520 | } # ac_fn_c_check_func |
2521 | |
2522 | @@ -1920,10 +1814,10 @@ |
2523 | ac_fn_c_check_header_mongrel () |
2524 | { |
2525 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2526 | - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2527 | + if eval \${$3+:} false; then : |
2528 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2529 | $as_echo_n "checking for $2... " >&6; } |
2530 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2531 | +if eval \${$3+:} false; then : |
2532 | $as_echo_n "(cached) " >&6 |
2533 | fi |
2534 | eval ac_res=\$$3 |
2535 | @@ -1959,7 +1853,7 @@ |
2536 | else |
2537 | ac_header_preproc=no |
2538 | fi |
2539 | -rm -f conftest.err conftest.$ac_ext |
2540 | +rm -f conftest.err conftest.i conftest.$ac_ext |
2541 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 |
2542 | $as_echo "$ac_header_preproc" >&6; } |
2543 | |
2544 | @@ -1986,7 +1880,7 @@ |
2545 | esac |
2546 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2547 | $as_echo_n "checking for $2... " >&6; } |
2548 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2549 | +if eval \${$3+:} false; then : |
2550 | $as_echo_n "(cached) " >&6 |
2551 | else |
2552 | eval "$3=\$ac_header_compiler" |
2553 | @@ -1995,15 +1889,15 @@ |
2554 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2555 | $as_echo "$ac_res" >&6; } |
2556 | fi |
2557 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2558 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2559 | |
2560 | } # ac_fn_c_check_header_mongrel |
2561 | cat >config.log <<_ACEOF |
2562 | This file contains any messages produced by compilers while |
2563 | running configure, to aid debugging if configure makes a mistake. |
2564 | |
2565 | -It was created by OGMRipOggz $as_me 0.2, which was |
2566 | -generated by GNU Autoconf 2.64. Invocation command line was |
2567 | +It was created by OGMRipOggz $as_me 0.3, which was |
2568 | +generated by GNU Autoconf 2.68. Invocation command line was |
2569 | |
2570 | $ $0 $@ |
2571 | |
2572 | @@ -2113,11 +2007,9 @@ |
2573 | { |
2574 | echo |
2575 | |
2576 | - cat <<\_ASBOX |
2577 | -## ---------------- ## |
2578 | + $as_echo "## ---------------- ## |
2579 | ## Cache variables. ## |
2580 | -## ---------------- ## |
2581 | -_ASBOX |
2582 | +## ---------------- ##" |
2583 | echo |
2584 | # The following way of writing the cache mishandles newlines in values, |
2585 | ( |
2586 | @@ -2151,11 +2043,9 @@ |
2587 | ) |
2588 | echo |
2589 | |
2590 | - cat <<\_ASBOX |
2591 | -## ----------------- ## |
2592 | + $as_echo "## ----------------- ## |
2593 | ## Output variables. ## |
2594 | -## ----------------- ## |
2595 | -_ASBOX |
2596 | +## ----------------- ##" |
2597 | echo |
2598 | for ac_var in $ac_subst_vars |
2599 | do |
2600 | @@ -2168,11 +2058,9 @@ |
2601 | echo |
2602 | |
2603 | if test -n "$ac_subst_files"; then |
2604 | - cat <<\_ASBOX |
2605 | -## ------------------- ## |
2606 | + $as_echo "## ------------------- ## |
2607 | ## File substitutions. ## |
2608 | -## ------------------- ## |
2609 | -_ASBOX |
2610 | +## ------------------- ##" |
2611 | echo |
2612 | for ac_var in $ac_subst_files |
2613 | do |
2614 | @@ -2186,11 +2074,9 @@ |
2615 | fi |
2616 | |
2617 | if test -s confdefs.h; then |
2618 | - cat <<\_ASBOX |
2619 | -## ----------- ## |
2620 | + $as_echo "## ----------- ## |
2621 | ## confdefs.h. ## |
2622 | -## ----------- ## |
2623 | -_ASBOX |
2624 | +## ----------- ##" |
2625 | echo |
2626 | cat confdefs.h |
2627 | echo |
2628 | @@ -2245,7 +2131,12 @@ |
2629 | ac_site_file1=NONE |
2630 | ac_site_file2=NONE |
2631 | if test -n "$CONFIG_SITE"; then |
2632 | - ac_site_file1=$CONFIG_SITE |
2633 | + # We do not want a PATH search for config.site. |
2634 | + case $CONFIG_SITE in #(( |
2635 | + -*) ac_site_file1=./$CONFIG_SITE;; |
2636 | + */*) ac_site_file1=$CONFIG_SITE;; |
2637 | + *) ac_site_file1=./$CONFIG_SITE;; |
2638 | + esac |
2639 | elif test "x$prefix" != xNONE; then |
2640 | ac_site_file1=$prefix/share/config.site |
2641 | ac_site_file2=$prefix/etc/config.site |
2642 | @@ -2256,18 +2147,22 @@ |
2643 | for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
2644 | do |
2645 | test "x$ac_site_file" = xNONE && continue |
2646 | - if test -r "$ac_site_file"; then |
2647 | + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then |
2648 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
2649 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
2650 | sed 's/^/| /' "$ac_site_file" >&5 |
2651 | - . "$ac_site_file" |
2652 | + . "$ac_site_file" \ |
2653 | + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2654 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2655 | +as_fn_error $? "failed to load site script $ac_site_file |
2656 | +See \`config.log' for more details" "$LINENO" 5; } |
2657 | fi |
2658 | done |
2659 | |
2660 | if test -r "$cache_file"; then |
2661 | - # Some versions of bash will fail to source /dev/null (special |
2662 | - # files actually), so we avoid doing that. |
2663 | - if test -f "$cache_file"; then |
2664 | + # Some versions of bash will fail to source /dev/null (special files |
2665 | + # actually), so we avoid doing that. DJGPP emulates it as a regular file. |
2666 | + if test /dev/null != "$cache_file" && test -f "$cache_file"; then |
2667 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 |
2668 | $as_echo "$as_me: loading cache $cache_file" >&6;} |
2669 | case $cache_file in |
2670 | @@ -2336,7 +2231,7 @@ |
2671 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2672 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
2673 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
2674 | - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
2675 | + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
2676 | fi |
2677 | ## -------------------- ## |
2678 | ## Main body of script. ## |
2679 | @@ -2354,16 +2249,22 @@ |
2680 | |
2681 | ac_aux_dir= |
2682 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
2683 | - for ac_t in install-sh install.sh shtool; do |
2684 | - if test -f "$ac_dir/$ac_t"; then |
2685 | - ac_aux_dir=$ac_dir |
2686 | - ac_install_sh="$ac_aux_dir/$ac_t -c" |
2687 | - break 2 |
2688 | - fi |
2689 | - done |
2690 | + if test -f "$ac_dir/install-sh"; then |
2691 | + ac_aux_dir=$ac_dir |
2692 | + ac_install_sh="$ac_aux_dir/install-sh -c" |
2693 | + break |
2694 | + elif test -f "$ac_dir/install.sh"; then |
2695 | + ac_aux_dir=$ac_dir |
2696 | + ac_install_sh="$ac_aux_dir/install.sh -c" |
2697 | + break |
2698 | + elif test -f "$ac_dir/shtool"; then |
2699 | + ac_aux_dir=$ac_dir |
2700 | + ac_install_sh="$ac_aux_dir/shtool install -c" |
2701 | + break |
2702 | + fi |
2703 | done |
2704 | if test -z "$ac_aux_dir"; then |
2705 | - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
2706 | + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
2707 | fi |
2708 | |
2709 | # These three variables are undocumented and unsupported, |
2710 | @@ -2392,7 +2293,7 @@ |
2711 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
2712 | $as_echo_n "checking for a BSD-compatible install... " >&6; } |
2713 | if test -z "$INSTALL"; then |
2714 | -if test "${ac_cv_path_install+set}" = set; then : |
2715 | +if ${ac_cv_path_install+:} false; then : |
2716 | $as_echo_n "(cached) " >&6 |
2717 | else |
2718 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2719 | @@ -2479,11 +2380,11 @@ |
2720 | ' |
2721 | case `pwd` in |
2722 | *[\\\"\#\$\&\'\`$am_lf]*) |
2723 | - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; |
2724 | + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; |
2725 | esac |
2726 | case $srcdir in |
2727 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
2728 | - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
2729 | + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
2730 | esac |
2731 | |
2732 | # Do `set' in a subshell so we don't clobber the current shell's |
2733 | @@ -2505,7 +2406,7 @@ |
2734 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
2735 | # broken ls alias from the environment. This has actually |
2736 | # happened. Such a system could not be considered "sane". |
2737 | - as_fn_error "ls -t appears to fail. Make sure there is not a broken |
2738 | + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
2739 | alias in your environment" "$LINENO" 5 |
2740 | fi |
2741 | |
2742 | @@ -2515,7 +2416,7 @@ |
2743 | # Ok. |
2744 | : |
2745 | else |
2746 | - as_fn_error "newly created file is older than distributed files! |
2747 | + as_fn_error $? "newly created file is older than distributed files! |
2748 | Check your system clock" "$LINENO" 5 |
2749 | fi |
2750 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2751 | @@ -2569,7 +2470,7 @@ |
2752 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
2753 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2754 | $as_echo_n "checking for $ac_word... " >&6; } |
2755 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
2756 | +if ${ac_cv_prog_STRIP+:} false; then : |
2757 | $as_echo_n "(cached) " >&6 |
2758 | else |
2759 | if test -n "$STRIP"; then |
2760 | @@ -2609,7 +2510,7 @@ |
2761 | set dummy strip; ac_word=$2 |
2762 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2763 | $as_echo_n "checking for $ac_word... " >&6; } |
2764 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
2765 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
2766 | $as_echo_n "(cached) " >&6 |
2767 | else |
2768 | if test -n "$ac_ct_STRIP"; then |
2769 | @@ -2662,7 +2563,7 @@ |
2770 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 |
2771 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } |
2772 | if test -z "$MKDIR_P"; then |
2773 | - if test "${ac_cv_path_mkdir+set}" = set; then : |
2774 | + if ${ac_cv_path_mkdir+:} false; then : |
2775 | $as_echo_n "(cached) " >&6 |
2776 | else |
2777 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2778 | @@ -2687,6 +2588,7 @@ |
2779 | |
2780 | fi |
2781 | |
2782 | + test -d ./--version && rmdir ./--version |
2783 | if test "${ac_cv_path_mkdir+set}" = set; then |
2784 | MKDIR_P="$ac_cv_path_mkdir -p" |
2785 | else |
2786 | @@ -2694,7 +2596,6 @@ |
2787 | # value for MKDIR_P within a source directory, because that will |
2788 | # break other packages using the cache if that directory is |
2789 | # removed, or if the value is a relative name. |
2790 | - test -d ./--version && rmdir ./--version |
2791 | MKDIR_P="$ac_install_sh -d" |
2792 | fi |
2793 | fi |
2794 | @@ -2713,7 +2614,7 @@ |
2795 | set dummy $ac_prog; ac_word=$2 |
2796 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2797 | $as_echo_n "checking for $ac_word... " >&6; } |
2798 | -if test "${ac_cv_prog_AWK+set}" = set; then : |
2799 | +if ${ac_cv_prog_AWK+:} false; then : |
2800 | $as_echo_n "(cached) " >&6 |
2801 | else |
2802 | if test -n "$AWK"; then |
2803 | @@ -2753,7 +2654,7 @@ |
2804 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
2805 | set x ${MAKE-make} |
2806 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
2807 | -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
2808 | +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : |
2809 | $as_echo_n "(cached) " >&6 |
2810 | else |
2811 | cat >conftest.make <<\_ACEOF |
2812 | @@ -2761,7 +2662,7 @@ |
2813 | all: |
2814 | @echo '@@@%%%=$(MAKE)=@@@%%%' |
2815 | _ACEOF |
2816 | -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. |
2817 | +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
2818 | case `${MAKE-make} -f conftest.make 2>/dev/null` in |
2819 | *@@@%%%=?*=@@@%%%*) |
2820 | eval ac_cv_prog_make_${ac_make}_set=yes;; |
2821 | @@ -2795,7 +2696,7 @@ |
2822 | am__isrc=' -I$(srcdir)' |
2823 | # test to see if srcdir already configured |
2824 | if test -f $srcdir/config.status; then |
2825 | - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
2826 | + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
2827 | fi |
2828 | fi |
2829 | |
2830 | @@ -2811,7 +2712,7 @@ |
2831 | |
2832 | # Define the identity of the package. |
2833 | PACKAGE=ogmrip-oggz |
2834 | - VERSION=0.2 |
2835 | + VERSION=0.3 |
2836 | |
2837 | |
2838 | cat >>confdefs.h <<_ACEOF |
2839 | @@ -2865,7 +2766,7 @@ |
2840 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
2841 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2842 | $as_echo_n "checking for $ac_word... " >&6; } |
2843 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2844 | +if ${ac_cv_prog_CC+:} false; then : |
2845 | $as_echo_n "(cached) " >&6 |
2846 | else |
2847 | if test -n "$CC"; then |
2848 | @@ -2905,7 +2806,7 @@ |
2849 | set dummy gcc; ac_word=$2 |
2850 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2851 | $as_echo_n "checking for $ac_word... " >&6; } |
2852 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
2853 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
2854 | $as_echo_n "(cached) " >&6 |
2855 | else |
2856 | if test -n "$ac_ct_CC"; then |
2857 | @@ -2958,7 +2859,7 @@ |
2858 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
2859 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2860 | $as_echo_n "checking for $ac_word... " >&6; } |
2861 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2862 | +if ${ac_cv_prog_CC+:} false; then : |
2863 | $as_echo_n "(cached) " >&6 |
2864 | else |
2865 | if test -n "$CC"; then |
2866 | @@ -2998,7 +2899,7 @@ |
2867 | set dummy cc; ac_word=$2 |
2868 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2869 | $as_echo_n "checking for $ac_word... " >&6; } |
2870 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2871 | +if ${ac_cv_prog_CC+:} false; then : |
2872 | $as_echo_n "(cached) " >&6 |
2873 | else |
2874 | if test -n "$CC"; then |
2875 | @@ -3057,7 +2958,7 @@ |
2876 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2877 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2878 | $as_echo_n "checking for $ac_word... " >&6; } |
2879 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2880 | +if ${ac_cv_prog_CC+:} false; then : |
2881 | $as_echo_n "(cached) " >&6 |
2882 | else |
2883 | if test -n "$CC"; then |
2884 | @@ -3101,7 +3002,7 @@ |
2885 | set dummy $ac_prog; ac_word=$2 |
2886 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2887 | $as_echo_n "checking for $ac_word... " >&6; } |
2888 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
2889 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
2890 | $as_echo_n "(cached) " >&6 |
2891 | else |
2892 | if test -n "$ac_ct_CC"; then |
2893 | @@ -3155,8 +3056,8 @@ |
2894 | |
2895 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2896 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2897 | -as_fn_error "no acceptable C compiler found in \$PATH |
2898 | -See \`config.log' for more details." "$LINENO" 5; } |
2899 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
2900 | +See \`config.log' for more details" "$LINENO" 5; } |
2901 | |
2902 | # Provide some information about the compiler. |
2903 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
2904 | @@ -3177,32 +3078,30 @@ |
2905 | ... rest of stderr output deleted ... |
2906 | 10q' conftest.err >conftest.er1 |
2907 | cat conftest.er1 >&5 |
2908 | - rm -f conftest.er1 conftest.err |
2909 | fi |
2910 | + rm -f conftest.er1 conftest.err |
2911 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2912 | test $ac_status = 0; } |
2913 | done |
2914 | |
2915 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2916 | /* end confdefs.h. */ |
2917 | -#include <stdio.h> |
2918 | + |
2919 | int |
2920 | main () |
2921 | { |
2922 | -FILE *f = fopen ("conftest.out", "w"); |
2923 | - return ferror (f) || fclose (f) != 0; |
2924 | |
2925 | ; |
2926 | return 0; |
2927 | } |
2928 | _ACEOF |
2929 | ac_clean_files_save=$ac_clean_files |
2930 | -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" |
2931 | +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" |
2932 | # Try to create an executable without -o first, disregard a.out. |
2933 | # It will help us diagnose broken compilers, and finding out an intuition |
2934 | # of exeext. |
2935 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
2936 | -$as_echo_n "checking for C compiler default output file name... " >&6; } |
2937 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
2938 | +$as_echo_n "checking whether the C compiler works... " >&6; } |
2939 | ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
2940 | |
2941 | # The possible output files: |
2942 | @@ -3264,62 +3163,28 @@ |
2943 | else |
2944 | ac_file='' |
2945 | fi |
2946 | +if test -z "$ac_file"; then : |
2947 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2948 | +$as_echo "no" >&6; } |
2949 | +$as_echo "$as_me: failed program was:" >&5 |
2950 | +sed 's/^/| /' conftest.$ac_ext >&5 |
2951 | + |
2952 | +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2953 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2954 | +as_fn_error 77 "C compiler cannot create executables |
2955 | +See \`config.log' for more details" "$LINENO" 5; } |
2956 | +else |
2957 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2958 | +$as_echo "yes" >&6; } |
2959 | +fi |
2960 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
2961 | +$as_echo_n "checking for C compiler default output file name... " >&6; } |
2962 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 |
2963 | $as_echo "$ac_file" >&6; } |
2964 | -if test -z "$ac_file"; then : |
2965 | - $as_echo "$as_me: failed program was:" >&5 |
2966 | -sed 's/^/| /' conftest.$ac_ext >&5 |
2967 | - |
2968 | -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2969 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2970 | -{ as_fn_set_status 77 |
2971 | -as_fn_error "C compiler cannot create executables |
2972 | -See \`config.log' for more details." "$LINENO" 5; }; } |
2973 | -fi |
2974 | ac_exeext=$ac_cv_exeext |
2975 | |
2976 | -# Check that the compiler produces executables we can run. If not, either |
2977 | -# the compiler is broken, or we cross compile. |
2978 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
2979 | -$as_echo_n "checking whether the C compiler works... " >&6; } |
2980 | -# If not cross compiling, check that we can run a simple program. |
2981 | -if test "$cross_compiling" != yes; then |
2982 | - if { ac_try='./$ac_file' |
2983 | - { { case "(($ac_try" in |
2984 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2985 | - *) ac_try_echo=$ac_try;; |
2986 | -esac |
2987 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2988 | -$as_echo "$ac_try_echo"; } >&5 |
2989 | - (eval "$ac_try") 2>&5 |
2990 | - ac_status=$? |
2991 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2992 | - test $ac_status = 0; }; }; then |
2993 | - cross_compiling=no |
2994 | - else |
2995 | - if test "$cross_compiling" = maybe; then |
2996 | - cross_compiling=yes |
2997 | - else |
2998 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2999 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3000 | -as_fn_error "cannot run C compiled programs. |
3001 | -If you meant to cross compile, use \`--host'. |
3002 | -See \`config.log' for more details." "$LINENO" 5; } |
3003 | - fi |
3004 | - fi |
3005 | -fi |
3006 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3007 | -$as_echo "yes" >&6; } |
3008 | - |
3009 | -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out |
3010 | +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out |
3011 | ac_clean_files=$ac_clean_files_save |
3012 | -# Check that the compiler produces executables we can run. If not, either |
3013 | -# the compiler is broken, or we cross compile. |
3014 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
3015 | -$as_echo_n "checking whether we are cross compiling... " >&6; } |
3016 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
3017 | -$as_echo "$cross_compiling" >&6; } |
3018 | - |
3019 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 |
3020 | $as_echo_n "checking for suffix of executables... " >&6; } |
3021 | if { { ac_try="$ac_link" |
3022 | @@ -3349,19 +3214,78 @@ |
3023 | else |
3024 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3025 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3026 | -as_fn_error "cannot compute suffix of executables: cannot compile and link |
3027 | -See \`config.log' for more details." "$LINENO" 5; } |
3028 | +as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
3029 | +See \`config.log' for more details" "$LINENO" 5; } |
3030 | fi |
3031 | -rm -f conftest$ac_cv_exeext |
3032 | +rm -f conftest conftest$ac_cv_exeext |
3033 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
3034 | $as_echo "$ac_cv_exeext" >&6; } |
3035 | |
3036 | rm -f conftest.$ac_ext |
3037 | EXEEXT=$ac_cv_exeext |
3038 | ac_exeext=$EXEEXT |
3039 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3040 | +/* end confdefs.h. */ |
3041 | +#include <stdio.h> |
3042 | +int |
3043 | +main () |
3044 | +{ |
3045 | +FILE *f = fopen ("conftest.out", "w"); |
3046 | + return ferror (f) || fclose (f) != 0; |
3047 | + |
3048 | + ; |
3049 | + return 0; |
3050 | +} |
3051 | +_ACEOF |
3052 | +ac_clean_files="$ac_clean_files conftest.out" |
3053 | +# Check that the compiler produces executables we can run. If not, either |
3054 | +# the compiler is broken, or we cross compile. |
3055 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
3056 | +$as_echo_n "checking whether we are cross compiling... " >&6; } |
3057 | +if test "$cross_compiling" != yes; then |
3058 | + { { ac_try="$ac_link" |
3059 | +case "(($ac_try" in |
3060 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3061 | + *) ac_try_echo=$ac_try;; |
3062 | +esac |
3063 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3064 | +$as_echo "$ac_try_echo"; } >&5 |
3065 | + (eval "$ac_link") 2>&5 |
3066 | + ac_status=$? |
3067 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3068 | + test $ac_status = 0; } |
3069 | + if { ac_try='./conftest$ac_cv_exeext' |
3070 | + { { case "(($ac_try" in |
3071 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3072 | + *) ac_try_echo=$ac_try;; |
3073 | +esac |
3074 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3075 | +$as_echo "$ac_try_echo"; } >&5 |
3076 | + (eval "$ac_try") 2>&5 |
3077 | + ac_status=$? |
3078 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3079 | + test $ac_status = 0; }; }; then |
3080 | + cross_compiling=no |
3081 | + else |
3082 | + if test "$cross_compiling" = maybe; then |
3083 | + cross_compiling=yes |
3084 | + else |
3085 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3086 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3087 | +as_fn_error $? "cannot run C compiled programs. |
3088 | +If you meant to cross compile, use \`--host'. |
3089 | +See \`config.log' for more details" "$LINENO" 5; } |
3090 | + fi |
3091 | + fi |
3092 | +fi |
3093 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
3094 | +$as_echo "$cross_compiling" >&6; } |
3095 | + |
3096 | +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out |
3097 | +ac_clean_files=$ac_clean_files_save |
3098 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
3099 | $as_echo_n "checking for suffix of object files... " >&6; } |
3100 | -if test "${ac_cv_objext+set}" = set; then : |
3101 | +if ${ac_cv_objext+:} false; then : |
3102 | $as_echo_n "(cached) " >&6 |
3103 | else |
3104 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3105 | @@ -3401,8 +3325,8 @@ |
3106 | |
3107 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3108 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3109 | -as_fn_error "cannot compute suffix of object files: cannot compile |
3110 | -See \`config.log' for more details." "$LINENO" 5; } |
3111 | +as_fn_error $? "cannot compute suffix of object files: cannot compile |
3112 | +See \`config.log' for more details" "$LINENO" 5; } |
3113 | fi |
3114 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
3115 | fi |
3116 | @@ -3412,7 +3336,7 @@ |
3117 | ac_objext=$OBJEXT |
3118 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
3119 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
3120 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
3121 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
3122 | $as_echo_n "(cached) " >&6 |
3123 | else |
3124 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3125 | @@ -3449,7 +3373,7 @@ |
3126 | ac_save_CFLAGS=$CFLAGS |
3127 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
3128 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
3129 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
3130 | +if ${ac_cv_prog_cc_g+:} false; then : |
3131 | $as_echo_n "(cached) " >&6 |
3132 | else |
3133 | ac_save_c_werror_flag=$ac_c_werror_flag |
3134 | @@ -3527,7 +3451,7 @@ |
3135 | fi |
3136 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
3137 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
3138 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
3139 | +if ${ac_cv_prog_cc_c89+:} false; then : |
3140 | $as_echo_n "(cached) " >&6 |
3141 | else |
3142 | ac_cv_prog_cc_c89=no |
3143 | @@ -3688,7 +3612,7 @@ |
3144 | |
3145 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
3146 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
3147 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
3148 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
3149 | $as_echo_n "(cached) " >&6 |
3150 | else |
3151 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
3152 | @@ -3820,8 +3744,8 @@ |
3153 | |
3154 | |
3155 | |
3156 | -macro_version='2.2.6' |
3157 | -macro_revision='1.3012' |
3158 | +macro_version='2.4' |
3159 | +macro_revision='1.3293' |
3160 | |
3161 | |
3162 | |
3163 | @@ -3839,27 +3763,27 @@ |
3164 | |
3165 | # Make sure we can run config.sub. |
3166 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
3167 | - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
3168 | + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
3169 | |
3170 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
3171 | $as_echo_n "checking build system type... " >&6; } |
3172 | -if test "${ac_cv_build+set}" = set; then : |
3173 | +if ${ac_cv_build+:} false; then : |
3174 | $as_echo_n "(cached) " >&6 |
3175 | else |
3176 | ac_build_alias=$build_alias |
3177 | test "x$ac_build_alias" = x && |
3178 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
3179 | test "x$ac_build_alias" = x && |
3180 | - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 |
3181 | + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
3182 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
3183 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
3184 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
3185 | |
3186 | fi |
3187 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
3188 | $as_echo "$ac_cv_build" >&6; } |
3189 | case $ac_cv_build in |
3190 | *-*-*) ;; |
3191 | -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; |
3192 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; |
3193 | esac |
3194 | build=$ac_cv_build |
3195 | ac_save_IFS=$IFS; IFS='-' |
3196 | @@ -3877,14 +3801,14 @@ |
3197 | |
3198 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
3199 | $as_echo_n "checking host system type... " >&6; } |
3200 | -if test "${ac_cv_host+set}" = set; then : |
3201 | +if ${ac_cv_host+:} false; then : |
3202 | $as_echo_n "(cached) " >&6 |
3203 | else |
3204 | if test "x$host_alias" = x; then |
3205 | ac_cv_host=$ac_cv_build |
3206 | else |
3207 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
3208 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
3209 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
3210 | fi |
3211 | |
3212 | fi |
3213 | @@ -3892,7 +3816,7 @@ |
3214 | $as_echo "$ac_cv_host" >&6; } |
3215 | case $ac_cv_host in |
3216 | *-*-*) ;; |
3217 | -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; |
3218 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; |
3219 | esac |
3220 | host=$ac_cv_host |
3221 | ac_save_IFS=$IFS; IFS='-' |
3222 | @@ -3908,9 +3832,78 @@ |
3223 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac |
3224 | |
3225 | |
3226 | +# Backslashify metacharacters that are still active within |
3227 | +# double-quoted strings. |
3228 | +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
3229 | + |
3230 | +# Same as above, but do not quote variable references. |
3231 | +double_quote_subst='s/\(["`\\]\)/\\\1/g' |
3232 | + |
3233 | +# Sed substitution to delay expansion of an escaped shell variable in a |
3234 | +# double_quote_subst'ed string. |
3235 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
3236 | + |
3237 | +# Sed substitution to delay expansion of an escaped single quote. |
3238 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
3239 | + |
3240 | +# Sed substitution to avoid accidental globbing in evaled expressions |
3241 | +no_glob_subst='s/\*/\\\*/g' |
3242 | + |
3243 | +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
3244 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
3245 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
3246 | + |
3247 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
3248 | +$as_echo_n "checking how to print strings... " >&6; } |
3249 | +# Test print first, because it will be a builtin if present. |
3250 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
3251 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
3252 | + ECHO='print -r --' |
3253 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
3254 | + ECHO='printf %s\n' |
3255 | +else |
3256 | + # Use this function as a fallback that always works. |
3257 | + func_fallback_echo () |
3258 | + { |
3259 | + eval 'cat <<_LTECHO_EOF |
3260 | +$1 |
3261 | +_LTECHO_EOF' |
3262 | + } |
3263 | + ECHO='func_fallback_echo' |
3264 | +fi |
3265 | + |
3266 | +# func_echo_all arg... |
3267 | +# Invoke $ECHO with all args, space-separated. |
3268 | +func_echo_all () |
3269 | +{ |
3270 | + $ECHO "" |
3271 | +} |
3272 | + |
3273 | +case "$ECHO" in |
3274 | + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 |
3275 | +$as_echo "printf" >&6; } ;; |
3276 | + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 |
3277 | +$as_echo "print -r" >&6; } ;; |
3278 | + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 |
3279 | +$as_echo "cat" >&6; } ;; |
3280 | +esac |
3281 | + |
3282 | + |
3283 | + |
3284 | + |
3285 | + |
3286 | + |
3287 | + |
3288 | + |
3289 | + |
3290 | + |
3291 | + |
3292 | + |
3293 | + |
3294 | + |
3295 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 |
3296 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } |
3297 | -if test "${ac_cv_path_SED+set}" = set; then : |
3298 | +if ${ac_cv_path_SED+:} false; then : |
3299 | $as_echo_n "(cached) " >&6 |
3300 | else |
3301 | ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ |
3302 | @@ -3965,7 +3958,7 @@ |
3303 | done |
3304 | IFS=$as_save_IFS |
3305 | if test -z "$ac_cv_path_SED"; then |
3306 | - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
3307 | + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
3308 | fi |
3309 | else |
3310 | ac_cv_path_SED=$SED |
3311 | @@ -3992,7 +3985,7 @@ |
3312 | |
3313 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
3314 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
3315 | -if test "${ac_cv_path_GREP+set}" = set; then : |
3316 | +if ${ac_cv_path_GREP+:} false; then : |
3317 | $as_echo_n "(cached) " >&6 |
3318 | else |
3319 | if test -z "$GREP"; then |
3320 | @@ -4041,7 +4034,7 @@ |
3321 | done |
3322 | IFS=$as_save_IFS |
3323 | if test -z "$ac_cv_path_GREP"; then |
3324 | - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3325 | + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3326 | fi |
3327 | else |
3328 | ac_cv_path_GREP=$GREP |
3329 | @@ -4055,7 +4048,7 @@ |
3330 | |
3331 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
3332 | $as_echo_n "checking for egrep... " >&6; } |
3333 | -if test "${ac_cv_path_EGREP+set}" = set; then : |
3334 | +if ${ac_cv_path_EGREP+:} false; then : |
3335 | $as_echo_n "(cached) " >&6 |
3336 | else |
3337 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
3338 | @@ -4107,7 +4100,7 @@ |
3339 | done |
3340 | IFS=$as_save_IFS |
3341 | if test -z "$ac_cv_path_EGREP"; then |
3342 | - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3343 | + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3344 | fi |
3345 | else |
3346 | ac_cv_path_EGREP=$EGREP |
3347 | @@ -4122,7 +4115,7 @@ |
3348 | |
3349 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 |
3350 | $as_echo_n "checking for fgrep... " >&6; } |
3351 | -if test "${ac_cv_path_FGREP+set}" = set; then : |
3352 | +if ${ac_cv_path_FGREP+:} false; then : |
3353 | $as_echo_n "(cached) " >&6 |
3354 | else |
3355 | if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 |
3356 | @@ -4174,7 +4167,7 @@ |
3357 | done |
3358 | IFS=$as_save_IFS |
3359 | if test -z "$ac_cv_path_FGREP"; then |
3360 | - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3361 | + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
3362 | fi |
3363 | else |
3364 | ac_cv_path_FGREP=$FGREP |
3365 | @@ -4253,7 +4246,7 @@ |
3366 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 |
3367 | $as_echo_n "checking for non-GNU ld... " >&6; } |
3368 | fi |
3369 | -if test "${lt_cv_path_LD+set}" = set; then : |
3370 | +if ${lt_cv_path_LD+:} false; then : |
3371 | $as_echo_n "(cached) " >&6 |
3372 | else |
3373 | if test -z "$LD"; then |
3374 | @@ -4290,10 +4283,10 @@ |
3375 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3376 | $as_echo "no" >&6; } |
3377 | fi |
3378 | -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 |
3379 | +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
3380 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
3381 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
3382 | -if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
3383 | +if ${lt_cv_prog_gnu_ld+:} false; then : |
3384 | $as_echo_n "(cached) " >&6 |
3385 | else |
3386 | # I'd rather use --version here, but apparently some GNU lds only accept -v. |
3387 | @@ -4320,7 +4313,7 @@ |
3388 | |
3389 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 |
3390 | $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } |
3391 | -if test "${lt_cv_path_NM+set}" = set; then : |
3392 | +if ${lt_cv_path_NM+:} false; then : |
3393 | $as_echo_n "(cached) " >&6 |
3394 | else |
3395 | if test -n "$NM"; then |
3396 | @@ -4373,14 +4366,17 @@ |
3397 | NM="$lt_cv_path_NM" |
3398 | else |
3399 | # Didn't find any BSD compatible name lister, look for dumpbin. |
3400 | - if test -n "$ac_tool_prefix"; then |
3401 | - for ac_prog in "dumpbin -symbols" "link -dump -symbols" |
3402 | + if test -n "$DUMPBIN"; then : |
3403 | + # Let the user override the test. |
3404 | + else |
3405 | + if test -n "$ac_tool_prefix"; then |
3406 | + for ac_prog in dumpbin "link -dump" |
3407 | do |
3408 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
3409 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
3410 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3411 | $as_echo_n "checking for $ac_word... " >&6; } |
3412 | -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : |
3413 | +if ${ac_cv_prog_DUMPBIN+:} false; then : |
3414 | $as_echo_n "(cached) " >&6 |
3415 | else |
3416 | if test -n "$DUMPBIN"; then |
3417 | @@ -4418,13 +4414,13 @@ |
3418 | fi |
3419 | if test -z "$DUMPBIN"; then |
3420 | ac_ct_DUMPBIN=$DUMPBIN |
3421 | - for ac_prog in "dumpbin -symbols" "link -dump -symbols" |
3422 | + for ac_prog in dumpbin "link -dump" |
3423 | do |
3424 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
3425 | set dummy $ac_prog; ac_word=$2 |
3426 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3427 | $as_echo_n "checking for $ac_word... " >&6; } |
3428 | -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : |
3429 | +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : |
3430 | $as_echo_n "(cached) " >&6 |
3431 | else |
3432 | if test -n "$ac_ct_DUMPBIN"; then |
3433 | @@ -4473,6 +4469,15 @@ |
3434 | fi |
3435 | fi |
3436 | |
3437 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
3438 | + *COFF*) |
3439 | + DUMPBIN="$DUMPBIN -symbols" |
3440 | + ;; |
3441 | + *) |
3442 | + DUMPBIN=: |
3443 | + ;; |
3444 | + esac |
3445 | + fi |
3446 | |
3447 | if test "$DUMPBIN" != ":"; then |
3448 | NM="$DUMPBIN" |
3449 | @@ -4487,18 +4492,18 @@ |
3450 | |
3451 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 |
3452 | $as_echo_n "checking the name lister ($NM) interface... " >&6; } |
3453 | -if test "${lt_cv_nm_interface+set}" = set; then : |
3454 | +if ${lt_cv_nm_interface+:} false; then : |
3455 | $as_echo_n "(cached) " >&6 |
3456 | else |
3457 | lt_cv_nm_interface="BSD nm" |
3458 | echo "int some_variable = 0;" > conftest.$ac_ext |
3459 | - (eval echo "\"\$as_me:4495: $ac_compile\"" >&5) |
3460 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) |
3461 | (eval "$ac_compile" 2>conftest.err) |
3462 | cat conftest.err >&5 |
3463 | - (eval echo "\"\$as_me:4498: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
3464 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
3465 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
3466 | cat conftest.err >&5 |
3467 | - (eval echo "\"\$as_me:4501: output\"" >&5) |
3468 | + (eval echo "\"\$as_me:$LINENO: output\"" >&5) |
3469 | cat conftest.out >&5 |
3470 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
3471 | lt_cv_nm_interface="MS dumpbin" |
3472 | @@ -4522,7 +4527,7 @@ |
3473 | # find the maximum length of command line arguments |
3474 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 |
3475 | $as_echo_n "checking the maximum length of command line arguments... " >&6; } |
3476 | -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : |
3477 | +if ${lt_cv_sys_max_cmd_len+:} false; then : |
3478 | $as_echo_n "(cached) " >&6 |
3479 | else |
3480 | i=0 |
3481 | @@ -4555,6 +4560,11 @@ |
3482 | lt_cv_sys_max_cmd_len=8192; |
3483 | ;; |
3484 | |
3485 | + mint*) |
3486 | + # On MiNT this can take a long time and run out of memory. |
3487 | + lt_cv_sys_max_cmd_len=8192; |
3488 | + ;; |
3489 | + |
3490 | amigaos*) |
3491 | # On AmigaOS with pdksh, this test takes hours, literally. |
3492 | # So we just punt and use a minimum line length of 8192. |
3493 | @@ -4619,8 +4629,8 @@ |
3494 | # If test is not a shell built-in, we'll probably end up computing a |
3495 | # maximum length that is only half of the actual maximum length, but |
3496 | # we can't tell. |
3497 | - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
3498 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
3499 | + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
3500 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
3501 | test $i != 17 # 1/2 MB should be enough |
3502 | do |
3503 | i=`expr $i + 1` |
3504 | @@ -4662,8 +4672,8 @@ |
3505 | # Try some XSI features |
3506 | xsi_shell=no |
3507 | ( _lt_dummy="a/b/c" |
3508 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
3509 | - = c,a/b,, \ |
3510 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
3511 | + = c,a/b,b/c, \ |
3512 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
3513 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
3514 | && xsi_shell=yes |
3515 | @@ -4712,9 +4722,83 @@ |
3516 | |
3517 | |
3518 | |
3519 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
3520 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
3521 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
3522 | + $as_echo_n "(cached) " >&6 |
3523 | +else |
3524 | + case $host in |
3525 | + *-*-mingw* ) |
3526 | + case $build in |
3527 | + *-*-mingw* ) # actually msys |
3528 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
3529 | + ;; |
3530 | + *-*-cygwin* ) |
3531 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
3532 | + ;; |
3533 | + * ) # otherwise, assume *nix |
3534 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
3535 | + ;; |
3536 | + esac |
3537 | + ;; |
3538 | + *-*-cygwin* ) |
3539 | + case $build in |
3540 | + *-*-mingw* ) # actually msys |
3541 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
3542 | + ;; |
3543 | + *-*-cygwin* ) |
3544 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
3545 | + ;; |
3546 | + * ) # otherwise, assume *nix |
3547 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
3548 | + ;; |
3549 | + esac |
3550 | + ;; |
3551 | + * ) # unhandled hosts (and "normal" native builds) |
3552 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
3553 | + ;; |
3554 | +esac |
3555 | + |
3556 | +fi |
3557 | + |
3558 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
3559 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
3560 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
3561 | + |
3562 | + |
3563 | + |
3564 | + |
3565 | + |
3566 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
3567 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
3568 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
3569 | + $as_echo_n "(cached) " >&6 |
3570 | +else |
3571 | + #assume ordinary cross tools, or native build. |
3572 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
3573 | +case $host in |
3574 | + *-*-mingw* ) |
3575 | + case $build in |
3576 | + *-*-mingw* ) # actually msys |
3577 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
3578 | + ;; |
3579 | + esac |
3580 | + ;; |
3581 | +esac |
3582 | + |
3583 | +fi |
3584 | + |
3585 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
3586 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
3587 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
3588 | + |
3589 | + |
3590 | + |
3591 | + |
3592 | + |
3593 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
3594 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
3595 | -if test "${lt_cv_ld_reload_flag+set}" = set; then : |
3596 | +if ${lt_cv_ld_reload_flag+:} false; then : |
3597 | $as_echo_n "(cached) " >&6 |
3598 | else |
3599 | lt_cv_ld_reload_flag='-r' |
3600 | @@ -4728,6 +4812,11 @@ |
3601 | esac |
3602 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
3603 | case $host_os in |
3604 | + cygwin* | mingw* | pw32* | cegcc*) |
3605 | + if test "$GCC" != yes; then |
3606 | + reload_cmds=false |
3607 | + fi |
3608 | + ;; |
3609 | darwin*) |
3610 | if test "$GCC" = yes; then |
3611 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
3612 | @@ -4750,7 +4839,7 @@ |
3613 | set dummy ${ac_tool_prefix}objdump; ac_word=$2 |
3614 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3615 | $as_echo_n "checking for $ac_word... " >&6; } |
3616 | -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : |
3617 | +if ${ac_cv_prog_OBJDUMP+:} false; then : |
3618 | $as_echo_n "(cached) " >&6 |
3619 | else |
3620 | if test -n "$OBJDUMP"; then |
3621 | @@ -4790,7 +4879,7 @@ |
3622 | set dummy objdump; ac_word=$2 |
3623 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3624 | $as_echo_n "checking for $ac_word... " >&6; } |
3625 | -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : |
3626 | +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : |
3627 | $as_echo_n "(cached) " >&6 |
3628 | else |
3629 | if test -n "$ac_ct_OBJDUMP"; then |
3630 | @@ -4849,7 +4938,7 @@ |
3631 | |
3632 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 |
3633 | $as_echo_n "checking how to recognize dependent libraries... " >&6; } |
3634 | -if test "${lt_cv_deplibs_check_method+set}" = set; then : |
3635 | +if ${lt_cv_deplibs_check_method+:} false; then : |
3636 | $as_echo_n "(cached) " >&6 |
3637 | else |
3638 | lt_cv_file_magic_cmd='$MAGIC_CMD' |
3639 | @@ -4891,16 +4980,18 @@ |
3640 | # Base MSYS/MinGW do not provide the 'file' command needed by |
3641 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
3642 | # unless we find 'file', for example because we are cross-compiling. |
3643 | - if ( file / ) >/dev/null 2>&1; then |
3644 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
3645 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
3646 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
3647 | lt_cv_file_magic_cmd='func_win32_libid' |
3648 | else |
3649 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
3650 | + # Keep this pattern in sync with the one in func_win32_libid. |
3651 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
3652 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3653 | fi |
3654 | ;; |
3655 | |
3656 | -cegcc) |
3657 | +cegcc*) |
3658 | # use the weaker test based on 'objdump'. See mingw*. |
3659 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
3660 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3661 | @@ -4930,6 +5021,10 @@ |
3662 | lt_cv_deplibs_check_method=pass_all |
3663 | ;; |
3664 | |
3665 | +haiku*) |
3666 | + lt_cv_deplibs_check_method=pass_all |
3667 | + ;; |
3668 | + |
3669 | hpux10.20* | hpux11*) |
3670 | lt_cv_file_magic_cmd=/usr/bin/file |
3671 | case $host_cpu in |
3672 | @@ -4938,11 +5033,11 @@ |
3673 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
3674 | ;; |
3675 | hppa*64*) |
3676 | - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' |
3677 | + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' |
3678 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
3679 | ;; |
3680 | *) |
3681 | - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' |
3682 | + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' |
3683 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
3684 | ;; |
3685 | esac |
3686 | @@ -4964,11 +5059,11 @@ |
3687 | ;; |
3688 | |
3689 | # This must be Linux ELF. |
3690 | -linux* | k*bsd*-gnu) |
3691 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3692 | lt_cv_deplibs_check_method=pass_all |
3693 | ;; |
3694 | |
3695 | -netbsd* | netbsdelf*-gnu) |
3696 | +netbsd*) |
3697 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
3698 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
3699 | else |
3700 | @@ -5045,6 +5140,21 @@ |
3701 | fi |
3702 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
3703 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
3704 | + |
3705 | +file_magic_glob= |
3706 | +want_nocaseglob=no |
3707 | +if test "$build" = "$host"; then |
3708 | + case $host_os in |
3709 | + mingw* | pw32*) |
3710 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
3711 | + want_nocaseglob=yes |
3712 | + else |
3713 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
3714 | + fi |
3715 | + ;; |
3716 | + esac |
3717 | +fi |
3718 | + |
3719 | file_magic_cmd=$lt_cv_file_magic_cmd |
3720 | deplibs_check_method=$lt_cv_deplibs_check_method |
3721 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
3722 | @@ -5060,12 +5170,166 @@ |
3723 | |
3724 | |
3725 | |
3726 | -if test -n "$ac_tool_prefix"; then |
3727 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
3728 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
3729 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3730 | -$as_echo_n "checking for $ac_word... " >&6; } |
3731 | -if test "${ac_cv_prog_AR+set}" = set; then : |
3732 | + |
3733 | + |
3734 | + |
3735 | + |
3736 | + |
3737 | + |
3738 | + |
3739 | + |
3740 | + |
3741 | + |
3742 | +if test -n "$ac_tool_prefix"; then |
3743 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
3744 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
3745 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3746 | +$as_echo_n "checking for $ac_word... " >&6; } |
3747 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
3748 | + $as_echo_n "(cached) " >&6 |
3749 | +else |
3750 | + if test -n "$DLLTOOL"; then |
3751 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
3752 | +else |
3753 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3754 | +for as_dir in $PATH |
3755 | +do |
3756 | + IFS=$as_save_IFS |
3757 | + test -z "$as_dir" && as_dir=. |
3758 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3759 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3760 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
3761 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3762 | + break 2 |
3763 | + fi |
3764 | +done |
3765 | + done |
3766 | +IFS=$as_save_IFS |
3767 | + |
3768 | +fi |
3769 | +fi |
3770 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
3771 | +if test -n "$DLLTOOL"; then |
3772 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
3773 | +$as_echo "$DLLTOOL" >&6; } |
3774 | +else |
3775 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3776 | +$as_echo "no" >&6; } |
3777 | +fi |
3778 | + |
3779 | + |
3780 | +fi |
3781 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
3782 | + ac_ct_DLLTOOL=$DLLTOOL |
3783 | + # Extract the first word of "dlltool", so it can be a program name with args. |
3784 | +set dummy dlltool; ac_word=$2 |
3785 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3786 | +$as_echo_n "checking for $ac_word... " >&6; } |
3787 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
3788 | + $as_echo_n "(cached) " >&6 |
3789 | +else |
3790 | + if test -n "$ac_ct_DLLTOOL"; then |
3791 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
3792 | +else |
3793 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3794 | +for as_dir in $PATH |
3795 | +do |
3796 | + IFS=$as_save_IFS |
3797 | + test -z "$as_dir" && as_dir=. |
3798 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3799 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3800 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
3801 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3802 | + break 2 |
3803 | + fi |
3804 | +done |
3805 | + done |
3806 | +IFS=$as_save_IFS |
3807 | + |
3808 | +fi |
3809 | +fi |
3810 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
3811 | +if test -n "$ac_ct_DLLTOOL"; then |
3812 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
3813 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
3814 | +else |
3815 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3816 | +$as_echo "no" >&6; } |
3817 | +fi |
3818 | + |
3819 | + if test "x$ac_ct_DLLTOOL" = x; then |
3820 | + DLLTOOL="false" |
3821 | + else |
3822 | + case $cross_compiling:$ac_tool_warned in |
3823 | +yes:) |
3824 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3825 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3826 | +ac_tool_warned=yes ;; |
3827 | +esac |
3828 | + DLLTOOL=$ac_ct_DLLTOOL |
3829 | + fi |
3830 | +else |
3831 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
3832 | +fi |
3833 | + |
3834 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
3835 | + |
3836 | + |
3837 | + |
3838 | + |
3839 | + |
3840 | + |
3841 | + |
3842 | + |
3843 | + |
3844 | + |
3845 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
3846 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
3847 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
3848 | + $as_echo_n "(cached) " >&6 |
3849 | +else |
3850 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
3851 | + |
3852 | +case $host_os in |
3853 | +cygwin* | mingw* | pw32* | cegcc*) |
3854 | + # two different shell functions defined in ltmain.sh |
3855 | + # decide which to use based on capabilities of $DLLTOOL |
3856 | + case `$DLLTOOL --help 2>&1` in |
3857 | + *--identify-strict*) |
3858 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
3859 | + ;; |
3860 | + *) |
3861 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
3862 | + ;; |
3863 | + esac |
3864 | + ;; |
3865 | +*) |
3866 | + # fallback: assume linklib IS sharedlib |
3867 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
3868 | + ;; |
3869 | +esac |
3870 | + |
3871 | +fi |
3872 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
3873 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
3874 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
3875 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
3876 | + |
3877 | + |
3878 | + |
3879 | + |
3880 | + |
3881 | + |
3882 | + |
3883 | + |
3884 | +if test -n "$ac_tool_prefix"; then |
3885 | + for ac_prog in ar |
3886 | + do |
3887 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
3888 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
3889 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3890 | +$as_echo_n "checking for $ac_word... " >&6; } |
3891 | +if ${ac_cv_prog_AR+:} false; then : |
3892 | $as_echo_n "(cached) " >&6 |
3893 | else |
3894 | if test -n "$AR"; then |
3895 | @@ -5078,7 +5342,7 @@ |
3896 | test -z "$as_dir" && as_dir=. |
3897 | for ac_exec_ext in '' $ac_executable_extensions; do |
3898 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3899 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
3900 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
3901 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3902 | break 2 |
3903 | fi |
3904 | @@ -5098,14 +5362,18 @@ |
3905 | fi |
3906 | |
3907 | |
3908 | + test -n "$AR" && break |
3909 | + done |
3910 | fi |
3911 | -if test -z "$ac_cv_prog_AR"; then |
3912 | +if test -z "$AR"; then |
3913 | ac_ct_AR=$AR |
3914 | - # Extract the first word of "ar", so it can be a program name with args. |
3915 | -set dummy ar; ac_word=$2 |
3916 | + for ac_prog in ar |
3917 | +do |
3918 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
3919 | +set dummy $ac_prog; ac_word=$2 |
3920 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3921 | $as_echo_n "checking for $ac_word... " >&6; } |
3922 | -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
3923 | +if ${ac_cv_prog_ac_ct_AR+:} false; then : |
3924 | $as_echo_n "(cached) " >&6 |
3925 | else |
3926 | if test -n "$ac_ct_AR"; then |
3927 | @@ -5118,7 +5386,7 @@ |
3928 | test -z "$as_dir" && as_dir=. |
3929 | for ac_exec_ext in '' $ac_executable_extensions; do |
3930 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3931 | - ac_cv_prog_ac_ct_AR="ar" |
3932 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
3933 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3934 | break 2 |
3935 | fi |
3936 | @@ -5137,6 +5405,10 @@ |
3937 | $as_echo "no" >&6; } |
3938 | fi |
3939 | |
3940 | + |
3941 | + test -n "$ac_ct_AR" && break |
3942 | +done |
3943 | + |
3944 | if test "x$ac_ct_AR" = x; then |
3945 | AR="false" |
3946 | else |
3947 | @@ -5148,16 +5420,72 @@ |
3948 | esac |
3949 | AR=$ac_ct_AR |
3950 | fi |
3951 | -else |
3952 | - AR="$ac_cv_prog_AR" |
3953 | -fi |
3954 | - |
3955 | -test -z "$AR" && AR=ar |
3956 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
3957 | - |
3958 | - |
3959 | - |
3960 | - |
3961 | +fi |
3962 | + |
3963 | +: ${AR=ar} |
3964 | +: ${AR_FLAGS=cru} |
3965 | + |
3966 | + |
3967 | + |
3968 | + |
3969 | + |
3970 | + |
3971 | + |
3972 | + |
3973 | + |
3974 | + |
3975 | + |
3976 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
3977 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
3978 | +if ${lt_cv_ar_at_file+:} false; then : |
3979 | + $as_echo_n "(cached) " >&6 |
3980 | +else |
3981 | + lt_cv_ar_at_file=no |
3982 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3983 | +/* end confdefs.h. */ |
3984 | + |
3985 | +int |
3986 | +main () |
3987 | +{ |
3988 | + |
3989 | + ; |
3990 | + return 0; |
3991 | +} |
3992 | +_ACEOF |
3993 | +if ac_fn_c_try_compile "$LINENO"; then : |
3994 | + echo conftest.$ac_objext > conftest.lst |
3995 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
3996 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
3997 | + (eval $lt_ar_try) 2>&5 |
3998 | + ac_status=$? |
3999 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4000 | + test $ac_status = 0; } |
4001 | + if test "$ac_status" -eq 0; then |
4002 | + # Ensure the archiver fails upon bogus file names. |
4003 | + rm -f conftest.$ac_objext libconftest.a |
4004 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
4005 | + (eval $lt_ar_try) 2>&5 |
4006 | + ac_status=$? |
4007 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4008 | + test $ac_status = 0; } |
4009 | + if test "$ac_status" -ne 0; then |
4010 | + lt_cv_ar_at_file=@ |
4011 | + fi |
4012 | + fi |
4013 | + rm -f conftest.* libconftest.a |
4014 | + |
4015 | +fi |
4016 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4017 | + |
4018 | +fi |
4019 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
4020 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
4021 | + |
4022 | +if test "x$lt_cv_ar_at_file" = xno; then |
4023 | + archiver_list_spec= |
4024 | +else |
4025 | + archiver_list_spec=$lt_cv_ar_at_file |
4026 | +fi |
4027 | |
4028 | |
4029 | |
4030 | @@ -5170,7 +5498,7 @@ |
4031 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
4032 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4033 | $as_echo_n "checking for $ac_word... " >&6; } |
4034 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
4035 | +if ${ac_cv_prog_STRIP+:} false; then : |
4036 | $as_echo_n "(cached) " >&6 |
4037 | else |
4038 | if test -n "$STRIP"; then |
4039 | @@ -5210,7 +5538,7 @@ |
4040 | set dummy strip; ac_word=$2 |
4041 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4042 | $as_echo_n "checking for $ac_word... " >&6; } |
4043 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
4044 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
4045 | $as_echo_n "(cached) " >&6 |
4046 | else |
4047 | if test -n "$ac_ct_STRIP"; then |
4048 | @@ -5269,7 +5597,7 @@ |
4049 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
4050 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4051 | $as_echo_n "checking for $ac_word... " >&6; } |
4052 | -if test "${ac_cv_prog_RANLIB+set}" = set; then : |
4053 | +if ${ac_cv_prog_RANLIB+:} false; then : |
4054 | $as_echo_n "(cached) " >&6 |
4055 | else |
4056 | if test -n "$RANLIB"; then |
4057 | @@ -5309,7 +5637,7 @@ |
4058 | set dummy ranlib; ac_word=$2 |
4059 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4060 | $as_echo_n "checking for $ac_word... " >&6; } |
4061 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
4062 | +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : |
4063 | $as_echo_n "(cached) " >&6 |
4064 | else |
4065 | if test -n "$ac_ct_RANLIB"; then |
4066 | @@ -5380,6 +5708,18 @@ |
4067 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
4068 | fi |
4069 | |
4070 | +case $host_os in |
4071 | + darwin*) |
4072 | + lock_old_archive_extraction=yes ;; |
4073 | + *) |
4074 | + lock_old_archive_extraction=no ;; |
4075 | +esac |
4076 | + |
4077 | + |
4078 | + |
4079 | + |
4080 | + |
4081 | + |
4082 | |
4083 | |
4084 | |
4085 | @@ -5426,7 +5766,7 @@ |
4086 | # Check for command to grab the raw symbol name followed by C symbol from nm. |
4087 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 |
4088 | $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } |
4089 | -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : |
4090 | +if ${lt_cv_sys_global_symbol_pipe+:} false; then : |
4091 | $as_echo_n "(cached) " >&6 |
4092 | else |
4093 | |
4094 | @@ -5487,8 +5827,8 @@ |
4095 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
4096 | |
4097 | # Transform an extracted symbol line into symbol name and symbol address |
4098 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
4099 | -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'" |
4100 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
4101 | +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'" |
4102 | |
4103 | # Handle CRLF in mingw tool chain |
4104 | opt_cr= |
4105 | @@ -5524,6 +5864,7 @@ |
4106 | else |
4107 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
4108 | fi |
4109 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
4110 | |
4111 | # Check to see that the pipe works correctly. |
4112 | pipe_works=no |
4113 | @@ -5549,8 +5890,8 @@ |
4114 | test $ac_status = 0; }; then |
4115 | # Now try to grab the symbols. |
4116 | nlist=conftest.nm |
4117 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 |
4118 | - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 |
4119 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 |
4120 | + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 |
4121 | ac_status=$? |
4122 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4123 | test $ac_status = 0; } && test -s "$nlist"; then |
4124 | @@ -5565,6 +5906,18 @@ |
4125 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
4126 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
4127 | cat <<_LT_EOF > conftest.$ac_ext |
4128 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
4129 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
4130 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
4131 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
4132 | +# define LT_DLSYM_CONST |
4133 | +#elif defined(__osf__) |
4134 | +/* This system does not cope well with relocations in const data. */ |
4135 | +# define LT_DLSYM_CONST |
4136 | +#else |
4137 | +# define LT_DLSYM_CONST const |
4138 | +#endif |
4139 | + |
4140 | #ifdef __cplusplus |
4141 | extern "C" { |
4142 | #endif |
4143 | @@ -5576,7 +5929,7 @@ |
4144 | cat <<_LT_EOF >> conftest.$ac_ext |
4145 | |
4146 | /* The mapping between symbol names and symbols. */ |
4147 | -const struct { |
4148 | +LT_DLSYM_CONST struct { |
4149 | const char *name; |
4150 | void *address; |
4151 | } |
4152 | @@ -5602,8 +5955,8 @@ |
4153 | _LT_EOF |
4154 | # Now try linking the two files. |
4155 | mv conftest.$ac_objext conftstm.$ac_objext |
4156 | - lt_save_LIBS="$LIBS" |
4157 | - lt_save_CFLAGS="$CFLAGS" |
4158 | + lt_globsym_save_LIBS=$LIBS |
4159 | + lt_globsym_save_CFLAGS=$CFLAGS |
4160 | LIBS="conftstm.$ac_objext" |
4161 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
4162 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
4163 | @@ -5613,8 +5966,8 @@ |
4164 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
4165 | pipe_works=yes |
4166 | fi |
4167 | - LIBS="$lt_save_LIBS" |
4168 | - CFLAGS="$lt_save_CFLAGS" |
4169 | + LIBS=$lt_globsym_save_LIBS |
4170 | + CFLAGS=$lt_globsym_save_CFLAGS |
4171 | else |
4172 | echo "cannot find nm_test_func in $nlist" >&5 |
4173 | fi |
4174 | @@ -5651,23 +6004,71 @@ |
4175 | $as_echo "ok" >&6; } |
4176 | fi |
4177 | |
4178 | - |
4179 | - |
4180 | - |
4181 | - |
4182 | - |
4183 | - |
4184 | - |
4185 | - |
4186 | - |
4187 | - |
4188 | - |
4189 | - |
4190 | - |
4191 | - |
4192 | - |
4193 | - |
4194 | - |
4195 | +# Response file support. |
4196 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
4197 | + nm_file_list_spec='@' |
4198 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
4199 | + nm_file_list_spec='@' |
4200 | +fi |
4201 | + |
4202 | + |
4203 | + |
4204 | + |
4205 | + |
4206 | + |
4207 | + |
4208 | + |
4209 | + |
4210 | + |
4211 | + |
4212 | + |
4213 | + |
4214 | + |
4215 | + |
4216 | + |
4217 | + |
4218 | + |
4219 | + |
4220 | + |
4221 | + |
4222 | + |
4223 | + |
4224 | + |
4225 | + |
4226 | + |
4227 | + |
4228 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
4229 | +$as_echo_n "checking for sysroot... " >&6; } |
4230 | + |
4231 | +# Check whether --with-sysroot was given. |
4232 | +if test "${with_sysroot+set}" = set; then : |
4233 | + withval=$with_sysroot; |
4234 | +else |
4235 | + with_sysroot=no |
4236 | +fi |
4237 | + |
4238 | + |
4239 | +lt_sysroot= |
4240 | +case ${with_sysroot} in #( |
4241 | + yes) |
4242 | + if test "$GCC" = yes; then |
4243 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
4244 | + fi |
4245 | + ;; #( |
4246 | + /*) |
4247 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
4248 | + ;; #( |
4249 | + no|'') |
4250 | + ;; #( |
4251 | + *) |
4252 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 |
4253 | +$as_echo "${with_sysroot}" >&6; } |
4254 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
4255 | + ;; |
4256 | +esac |
4257 | + |
4258 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
4259 | +$as_echo "${lt_sysroot:-no}" >&6; } |
4260 | |
4261 | |
4262 | |
4263 | @@ -5704,7 +6105,7 @@ |
4264 | ;; |
4265 | *-*-irix6*) |
4266 | # Find out which ABI we are using. |
4267 | - echo '#line 5707 "configure"' > conftest.$ac_ext |
4268 | + echo '#line '$LINENO' "configure"' > conftest.$ac_ext |
4269 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
4270 | (eval $ac_compile) 2>&5 |
4271 | ac_status=$? |
4272 | @@ -5798,7 +6199,7 @@ |
4273 | CFLAGS="$CFLAGS -belf" |
4274 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 |
4275 | $as_echo_n "checking whether the C compiler needs -belf... " >&6; } |
4276 | -if test "${lt_cv_cc_needs_belf+set}" = set; then : |
4277 | +if ${lt_cv_cc_needs_belf+:} false; then : |
4278 | $as_echo_n "(cached) " >&6 |
4279 | else |
4280 | ac_ext=c |
4281 | @@ -5866,6 +6267,123 @@ |
4282 | |
4283 | need_locks="$enable_libtool_lock" |
4284 | |
4285 | +if test -n "$ac_tool_prefix"; then |
4286 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
4287 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
4288 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4289 | +$as_echo_n "checking for $ac_word... " >&6; } |
4290 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
4291 | + $as_echo_n "(cached) " >&6 |
4292 | +else |
4293 | + if test -n "$MANIFEST_TOOL"; then |
4294 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
4295 | +else |
4296 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4297 | +for as_dir in $PATH |
4298 | +do |
4299 | + IFS=$as_save_IFS |
4300 | + test -z "$as_dir" && as_dir=. |
4301 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4302 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4303 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
4304 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4305 | + break 2 |
4306 | + fi |
4307 | +done |
4308 | + done |
4309 | +IFS=$as_save_IFS |
4310 | + |
4311 | +fi |
4312 | +fi |
4313 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
4314 | +if test -n "$MANIFEST_TOOL"; then |
4315 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
4316 | +$as_echo "$MANIFEST_TOOL" >&6; } |
4317 | +else |
4318 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4319 | +$as_echo "no" >&6; } |
4320 | +fi |
4321 | + |
4322 | + |
4323 | +fi |
4324 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
4325 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
4326 | + # Extract the first word of "mt", so it can be a program name with args. |
4327 | +set dummy mt; ac_word=$2 |
4328 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4329 | +$as_echo_n "checking for $ac_word... " >&6; } |
4330 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
4331 | + $as_echo_n "(cached) " >&6 |
4332 | +else |
4333 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
4334 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
4335 | +else |
4336 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4337 | +for as_dir in $PATH |
4338 | +do |
4339 | + IFS=$as_save_IFS |
4340 | + test -z "$as_dir" && as_dir=. |
4341 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4342 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4343 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
4344 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4345 | + break 2 |
4346 | + fi |
4347 | +done |
4348 | + done |
4349 | +IFS=$as_save_IFS |
4350 | + |
4351 | +fi |
4352 | +fi |
4353 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
4354 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
4355 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
4356 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
4357 | +else |
4358 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4359 | +$as_echo "no" >&6; } |
4360 | +fi |
4361 | + |
4362 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
4363 | + MANIFEST_TOOL=":" |
4364 | + else |
4365 | + case $cross_compiling:$ac_tool_warned in |
4366 | +yes:) |
4367 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
4368 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
4369 | +ac_tool_warned=yes ;; |
4370 | +esac |
4371 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
4372 | + fi |
4373 | +else |
4374 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
4375 | +fi |
4376 | + |
4377 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
4378 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
4379 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
4380 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
4381 | + $as_echo_n "(cached) " >&6 |
4382 | +else |
4383 | + lt_cv_path_mainfest_tool=no |
4384 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
4385 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
4386 | + cat conftest.err >&5 |
4387 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
4388 | + lt_cv_path_mainfest_tool=yes |
4389 | + fi |
4390 | + rm -f conftest* |
4391 | +fi |
4392 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
4393 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
4394 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
4395 | + MANIFEST_TOOL=: |
4396 | +fi |
4397 | + |
4398 | + |
4399 | + |
4400 | + |
4401 | + |
4402 | |
4403 | case $host_os in |
4404 | rhapsody* | darwin*) |
4405 | @@ -5874,7 +6392,7 @@ |
4406 | set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 |
4407 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4408 | $as_echo_n "checking for $ac_word... " >&6; } |
4409 | -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : |
4410 | +if ${ac_cv_prog_DSYMUTIL+:} false; then : |
4411 | $as_echo_n "(cached) " >&6 |
4412 | else |
4413 | if test -n "$DSYMUTIL"; then |
4414 | @@ -5914,7 +6432,7 @@ |
4415 | set dummy dsymutil; ac_word=$2 |
4416 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4417 | $as_echo_n "checking for $ac_word... " >&6; } |
4418 | -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : |
4419 | +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : |
4420 | $as_echo_n "(cached) " >&6 |
4421 | else |
4422 | if test -n "$ac_ct_DSYMUTIL"; then |
4423 | @@ -5966,7 +6484,7 @@ |
4424 | set dummy ${ac_tool_prefix}nmedit; ac_word=$2 |
4425 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4426 | $as_echo_n "checking for $ac_word... " >&6; } |
4427 | -if test "${ac_cv_prog_NMEDIT+set}" = set; then : |
4428 | +if ${ac_cv_prog_NMEDIT+:} false; then : |
4429 | $as_echo_n "(cached) " >&6 |
4430 | else |
4431 | if test -n "$NMEDIT"; then |
4432 | @@ -6006,7 +6524,7 @@ |
4433 | set dummy nmedit; ac_word=$2 |
4434 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4435 | $as_echo_n "checking for $ac_word... " >&6; } |
4436 | -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : |
4437 | +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : |
4438 | $as_echo_n "(cached) " >&6 |
4439 | else |
4440 | if test -n "$ac_ct_NMEDIT"; then |
4441 | @@ -6058,7 +6576,7 @@ |
4442 | set dummy ${ac_tool_prefix}lipo; ac_word=$2 |
4443 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4444 | $as_echo_n "checking for $ac_word... " >&6; } |
4445 | -if test "${ac_cv_prog_LIPO+set}" = set; then : |
4446 | +if ${ac_cv_prog_LIPO+:} false; then : |
4447 | $as_echo_n "(cached) " >&6 |
4448 | else |
4449 | if test -n "$LIPO"; then |
4450 | @@ -6098,7 +6616,7 @@ |
4451 | set dummy lipo; ac_word=$2 |
4452 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4453 | $as_echo_n "checking for $ac_word... " >&6; } |
4454 | -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : |
4455 | +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : |
4456 | $as_echo_n "(cached) " >&6 |
4457 | else |
4458 | if test -n "$ac_ct_LIPO"; then |
4459 | @@ -6150,7 +6668,7 @@ |
4460 | set dummy ${ac_tool_prefix}otool; ac_word=$2 |
4461 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4462 | $as_echo_n "checking for $ac_word... " >&6; } |
4463 | -if test "${ac_cv_prog_OTOOL+set}" = set; then : |
4464 | +if ${ac_cv_prog_OTOOL+:} false; then : |
4465 | $as_echo_n "(cached) " >&6 |
4466 | else |
4467 | if test -n "$OTOOL"; then |
4468 | @@ -6190,7 +6708,7 @@ |
4469 | set dummy otool; ac_word=$2 |
4470 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4471 | $as_echo_n "checking for $ac_word... " >&6; } |
4472 | -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : |
4473 | +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : |
4474 | $as_echo_n "(cached) " >&6 |
4475 | else |
4476 | if test -n "$ac_ct_OTOOL"; then |
4477 | @@ -6242,7 +6760,7 @@ |
4478 | set dummy ${ac_tool_prefix}otool64; ac_word=$2 |
4479 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4480 | $as_echo_n "checking for $ac_word... " >&6; } |
4481 | -if test "${ac_cv_prog_OTOOL64+set}" = set; then : |
4482 | +if ${ac_cv_prog_OTOOL64+:} false; then : |
4483 | $as_echo_n "(cached) " >&6 |
4484 | else |
4485 | if test -n "$OTOOL64"; then |
4486 | @@ -6282,7 +6800,7 @@ |
4487 | set dummy otool64; ac_word=$2 |
4488 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4489 | $as_echo_n "checking for $ac_word... " >&6; } |
4490 | -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : |
4491 | +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : |
4492 | $as_echo_n "(cached) " >&6 |
4493 | else |
4494 | if test -n "$ac_ct_OTOOL64"; then |
4495 | @@ -6357,7 +6875,7 @@ |
4496 | |
4497 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 |
4498 | $as_echo_n "checking for -single_module linker flag... " >&6; } |
4499 | -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : |
4500 | +if ${lt_cv_apple_cc_single_mod+:} false; then : |
4501 | $as_echo_n "(cached) " >&6 |
4502 | else |
4503 | lt_cv_apple_cc_single_mod=no |
4504 | @@ -6386,7 +6904,7 @@ |
4505 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
4506 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
4507 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
4508 | -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : |
4509 | +if ${lt_cv_ld_exported_symbols_list+:} false; then : |
4510 | $as_echo_n "(cached) " >&6 |
4511 | else |
4512 | lt_cv_ld_exported_symbols_list=no |
4513 | @@ -6416,6 +6934,38 @@ |
4514 | fi |
4515 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
4516 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
4517 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
4518 | +$as_echo_n "checking for -force_load linker flag... " >&6; } |
4519 | +if ${lt_cv_ld_force_load+:} false; then : |
4520 | + $as_echo_n "(cached) " >&6 |
4521 | +else |
4522 | + lt_cv_ld_force_load=no |
4523 | + cat > conftest.c << _LT_EOF |
4524 | +int forced_loaded() { return 2;} |
4525 | +_LT_EOF |
4526 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 |
4527 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
4528 | + echo "$AR cru libconftest.a conftest.o" >&5 |
4529 | + $AR cru libconftest.a conftest.o 2>&5 |
4530 | + echo "$RANLIB libconftest.a" >&5 |
4531 | + $RANLIB libconftest.a 2>&5 |
4532 | + cat > conftest.c << _LT_EOF |
4533 | +int main() { return 0;} |
4534 | +_LT_EOF |
4535 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
4536 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
4537 | + _lt_result=$? |
4538 | + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
4539 | + lt_cv_ld_force_load=yes |
4540 | + else |
4541 | + cat conftest.err >&5 |
4542 | + fi |
4543 | + rm -f conftest.err libconftest.a conftest conftest.c |
4544 | + rm -rf conftest.dSYM |
4545 | + |
4546 | +fi |
4547 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 |
4548 | +$as_echo "$lt_cv_ld_force_load" >&6; } |
4549 | case $host_os in |
4550 | rhapsody* | darwin1.[012]) |
4551 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
4552 | @@ -6443,7 +6993,7 @@ |
4553 | else |
4554 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
4555 | fi |
4556 | - if test "$DSYMUTIL" != ":"; then |
4557 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
4558 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
4559 | else |
4560 | _lt_dsymutil= |
4561 | @@ -6463,7 +7013,7 @@ |
4562 | CPP= |
4563 | fi |
4564 | if test -z "$CPP"; then |
4565 | - if test "${ac_cv_prog_CPP+set}" = set; then : |
4566 | + if ${ac_cv_prog_CPP+:} false; then : |
4567 | $as_echo_n "(cached) " >&6 |
4568 | else |
4569 | # Double quotes because CPP needs to be expanded |
4570 | @@ -6493,7 +7043,7 @@ |
4571 | # Broken: fails on valid input. |
4572 | continue |
4573 | fi |
4574 | -rm -f conftest.err conftest.$ac_ext |
4575 | +rm -f conftest.err conftest.i conftest.$ac_ext |
4576 | |
4577 | # OK, works on sane cases. Now check whether nonexistent headers |
4578 | # can be detected and how. |
4579 | @@ -6509,11 +7059,11 @@ |
4580 | ac_preproc_ok=: |
4581 | break |
4582 | fi |
4583 | -rm -f conftest.err conftest.$ac_ext |
4584 | +rm -f conftest.err conftest.i conftest.$ac_ext |
4585 | |
4586 | done |
4587 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
4588 | -rm -f conftest.err conftest.$ac_ext |
4589 | +rm -f conftest.i conftest.err conftest.$ac_ext |
4590 | if $ac_preproc_ok; then : |
4591 | break |
4592 | fi |
4593 | @@ -6552,7 +7102,7 @@ |
4594 | # Broken: fails on valid input. |
4595 | continue |
4596 | fi |
4597 | -rm -f conftest.err conftest.$ac_ext |
4598 | +rm -f conftest.err conftest.i conftest.$ac_ext |
4599 | |
4600 | # OK, works on sane cases. Now check whether nonexistent headers |
4601 | # can be detected and how. |
4602 | @@ -6568,18 +7118,18 @@ |
4603 | ac_preproc_ok=: |
4604 | break |
4605 | fi |
4606 | -rm -f conftest.err conftest.$ac_ext |
4607 | +rm -f conftest.err conftest.i conftest.$ac_ext |
4608 | |
4609 | done |
4610 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
4611 | -rm -f conftest.err conftest.$ac_ext |
4612 | +rm -f conftest.i conftest.err conftest.$ac_ext |
4613 | if $ac_preproc_ok; then : |
4614 | |
4615 | else |
4616 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4617 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4618 | -as_fn_error "C preprocessor \"$CPP\" fails sanity check |
4619 | -See \`config.log' for more details." "$LINENO" 5; } |
4620 | +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
4621 | +See \`config.log' for more details" "$LINENO" 5; } |
4622 | fi |
4623 | |
4624 | ac_ext=c |
4625 | @@ -6591,7 +7141,7 @@ |
4626 | |
4627 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
4628 | $as_echo_n "checking for ANSI C header files... " >&6; } |
4629 | -if test "${ac_cv_header_stdc+set}" = set; then : |
4630 | +if ${ac_cv_header_stdc+:} false; then : |
4631 | $as_echo_n "(cached) " >&6 |
4632 | else |
4633 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4634 | @@ -6708,8 +7258,7 @@ |
4635 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
4636 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
4637 | " |
4638 | -eval as_val=\$$as_ac_Header |
4639 | - if test "x$as_val" = x""yes; then : |
4640 | +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
4641 | cat >>confdefs.h <<_ACEOF |
4642 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
4643 | _ACEOF |
4644 | @@ -6723,7 +7272,7 @@ |
4645 | do : |
4646 | ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default |
4647 | " |
4648 | -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : |
4649 | +if test "x$ac_cv_header_dlfcn_h" = xyes; then : |
4650 | cat >>confdefs.h <<_ACEOF |
4651 | #define HAVE_DLFCN_H 1 |
4652 | _ACEOF |
4653 | @@ -6734,6 +7283,8 @@ |
4654 | |
4655 | |
4656 | |
4657 | + |
4658 | + |
4659 | # Set options |
4660 | |
4661 | |
4662 | @@ -6886,6 +7437,7 @@ |
4663 | |
4664 | |
4665 | |
4666 | + |
4667 | test -z "$LN_S" && LN_S="ln -s" |
4668 | |
4669 | |
4670 | @@ -6907,7 +7459,7 @@ |
4671 | |
4672 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 |
4673 | $as_echo_n "checking for objdir... " >&6; } |
4674 | -if test "${lt_cv_objdir+set}" = set; then : |
4675 | +if ${lt_cv_objdir+:} false; then : |
4676 | $as_echo_n "(cached) " >&6 |
4677 | else |
4678 | rm -f .libs 2>/dev/null |
4679 | @@ -6935,19 +7487,6 @@ |
4680 | |
4681 | |
4682 | |
4683 | - |
4684 | - |
4685 | - |
4686 | - |
4687 | - |
4688 | - |
4689 | - |
4690 | - |
4691 | - |
4692 | - |
4693 | - |
4694 | - |
4695 | - |
4696 | case $host_os in |
4697 | aix3*) |
4698 | # AIX sometimes has problems with the GCC collect2 program. For some |
4699 | @@ -6960,23 +7499,6 @@ |
4700 | ;; |
4701 | esac |
4702 | |
4703 | -# Sed substitution that helps us do robust quoting. It backslashifies |
4704 | -# metacharacters that are still active within double-quoted strings. |
4705 | -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
4706 | - |
4707 | -# Same as above, but do not quote variable references. |
4708 | -double_quote_subst='s/\(["`\\]\)/\\\1/g' |
4709 | - |
4710 | -# Sed substitution to delay expansion of an escaped shell variable in a |
4711 | -# double_quote_subst'ed string. |
4712 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
4713 | - |
4714 | -# Sed substitution to delay expansion of an escaped single quote. |
4715 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
4716 | - |
4717 | -# Sed substitution to avoid accidental globbing in evaled expressions |
4718 | -no_glob_subst='s/\*/\\\*/g' |
4719 | - |
4720 | # Global variables: |
4721 | ofile=libtool |
4722 | can_build_shared=yes |
4723 | @@ -7005,7 +7527,7 @@ |
4724 | *) break;; |
4725 | esac |
4726 | done |
4727 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
4728 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
4729 | |
4730 | |
4731 | # Only perform the check for file, if the check method requires it |
4732 | @@ -7015,7 +7537,7 @@ |
4733 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
4734 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 |
4735 | $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } |
4736 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : |
4737 | +if ${lt_cv_path_MAGIC_CMD+:} false; then : |
4738 | $as_echo_n "(cached) " >&6 |
4739 | else |
4740 | case $MAGIC_CMD in |
4741 | @@ -7081,7 +7603,7 @@ |
4742 | if test -n "$ac_tool_prefix"; then |
4743 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 |
4744 | $as_echo_n "checking for file... " >&6; } |
4745 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : |
4746 | +if ${lt_cv_path_MAGIC_CMD+:} false; then : |
4747 | $as_echo_n "(cached) " >&6 |
4748 | else |
4749 | case $MAGIC_CMD in |
4750 | @@ -7214,11 +7736,16 @@ |
4751 | lt_prog_compiler_no_builtin_flag= |
4752 | |
4753 | if test "$GCC" = yes; then |
4754 | - lt_prog_compiler_no_builtin_flag=' -fno-builtin' |
4755 | + case $cc_basename in |
4756 | + nvcc*) |
4757 | + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; |
4758 | + *) |
4759 | + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; |
4760 | + esac |
4761 | |
4762 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
4763 | $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } |
4764 | -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : |
4765 | +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : |
4766 | $as_echo_n "(cached) " >&6 |
4767 | else |
4768 | lt_cv_prog_compiler_rtti_exceptions=no |
4769 | @@ -7234,15 +7761,15 @@ |
4770 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4771 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4772 | -e 's:$: $lt_compiler_flag:'` |
4773 | - (eval echo "\"\$as_me:7237: $lt_compile\"" >&5) |
4774 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4775 | (eval "$lt_compile" 2>conftest.err) |
4776 | ac_status=$? |
4777 | cat conftest.err >&5 |
4778 | - echo "$as_me:7241: \$? = $ac_status" >&5 |
4779 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4780 | if (exit $ac_status) && test -s "$ac_outfile"; then |
4781 | # The compiler can only warn and ignore the option if not recognized |
4782 | # So say no if there are warnings other than the usual output. |
4783 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
4784 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
4785 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4786 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
4787 | lt_cv_prog_compiler_rtti_exceptions=yes |
4788 | @@ -7271,8 +7798,6 @@ |
4789 | lt_prog_compiler_pic= |
4790 | lt_prog_compiler_static= |
4791 | |
4792 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
4793 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4794 | |
4795 | if test "$GCC" = yes; then |
4796 | lt_prog_compiler_wl='-Wl,' |
4797 | @@ -7320,6 +7845,12 @@ |
4798 | lt_prog_compiler_pic='-fno-common' |
4799 | ;; |
4800 | |
4801 | + haiku*) |
4802 | + # PIC is the default for Haiku. |
4803 | + # The "-static" flag exists, but is broken. |
4804 | + lt_prog_compiler_static= |
4805 | + ;; |
4806 | + |
4807 | hpux*) |
4808 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
4809 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
4810 | @@ -7362,6 +7893,13 @@ |
4811 | lt_prog_compiler_pic='-fPIC' |
4812 | ;; |
4813 | esac |
4814 | + |
4815 | + case $cc_basename in |
4816 | + nvcc*) # Cuda Compiler Driver 2.2 |
4817 | + lt_prog_compiler_wl='-Xlinker ' |
4818 | + lt_prog_compiler_pic='-Xcompiler -fPIC' |
4819 | + ;; |
4820 | + esac |
4821 | else |
4822 | # PORTME Check for flag to pass linker flags through the system compiler. |
4823 | case $host_os in |
4824 | @@ -7403,7 +7941,7 @@ |
4825 | lt_prog_compiler_static='-non_shared' |
4826 | ;; |
4827 | |
4828 | - linux* | k*bsd*-gnu) |
4829 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4830 | case $cc_basename in |
4831 | # old Intel for x86_64 which still supported -KPIC. |
4832 | ecc*) |
4833 | @@ -7424,7 +7962,13 @@ |
4834 | lt_prog_compiler_pic='--shared' |
4835 | lt_prog_compiler_static='--static' |
4836 | ;; |
4837 | - pgcc* | pgf77* | pgf90* | pgf95*) |
4838 | + nagfor*) |
4839 | + # NAG Fortran compiler |
4840 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
4841 | + lt_prog_compiler_pic='-PIC' |
4842 | + lt_prog_compiler_static='-Bstatic' |
4843 | + ;; |
4844 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
4845 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4846 | # which looks to be a dead project) |
4847 | lt_prog_compiler_wl='-Wl,' |
4848 | @@ -7436,26 +7980,26 @@ |
4849 | # All Alpha code is PIC. |
4850 | lt_prog_compiler_static='-non_shared' |
4851 | ;; |
4852 | - xl*) |
4853 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
4854 | + xl* | bgxl* | bgf* | mpixl*) |
4855 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
4856 | lt_prog_compiler_wl='-Wl,' |
4857 | lt_prog_compiler_pic='-qpic' |
4858 | lt_prog_compiler_static='-qstaticlink' |
4859 | ;; |
4860 | *) |
4861 | case `$CC -V 2>&1 | sed 5q` in |
4862 | + *Sun\ F* | *Sun*Fortran*) |
4863 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4864 | + lt_prog_compiler_pic='-KPIC' |
4865 | + lt_prog_compiler_static='-Bstatic' |
4866 | + lt_prog_compiler_wl='' |
4867 | + ;; |
4868 | *Sun\ C*) |
4869 | # Sun C 5.9 |
4870 | lt_prog_compiler_pic='-KPIC' |
4871 | lt_prog_compiler_static='-Bstatic' |
4872 | lt_prog_compiler_wl='-Wl,' |
4873 | ;; |
4874 | - *Sun\ F*) |
4875 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4876 | - lt_prog_compiler_pic='-KPIC' |
4877 | - lt_prog_compiler_static='-Bstatic' |
4878 | - lt_prog_compiler_wl='' |
4879 | - ;; |
4880 | esac |
4881 | ;; |
4882 | esac |
4883 | @@ -7486,7 +8030,7 @@ |
4884 | lt_prog_compiler_pic='-KPIC' |
4885 | lt_prog_compiler_static='-Bstatic' |
4886 | case $cc_basename in |
4887 | - f77* | f90* | f95*) |
4888 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
4889 | lt_prog_compiler_wl='-Qoption ld ';; |
4890 | *) |
4891 | lt_prog_compiler_wl='-Wl,';; |
4892 | @@ -7543,13 +8087,17 @@ |
4893 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
4894 | ;; |
4895 | esac |
4896 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
4897 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
4898 | - |
4899 | - |
4900 | - |
4901 | - |
4902 | - |
4903 | + |
4904 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
4905 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4906 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
4907 | + $as_echo_n "(cached) " >&6 |
4908 | +else |
4909 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
4910 | +fi |
4911 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
4912 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
4913 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
4914 | |
4915 | # |
4916 | # Check to make sure the PIC flag actually works. |
4917 | @@ -7557,7 +8105,7 @@ |
4918 | if test -n "$lt_prog_compiler_pic"; then |
4919 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 |
4920 | $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } |
4921 | -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : |
4922 | +if ${lt_cv_prog_compiler_pic_works+:} false; then : |
4923 | $as_echo_n "(cached) " >&6 |
4924 | else |
4925 | lt_cv_prog_compiler_pic_works=no |
4926 | @@ -7573,15 +8121,15 @@ |
4927 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4928 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4929 | -e 's:$: $lt_compiler_flag:'` |
4930 | - (eval echo "\"\$as_me:7576: $lt_compile\"" >&5) |
4931 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4932 | (eval "$lt_compile" 2>conftest.err) |
4933 | ac_status=$? |
4934 | cat conftest.err >&5 |
4935 | - echo "$as_me:7580: \$? = $ac_status" >&5 |
4936 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4937 | if (exit $ac_status) && test -s "$ac_outfile"; then |
4938 | # The compiler can only warn and ignore the option if not recognized |
4939 | # So say no if there are warnings other than the usual output. |
4940 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
4941 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
4942 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4943 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
4944 | lt_cv_prog_compiler_pic_works=yes |
4945 | @@ -7610,13 +8158,18 @@ |
4946 | |
4947 | |
4948 | |
4949 | + |
4950 | + |
4951 | + |
4952 | + |
4953 | + |
4954 | # |
4955 | # Check to make sure the static flag actually works. |
4956 | # |
4957 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" |
4958 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
4959 | $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } |
4960 | -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : |
4961 | +if ${lt_cv_prog_compiler_static_works+:} false; then : |
4962 | $as_echo_n "(cached) " >&6 |
4963 | else |
4964 | lt_cv_prog_compiler_static_works=no |
4965 | @@ -7629,7 +8182,7 @@ |
4966 | if test -s conftest.err; then |
4967 | # Append any errors to the config.log. |
4968 | cat conftest.err 1>&5 |
4969 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
4970 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
4971 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4972 | if diff conftest.exp conftest.er2 >/dev/null; then |
4973 | lt_cv_prog_compiler_static_works=yes |
4974 | @@ -7659,7 +8212,7 @@ |
4975 | |
4976 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 |
4977 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
4978 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : |
4979 | +if ${lt_cv_prog_compiler_c_o+:} false; then : |
4980 | $as_echo_n "(cached) " >&6 |
4981 | else |
4982 | lt_cv_prog_compiler_c_o=no |
4983 | @@ -7678,16 +8231,16 @@ |
4984 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4985 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4986 | -e 's:$: $lt_compiler_flag:'` |
4987 | - (eval echo "\"\$as_me:7681: $lt_compile\"" >&5) |
4988 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4989 | (eval "$lt_compile" 2>out/conftest.err) |
4990 | ac_status=$? |
4991 | cat out/conftest.err >&5 |
4992 | - echo "$as_me:7685: \$? = $ac_status" >&5 |
4993 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4994 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
4995 | then |
4996 | # The compiler can only warn and ignore the option if not recognized |
4997 | # So say no if there are warnings |
4998 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
4999 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
5000 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
The diff has been truncated for viewing.
Thanks. Uploaded.