Merge lp:~mfisch/ubuntu/raring/cracklib2/new_upstream_2.8.20 into lp:ubuntu/raring/cracklib2
- Raring (13.04)
- new_upstream_2.8.20
- Merge into raring
Proposed by
Matt Fischer
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 31 | ||||
Proposed branch: | lp:~mfisch/ubuntu/raring/cracklib2/new_upstream_2.8.20 | ||||
Merge into: | lp:ubuntu/raring/cracklib2 | ||||
Diff against target: |
16723 lines (+5182/-3653) 76 files modified
.pc/applied-patches (+0/-3) .pc/install-debian-python-modules.patch/python/setup.py.in (+0/-58) .pc/pass-dict-to-cracklib-test.patch/python/cracklib.py (+0/-228) .pc/python3.3.patch/python/Makefile.am (+0/-9) .pc/python3.3.patch/python/_cracklibmodule.c (+0/-218) .pc/python3.3.patch/python/setup.py.in (+0/-58) INSTALL (+7/-2) Makefile.in (+84/-40) NEWS (+3/-0) aclocal.m4 (+58/-40) config.guess (+147/-118) config.sub (+136/-68) configure (+1378/-629) configure.in (+2/-1) debian/changelog (+13/-0) debian/patches/install-debian-python-modules.patch (+1/-1) debian/patches/pass-dict-to-cracklib-test.patch (+0/-18) debian/patches/python3.3.patch (+0/-472) debian/patches/series (+0/-2) debian/rules (+0/-1) depcomp (+134/-56) dicts/Makefile.in (+48/-11) doc/Makefile.in (+48/-11) install-sh (+18/-11) lib/Makefile.in (+51/-13) lib/packer.h (+2/-1) lib/packlib.c (+16/-15) ltmain.sh (+1688/-778) m4/Makefile.in (+37/-7) m4/libtool.m4 (+943/-398) m4/ltoptions.m4 (+17/-2) m4/ltversion.m4 (+6/-6) missing (+4/-49) po/as.po (+1/-1) po/bn_IN.po (+1/-1) po/cracklib.pot (+2/-2) po/cs.po (+1/-1) po/da.po (+1/-1) po/de.po (+1/-1) po/el.po (+1/-1) po/es.po (+1/-1) po/fi.po (+1/-1) po/fr.po (+1/-1) po/gu.po (+1/-1) po/hi.po (+1/-1) po/hu.po (+1/-1) po/it.po (+1/-1) po/ja.po (+1/-1) po/kn.po (+1/-1) po/ko.po (+1/-1) po/lt.po (+1/-1) po/ml.po (+1/-1) po/mr.po (+1/-1) po/nb.po (+1/-1) po/nl.po (+1/-1) po/or.po (+1/-1) po/pa.po (+1/-1) po/pl.po (+1/-1) po/pt.po (+1/-1) po/pt_BR.po (+1/-1) po/ru.po (+1/-1) po/sk.po (+1/-1) po/sl_SI.po (+1/-1) po/ta.po (+1/-1) po/te.po (+1/-1) po/tr.po (+1/-1) po/uk.po (+1/-1) po/zh_CN.po (+1/-1) po/zh_TW.po (+1/-1) py-compile (+33/-18) python/Makefile.am (+1/-1) python/Makefile.in (+73/-35) python/_cracklib.c (+0/-218) python/setup.py.in (+2/-2) python/test_cracklib.py (+137/-0) util/Makefile.in (+58/-18) |
||||
To merge this branch: | bzr merge lp:~mfisch/ubuntu/raring/cracklib2/new_upstream_2.8.20 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+138890@code.launchpad.net |
Commit message
Description of the change
New upstream:
cracklib2 (2.8.20-0ubuntu1) raring; urgency=low
* New upstream release:
- Patches applied upstream:
- pass-dict-
- python3.3.patch
- Patches remaining:
- install-
- debian/
- debian/rules: removed symlink for debian/
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file '.pc/applied-patches' |
2 | --- .pc/applied-patches 2012-10-23 09:53:29 +0000 |
3 | +++ .pc/applied-patches 1970-01-01 00:00:00 +0000 |
4 | @@ -1,3 +0,0 @@ |
5 | -install-debian-python-modules.patch |
6 | -pass-dict-to-cracklib-test.patch |
7 | -python3.3.patch |
8 | |
9 | === removed directory '.pc/install-debian-python-modules.patch' |
10 | === removed directory '.pc/install-debian-python-modules.patch/python' |
11 | === removed file '.pc/install-debian-python-modules.patch/python/setup.py.in' |
12 | --- .pc/install-debian-python-modules.patch/python/setup.py.in 2012-05-20 01:24:02 +0000 |
13 | +++ .pc/install-debian-python-modules.patch/python/setup.py.in 1970-01-01 00:00:00 +0000 |
14 | @@ -1,58 +0,0 @@ |
15 | -#!/usr/bin/python |
16 | -# Copyright 2009 Jan Dittberner <jan@dittberner.info> |
17 | -# |
18 | -# This file is part of cracklib. |
19 | -# |
20 | -# cracklib is free software; you can redistribute it and/or modify it |
21 | -# under the terms of the GNU General Public License as published by |
22 | -# the Free Software Foundation; either version 2 of the License, or |
23 | -# (at your option) any later version. |
24 | -# |
25 | -# cracklib is distributed in the hope that it will be useful, but |
26 | -# WITHOUT ANY WARRANTY; without even the implied warranty of |
27 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
28 | -# General Public License for more details. |
29 | -# |
30 | -# You should have received a copy of the GNU General Public License |
31 | -# along with Prua; if not, write to the Free Software Foundation, |
32 | -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
33 | - |
34 | -import os, sys |
35 | - |
36 | -from setuptools import setup, Extension, find_packages |
37 | - |
38 | -extensions = [ |
39 | - Extension("_cracklibmodule", |
40 | - ["_cracklibmodule.c"], |
41 | - include_dirs = ["@top_builddir@/lib"], |
42 | - libraries = ["crack"], |
43 | - library_dirs = ["@top_builddir@/lib/.libs"]), |
44 | -] |
45 | - |
46 | -setup( |
47 | - name="cracklib", |
48 | - version="@VERSION@", |
49 | - description="A CPython extension module wrapping the libcrack library", |
50 | - long_description="""\ |
51 | -This CPython extension provides Python bindings for cracklib. It |
52 | -contains a pythonic interface to cracklib's functions and some Python |
53 | -convenience functions. |
54 | -""", |
55 | - author="Jan Dittberner", |
56 | - author_email="jan@dittberner.info", |
57 | - url="http://cracklib.sourceforge.net/", |
58 | - license="GPLv2+", |
59 | - py_modules=['cracklib'], |
60 | - ext_modules=extensions, |
61 | - zip_safe=False, |
62 | - classifiers=[ |
63 | - "Development Status :: 4 - Beta", |
64 | - "Intended Audience :: Developers", |
65 | - "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", |
66 | - "Operating System :: OS Independent", |
67 | - "Programming Language :: Python", |
68 | - "Topic :: Security", |
69 | - "Topic :: Software Development :: Libraries :: Python Modules", |
70 | - "Topic :: System :: Systems Administration", |
71 | - ], |
72 | -) |
73 | |
74 | === removed directory '.pc/pass-dict-to-cracklib-test.patch' |
75 | === removed directory '.pc/pass-dict-to-cracklib-test.patch/python' |
76 | === removed file '.pc/pass-dict-to-cracklib-test.patch/python/cracklib.py' |
77 | --- .pc/pass-dict-to-cracklib-test.patch/python/cracklib.py 2012-05-20 01:24:02 +0000 |
78 | +++ .pc/pass-dict-to-cracklib-test.patch/python/cracklib.py 1970-01-01 00:00:00 +0000 |
79 | @@ -1,228 +0,0 @@ |
80 | -# |
81 | -# A Python binding for cracklib. |
82 | -# |
83 | -# Parts of this code are based on work Copyright (c) 2003 by Domenico |
84 | -# Andreoli. |
85 | -# |
86 | -# Copyright (c) 2008, 2009, 2012 Jan Dittberner <jan@dittberner.info> |
87 | -# |
88 | -# This file is part of cracklib. |
89 | -# |
90 | -# This library is free software; you can redistribute it and/or modify it under |
91 | -# the terms of the GNU Lesser General Public License as published by the Free |
92 | -# Software Foundation; either version 2.1 of the License, or (at your option) |
93 | -# any later version. |
94 | -# |
95 | -# This library is distributed in the hope that it will be useful, but WITHOUT |
96 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
97 | -# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more |
98 | -# details. |
99 | -# |
100 | -# You should have received a copy of the GNU Lesser General Public License |
101 | -# along with this library; if not, write to the Free Software Foundation, Inc., |
102 | -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
103 | -"""Python extensions for the cracklib binding. |
104 | -""" |
105 | - |
106 | -import string |
107 | -from _cracklib import FascistCheck |
108 | - |
109 | -__version__ = '2.8.19' |
110 | - |
111 | -ASCII_UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" |
112 | -ASCII_LOWERCASE = "abcdefghijklmnopqrstuvwxyz" |
113 | - |
114 | -DIFF_OK = 5 |
115 | -MIN_LENGTH = 9 |
116 | -DIG_CREDIT = 1 |
117 | -UP_CREDIT = 1 |
118 | -LOW_CREDIT = 1 |
119 | -OTH_CREDIT = 1 |
120 | - |
121 | - |
122 | -def palindrome(sample): |
123 | - """Checks whether the given string is a palindrome. |
124 | - """ |
125 | - for i in range(len(sample)): |
126 | - if sample[i] != sample[-i - 1]: |
127 | - return 0 |
128 | - return 1 |
129 | - |
130 | - |
131 | -def distdifferent(old, new, i, j): |
132 | - """Calculate how different two strings are in terms of the number |
133 | - of character removals, additions, and changes needed to go from one |
134 | - to the other.""" |
135 | - if i == 0 or len(old) <= i: |
136 | - cval = 0 |
137 | - else: |
138 | - cval = old[i - 1] |
139 | - |
140 | - if j == 0 or len(new) <= i: |
141 | - dval = 0 |
142 | - else: |
143 | - dval = new[j - 1] |
144 | - |
145 | - return cval != dval |
146 | - |
147 | - |
148 | -def distcalculate(distances, old, new, i, j): |
149 | - """Calculates the distance between two strings. |
150 | - """ |
151 | - tmp = 0 |
152 | - |
153 | - if distances[i][j] != -1: |
154 | - return distances[i][j] |
155 | - |
156 | - tmp = distcalculate(distances, old, new, i - 1, j - 1) |
157 | - tmp = min(tmp, distcalculate(distances, old, new, i , j - 1)) |
158 | - tmp = min(tmp, distcalculate(distances, old, new, i - 1, j )) |
159 | - tmp = tmp + distdifferent(old, new, i, j) |
160 | - |
161 | - distances[i][j] = tmp |
162 | - |
163 | - return tmp |
164 | - |
165 | - |
166 | -def distance(old, new): |
167 | - """Gets the distance of two given strings. |
168 | - """ |
169 | - oldlength = len(old) |
170 | - newlength = len(new) |
171 | - |
172 | - distances = [ [] for i in range(oldlength + 1) ] |
173 | - for i in range(oldlength + 1): |
174 | - distances[i] = [ -1 for j in range(newlength + 1) ] |
175 | - |
176 | - for i in range(oldlength + 1): |
177 | - distances[i][0] = i |
178 | - for j in range(newlength + 1): |
179 | - distances[0][j] = j |
180 | - distances[0][0] = 0 |
181 | - |
182 | - retval = distcalculate(distances, old, new, oldlength, newlength) |
183 | - |
184 | - for i in range(len(distances)): |
185 | - for j in range(len(distances[i])): |
186 | - distances[i][j] = 0 |
187 | - |
188 | - return retval |
189 | - |
190 | - |
191 | -def similar(old, new): |
192 | - """Calculates whether the given strings are similar. |
193 | - """ |
194 | - if distance(old, new) >= DIFF_OK: |
195 | - return 0 |
196 | - |
197 | - if len(new) >= (len(old) * 2): |
198 | - return 0 |
199 | - |
200 | - # passwords are too similar |
201 | - return 1 |
202 | - |
203 | - |
204 | -def simple(new): |
205 | - """Checks whether the given string is simple or not. |
206 | - """ |
207 | - digits = 0 |
208 | - uppers = 0 |
209 | - lowers = 0 |
210 | - others = 0 |
211 | - |
212 | - for character in new: |
213 | - if character in string.digits: |
214 | - digits = digits + 1 |
215 | - elif character in ASCII_UPPERCASE: |
216 | - uppers = uppers + 1 |
217 | - elif character in ASCII_LOWERCASE: |
218 | - lowers = lowers + 1 |
219 | - else: |
220 | - others = others + 1 |
221 | - |
222 | - # The scam was this - a password of only one character type |
223 | - # must be 8 letters long. Two types, 7, and so on. |
224 | - # This is now changed, the base size and the credits or defaults |
225 | - # see the docs on the module for info on these parameters, the |
226 | - # defaults cause the effect to be the same as before the change |
227 | - |
228 | - if DIG_CREDIT >= 0 and digits > DIG_CREDIT: |
229 | - digits = DIG_CREDIT |
230 | - |
231 | - if UP_CREDIT >= 0 and uppers > UP_CREDIT: |
232 | - uppers = UP_CREDIT |
233 | - |
234 | - if LOW_CREDIT >= 0 and lowers > LOW_CREDIT: |
235 | - lowers = LOW_CREDIT |
236 | - |
237 | - if OTH_CREDIT >= 0 and others > OTH_CREDIT: |
238 | - others = OTH_CREDIT |
239 | - |
240 | - size = MIN_LENGTH |
241 | - |
242 | - if DIG_CREDIT >= 0: |
243 | - size = size - digits |
244 | - elif digits < (DIG_CREDIT * -1): |
245 | - return 1 |
246 | - |
247 | - if UP_CREDIT >= 0: |
248 | - size = size - uppers |
249 | - elif uppers < (UP_CREDIT * -1): |
250 | - return 1 |
251 | - |
252 | - if LOW_CREDIT >= 0: |
253 | - size = size - lowers |
254 | - elif lowers < (LOW_CREDIT * -1): |
255 | - return 1 |
256 | - |
257 | - if OTH_CREDIT >= 0: |
258 | - size = size - others |
259 | - elif others < (OTH_CREDIT * -1): |
260 | - return 1 |
261 | - |
262 | - if len(new) < size: |
263 | - return 1 |
264 | - |
265 | - return 0 |
266 | - |
267 | - |
268 | -def VeryFascistCheck(new, old = None, dictpath = None): |
269 | - """Extends the FascistCheck function with other checks implemented |
270 | - in this module. |
271 | - """ |
272 | - if old != None: |
273 | - if new == old: |
274 | - raise ValueError("is the same as the old one") |
275 | - |
276 | - oldmono = old.lower() |
277 | - newmono = new.lower() |
278 | - wrapped = old + old |
279 | - |
280 | - if newmono == oldmono: |
281 | - raise ValueError("case changes only") |
282 | - if wrapped.find(new) != -1: |
283 | - raise ValueError("is rotated") |
284 | - if similar(oldmono, newmono): |
285 | - raise ValueError("is too similar to the old one") |
286 | - |
287 | - if dictpath == None: |
288 | - FascistCheck(new) |
289 | - else: |
290 | - FascistCheck(new, dictpath) |
291 | - |
292 | - if palindrome(new): |
293 | - raise ValueError("is a palindrome") |
294 | - if simple(new): |
295 | - raise ValueError("is too simple") |
296 | - |
297 | - return new |
298 | - |
299 | - |
300 | -def test(verbosity=1, repeat=1): |
301 | - """Test cracklib methods.""" |
302 | - import test_cracklib |
303 | - import sys |
304 | - result = test_cracklib.run(verbosity=verbosity, repeat=repeat) |
305 | - if result.wasSuccessful(): |
306 | - sys.exit(0) |
307 | - sys.exit(1) |
308 | |
309 | === removed directory '.pc/python3.3.patch' |
310 | === removed directory '.pc/python3.3.patch/python' |
311 | === removed file '.pc/python3.3.patch/python/Makefile.am' |
312 | --- .pc/python3.3.patch/python/Makefile.am 2012-10-23 09:53:29 +0000 |
313 | +++ .pc/python3.3.patch/python/Makefile.am 1970-01-01 00:00:00 +0000 |
314 | @@ -1,9 +0,0 @@ |
315 | -if BUILD_PYTHON |
316 | -python_PYTHON = cracklib.py |
317 | -pyexec_LTLIBRARIES = _cracklibmodule.la |
318 | -AM_CFLAGS = -I$(top_srcdir)/lib -Wall |
319 | -_cracklibmodule_la_LDFLAGS = -module -avoid-version $(top_builddir)/lib/libcrack.la |
320 | -DEFS += '-DDEFAULT_CRACKLIB_DICT="$(DEFAULT_CRACKLIB_DICT)"' |
321 | -DEFS += '-DPYTHON_H="python@PYTHON_VERSION@/Python.h"' |
322 | -endif |
323 | - |
324 | |
325 | === removed file '.pc/python3.3.patch/python/_cracklib.c' |
326 | === removed file '.pc/python3.3.patch/python/_cracklibmodule.c' |
327 | --- .pc/python3.3.patch/python/_cracklibmodule.c 2012-10-23 09:53:29 +0000 |
328 | +++ .pc/python3.3.patch/python/_cracklibmodule.c 1970-01-01 00:00:00 +0000 |
329 | @@ -1,218 +0,0 @@ |
330 | -/* |
331 | - * A Python binding for cracklib. |
332 | - * |
333 | - * Parts of this code are based on work Copyright (c) 2003 by Domenico |
334 | - * Andreoli. |
335 | - * |
336 | - * Copyright (c) 2008, 2009, 2012 Jan Dittberner <jan@dittberner.info> |
337 | - * |
338 | - * This file is part of cracklib. |
339 | - * |
340 | - * This library is free software; you can redistribute it and/or modify it |
341 | - * under the terms of the GNU Lesser General Public License as published by the |
342 | - * Free Software Foundation; either version 2.1 of the License, or (at your |
343 | - * option) any later version. |
344 | - * |
345 | - * This library is distributed in the hope that it will be useful, but WITHOUT |
346 | - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
347 | - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License |
348 | - * for more details. |
349 | - * |
350 | - * You should have received a copy of the GNU Lesser General Public License |
351 | - * along with this library; if not, write to the Free Software Foundation, |
352 | - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
353 | - */ |
354 | - |
355 | -#ifdef PYTHON_H |
356 | -#include PYTHON_H |
357 | -#else |
358 | -#include <Python.h> |
359 | -#endif |
360 | -#if PY_MAJOR_VERSION >= 3 |
361 | -#define IS_PY3K |
362 | -#endif |
363 | -#ifdef HAVE_PTHREAD_H |
364 | -#include <pthread.h> |
365 | -#endif |
366 | -#ifdef HAVE_SYS_STAT_H |
367 | -#include <sys/stat.h> |
368 | -#endif |
369 | -#include <crack.h> |
370 | -#include <locale.h> |
371 | -#ifdef HAVE_LIBINTL_H |
372 | -#include <libintl.h> |
373 | -#endif |
374 | - |
375 | -#ifdef HAVE_PTHREAD_H |
376 | -static pthread_mutex_t cracklib_mutex = PTHREAD_MUTEX_INITIALIZER; |
377 | -#define LOCK() pthread_mutex_lock(&cracklib_mutex) |
378 | -#define UNLOCK() pthread_mutex_unlock(&cracklib_mutex) |
379 | -#else |
380 | -#define LOCK() |
381 | -#define UNLOCK() |
382 | -#endif |
383 | - |
384 | -#define DICT_SUFFIX ".pwd" |
385 | - |
386 | -static char _cracklib_FascistCheck_doc [] = |
387 | - "arguments: passwd, dictpath (optional)\n" |
388 | - "\n" |
389 | - " passwd - password to be checked for weakness\n" |
390 | - " dictpath - full path name to the cracklib dictionary database\n" |
391 | - "\n" |
392 | - "if dictpath is not specified the default dictionary database\n" |
393 | - "will be used.\n" |
394 | - "\n" |
395 | - "return value: the same password passed as first argument.\n" |
396 | - "\n" |
397 | - "if password is weak, exception ValueError is raised with argument\n" |
398 | - "set to the reason of weakness.\n" |
399 | -; |
400 | - |
401 | -static PyObject * |
402 | -_cracklib_FascistCheck(PyObject *self, PyObject *args, PyObject *kwargs) |
403 | -{ |
404 | - char *candidate, *dict; |
405 | - char *defaultdict = NULL; |
406 | - const char *result; |
407 | - struct stat st; |
408 | - char *keywords[] = {"pw", "dictpath", NULL}; |
409 | - char *dictfile; |
410 | - |
411 | - self = NULL; |
412 | - candidate = NULL; |
413 | - dict = NULL; |
414 | - |
415 | - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|s", keywords, |
416 | - &candidate, &dict)) |
417 | - { |
418 | - PyErr_SetString(PyExc_ValueError, "error parsing arguments"); |
419 | - return NULL; |
420 | - } |
421 | - |
422 | - if (candidate == NULL) |
423 | - { |
424 | - PyErr_SetString(PyExc_ValueError, "first argument was not a string!"); |
425 | - return NULL; |
426 | - } |
427 | - if (dict != NULL) |
428 | - { |
429 | - if (dict[0] != '/') |
430 | - { |
431 | - PyErr_SetString(PyExc_ValueError, |
432 | - "second argument was not an absolute path!"); |
433 | - return NULL; |
434 | - } |
435 | - dictfile = malloc(strlen(dict) + sizeof(DICT_SUFFIX)); |
436 | - if (dictfile == NULL) |
437 | - { |
438 | - PyErr_SetFromErrnoWithFilename(PyExc_OSError, dict); |
439 | - return NULL; |
440 | - } |
441 | - sprintf(dictfile, "%s" DICT_SUFFIX, dict); |
442 | - if (lstat(dictfile, &st) == -1) |
443 | - { |
444 | - PyErr_SetFromErrnoWithFilename(PyExc_OSError, dictfile); |
445 | - free(dictfile); |
446 | - return NULL; |
447 | - } |
448 | - free(dictfile); |
449 | - } else |
450 | - { |
451 | - defaultdict = strdup(GetDefaultCracklibDict()); |
452 | - if (errno == ENOMEM) { |
453 | - PyErr_SetFromErrno(PyExc_OSError); |
454 | - return NULL; |
455 | - } |
456 | - dictfile = malloc(strlen(defaultdict) + sizeof(DICT_SUFFIX)); |
457 | - if (dictfile == NULL) |
458 | - { |
459 | - PyErr_SetFromErrnoWithFilename(PyExc_OSError, defaultdict); |
460 | - free(defaultdict); |
461 | - return NULL; |
462 | - } |
463 | - sprintf(dictfile, "%s" DICT_SUFFIX, defaultdict); |
464 | - if (lstat(dictfile, &st) == -1) |
465 | - { |
466 | - PyErr_SetFromErrnoWithFilename(PyExc_OSError, dictfile); |
467 | - free(defaultdict); |
468 | - free(dictfile); |
469 | - return NULL; |
470 | - } |
471 | - free(dictfile); |
472 | - } |
473 | - |
474 | - setlocale(LC_ALL, ""); |
475 | -#ifdef ENABLE_NLS |
476 | - textdomain("cracklib"); |
477 | -#endif |
478 | - |
479 | - LOCK(); |
480 | - result = FascistCheck(candidate, dict ? dict : defaultdict); |
481 | - UNLOCK(); |
482 | - |
483 | - if (defaultdict != NULL) |
484 | - { |
485 | - free(defaultdict); |
486 | - } |
487 | - |
488 | - if (result != NULL) |
489 | - { |
490 | - PyErr_SetString(PyExc_ValueError, result); |
491 | - return NULL; |
492 | - } |
493 | - return Py_BuildValue("s", candidate); |
494 | -} |
495 | - |
496 | -static PyMethodDef |
497 | -_cracklibmethods[] = |
498 | -{ |
499 | - {"FascistCheck", (PyCFunction) _cracklib_FascistCheck, |
500 | - METH_VARARGS | METH_KEYWORDS, _cracklib_FascistCheck_doc}, |
501 | - {NULL, NULL}, |
502 | -}; |
503 | - |
504 | -static char _cracklib_doc[] = |
505 | - "Python bindings for cracklib.\n" |
506 | - "\n" |
507 | - "This module enables the use of cracklib features from within a Python\n" |
508 | - "program or interpreter.\n" |
509 | -; |
510 | - |
511 | -#ifdef IS_PY3K |
512 | - |
513 | -static struct PyModuleDef moduledef = { |
514 | - PyModuleDef_HEAD_INIT, |
515 | - "_cracklib", |
516 | - _cracklib_doc, |
517 | - 0, |
518 | - _cracklibmethods, |
519 | - NULL, |
520 | - NULL, |
521 | - NULL, |
522 | - NULL |
523 | -}; |
524 | - |
525 | -#define INITERROR return NULL |
526 | - |
527 | -PyObject * |
528 | -PyInit__cracklib(void) |
529 | - |
530 | -#else |
531 | -#define INITERROR return |
532 | - |
533 | -void |
534 | -init_cracklib(void) |
535 | -#endif |
536 | -{ |
537 | -#ifdef IS_PY3K |
538 | - PyObject *module = PyModule_Create(&moduledef); |
539 | -#else |
540 | - PyObject *module = Py_InitModule3("_cracklib", _cracklibmethods, _cracklib_doc); |
541 | -#endif |
542 | - if (module == NULL) |
543 | - INITERROR; |
544 | -#ifdef IS_PY3K |
545 | - return module; |
546 | -#endif |
547 | -} |
548 | |
549 | === removed file '.pc/python3.3.patch/python/setup.py.in' |
550 | --- .pc/python3.3.patch/python/setup.py.in 2012-10-23 09:53:29 +0000 |
551 | +++ .pc/python3.3.patch/python/setup.py.in 1970-01-01 00:00:00 +0000 |
552 | @@ -1,58 +0,0 @@ |
553 | -#!/usr/bin/python |
554 | -# Copyright 2009 Jan Dittberner <jan@dittberner.info> |
555 | -# |
556 | -# This file is part of cracklib. |
557 | -# |
558 | -# cracklib is free software; you can redistribute it and/or modify it |
559 | -# under the terms of the GNU General Public License as published by |
560 | -# the Free Software Foundation; either version 2 of the License, or |
561 | -# (at your option) any later version. |
562 | -# |
563 | -# cracklib is distributed in the hope that it will be useful, but |
564 | -# WITHOUT ANY WARRANTY; without even the implied warranty of |
565 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
566 | -# General Public License for more details. |
567 | -# |
568 | -# You should have received a copy of the GNU General Public License |
569 | -# along with Prua; if not, write to the Free Software Foundation, |
570 | -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
571 | - |
572 | -import os, sys |
573 | - |
574 | -from setuptools import setup, Extension, find_packages |
575 | - |
576 | -extensions = [ |
577 | - Extension("_cracklibmodule", |
578 | - ["_cracklibmodule.c"], |
579 | - include_dirs = ["@top_builddir@/lib"], |
580 | - libraries = ["crack"], |
581 | - library_dirs = ["@top_builddir@/lib/.libs"]), |
582 | -] |
583 | - |
584 | -setup( |
585 | - name="cracklib", |
586 | - version="@VERSION@", |
587 | - description="A CPython extension module wrapping the libcrack library", |
588 | - long_description="""\ |
589 | -This CPython extension provides Python bindings for cracklib. It |
590 | -contains a pythonic interface to cracklib's functions and some Python |
591 | -convenience functions. |
592 | -""", |
593 | - author="Jan Dittberner", |
594 | - author_email="jan@dittberner.info", |
595 | - url="http://cracklib.sourceforge.net/", |
596 | - license="GPLv2+", |
597 | - py_modules=['cracklib', 'test_cracklib', 'crack'], |
598 | - ext_modules=extensions, |
599 | - zip_safe=False, |
600 | - classifiers=[ |
601 | - "Development Status :: 4 - Beta", |
602 | - "Intended Audience :: Developers", |
603 | - "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", |
604 | - "Operating System :: OS Independent", |
605 | - "Programming Language :: Python", |
606 | - "Topic :: Security", |
607 | - "Topic :: Software Development :: Libraries :: Python Modules", |
608 | - "Topic :: System :: Systems Administration", |
609 | - ], |
610 | -) |
611 | |
612 | === modified file 'INSTALL' |
613 | --- INSTALL 2012-05-20 01:24:02 +0000 |
614 | +++ INSTALL 2012-12-09 20:39:17 +0000 |
615 | @@ -1,8 +1,8 @@ |
616 | Installation Instructions |
617 | ************************* |
618 | |
619 | -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, |
620 | -2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
621 | +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, |
622 | +Inc. |
623 | |
624 | Copying and distribution of this file, with or without modification, |
625 | are permitted in any medium without royalty provided the copyright |
626 | @@ -226,6 +226,11 @@ |
627 | |
628 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
629 | |
630 | + HP-UX `make' updates targets which have the same time stamps as |
631 | +their prerequisites, which makes it generally unusable when shipped |
632 | +generated files such as `configure' are involved. Use GNU `make' |
633 | +instead. |
634 | + |
635 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
636 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
637 | a workaround. If GNU CC is not installed, it is therefore recommended |
638 | |
639 | === modified file 'Makefile.in' |
640 | --- Makefile.in 2012-05-20 01:24:02 +0000 |
641 | +++ Makefile.in 2012-12-09 20:39:17 +0000 |
642 | @@ -1,9 +1,9 @@ |
643 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
644 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
645 | # @configure_input@ |
646 | |
647 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
648 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
649 | -# Inc. |
650 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
651 | +# Foundation, Inc. |
652 | # This Makefile.in is free software; the Free Software Foundation |
653 | # gives unlimited permission to copy and/or distribute it, |
654 | # with or without modifications, as long as this notice is preserved. |
655 | @@ -15,6 +15,23 @@ |
656 | |
657 | @SET_MAKE@ |
658 | VPATH = @srcdir@ |
659 | +am__make_dryrun = \ |
660 | + { \ |
661 | + am__dry=no; \ |
662 | + case $$MAKEFLAGS in \ |
663 | + *\\[\ \ ]*) \ |
664 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
665 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
666 | + *) \ |
667 | + for am__flg in $$MAKEFLAGS; do \ |
668 | + case $$am__flg in \ |
669 | + *=*|--*) ;; \ |
670 | + *n*) am__dry=yes; break;; \ |
671 | + esac; \ |
672 | + done;; \ |
673 | + esac; \ |
674 | + test $$am__dry = yes; \ |
675 | + } |
676 | pkgdatadir = $(datadir)/@PACKAGE@ |
677 | pkgincludedir = $(includedir)/@PACKAGE@ |
678 | pkglibdir = $(libdir)/@PACKAGE@ |
679 | @@ -66,6 +83,11 @@ |
680 | install-pdf-recursive install-ps-recursive install-recursive \ |
681 | installcheck-recursive installdirs-recursive pdf-recursive \ |
682 | ps-recursive uninstall-recursive |
683 | +am__can_run_installinfo = \ |
684 | + case $$AM_UPDATE_INFO_DIR in \ |
685 | + n|no|NO) false;; \ |
686 | + *) (install-info --version) >/dev/null 2>&1;; \ |
687 | + esac |
688 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
689 | distclean-recursive maintainer-clean-recursive |
690 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
691 | @@ -78,9 +100,11 @@ |
692 | distdir = $(PACKAGE)-$(VERSION) |
693 | top_distdir = $(distdir) |
694 | am__remove_distdir = \ |
695 | - { test ! -d "$(distdir)" \ |
696 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
697 | - && rm -fr "$(distdir)"; }; } |
698 | + if test -d "$(distdir)"; then \ |
699 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
700 | + && rm -rf "$(distdir)" \ |
701 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
702 | + else :; fi |
703 | am__relativize = \ |
704 | dir0=`pwd`; \ |
705 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
706 | @@ -109,6 +133,8 @@ |
707 | DIST_ARCHIVES = $(distdir).tar.gz |
708 | GZIP_ENV = --best |
709 | distuninstallcheck_listfiles = find . -type f -print |
710 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
711 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
712 | distcleancheck_listfiles = find . -type f -print |
713 | ACLOCAL = @ACLOCAL@ |
714 | AMTAR = @AMTAR@ |
715 | @@ -127,6 +153,7 @@ |
716 | DEFAULT_CRACKLIB_DICT = @DEFAULT_CRACKLIB_DICT@ |
717 | DEFS = @DEFS@ |
718 | DEPDIR = @DEPDIR@ |
719 | +DLLTOOL = @DLLTOOL@ |
720 | DSYMUTIL = @DSYMUTIL@ |
721 | DUMPBIN = @DUMPBIN@ |
722 | ECHO_C = @ECHO_C@ |
723 | @@ -159,6 +186,7 @@ |
724 | LTLIBINTL = @LTLIBINTL@ |
725 | LTLIBOBJS = @LTLIBOBJS@ |
726 | MAKEINFO = @MAKEINFO@ |
727 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
728 | MKDIR_P = @MKDIR_P@ |
729 | MSGFMT = @MSGFMT@ |
730 | MSGFMT_015 = @MSGFMT_015@ |
731 | @@ -202,6 +230,7 @@ |
732 | abs_srcdir = @abs_srcdir@ |
733 | abs_top_builddir = @abs_top_builddir@ |
734 | abs_top_srcdir = @abs_top_srcdir@ |
735 | +ac_ct_AR = @ac_ct_AR@ |
736 | ac_ct_CC = @ac_ct_CC@ |
737 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
738 | am__include = @am__include@ |
739 | @@ -266,7 +295,7 @@ |
740 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
741 | |
742 | .SUFFIXES: |
743 | -am--refresh: |
744 | +am--refresh: Makefile |
745 | @: |
746 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
747 | @for dep in $?; do \ |
748 | @@ -302,10 +331,8 @@ |
749 | $(am__aclocal_m4_deps): |
750 | |
751 | config.h: stamp-h1 |
752 | - @if test ! -f $@; then \ |
753 | - rm -f stamp-h1; \ |
754 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
755 | - else :; fi |
756 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
757 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
758 | |
759 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
760 | @rm -f stamp-h1 |
761 | @@ -498,13 +525,10 @@ |
762 | done |
763 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
764 | if test "$$subdir" = .; then :; else \ |
765 | - test -d "$(distdir)/$$subdir" \ |
766 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
767 | - || exit 1; \ |
768 | - fi; \ |
769 | - done |
770 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
771 | - if test "$$subdir" = .; then :; else \ |
772 | + $(am__make_dryrun) \ |
773 | + || test -d "$(distdir)/$$subdir" \ |
774 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
775 | + || exit 1; \ |
776 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
777 | $(am__relativize); \ |
778 | new_distdir=$$reldir; \ |
779 | @@ -536,7 +560,11 @@ |
780 | $(am__remove_distdir) |
781 | |
782 | dist-bzip2: distdir |
783 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
784 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
785 | + $(am__remove_distdir) |
786 | + |
787 | +dist-lzip: distdir |
788 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
789 | $(am__remove_distdir) |
790 | |
791 | dist-lzma: distdir |
792 | @@ -544,7 +572,7 @@ |
793 | $(am__remove_distdir) |
794 | |
795 | dist-xz: distdir |
796 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
797 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
798 | $(am__remove_distdir) |
799 | |
800 | dist-tarZ: distdir |
801 | @@ -575,6 +603,8 @@ |
802 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
803 | *.tar.lzma*) \ |
804 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
805 | + *.tar.lz*) \ |
806 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
807 | *.tar.xz*) \ |
808 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
809 | *.tar.Z*) \ |
810 | @@ -584,7 +614,7 @@ |
811 | *.zip*) \ |
812 | unzip $(distdir).zip ;;\ |
813 | esac |
814 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
815 | + chmod -R a-w $(distdir); chmod u+w $(distdir) |
816 | mkdir $(distdir)/_build |
817 | mkdir $(distdir)/_inst |
818 | chmod a-w $(distdir) |
819 | @@ -594,6 +624,7 @@ |
820 | && am__cwd=`pwd` \ |
821 | && $(am__cd) $(distdir)/_build \ |
822 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
823 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
824 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
825 | && $(MAKE) $(AM_MAKEFLAGS) \ |
826 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
827 | @@ -622,8 +653,16 @@ |
828 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
829 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
830 | distuninstallcheck: |
831 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
832 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
833 | + @test -n '$(distuninstallcheck_dir)' || { \ |
834 | + echo 'ERROR: trying to run $@ with an empty' \ |
835 | + '$$(distuninstallcheck_dir)' >&2; \ |
836 | + exit 1; \ |
837 | + }; \ |
838 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
839 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
840 | + exit 1; \ |
841 | + }; \ |
842 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
843 | || { echo "ERROR: files left after uninstall:" ; \ |
844 | if test -n "$(DESTDIR)"; then \ |
845 | echo " (check DESTDIR support)"; \ |
846 | @@ -654,10 +693,15 @@ |
847 | |
848 | installcheck: installcheck-recursive |
849 | install-strip: |
850 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
851 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
852 | - `test -z '$(STRIP)' || \ |
853 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
854 | + if test -z '$(STRIP)'; then \ |
855 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
856 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
857 | + install; \ |
858 | + else \ |
859 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
860 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
861 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
862 | + fi |
863 | mostlyclean-generic: |
864 | |
865 | clean-generic: |
866 | @@ -745,19 +789,19 @@ |
867 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
868 | all all-am all-local am--refresh check check-am clean \ |
869 | clean-generic clean-libtool ctags ctags-recursive dist \ |
870 | - dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ |
871 | - dist-xz dist-zip distcheck distclean distclean-generic \ |
872 | - distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
873 | - distdir distuninstallcheck dvi dvi-am html html-am info \ |
874 | - info-am install install-am install-data install-data-am \ |
875 | - install-dvi install-dvi-am install-exec install-exec-am \ |
876 | - install-html install-html-am install-info install-info-am \ |
877 | - install-man install-pdf install-pdf-am install-ps \ |
878 | - install-ps-am install-strip installcheck installcheck-am \ |
879 | - installdirs installdirs-am maintainer-clean \ |
880 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
881 | - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
882 | - uninstall uninstall-am |
883 | + dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \ |
884 | + dist-tarZ dist-xz dist-zip distcheck distclean \ |
885 | + distclean-generic distclean-hdr distclean-libtool \ |
886 | + distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
887 | + dvi-am html html-am info info-am install install-am \ |
888 | + install-data install-data-am install-dvi install-dvi-am \ |
889 | + install-exec install-exec-am install-html install-html-am \ |
890 | + install-info install-info-am install-man install-pdf \ |
891 | + install-pdf-am install-ps install-ps-am install-strip \ |
892 | + installcheck installcheck-am installdirs installdirs-am \ |
893 | + maintainer-clean maintainer-clean-generic mostlyclean \ |
894 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
895 | + tags tags-recursive uninstall uninstall-am |
896 | |
897 | |
898 | all-local: |
899 | |
900 | === modified file 'NEWS' |
901 | --- NEWS 2012-05-20 01:24:02 +0000 |
902 | +++ NEWS 2012-12-09 20:39:17 +0000 |
903 | @@ -1,3 +1,6 @@ |
904 | +v2.8.20 include python/test_cracklib.py in release tarball (Jan Dittberner) |
905 | + rename python/_cracklibmodule.c to python/_cracklib.c to support Python 3.3 (Jan Dittberner) |
906 | + patch from Ivosh (iraisr) for uninitialized buffer issue with small dictionaries. |
907 | v2.8.19 drop autogenerated files from SVN (Mike Frysinger) |
908 | add words from "The Top 500 Worst Passwords of All Time" <http://www.whatsmypass.com/the-top-500-worst-passwords-of-all-time> to dicts/cracklib-small (patch by Fabian Greffrath) |
909 | include sys/stat.h in python/_cracklibmodule.c (Mike Frysinger) |
910 | |
911 | === modified file 'aclocal.m4' |
912 | --- aclocal.m4 2012-05-20 01:24:02 +0000 |
913 | +++ aclocal.m4 2012-12-09 20:39:17 +0000 |
914 | @@ -1,7 +1,8 @@ |
915 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
916 | +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
917 | |
918 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
919 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
920 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
921 | +# Inc. |
922 | # This file is free software; the Free Software Foundation |
923 | # gives unlimited permission to copy and/or distribute it, |
924 | # with or without modifications, as long as this notice is preserved. |
925 | @@ -13,18 +14,21 @@ |
926 | |
927 | m4_ifndef([AC_AUTOCONF_VERSION], |
928 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
929 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, |
930 | -[m4_warning([this file was generated for autoconf 2.66. |
931 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
932 | +[m4_warning([this file was generated for autoconf 2.68. |
933 | You have another version of autoconf. It may work, but is not guaranteed to. |
934 | If you have problems, you may need to regenerate the build system entirely. |
935 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
936 | |
937 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
938 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
939 | +# Foundation, Inc. |
940 | # |
941 | # This file is free software; the Free Software Foundation |
942 | # gives unlimited permission to copy and/or distribute it, |
943 | # with or without modifications, as long as this notice is preserved. |
944 | |
945 | +# serial 1 |
946 | + |
947 | # AM_AUTOMAKE_VERSION(VERSION) |
948 | # ---------------------------- |
949 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
950 | @@ -34,7 +38,7 @@ |
951 | [am__api_version='1.11' |
952 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
953 | dnl require some minimum version. Point them to the right macro. |
954 | -m4_if([$1], [1.11.1], [], |
955 | +m4_if([$1], [1.11.6], [], |
956 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
957 | ]) |
958 | |
959 | @@ -50,19 +54,21 @@ |
960 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
961 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
962 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
963 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
964 | +[AM_AUTOMAKE_VERSION([1.11.6])dnl |
965 | m4_ifndef([AC_AUTOCONF_VERSION], |
966 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
967 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
968 | |
969 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
970 | |
971 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
972 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
973 | # |
974 | # This file is free software; the Free Software Foundation |
975 | # gives unlimited permission to copy and/or distribute it, |
976 | # with or without modifications, as long as this notice is preserved. |
977 | |
978 | +# serial 1 |
979 | + |
980 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
981 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
982 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
983 | @@ -144,14 +150,14 @@ |
984 | Usually this means the macro was only invoked conditionally.]]) |
985 | fi])]) |
986 | |
987 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
988 | -# Free Software Foundation, Inc. |
989 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
990 | +# 2010, 2011 Free Software Foundation, Inc. |
991 | # |
992 | # This file is free software; the Free Software Foundation |
993 | # gives unlimited permission to copy and/or distribute it, |
994 | # with or without modifications, as long as this notice is preserved. |
995 | |
996 | -# serial 10 |
997 | +# serial 12 |
998 | |
999 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
1000 | # written in clear, in which case automake, when reading aclocal.m4, |
1001 | @@ -191,6 +197,7 @@ |
1002 | # instance it was reported that on HP-UX the gcc test will end up |
1003 | # making a dummy file named `D' -- because `-MD' means `put the output |
1004 | # in D'. |
1005 | + rm -rf conftest.dir |
1006 | mkdir conftest.dir |
1007 | # Copy depcomp to subdir because otherwise we won't find it if we're |
1008 | # using a relative directory. |
1009 | @@ -255,7 +262,7 @@ |
1010 | break |
1011 | fi |
1012 | ;; |
1013 | - msvisualcpp | msvcmsys) |
1014 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
1015 | # This compiler won't grok `-c -o', but also, the minuso test has |
1016 | # not run yet. These depmodes are late enough in the game, and |
1017 | # so weak that their functioning should not be impacted. |
1018 | @@ -320,10 +327,13 @@ |
1019 | if test "x$enable_dependency_tracking" != xno; then |
1020 | am_depcomp="$ac_aux_dir/depcomp" |
1021 | AMDEPBACKSLASH='\' |
1022 | + am__nodep='_no' |
1023 | fi |
1024 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
1025 | AC_SUBST([AMDEPBACKSLASH])dnl |
1026 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
1027 | +AC_SUBST([am__nodep])dnl |
1028 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
1029 | ]) |
1030 | |
1031 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
1032 | @@ -557,12 +567,15 @@ |
1033 | done |
1034 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
1035 | |
1036 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
1037 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
1038 | +# Inc. |
1039 | # |
1040 | # This file is free software; the Free Software Foundation |
1041 | # gives unlimited permission to copy and/or distribute it, |
1042 | # with or without modifications, as long as this notice is preserved. |
1043 | |
1044 | +# serial 1 |
1045 | + |
1046 | # AM_PROG_INSTALL_SH |
1047 | # ------------------ |
1048 | # Define $install_sh. |
1049 | @@ -694,12 +707,15 @@ |
1050 | fi |
1051 | ]) |
1052 | |
1053 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
1054 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
1055 | +# Inc. |
1056 | # |
1057 | # This file is free software; the Free Software Foundation |
1058 | # gives unlimited permission to copy and/or distribute it, |
1059 | # with or without modifications, as long as this notice is preserved. |
1060 | |
1061 | +# serial 1 |
1062 | + |
1063 | # AM_PROG_MKDIR_P |
1064 | # --------------- |
1065 | # Check for `mkdir -p'. |
1066 | @@ -722,13 +738,14 @@ |
1067 | |
1068 | # Helper functions for option handling. -*- Autoconf -*- |
1069 | |
1070 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
1071 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
1072 | +# Foundation, Inc. |
1073 | # |
1074 | # This file is free software; the Free Software Foundation |
1075 | # gives unlimited permission to copy and/or distribute it, |
1076 | # with or without modifications, as long as this notice is preserved. |
1077 | |
1078 | -# serial 4 |
1079 | +# serial 5 |
1080 | |
1081 | # _AM_MANGLE_OPTION(NAME) |
1082 | # ----------------------- |
1083 | @@ -736,13 +753,13 @@ |
1084 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
1085 | |
1086 | # _AM_SET_OPTION(NAME) |
1087 | -# ------------------------------ |
1088 | +# -------------------- |
1089 | # Set option NAME. Presently that only means defining a flag for this option. |
1090 | AC_DEFUN([_AM_SET_OPTION], |
1091 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
1092 | |
1093 | # _AM_SET_OPTIONS(OPTIONS) |
1094 | -# ---------------------------------- |
1095 | +# ------------------------ |
1096 | # OPTIONS is a space-separated list of Automake options. |
1097 | AC_DEFUN([_AM_SET_OPTIONS], |
1098 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
1099 | @@ -753,13 +770,15 @@ |
1100 | AC_DEFUN([_AM_IF_OPTION], |
1101 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
1102 | |
1103 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 |
1104 | -# Free Software Foundation, Inc. |
1105 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, |
1106 | +# 2011 Free Software Foundation, Inc. |
1107 | # |
1108 | # This file is free software; the Free Software Foundation |
1109 | # gives unlimited permission to copy and/or distribute it, |
1110 | # with or without modifications, as long as this notice is preserved. |
1111 | |
1112 | +# serial 2 |
1113 | + |
1114 | # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
1115 | # --------------------------------------------------------------------------- |
1116 | # Adds support for distributing Python modules and packages. To |
1117 | @@ -787,8 +806,10 @@ |
1118 | dnl Find a Python interpreter. Python versions prior to 2.0 are not |
1119 | dnl supported. (2.0 was released on October 16, 2000). |
1120 | m4_define_default([_AM_PYTHON_INTERPRETER_LIST], |
1121 | - [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl |
1122 | -python2.1 python2.0]) |
1123 | +[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl |
1124 | + python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) |
1125 | + |
1126 | + AC_ARG_VAR([PYTHON], [the Python interpreter]) |
1127 | |
1128 | m4_if([$1],[],[ |
1129 | dnl No version check is needed. |
1130 | @@ -860,9 +881,7 @@ |
1131 | dnl site-packages directory, not the python standard library |
1132 | dnl directory like in previous automake betas. This behavior |
1133 | dnl is more consistent with lispdir.m4 for example. |
1134 | - dnl Query distutils for this directory. distutils does not exist in |
1135 | - dnl Python 1.5, so we fall back to the hardcoded directory if it |
1136 | - dnl doesn't work. |
1137 | + dnl Query distutils for this directory. |
1138 | AC_CACHE_CHECK([for $am_display_PYTHON script directory], |
1139 | [am_cv_python_pythondir], |
1140 | [if test "x$prefix" = xNONE |
1141 | @@ -871,8 +890,7 @@ |
1142 | else |
1143 | am_py_prefix=$prefix |
1144 | fi |
1145 | - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || |
1146 | - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` |
1147 | + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` |
1148 | case $am_cv_python_pythondir in |
1149 | $am_py_prefix*) |
1150 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` |
1151 | @@ -898,9 +916,7 @@ |
1152 | |
1153 | dnl pyexecdir -- directory for installing python extension modules |
1154 | dnl (shared libraries) |
1155 | - dnl Query distutils for this directory. distutils does not exist in |
1156 | - dnl Python 1.5, so we fall back to the hardcoded directory if it |
1157 | - dnl doesn't work. |
1158 | + dnl Query distutils for this directory. |
1159 | AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], |
1160 | [am_cv_python_pyexecdir], |
1161 | [if test "x$exec_prefix" = xNONE |
1162 | @@ -909,8 +925,7 @@ |
1163 | else |
1164 | am_py_exec_prefix=$exec_prefix |
1165 | fi |
1166 | - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || |
1167 | - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` |
1168 | + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` |
1169 | case $am_cv_python_pyexecdir in |
1170 | $am_py_exec_prefix*) |
1171 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` |
1172 | @@ -1023,12 +1038,14 @@ |
1173 | fi |
1174 | AC_MSG_RESULT(yes)]) |
1175 | |
1176 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
1177 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1178 | # |
1179 | # This file is free software; the Free Software Foundation |
1180 | # gives unlimited permission to copy and/or distribute it, |
1181 | # with or without modifications, as long as this notice is preserved. |
1182 | |
1183 | +# serial 1 |
1184 | + |
1185 | # AM_PROG_INSTALL_STRIP |
1186 | # --------------------- |
1187 | # One issue with vendor `install' (even GNU) is that you can't |
1188 | @@ -1051,13 +1068,13 @@ |
1189 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1190 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1191 | |
1192 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
1193 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
1194 | # |
1195 | # This file is free software; the Free Software Foundation |
1196 | # gives unlimited permission to copy and/or distribute it, |
1197 | # with or without modifications, as long as this notice is preserved. |
1198 | |
1199 | -# serial 2 |
1200 | +# serial 3 |
1201 | |
1202 | # _AM_SUBST_NOTMAKE(VARIABLE) |
1203 | # --------------------------- |
1204 | @@ -1066,13 +1083,13 @@ |
1205 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
1206 | |
1207 | # AM_SUBST_NOTMAKE(VARIABLE) |
1208 | -# --------------------------- |
1209 | +# -------------------------- |
1210 | # Public sister of _AM_SUBST_NOTMAKE. |
1211 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
1212 | |
1213 | # Check how to create a tarball. -*- Autoconf -*- |
1214 | |
1215 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
1216 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
1217 | # |
1218 | # This file is free software; the Free Software Foundation |
1219 | # gives unlimited permission to copy and/or distribute it, |
1220 | @@ -1094,10 +1111,11 @@ |
1221 | # a tarball read from stdin. |
1222 | # $(am__untar) < result.tar |
1223 | AC_DEFUN([_AM_PROG_TAR], |
1224 | -[# Always define AMTAR for backward compatibility. |
1225 | -AM_MISSING_PROG([AMTAR], [tar]) |
1226 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
1227 | +# in the wild :-( We should find a proper way to deprecate it ... |
1228 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1229 | m4_if([$1], [v7], |
1230 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
1231 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1232 | [m4_case([$1], [ustar],, [pax],, |
1233 | [m4_fatal([Unknown tar format])]) |
1234 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
1235 | |
1236 | === modified file 'config.guess' |
1237 | --- config.guess 2012-05-20 01:24:02 +0000 |
1238 | +++ config.guess 2012-12-09 20:39:17 +0000 |
1239 | @@ -1,10 +1,10 @@ |
1240 | #! /bin/sh |
1241 | # Attempt to guess a canonical system name. |
1242 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1243 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
1244 | -# Free Software Foundation, Inc. |
1245 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1246 | +# 2011, 2012 Free Software Foundation, Inc. |
1247 | |
1248 | -timestamp='2009-11-20' |
1249 | +timestamp='2012-02-10' |
1250 | |
1251 | # This file is free software; you can redistribute it and/or modify it |
1252 | # under the terms of the GNU General Public License as published by |
1253 | @@ -17,9 +17,7 @@ |
1254 | # General Public License for more details. |
1255 | # |
1256 | # You should have received a copy of the GNU General Public License |
1257 | -# along with this program; if not, write to the Free Software |
1258 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
1259 | -# 02110-1301, USA. |
1260 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
1261 | # |
1262 | # As a special exception to the GNU General Public License, if you |
1263 | # distribute this file as part of a program that contains a |
1264 | @@ -56,8 +54,9 @@ |
1265 | GNU config.guess ($timestamp) |
1266 | |
1267 | Originally written by Per Bothner. |
1268 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
1269 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
1270 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1271 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1272 | +Free Software Foundation, Inc. |
1273 | |
1274 | This is free software; see the source for copying conditions. There is NO |
1275 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1276 | @@ -144,7 +143,7 @@ |
1277 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
1278 | *:NetBSD:*:*) |
1279 | # NetBSD (nbsd) targets should (where applicable) match one or |
1280 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
1281 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
1282 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
1283 | # switched to ELF, *-*-netbsd* would select the old |
1284 | # object file format. This provides both forward |
1285 | @@ -180,7 +179,7 @@ |
1286 | fi |
1287 | ;; |
1288 | *) |
1289 | - os=netbsd |
1290 | + os=netbsd |
1291 | ;; |
1292 | esac |
1293 | # The OS release |
1294 | @@ -223,7 +222,7 @@ |
1295 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
1296 | ;; |
1297 | *5.*) |
1298 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
1299 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
1300 | ;; |
1301 | esac |
1302 | # According to Compaq, /usr/sbin/psrinfo has been available on |
1303 | @@ -269,7 +268,10 @@ |
1304 | # A Xn.n version is an unreleased experimental baselevel. |
1305 | # 1.2 uses "1.2" for uname -r. |
1306 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
1307 | - exit ;; |
1308 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
1309 | + exitcode=$? |
1310 | + trap '' 0 |
1311 | + exit $exitcode ;; |
1312 | Alpha\ *:Windows_NT*:*) |
1313 | # How do we know it's Interix rather than the generic POSIX subsystem? |
1314 | # Should we change UNAME_MACHINE based on the output of uname instead |
1315 | @@ -295,7 +297,7 @@ |
1316 | echo s390-ibm-zvmoe |
1317 | exit ;; |
1318 | *:OS400:*:*) |
1319 | - echo powerpc-ibm-os400 |
1320 | + echo powerpc-ibm-os400 |
1321 | exit ;; |
1322 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
1323 | echo arm-acorn-riscix${UNAME_RELEASE} |
1324 | @@ -394,23 +396,23 @@ |
1325 | # MiNT. But MiNT is downward compatible to TOS, so this should |
1326 | # be no problem. |
1327 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
1328 | - echo m68k-atari-mint${UNAME_RELEASE} |
1329 | + echo m68k-atari-mint${UNAME_RELEASE} |
1330 | exit ;; |
1331 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
1332 | echo m68k-atari-mint${UNAME_RELEASE} |
1333 | - exit ;; |
1334 | + exit ;; |
1335 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
1336 | - echo m68k-atari-mint${UNAME_RELEASE} |
1337 | + echo m68k-atari-mint${UNAME_RELEASE} |
1338 | exit ;; |
1339 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
1340 | - echo m68k-milan-mint${UNAME_RELEASE} |
1341 | - exit ;; |
1342 | + echo m68k-milan-mint${UNAME_RELEASE} |
1343 | + exit ;; |
1344 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
1345 | - echo m68k-hades-mint${UNAME_RELEASE} |
1346 | - exit ;; |
1347 | + echo m68k-hades-mint${UNAME_RELEASE} |
1348 | + exit ;; |
1349 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
1350 | - echo m68k-unknown-mint${UNAME_RELEASE} |
1351 | - exit ;; |
1352 | + echo m68k-unknown-mint${UNAME_RELEASE} |
1353 | + exit ;; |
1354 | m68k:machten:*:*) |
1355 | echo m68k-apple-machten${UNAME_RELEASE} |
1356 | exit ;; |
1357 | @@ -480,8 +482,8 @@ |
1358 | echo m88k-motorola-sysv3 |
1359 | exit ;; |
1360 | AViiON:dgux:*:*) |
1361 | - # DG/UX returns AViiON for all architectures |
1362 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
1363 | + # DG/UX returns AViiON for all architectures |
1364 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
1365 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
1366 | then |
1367 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
1368 | @@ -494,7 +496,7 @@ |
1369 | else |
1370 | echo i586-dg-dgux${UNAME_RELEASE} |
1371 | fi |
1372 | - exit ;; |
1373 | + exit ;; |
1374 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
1375 | echo m88k-dolphin-sysv3 |
1376 | exit ;; |
1377 | @@ -551,7 +553,7 @@ |
1378 | echo rs6000-ibm-aix3.2 |
1379 | fi |
1380 | exit ;; |
1381 | - *:AIX:*:[456]) |
1382 | + *:AIX:*:[4567]) |
1383 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
1384 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
1385 | IBM_ARCH=rs6000 |
1386 | @@ -594,52 +596,52 @@ |
1387 | 9000/[678][0-9][0-9]) |
1388 | if [ -x /usr/bin/getconf ]; then |
1389 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
1390 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
1391 | - case "${sc_cpu_version}" in |
1392 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
1393 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
1394 | - 532) # CPU_PA_RISC2_0 |
1395 | - case "${sc_kernel_bits}" in |
1396 | - 32) HP_ARCH="hppa2.0n" ;; |
1397 | - 64) HP_ARCH="hppa2.0w" ;; |
1398 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
1399 | + case "${sc_cpu_version}" in |
1400 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
1401 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
1402 | + 532) # CPU_PA_RISC2_0 |
1403 | + case "${sc_kernel_bits}" in |
1404 | + 32) HP_ARCH="hppa2.0n" ;; |
1405 | + 64) HP_ARCH="hppa2.0w" ;; |
1406 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
1407 | - esac ;; |
1408 | - esac |
1409 | + esac ;; |
1410 | + esac |
1411 | fi |
1412 | if [ "${HP_ARCH}" = "" ]; then |
1413 | eval $set_cc_for_build |
1414 | - sed 's/^ //' << EOF >$dummy.c |
1415 | - |
1416 | - #define _HPUX_SOURCE |
1417 | - #include <stdlib.h> |
1418 | - #include <unistd.h> |
1419 | - |
1420 | - int main () |
1421 | - { |
1422 | - #if defined(_SC_KERNEL_BITS) |
1423 | - long bits = sysconf(_SC_KERNEL_BITS); |
1424 | - #endif |
1425 | - long cpu = sysconf (_SC_CPU_VERSION); |
1426 | - |
1427 | - switch (cpu) |
1428 | - { |
1429 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
1430 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
1431 | - case CPU_PA_RISC2_0: |
1432 | - #if defined(_SC_KERNEL_BITS) |
1433 | - switch (bits) |
1434 | - { |
1435 | - case 64: puts ("hppa2.0w"); break; |
1436 | - case 32: puts ("hppa2.0n"); break; |
1437 | - default: puts ("hppa2.0"); break; |
1438 | - } break; |
1439 | - #else /* !defined(_SC_KERNEL_BITS) */ |
1440 | - puts ("hppa2.0"); break; |
1441 | - #endif |
1442 | - default: puts ("hppa1.0"); break; |
1443 | - } |
1444 | - exit (0); |
1445 | - } |
1446 | + sed 's/^ //' << EOF >$dummy.c |
1447 | + |
1448 | + #define _HPUX_SOURCE |
1449 | + #include <stdlib.h> |
1450 | + #include <unistd.h> |
1451 | + |
1452 | + int main () |
1453 | + { |
1454 | + #if defined(_SC_KERNEL_BITS) |
1455 | + long bits = sysconf(_SC_KERNEL_BITS); |
1456 | + #endif |
1457 | + long cpu = sysconf (_SC_CPU_VERSION); |
1458 | + |
1459 | + switch (cpu) |
1460 | + { |
1461 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
1462 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
1463 | + case CPU_PA_RISC2_0: |
1464 | + #if defined(_SC_KERNEL_BITS) |
1465 | + switch (bits) |
1466 | + { |
1467 | + case 64: puts ("hppa2.0w"); break; |
1468 | + case 32: puts ("hppa2.0n"); break; |
1469 | + default: puts ("hppa2.0"); break; |
1470 | + } break; |
1471 | + #else /* !defined(_SC_KERNEL_BITS) */ |
1472 | + puts ("hppa2.0"); break; |
1473 | + #endif |
1474 | + default: puts ("hppa1.0"); break; |
1475 | + } |
1476 | + exit (0); |
1477 | + } |
1478 | EOF |
1479 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
1480 | test -z "$HP_ARCH" && HP_ARCH=hppa |
1481 | @@ -730,22 +732,22 @@ |
1482 | exit ;; |
1483 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
1484 | echo c1-convex-bsd |
1485 | - exit ;; |
1486 | + exit ;; |
1487 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
1488 | if getsysinfo -f scalar_acc |
1489 | then echo c32-convex-bsd |
1490 | else echo c2-convex-bsd |
1491 | fi |
1492 | - exit ;; |
1493 | + exit ;; |
1494 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
1495 | echo c34-convex-bsd |
1496 | - exit ;; |
1497 | + exit ;; |
1498 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
1499 | echo c38-convex-bsd |
1500 | - exit ;; |
1501 | + exit ;; |
1502 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
1503 | echo c4-convex-bsd |
1504 | - exit ;; |
1505 | + exit ;; |
1506 | CRAY*Y-MP:*:*:*) |
1507 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
1508 | exit ;; |
1509 | @@ -769,14 +771,14 @@ |
1510 | exit ;; |
1511 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
1512 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
1513 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
1514 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
1515 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1516 | - exit ;; |
1517 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
1518 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
1519 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1520 | + exit ;; |
1521 | 5000:UNIX_System_V:4.*:*) |
1522 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
1523 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
1524 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1525 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
1526 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
1527 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
1528 | exit ;; |
1529 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
1530 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
1531 | @@ -788,13 +790,12 @@ |
1532 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
1533 | exit ;; |
1534 | *:FreeBSD:*:*) |
1535 | - case ${UNAME_MACHINE} in |
1536 | - pc98) |
1537 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1538 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
1539 | + case ${UNAME_PROCESSOR} in |
1540 | amd64) |
1541 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1542 | *) |
1543 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1544 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1545 | esac |
1546 | exit ;; |
1547 | i*:CYGWIN*:*) |
1548 | @@ -803,15 +804,18 @@ |
1549 | *:MINGW*:*) |
1550 | echo ${UNAME_MACHINE}-pc-mingw32 |
1551 | exit ;; |
1552 | + i*:MSYS*:*) |
1553 | + echo ${UNAME_MACHINE}-pc-msys |
1554 | + exit ;; |
1555 | i*:windows32*:*) |
1556 | - # uname -m includes "-pc" on this system. |
1557 | - echo ${UNAME_MACHINE}-mingw32 |
1558 | + # uname -m includes "-pc" on this system. |
1559 | + echo ${UNAME_MACHINE}-mingw32 |
1560 | exit ;; |
1561 | i*:PW*:*) |
1562 | echo ${UNAME_MACHINE}-pc-pw32 |
1563 | exit ;; |
1564 | *:Interix*:*) |
1565 | - case ${UNAME_MACHINE} in |
1566 | + case ${UNAME_MACHINE} in |
1567 | x86) |
1568 | echo i586-pc-interix${UNAME_RELEASE} |
1569 | exit ;; |
1570 | @@ -857,6 +861,13 @@ |
1571 | i*86:Minix:*:*) |
1572 | echo ${UNAME_MACHINE}-pc-minix |
1573 | exit ;; |
1574 | + aarch64:Linux:*:*) |
1575 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1576 | + exit ;; |
1577 | + aarch64_be:Linux:*:*) |
1578 | + UNAME_MACHINE=aarch64_be |
1579 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1580 | + exit ;; |
1581 | alpha:Linux:*:*) |
1582 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1583 | EV5) UNAME_MACHINE=alphaev5 ;; |
1584 | @@ -866,7 +877,7 @@ |
1585 | EV6) UNAME_MACHINE=alphaev6 ;; |
1586 | EV67) UNAME_MACHINE=alphaev67 ;; |
1587 | EV68*) UNAME_MACHINE=alphaev68 ;; |
1588 | - esac |
1589 | + esac |
1590 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
1591 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
1592 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
1593 | @@ -878,20 +889,29 @@ |
1594 | then |
1595 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1596 | else |
1597 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
1598 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
1599 | + | grep -q __ARM_PCS_VFP |
1600 | + then |
1601 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
1602 | + else |
1603 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
1604 | + fi |
1605 | fi |
1606 | exit ;; |
1607 | avr32*:Linux:*:*) |
1608 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1609 | exit ;; |
1610 | cris:Linux:*:*) |
1611 | - echo cris-axis-linux-gnu |
1612 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1613 | exit ;; |
1614 | crisv32:Linux:*:*) |
1615 | - echo crisv32-axis-linux-gnu |
1616 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1617 | exit ;; |
1618 | frv:Linux:*:*) |
1619 | - echo frv-unknown-linux-gnu |
1620 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1621 | + exit ;; |
1622 | + hexagon:Linux:*:*) |
1623 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1624 | exit ;; |
1625 | i*86:Linux:*:*) |
1626 | LIBC=gnu |
1627 | @@ -933,7 +953,7 @@ |
1628 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
1629 | ;; |
1630 | or32:Linux:*:*) |
1631 | - echo or32-unknown-linux-gnu |
1632 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1633 | exit ;; |
1634 | padre:Linux:*:*) |
1635 | echo sparc-unknown-linux-gnu |
1636 | @@ -959,7 +979,7 @@ |
1637 | echo ${UNAME_MACHINE}-ibm-linux |
1638 | exit ;; |
1639 | sh64*:Linux:*:*) |
1640 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1641 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1642 | exit ;; |
1643 | sh*:Linux:*:*) |
1644 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1645 | @@ -967,14 +987,17 @@ |
1646 | sparc:Linux:*:* | sparc64:Linux:*:*) |
1647 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1648 | exit ;; |
1649 | + tile*:Linux:*:*) |
1650 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1651 | + exit ;; |
1652 | vax:Linux:*:*) |
1653 | echo ${UNAME_MACHINE}-dec-linux-gnu |
1654 | exit ;; |
1655 | x86_64:Linux:*:*) |
1656 | - echo x86_64-unknown-linux-gnu |
1657 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1658 | exit ;; |
1659 | xtensa*:Linux:*:*) |
1660 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1661 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1662 | exit ;; |
1663 | i*86:DYNIX/ptx:4*:*) |
1664 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1665 | @@ -983,11 +1006,11 @@ |
1666 | echo i386-sequent-sysv4 |
1667 | exit ;; |
1668 | i*86:UNIX_SV:4.2MP:2.*) |
1669 | - # Unixware is an offshoot of SVR4, but it has its own version |
1670 | - # number series starting with 2... |
1671 | - # I am not positive that other SVR4 systems won't match this, |
1672 | + # Unixware is an offshoot of SVR4, but it has its own version |
1673 | + # number series starting with 2... |
1674 | + # I am not positive that other SVR4 systems won't match this, |
1675 | # I just have to hope. -- rms. |
1676 | - # Use sysv4.2uw... so that sysv4* matches it. |
1677 | + # Use sysv4.2uw... so that sysv4* matches it. |
1678 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
1679 | exit ;; |
1680 | i*86:OS/2:*:*) |
1681 | @@ -1019,7 +1042,7 @@ |
1682 | fi |
1683 | exit ;; |
1684 | i*86:*:5:[678]*) |
1685 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1686 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1687 | case `/bin/uname -X | grep "^Machine"` in |
1688 | *486*) UNAME_MACHINE=i486 ;; |
1689 | *Pentium) UNAME_MACHINE=i586 ;; |
1690 | @@ -1047,13 +1070,13 @@ |
1691 | exit ;; |
1692 | pc:*:*:*) |
1693 | # Left here for compatibility: |
1694 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1695 | - # the processor, so we play safe by assuming i586. |
1696 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1697 | + # the processor, so we play safe by assuming i586. |
1698 | # Note: whatever this is, it MUST be the same as what config.sub |
1699 | # prints for the "djgpp" host, or else GDB configury will decide that |
1700 | # this is a cross-build. |
1701 | echo i586-pc-msdosdjgpp |
1702 | - exit ;; |
1703 | + exit ;; |
1704 | Intel:Mach:3*:*) |
1705 | echo i386-pc-mach3 |
1706 | exit ;; |
1707 | @@ -1088,8 +1111,8 @@ |
1708 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1709 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
1710 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1711 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1712 | - && { echo i486-ncr-sysv4; exit; } ;; |
1713 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1714 | + && { echo i486-ncr-sysv4; exit; } ;; |
1715 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
1716 | OS_REL='.3' |
1717 | test -r /etc/.relid \ |
1718 | @@ -1132,10 +1155,10 @@ |
1719 | echo ns32k-sni-sysv |
1720 | fi |
1721 | exit ;; |
1722 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1723 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
1724 | - echo i586-unisys-sysv4 |
1725 | - exit ;; |
1726 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1727 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
1728 | + echo i586-unisys-sysv4 |
1729 | + exit ;; |
1730 | *:UNIX_System_V:4*:FTX*) |
1731 | # From Gerald Hewes <hewes@openmarket.com>. |
1732 | # How about differentiating between stratus architectures? -djm |
1733 | @@ -1161,11 +1184,11 @@ |
1734 | exit ;; |
1735 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1736 | if [ -d /usr/nec ]; then |
1737 | - echo mips-nec-sysv${UNAME_RELEASE} |
1738 | + echo mips-nec-sysv${UNAME_RELEASE} |
1739 | else |
1740 | - echo mips-unknown-sysv${UNAME_RELEASE} |
1741 | + echo mips-unknown-sysv${UNAME_RELEASE} |
1742 | fi |
1743 | - exit ;; |
1744 | + exit ;; |
1745 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1746 | echo powerpc-be-beos |
1747 | exit ;; |
1748 | @@ -1230,6 +1253,9 @@ |
1749 | *:QNX:*:4*) |
1750 | echo i386-pc-qnx |
1751 | exit ;; |
1752 | + NEO-?:NONSTOP_KERNEL:*:*) |
1753 | + echo neo-tandem-nsk${UNAME_RELEASE} |
1754 | + exit ;; |
1755 | NSE-?:NONSTOP_KERNEL:*:*) |
1756 | echo nse-tandem-nsk${UNAME_RELEASE} |
1757 | exit ;; |
1758 | @@ -1275,13 +1301,13 @@ |
1759 | echo pdp10-unknown-its |
1760 | exit ;; |
1761 | SEI:*:*:SEIUX) |
1762 | - echo mips-sei-seiux${UNAME_RELEASE} |
1763 | + echo mips-sei-seiux${UNAME_RELEASE} |
1764 | exit ;; |
1765 | *:DragonFly:*:*) |
1766 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
1767 | exit ;; |
1768 | *:*VMS:*:*) |
1769 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1770 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1771 | case "${UNAME_MACHINE}" in |
1772 | A*) echo alpha-dec-vms ; exit ;; |
1773 | I*) echo ia64-dec-vms ; exit ;; |
1774 | @@ -1299,6 +1325,9 @@ |
1775 | i*86:AROS:*:*) |
1776 | echo ${UNAME_MACHINE}-pc-aros |
1777 | exit ;; |
1778 | + x86_64:VMkernel:*:*) |
1779 | + echo ${UNAME_MACHINE}-unknown-esx |
1780 | + exit ;; |
1781 | esac |
1782 | |
1783 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
1784 | @@ -1321,11 +1350,11 @@ |
1785 | #include <sys/param.h> |
1786 | printf ("m68k-sony-newsos%s\n", |
1787 | #ifdef NEWSOS4 |
1788 | - "4" |
1789 | + "4" |
1790 | #else |
1791 | - "" |
1792 | + "" |
1793 | #endif |
1794 | - ); exit (0); |
1795 | + ); exit (0); |
1796 | #endif |
1797 | #endif |
1798 | |
1799 | |
1800 | === modified file 'config.sub' |
1801 | --- config.sub 2012-05-20 01:24:02 +0000 |
1802 | +++ config.sub 2012-12-09 20:39:17 +0000 |
1803 | @@ -1,10 +1,10 @@ |
1804 | #! /bin/sh |
1805 | # Configuration validation subroutine script. |
1806 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1807 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
1808 | -# Free Software Foundation, Inc. |
1809 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1810 | +# 2011, 2012 Free Software Foundation, Inc. |
1811 | |
1812 | -timestamp='2009-11-20' |
1813 | +timestamp='2012-02-10' |
1814 | |
1815 | # This file is (in principle) common to ALL GNU software. |
1816 | # The presence of a machine in this file suggests that SOME GNU software |
1817 | @@ -21,9 +21,7 @@ |
1818 | # GNU General Public License for more details. |
1819 | # |
1820 | # You should have received a copy of the GNU General Public License |
1821 | -# along with this program; if not, write to the Free Software |
1822 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
1823 | -# 02110-1301, USA. |
1824 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
1825 | # |
1826 | # As a special exception to the GNU General Public License, if you |
1827 | # distribute this file as part of a program that contains a |
1828 | @@ -75,8 +73,9 @@ |
1829 | version="\ |
1830 | GNU config.sub ($timestamp) |
1831 | |
1832 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
1833 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
1834 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1835 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1836 | +Free Software Foundation, Inc. |
1837 | |
1838 | This is free software; see the source for copying conditions. There is NO |
1839 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1840 | @@ -123,13 +122,18 @@ |
1841 | # Here we must recognize all the valid KERNEL-OS combinations. |
1842 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1843 | case $maybe_os in |
1844 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
1845 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
1846 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1847 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1848 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
1849 | kopensolaris*-gnu* | \ |
1850 | storm-chaos* | os2-emx* | rtmk-nova*) |
1851 | os=-$maybe_os |
1852 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
1853 | ;; |
1854 | + android-linux) |
1855 | + os=-linux-android |
1856 | + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
1857 | + ;; |
1858 | *) |
1859 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
1860 | if [ $basic_machine != $1 ] |
1861 | @@ -156,8 +160,8 @@ |
1862 | os= |
1863 | basic_machine=$1 |
1864 | ;; |
1865 | - -bluegene*) |
1866 | - os=-cnk |
1867 | + -bluegene*) |
1868 | + os=-cnk |
1869 | ;; |
1870 | -sim | -cisco | -oki | -wec | -winbond) |
1871 | os= |
1872 | @@ -173,10 +177,10 @@ |
1873 | os=-chorusos |
1874 | basic_machine=$1 |
1875 | ;; |
1876 | - -chorusrdb) |
1877 | - os=-chorusrdb |
1878 | + -chorusrdb) |
1879 | + os=-chorusrdb |
1880 | basic_machine=$1 |
1881 | - ;; |
1882 | + ;; |
1883 | -hiux*) |
1884 | os=-hiuxwe2 |
1885 | ;; |
1886 | @@ -245,17 +249,22 @@ |
1887 | # Some are omitted here because they have special meanings below. |
1888 | 1750a | 580 \ |
1889 | | a29k \ |
1890 | + | aarch64 | aarch64_be \ |
1891 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
1892 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
1893 | | am33_2.0 \ |
1894 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
1895 | + | be32 | be64 \ |
1896 | | bfin \ |
1897 | | c4x | clipper \ |
1898 | | d10v | d30v | dlx | dsp16xx \ |
1899 | + | epiphany \ |
1900 | | fido | fr30 | frv \ |
1901 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
1902 | + | hexagon \ |
1903 | | i370 | i860 | i960 | ia64 \ |
1904 | | ip2k | iq2000 \ |
1905 | + | le32 | le64 \ |
1906 | | lm32 \ |
1907 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1908 | | maxq | mb | microblaze | mcore | mep | metag \ |
1909 | @@ -281,29 +290,39 @@ |
1910 | | moxie \ |
1911 | | mt \ |
1912 | | msp430 \ |
1913 | + | nds32 | nds32le | nds32be \ |
1914 | | nios | nios2 \ |
1915 | | ns16k | ns32k \ |
1916 | + | open8 \ |
1917 | | or32 \ |
1918 | | pdp10 | pdp11 | pj | pjl \ |
1919 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
1920 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
1921 | | pyramid \ |
1922 | - | rx \ |
1923 | + | rl78 | rx \ |
1924 | | score \ |
1925 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
1926 | | sh64 | sh64le \ |
1927 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
1928 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
1929 | - | spu | strongarm \ |
1930 | - | tahoe | thumb | tic4x | tic80 | tron \ |
1931 | + | spu \ |
1932 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
1933 | | ubicom32 \ |
1934 | - | v850 | v850e \ |
1935 | + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
1936 | | we32k \ |
1937 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
1938 | + | x86 | xc16x | xstormy16 | xtensa \ |
1939 | | z8k | z80) |
1940 | basic_machine=$basic_machine-unknown |
1941 | ;; |
1942 | - m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
1943 | - # Motorola 68HC11/12. |
1944 | + c54x) |
1945 | + basic_machine=tic54x-unknown |
1946 | + ;; |
1947 | + c55x) |
1948 | + basic_machine=tic55x-unknown |
1949 | + ;; |
1950 | + c6x) |
1951 | + basic_machine=tic6x-unknown |
1952 | + ;; |
1953 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
1954 | basic_machine=$basic_machine-unknown |
1955 | os=-none |
1956 | ;; |
1957 | @@ -313,6 +332,21 @@ |
1958 | basic_machine=mt-unknown |
1959 | ;; |
1960 | |
1961 | + strongarm | thumb | xscale) |
1962 | + basic_machine=arm-unknown |
1963 | + ;; |
1964 | + xgate) |
1965 | + basic_machine=$basic_machine-unknown |
1966 | + os=-none |
1967 | + ;; |
1968 | + xscaleeb) |
1969 | + basic_machine=armeb-unknown |
1970 | + ;; |
1971 | + |
1972 | + xscaleel) |
1973 | + basic_machine=armel-unknown |
1974 | + ;; |
1975 | + |
1976 | # We use `pc' rather than `unknown' |
1977 | # because (1) that's what they normally are, and |
1978 | # (2) the word "unknown" tends to confuse beginning users. |
1979 | @@ -327,21 +361,25 @@ |
1980 | # Recognize the basic CPU types with company name. |
1981 | 580-* \ |
1982 | | a29k-* \ |
1983 | + | aarch64-* | aarch64_be-* \ |
1984 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
1985 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
1986 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
1987 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
1988 | | avr-* | avr32-* \ |
1989 | + | be32-* | be64-* \ |
1990 | | bfin-* | bs2000-* \ |
1991 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
1992 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
1993 | | clipper-* | craynv-* | cydra-* \ |
1994 | | d10v-* | d30v-* | dlx-* \ |
1995 | | elxsi-* \ |
1996 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
1997 | | h8300-* | h8500-* \ |
1998 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
1999 | + | hexagon-* \ |
2000 | | i*86-* | i860-* | i960-* | ia64-* \ |
2001 | | ip2k-* | iq2000-* \ |
2002 | + | le32-* | le64-* \ |
2003 | | lm32-* \ |
2004 | | m32c-* | m32r-* | m32rle-* \ |
2005 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
2006 | @@ -367,25 +405,29 @@ |
2007 | | mmix-* \ |
2008 | | mt-* \ |
2009 | | msp430-* \ |
2010 | + | nds32-* | nds32le-* | nds32be-* \ |
2011 | | nios-* | nios2-* \ |
2012 | | none-* | np1-* | ns16k-* | ns32k-* \ |
2013 | + | open8-* \ |
2014 | | orion-* \ |
2015 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
2016 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
2017 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
2018 | | pyramid-* \ |
2019 | - | romp-* | rs6000-* | rx-* \ |
2020 | + | rl78-* | romp-* | rs6000-* | rx-* \ |
2021 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
2022 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
2023 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
2024 | | sparclite-* \ |
2025 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
2026 | - | tahoe-* | thumb-* \ |
2027 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
2028 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
2029 | + | tahoe-* \ |
2030 | + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
2031 | + | tile*-* \ |
2032 | | tron-* \ |
2033 | | ubicom32-* \ |
2034 | - | v850-* | v850e-* | vax-* \ |
2035 | + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
2036 | + | vax-* \ |
2037 | | we32k-* \ |
2038 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
2039 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
2040 | | xstormy16-* | xtensa*-* \ |
2041 | | ymp-* \ |
2042 | | z8k-* | z80-*) |
2043 | @@ -410,7 +452,7 @@ |
2044 | basic_machine=a29k-amd |
2045 | os=-udi |
2046 | ;; |
2047 | - abacus) |
2048 | + abacus) |
2049 | basic_machine=abacus-unknown |
2050 | ;; |
2051 | adobe68k) |
2052 | @@ -480,11 +522,20 @@ |
2053 | basic_machine=powerpc-ibm |
2054 | os=-cnk |
2055 | ;; |
2056 | + c54x-*) |
2057 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
2058 | + ;; |
2059 | + c55x-*) |
2060 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
2061 | + ;; |
2062 | + c6x-*) |
2063 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
2064 | + ;; |
2065 | c90) |
2066 | basic_machine=c90-cray |
2067 | os=-unicos |
2068 | ;; |
2069 | - cegcc) |
2070 | + cegcc) |
2071 | basic_machine=arm-unknown |
2072 | os=-cegcc |
2073 | ;; |
2074 | @@ -516,7 +567,7 @@ |
2075 | basic_machine=craynv-cray |
2076 | os=-unicosmp |
2077 | ;; |
2078 | - cr16) |
2079 | + cr16 | cr16-*) |
2080 | basic_machine=cr16-unknown |
2081 | os=-elf |
2082 | ;; |
2083 | @@ -674,7 +725,6 @@ |
2084 | i370-ibm* | ibm*) |
2085 | basic_machine=i370-ibm |
2086 | ;; |
2087 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
2088 | i*86v32) |
2089 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
2090 | os=-sysv32 |
2091 | @@ -732,7 +782,7 @@ |
2092 | basic_machine=ns32k-utek |
2093 | os=-sysv |
2094 | ;; |
2095 | - microblaze) |
2096 | + microblaze) |
2097 | basic_machine=microblaze-xilinx |
2098 | ;; |
2099 | mingw32) |
2100 | @@ -771,10 +821,18 @@ |
2101 | ms1-*) |
2102 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
2103 | ;; |
2104 | + msys) |
2105 | + basic_machine=i386-pc |
2106 | + os=-msys |
2107 | + ;; |
2108 | mvs) |
2109 | basic_machine=i370-ibm |
2110 | os=-mvs |
2111 | ;; |
2112 | + nacl) |
2113 | + basic_machine=le32-unknown |
2114 | + os=-nacl |
2115 | + ;; |
2116 | ncr3000) |
2117 | basic_machine=i486-ncr |
2118 | os=-sysv4 |
2119 | @@ -839,6 +897,12 @@ |
2120 | np1) |
2121 | basic_machine=np1-gould |
2122 | ;; |
2123 | + neo-tandem) |
2124 | + basic_machine=neo-tandem |
2125 | + ;; |
2126 | + nse-tandem) |
2127 | + basic_machine=nse-tandem |
2128 | + ;; |
2129 | nsr-tandem) |
2130 | basic_machine=nsr-tandem |
2131 | ;; |
2132 | @@ -921,9 +985,10 @@ |
2133 | ;; |
2134 | power) basic_machine=power-ibm |
2135 | ;; |
2136 | - ppc) basic_machine=powerpc-unknown |
2137 | + ppc | ppcbe) basic_machine=powerpc-unknown |
2138 | ;; |
2139 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
2140 | + ppc-* | ppcbe-*) |
2141 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
2142 | ;; |
2143 | ppcle | powerpclittle | ppc-le | powerpc-little) |
2144 | basic_machine=powerpcle-unknown |
2145 | @@ -1017,6 +1082,9 @@ |
2146 | basic_machine=i860-stratus |
2147 | os=-sysv4 |
2148 | ;; |
2149 | + strongarm-* | thumb-*) |
2150 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
2151 | + ;; |
2152 | sun2) |
2153 | basic_machine=m68000-sun |
2154 | ;; |
2155 | @@ -1073,20 +1141,8 @@ |
2156 | basic_machine=t90-cray |
2157 | os=-unicos |
2158 | ;; |
2159 | - tic54x | c54x*) |
2160 | - basic_machine=tic54x-unknown |
2161 | - os=-coff |
2162 | - ;; |
2163 | - tic55x | c55x*) |
2164 | - basic_machine=tic55x-unknown |
2165 | - os=-coff |
2166 | - ;; |
2167 | - tic6x | c6x*) |
2168 | - basic_machine=tic6x-unknown |
2169 | - os=-coff |
2170 | - ;; |
2171 | tile*) |
2172 | - basic_machine=tile-unknown |
2173 | + basic_machine=$basic_machine-unknown |
2174 | os=-linux-gnu |
2175 | ;; |
2176 | tx39) |
2177 | @@ -1156,6 +1212,9 @@ |
2178 | xps | xps100) |
2179 | basic_machine=xps100-honeywell |
2180 | ;; |
2181 | + xscale-* | xscalee[bl]-*) |
2182 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
2183 | + ;; |
2184 | ymp) |
2185 | basic_machine=ymp-cray |
2186 | os=-unicos |
2187 | @@ -1253,11 +1312,11 @@ |
2188 | if [ x"$os" != x"" ] |
2189 | then |
2190 | case $os in |
2191 | - # First match some system type aliases |
2192 | - # that might get confused with valid system types. |
2193 | + # First match some system type aliases |
2194 | + # that might get confused with valid system types. |
2195 | # -solaris* is a basic system type, with this one exception. |
2196 | - -auroraux) |
2197 | - os=-auroraux |
2198 | + -auroraux) |
2199 | + os=-auroraux |
2200 | ;; |
2201 | -solaris1 | -solaris1.*) |
2202 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
2203 | @@ -1293,8 +1352,9 @@ |
2204 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
2205 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
2206 | | -chorusos* | -chorusrdb* | -cegcc* \ |
2207 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
2208 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
2209 | + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
2210 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
2211 | + | -linux-newlib* | -linux-uclibc* \ |
2212 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
2213 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
2214 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
2215 | @@ -1341,7 +1401,7 @@ |
2216 | -opened*) |
2217 | os=-openedition |
2218 | ;; |
2219 | - -os400*) |
2220 | + -os400*) |
2221 | os=-os400 |
2222 | ;; |
2223 | -wince*) |
2224 | @@ -1390,7 +1450,7 @@ |
2225 | -sinix*) |
2226 | os=-sysv4 |
2227 | ;; |
2228 | - -tpf*) |
2229 | + -tpf*) |
2230 | os=-tpf |
2231 | ;; |
2232 | -triton*) |
2233 | @@ -1435,6 +1495,8 @@ |
2234 | -dicos*) |
2235 | os=-dicos |
2236 | ;; |
2237 | + -nacl*) |
2238 | + ;; |
2239 | -none) |
2240 | ;; |
2241 | *) |
2242 | @@ -1457,10 +1519,10 @@ |
2243 | # system, and we'll never get to this point. |
2244 | |
2245 | case $basic_machine in |
2246 | - score-*) |
2247 | + score-*) |
2248 | os=-elf |
2249 | ;; |
2250 | - spu-*) |
2251 | + spu-*) |
2252 | os=-elf |
2253 | ;; |
2254 | *-acorn) |
2255 | @@ -1472,8 +1534,17 @@ |
2256 | arm*-semi) |
2257 | os=-aout |
2258 | ;; |
2259 | - c4x-* | tic4x-*) |
2260 | - os=-coff |
2261 | + c4x-* | tic4x-*) |
2262 | + os=-coff |
2263 | + ;; |
2264 | + tic54x-*) |
2265 | + os=-coff |
2266 | + ;; |
2267 | + tic55x-*) |
2268 | + os=-coff |
2269 | + ;; |
2270 | + tic6x-*) |
2271 | + os=-coff |
2272 | ;; |
2273 | # This must come before the *-dec entry. |
2274 | pdp10-*) |
2275 | @@ -1493,14 +1564,11 @@ |
2276 | ;; |
2277 | m68000-sun) |
2278 | os=-sunos3 |
2279 | - # This also exists in the configure program, but was not the |
2280 | - # default. |
2281 | - # os=-sunos4 |
2282 | ;; |
2283 | m68*-cisco) |
2284 | os=-aout |
2285 | ;; |
2286 | - mep-*) |
2287 | + mep-*) |
2288 | os=-elf |
2289 | ;; |
2290 | mips*-cisco) |
2291 | @@ -1527,7 +1595,7 @@ |
2292 | *-ibm) |
2293 | os=-aix |
2294 | ;; |
2295 | - *-knuth) |
2296 | + *-knuth) |
2297 | os=-mmixware |
2298 | ;; |
2299 | *-wec) |
2300 | |
2301 | === modified file 'configure' |
2302 | --- configure 2012-05-20 01:24:02 +0000 |
2303 | +++ configure 2012-12-09 20:39:17 +0000 |
2304 | @@ -1,6 +1,6 @@ |
2305 | #! /bin/sh |
2306 | # Guess values for system-dependent variables and create Makefiles. |
2307 | -# Generated by GNU Autoconf 2.66. |
2308 | +# Generated by GNU Autoconf 2.68. |
2309 | # |
2310 | # |
2311 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
2312 | @@ -89,6 +89,7 @@ |
2313 | IFS=" "" $as_nl" |
2314 | |
2315 | # Find who we are. Look in the path if we contain no directory separator. |
2316 | +as_myself= |
2317 | case $0 in #(( |
2318 | *[\\/]* ) as_myself=$0 ;; |
2319 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2320 | @@ -222,11 +223,18 @@ |
2321 | # We cannot yet assume a decent shell, so we have to provide a |
2322 | # neutralization value for shells without unset; and this also |
2323 | # works around shells that cannot unset nonexistent variables. |
2324 | + # Preserve -v and -x to the replacement shell. |
2325 | BASH_ENV=/dev/null |
2326 | ENV=/dev/null |
2327 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
2328 | export CONFIG_SHELL |
2329 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
2330 | + case $- in # (((( |
2331 | + *v*x* | *x*v* ) as_opts=-vx ;; |
2332 | + *v* ) as_opts=-v ;; |
2333 | + *x* ) as_opts=-x ;; |
2334 | + * ) as_opts= ;; |
2335 | + esac |
2336 | + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
2337 | fi |
2338 | |
2339 | if test x$as_have_required = xno; then : |
2340 | @@ -647,8 +655,11 @@ |
2341 | LIPO |
2342 | NMEDIT |
2343 | DSYMUTIL |
2344 | +MANIFEST_TOOL |
2345 | RANLIB |
2346 | +ac_ct_AR |
2347 | AR |
2348 | +DLLTOOL |
2349 | OBJDUMP |
2350 | LN_S |
2351 | NM |
2352 | @@ -662,6 +673,7 @@ |
2353 | am__fastdepCC_FALSE |
2354 | am__fastdepCC_TRUE |
2355 | CCDEPMODE |
2356 | +am__nodep |
2357 | AMDEPBACKSLASH |
2358 | AMDEP_FALSE |
2359 | AMDEP_TRUE |
2360 | @@ -754,6 +766,7 @@ |
2361 | enable_fast_install |
2362 | enable_dependency_tracking |
2363 | with_gnu_ld |
2364 | +with_sysroot |
2365 | enable_libtool_lock |
2366 | with_x |
2367 | enable_nls |
2368 | @@ -772,7 +785,8 @@ |
2369 | LIBS |
2370 | CPPFLAGS |
2371 | CPP |
2372 | -XMKMF' |
2373 | +XMKMF |
2374 | +PYTHON' |
2375 | |
2376 | |
2377 | # Initialize some variables set by options. |
2378 | @@ -835,8 +849,9 @@ |
2379 | fi |
2380 | |
2381 | case $ac_option in |
2382 | - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
2383 | - *) ac_optarg=yes ;; |
2384 | + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
2385 | + *=) ac_optarg= ;; |
2386 | + *) ac_optarg=yes ;; |
2387 | esac |
2388 | |
2389 | # Accept the important Cygnus configure options, so we can diagnose typos. |
2390 | @@ -1176,7 +1191,7 @@ |
2391 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
2392 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
2393 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
2394 | - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
2395 | + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" |
2396 | ;; |
2397 | |
2398 | esac |
2399 | @@ -1407,9 +1422,11 @@ |
2400 | Optional Packages: |
2401 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
2402 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
2403 | - --with-pic try to use only PIC/non-PIC objects [default=use |
2404 | + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
2405 | both] |
2406 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
2407 | + --with-sysroot=DIR Search for dependent libraries within DIR |
2408 | + (or the compiler's sysroot if not specified). |
2409 | --with-x use the X Window System |
2410 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
2411 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
2412 | @@ -1429,6 +1446,7 @@ |
2413 | you have headers in a nonstandard directory <include dir> |
2414 | CPP C preprocessor |
2415 | XMKMF Path to xmkmf, Makefile generator for X Window System |
2416 | + PYTHON the Python interpreter |
2417 | |
2418 | Use these variables to override the choices made by `configure' or to help |
2419 | it to find libraries and programs with nonstandard names/locations. |
2420 | @@ -1497,7 +1515,7 @@ |
2421 | if $ac_init_version; then |
2422 | cat <<\_ACEOF |
2423 | configure |
2424 | -generated by GNU Autoconf 2.66 |
2425 | +generated by GNU Autoconf 2.68 |
2426 | |
2427 | Copyright (C) 2010 Free Software Foundation, Inc. |
2428 | This configure script is free software; the Free Software Foundation |
2429 | @@ -1543,7 +1561,7 @@ |
2430 | |
2431 | ac_retval=1 |
2432 | fi |
2433 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2434 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2435 | as_fn_set_status $ac_retval |
2436 | |
2437 | } # ac_fn_c_try_compile |
2438 | @@ -1589,7 +1607,7 @@ |
2439 | # interfere with the next link command; also delete a directory that is |
2440 | # left behind by Apple's compiler. We do this before executing the actions. |
2441 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
2442 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2443 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2444 | as_fn_set_status $ac_retval |
2445 | |
2446 | } # ac_fn_c_try_link |
2447 | @@ -1603,7 +1621,7 @@ |
2448 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2449 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2450 | $as_echo_n "checking for $2... " >&6; } |
2451 | -if eval "test \"\${$3+set}\"" = set; then : |
2452 | +if eval \${$3+:} false; then : |
2453 | $as_echo_n "(cached) " >&6 |
2454 | else |
2455 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2456 | @@ -1621,7 +1639,7 @@ |
2457 | eval ac_res=\$$3 |
2458 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2459 | $as_echo "$ac_res" >&6; } |
2460 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2461 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2462 | |
2463 | } # ac_fn_c_check_header_compile |
2464 | |
2465 | @@ -1646,7 +1664,7 @@ |
2466 | mv -f conftest.er1 conftest.err |
2467 | fi |
2468 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2469 | - test $ac_status = 0; } >/dev/null && { |
2470 | + test $ac_status = 0; } > conftest.i && { |
2471 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
2472 | test ! -s conftest.err |
2473 | }; then : |
2474 | @@ -1657,7 +1675,7 @@ |
2475 | |
2476 | ac_retval=1 |
2477 | fi |
2478 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2479 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2480 | as_fn_set_status $ac_retval |
2481 | |
2482 | } # ac_fn_c_try_cpp |
2483 | @@ -1699,7 +1717,7 @@ |
2484 | ac_retval=$ac_status |
2485 | fi |
2486 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
2487 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2488 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2489 | as_fn_set_status $ac_retval |
2490 | |
2491 | } # ac_fn_c_try_run |
2492 | @@ -1712,7 +1730,7 @@ |
2493 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2494 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2495 | $as_echo_n "checking for $2... " >&6; } |
2496 | -if eval "test \"\${$3+set}\"" = set; then : |
2497 | +if eval \${$3+:} false; then : |
2498 | $as_echo_n "(cached) " >&6 |
2499 | else |
2500 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2501 | @@ -1767,7 +1785,7 @@ |
2502 | eval ac_res=\$$3 |
2503 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2504 | $as_echo "$ac_res" >&6; } |
2505 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2506 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2507 | |
2508 | } # ac_fn_c_check_func |
2509 | |
2510 | @@ -1779,10 +1797,10 @@ |
2511 | ac_fn_c_check_header_mongrel () |
2512 | { |
2513 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2514 | - if eval "test \"\${$3+set}\"" = set; then : |
2515 | + if eval \${$3+:} false; then : |
2516 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2517 | $as_echo_n "checking for $2... " >&6; } |
2518 | -if eval "test \"\${$3+set}\"" = set; then : |
2519 | +if eval \${$3+:} false; then : |
2520 | $as_echo_n "(cached) " >&6 |
2521 | fi |
2522 | eval ac_res=\$$3 |
2523 | @@ -1818,7 +1836,7 @@ |
2524 | else |
2525 | ac_header_preproc=no |
2526 | fi |
2527 | -rm -f conftest.err conftest.$ac_ext |
2528 | +rm -f conftest.err conftest.i conftest.$ac_ext |
2529 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 |
2530 | $as_echo "$ac_header_preproc" >&6; } |
2531 | |
2532 | @@ -1845,7 +1863,7 @@ |
2533 | esac |
2534 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2535 | $as_echo_n "checking for $2... " >&6; } |
2536 | -if eval "test \"\${$3+set}\"" = set; then : |
2537 | +if eval \${$3+:} false; then : |
2538 | $as_echo_n "(cached) " >&6 |
2539 | else |
2540 | eval "$3=\$ac_header_compiler" |
2541 | @@ -1854,7 +1872,7 @@ |
2542 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2543 | $as_echo "$ac_res" >&6; } |
2544 | fi |
2545 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2546 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
2547 | |
2548 | } # ac_fn_c_check_header_mongrel |
2549 | cat >config.log <<_ACEOF |
2550 | @@ -1862,7 +1880,7 @@ |
2551 | running configure, to aid debugging if configure makes a mistake. |
2552 | |
2553 | It was created by $as_me, which was |
2554 | -generated by GNU Autoconf 2.66. Invocation command line was |
2555 | +generated by GNU Autoconf 2.68. Invocation command line was |
2556 | |
2557 | $ $0 $@ |
2558 | |
2559 | @@ -2258,7 +2276,7 @@ |
2560 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
2561 | $as_echo_n "checking for a BSD-compatible install... " >&6; } |
2562 | if test -z "$INSTALL"; then |
2563 | -if test "${ac_cv_path_install+set}" = set; then : |
2564 | +if ${ac_cv_path_install+:} false; then : |
2565 | $as_echo_n "(cached) " >&6 |
2566 | else |
2567 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2568 | @@ -2435,7 +2453,7 @@ |
2569 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
2570 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2571 | $as_echo_n "checking for $ac_word... " >&6; } |
2572 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
2573 | +if ${ac_cv_prog_STRIP+:} false; then : |
2574 | $as_echo_n "(cached) " >&6 |
2575 | else |
2576 | if test -n "$STRIP"; then |
2577 | @@ -2475,7 +2493,7 @@ |
2578 | set dummy strip; ac_word=$2 |
2579 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2580 | $as_echo_n "checking for $ac_word... " >&6; } |
2581 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
2582 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
2583 | $as_echo_n "(cached) " >&6 |
2584 | else |
2585 | if test -n "$ac_ct_STRIP"; then |
2586 | @@ -2528,7 +2546,7 @@ |
2587 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 |
2588 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } |
2589 | if test -z "$MKDIR_P"; then |
2590 | - if test "${ac_cv_path_mkdir+set}" = set; then : |
2591 | + if ${ac_cv_path_mkdir+:} false; then : |
2592 | $as_echo_n "(cached) " >&6 |
2593 | else |
2594 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2595 | @@ -2579,7 +2597,7 @@ |
2596 | set dummy $ac_prog; ac_word=$2 |
2597 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2598 | $as_echo_n "checking for $ac_word... " >&6; } |
2599 | -if test "${ac_cv_prog_AWK+set}" = set; then : |
2600 | +if ${ac_cv_prog_AWK+:} false; then : |
2601 | $as_echo_n "(cached) " >&6 |
2602 | else |
2603 | if test -n "$AWK"; then |
2604 | @@ -2619,7 +2637,7 @@ |
2605 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
2606 | set x ${MAKE-make} |
2607 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
2608 | -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
2609 | +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : |
2610 | $as_echo_n "(cached) " >&6 |
2611 | else |
2612 | cat >conftest.make <<\_ACEOF |
2613 | @@ -2677,7 +2695,7 @@ |
2614 | |
2615 | # Define the identity of the package. |
2616 | PACKAGE=cracklib |
2617 | - VERSION=2.8.19 |
2618 | + VERSION=2.8.20 |
2619 | |
2620 | |
2621 | cat >>confdefs.h <<_ACEOF |
2622 | @@ -2707,11 +2725,11 @@ |
2623 | |
2624 | # We need awk for the "check" target. The system "awk" is bad on |
2625 | # some platforms. |
2626 | -# Always define AMTAR for backward compatibility. |
2627 | - |
2628 | -AMTAR=${AMTAR-"${am_missing_run}tar"} |
2629 | - |
2630 | -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' |
2631 | +# Always define AMTAR for backward compatibility. Yes, it's still used |
2632 | +# in the wild :-( We should find a proper way to deprecate it ... |
2633 | +AMTAR='$${TAR-tar}' |
2634 | + |
2635 | +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
2636 | |
2637 | |
2638 | |
2639 | @@ -2720,6 +2738,7 @@ |
2640 | ac_config_headers="$ac_config_headers config.h" |
2641 | |
2642 | |
2643 | + |
2644 | ALL_LINGUAS="as bn_IN cs da de el es fi fr gu hi hu it ja kn ko lt nb nl ml mr or pa pl pt_BR pt ru sl_SI sk ta te tr uk zh_CN zh_TW" |
2645 | |
2646 | case `pwd` in |
2647 | @@ -2730,8 +2749,8 @@ |
2648 | |
2649 | |
2650 | |
2651 | -macro_version='2.2.10' |
2652 | -macro_revision='1.3175' |
2653 | +macro_version='2.4.2' |
2654 | +macro_revision='1.3337' |
2655 | |
2656 | |
2657 | |
2658 | @@ -2753,7 +2772,7 @@ |
2659 | |
2660 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
2661 | $as_echo_n "checking build system type... " >&6; } |
2662 | -if test "${ac_cv_build+set}" = set; then : |
2663 | +if ${ac_cv_build+:} false; then : |
2664 | $as_echo_n "(cached) " >&6 |
2665 | else |
2666 | ac_build_alias=$build_alias |
2667 | @@ -2787,7 +2806,7 @@ |
2668 | |
2669 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
2670 | $as_echo_n "checking host system type... " >&6; } |
2671 | -if test "${ac_cv_host+set}" = set; then : |
2672 | +if ${ac_cv_host+:} false; then : |
2673 | $as_echo_n "(cached) " >&6 |
2674 | else |
2675 | if test "x$host_alias" = x; then |
2676 | @@ -2842,7 +2861,7 @@ |
2677 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
2678 | $as_echo_n "checking how to print strings... " >&6; } |
2679 | # Test print first, because it will be a builtin if present. |
2680 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
2681 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
2682 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2683 | ECHO='print -r --' |
2684 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2685 | @@ -2939,6 +2958,7 @@ |
2686 | if test "x$enable_dependency_tracking" != xno; then |
2687 | am_depcomp="$ac_aux_dir/depcomp" |
2688 | AMDEPBACKSLASH='\' |
2689 | + am__nodep='_no' |
2690 | fi |
2691 | if test "x$enable_dependency_tracking" != xno; then |
2692 | AMDEP_TRUE= |
2693 | @@ -2959,7 +2979,7 @@ |
2694 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
2695 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2696 | $as_echo_n "checking for $ac_word... " >&6; } |
2697 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2698 | +if ${ac_cv_prog_CC+:} false; then : |
2699 | $as_echo_n "(cached) " >&6 |
2700 | else |
2701 | if test -n "$CC"; then |
2702 | @@ -2999,7 +3019,7 @@ |
2703 | set dummy gcc; ac_word=$2 |
2704 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2705 | $as_echo_n "checking for $ac_word... " >&6; } |
2706 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
2707 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
2708 | $as_echo_n "(cached) " >&6 |
2709 | else |
2710 | if test -n "$ac_ct_CC"; then |
2711 | @@ -3052,7 +3072,7 @@ |
2712 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
2713 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2714 | $as_echo_n "checking for $ac_word... " >&6; } |
2715 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2716 | +if ${ac_cv_prog_CC+:} false; then : |
2717 | $as_echo_n "(cached) " >&6 |
2718 | else |
2719 | if test -n "$CC"; then |
2720 | @@ -3092,7 +3112,7 @@ |
2721 | set dummy cc; ac_word=$2 |
2722 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2723 | $as_echo_n "checking for $ac_word... " >&6; } |
2724 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2725 | +if ${ac_cv_prog_CC+:} false; then : |
2726 | $as_echo_n "(cached) " >&6 |
2727 | else |
2728 | if test -n "$CC"; then |
2729 | @@ -3151,7 +3171,7 @@ |
2730 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2731 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2732 | $as_echo_n "checking for $ac_word... " >&6; } |
2733 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2734 | +if ${ac_cv_prog_CC+:} false; then : |
2735 | $as_echo_n "(cached) " >&6 |
2736 | else |
2737 | if test -n "$CC"; then |
2738 | @@ -3195,7 +3215,7 @@ |
2739 | set dummy $ac_prog; ac_word=$2 |
2740 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2741 | $as_echo_n "checking for $ac_word... " >&6; } |
2742 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
2743 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
2744 | $as_echo_n "(cached) " >&6 |
2745 | else |
2746 | if test -n "$ac_ct_CC"; then |
2747 | @@ -3478,7 +3498,7 @@ |
2748 | ac_clean_files=$ac_clean_files_save |
2749 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
2750 | $as_echo_n "checking for suffix of object files... " >&6; } |
2751 | -if test "${ac_cv_objext+set}" = set; then : |
2752 | +if ${ac_cv_objext+:} false; then : |
2753 | $as_echo_n "(cached) " >&6 |
2754 | else |
2755 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2756 | @@ -3529,7 +3549,7 @@ |
2757 | ac_objext=$OBJEXT |
2758 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
2759 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
2760 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
2761 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
2762 | $as_echo_n "(cached) " >&6 |
2763 | else |
2764 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2765 | @@ -3566,7 +3586,7 @@ |
2766 | ac_save_CFLAGS=$CFLAGS |
2767 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
2768 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
2769 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
2770 | +if ${ac_cv_prog_cc_g+:} false; then : |
2771 | $as_echo_n "(cached) " >&6 |
2772 | else |
2773 | ac_save_c_werror_flag=$ac_c_werror_flag |
2774 | @@ -3644,7 +3664,7 @@ |
2775 | fi |
2776 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
2777 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
2778 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
2779 | +if ${ac_cv_prog_cc_c89+:} false; then : |
2780 | $as_echo_n "(cached) " >&6 |
2781 | else |
2782 | ac_cv_prog_cc_c89=no |
2783 | @@ -3743,7 +3763,7 @@ |
2784 | |
2785 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
2786 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
2787 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
2788 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
2789 | $as_echo_n "(cached) " >&6 |
2790 | else |
2791 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
2792 | @@ -3752,6 +3772,7 @@ |
2793 | # instance it was reported that on HP-UX the gcc test will end up |
2794 | # making a dummy file named `D' -- because `-MD' means `put the output |
2795 | # in D'. |
2796 | + rm -rf conftest.dir |
2797 | mkdir conftest.dir |
2798 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2799 | # using a relative directory. |
2800 | @@ -3811,7 +3832,7 @@ |
2801 | break |
2802 | fi |
2803 | ;; |
2804 | - msvisualcpp | msvcmsys) |
2805 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2806 | # This compiler won't grok `-c -o', but also, the minuso test has |
2807 | # not run yet. These depmodes are late enough in the game, and |
2808 | # so weak that their functioning should not be impacted. |
2809 | @@ -3868,7 +3889,7 @@ |
2810 | |
2811 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 |
2812 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } |
2813 | -if test "${ac_cv_path_SED+set}" = set; then : |
2814 | +if ${ac_cv_path_SED+:} false; then : |
2815 | $as_echo_n "(cached) " >&6 |
2816 | else |
2817 | ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ |
2818 | @@ -3950,7 +3971,7 @@ |
2819 | |
2820 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
2821 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
2822 | -if test "${ac_cv_path_GREP+set}" = set; then : |
2823 | +if ${ac_cv_path_GREP+:} false; then : |
2824 | $as_echo_n "(cached) " >&6 |
2825 | else |
2826 | if test -z "$GREP"; then |
2827 | @@ -4013,7 +4034,7 @@ |
2828 | |
2829 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
2830 | $as_echo_n "checking for egrep... " >&6; } |
2831 | -if test "${ac_cv_path_EGREP+set}" = set; then : |
2832 | +if ${ac_cv_path_EGREP+:} false; then : |
2833 | $as_echo_n "(cached) " >&6 |
2834 | else |
2835 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
2836 | @@ -4080,7 +4101,7 @@ |
2837 | |
2838 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 |
2839 | $as_echo_n "checking for fgrep... " >&6; } |
2840 | -if test "${ac_cv_path_FGREP+set}" = set; then : |
2841 | +if ${ac_cv_path_FGREP+:} false; then : |
2842 | $as_echo_n "(cached) " >&6 |
2843 | else |
2844 | if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 |
2845 | @@ -4211,7 +4232,7 @@ |
2846 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 |
2847 | $as_echo_n "checking for non-GNU ld... " >&6; } |
2848 | fi |
2849 | -if test "${lt_cv_path_LD+set}" = set; then : |
2850 | +if ${lt_cv_path_LD+:} false; then : |
2851 | $as_echo_n "(cached) " >&6 |
2852 | else |
2853 | if test -z "$LD"; then |
2854 | @@ -4251,7 +4272,7 @@ |
2855 | test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
2856 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
2857 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
2858 | -if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
2859 | +if ${lt_cv_prog_gnu_ld+:} false; then : |
2860 | $as_echo_n "(cached) " >&6 |
2861 | else |
2862 | # I'd rather use --version here, but apparently some GNU lds only accept -v. |
2863 | @@ -4278,7 +4299,7 @@ |
2864 | |
2865 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 |
2866 | $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } |
2867 | -if test "${lt_cv_path_NM+set}" = set; then : |
2868 | +if ${lt_cv_path_NM+:} false; then : |
2869 | $as_echo_n "(cached) " >&6 |
2870 | else |
2871 | if test -n "$NM"; then |
2872 | @@ -4341,7 +4362,7 @@ |
2873 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2874 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2875 | $as_echo_n "checking for $ac_word... " >&6; } |
2876 | -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : |
2877 | +if ${ac_cv_prog_DUMPBIN+:} false; then : |
2878 | $as_echo_n "(cached) " >&6 |
2879 | else |
2880 | if test -n "$DUMPBIN"; then |
2881 | @@ -4385,7 +4406,7 @@ |
2882 | set dummy $ac_prog; ac_word=$2 |
2883 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2884 | $as_echo_n "checking for $ac_word... " >&6; } |
2885 | -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : |
2886 | +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : |
2887 | $as_echo_n "(cached) " >&6 |
2888 | else |
2889 | if test -n "$ac_ct_DUMPBIN"; then |
2890 | @@ -4457,7 +4478,7 @@ |
2891 | |
2892 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 |
2893 | $as_echo_n "checking the name lister ($NM) interface... " >&6; } |
2894 | -if test "${lt_cv_nm_interface+set}" = set; then : |
2895 | +if ${lt_cv_nm_interface+:} false; then : |
2896 | $as_echo_n "(cached) " >&6 |
2897 | else |
2898 | lt_cv_nm_interface="BSD nm" |
2899 | @@ -4492,7 +4513,7 @@ |
2900 | # find the maximum length of command line arguments |
2901 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 |
2902 | $as_echo_n "checking the maximum length of command line arguments... " >&6; } |
2903 | -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : |
2904 | +if ${lt_cv_sys_max_cmd_len+:} false; then : |
2905 | $as_echo_n "(cached) " >&6 |
2906 | else |
2907 | i=0 |
2908 | @@ -4555,6 +4576,11 @@ |
2909 | lt_cv_sys_max_cmd_len=196608 |
2910 | ;; |
2911 | |
2912 | + os2*) |
2913 | + # The test takes a long time on OS/2. |
2914 | + lt_cv_sys_max_cmd_len=8192 |
2915 | + ;; |
2916 | + |
2917 | osf*) |
2918 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2919 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2920 | @@ -4594,7 +4620,7 @@ |
2921 | # If test is not a shell built-in, we'll probably end up computing a |
2922 | # maximum length that is only half of the actual maximum length, but |
2923 | # we can't tell. |
2924 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
2925 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2926 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2927 | test $i != 17 # 1/2 MB should be enough |
2928 | do |
2929 | @@ -4637,8 +4663,8 @@ |
2930 | # Try some XSI features |
2931 | xsi_shell=no |
2932 | ( _lt_dummy="a/b/c" |
2933 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
2934 | - = c,a/b,, \ |
2935 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
2936 | + = c,a/b,b/c, \ |
2937 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2938 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2939 | && xsi_shell=yes |
2940 | @@ -4687,9 +4713,83 @@ |
2941 | |
2942 | |
2943 | |
2944 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
2945 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
2946 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
2947 | + $as_echo_n "(cached) " >&6 |
2948 | +else |
2949 | + case $host in |
2950 | + *-*-mingw* ) |
2951 | + case $build in |
2952 | + *-*-mingw* ) # actually msys |
2953 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
2954 | + ;; |
2955 | + *-*-cygwin* ) |
2956 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
2957 | + ;; |
2958 | + * ) # otherwise, assume *nix |
2959 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
2960 | + ;; |
2961 | + esac |
2962 | + ;; |
2963 | + *-*-cygwin* ) |
2964 | + case $build in |
2965 | + *-*-mingw* ) # actually msys |
2966 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
2967 | + ;; |
2968 | + *-*-cygwin* ) |
2969 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
2970 | + ;; |
2971 | + * ) # otherwise, assume *nix |
2972 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
2973 | + ;; |
2974 | + esac |
2975 | + ;; |
2976 | + * ) # unhandled hosts (and "normal" native builds) |
2977 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
2978 | + ;; |
2979 | +esac |
2980 | + |
2981 | +fi |
2982 | + |
2983 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
2984 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
2985 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
2986 | + |
2987 | + |
2988 | + |
2989 | + |
2990 | + |
2991 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
2992 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
2993 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
2994 | + $as_echo_n "(cached) " >&6 |
2995 | +else |
2996 | + #assume ordinary cross tools, or native build. |
2997 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
2998 | +case $host in |
2999 | + *-*-mingw* ) |
3000 | + case $build in |
3001 | + *-*-mingw* ) # actually msys |
3002 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
3003 | + ;; |
3004 | + esac |
3005 | + ;; |
3006 | +esac |
3007 | + |
3008 | +fi |
3009 | + |
3010 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
3011 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
3012 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
3013 | + |
3014 | + |
3015 | + |
3016 | + |
3017 | + |
3018 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
3019 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
3020 | -if test "${lt_cv_ld_reload_flag+set}" = set; then : |
3021 | +if ${lt_cv_ld_reload_flag+:} false; then : |
3022 | $as_echo_n "(cached) " >&6 |
3023 | else |
3024 | lt_cv_ld_reload_flag='-r' |
3025 | @@ -4703,6 +4803,11 @@ |
3026 | esac |
3027 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
3028 | case $host_os in |
3029 | + cygwin* | mingw* | pw32* | cegcc*) |
3030 | + if test "$GCC" != yes; then |
3031 | + reload_cmds=false |
3032 | + fi |
3033 | + ;; |
3034 | darwin*) |
3035 | if test "$GCC" = yes; then |
3036 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
3037 | @@ -4725,7 +4830,7 @@ |
3038 | set dummy ${ac_tool_prefix}objdump; ac_word=$2 |
3039 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3040 | $as_echo_n "checking for $ac_word... " >&6; } |
3041 | -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : |
3042 | +if ${ac_cv_prog_OBJDUMP+:} false; then : |
3043 | $as_echo_n "(cached) " >&6 |
3044 | else |
3045 | if test -n "$OBJDUMP"; then |
3046 | @@ -4765,7 +4870,7 @@ |
3047 | set dummy objdump; ac_word=$2 |
3048 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3049 | $as_echo_n "checking for $ac_word... " >&6; } |
3050 | -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : |
3051 | +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : |
3052 | $as_echo_n "(cached) " >&6 |
3053 | else |
3054 | if test -n "$ac_ct_OBJDUMP"; then |
3055 | @@ -4824,7 +4929,7 @@ |
3056 | |
3057 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 |
3058 | $as_echo_n "checking how to recognize dependent libraries... " >&6; } |
3059 | -if test "${lt_cv_deplibs_check_method+set}" = set; then : |
3060 | +if ${lt_cv_deplibs_check_method+:} false; then : |
3061 | $as_echo_n "(cached) " >&6 |
3062 | else |
3063 | lt_cv_file_magic_cmd='$MAGIC_CMD' |
3064 | @@ -4944,7 +5049,7 @@ |
3065 | lt_cv_deplibs_check_method=pass_all |
3066 | ;; |
3067 | |
3068 | -# This must be Linux ELF. |
3069 | +# This must be glibc/ELF. |
3070 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3071 | lt_cv_deplibs_check_method=pass_all |
3072 | ;; |
3073 | @@ -5026,6 +5131,21 @@ |
3074 | fi |
3075 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
3076 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
3077 | + |
3078 | +file_magic_glob= |
3079 | +want_nocaseglob=no |
3080 | +if test "$build" = "$host"; then |
3081 | + case $host_os in |
3082 | + mingw* | pw32*) |
3083 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
3084 | + want_nocaseglob=yes |
3085 | + else |
3086 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
3087 | + fi |
3088 | + ;; |
3089 | + esac |
3090 | +fi |
3091 | + |
3092 | file_magic_cmd=$lt_cv_file_magic_cmd |
3093 | deplibs_check_method=$lt_cv_deplibs_check_method |
3094 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
3095 | @@ -5041,12 +5161,166 @@ |
3096 | |
3097 | |
3098 | |
3099 | -if test -n "$ac_tool_prefix"; then |
3100 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
3101 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
3102 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3103 | -$as_echo_n "checking for $ac_word... " >&6; } |
3104 | -if test "${ac_cv_prog_AR+set}" = set; then : |
3105 | + |
3106 | + |
3107 | + |
3108 | + |
3109 | + |
3110 | + |
3111 | + |
3112 | + |
3113 | + |
3114 | + |
3115 | +if test -n "$ac_tool_prefix"; then |
3116 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
3117 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
3118 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3119 | +$as_echo_n "checking for $ac_word... " >&6; } |
3120 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
3121 | + $as_echo_n "(cached) " >&6 |
3122 | +else |
3123 | + if test -n "$DLLTOOL"; then |
3124 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
3125 | +else |
3126 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3127 | +for as_dir in $PATH |
3128 | +do |
3129 | + IFS=$as_save_IFS |
3130 | + test -z "$as_dir" && as_dir=. |
3131 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3132 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3133 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
3134 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3135 | + break 2 |
3136 | + fi |
3137 | +done |
3138 | + done |
3139 | +IFS=$as_save_IFS |
3140 | + |
3141 | +fi |
3142 | +fi |
3143 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
3144 | +if test -n "$DLLTOOL"; then |
3145 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
3146 | +$as_echo "$DLLTOOL" >&6; } |
3147 | +else |
3148 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3149 | +$as_echo "no" >&6; } |
3150 | +fi |
3151 | + |
3152 | + |
3153 | +fi |
3154 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
3155 | + ac_ct_DLLTOOL=$DLLTOOL |
3156 | + # Extract the first word of "dlltool", so it can be a program name with args. |
3157 | +set dummy dlltool; ac_word=$2 |
3158 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3159 | +$as_echo_n "checking for $ac_word... " >&6; } |
3160 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
3161 | + $as_echo_n "(cached) " >&6 |
3162 | +else |
3163 | + if test -n "$ac_ct_DLLTOOL"; then |
3164 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
3165 | +else |
3166 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3167 | +for as_dir in $PATH |
3168 | +do |
3169 | + IFS=$as_save_IFS |
3170 | + test -z "$as_dir" && as_dir=. |
3171 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3172 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3173 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
3174 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3175 | + break 2 |
3176 | + fi |
3177 | +done |
3178 | + done |
3179 | +IFS=$as_save_IFS |
3180 | + |
3181 | +fi |
3182 | +fi |
3183 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
3184 | +if test -n "$ac_ct_DLLTOOL"; then |
3185 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
3186 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
3187 | +else |
3188 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3189 | +$as_echo "no" >&6; } |
3190 | +fi |
3191 | + |
3192 | + if test "x$ac_ct_DLLTOOL" = x; then |
3193 | + DLLTOOL="false" |
3194 | + else |
3195 | + case $cross_compiling:$ac_tool_warned in |
3196 | +yes:) |
3197 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3198 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3199 | +ac_tool_warned=yes ;; |
3200 | +esac |
3201 | + DLLTOOL=$ac_ct_DLLTOOL |
3202 | + fi |
3203 | +else |
3204 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
3205 | +fi |
3206 | + |
3207 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
3208 | + |
3209 | + |
3210 | + |
3211 | + |
3212 | + |
3213 | + |
3214 | + |
3215 | + |
3216 | + |
3217 | + |
3218 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
3219 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
3220 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
3221 | + $as_echo_n "(cached) " >&6 |
3222 | +else |
3223 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
3224 | + |
3225 | +case $host_os in |
3226 | +cygwin* | mingw* | pw32* | cegcc*) |
3227 | + # two different shell functions defined in ltmain.sh |
3228 | + # decide which to use based on capabilities of $DLLTOOL |
3229 | + case `$DLLTOOL --help 2>&1` in |
3230 | + *--identify-strict*) |
3231 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
3232 | + ;; |
3233 | + *) |
3234 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
3235 | + ;; |
3236 | + esac |
3237 | + ;; |
3238 | +*) |
3239 | + # fallback: assume linklib IS sharedlib |
3240 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
3241 | + ;; |
3242 | +esac |
3243 | + |
3244 | +fi |
3245 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
3246 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
3247 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
3248 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
3249 | + |
3250 | + |
3251 | + |
3252 | + |
3253 | + |
3254 | + |
3255 | + |
3256 | + |
3257 | +if test -n "$ac_tool_prefix"; then |
3258 | + for ac_prog in ar |
3259 | + do |
3260 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
3261 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
3262 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3263 | +$as_echo_n "checking for $ac_word... " >&6; } |
3264 | +if ${ac_cv_prog_AR+:} false; then : |
3265 | $as_echo_n "(cached) " >&6 |
3266 | else |
3267 | if test -n "$AR"; then |
3268 | @@ -5059,7 +5333,7 @@ |
3269 | test -z "$as_dir" && as_dir=. |
3270 | for ac_exec_ext in '' $ac_executable_extensions; do |
3271 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3272 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
3273 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
3274 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3275 | break 2 |
3276 | fi |
3277 | @@ -5079,14 +5353,18 @@ |
3278 | fi |
3279 | |
3280 | |
3281 | + test -n "$AR" && break |
3282 | + done |
3283 | fi |
3284 | -if test -z "$ac_cv_prog_AR"; then |
3285 | +if test -z "$AR"; then |
3286 | ac_ct_AR=$AR |
3287 | - # Extract the first word of "ar", so it can be a program name with args. |
3288 | -set dummy ar; ac_word=$2 |
3289 | + for ac_prog in ar |
3290 | +do |
3291 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
3292 | +set dummy $ac_prog; ac_word=$2 |
3293 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3294 | $as_echo_n "checking for $ac_word... " >&6; } |
3295 | -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
3296 | +if ${ac_cv_prog_ac_ct_AR+:} false; then : |
3297 | $as_echo_n "(cached) " >&6 |
3298 | else |
3299 | if test -n "$ac_ct_AR"; then |
3300 | @@ -5099,7 +5377,7 @@ |
3301 | test -z "$as_dir" && as_dir=. |
3302 | for ac_exec_ext in '' $ac_executable_extensions; do |
3303 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3304 | - ac_cv_prog_ac_ct_AR="ar" |
3305 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
3306 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3307 | break 2 |
3308 | fi |
3309 | @@ -5118,6 +5396,10 @@ |
3310 | $as_echo "no" >&6; } |
3311 | fi |
3312 | |
3313 | + |
3314 | + test -n "$ac_ct_AR" && break |
3315 | +done |
3316 | + |
3317 | if test "x$ac_ct_AR" = x; then |
3318 | AR="false" |
3319 | else |
3320 | @@ -5129,16 +5411,72 @@ |
3321 | esac |
3322 | AR=$ac_ct_AR |
3323 | fi |
3324 | -else |
3325 | - AR="$ac_cv_prog_AR" |
3326 | -fi |
3327 | - |
3328 | -test -z "$AR" && AR=ar |
3329 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
3330 | - |
3331 | - |
3332 | - |
3333 | - |
3334 | +fi |
3335 | + |
3336 | +: ${AR=ar} |
3337 | +: ${AR_FLAGS=cru} |
3338 | + |
3339 | + |
3340 | + |
3341 | + |
3342 | + |
3343 | + |
3344 | + |
3345 | + |
3346 | + |
3347 | + |
3348 | + |
3349 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
3350 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
3351 | +if ${lt_cv_ar_at_file+:} false; then : |
3352 | + $as_echo_n "(cached) " >&6 |
3353 | +else |
3354 | + lt_cv_ar_at_file=no |
3355 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3356 | +/* end confdefs.h. */ |
3357 | + |
3358 | +int |
3359 | +main () |
3360 | +{ |
3361 | + |
3362 | + ; |
3363 | + return 0; |
3364 | +} |
3365 | +_ACEOF |
3366 | +if ac_fn_c_try_compile "$LINENO"; then : |
3367 | + echo conftest.$ac_objext > conftest.lst |
3368 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
3369 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
3370 | + (eval $lt_ar_try) 2>&5 |
3371 | + ac_status=$? |
3372 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3373 | + test $ac_status = 0; } |
3374 | + if test "$ac_status" -eq 0; then |
3375 | + # Ensure the archiver fails upon bogus file names. |
3376 | + rm -f conftest.$ac_objext libconftest.a |
3377 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
3378 | + (eval $lt_ar_try) 2>&5 |
3379 | + ac_status=$? |
3380 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3381 | + test $ac_status = 0; } |
3382 | + if test "$ac_status" -ne 0; then |
3383 | + lt_cv_ar_at_file=@ |
3384 | + fi |
3385 | + fi |
3386 | + rm -f conftest.* libconftest.a |
3387 | + |
3388 | +fi |
3389 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3390 | + |
3391 | +fi |
3392 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
3393 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
3394 | + |
3395 | +if test "x$lt_cv_ar_at_file" = xno; then |
3396 | + archiver_list_spec= |
3397 | +else |
3398 | + archiver_list_spec=$lt_cv_ar_at_file |
3399 | +fi |
3400 | |
3401 | |
3402 | |
3403 | @@ -5151,7 +5489,7 @@ |
3404 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
3405 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3406 | $as_echo_n "checking for $ac_word... " >&6; } |
3407 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
3408 | +if ${ac_cv_prog_STRIP+:} false; then : |
3409 | $as_echo_n "(cached) " >&6 |
3410 | else |
3411 | if test -n "$STRIP"; then |
3412 | @@ -5191,7 +5529,7 @@ |
3413 | set dummy strip; ac_word=$2 |
3414 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3415 | $as_echo_n "checking for $ac_word... " >&6; } |
3416 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
3417 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
3418 | $as_echo_n "(cached) " >&6 |
3419 | else |
3420 | if test -n "$ac_ct_STRIP"; then |
3421 | @@ -5250,7 +5588,7 @@ |
3422 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
3423 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3424 | $as_echo_n "checking for $ac_word... " >&6; } |
3425 | -if test "${ac_cv_prog_RANLIB+set}" = set; then : |
3426 | +if ${ac_cv_prog_RANLIB+:} false; then : |
3427 | $as_echo_n "(cached) " >&6 |
3428 | else |
3429 | if test -n "$RANLIB"; then |
3430 | @@ -5290,7 +5628,7 @@ |
3431 | set dummy ranlib; ac_word=$2 |
3432 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3433 | $as_echo_n "checking for $ac_word... " >&6; } |
3434 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
3435 | +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : |
3436 | $as_echo_n "(cached) " >&6 |
3437 | else |
3438 | if test -n "$ac_ct_RANLIB"; then |
3439 | @@ -5352,13 +5690,13 @@ |
3440 | if test -n "$RANLIB"; then |
3441 | case $host_os in |
3442 | openbsd*) |
3443 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
3444 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
3445 | ;; |
3446 | *) |
3447 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
3448 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
3449 | ;; |
3450 | esac |
3451 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
3452 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
3453 | fi |
3454 | |
3455 | case $host_os in |
3456 | @@ -5419,7 +5757,7 @@ |
3457 | # Check for command to grab the raw symbol name followed by C symbol from nm. |
3458 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 |
3459 | $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } |
3460 | -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : |
3461 | +if ${lt_cv_sys_global_symbol_pipe+:} false; then : |
3462 | $as_echo_n "(cached) " >&6 |
3463 | else |
3464 | |
3465 | @@ -5480,8 +5818,8 @@ |
3466 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
3467 | |
3468 | # Transform an extracted symbol line into symbol name and symbol address |
3469 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3470 | -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'" |
3471 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3472 | +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'" |
3473 | |
3474 | # Handle CRLF in mingw tool chain |
3475 | opt_cr= |
3476 | @@ -5505,6 +5843,7 @@ |
3477 | # which start with @ or ?. |
3478 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
3479 | " {last_section=section; section=\$ 3};"\ |
3480 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
3481 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
3482 | " \$ 0!~/External *\|/{next};"\ |
3483 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
3484 | @@ -5517,6 +5856,7 @@ |
3485 | else |
3486 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
3487 | fi |
3488 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
3489 | |
3490 | # Check to see that the pipe works correctly. |
3491 | pipe_works=no |
3492 | @@ -5558,6 +5898,18 @@ |
3493 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
3494 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
3495 | cat <<_LT_EOF > conftest.$ac_ext |
3496 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
3497 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
3498 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
3499 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
3500 | +# define LT_DLSYM_CONST |
3501 | +#elif defined(__osf__) |
3502 | +/* This system does not cope well with relocations in const data. */ |
3503 | +# define LT_DLSYM_CONST |
3504 | +#else |
3505 | +# define LT_DLSYM_CONST const |
3506 | +#endif |
3507 | + |
3508 | #ifdef __cplusplus |
3509 | extern "C" { |
3510 | #endif |
3511 | @@ -5569,7 +5921,7 @@ |
3512 | cat <<_LT_EOF >> conftest.$ac_ext |
3513 | |
3514 | /* The mapping between symbol names and symbols. */ |
3515 | -const struct { |
3516 | +LT_DLSYM_CONST struct { |
3517 | const char *name; |
3518 | void *address; |
3519 | } |
3520 | @@ -5595,8 +5947,8 @@ |
3521 | _LT_EOF |
3522 | # Now try linking the two files. |
3523 | mv conftest.$ac_objext conftstm.$ac_objext |
3524 | - lt_save_LIBS="$LIBS" |
3525 | - lt_save_CFLAGS="$CFLAGS" |
3526 | + lt_globsym_save_LIBS=$LIBS |
3527 | + lt_globsym_save_CFLAGS=$CFLAGS |
3528 | LIBS="conftstm.$ac_objext" |
3529 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
3530 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
3531 | @@ -5606,8 +5958,8 @@ |
3532 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
3533 | pipe_works=yes |
3534 | fi |
3535 | - LIBS="$lt_save_LIBS" |
3536 | - CFLAGS="$lt_save_CFLAGS" |
3537 | + LIBS=$lt_globsym_save_LIBS |
3538 | + CFLAGS=$lt_globsym_save_CFLAGS |
3539 | else |
3540 | echo "cannot find nm_test_func in $nlist" >&5 |
3541 | fi |
3542 | @@ -5644,23 +5996,71 @@ |
3543 | $as_echo "ok" >&6; } |
3544 | fi |
3545 | |
3546 | - |
3547 | - |
3548 | - |
3549 | - |
3550 | - |
3551 | - |
3552 | - |
3553 | - |
3554 | - |
3555 | - |
3556 | - |
3557 | - |
3558 | - |
3559 | - |
3560 | - |
3561 | - |
3562 | - |
3563 | +# Response file support. |
3564 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
3565 | + nm_file_list_spec='@' |
3566 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
3567 | + nm_file_list_spec='@' |
3568 | +fi |
3569 | + |
3570 | + |
3571 | + |
3572 | + |
3573 | + |
3574 | + |
3575 | + |
3576 | + |
3577 | + |
3578 | + |
3579 | + |
3580 | + |
3581 | + |
3582 | + |
3583 | + |
3584 | + |
3585 | + |
3586 | + |
3587 | + |
3588 | + |
3589 | + |
3590 | + |
3591 | + |
3592 | + |
3593 | + |
3594 | + |
3595 | + |
3596 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
3597 | +$as_echo_n "checking for sysroot... " >&6; } |
3598 | + |
3599 | +# Check whether --with-sysroot was given. |
3600 | +if test "${with_sysroot+set}" = set; then : |
3601 | + withval=$with_sysroot; |
3602 | +else |
3603 | + with_sysroot=no |
3604 | +fi |
3605 | + |
3606 | + |
3607 | +lt_sysroot= |
3608 | +case ${with_sysroot} in #( |
3609 | + yes) |
3610 | + if test "$GCC" = yes; then |
3611 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
3612 | + fi |
3613 | + ;; #( |
3614 | + /*) |
3615 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
3616 | + ;; #( |
3617 | + no|'') |
3618 | + ;; #( |
3619 | + *) |
3620 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 |
3621 | +$as_echo "${with_sysroot}" >&6; } |
3622 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
3623 | + ;; |
3624 | +esac |
3625 | + |
3626 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
3627 | +$as_echo "${lt_sysroot:-no}" >&6; } |
3628 | |
3629 | |
3630 | |
3631 | @@ -5791,7 +6191,7 @@ |
3632 | CFLAGS="$CFLAGS -belf" |
3633 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 |
3634 | $as_echo_n "checking whether the C compiler needs -belf... " >&6; } |
3635 | -if test "${lt_cv_cc_needs_belf+set}" = set; then : |
3636 | +if ${lt_cv_cc_needs_belf+:} false; then : |
3637 | $as_echo_n "(cached) " >&6 |
3638 | else |
3639 | ac_ext=c |
3640 | @@ -5832,7 +6232,7 @@ |
3641 | CFLAGS="$SAVE_CFLAGS" |
3642 | fi |
3643 | ;; |
3644 | -sparc*-*solaris*) |
3645 | +*-*solaris*) |
3646 | # Find out which ABI we are using. |
3647 | echo 'int i;' > conftest.$ac_ext |
3648 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
3649 | @@ -5843,7 +6243,20 @@ |
3650 | case `/usr/bin/file conftest.o` in |
3651 | *64-bit*) |
3652 | case $lt_cv_prog_gnu_ld in |
3653 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
3654 | + yes*) |
3655 | + case $host in |
3656 | + i?86-*-solaris*) |
3657 | + LD="${LD-ld} -m elf_x86_64" |
3658 | + ;; |
3659 | + sparc*-*-solaris*) |
3660 | + LD="${LD-ld} -m elf64_sparc" |
3661 | + ;; |
3662 | + esac |
3663 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
3664 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
3665 | + LD="${LD-ld}_sol2" |
3666 | + fi |
3667 | + ;; |
3668 | *) |
3669 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
3670 | LD="${LD-ld} -64" |
3671 | @@ -5859,6 +6272,123 @@ |
3672 | |
3673 | need_locks="$enable_libtool_lock" |
3674 | |
3675 | +if test -n "$ac_tool_prefix"; then |
3676 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
3677 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
3678 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3679 | +$as_echo_n "checking for $ac_word... " >&6; } |
3680 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
3681 | + $as_echo_n "(cached) " >&6 |
3682 | +else |
3683 | + if test -n "$MANIFEST_TOOL"; then |
3684 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
3685 | +else |
3686 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3687 | +for as_dir in $PATH |
3688 | +do |
3689 | + IFS=$as_save_IFS |
3690 | + test -z "$as_dir" && as_dir=. |
3691 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3692 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3693 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
3694 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3695 | + break 2 |
3696 | + fi |
3697 | +done |
3698 | + done |
3699 | +IFS=$as_save_IFS |
3700 | + |
3701 | +fi |
3702 | +fi |
3703 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
3704 | +if test -n "$MANIFEST_TOOL"; then |
3705 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
3706 | +$as_echo "$MANIFEST_TOOL" >&6; } |
3707 | +else |
3708 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3709 | +$as_echo "no" >&6; } |
3710 | +fi |
3711 | + |
3712 | + |
3713 | +fi |
3714 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
3715 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
3716 | + # Extract the first word of "mt", so it can be a program name with args. |
3717 | +set dummy mt; ac_word=$2 |
3718 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3719 | +$as_echo_n "checking for $ac_word... " >&6; } |
3720 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
3721 | + $as_echo_n "(cached) " >&6 |
3722 | +else |
3723 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
3724 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
3725 | +else |
3726 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3727 | +for as_dir in $PATH |
3728 | +do |
3729 | + IFS=$as_save_IFS |
3730 | + test -z "$as_dir" && as_dir=. |
3731 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3732 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3733 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
3734 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3735 | + break 2 |
3736 | + fi |
3737 | +done |
3738 | + done |
3739 | +IFS=$as_save_IFS |
3740 | + |
3741 | +fi |
3742 | +fi |
3743 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
3744 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
3745 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
3746 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
3747 | +else |
3748 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3749 | +$as_echo "no" >&6; } |
3750 | +fi |
3751 | + |
3752 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
3753 | + MANIFEST_TOOL=":" |
3754 | + else |
3755 | + case $cross_compiling:$ac_tool_warned in |
3756 | +yes:) |
3757 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3758 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3759 | +ac_tool_warned=yes ;; |
3760 | +esac |
3761 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
3762 | + fi |
3763 | +else |
3764 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
3765 | +fi |
3766 | + |
3767 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
3768 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
3769 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
3770 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
3771 | + $as_echo_n "(cached) " >&6 |
3772 | +else |
3773 | + lt_cv_path_mainfest_tool=no |
3774 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
3775 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
3776 | + cat conftest.err >&5 |
3777 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
3778 | + lt_cv_path_mainfest_tool=yes |
3779 | + fi |
3780 | + rm -f conftest* |
3781 | +fi |
3782 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
3783 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
3784 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
3785 | + MANIFEST_TOOL=: |
3786 | +fi |
3787 | + |
3788 | + |
3789 | + |
3790 | + |
3791 | + |
3792 | |
3793 | case $host_os in |
3794 | rhapsody* | darwin*) |
3795 | @@ -5867,7 +6397,7 @@ |
3796 | set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 |
3797 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3798 | $as_echo_n "checking for $ac_word... " >&6; } |
3799 | -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : |
3800 | +if ${ac_cv_prog_DSYMUTIL+:} false; then : |
3801 | $as_echo_n "(cached) " >&6 |
3802 | else |
3803 | if test -n "$DSYMUTIL"; then |
3804 | @@ -5907,7 +6437,7 @@ |
3805 | set dummy dsymutil; ac_word=$2 |
3806 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3807 | $as_echo_n "checking for $ac_word... " >&6; } |
3808 | -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : |
3809 | +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : |
3810 | $as_echo_n "(cached) " >&6 |
3811 | else |
3812 | if test -n "$ac_ct_DSYMUTIL"; then |
3813 | @@ -5959,7 +6489,7 @@ |
3814 | set dummy ${ac_tool_prefix}nmedit; ac_word=$2 |
3815 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3816 | $as_echo_n "checking for $ac_word... " >&6; } |
3817 | -if test "${ac_cv_prog_NMEDIT+set}" = set; then : |
3818 | +if ${ac_cv_prog_NMEDIT+:} false; then : |
3819 | $as_echo_n "(cached) " >&6 |
3820 | else |
3821 | if test -n "$NMEDIT"; then |
3822 | @@ -5999,7 +6529,7 @@ |
3823 | set dummy nmedit; ac_word=$2 |
3824 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3825 | $as_echo_n "checking for $ac_word... " >&6; } |
3826 | -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : |
3827 | +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : |
3828 | $as_echo_n "(cached) " >&6 |
3829 | else |
3830 | if test -n "$ac_ct_NMEDIT"; then |
3831 | @@ -6051,7 +6581,7 @@ |
3832 | set dummy ${ac_tool_prefix}lipo; ac_word=$2 |
3833 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3834 | $as_echo_n "checking for $ac_word... " >&6; } |
3835 | -if test "${ac_cv_prog_LIPO+set}" = set; then : |
3836 | +if ${ac_cv_prog_LIPO+:} false; then : |
3837 | $as_echo_n "(cached) " >&6 |
3838 | else |
3839 | if test -n "$LIPO"; then |
3840 | @@ -6091,7 +6621,7 @@ |
3841 | set dummy lipo; ac_word=$2 |
3842 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3843 | $as_echo_n "checking for $ac_word... " >&6; } |
3844 | -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : |
3845 | +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : |
3846 | $as_echo_n "(cached) " >&6 |
3847 | else |
3848 | if test -n "$ac_ct_LIPO"; then |
3849 | @@ -6143,7 +6673,7 @@ |
3850 | set dummy ${ac_tool_prefix}otool; ac_word=$2 |
3851 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3852 | $as_echo_n "checking for $ac_word... " >&6; } |
3853 | -if test "${ac_cv_prog_OTOOL+set}" = set; then : |
3854 | +if ${ac_cv_prog_OTOOL+:} false; then : |
3855 | $as_echo_n "(cached) " >&6 |
3856 | else |
3857 | if test -n "$OTOOL"; then |
3858 | @@ -6183,7 +6713,7 @@ |
3859 | set dummy otool; ac_word=$2 |
3860 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3861 | $as_echo_n "checking for $ac_word... " >&6; } |
3862 | -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : |
3863 | +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : |
3864 | $as_echo_n "(cached) " >&6 |
3865 | else |
3866 | if test -n "$ac_ct_OTOOL"; then |
3867 | @@ -6235,7 +6765,7 @@ |
3868 | set dummy ${ac_tool_prefix}otool64; ac_word=$2 |
3869 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3870 | $as_echo_n "checking for $ac_word... " >&6; } |
3871 | -if test "${ac_cv_prog_OTOOL64+set}" = set; then : |
3872 | +if ${ac_cv_prog_OTOOL64+:} false; then : |
3873 | $as_echo_n "(cached) " >&6 |
3874 | else |
3875 | if test -n "$OTOOL64"; then |
3876 | @@ -6275,7 +6805,7 @@ |
3877 | set dummy otool64; ac_word=$2 |
3878 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3879 | $as_echo_n "checking for $ac_word... " >&6; } |
3880 | -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : |
3881 | +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : |
3882 | $as_echo_n "(cached) " >&6 |
3883 | else |
3884 | if test -n "$ac_ct_OTOOL64"; then |
3885 | @@ -6350,7 +6880,7 @@ |
3886 | |
3887 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 |
3888 | $as_echo_n "checking for -single_module linker flag... " >&6; } |
3889 | -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : |
3890 | +if ${lt_cv_apple_cc_single_mod+:} false; then : |
3891 | $as_echo_n "(cached) " >&6 |
3892 | else |
3893 | lt_cv_apple_cc_single_mod=no |
3894 | @@ -6366,7 +6896,13 @@ |
3895 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
3896 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
3897 | _lt_result=$? |
3898 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
3899 | + # If there is a non-empty error log, and "single_module" |
3900 | + # appears in it, assume the flag caused a linker warning |
3901 | + if test -s conftest.err && $GREP single_module conftest.err; then |
3902 | + cat conftest.err >&5 |
3903 | + # Otherwise, if the output was created with a 0 exit code from |
3904 | + # the compiler, it worked. |
3905 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
3906 | lt_cv_apple_cc_single_mod=yes |
3907 | else |
3908 | cat conftest.err >&5 |
3909 | @@ -6377,9 +6913,10 @@ |
3910 | fi |
3911 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 |
3912 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
3913 | + |
3914 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
3915 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
3916 | -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : |
3917 | +if ${lt_cv_ld_exported_symbols_list+:} false; then : |
3918 | $as_echo_n "(cached) " >&6 |
3919 | else |
3920 | lt_cv_ld_exported_symbols_list=no |
3921 | @@ -6409,9 +6946,10 @@ |
3922 | fi |
3923 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
3924 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
3925 | + |
3926 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
3927 | $as_echo_n "checking for -force_load linker flag... " >&6; } |
3928 | -if test "${lt_cv_ld_force_load+set}" = set; then : |
3929 | +if ${lt_cv_ld_force_load+:} false; then : |
3930 | $as_echo_n "(cached) " >&6 |
3931 | else |
3932 | lt_cv_ld_force_load=no |
3933 | @@ -6430,7 +6968,9 @@ |
3934 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
3935 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
3936 | _lt_result=$? |
3937 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
3938 | + if test -s conftest.err && $GREP force_load conftest.err; then |
3939 | + cat conftest.err >&5 |
3940 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
3941 | lt_cv_ld_force_load=yes |
3942 | else |
3943 | cat conftest.err >&5 |
3944 | @@ -6488,7 +7028,7 @@ |
3945 | CPP= |
3946 | fi |
3947 | if test -z "$CPP"; then |
3948 | - if test "${ac_cv_prog_CPP+set}" = set; then : |
3949 | + if ${ac_cv_prog_CPP+:} false; then : |
3950 | $as_echo_n "(cached) " >&6 |
3951 | else |
3952 | # Double quotes because CPP needs to be expanded |
3953 | @@ -6518,7 +7058,7 @@ |
3954 | # Broken: fails on valid input. |
3955 | continue |
3956 | fi |
3957 | -rm -f conftest.err conftest.$ac_ext |
3958 | +rm -f conftest.err conftest.i conftest.$ac_ext |
3959 | |
3960 | # OK, works on sane cases. Now check whether nonexistent headers |
3961 | # can be detected and how. |
3962 | @@ -6534,11 +7074,11 @@ |
3963 | ac_preproc_ok=: |
3964 | break |
3965 | fi |
3966 | -rm -f conftest.err conftest.$ac_ext |
3967 | +rm -f conftest.err conftest.i conftest.$ac_ext |
3968 | |
3969 | done |
3970 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
3971 | -rm -f conftest.err conftest.$ac_ext |
3972 | +rm -f conftest.i conftest.err conftest.$ac_ext |
3973 | if $ac_preproc_ok; then : |
3974 | break |
3975 | fi |
3976 | @@ -6577,7 +7117,7 @@ |
3977 | # Broken: fails on valid input. |
3978 | continue |
3979 | fi |
3980 | -rm -f conftest.err conftest.$ac_ext |
3981 | +rm -f conftest.err conftest.i conftest.$ac_ext |
3982 | |
3983 | # OK, works on sane cases. Now check whether nonexistent headers |
3984 | # can be detected and how. |
3985 | @@ -6593,11 +7133,11 @@ |
3986 | ac_preproc_ok=: |
3987 | break |
3988 | fi |
3989 | -rm -f conftest.err conftest.$ac_ext |
3990 | +rm -f conftest.err conftest.i conftest.$ac_ext |
3991 | |
3992 | done |
3993 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
3994 | -rm -f conftest.err conftest.$ac_ext |
3995 | +rm -f conftest.i conftest.err conftest.$ac_ext |
3996 | if $ac_preproc_ok; then : |
3997 | |
3998 | else |
3999 | @@ -6616,7 +7156,7 @@ |
4000 | |
4001 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
4002 | $as_echo_n "checking for ANSI C header files... " >&6; } |
4003 | -if test "${ac_cv_header_stdc+set}" = set; then : |
4004 | +if ${ac_cv_header_stdc+:} false; then : |
4005 | $as_echo_n "(cached) " >&6 |
4006 | else |
4007 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4008 | @@ -6747,7 +7287,7 @@ |
4009 | do : |
4010 | ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default |
4011 | " |
4012 | -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : |
4013 | +if test "x$ac_cv_header_dlfcn_h" = xyes; then : |
4014 | cat >>confdefs.h <<_ACEOF |
4015 | #define HAVE_DLFCN_H 1 |
4016 | _ACEOF |
4017 | @@ -6835,7 +7375,22 @@ |
4018 | |
4019 | # Check whether --with-pic was given. |
4020 | if test "${with_pic+set}" = set; then : |
4021 | - withval=$with_pic; pic_mode="$withval" |
4022 | + withval=$with_pic; lt_p=${PACKAGE-default} |
4023 | + case $withval in |
4024 | + yes|no) pic_mode=$withval ;; |
4025 | + *) |
4026 | + pic_mode=default |
4027 | + # Look at the argument we got. We use all the common list separators. |
4028 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
4029 | + for lt_pkg in $withval; do |
4030 | + IFS="$lt_save_ifs" |
4031 | + if test "X$lt_pkg" = "X$lt_p"; then |
4032 | + pic_mode=yes |
4033 | + fi |
4034 | + done |
4035 | + IFS="$lt_save_ifs" |
4036 | + ;; |
4037 | + esac |
4038 | else |
4039 | pic_mode=default |
4040 | fi |
4041 | @@ -6913,6 +7468,10 @@ |
4042 | |
4043 | |
4044 | |
4045 | + |
4046 | + |
4047 | + |
4048 | + |
4049 | test -z "$LN_S" && LN_S="ln -s" |
4050 | |
4051 | |
4052 | @@ -6934,7 +7493,7 @@ |
4053 | |
4054 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 |
4055 | $as_echo_n "checking for objdir... " >&6; } |
4056 | -if test "${lt_cv_objdir+set}" = set; then : |
4057 | +if ${lt_cv_objdir+:} false; then : |
4058 | $as_echo_n "(cached) " >&6 |
4059 | else |
4060 | rm -f .libs 2>/dev/null |
4061 | @@ -7012,7 +7571,7 @@ |
4062 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
4063 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 |
4064 | $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } |
4065 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : |
4066 | +if ${lt_cv_path_MAGIC_CMD+:} false; then : |
4067 | $as_echo_n "(cached) " >&6 |
4068 | else |
4069 | case $MAGIC_CMD in |
4070 | @@ -7078,7 +7637,7 @@ |
4071 | if test -n "$ac_tool_prefix"; then |
4072 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 |
4073 | $as_echo_n "checking for file... " >&6; } |
4074 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : |
4075 | +if ${lt_cv_path_MAGIC_CMD+:} false; then : |
4076 | $as_echo_n "(cached) " >&6 |
4077 | else |
4078 | case $MAGIC_CMD in |
4079 | @@ -7220,7 +7779,7 @@ |
4080 | |
4081 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
4082 | $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } |
4083 | -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : |
4084 | +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : |
4085 | $as_echo_n "(cached) " >&6 |
4086 | else |
4087 | lt_cv_prog_compiler_rtti_exceptions=no |
4088 | @@ -7273,8 +7832,6 @@ |
4089 | lt_prog_compiler_pic= |
4090 | lt_prog_compiler_static= |
4091 | |
4092 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
4093 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4094 | |
4095 | if test "$GCC" = yes; then |
4096 | lt_prog_compiler_wl='-Wl,' |
4097 | @@ -7374,7 +7931,9 @@ |
4098 | case $cc_basename in |
4099 | nvcc*) # Cuda Compiler Driver 2.2 |
4100 | lt_prog_compiler_wl='-Xlinker ' |
4101 | - lt_prog_compiler_pic='-Xcompiler -fPIC' |
4102 | + if test -n "$lt_prog_compiler_pic"; then |
4103 | + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" |
4104 | + fi |
4105 | ;; |
4106 | esac |
4107 | else |
4108 | @@ -7439,6 +7998,12 @@ |
4109 | lt_prog_compiler_pic='--shared' |
4110 | lt_prog_compiler_static='--static' |
4111 | ;; |
4112 | + nagfor*) |
4113 | + # NAG Fortran compiler |
4114 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
4115 | + lt_prog_compiler_pic='-PIC' |
4116 | + lt_prog_compiler_static='-Bstatic' |
4117 | + ;; |
4118 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
4119 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4120 | # which looks to be a dead project) |
4121 | @@ -7459,18 +8024,33 @@ |
4122 | ;; |
4123 | *) |
4124 | case `$CC -V 2>&1 | sed 5q` in |
4125 | - *Sun\ F* | *Sun*Fortran*) |
4126 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) |
4127 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4128 | lt_prog_compiler_pic='-KPIC' |
4129 | lt_prog_compiler_static='-Bstatic' |
4130 | lt_prog_compiler_wl='' |
4131 | ;; |
4132 | + *Sun\ F* | *Sun*Fortran*) |
4133 | + lt_prog_compiler_pic='-KPIC' |
4134 | + lt_prog_compiler_static='-Bstatic' |
4135 | + lt_prog_compiler_wl='-Qoption ld ' |
4136 | + ;; |
4137 | *Sun\ C*) |
4138 | # Sun C 5.9 |
4139 | lt_prog_compiler_pic='-KPIC' |
4140 | lt_prog_compiler_static='-Bstatic' |
4141 | lt_prog_compiler_wl='-Wl,' |
4142 | ;; |
4143 | + *Intel*\ [CF]*Compiler*) |
4144 | + lt_prog_compiler_wl='-Wl,' |
4145 | + lt_prog_compiler_pic='-fPIC' |
4146 | + lt_prog_compiler_static='-static' |
4147 | + ;; |
4148 | + *Portland\ Group*) |
4149 | + lt_prog_compiler_wl='-Wl,' |
4150 | + lt_prog_compiler_pic='-fpic' |
4151 | + lt_prog_compiler_static='-Bstatic' |
4152 | + ;; |
4153 | esac |
4154 | ;; |
4155 | esac |
4156 | @@ -7558,13 +8138,17 @@ |
4157 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
4158 | ;; |
4159 | esac |
4160 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
4161 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
4162 | - |
4163 | - |
4164 | - |
4165 | - |
4166 | - |
4167 | + |
4168 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
4169 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4170 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
4171 | + $as_echo_n "(cached) " >&6 |
4172 | +else |
4173 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
4174 | +fi |
4175 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
4176 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
4177 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
4178 | |
4179 | # |
4180 | # Check to make sure the PIC flag actually works. |
4181 | @@ -7572,7 +8156,7 @@ |
4182 | if test -n "$lt_prog_compiler_pic"; then |
4183 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 |
4184 | $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } |
4185 | -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : |
4186 | +if ${lt_cv_prog_compiler_pic_works+:} false; then : |
4187 | $as_echo_n "(cached) " >&6 |
4188 | else |
4189 | lt_cv_prog_compiler_pic_works=no |
4190 | @@ -7625,13 +8209,18 @@ |
4191 | |
4192 | |
4193 | |
4194 | + |
4195 | + |
4196 | + |
4197 | + |
4198 | + |
4199 | # |
4200 | # Check to make sure the static flag actually works. |
4201 | # |
4202 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" |
4203 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
4204 | $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } |
4205 | -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : |
4206 | +if ${lt_cv_prog_compiler_static_works+:} false; then : |
4207 | $as_echo_n "(cached) " >&6 |
4208 | else |
4209 | lt_cv_prog_compiler_static_works=no |
4210 | @@ -7674,7 +8263,7 @@ |
4211 | |
4212 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 |
4213 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
4214 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : |
4215 | +if ${lt_cv_prog_compiler_c_o+:} false; then : |
4216 | $as_echo_n "(cached) " >&6 |
4217 | else |
4218 | lt_cv_prog_compiler_c_o=no |
4219 | @@ -7729,7 +8318,7 @@ |
4220 | |
4221 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 |
4222 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
4223 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : |
4224 | +if ${lt_cv_prog_compiler_c_o+:} false; then : |
4225 | $as_echo_n "(cached) " >&6 |
4226 | else |
4227 | lt_cv_prog_compiler_c_o=no |
4228 | @@ -7823,7 +8412,6 @@ |
4229 | hardcode_direct=no |
4230 | hardcode_direct_absolute=no |
4231 | hardcode_libdir_flag_spec= |
4232 | - hardcode_libdir_flag_spec_ld= |
4233 | hardcode_libdir_separator= |
4234 | hardcode_minus_L=no |
4235 | hardcode_shlibpath_var=unsupported |
4236 | @@ -7975,7 +8563,8 @@ |
4237 | allow_undefined_flag=unsupported |
4238 | always_export_symbols=no |
4239 | enable_shared_with_static_runtimes=yes |
4240 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
4241 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
4242 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
4243 | |
4244 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4245 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4246 | @@ -8023,7 +8612,7 @@ |
4247 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
4248 | && test "$tmp_diet" = no |
4249 | then |
4250 | - tmp_addflag= |
4251 | + tmp_addflag=' $pic_flag' |
4252 | tmp_sharedflag='-shared' |
4253 | case $cc_basename,$host_cpu in |
4254 | pgcc*) # Portland Group C compiler |
4255 | @@ -8072,8 +8661,7 @@ |
4256 | xlf* | bgf* | bgxlf* | mpixlf*) |
4257 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
4258 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
4259 | - hardcode_libdir_flag_spec= |
4260 | - hardcode_libdir_flag_spec_ld='-rpath $libdir' |
4261 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4262 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
4263 | if test "x$supports_anon_versioning" = xyes; then |
4264 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
4265 | @@ -8093,8 +8681,8 @@ |
4266 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4267 | wlarc= |
4268 | else |
4269 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4270 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4271 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4272 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4273 | fi |
4274 | ;; |
4275 | |
4276 | @@ -8112,8 +8700,8 @@ |
4277 | |
4278 | _LT_EOF |
4279 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4280 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4281 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4282 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4283 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4284 | else |
4285 | ld_shlibs=no |
4286 | fi |
4287 | @@ -8159,8 +8747,8 @@ |
4288 | |
4289 | *) |
4290 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4291 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4292 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4293 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4294 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4295 | else |
4296 | ld_shlibs=no |
4297 | fi |
4298 | @@ -8290,7 +8878,13 @@ |
4299 | allow_undefined_flag='-berok' |
4300 | # Determine the default libpath from the value encoded in an |
4301 | # empty executable. |
4302 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4303 | + if test "${lt_cv_aix_libpath+set}" = set; then |
4304 | + aix_libpath=$lt_cv_aix_libpath |
4305 | +else |
4306 | + if ${lt_cv_aix_libpath_+:} false; then : |
4307 | + $as_echo_n "(cached) " >&6 |
4308 | +else |
4309 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4310 | /* end confdefs.h. */ |
4311 | |
4312 | int |
4313 | @@ -8303,22 +8897,29 @@ |
4314 | _ACEOF |
4315 | if ac_fn_c_try_link "$LINENO"; then : |
4316 | |
4317 | -lt_aix_libpath_sed=' |
4318 | - /Import File Strings/,/^$/ { |
4319 | - /^0/ { |
4320 | - s/^0 *\(.*\)$/\1/ |
4321 | - p |
4322 | - } |
4323 | - }' |
4324 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4325 | -# Check for a 64-bit object if we didn't find anything. |
4326 | -if test -z "$aix_libpath"; then |
4327 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4328 | -fi |
4329 | + lt_aix_libpath_sed=' |
4330 | + /Import File Strings/,/^$/ { |
4331 | + /^0/ { |
4332 | + s/^0 *\([^ ]*\) *$/\1/ |
4333 | + p |
4334 | + } |
4335 | + }' |
4336 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4337 | + # Check for a 64-bit object if we didn't find anything. |
4338 | + if test -z "$lt_cv_aix_libpath_"; then |
4339 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4340 | + fi |
4341 | fi |
4342 | rm -f core conftest.err conftest.$ac_objext \ |
4343 | conftest$ac_exeext conftest.$ac_ext |
4344 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4345 | + if test -z "$lt_cv_aix_libpath_"; then |
4346 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
4347 | + fi |
4348 | + |
4349 | +fi |
4350 | + |
4351 | + aix_libpath=$lt_cv_aix_libpath_ |
4352 | +fi |
4353 | |
4354 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4355 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4356 | @@ -8330,7 +8931,13 @@ |
4357 | else |
4358 | # Determine the default libpath from the value encoded in an |
4359 | # empty executable. |
4360 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4361 | + if test "${lt_cv_aix_libpath+set}" = set; then |
4362 | + aix_libpath=$lt_cv_aix_libpath |
4363 | +else |
4364 | + if ${lt_cv_aix_libpath_+:} false; then : |
4365 | + $as_echo_n "(cached) " >&6 |
4366 | +else |
4367 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4368 | /* end confdefs.h. */ |
4369 | |
4370 | int |
4371 | @@ -8343,22 +8950,29 @@ |
4372 | _ACEOF |
4373 | if ac_fn_c_try_link "$LINENO"; then : |
4374 | |
4375 | -lt_aix_libpath_sed=' |
4376 | - /Import File Strings/,/^$/ { |
4377 | - /^0/ { |
4378 | - s/^0 *\(.*\)$/\1/ |
4379 | - p |
4380 | - } |
4381 | - }' |
4382 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4383 | -# Check for a 64-bit object if we didn't find anything. |
4384 | -if test -z "$aix_libpath"; then |
4385 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4386 | -fi |
4387 | + lt_aix_libpath_sed=' |
4388 | + /Import File Strings/,/^$/ { |
4389 | + /^0/ { |
4390 | + s/^0 *\([^ ]*\) *$/\1/ |
4391 | + p |
4392 | + } |
4393 | + }' |
4394 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4395 | + # Check for a 64-bit object if we didn't find anything. |
4396 | + if test -z "$lt_cv_aix_libpath_"; then |
4397 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4398 | + fi |
4399 | fi |
4400 | rm -f core conftest.err conftest.$ac_objext \ |
4401 | conftest$ac_exeext conftest.$ac_ext |
4402 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4403 | + if test -z "$lt_cv_aix_libpath_"; then |
4404 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
4405 | + fi |
4406 | + |
4407 | +fi |
4408 | + |
4409 | + aix_libpath=$lt_cv_aix_libpath_ |
4410 | +fi |
4411 | |
4412 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4413 | # Warning - without using the other run time loading flags, |
4414 | @@ -8403,20 +9017,64 @@ |
4415 | # Microsoft Visual C++. |
4416 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
4417 | # no search path for DLLs. |
4418 | - hardcode_libdir_flag_spec=' ' |
4419 | - allow_undefined_flag=unsupported |
4420 | - # Tell ltmain to make .lib files, not .a files. |
4421 | - libext=lib |
4422 | - # Tell ltmain to make .dll files, not .so files. |
4423 | - shrext_cmds=".dll" |
4424 | - # FIXME: Setting linknames here is a bad hack. |
4425 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
4426 | - # The linker will automatically build a .lib file if we build a DLL. |
4427 | - old_archive_from_new_cmds='true' |
4428 | - # FIXME: Should let the user specify the lib program. |
4429 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4430 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
4431 | - enable_shared_with_static_runtimes=yes |
4432 | + case $cc_basename in |
4433 | + cl*) |
4434 | + # Native MSVC |
4435 | + hardcode_libdir_flag_spec=' ' |
4436 | + allow_undefined_flag=unsupported |
4437 | + always_export_symbols=yes |
4438 | + file_list_spec='@' |
4439 | + # Tell ltmain to make .lib files, not .a files. |
4440 | + libext=lib |
4441 | + # Tell ltmain to make .dll files, not .so files. |
4442 | + shrext_cmds=".dll" |
4443 | + # FIXME: Setting linknames here is a bad hack. |
4444 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
4445 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4446 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
4447 | + else |
4448 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
4449 | + fi~ |
4450 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
4451 | + linknames=' |
4452 | + # The linker will not automatically build a static lib if we build a DLL. |
4453 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
4454 | + enable_shared_with_static_runtimes=yes |
4455 | + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
4456 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
4457 | + # Don't use ranlib |
4458 | + old_postinstall_cmds='chmod 644 $oldlib' |
4459 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
4460 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
4461 | + case $lt_outputfile in |
4462 | + *.exe|*.EXE) ;; |
4463 | + *) |
4464 | + lt_outputfile="$lt_outputfile.exe" |
4465 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
4466 | + ;; |
4467 | + esac~ |
4468 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
4469 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
4470 | + $RM "$lt_outputfile.manifest"; |
4471 | + fi' |
4472 | + ;; |
4473 | + *) |
4474 | + # Assume MSVC wrapper |
4475 | + hardcode_libdir_flag_spec=' ' |
4476 | + allow_undefined_flag=unsupported |
4477 | + # Tell ltmain to make .lib files, not .a files. |
4478 | + libext=lib |
4479 | + # Tell ltmain to make .dll files, not .so files. |
4480 | + shrext_cmds=".dll" |
4481 | + # FIXME: Setting linknames here is a bad hack. |
4482 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
4483 | + # The linker will automatically build a .lib file if we build a DLL. |
4484 | + old_archive_from_new_cmds='true' |
4485 | + # FIXME: Should let the user specify the lib program. |
4486 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4487 | + enable_shared_with_static_runtimes=yes |
4488 | + ;; |
4489 | + esac |
4490 | ;; |
4491 | |
4492 | darwin* | rhapsody*) |
4493 | @@ -8428,6 +9086,7 @@ |
4494 | hardcode_shlibpath_var=unsupported |
4495 | if test "$lt_cv_ld_force_load" = "yes"; then |
4496 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
4497 | + |
4498 | else |
4499 | whole_archive_flag_spec='' |
4500 | fi |
4501 | @@ -8456,10 +9115,6 @@ |
4502 | hardcode_shlibpath_var=no |
4503 | ;; |
4504 | |
4505 | - freebsd1*) |
4506 | - ld_shlibs=no |
4507 | - ;; |
4508 | - |
4509 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
4510 | # support. Future versions do this automatically, but an explicit c++rt0.o |
4511 | # does not break anything, and helps significantly (at the cost of a little |
4512 | @@ -8472,7 +9127,7 @@ |
4513 | ;; |
4514 | |
4515 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
4516 | - freebsd2*) |
4517 | + freebsd2.*) |
4518 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
4519 | hardcode_direct=yes |
4520 | hardcode_minus_L=yes |
4521 | @@ -8481,7 +9136,7 @@ |
4522 | |
4523 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
4524 | freebsd* | dragonfly*) |
4525 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
4526 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
4527 | hardcode_libdir_flag_spec='-R$libdir' |
4528 | hardcode_direct=yes |
4529 | hardcode_shlibpath_var=no |
4530 | @@ -8489,7 +9144,7 @@ |
4531 | |
4532 | hpux9*) |
4533 | if test "$GCC" = yes; then |
4534 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4535 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4536 | else |
4537 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4538 | fi |
4539 | @@ -8505,13 +9160,12 @@ |
4540 | |
4541 | hpux10*) |
4542 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4543 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4544 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4545 | else |
4546 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4547 | fi |
4548 | if test "$with_gnu_ld" = no; then |
4549 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
4550 | - hardcode_libdir_flag_spec_ld='+b $libdir' |
4551 | hardcode_libdir_separator=: |
4552 | hardcode_direct=yes |
4553 | hardcode_direct_absolute=yes |
4554 | @@ -8529,10 +9183,10 @@ |
4555 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4556 | ;; |
4557 | ia64*) |
4558 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4559 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4560 | ;; |
4561 | *) |
4562 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4563 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4564 | ;; |
4565 | esac |
4566 | else |
4567 | @@ -8549,7 +9203,7 @@ |
4568 | # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) |
4569 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 |
4570 | $as_echo_n "checking if $CC understands -b... " >&6; } |
4571 | -if test "${lt_cv_prog_compiler__b+set}" = set; then : |
4572 | +if ${lt_cv_prog_compiler__b+:} false; then : |
4573 | $as_echo_n "(cached) " >&6 |
4574 | else |
4575 | lt_cv_prog_compiler__b=no |
4576 | @@ -8611,23 +9265,36 @@ |
4577 | |
4578 | irix5* | irix6* | nonstopux*) |
4579 | if test "$GCC" = yes; then |
4580 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4581 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4582 | # Try to use the -exported_symbol ld option, if it does not |
4583 | # work, assume that -exports_file does not work either and |
4584 | # implicitly export all symbols. |
4585 | - save_LDFLAGS="$LDFLAGS" |
4586 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
4587 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4588 | + # This should be the same for all languages, so no per-tag cache variable. |
4589 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
4590 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
4591 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
4592 | + $as_echo_n "(cached) " >&6 |
4593 | +else |
4594 | + save_LDFLAGS="$LDFLAGS" |
4595 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
4596 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4597 | /* end confdefs.h. */ |
4598 | -int foo(void) {} |
4599 | +int foo (void) { return 0; } |
4600 | _ACEOF |
4601 | if ac_fn_c_try_link "$LINENO"; then : |
4602 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4603 | - |
4604 | + lt_cv_irix_exported_symbol=yes |
4605 | +else |
4606 | + lt_cv_irix_exported_symbol=no |
4607 | fi |
4608 | rm -f core conftest.err conftest.$ac_objext \ |
4609 | conftest$ac_exeext conftest.$ac_ext |
4610 | - LDFLAGS="$save_LDFLAGS" |
4611 | + LDFLAGS="$save_LDFLAGS" |
4612 | +fi |
4613 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
4614 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
4615 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
4616 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4617 | + fi |
4618 | else |
4619 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4620 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
4621 | @@ -8712,7 +9379,7 @@ |
4622 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
4623 | if test "$GCC" = yes; then |
4624 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
4625 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4626 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4627 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4628 | else |
4629 | allow_undefined_flag=' -expect_unresolved \*' |
4630 | @@ -8731,9 +9398,9 @@ |
4631 | no_undefined_flag=' -z defs' |
4632 | if test "$GCC" = yes; then |
4633 | wlarc='${wl}' |
4634 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4635 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4636 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
4637 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
4638 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
4639 | else |
4640 | case `$CC -V 2>&1` in |
4641 | *"Compilers 5.0"*) |
4642 | @@ -8921,7 +9588,7 @@ |
4643 | # to ld, don't add -lc before -lgcc. |
4644 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 |
4645 | $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } |
4646 | -if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : |
4647 | +if ${lt_cv_archive_cmds_need_lc+:} false; then : |
4648 | $as_echo_n "(cached) " >&6 |
4649 | else |
4650 | $RM conftest* |
4651 | @@ -9122,11 +9789,6 @@ |
4652 | |
4653 | |
4654 | |
4655 | - |
4656 | - |
4657 | - |
4658 | - |
4659 | - |
4660 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
4661 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
4662 | |
4663 | @@ -9216,7 +9878,7 @@ |
4664 | |
4665 | case $host_os in |
4666 | aix3*) |
4667 | - version_type=linux |
4668 | + version_type=linux # correct to gnu/linux during the next big refactor |
4669 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
4670 | shlibpath_var=LIBPATH |
4671 | |
4672 | @@ -9225,7 +9887,7 @@ |
4673 | ;; |
4674 | |
4675 | aix[4-9]*) |
4676 | - version_type=linux |
4677 | + version_type=linux # correct to gnu/linux during the next big refactor |
4678 | need_lib_prefix=no |
4679 | need_version=no |
4680 | hardcode_into_libs=yes |
4681 | @@ -9290,7 +9952,7 @@ |
4682 | ;; |
4683 | |
4684 | bsdi[45]*) |
4685 | - version_type=linux |
4686 | + version_type=linux # correct to gnu/linux during the next big refactor |
4687 | need_version=no |
4688 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4689 | soname_spec='${libname}${release}${shared_ext}$major' |
4690 | @@ -9309,8 +9971,9 @@ |
4691 | need_version=no |
4692 | need_lib_prefix=no |
4693 | |
4694 | - case $GCC,$host_os in |
4695 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
4696 | + case $GCC,$cc_basename in |
4697 | + yes,*) |
4698 | + # gcc |
4699 | library_names_spec='$libname.dll.a' |
4700 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
4701 | postinstall_cmds='base_file=`basename \${file}`~ |
4702 | @@ -9343,13 +10006,71 @@ |
4703 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
4704 | ;; |
4705 | esac |
4706 | + dynamic_linker='Win32 ld.exe' |
4707 | + ;; |
4708 | + |
4709 | + *,cl*) |
4710 | + # Native MSVC |
4711 | + libname_spec='$name' |
4712 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
4713 | + library_names_spec='${libname}.dll.lib' |
4714 | + |
4715 | + case $build_os in |
4716 | + mingw*) |
4717 | + sys_lib_search_path_spec= |
4718 | + lt_save_ifs=$IFS |
4719 | + IFS=';' |
4720 | + for lt_path in $LIB |
4721 | + do |
4722 | + IFS=$lt_save_ifs |
4723 | + # Let DOS variable expansion print the short 8.3 style file name. |
4724 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
4725 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
4726 | + done |
4727 | + IFS=$lt_save_ifs |
4728 | + # Convert to MSYS style. |
4729 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
4730 | + ;; |
4731 | + cygwin*) |
4732 | + # Convert to unix form, then to dos form, then back to unix form |
4733 | + # but this time dos style (no spaces!) so that the unix form looks |
4734 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
4735 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
4736 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
4737 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
4738 | + ;; |
4739 | + *) |
4740 | + sys_lib_search_path_spec="$LIB" |
4741 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
4742 | + # It is most probably a Windows format PATH. |
4743 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
4744 | + else |
4745 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
4746 | + fi |
4747 | + # FIXME: find the short name or the path components, as spaces are |
4748 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
4749 | + ;; |
4750 | + esac |
4751 | + |
4752 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
4753 | + postinstall_cmds='base_file=`basename \${file}`~ |
4754 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
4755 | + dldir=$destdir/`dirname \$dlpath`~ |
4756 | + test -d \$dldir || mkdir -p \$dldir~ |
4757 | + $install_prog $dir/$dlname \$dldir/$dlname' |
4758 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
4759 | + dlpath=$dir/\$dldll~ |
4760 | + $RM \$dlpath' |
4761 | + shlibpath_overrides_runpath=yes |
4762 | + dynamic_linker='Win32 link.exe' |
4763 | ;; |
4764 | |
4765 | *) |
4766 | + # Assume MSVC wrapper |
4767 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
4768 | + dynamic_linker='Win32 ld.exe' |
4769 | ;; |
4770 | esac |
4771 | - dynamic_linker='Win32 ld.exe' |
4772 | # FIXME: first we should search . and the directory the executable is in |
4773 | shlibpath_var=PATH |
4774 | ;; |
4775 | @@ -9370,7 +10091,7 @@ |
4776 | ;; |
4777 | |
4778 | dgux*) |
4779 | - version_type=linux |
4780 | + version_type=linux # correct to gnu/linux during the next big refactor |
4781 | need_lib_prefix=no |
4782 | need_version=no |
4783 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
4784 | @@ -9378,10 +10099,6 @@ |
4785 | shlibpath_var=LD_LIBRARY_PATH |
4786 | ;; |
4787 | |
4788 | -freebsd1*) |
4789 | - dynamic_linker=no |
4790 | - ;; |
4791 | - |
4792 | freebsd* | dragonfly*) |
4793 | # DragonFly does not have aout. When/if they implement a new |
4794 | # versioning mechanism, adjust this. |
4795 | @@ -9389,7 +10106,7 @@ |
4796 | objformat=`/usr/bin/objformat` |
4797 | else |
4798 | case $host_os in |
4799 | - freebsd[123]*) objformat=aout ;; |
4800 | + freebsd[23].*) objformat=aout ;; |
4801 | *) objformat=elf ;; |
4802 | esac |
4803 | fi |
4804 | @@ -9407,7 +10124,7 @@ |
4805 | esac |
4806 | shlibpath_var=LD_LIBRARY_PATH |
4807 | case $host_os in |
4808 | - freebsd2*) |
4809 | + freebsd2.*) |
4810 | shlibpath_overrides_runpath=yes |
4811 | ;; |
4812 | freebsd3.[01]* | freebsdelf3.[01]*) |
4813 | @@ -9427,17 +10144,18 @@ |
4814 | ;; |
4815 | |
4816 | gnu*) |
4817 | - version_type=linux |
4818 | + version_type=linux # correct to gnu/linux during the next big refactor |
4819 | need_lib_prefix=no |
4820 | need_version=no |
4821 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
4822 | soname_spec='${libname}${release}${shared_ext}$major' |
4823 | shlibpath_var=LD_LIBRARY_PATH |
4824 | + shlibpath_overrides_runpath=no |
4825 | hardcode_into_libs=yes |
4826 | ;; |
4827 | |
4828 | haiku*) |
4829 | - version_type=linux |
4830 | + version_type=linux # correct to gnu/linux during the next big refactor |
4831 | need_lib_prefix=no |
4832 | need_version=no |
4833 | dynamic_linker="$host_os runtime_loader" |
4834 | @@ -9498,7 +10216,7 @@ |
4835 | ;; |
4836 | |
4837 | interix[3-9]*) |
4838 | - version_type=linux |
4839 | + version_type=linux # correct to gnu/linux during the next big refactor |
4840 | need_lib_prefix=no |
4841 | need_version=no |
4842 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
4843 | @@ -9514,7 +10232,7 @@ |
4844 | nonstopux*) version_type=nonstopux ;; |
4845 | *) |
4846 | if test "$lt_cv_prog_gnu_ld" = yes; then |
4847 | - version_type=linux |
4848 | + version_type=linux # correct to gnu/linux during the next big refactor |
4849 | else |
4850 | version_type=irix |
4851 | fi ;; |
4852 | @@ -9551,9 +10269,9 @@ |
4853 | dynamic_linker=no |
4854 | ;; |
4855 | |
4856 | -# This must be Linux ELF. |
4857 | +# This must be glibc/ELF. |
4858 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4859 | - version_type=linux |
4860 | + version_type=linux # correct to gnu/linux during the next big refactor |
4861 | need_lib_prefix=no |
4862 | need_version=no |
4863 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4864 | @@ -9563,7 +10281,7 @@ |
4865 | shlibpath_overrides_runpath=no |
4866 | |
4867 | # Some binutils ld are patched to set DT_RUNPATH |
4868 | - if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : |
4869 | + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : |
4870 | $as_echo_n "(cached) " >&6 |
4871 | else |
4872 | lt_cv_shlibpath_overrides_runpath=no |
4873 | @@ -9639,7 +10357,7 @@ |
4874 | ;; |
4875 | |
4876 | newsos6) |
4877 | - version_type=linux |
4878 | + version_type=linux # correct to gnu/linux during the next big refactor |
4879 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4880 | shlibpath_var=LD_LIBRARY_PATH |
4881 | shlibpath_overrides_runpath=yes |
4882 | @@ -9708,7 +10426,7 @@ |
4883 | ;; |
4884 | |
4885 | solaris*) |
4886 | - version_type=linux |
4887 | + version_type=linux # correct to gnu/linux during the next big refactor |
4888 | need_lib_prefix=no |
4889 | need_version=no |
4890 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4891 | @@ -9733,7 +10451,7 @@ |
4892 | ;; |
4893 | |
4894 | sysv4 | sysv4.3*) |
4895 | - version_type=linux |
4896 | + version_type=linux # correct to gnu/linux during the next big refactor |
4897 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4898 | soname_spec='${libname}${release}${shared_ext}$major' |
4899 | shlibpath_var=LD_LIBRARY_PATH |
4900 | @@ -9757,7 +10475,7 @@ |
4901 | |
4902 | sysv4*MP*) |
4903 | if test -d /usr/nec ;then |
4904 | - version_type=linux |
4905 | + version_type=linux # correct to gnu/linux during the next big refactor |
4906 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
4907 | soname_spec='$libname${shared_ext}.$major' |
4908 | shlibpath_var=LD_LIBRARY_PATH |
4909 | @@ -9788,7 +10506,7 @@ |
4910 | |
4911 | tpf*) |
4912 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
4913 | - version_type=linux |
4914 | + version_type=linux # correct to gnu/linux during the next big refactor |
4915 | need_lib_prefix=no |
4916 | need_version=no |
4917 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4918 | @@ -9798,7 +10516,7 @@ |
4919 | ;; |
4920 | |
4921 | uts4*) |
4922 | - version_type=linux |
4923 | + version_type=linux # correct to gnu/linux during the next big refactor |
4924 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4925 | soname_spec='${libname}${release}${shared_ext}$major' |
4926 | shlibpath_var=LD_LIBRARY_PATH |
4927 | @@ -9987,7 +10705,7 @@ |
4928 | # if libdl is installed we need to link against it |
4929 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 |
4930 | $as_echo_n "checking for dlopen in -ldl... " >&6; } |
4931 | -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : |
4932 | +if ${ac_cv_lib_dl_dlopen+:} false; then : |
4933 | $as_echo_n "(cached) " >&6 |
4934 | else |
4935 | ac_check_lib_save_LIBS=$LIBS |
4936 | @@ -10021,7 +10739,7 @@ |
4937 | fi |
4938 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 |
4939 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
4940 | -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : |
4941 | +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : |
4942 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
4943 | else |
4944 | |
4945 | @@ -10035,12 +10753,12 @@ |
4946 | |
4947 | *) |
4948 | ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" |
4949 | -if test "x$ac_cv_func_shl_load" = x""yes; then : |
4950 | +if test "x$ac_cv_func_shl_load" = xyes; then : |
4951 | lt_cv_dlopen="shl_load" |
4952 | else |
4953 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 |
4954 | $as_echo_n "checking for shl_load in -ldld... " >&6; } |
4955 | -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : |
4956 | +if ${ac_cv_lib_dld_shl_load+:} false; then : |
4957 | $as_echo_n "(cached) " >&6 |
4958 | else |
4959 | ac_check_lib_save_LIBS=$LIBS |
4960 | @@ -10074,16 +10792,16 @@ |
4961 | fi |
4962 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 |
4963 | $as_echo "$ac_cv_lib_dld_shl_load" >&6; } |
4964 | -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : |
4965 | +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : |
4966 | lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" |
4967 | else |
4968 | ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" |
4969 | -if test "x$ac_cv_func_dlopen" = x""yes; then : |
4970 | +if test "x$ac_cv_func_dlopen" = xyes; then : |
4971 | lt_cv_dlopen="dlopen" |
4972 | else |
4973 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 |
4974 | $as_echo_n "checking for dlopen in -ldl... " >&6; } |
4975 | -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : |
4976 | +if ${ac_cv_lib_dl_dlopen+:} false; then : |
4977 | $as_echo_n "(cached) " >&6 |
4978 | else |
4979 | ac_check_lib_save_LIBS=$LIBS |
4980 | @@ -10117,12 +10835,12 @@ |
4981 | fi |
4982 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 |
4983 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
4984 | -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : |
4985 | +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : |
4986 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
4987 | else |
4988 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 |
4989 | $as_echo_n "checking for dlopen in -lsvld... " >&6; } |
4990 | -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : |
4991 | +if ${ac_cv_lib_svld_dlopen+:} false; then : |
4992 | $as_echo_n "(cached) " >&6 |
4993 | else |
4994 | ac_check_lib_save_LIBS=$LIBS |
4995 | @@ -10156,12 +10874,12 @@ |
4996 | fi |
4997 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 |
4998 | $as_echo "$ac_cv_lib_svld_dlopen" >&6; } |
4999 | -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : |
5000 | +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : |
The diff has been truncated for viewing.