re-libtoolize linux-atm to fix random libname breakage
[openwrt/svn-archive/archive.git] / package / linux-atm / patches / 700-libtoolize.patch
1 diff -urN atm.old/aclocal.m4 atm.dev/aclocal.m4
2 --- atm.old/aclocal.m4 2007-10-20 16:57:33.418005734 +0200
3 +++ atm.dev/aclocal.m4 2007-10-20 16:58:38.609720794 +0200
4 @@ -1,992 +1,19 @@
5 -dnl aclocal.m4 generated automatically by aclocal 1.4-p6
6 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
7
8 -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
9 -dnl This file is free software; the Free Software Foundation
10 -dnl gives unlimited permission to copy and/or distribute it,
11 -dnl with or without modifications, as long as this notice is preserved.
12 -
13 -dnl This program is distributed in the hope that it will be useful,
14 -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
15 -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
16 -dnl PARTICULAR PURPOSE.
17 -
18 -# lib-prefix.m4 serial 4 (gettext-0.14.2)
19 -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
20 -dnl This file is free software; the Free Software Foundation
21 -dnl gives unlimited permission to copy and/or distribute it,
22 -dnl with or without modifications, as long as this notice is preserved.
23 -
24 -dnl From Bruno Haible.
25 -
26 -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
27 -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
28 -dnl require excessive bracketing.
29 -ifdef([AC_HELP_STRING],
30 -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
31 -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
32 -
33 -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
34 -dnl to access previously installed libraries. The basic assumption is that
35 -dnl a user will want packages to use other packages he previously installed
36 -dnl with the same --prefix option.
37 -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
38 -dnl libraries, but is otherwise very convenient.
39 -AC_DEFUN([AC_LIB_PREFIX],
40 -[
41 - AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
42 - AC_REQUIRE([AC_PROG_CC])
43 - AC_REQUIRE([AC_CANONICAL_HOST])
44 - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
45 - dnl By default, look in $includedir and $libdir.
46 - use_additional=yes
47 - AC_LIB_WITH_FINAL_PREFIX([
48 - eval additional_includedir=\"$includedir\"
49 - eval additional_libdir=\"$libdir\"
50 - ])
51 - AC_LIB_ARG_WITH([lib-prefix],
52 -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
53 - --without-lib-prefix don't search for libraries in includedir and libdir],
54 -[
55 - if test "X$withval" = "Xno"; then
56 - use_additional=no
57 - else
58 - if test "X$withval" = "X"; then
59 - AC_LIB_WITH_FINAL_PREFIX([
60 - eval additional_includedir=\"$includedir\"
61 - eval additional_libdir=\"$libdir\"
62 - ])
63 - else
64 - additional_includedir="$withval/include"
65 - additional_libdir="$withval/lib"
66 - fi
67 - fi
68 -])
69 - if test $use_additional = yes; then
70 - dnl Potentially add $additional_includedir to $CPPFLAGS.
71 - dnl But don't add it
72 - dnl 1. if it's the standard /usr/include,
73 - dnl 2. if it's already present in $CPPFLAGS,
74 - dnl 3. if it's /usr/local/include and we are using GCC on Linux,
75 - dnl 4. if it doesn't exist as a directory.
76 - if test "X$additional_includedir" != "X/usr/include"; then
77 - haveit=
78 - for x in $CPPFLAGS; do
79 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
80 - if test "X$x" = "X-I$additional_includedir"; then
81 - haveit=yes
82 - break
83 - fi
84 - done
85 - if test -z "$haveit"; then
86 - if test "X$additional_includedir" = "X/usr/local/include"; then
87 - if test -n "$GCC"; then
88 - case $host_os in
89 - linux* | gnu* | k*bsd*-gnu) haveit=yes;;
90 - esac
91 - fi
92 - fi
93 - if test -z "$haveit"; then
94 - if test -d "$additional_includedir"; then
95 - dnl Really add $additional_includedir to $CPPFLAGS.
96 - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
97 - fi
98 - fi
99 - fi
100 - fi
101 - dnl Potentially add $additional_libdir to $LDFLAGS.
102 - dnl But don't add it
103 - dnl 1. if it's the standard /usr/lib,
104 - dnl 2. if it's already present in $LDFLAGS,
105 - dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
106 - dnl 4. if it doesn't exist as a directory.
107 - if test "X$additional_libdir" != "X/usr/lib"; then
108 - haveit=
109 - for x in $LDFLAGS; do
110 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
111 - if test "X$x" = "X-L$additional_libdir"; then
112 - haveit=yes
113 - break
114 - fi
115 - done
116 - if test -z "$haveit"; then
117 - if test "X$additional_libdir" = "X/usr/local/lib"; then
118 - if test -n "$GCC"; then
119 - case $host_os in
120 - linux*) haveit=yes;;
121 - esac
122 - fi
123 - fi
124 - if test -z "$haveit"; then
125 - if test -d "$additional_libdir"; then
126 - dnl Really add $additional_libdir to $LDFLAGS.
127 - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
128 - fi
129 - fi
130 - fi
131 - fi
132 - fi
133 -])
134 -
135 -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
136 -dnl acl_final_exec_prefix, containing the values to which $prefix and
137 -dnl $exec_prefix will expand at the end of the configure script.
138 -AC_DEFUN([AC_LIB_PREPARE_PREFIX],
139 -[
140 - dnl Unfortunately, prefix and exec_prefix get only finally determined
141 - dnl at the end of configure.
142 - if test "X$prefix" = "XNONE"; then
143 - acl_final_prefix="$ac_default_prefix"
144 - else
145 - acl_final_prefix="$prefix"
146 - fi
147 - if test "X$exec_prefix" = "XNONE"; then
148 - acl_final_exec_prefix='${prefix}'
149 - else
150 - acl_final_exec_prefix="$exec_prefix"
151 - fi
152 - acl_save_prefix="$prefix"
153 - prefix="$acl_final_prefix"
154 - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
155 - prefix="$acl_save_prefix"
156 -])
157 -
158 -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
159 -dnl variables prefix and exec_prefix bound to the values they will have
160 -dnl at the end of the configure script.
161 -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
162 -[
163 - acl_save_prefix="$prefix"
164 - prefix="$acl_final_prefix"
165 - acl_save_exec_prefix="$exec_prefix"
166 - exec_prefix="$acl_final_exec_prefix"
167 - $1
168 - exec_prefix="$acl_save_exec_prefix"
169 - prefix="$acl_save_prefix"
170 -])
171 -
172 -# lib-link.m4 serial 6 (gettext-0.14.3)
173 -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
174 -dnl This file is free software; the Free Software Foundation
175 -dnl gives unlimited permission to copy and/or distribute it,
176 -dnl with or without modifications, as long as this notice is preserved.
177 -
178 -dnl From Bruno Haible.
179 -
180 -AC_PREREQ(2.50)
181 -
182 -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
183 -dnl the libraries corresponding to explicit and implicit dependencies.
184 -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
185 -dnl augments the CPPFLAGS variable.
186 -AC_DEFUN([AC_LIB_LINKFLAGS],
187 -[
188 - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
189 - AC_REQUIRE([AC_LIB_RPATH])
190 - define([Name],[translit([$1],[./-], [___])])
191 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
192 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
193 - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
194 - AC_LIB_LINKFLAGS_BODY([$1], [$2])
195 - ac_cv_lib[]Name[]_libs="$LIB[]NAME"
196 - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
197 - ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
198 - ])
199 - LIB[]NAME="$ac_cv_lib[]Name[]_libs"
200 - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
201 - INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
202 - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
203 - AC_SUBST([LIB]NAME)
204 - AC_SUBST([LTLIB]NAME)
205 - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
206 - dnl results of this search when this library appears as a dependency.
207 - HAVE_LIB[]NAME=yes
208 - undefine([Name])
209 - undefine([NAME])
210 -])
211 -
212 -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
213 -dnl searches for libname and the libraries corresponding to explicit and
214 -dnl implicit dependencies, together with the specified include files and
215 -dnl the ability to compile and link the specified testcode. If found, it
216 -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
217 -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
218 -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
219 -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
220 -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
221 -[
222 - AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
223 - AC_REQUIRE([AC_LIB_RPATH])
224 - define([Name],[translit([$1],[./-], [___])])
225 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
226 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
227 -
228 - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
229 - dnl accordingly.
230 - AC_LIB_LINKFLAGS_BODY([$1], [$2])
231 -
232 - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
233 - dnl because if the user has installed lib[]Name and not disabled its use
234 - dnl via --without-lib[]Name-prefix, he wants to use it.
235 - ac_save_CPPFLAGS="$CPPFLAGS"
236 - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
237 -
238 - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
239 - ac_save_LIBS="$LIBS"
240 - LIBS="$LIBS $LIB[]NAME"
241 - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
242 - LIBS="$ac_save_LIBS"
243 - ])
244 - if test "$ac_cv_lib[]Name" = yes; then
245 - HAVE_LIB[]NAME=yes
246 - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
247 - AC_MSG_CHECKING([how to link with lib[]$1])
248 - AC_MSG_RESULT([$LIB[]NAME])
249 - else
250 - HAVE_LIB[]NAME=no
251 - dnl If $LIB[]NAME didn't lead to a usable library, we don't need
252 - dnl $INC[]NAME either.
253 - CPPFLAGS="$ac_save_CPPFLAGS"
254 - LIB[]NAME=
255 - LTLIB[]NAME=
256 - fi
257 - AC_SUBST([HAVE_LIB]NAME)
258 - AC_SUBST([LIB]NAME)
259 - AC_SUBST([LTLIB]NAME)
260 - undefine([Name])
261 - undefine([NAME])
262 -])
263 -
264 -dnl Determine the platform dependent parameters needed to use rpath:
265 -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
266 -dnl hardcode_direct, hardcode_minus_L.
267 -AC_DEFUN([AC_LIB_RPATH],
268 -[
269 - dnl Tell automake >= 1.10 to complain if config.rpath is missing.
270 - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
271 - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
272 - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
273 - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
274 - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
275 - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
276 - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
277 - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
278 - . ./conftest.sh
279 - rm -f ./conftest.sh
280 - acl_cv_rpath=done
281 - ])
282 - wl="$acl_cv_wl"
283 - libext="$acl_cv_libext"
284 - shlibext="$acl_cv_shlibext"
285 - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
286 - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
287 - hardcode_direct="$acl_cv_hardcode_direct"
288 - hardcode_minus_L="$acl_cv_hardcode_minus_L"
289 - dnl Determine whether the user wants rpath handling at all.
290 - AC_ARG_ENABLE(rpath,
291 - [ --disable-rpath do not hardcode runtime library paths],
292 - :, enable_rpath=yes)
293 -])
294 -
295 -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
296 -dnl the libraries corresponding to explicit and implicit dependencies.
297 -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
298 -AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
299 -[
300 - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
301 - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
302 - dnl By default, look in $includedir and $libdir.
303 - use_additional=yes
304 - AC_LIB_WITH_FINAL_PREFIX([
305 - eval additional_includedir=\"$includedir\"
306 - eval additional_libdir=\"$libdir\"
307 - ])
308 - AC_LIB_ARG_WITH([lib$1-prefix],
309 -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
310 - --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
311 -[
312 - if test "X$withval" = "Xno"; then
313 - use_additional=no
314 - else
315 - if test "X$withval" = "X"; then
316 - AC_LIB_WITH_FINAL_PREFIX([
317 - eval additional_includedir=\"$includedir\"
318 - eval additional_libdir=\"$libdir\"
319 - ])
320 - else
321 - additional_includedir="$withval/include"
322 - additional_libdir="$withval/lib"
323 - fi
324 - fi
325 -])
326 - dnl Search the library and its dependencies in $additional_libdir and
327 - dnl $LDFLAGS. Using breadth-first-seach.
328 - LIB[]NAME=
329 - LTLIB[]NAME=
330 - INC[]NAME=
331 - rpathdirs=
332 - ltrpathdirs=
333 - names_already_handled=
334 - names_next_round='$1 $2'
335 - while test -n "$names_next_round"; do
336 - names_this_round="$names_next_round"
337 - names_next_round=
338 - for name in $names_this_round; do
339 - already_handled=
340 - for n in $names_already_handled; do
341 - if test "$n" = "$name"; then
342 - already_handled=yes
343 - break
344 - fi
345 - done
346 - if test -z "$already_handled"; then
347 - names_already_handled="$names_already_handled $name"
348 - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
349 - dnl or AC_LIB_HAVE_LINKFLAGS call.
350 - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
351 - eval value=\"\$HAVE_LIB$uppername\"
352 - if test -n "$value"; then
353 - if test "$value" = yes; then
354 - eval value=\"\$LIB$uppername\"
355 - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
356 - eval value=\"\$LTLIB$uppername\"
357 - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
358 - else
359 - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
360 - dnl that this library doesn't exist. So just drop it.
361 - :
362 - fi
363 - else
364 - dnl Search the library lib$name in $additional_libdir and $LDFLAGS
365 - dnl and the already constructed $LIBNAME/$LTLIBNAME.
366 - found_dir=
367 - found_la=
368 - found_so=
369 - found_a=
370 - if test $use_additional = yes; then
371 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
372 - found_dir="$additional_libdir"
373 - found_so="$additional_libdir/lib$name.$shlibext"
374 - if test -f "$additional_libdir/lib$name.la"; then
375 - found_la="$additional_libdir/lib$name.la"
376 - fi
377 - else
378 - if test -f "$additional_libdir/lib$name.$libext"; then
379 - found_dir="$additional_libdir"
380 - found_a="$additional_libdir/lib$name.$libext"
381 - if test -f "$additional_libdir/lib$name.la"; then
382 - found_la="$additional_libdir/lib$name.la"
383 - fi
384 - fi
385 - fi
386 - fi
387 - if test "X$found_dir" = "X"; then
388 - for x in $LDFLAGS $LTLIB[]NAME; do
389 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
390 - case "$x" in
391 - -L*)
392 - dir=`echo "X$x" | sed -e 's/^X-L//'`
393 - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
394 - found_dir="$dir"
395 - found_so="$dir/lib$name.$shlibext"
396 - if test -f "$dir/lib$name.la"; then
397 - found_la="$dir/lib$name.la"
398 - fi
399 - else
400 - if test -f "$dir/lib$name.$libext"; then
401 - found_dir="$dir"
402 - found_a="$dir/lib$name.$libext"
403 - if test -f "$dir/lib$name.la"; then
404 - found_la="$dir/lib$name.la"
405 - fi
406 - fi
407 - fi
408 - ;;
409 - esac
410 - if test "X$found_dir" != "X"; then
411 - break
412 - fi
413 - done
414 - fi
415 - if test "X$found_dir" != "X"; then
416 - dnl Found the library.
417 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
418 - if test "X$found_so" != "X"; then
419 - dnl Linking with a shared library. We attempt to hardcode its
420 - dnl directory into the executable's runpath, unless it's the
421 - dnl standard /usr/lib.
422 - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
423 - dnl No hardcoding is needed.
424 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
425 - else
426 - dnl Use an explicit option to hardcode DIR into the resulting
427 - dnl binary.
428 - dnl Potentially add DIR to ltrpathdirs.
429 - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
430 - haveit=
431 - for x in $ltrpathdirs; do
432 - if test "X$x" = "X$found_dir"; then
433 - haveit=yes
434 - break
435 - fi
436 - done
437 - if test -z "$haveit"; then
438 - ltrpathdirs="$ltrpathdirs $found_dir"
439 - fi
440 - dnl The hardcoding into $LIBNAME is system dependent.
441 - if test "$hardcode_direct" = yes; then
442 - dnl Using DIR/libNAME.so during linking hardcodes DIR into the
443 - dnl resulting binary.
444 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
445 - else
446 - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
447 - dnl Use an explicit option to hardcode DIR into the resulting
448 - dnl binary.
449 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
450 - dnl Potentially add DIR to rpathdirs.
451 - dnl The rpathdirs will be appended to $LIBNAME at the end.
452 - haveit=
453 - for x in $rpathdirs; do
454 - if test "X$x" = "X$found_dir"; then
455 - haveit=yes
456 - break
457 - fi
458 - done
459 - if test -z "$haveit"; then
460 - rpathdirs="$rpathdirs $found_dir"
461 - fi
462 - else
463 - dnl Rely on "-L$found_dir".
464 - dnl But don't add it if it's already contained in the LDFLAGS
465 - dnl or the already constructed $LIBNAME
466 - haveit=
467 - for x in $LDFLAGS $LIB[]NAME; do
468 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
469 - if test "X$x" = "X-L$found_dir"; then
470 - haveit=yes
471 - break
472 - fi
473 - done
474 - if test -z "$haveit"; then
475 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
476 - fi
477 - if test "$hardcode_minus_L" != no; then
478 - dnl FIXME: Not sure whether we should use
479 - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
480 - dnl here.
481 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
482 - else
483 - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
484 - dnl here, because this doesn't fit in flags passed to the
485 - dnl compiler. So give up. No hardcoding. This affects only
486 - dnl very old systems.
487 - dnl FIXME: Not sure whether we should use
488 - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
489 - dnl here.
490 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
491 - fi
492 - fi
493 - fi
494 - fi
495 - else
496 - if test "X$found_a" != "X"; then
497 - dnl Linking with a static library.
498 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
499 - else
500 - dnl We shouldn't come here, but anyway it's good to have a
501 - dnl fallback.
502 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
503 - fi
504 - fi
505 - dnl Assume the include files are nearby.
506 - additional_includedir=
507 - case "$found_dir" in
508 - */lib | */lib/)
509 - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
510 - additional_includedir="$basedir/include"
511 - ;;
512 - esac
513 - if test "X$additional_includedir" != "X"; then
514 - dnl Potentially add $additional_includedir to $INCNAME.
515 - dnl But don't add it
516 - dnl 1. if it's the standard /usr/include,
517 - dnl 2. if it's /usr/local/include and we are using GCC on Linux,
518 - dnl 3. if it's already present in $CPPFLAGS or the already
519 - dnl constructed $INCNAME,
520 - dnl 4. if it doesn't exist as a directory.
521 - if test "X$additional_includedir" != "X/usr/include"; then
522 - haveit=
523 - if test "X$additional_includedir" = "X/usr/local/include"; then
524 - if test -n "$GCC"; then
525 - case $host_os in
526 - linux* | gnu* | k*bsd*-gnu) haveit=yes;;
527 - esac
528 - fi
529 - fi
530 - if test -z "$haveit"; then
531 - for x in $CPPFLAGS $INC[]NAME; do
532 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
533 - if test "X$x" = "X-I$additional_includedir"; then
534 - haveit=yes
535 - break
536 - fi
537 - done
538 - if test -z "$haveit"; then
539 - if test -d "$additional_includedir"; then
540 - dnl Really add $additional_includedir to $INCNAME.
541 - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
542 - fi
543 - fi
544 - fi
545 - fi
546 - fi
547 - dnl Look for dependencies.
548 - if test -n "$found_la"; then
549 - dnl Read the .la file. It defines the variables
550 - dnl dlname, library_names, old_library, dependency_libs, current,
551 - dnl age, revision, installed, dlopen, dlpreopen, libdir.
552 - save_libdir="$libdir"
553 - case "$found_la" in
554 - */* | *\\*) . "$found_la" ;;
555 - *) . "./$found_la" ;;
556 - esac
557 - libdir="$save_libdir"
558 - dnl We use only dependency_libs.
559 - for dep in $dependency_libs; do
560 - case "$dep" in
561 - -L*)
562 - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
563 - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
564 - dnl But don't add it
565 - dnl 1. if it's the standard /usr/lib,
566 - dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
567 - dnl 3. if it's already present in $LDFLAGS or the already
568 - dnl constructed $LIBNAME,
569 - dnl 4. if it doesn't exist as a directory.
570 - if test "X$additional_libdir" != "X/usr/lib"; then
571 - haveit=
572 - if test "X$additional_libdir" = "X/usr/local/lib"; then
573 - if test -n "$GCC"; then
574 - case $host_os in
575 - linux* | gnu* | k*bsd*-gnu) haveit=yes;;
576 - esac
577 - fi
578 - fi
579 - if test -z "$haveit"; then
580 - haveit=
581 - for x in $LDFLAGS $LIB[]NAME; do
582 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
583 - if test "X$x" = "X-L$additional_libdir"; then
584 - haveit=yes
585 - break
586 - fi
587 - done
588 - if test -z "$haveit"; then
589 - if test -d "$additional_libdir"; then
590 - dnl Really add $additional_libdir to $LIBNAME.
591 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
592 - fi
593 - fi
594 - haveit=
595 - for x in $LDFLAGS $LTLIB[]NAME; do
596 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
597 - if test "X$x" = "X-L$additional_libdir"; then
598 - haveit=yes
599 - break
600 - fi
601 - done
602 - if test -z "$haveit"; then
603 - if test -d "$additional_libdir"; then
604 - dnl Really add $additional_libdir to $LTLIBNAME.
605 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
606 - fi
607 - fi
608 - fi
609 - fi
610 - ;;
611 - -R*)
612 - dir=`echo "X$dep" | sed -e 's/^X-R//'`
613 - if test "$enable_rpath" != no; then
614 - dnl Potentially add DIR to rpathdirs.
615 - dnl The rpathdirs will be appended to $LIBNAME at the end.
616 - haveit=
617 - for x in $rpathdirs; do
618 - if test "X$x" = "X$dir"; then
619 - haveit=yes
620 - break
621 - fi
622 - done
623 - if test -z "$haveit"; then
624 - rpathdirs="$rpathdirs $dir"
625 - fi
626 - dnl Potentially add DIR to ltrpathdirs.
627 - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
628 - haveit=
629 - for x in $ltrpathdirs; do
630 - if test "X$x" = "X$dir"; then
631 - haveit=yes
632 - break
633 - fi
634 - done
635 - if test -z "$haveit"; then
636 - ltrpathdirs="$ltrpathdirs $dir"
637 - fi
638 - fi
639 - ;;
640 - -l*)
641 - dnl Handle this in the next round.
642 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
643 - ;;
644 - *.la)
645 - dnl Handle this in the next round. Throw away the .la's
646 - dnl directory; it is already contained in a preceding -L
647 - dnl option.
648 - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
649 - ;;
650 - *)
651 - dnl Most likely an immediate library name.
652 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
653 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
654 - ;;
655 - esac
656 - done
657 - fi
658 - else
659 - dnl Didn't find the library; assume it is in the system directories
660 - dnl known to the linker and runtime loader. (All the system
661 - dnl directories known to the linker should also be known to the
662 - dnl runtime loader, otherwise the system is severely misconfigured.)
663 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
664 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
665 - fi
666 - fi
667 - fi
668 - done
669 - done
670 - if test "X$rpathdirs" != "X"; then
671 - if test -n "$hardcode_libdir_separator"; then
672 - dnl Weird platform: only the last -rpath option counts, the user must
673 - dnl pass all path elements in one option. We can arrange that for a
674 - dnl single library, but not when more than one $LIBNAMEs are used.
675 - alldirs=
676 - for found_dir in $rpathdirs; do
677 - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
678 - done
679 - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
680 - acl_save_libdir="$libdir"
681 - libdir="$alldirs"
682 - eval flag=\"$hardcode_libdir_flag_spec\"
683 - libdir="$acl_save_libdir"
684 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
685 - else
686 - dnl The -rpath options are cumulative.
687 - for found_dir in $rpathdirs; do
688 - acl_save_libdir="$libdir"
689 - libdir="$found_dir"
690 - eval flag=\"$hardcode_libdir_flag_spec\"
691 - libdir="$acl_save_libdir"
692 - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
693 - done
694 - fi
695 - fi
696 - if test "X$ltrpathdirs" != "X"; then
697 - dnl When using libtool, the option that works for both libraries and
698 - dnl executables is -R. The -R options are cumulative.
699 - for found_dir in $ltrpathdirs; do
700 - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
701 - done
702 - fi
703 -])
704 -
705 -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
706 -dnl unless already present in VAR.
707 -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
708 -dnl contains two or three consecutive elements that belong together.
709 -AC_DEFUN([AC_LIB_APPENDTOVAR],
710 -[
711 - for element in [$2]; do
712 - haveit=
713 - for x in $[$1]; do
714 - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
715 - if test "X$x" = "X$element"; then
716 - haveit=yes
717 - break
718 - fi
719 - done
720 - if test -z "$haveit"; then
721 - [$1]="${[$1]}${[$1]:+ }$element"
722 - fi
723 - done
724 -])
725 -
726 -# lib-ld.m4 serial 3 (gettext-0.13)
727 -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
728 -dnl This file is free software; the Free Software Foundation
729 -dnl gives unlimited permission to copy and/or distribute it,
730 -dnl with or without modifications, as long as this notice is preserved.
731 -
732 -dnl Subroutines of libtool.m4,
733 -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
734 -dnl with libtool.m4.
735 -
736 -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
737 -AC_DEFUN([AC_LIB_PROG_LD_GNU],
738 -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
739 -[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
740 -case `$LD -v 2>&1 </dev/null` in
741 -*GNU* | *'with BFD'*)
742 - acl_cv_prog_gnu_ld=yes ;;
743 -*)
744 - acl_cv_prog_gnu_ld=no ;;
745 -esac])
746 -with_gnu_ld=$acl_cv_prog_gnu_ld
747 -])
748 -
749 -dnl From libtool-1.4. Sets the variable LD.
750 -AC_DEFUN([AC_LIB_PROG_LD],
751 -[AC_ARG_WITH(gnu-ld,
752 -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
753 -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
754 -AC_REQUIRE([AC_PROG_CC])dnl
755 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
756 -# Prepare PATH_SEPARATOR.
757 -# The user is always right.
758 -if test "${PATH_SEPARATOR+set}" != set; then
759 - echo "#! /bin/sh" >conf$$.sh
760 - echo "exit 0" >>conf$$.sh
761 - chmod +x conf$$.sh
762 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
763 - PATH_SEPARATOR=';'
764 - else
765 - PATH_SEPARATOR=:
766 - fi
767 - rm -f conf$$.sh
768 -fi
769 -ac_prog=ld
770 -if test "$GCC" = yes; then
771 - # Check if gcc -print-prog-name=ld gives a path.
772 - AC_MSG_CHECKING([for ld used by GCC])
773 - case $host in
774 - *-*-mingw*)
775 - # gcc leaves a trailing carriage return which upsets mingw
776 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
777 - *)
778 - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
779 - esac
780 - case $ac_prog in
781 - # Accept absolute paths.
782 - [[\\/]* | [A-Za-z]:[\\/]*)]
783 - [re_direlt='/[^/][^/]*/\.\./']
784 - # Canonicalize the path of ld
785 - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
786 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
787 - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
788 - done
789 - test -z "$LD" && LD="$ac_prog"
790 - ;;
791 - "")
792 - # If it fails, then pretend we aren't using GCC.
793 - ac_prog=ld
794 - ;;
795 - *)
796 - # If it is relative, then search for the first ld in PATH.
797 - with_gnu_ld=unknown
798 - ;;
799 - esac
800 -elif test "$with_gnu_ld" = yes; then
801 - AC_MSG_CHECKING([for GNU ld])
802 -else
803 - AC_MSG_CHECKING([for non-GNU ld])
804 -fi
805 -AC_CACHE_VAL(acl_cv_path_LD,
806 -[if test -z "$LD"; then
807 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
808 - for ac_dir in $PATH; do
809 - test -z "$ac_dir" && ac_dir=.
810 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
811 - acl_cv_path_LD="$ac_dir/$ac_prog"
812 - # Check to see if the program is GNU ld. I'd rather use --version,
813 - # but apparently some GNU ld's only accept -v.
814 - # Break only if it was the GNU/non-GNU ld that we prefer.
815 - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
816 - *GNU* | *'with BFD'*)
817 - test "$with_gnu_ld" != no && break ;;
818 - *)
819 - test "$with_gnu_ld" != yes && break ;;
820 - esac
821 - fi
822 - done
823 - IFS="$ac_save_ifs"
824 -else
825 - acl_cv_path_LD="$LD" # Let the user override the test with a path.
826 -fi])
827 -LD="$acl_cv_path_LD"
828 -if test -n "$LD"; then
829 - AC_MSG_RESULT($LD)
830 -else
831 - AC_MSG_RESULT(no)
832 -fi
833 -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
834 -AC_LIB_PROG_LD_GNU
835 -])
836 -
837 -# Like AC_CONFIG_HEADER, but automatically create stamp file.
838 -
839 -AC_DEFUN([AM_CONFIG_HEADER],
840 -[AC_PREREQ([2.12])
841 -AC_CONFIG_HEADER([$1])
842 -dnl When config.status generates a header, we must update the stamp-h file.
843 -dnl This file resides in the same directory as the config header
844 -dnl that is generated. We must strip everything past the first ":",
845 -dnl and everything past the last "/".
846 -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
847 -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
848 -<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
849 -<<am_indx=1
850 -for am_file in <<$1>>; do
851 - case " <<$>>CONFIG_HEADERS " in
852 - *" <<$>>am_file "*<<)>>
853 - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
854 - ;;
855 - esac
856 - am_indx=`expr "<<$>>am_indx" + 1`
857 -done<<>>dnl>>)
858 -changequote([,]))])
859 -
860 -# Do all the work for Automake. This macro actually does too much --
861 -# some checks are only needed if your package does certain things.
862 -# But this isn't really a big deal.
863 -
864 -# serial 1
865 -
866 -dnl Usage:
867 -dnl AM_INIT_AUTOMAKE(package,version, [no-define])
868 -
869 -AC_DEFUN([AM_INIT_AUTOMAKE],
870 -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
871 -AC_REQUIRE([AC_PROG_INSTALL])
872 -PACKAGE=[$1]
873 -AC_SUBST(PACKAGE)
874 -VERSION=[$2]
875 -AC_SUBST(VERSION)
876 -dnl test to see if srcdir already configured
877 -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
878 - AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
879 -fi
880 -ifelse([$3],,
881 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
882 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
883 -AC_REQUIRE([AM_SANITY_CHECK])
884 -AC_REQUIRE([AC_ARG_PROGRAM])
885 -dnl FIXME This is truly gross.
886 -missing_dir=`cd $ac_aux_dir && pwd`
887 -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
888 -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
889 -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
890 -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
891 -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
892 -AC_REQUIRE([AC_PROG_MAKE_SET])])
893 -
894 -# Copyright 2002 Free Software Foundation, Inc.
895 -
896 -# This program is free software; you can redistribute it and/or modify
897 -# it under the terms of the GNU General Public License as published by
898 -# the Free Software Foundation; either version 2, or (at your option)
899 -# any later version.
900 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
901 +# 2005 Free Software Foundation, Inc.
902 +# This file is free software; the Free Software Foundation
903 +# gives unlimited permission to copy and/or distribute it,
904 +# with or without modifications, as long as this notice is preserved.
905
906 # This program is distributed in the hope that it will be useful,
907 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
908 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
909 -# GNU General Public License for more details.
910 -
911 -# You should have received a copy of the GNU General Public License
912 -# along with this program; if not, write to the Free Software
913 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
914 -
915 -# AM_AUTOMAKE_VERSION(VERSION)
916 -# ----------------------------
917 -# Automake X.Y traces this macro to ensure aclocal.m4 has been
918 -# generated from the m4 files accompanying Automake X.Y.
919 -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
920 -
921 -# AM_SET_CURRENT_AUTOMAKE_VERSION
922 -# -------------------------------
923 -# Call AM_AUTOMAKE_VERSION so it can be traced.
924 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
925 -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
926 - [AM_AUTOMAKE_VERSION([1.4-p6])])
927 -
928 -#
929 -# Check to make sure that the build environment is sane.
930 -#
931 -
932 -AC_DEFUN([AM_SANITY_CHECK],
933 -[AC_MSG_CHECKING([whether build environment is sane])
934 -# Just in case
935 -sleep 1
936 -echo timestamp > conftestfile
937 -# Do `set' in a subshell so we don't clobber the current shell's
938 -# arguments. Must try -L first in case configure is actually a
939 -# symlink; some systems play weird games with the mod time of symlinks
940 -# (eg FreeBSD returns the mod time of the symlink's containing
941 -# directory).
942 -if (
943 - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
944 - if test "[$]*" = "X"; then
945 - # -L didn't work.
946 - set X `ls -t $srcdir/configure conftestfile`
947 - fi
948 - if test "[$]*" != "X $srcdir/configure conftestfile" \
949 - && test "[$]*" != "X conftestfile $srcdir/configure"; then
950 -
951 - # If neither matched, then we have a broken ls. This can happen
952 - # if, for instance, CONFIG_SHELL is bash and it inherits a
953 - # broken ls alias from the environment. This has actually
954 - # happened. Such a system could not be considered "sane".
955 - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
956 -alias in your environment])
957 - fi
958 -
959 - test "[$]2" = conftestfile
960 - )
961 -then
962 - # Ok.
963 - :
964 -else
965 - AC_MSG_ERROR([newly created file is older than distributed files!
966 -Check your system clock])
967 -fi
968 -rm -f conftest*
969 -AC_MSG_RESULT(yes)])
970 -
971 -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
972 -dnl The program must properly implement --version.
973 -AC_DEFUN([AM_MISSING_PROG],
974 -[AC_MSG_CHECKING(for working $2)
975 -# Run test in a subshell; some versions of sh will print an error if
976 -# an executable is not found, even if stderr is redirected.
977 -# Redirect stdin to placate older versions of autoconf. Sigh.
978 -if ($2 --version) < /dev/null > /dev/null 2>&1; then
979 - $1=$2
980 - AC_MSG_RESULT(found)
981 -else
982 - $1="$3/missing $2"
983 - AC_MSG_RESULT(missing)
984 -fi
985 -AC_SUBST($1)])
986 -
987 -
988 -dnl AM_PROG_LEX
989 -dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
990 -AC_DEFUN([AM_PROG_LEX],
991 -[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
992 -AC_CHECK_PROGS(LEX, flex lex, $missing_dir/missing flex)
993 -AC_PROG_LEX
994 -AC_DECL_YYTEXT])
995 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
996 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
997 +# PARTICULAR PURPOSE.
998
999 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1000
1001 -# serial 47 AC_PROG_LIBTOOL
1002 -# Debian $Rev$
1003 +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
1004
1005
1006 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
1007 @@ -1096,7 +123,7 @@
1008
1009 # Sed substitution that helps us do robust quoting. It backslashifies
1010 # metacharacters that are still active within double-quoted strings.
1011 -Xsed='sed -e s/^X//'
1012 +Xsed='sed -e 1s/^X//'
1013 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
1014
1015 # Same as above, but do not quote variable references.
1016 @@ -1116,7 +143,7 @@
1017 default_ofile=libtool
1018 can_build_shared=yes
1019
1020 -# All known linkers require a `.a' archive for static linking (except M$VC,
1021 +# All known linkers require a `.a' archive for static linking (except MSVC,
1022 # which needs '.lib').
1023 libext=a
1024 ltmain="$ac_aux_dir/ltmain.sh"
1025 @@ -1136,6 +163,7 @@
1026 test -z "$AS" && AS=as
1027 test -z "$CC" && CC=cc
1028 test -z "$LTCC" && LTCC=$CC
1029 +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
1030 test -z "$DLLTOOL" && DLLTOOL=dlltool
1031 test -z "$LD" && LD=ld
1032 test -z "$LN_S" && LN_S="ln -s"
1033 @@ -1155,15 +183,17 @@
1034 if test -n "$RANLIB"; then
1035 case $host_os in
1036 openbsd*)
1037 - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
1038 + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
1039 ;;
1040 *)
1041 - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
1042 + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
1043 ;;
1044 esac
1045 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1046 fi
1047
1048 +_LT_CC_BASENAME([$compiler])
1049 +
1050 # Only perform the check for file, if the check method requires it
1051 case $deplibs_check_method in
1052 file_magic*)
1053 @@ -1204,11 +234,56 @@
1054 # If no C compiler was specified, use CC.
1055 LTCC=${LTCC-"$CC"}
1056
1057 +# If no C compiler flags were specified, use CFLAGS.
1058 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
1059 +
1060 # Allow CC to be a program name with arguments.
1061 compiler=$CC
1062 ])# _LT_AC_SYS_COMPILER
1063
1064
1065 +# _LT_CC_BASENAME(CC)
1066 +# -------------------
1067 +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
1068 +AC_DEFUN([_LT_CC_BASENAME],
1069 +[for cc_temp in $1""; do
1070 + case $cc_temp in
1071 + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
1072 + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
1073 + \-*) ;;
1074 + *) break;;
1075 + esac
1076 +done
1077 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1078 +])
1079 +
1080 +
1081 +# _LT_COMPILER_BOILERPLATE
1082 +# ------------------------
1083 +# Check for compiler boilerplate output or warnings with
1084 +# the simple compiler test code.
1085 +AC_DEFUN([_LT_COMPILER_BOILERPLATE],
1086 +[ac_outfile=conftest.$ac_objext
1087 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
1088 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1089 +_lt_compiler_boilerplate=`cat conftest.err`
1090 +$rm conftest*
1091 +])# _LT_COMPILER_BOILERPLATE
1092 +
1093 +
1094 +# _LT_LINKER_BOILERPLATE
1095 +# ----------------------
1096 +# Check for linker boilerplate output or warnings with
1097 +# the simple link test code.
1098 +AC_DEFUN([_LT_LINKER_BOILERPLATE],
1099 +[ac_outfile=conftest.$ac_objext
1100 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
1101 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1102 +_lt_linker_boilerplate=`cat conftest.err`
1103 +$rm conftest*
1104 +])# _LT_LINKER_BOILERPLATE
1105 +
1106 +
1107 # _LT_AC_SYS_LIBPATH_AIX
1108 # ----------------------
1109 # Links a minimal program and checks the executable
1110 @@ -1281,15 +356,15 @@
1111
1112 # The HP-UX ksh and POSIX shell print the target directory to stdout
1113 # if CDPATH is set.
1114 -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
1115 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1116
1117 if test -z "$ECHO"; then
1118 if test "X${echo_test_string+set}" != Xset; then
1119 # find a string as large as possible, as long as the shell can cope with it
1120 for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
1121 # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
1122 - if (echo_test_string="`eval $cmd`") 2>/dev/null &&
1123 - echo_test_string="`eval $cmd`" &&
1124 + if (echo_test_string=`eval $cmd`) 2>/dev/null &&
1125 + echo_test_string=`eval $cmd` &&
1126 (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
1127 then
1128 break
1129 @@ -1458,7 +533,7 @@
1130 # Find out which ABI we are using.
1131 echo 'int i;' > conftest.$ac_ext
1132 if AC_TRY_EVAL(ac_compile); then
1133 - case "`/usr/bin/file conftest.o`" in
1134 + case `/usr/bin/file conftest.o` in
1135 *32-bit*)
1136 case $host in
1137 x86_64-*linux*)
1138 @@ -1509,6 +584,22 @@
1139 CFLAGS="$SAVE_CFLAGS"
1140 fi
1141 ;;
1142 +sparc*-*solaris*)
1143 + # Find out which ABI we are using.
1144 + echo 'int i;' > conftest.$ac_ext
1145 + if AC_TRY_EVAL(ac_compile); then
1146 + case `/usr/bin/file conftest.o` in
1147 + *64-bit*)
1148 + case $lt_cv_prog_gnu_ld in
1149 + yes*) LD="${LD-ld} -m elf64_sparc" ;;
1150 + *) LD="${LD-ld} -64" ;;
1151 + esac
1152 + ;;
1153 + esac
1154 + fi
1155 + rm -rf conftest*
1156 + ;;
1157 +
1158 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
1159 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
1160 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
1161 @@ -1540,7 +631,7 @@
1162 # with a dollar sign (not a hyphen), so the echo should work correctly.
1163 # The option is referenced via a variable to avoid confusing sed.
1164 lt_compile=`echo "$ac_compile" | $SED \
1165 - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1166 + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1167 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1168 -e 's:$: $lt_compiler_flag:'`
1169 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1170 @@ -1550,8 +641,10 @@
1171 echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1172 if (exit $ac_status) && test -s "$ac_outfile"; then
1173 # The compiler can only warn and ignore the option if not recognized
1174 - # So say no if there are warnings
1175 - if test ! -s conftest.err; then
1176 + # So say no if there are warnings other than the usual output.
1177 + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1178 + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1179 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1180 $2=yes
1181 fi
1182 fi
1183 @@ -1577,11 +670,16 @@
1184 LDFLAGS="$LDFLAGS $3"
1185 printf "$lt_simple_link_test_code" > conftest.$ac_ext
1186 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
1187 - # The compiler can only warn and ignore the option if not recognized
1188 + # The linker can only warn and ignore the option if not recognized
1189 # So say no if there are warnings
1190 if test -s conftest.err; then
1191 # Append any errors to the config.log.
1192 cat conftest.err 1>&AS_MESSAGE_LOG_FD
1193 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1194 + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1195 + if diff conftest.exp conftest.er2 >/dev/null; then
1196 + $2=yes
1197 + fi
1198 else
1199 $2=yes
1200 fi
1201 @@ -1640,17 +738,61 @@
1202 lt_cv_sys_max_cmd_len=8192;
1203 ;;
1204
1205 - *)
1206 - # If test is not a shell built-in, we'll probably end up computing a
1207 - # maximum length that is only half of the actual maximum length, but
1208 - # we can't tell.
1209 - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
1210 - = "XX$teststring") >/dev/null 2>&1 &&
1211 - new_result=`expr "X$teststring" : ".*" 2>&1` &&
1212 - lt_cv_sys_max_cmd_len=$new_result &&
1213 - test $i != 17 # 1/2 MB should be enough
1214 - do
1215 - i=`expr $i + 1`
1216 + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
1217 + # This has been around since 386BSD, at least. Likely further.
1218 + if test -x /sbin/sysctl; then
1219 + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
1220 + elif test -x /usr/sbin/sysctl; then
1221 + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
1222 + else
1223 + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
1224 + fi
1225 + # And add a safety zone
1226 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
1227 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
1228 + ;;
1229 +
1230 + interix*)
1231 + # We know the value 262144 and hardcode it with a safety zone (like BSD)
1232 + lt_cv_sys_max_cmd_len=196608
1233 + ;;
1234 +
1235 + osf*)
1236 + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
1237 + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
1238 + # nice to cause kernel panics so lets avoid the loop below.
1239 + # First set a reasonable default.
1240 + lt_cv_sys_max_cmd_len=16384
1241 + #
1242 + if test -x /sbin/sysconfig; then
1243 + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
1244 + *1*) lt_cv_sys_max_cmd_len=-1 ;;
1245 + esac
1246 + fi
1247 + ;;
1248 + sco3.2v5*)
1249 + lt_cv_sys_max_cmd_len=102400
1250 + ;;
1251 + sysv5* | sco5v6* | sysv4.2uw2*)
1252 + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
1253 + if test -n "$kargmax"; then
1254 + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
1255 + else
1256 + lt_cv_sys_max_cmd_len=32768
1257 + fi
1258 + ;;
1259 + *)
1260 + # If test is not a shell built-in, we'll probably end up computing a
1261 + # maximum length that is only half of the actual maximum length, but
1262 + # we can't tell.
1263 + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
1264 + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
1265 + = "XX$teststring") >/dev/null 2>&1 &&
1266 + new_result=`expr "X$teststring" : ".*" 2>&1` &&
1267 + lt_cv_sys_max_cmd_len=$new_result &&
1268 + test $i != 17 # 1/2 MB should be enough
1269 + do
1270 + i=`expr $i + 1`
1271 teststring=$teststring$teststring
1272 done
1273 teststring=
1274 @@ -1670,7 +812,7 @@
1275
1276
1277 # _LT_AC_CHECK_DLFCN
1278 -# --------------------
1279 +# ------------------
1280 AC_DEFUN([_LT_AC_CHECK_DLFCN],
1281 [AC_CHECK_HEADERS(dlfcn.h)dnl
1282 ])# _LT_AC_CHECK_DLFCN
1283 @@ -1678,7 +820,7 @@
1284
1285 # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
1286 # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
1287 -# ------------------------------------------------------------------
1288 +# ---------------------------------------------------------------------
1289 AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
1290 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
1291 if test "$cross_compiling" = yes; then :
1292 @@ -1744,17 +886,19 @@
1293 else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
1294 /* dlclose (self); */
1295 }
1296 + else
1297 + puts (dlerror ());
1298
1299 exit (status);
1300 }]
1301 EOF
1302 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
1303 - (./conftest; exit; ) 2>/dev/null
1304 + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
1305 lt_status=$?
1306 case x$lt_status in
1307 x$lt_dlno_uscore) $1 ;;
1308 x$lt_dlneed_uscore) $2 ;;
1309 - x$lt_unknown|x*) $3 ;;
1310 + x$lt_dlunknown|x*) $3 ;;
1311 esac
1312 else :
1313 # compilation failed
1314 @@ -1766,7 +910,7 @@
1315
1316
1317 # AC_LIBTOOL_DLOPEN_SELF
1318 -# -------------------
1319 +# ----------------------
1320 AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
1321 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
1322 if test "x$enable_dlopen" != xyes; then
1323 @@ -1837,7 +981,7 @@
1324 test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
1325
1326 save_LDFLAGS="$LDFLAGS"
1327 - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
1328 + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
1329
1330 save_LIBS="$LIBS"
1331 LIBS="$lt_cv_dlopen_libs $LIBS"
1332 @@ -1850,7 +994,7 @@
1333 ])
1334
1335 if test "x$lt_cv_dlopen_self" = xyes; then
1336 - LDFLAGS="$LDFLAGS $link_static_flag"
1337 + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
1338 AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
1339 lt_cv_dlopen_self_static, [dnl
1340 _LT_AC_TRY_DLOPEN_SELF(
1341 @@ -1898,7 +1042,7 @@
1342 # Note that $ac_compile itself does not contain backslashes and begins
1343 # with a dollar sign (not a hyphen), so the echo should work correctly.
1344 lt_compile=`echo "$ac_compile" | $SED \
1345 - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1346 + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1347 -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
1348 -e 's:$: $lt_compiler_flag:'`
1349 (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
1350 @@ -1910,11 +1054,13 @@
1351 then
1352 # The compiler can only warn and ignore the option if not recognized
1353 # So say no if there are warnings
1354 - if test ! -s out/conftest.err; then
1355 + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
1356 + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
1357 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
1358 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
1359 fi
1360 fi
1361 - chmod u+w .
1362 + chmod u+w . 2>&AS_MESSAGE_LOG_FD
1363 $rm conftest*
1364 # SGI C++ compiler will create directory out/ii_files/ for
1365 # template instantiation
1366 @@ -1978,8 +1124,8 @@
1367 [AC_MSG_CHECKING([how to hardcode library paths into programs])
1368 _LT_AC_TAGVAR(hardcode_action, $1)=
1369 if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
1370 - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
1371 - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
1372 + test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
1373 + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
1374
1375 # We can hardcode non-existant directories.
1376 if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
1377 @@ -2146,7 +1292,7 @@
1378 shlibpath_var=LIBRARY_PATH
1379 ;;
1380
1381 -bsdi4*)
1382 +bsdi[[45]]*)
1383 version_type=linux
1384 need_version=no
1385 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1386 @@ -2174,7 +1320,8 @@
1387 dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
1388 dldir=$destdir/`dirname \$dlpath`~
1389 test -d \$dldir || mkdir -p \$dldir~
1390 - $install_prog $dir/$dlname \$dldir/$dlname'
1391 + $install_prog $dir/$dlname \$dldir/$dlname~
1392 + chmod a+x \$dldir/$dlname'
1393 postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1394 dlpath=$dir/\$dldll~
1395 $rm \$dlpath'
1396 @@ -2204,7 +1351,7 @@
1397 ;;
1398 pw32*)
1399 # pw32 DLLs use 'pw' prefix rather than 'lib'
1400 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
1401 + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1402 ;;
1403 esac
1404 ;;
1405 @@ -2227,7 +1374,7 @@
1406 soname_spec='${libname}${release}${major}$shared_ext'
1407 shlibpath_overrides_runpath=yes
1408 shlibpath_var=DYLD_LIBRARY_PATH
1409 - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
1410 + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
1411 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
1412 if test "$GCC" = yes; then
1413 sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
1414 @@ -2250,20 +1397,17 @@
1415 dynamic_linker=no
1416 ;;
1417
1418 -kfreebsd*-gnu)
1419 - version_type=linux
1420 - need_lib_prefix=no
1421 - need_version=no
1422 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1423 - soname_spec='${libname}${release}${shared_ext}$major'
1424 - shlibpath_var=LD_LIBRARY_PATH
1425 - shlibpath_overrides_runpath=no
1426 - hardcode_into_libs=yes
1427 - dynamic_linker='GNU ld.so'
1428 - ;;
1429 -
1430 -freebsd*)
1431 - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
1432 +freebsd* | dragonfly*)
1433 + # DragonFly does not have aout. When/if they implement a new
1434 + # versioning mechanism, adjust this.
1435 + if test -x /usr/bin/objformat; then
1436 + objformat=`/usr/bin/objformat`
1437 + else
1438 + case $host_os in
1439 + freebsd[[123]]*) objformat=aout ;;
1440 + *) objformat=elf ;;
1441 + esac
1442 + fi
1443 version_type=freebsd-$objformat
1444 case $version_type in
1445 freebsd-elf*)
1446 @@ -2281,14 +1425,19 @@
1447 freebsd2*)
1448 shlibpath_overrides_runpath=yes
1449 ;;
1450 - freebsd3.[01]* | freebsdelf3.[01]*)
1451 + freebsd3.[[01]]* | freebsdelf3.[[01]]*)
1452 shlibpath_overrides_runpath=yes
1453 hardcode_into_libs=yes
1454 ;;
1455 - *) # from 3.2 on
1456 + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
1457 + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
1458 shlibpath_overrides_runpath=no
1459 hardcode_into_libs=yes
1460 ;;
1461 + freebsd*) # from 4.6 on
1462 + shlibpath_overrides_runpath=yes
1463 + hardcode_into_libs=yes
1464 + ;;
1465 esac
1466 ;;
1467
1468 @@ -2308,7 +1457,7 @@
1469 version_type=sunos
1470 need_lib_prefix=no
1471 need_version=no
1472 - case "$host_cpu" in
1473 + case $host_cpu in
1474 ia64*)
1475 shrext_cmds='.so'
1476 hardcode_into_libs=yes
1477 @@ -2348,6 +1497,18 @@
1478 postinstall_cmds='chmod 555 $lib'
1479 ;;
1480
1481 +interix3*)
1482 + version_type=linux
1483 + need_lib_prefix=no
1484 + need_version=no
1485 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1486 + soname_spec='${libname}${release}${shared_ext}$major'
1487 + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
1488 + shlibpath_var=LD_LIBRARY_PATH
1489 + shlibpath_overrides_runpath=no
1490 + hardcode_into_libs=yes
1491 + ;;
1492 +
1493 irix5* | irix6* | nonstopux*)
1494 case $host_os in
1495 nonstopux*) version_type=nonstopux ;;
1496 @@ -2391,7 +1552,7 @@
1497 ;;
1498
1499 # This must be Linux ELF.
1500 -linux*)
1501 +linux* | k*bsd*-gnu)
1502 version_type=linux
1503 need_lib_prefix=no
1504 need_version=no
1505 @@ -2407,7 +1568,7 @@
1506
1507 # Append ld.so.conf contents to the search path
1508 if test -f /etc/ld.so.conf; then
1509 - lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
1510 + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1511 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1512 fi
1513
1514 @@ -2432,18 +1593,6 @@
1515 dynamic_linker='NetBSD ld.elf_so'
1516 ;;
1517
1518 -knetbsd*-gnu)
1519 - version_type=linux
1520 - need_lib_prefix=no
1521 - need_version=no
1522 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1523 - soname_spec='${libname}${release}${shared_ext}$major'
1524 - shlibpath_var=LD_LIBRARY_PATH
1525 - shlibpath_overrides_runpath=no
1526 - hardcode_into_libs=yes
1527 - dynamic_linker='GNU ld.so'
1528 - ;;
1529 -
1530 netbsd*)
1531 version_type=sunos
1532 need_lib_prefix=no
1533 @@ -2481,8 +1630,13 @@
1534
1535 openbsd*)
1536 version_type=sunos
1537 + sys_lib_dlsearch_path_spec="/usr/lib"
1538 need_lib_prefix=no
1539 - need_version=yes
1540 + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
1541 + case $host_os in
1542 + openbsd3.3 | openbsd3.3.*) need_version=yes ;;
1543 + *) need_version=no ;;
1544 + esac
1545 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
1546 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
1547 shlibpath_var=LD_LIBRARY_PATH
1548 @@ -2520,13 +1674,6 @@
1549 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
1550 ;;
1551
1552 -sco3.2v5*)
1553 - version_type=osf
1554 - soname_spec='${libname}${release}${shared_ext}$major'
1555 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1556 - shlibpath_var=LD_LIBRARY_PATH
1557 - ;;
1558 -
1559 solaris*)
1560 version_type=linux
1561 need_lib_prefix=no
1562 @@ -2552,7 +1699,7 @@
1563 need_version=yes
1564 ;;
1565
1566 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
1567 +sysv4 | sysv4.3*)
1568 version_type=linux
1569 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1570 soname_spec='${libname}${release}${shared_ext}$major'
1571 @@ -2585,6 +1732,29 @@
1572 fi
1573 ;;
1574
1575 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
1576 + version_type=freebsd-elf
1577 + need_lib_prefix=no
1578 + need_version=no
1579 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
1580 + soname_spec='${libname}${release}${shared_ext}$major'
1581 + shlibpath_var=LD_LIBRARY_PATH
1582 + hardcode_into_libs=yes
1583 + if test "$with_gnu_ld" = yes; then
1584 + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
1585 + shlibpath_overrides_runpath=no
1586 + else
1587 + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
1588 + shlibpath_overrides_runpath=yes
1589 + case $host_os in
1590 + sco3.2v5*)
1591 + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
1592 + ;;
1593 + esac
1594 + fi
1595 + sys_lib_dlsearch_path_spec='/usr/lib'
1596 + ;;
1597 +
1598 uts4*)
1599 version_type=linux
1600 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1601 @@ -2598,6 +1768,11 @@
1602 esac
1603 AC_MSG_RESULT([$dynamic_linker])
1604 test "$dynamic_linker" = no && can_build_shared=no
1605 +
1606 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1607 +if test "$GCC" = yes; then
1608 + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
1609 +fi
1610 ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
1611
1612
1613 @@ -2622,6 +1797,9 @@
1614 AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
1615 fi
1616 fi
1617 + if test -z "$LTCFLAGS"; then
1618 + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
1619 + fi
1620
1621 # Extract list of available tagged configurations in $ofile.
1622 # Note that this assumes the entire list is on one line.
1623 @@ -2648,7 +1826,9 @@
1624
1625 case $tagname in
1626 CXX)
1627 - if test -n "$CXX" && test "X$CXX" != "Xno"; then
1628 + if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1629 + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1630 + (test "X$CXX" != "Xg++"))) ; then
1631 AC_LIBTOOL_LANG_CXX_CONFIG
1632 else
1633 tagname=""
1634 @@ -2710,7 +1890,7 @@
1635
1636 # AC_LIBTOOL_WIN32_DLL
1637 # --------------------
1638 -# declare package support for building win32 dll's
1639 +# declare package support for building win32 DLLs
1640 AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
1641 [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
1642 ])# AC_LIBTOOL_WIN32_DLL
1643 @@ -2748,7 +1928,7 @@
1644
1645 # AC_DISABLE_SHARED
1646 # -----------------
1647 -#- set the default shared flag to --disable-shared
1648 +# set the default shared flag to --disable-shared
1649 AC_DEFUN([AC_DISABLE_SHARED],
1650 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
1651 AC_ENABLE_SHARED(no)
1652 @@ -2884,7 +2064,7 @@
1653 if test -n "$file_magic_test_file"; then
1654 case $deplibs_check_method in
1655 "file_magic "*)
1656 - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
1657 + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
1658 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
1659 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
1660 $EGREP "$file_magic_regex" > /dev/null; then
1661 @@ -2994,7 +2174,7 @@
1662 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
1663 lt_cv_path_LD="$ac_dir/$ac_prog"
1664 # Check to see if the program is GNU ld. I'd rather use --version,
1665 - # but apparently some GNU ld's only accept -v.
1666 + # but apparently some variants of GNU ld only accept -v.
1667 # Break only if it was the GNU/non-GNU ld that we prefer.
1668 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
1669 *GNU* | *'with BFD'*)
1670 @@ -3026,7 +2206,7 @@
1671 AC_DEFUN([AC_PROG_LD_GNU],
1672 [AC_REQUIRE([AC_PROG_EGREP])dnl
1673 AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
1674 -[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
1675 +[# I'd rather use --version here, but apparently some GNU lds only accept -v.
1676 case `$LD -v 2>&1 </dev/null` in
1677 *GNU* | *'with BFD'*)
1678 lt_cv_prog_gnu_ld=yes
1679 @@ -3053,6 +2233,15 @@
1680 *) reload_flag=" $reload_flag" ;;
1681 esac
1682 reload_cmds='$LD$reload_flag -o $output$reload_objs'
1683 +case $host_os in
1684 + darwin*)
1685 + if test "$GCC" = yes; then
1686 + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
1687 + else
1688 + reload_cmds='$LD$reload_flag -o $output$reload_objs'
1689 + fi
1690 + ;;
1691 +esac
1692 ])# AC_PROG_LD_RELOAD_FLAG
1693
1694
1695 @@ -3086,7 +2275,7 @@
1696 lt_cv_deplibs_check_method=pass_all
1697 ;;
1698
1699 -bsdi4*)
1700 +bsdi[[45]]*)
1701 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
1702 lt_cv_file_magic_cmd='/usr/bin/file -L'
1703 lt_cv_file_magic_test_file=/shlib/libc.so
1704 @@ -3109,13 +2298,13 @@
1705 lt_cv_deplibs_check_method=pass_all
1706 ;;
1707
1708 -freebsd* | kfreebsd*-gnu)
1709 +freebsd* | dragonfly*)
1710 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
1711 case $host_cpu in
1712 i*86 )
1713 # Not sure whether the presence of OpenBSD here was a mistake.
1714 # Let's accept both of them until this is cleared up.
1715 - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
1716 + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
1717 lt_cv_file_magic_cmd=/usr/bin/file
1718 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
1719 ;;
1720 @@ -3131,7 +2320,7 @@
1721
1722 hpux10.20* | hpux11*)
1723 lt_cv_file_magic_cmd=/usr/bin/file
1724 - case "$host_cpu" in
1725 + case $host_cpu in
1726 ia64*)
1727 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
1728 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
1729 @@ -3147,6 +2336,11 @@
1730 esac
1731 ;;
1732
1733 +interix3*)
1734 + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
1735 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
1736 + ;;
1737 +
1738 irix5* | irix6* | nonstopux*)
1739 case $LD in
1740 *-32|*"-32 ") libmagic=32-bit;;
1741 @@ -3158,11 +2352,11 @@
1742 ;;
1743
1744 # This must be Linux ELF.
1745 -linux*)
1746 +linux* | k*bsd*-gnu)
1747 lt_cv_deplibs_check_method=pass_all
1748 ;;
1749
1750 -netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
1751 +netbsd* | netbsdelf*-gnu)
1752 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
1753 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
1754 else
1755 @@ -3181,12 +2375,10 @@
1756 ;;
1757
1758 openbsd*)
1759 - lt_cv_file_magic_cmd=/usr/bin/file
1760 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
1761 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
1762 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
1763 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
1764 else
1765 - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
1766 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
1767 fi
1768 ;;
1769
1770 @@ -3194,15 +2386,11 @@
1771 lt_cv_deplibs_check_method=pass_all
1772 ;;
1773
1774 -sco3.2v5*)
1775 - lt_cv_deplibs_check_method=pass_all
1776 - ;;
1777 -
1778 solaris*)
1779 lt_cv_deplibs_check_method=pass_all
1780 ;;
1781
1782 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
1783 +sysv4 | sysv4.3*)
1784 case $host_vendor in
1785 motorola)
1786 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
1787 @@ -3223,10 +2411,13 @@
1788 siemens)
1789 lt_cv_deplibs_check_method=pass_all
1790 ;;
1791 + pc)
1792 + lt_cv_deplibs_check_method=pass_all
1793 + ;;
1794 esac
1795 ;;
1796
1797 -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
1798 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
1799 lt_cv_deplibs_check_method=pass_all
1800 ;;
1801 esac
1802 @@ -3246,36 +2437,43 @@
1803 # Let the user override the test.
1804 lt_cv_path_NM="$NM"
1805 else
1806 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1807 - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
1808 - IFS="$lt_save_ifs"
1809 - test -z "$ac_dir" && ac_dir=.
1810 - tmp_nm="$ac_dir/${ac_tool_prefix}nm"
1811 - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
1812 - # Check to see if the nm accepts a BSD-compat flag.
1813 - # Adding the `sed 1q' prevents false positives on HP-UX, which says:
1814 - # nm: unknown option "B" ignored
1815 - # Tru64's nm complains that /dev/null is an invalid object file
1816 - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
1817 - */dev/null* | *'Invalid file or object type'*)
1818 - lt_cv_path_NM="$tmp_nm -B"
1819 - break
1820 - ;;
1821 - *)
1822 - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
1823 - */dev/null*)
1824 - lt_cv_path_NM="$tmp_nm -p"
1825 + lt_nm_to_check="${ac_tool_prefix}nm"
1826 + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
1827 + lt_nm_to_check="$lt_nm_to_check nm"
1828 + fi
1829 + for lt_tmp_nm in $lt_nm_to_check; do
1830 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1831 + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
1832 + IFS="$lt_save_ifs"
1833 + test -z "$ac_dir" && ac_dir=.
1834 + tmp_nm="$ac_dir/$lt_tmp_nm"
1835 + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
1836 + # Check to see if the nm accepts a BSD-compat flag.
1837 + # Adding the `sed 1q' prevents false positives on HP-UX, which says:
1838 + # nm: unknown option "B" ignored
1839 + # Tru64's nm complains that /dev/null is an invalid object file
1840 + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
1841 + */dev/null* | *'Invalid file or object type'*)
1842 + lt_cv_path_NM="$tmp_nm -B"
1843 break
1844 ;;
1845 *)
1846 - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
1847 - continue # so that we can try to find one that supports BSD flags
1848 + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
1849 + */dev/null*)
1850 + lt_cv_path_NM="$tmp_nm -p"
1851 + break
1852 + ;;
1853 + *)
1854 + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
1855 + continue # so that we can try to find one that supports BSD flags
1856 + ;;
1857 + esac
1858 ;;
1859 esac
1860 - esac
1861 - fi
1862 + fi
1863 + done
1864 + IFS="$lt_save_ifs"
1865 done
1866 - IFS="$lt_save_ifs"
1867 test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
1868 fi])
1869 NM="$lt_cv_path_NM"
1870 @@ -3307,13 +2505,13 @@
1871 # -----------------------------------
1872 # sets LIBLTDL to the link flags for the libltdl convenience library and
1873 # LTDLINCL to the include flags for the libltdl header and adds
1874 -# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
1875 -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
1876 -# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
1877 -# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
1878 -# '${top_srcdir}/' (note the single quotes!). If your package is not
1879 -# flat and you're not using automake, define top_builddir and
1880 -# top_srcdir appropriately in the Makefiles.
1881 +# --enable-ltdl-convenience to the configure arguments. Note that
1882 +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
1883 +# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
1884 +# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
1885 +# (note the single quotes!). If your package is not flat and you're not
1886 +# using automake, define top_builddir and top_srcdir appropriately in
1887 +# the Makefiles.
1888 AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
1889 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
1890 case $enable_ltdl_convenience in
1891 @@ -3332,13 +2530,13 @@
1892 # -----------------------------------
1893 # sets LIBLTDL to the link flags for the libltdl installable library and
1894 # LTDLINCL to the include flags for the libltdl header and adds
1895 -# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
1896 -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
1897 -# DIRECTORY is not provided and an installed libltdl is not found, it is
1898 -# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
1899 -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
1900 -# quotes!). If your package is not flat and you're not using automake,
1901 -# define top_builddir and top_srcdir appropriately in the Makefiles.
1902 +# --enable-ltdl-install to the configure arguments. Note that
1903 +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
1904 +# and an installed libltdl is not found, it is assumed to be `libltdl'.
1905 +# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
1906 +# '${top_srcdir}/' (note the single quotes!). If your package is not
1907 +# flat and you're not using automake, define top_builddir and top_srcdir
1908 +# appropriately in the Makefiles.
1909 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
1910 AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
1911 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
1912 @@ -3376,10 +2574,21 @@
1913 # ---------------
1914 AC_DEFUN([_LT_AC_LANG_CXX],
1915 [AC_REQUIRE([AC_PROG_CXX])
1916 -AC_REQUIRE([AC_PROG_CXXCPP])
1917 +AC_REQUIRE([_LT_AC_PROG_CXXCPP])
1918 _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
1919 ])# _LT_AC_LANG_CXX
1920
1921 +# _LT_AC_PROG_CXXCPP
1922 +# ------------------
1923 +AC_DEFUN([_LT_AC_PROG_CXXCPP],
1924 +[
1925 +AC_REQUIRE([AC_PROG_CXX])
1926 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1927 + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1928 + (test "X$CXX" != "Xg++"))) ; then
1929 + AC_PROG_CXXCPP
1930 +fi
1931 +])# _LT_AC_PROG_CXXCPP
1932
1933 # AC_LIBTOOL_F77
1934 # --------------
1935 @@ -3419,7 +2628,7 @@
1936
1937
1938 # AC_LIBTOOL_RC
1939 -# --------------
1940 +# -------------
1941 # enable support for Windows resource files
1942 AC_DEFUN([AC_LIBTOOL_RC],
1943 [AC_REQUIRE([LT_AC_PROG_RC])
1944 @@ -3452,36 +2661,9 @@
1945
1946 _LT_AC_SYS_COMPILER
1947
1948 -#
1949 -# Check for any special shared library compilation flags.
1950 -#
1951 -_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
1952 -if test "$GCC" = no; then
1953 - case $host_os in
1954 - sco3.2v5*)
1955 - _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
1956 - ;;
1957 - esac
1958 -fi
1959 -if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
1960 - AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
1961 - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
1962 - else
1963 - AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
1964 - _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
1965 - fi
1966 -fi
1967 -
1968 -
1969 -#
1970 -# Check to make sure the static flag actually works.
1971 -#
1972 -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
1973 - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
1974 - $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
1975 - [],
1976 - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
1977 -
1978 +# save warnings/boilerplate of simple test code
1979 +_LT_COMPILER_BOILERPLATE
1980 +_LT_LINKER_BOILERPLATE
1981
1982 AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
1983 AC_LIBTOOL_PROG_COMPILER_PIC($1)
1984 @@ -3491,9 +2673,9 @@
1985 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
1986 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
1987 AC_LIBTOOL_SYS_LIB_STRIP
1988 -AC_LIBTOOL_DLOPEN_SELF($1)
1989 +AC_LIBTOOL_DLOPEN_SELF
1990
1991 -# Report which librarie types wil actually be built
1992 +# Report which library types will actually be built
1993 AC_MSG_CHECKING([if libtool supports shared libraries])
1994 AC_MSG_RESULT([$can_build_shared])
1995
1996 @@ -3502,7 +2684,7 @@
1997
1998 # On AIX, shared libraries and static libraries use the same namespace, and
1999 # are all built from PIC.
2000 -case "$host_os" in
2001 +case $host_os in
2002 aix3*)
2003 test "$enable_shared" = yes && enable_static=no
2004 if test -n "$RANLIB"; then
2005 @@ -3515,43 +2697,6 @@
2006 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
2007 test "$enable_shared" = yes && enable_static=no
2008 fi
2009 - ;;
2010 - darwin* | rhapsody*)
2011 - if test "$GCC" = yes; then
2012 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2013 - case "$host_os" in
2014 - rhapsody* | darwin1.[[012]])
2015 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
2016 - ;;
2017 - *) # Darwin 1.3 on
2018 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
2019 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2020 - else
2021 - case ${MACOSX_DEPLOYMENT_TARGET} in
2022 - 10.[[012]])
2023 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2024 - ;;
2025 - 10.*)
2026 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
2027 - ;;
2028 - esac
2029 - fi
2030 - ;;
2031 - esac
2032 - output_verbose_link_cmd='echo'
2033 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
2034 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2035 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
2036 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2037 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2038 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
2039 - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2040 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2041 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
2042 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2043 - else
2044 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
2045 - fi
2046 ;;
2047 esac
2048 AC_MSG_RESULT([$enable_shared])
2049 @@ -3577,7 +2722,7 @@
2050 AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
2051 [AC_LANG_PUSH(C++)
2052 AC_REQUIRE([AC_PROG_CXX])
2053 -AC_REQUIRE([AC_PROG_CXXCPP])
2054 +AC_REQUIRE([_LT_AC_PROG_CXXCPP])
2055
2056 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2057 _LT_AC_TAGVAR(allow_undefined_flag, $1)=
2058 @@ -3589,6 +2734,7 @@
2059 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
2060 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
2061 _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
2062 +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2063 _LT_AC_TAGVAR(hardcode_automatic, $1)=no
2064 _LT_AC_TAGVAR(module_cmds, $1)=
2065 _LT_AC_TAGVAR(module_expsym_cmds, $1)=
2066 @@ -3606,7 +2752,7 @@
2067 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
2068
2069 # Source file extension for C++ test sources.
2070 -ac_ext=cc
2071 +ac_ext=cpp
2072
2073 # Object file extension for compiled C++ test sources.
2074 objext=o
2075 @@ -3616,11 +2762,15 @@
2076 lt_simple_compile_test_code="int some_variable = 0;\n"
2077
2078 # Code to be used in simple link tests
2079 -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
2080 +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
2081
2082 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
2083 _LT_AC_SYS_COMPILER
2084
2085 +# save warnings/boilerplate of simple test code
2086 +_LT_COMPILER_BOILERPLATE
2087 +_LT_LINKER_BOILERPLATE
2088 +
2089 # Allow CC to be a program name with arguments.
2090 lt_save_CC=$CC
2091 lt_save_LD=$LD
2092 @@ -3631,18 +2781,18 @@
2093 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
2094 lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
2095 else
2096 - unset lt_cv_prog_gnu_ld
2097 + $as_unset lt_cv_prog_gnu_ld
2098 fi
2099 if test -n "${lt_cv_path_LDCXX+set}"; then
2100 lt_cv_path_LD=$lt_cv_path_LDCXX
2101 else
2102 - unset lt_cv_path_LD
2103 + $as_unset lt_cv_path_LD
2104 fi
2105 test -z "${LDCXX+set}" || LD=$LDCXX
2106 CC=${CXX-"c++"}
2107 compiler=$CC
2108 _LT_AC_TAGVAR(compiler, $1)=$CC
2109 -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
2110 +_LT_CC_BASENAME([$compiler])
2111
2112 # We don't want -fno-exception wen compiling C++ code, so set the
2113 # no_builtin_flag separately
2114 @@ -3731,6 +2881,7 @@
2115 ;;
2116 esac
2117 done
2118 + ;;
2119 esac
2120
2121 exp_sym_flag='-bexport'
2122 @@ -3749,7 +2900,7 @@
2123 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2124
2125 if test "$GXX" = yes; then
2126 - case $host_os in aix4.[012]|aix4.[012].*)
2127 + case $host_os in aix4.[[012]]|aix4.[[012]].*)
2128 # We only want to do this on AIX 4.2 and lower, the check
2129 # below for broken collect2 doesn't work under 4.3+
2130 collect2name=`${CC} -print-prog-name=collect2`
2131 @@ -3768,8 +2919,12 @@
2132 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2133 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
2134 fi
2135 + ;;
2136 esac
2137 shared_flag='-shared'
2138 + if test "$aix_use_runtimelinking" = yes; then
2139 + shared_flag="$shared_flag "'${wl}-G'
2140 + fi
2141 else
2142 # not using gcc
2143 if test "$host_cpu" = ia64; then
2144 @@ -3796,12 +2951,12 @@
2145 _LT_AC_SYS_LIBPATH_AIX
2146 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2147
2148 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2149 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2150 else
2151 if test "$host_cpu" = ia64; then
2152 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2153 _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
2154 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
2155 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
2156 else
2157 # Determine the default libpath from the value encoded in an empty executable.
2158 _LT_AC_SYS_LIBPATH_AIX
2159 @@ -3810,16 +2965,26 @@
2160 # -berok will link without error, but may produce a broken library.
2161 _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
2162 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
2163 - # -bexpall does not export symbols beginning with underscore (_)
2164 - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
2165 # Exported symbols can be pulled into shared objects from archives
2166 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
2167 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2168 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
2169 - # This is similar to how AIX traditionally builds it's shared libraries.
2170 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
2171 + # This is similar to how AIX traditionally builds its shared libraries.
2172 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
2173 fi
2174 fi
2175 ;;
2176 +
2177 + beos*)
2178 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
2179 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
2180 + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
2181 + # support --undefined. This deserves some investigation. FIXME
2182 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2183 + else
2184 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
2185 + fi
2186 + ;;
2187 +
2188 chorus*)
2189 case $cc_basename in
2190 *)
2191 @@ -3838,7 +3003,7 @@
2192 _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2193
2194 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
2195 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
2196 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2197 # If the export-symbols file already is a .def file (1st line
2198 # is EXPORTS), use it as is; otherwise, prepend...
2199 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2200 @@ -3847,70 +3012,81 @@
2201 echo EXPORTS > $output_objdir/$soname.def;
2202 cat $export_symbols >> $output_objdir/$soname.def;
2203 fi~
2204 - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
2205 + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2206 else
2207 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2208 fi
2209 ;;
2210 + darwin* | rhapsody*)
2211 + case $host_os in
2212 + rhapsody* | darwin1.[[012]])
2213 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
2214 + ;;
2215 + *) # Darwin 1.3 on
2216 + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
2217 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
2218 + else
2219 + case ${MACOSX_DEPLOYMENT_TARGET} in
2220 + 10.[[012]])
2221 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
2222 + ;;
2223 + 10.*)
2224 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
2225 + ;;
2226 + esac
2227 + fi
2228 + ;;
2229 + esac
2230 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2231 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
2232 + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2233 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2234 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
2235 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2236
2237 - darwin* | rhapsody*)
2238 - if test "$GXX" = yes; then
2239 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2240 - case "$host_os" in
2241 - rhapsody* | darwin1.[[012]])
2242 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
2243 - ;;
2244 - *) # Darwin 1.3 on
2245 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
2246 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2247 + if test "$GXX" = yes ; then
2248 + lt_int_apple_cc_single_mod=no
2249 + output_verbose_link_cmd='echo'
2250 + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
2251 + lt_int_apple_cc_single_mod=yes
2252 + fi
2253 + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2254 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2255 else
2256 - case ${MACOSX_DEPLOYMENT_TARGET} in
2257 - 10.[[012]])
2258 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2259 - ;;
2260 - 10.*)
2261 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
2262 - ;;
2263 - esac
2264 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2265 + fi
2266 + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2267 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
2268 + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2269 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2270 + else
2271 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2272 + fi
2273 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2274 + else
2275 + case $cc_basename in
2276 + xlc*)
2277 + output_verbose_link_cmd='echo'
2278 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
2279 + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2280 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
2281 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2282 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2283 + ;;
2284 + *)
2285 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
2286 + ;;
2287 + esac
2288 fi
2289 - ;;
2290 - esac
2291 - lt_int_apple_cc_single_mod=no
2292 - output_verbose_link_cmd='echo'
2293 - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
2294 - lt_int_apple_cc_single_mod=yes
2295 - fi
2296 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2297 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2298 - else
2299 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2300 - fi
2301 - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2302 -
2303 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
2304 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2305 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2306 - else
2307 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2308 - fi
2309 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2310 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
2311 - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2312 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2313 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
2314 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2315 - else
2316 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
2317 - fi
2318 - ;;
2319 + ;;
2320
2321 dgux*)
2322 case $cc_basename in
2323 - ec++)
2324 + ec++*)
2325 # FIXME: insert proper C++ library support
2326 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2327 ;;
2328 - ghcx)
2329 + ghcx*)
2330 # Green Hills C++ Compiler
2331 # FIXME: insert proper C++ library support
2332 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2333 @@ -3921,14 +3097,14 @@
2334 ;;
2335 esac
2336 ;;
2337 - freebsd[12]*)
2338 + freebsd[[12]]*)
2339 # C++ shared libraries reported to be fairly broken before switch to ELF
2340 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2341 ;;
2342 freebsd-elf*)
2343 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2344 ;;
2345 - freebsd* | kfreebsd*-gnu)
2346 + freebsd* | dragonfly*)
2347 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
2348 # conventions
2349 _LT_AC_TAGVAR(ld_shlibs, $1)=yes
2350 @@ -3945,11 +3121,11 @@
2351 # location of the library.
2352
2353 case $cc_basename in
2354 - CC)
2355 + CC*)
2356 # FIXME: insert proper C++ library support
2357 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2358 ;;
2359 - aCC)
2360 + aCC*)
2361 _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2362 # Commands to make compiler produce verbose output that lists
2363 # what "hidden" libraries, object files and flags are used when
2364 @@ -3959,7 +3135,7 @@
2365 # explicitly linking system object files so we need to strip them
2366 # from the output so that they don't get included in the library
2367 # dependencies.
2368 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
2369 + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
2370 ;;
2371 *)
2372 if test "$GXX" = yes; then
2373 @@ -3973,33 +3149,22 @@
2374 ;;
2375 hpux10*|hpux11*)
2376 if test $with_gnu_ld = no; then
2377 - case "$host_cpu" in
2378 - hppa*64*)
2379 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
2380 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
2381 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
2382 +
2383 + case $host_cpu in
2384 + hppa*64*|ia64*)
2385 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
2386 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
2387 - ;;
2388 - ia64*)
2389 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2390 ;;
2391 *)
2392 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
2393 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
2394 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
2395 ;;
2396 esac
2397 fi
2398 - case "$host_cpu" in
2399 - hppa*64*)
2400 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
2401 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
2402 - ;;
2403 - ia64*)
2404 + case $host_cpu in
2405 + hppa*64*|ia64*)
2406 _LT_AC_TAGVAR(hardcode_direct, $1)=no
2407 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
2408 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
2409 - # but as the default
2410 - # location of the library.
2411 ;;
2412 *)
2413 _LT_AC_TAGVAR(hardcode_direct, $1)=yes
2414 @@ -4010,14 +3175,17 @@
2415 esac
2416
2417 case $cc_basename in
2418 - CC)
2419 + CC*)
2420 # FIXME: insert proper C++ library support
2421 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2422 ;;
2423 - aCC)
2424 - case "$host_cpu" in
2425 - hppa*64*|ia64*)
2426 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
2427 + aCC*)
2428 + case $host_cpu in
2429 + hppa*64*)
2430 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2431 + ;;
2432 + ia64*)
2433 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2434 ;;
2435 *)
2436 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2437 @@ -4036,9 +3204,12 @@
2438 *)
2439 if test "$GXX" = yes; then
2440 if test $with_gnu_ld = no; then
2441 - case "$host_cpu" in
2442 - ia64*|hppa*64*)
2443 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
2444 + case $host_cpu in
2445 + hppa*64*)
2446 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2447 + ;;
2448 + ia64*)
2449 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2450 ;;
2451 *)
2452 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2453 @@ -4052,11 +3223,25 @@
2454 ;;
2455 esac
2456 ;;
2457 + interix3*)
2458 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
2459 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
2460 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
2461 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
2462 + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
2463 + # Instead, shared libraries are loaded at an image base (0x10000000 by
2464 + # default) and relocated if they conflict, which is a slow very memory
2465 + # consuming and fragmenting process. To avoid this, we pick a random,
2466 + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
2467 + # time. Moving up from 0x10000000 also allows more sbrk(2) space.
2468 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
2469 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
2470 + ;;
2471 irix5* | irix6*)
2472 case $cc_basename in
2473 - CC)
2474 + CC*)
2475 # SGI C++
2476 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
2477 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
2478
2479 # Archives containing C++ object files must be created using
2480 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
2481 @@ -4067,7 +3252,7 @@
2482 *)
2483 if test "$GXX" = yes; then
2484 if test "$with_gnu_ld" = no; then
2485 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
2486 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2487 else
2488 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
2489 fi
2490 @@ -4078,9 +3263,9 @@
2491 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2492 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
2493 ;;
2494 - linux*)
2495 + linux* | k*bsd*-gnu)
2496 case $cc_basename in
2497 - KCC)
2498 + KCC*)
2499 # Kuck and Associates, Inc. (KAI) C++ Compiler
2500
2501 # KCC will only create a shared library if the output file
2502 @@ -4105,17 +3290,41 @@
2503 # "CC -Bstatic", where "CC" is the KAI C++ compiler.
2504 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
2505 ;;
2506 - icpc)
2507 + icpc*)
2508 # Intel C++
2509 with_gnu_ld=yes
2510 + # version 8.0 and above of icpc choke on multiply defined symbols
2511 + # if we add $predep_objects and $postdep_objects, however 7.1 and
2512 + # earlier do not add the objects themselves.
2513 + case `$CC -V 2>&1` in
2514 + *"Version 7."*)
2515 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
2516 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2517 + ;;
2518 + *) # Version 8.0 or newer
2519 + tmp_idyn=
2520 + case $host_cpu in
2521 + ia64*) tmp_idyn=' -i_dynamic';;
2522 + esac
2523 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2524 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2525 + ;;
2526 + esac
2527 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2528 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
2529 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2530 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
2531 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2532 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
2533 ;;
2534 - cxx)
2535 + pgCC*)
2536 + # Portland Group C++ compiler
2537 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2538 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
2539 +
2540 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
2541 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2542 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
2543 + ;;
2544 + cxx*)
2545 # Compaq C++
2546 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
2547 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
2548 @@ -4146,7 +3355,7 @@
2549 ;;
2550 mvs*)
2551 case $cc_basename in
2552 - cxx)
2553 + cxx*)
2554 # FIXME: insert proper C++ library support
2555 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2556 ;;
2557 @@ -4156,7 +3365,7 @@
2558 ;;
2559 esac
2560 ;;
2561 - netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
2562 + netbsd* | netbsdelf*-gnu)
2563 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
2564 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
2565 wlarc=
2566 @@ -4167,15 +3376,31 @@
2567 # Workaround some broken pre-1.5 toolchains
2568 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
2569 ;;
2570 - osf3*)
2571 - case $cc_basename in
2572 - KCC)
2573 - # Kuck and Associates, Inc. (KAI) C++ Compiler
2574 -
2575 - # KCC will only create a shared library if the output file
2576 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
2577 - # to its proper name (with version) after linking.
2578 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
2579 + openbsd2*)
2580 + # C++ shared libraries are fairly broken
2581 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
2582 + ;;
2583 + openbsd*)
2584 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
2585 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
2586 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
2587 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
2588 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
2589 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
2590 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
2591 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
2592 + fi
2593 + output_verbose_link_cmd='echo'
2594 + ;;
2595 + osf3*)
2596 + case $cc_basename in
2597 + KCC*)
2598 + # Kuck and Associates, Inc. (KAI) C++ Compiler
2599 +
2600 + # KCC will only create a shared library if the output file
2601 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
2602 + # to its proper name (with version) after linking.
2603 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
2604
2605 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
2606 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
2607 @@ -4185,14 +3410,14 @@
2608 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
2609
2610 ;;
2611 - RCC)
2612 + RCC*)
2613 # Rational C++ 2.4.1
2614 # FIXME: insert proper C++ library support
2615 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2616 ;;
2617 - cxx)
2618 + cxx*)
2619 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2620 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
2621 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
2622
2623 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2624 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
2625 @@ -4210,7 +3435,7 @@
2626 *)
2627 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
2628 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2629 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
2630 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2631
2632 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2633 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
2634 @@ -4229,7 +3454,7 @@
2635 ;;
2636 osf4* | osf5*)
2637 case $cc_basename in
2638 - KCC)
2639 + KCC*)
2640 # Kuck and Associates, Inc. (KAI) C++ Compiler
2641
2642 # KCC will only create a shared library if the output file
2643 @@ -4244,17 +3469,17 @@
2644 # the KAI C++ compiler.
2645 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
2646 ;;
2647 - RCC)
2648 + RCC*)
2649 # Rational C++ 2.4.1
2650 # FIXME: insert proper C++ library support
2651 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2652 ;;
2653 - cxx)
2654 + cxx*)
2655 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2656 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
2657 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
2658 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
2659 echo "-hidden">> $lib.exp~
2660 - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
2661 + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
2662 $rm $lib.exp'
2663
2664 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
2665 @@ -4273,7 +3498,7 @@
2666 *)
2667 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
2668 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2669 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
2670 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2671
2672 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2673 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
2674 @@ -4294,27 +3519,14 @@
2675 # FIXME: insert proper C++ library support
2676 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2677 ;;
2678 - sco*)
2679 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2680 - case $cc_basename in
2681 - CC)
2682 - # FIXME: insert proper C++ library support
2683 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
2684 - ;;
2685 - *)
2686 - # FIXME: insert proper C++ library support
2687 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
2688 - ;;
2689 - esac
2690 - ;;
2691 sunos4*)
2692 case $cc_basename in
2693 - CC)
2694 + CC*)
2695 # Sun C++ 4.x
2696 # FIXME: insert proper C++ library support
2697 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2698 ;;
2699 - lcc)
2700 + lcc*)
2701 # Lucid
2702 # FIXME: insert proper C++ library support
2703 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2704 @@ -4327,36 +3539,33 @@
2705 ;;
2706 solaris*)
2707 case $cc_basename in
2708 - CC)
2709 + CC*)
2710 # Sun C++ 4.2, 5.x and Centerline C++
2711 + _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
2712 _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
2713 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2714 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2715 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
2716 - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
2717 + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
2718
2719 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
2720 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
2721 case $host_os in
2722 - solaris2.[0-5] | solaris2.[0-5].*) ;;
2723 + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
2724 *)
2725 # The C++ compiler is used as linker so we must use $wl
2726 # flag to pass the commands to the underlying system
2727 - # linker.
2728 + # linker. We must also pass each convience library through
2729 + # to the system linker between allextract/defaultextract.
2730 + # The C++ compiler will combine linker options so we
2731 + # cannot just pass the convience library names through
2732 + # without $wl.
2733 # Supported since Solaris 2.6 (maybe 2.5.1?)
2734 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
2735 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
2736 ;;
2737 esac
2738 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2739
2740 - # Commands to make compiler produce verbose output that lists
2741 - # what "hidden" libraries, object files and flags are used when
2742 - # linking a shared library.
2743 - #
2744 - # There doesn't appear to be a way to prevent this compiler from
2745 - # explicitly linking system object files so we need to strip them
2746 - # from the output so that they don't get included in the library
2747 - # dependencies.
2748 - output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
2749 + output_verbose_link_cmd='echo'
2750
2751 # Archives containing C++ object files must be created using
2752 # "CC -xar", where "CC" is the Sun C++ compiler. This is
2753 @@ -4364,7 +3573,7 @@
2754 # in the archive.
2755 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
2756 ;;
2757 - gcx)
2758 + gcx*)
2759 # Green Hills C++ Compiler
2760 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
2761
2762 @@ -4402,12 +3611,63 @@
2763 ;;
2764 esac
2765 ;;
2766 - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
2767 + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
2768 + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
2769 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2770 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
2771 + runpath_var='LD_RUN_PATH'
2772 +
2773 + case $cc_basename in
2774 + CC*)
2775 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2776 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2777 + ;;
2778 + *)
2779 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2780 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2781 + ;;
2782 + esac
2783 + ;;
2784 + sysv5* | sco3.2v5* | sco5v6*)
2785 + # Note: We can NOT use -z defs as we might desire, because we do not
2786 + # link with -lc, and that would cause any symbols used from libc to
2787 + # always be unresolved, which means just about no library would
2788 + # ever link correctly. If we're not using GNU ld we use -z text
2789 + # though, which does catch some bad symbols but isn't as heavy-handed
2790 + # as -z defs.
2791 + # For security reasons, it is highly recommended that you always
2792 + # use absolute paths for naming shared libraries, and exclude the
2793 + # DT_RUNPATH tag from executables and libraries. But doing so
2794 + # requires that you compile everything twice, which is a pain.
2795 + # So that behaviour is only enabled if SCOABSPATH is set to a
2796 + # non-empty value in the environment. Most likely only useful for
2797 + # creating official distributions of packages.
2798 + # This is a hack until libtool officially supports absolute path
2799 + # names for shared libraries.
2800 + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
2801 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
2802 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2803 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
2804 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
2805 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
2806 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
2807 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
2808 + runpath_var='LD_RUN_PATH'
2809 +
2810 + case $cc_basename in
2811 + CC*)
2812 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
2813 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
2814 + ;;
2815 + *)
2816 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
2817 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
2818 + ;;
2819 + esac
2820 ;;
2821 tandem*)
2822 case $cc_basename in
2823 - NCC)
2824 + NCC*)
2825 # NonStop-UX NCC 3.20
2826 # FIXME: insert proper C++ library support
2827 _LT_AC_TAGVAR(ld_shlibs, $1)=no
2828 @@ -4440,8 +3700,6 @@
2829 AC_LIBTOOL_PROG_LD_SHLIBS($1)
2830 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
2831 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
2832 -AC_LIBTOOL_SYS_LIB_STRIP
2833 -AC_LIBTOOL_DLOPEN_SELF($1)
2834
2835 AC_LIBTOOL_CONFIG($1)
2836
2837 @@ -4459,7 +3717,7 @@
2838 ])# AC_LIBTOOL_LANG_CXX_CONFIG
2839
2840 # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
2841 -# ------------------------
2842 +# ------------------------------------
2843 # Figure out "hidden" library dependencies from verbose
2844 # compiler output when linking a shared library.
2845 # Parse the compiler output and extract the necessary
2846 @@ -4513,7 +3771,7 @@
2847 # The `*' in the case matches for architectures that use `case' in
2848 # $output_verbose_cmd can trigger glob expansion during the loop
2849 # eval without this substitution.
2850 - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
2851 + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
2852
2853 for p in `eval $output_verbose_link_cmd`; do
2854 case $p in
2855 @@ -4589,13 +3847,37 @@
2856
2857 $rm -f confest.$objext
2858
2859 +# PORTME: override above test on systems where it is broken
2860 +ifelse([$1],[CXX],
2861 +[case $host_os in
2862 +interix3*)
2863 + # Interix 3.5 installs completely hosed .la files for C++, so rather than
2864 + # hack all around it, let's just trust "g++" to DTRT.
2865 + _LT_AC_TAGVAR(predep_objects,$1)=
2866 + _LT_AC_TAGVAR(postdep_objects,$1)=
2867 + _LT_AC_TAGVAR(postdeps,$1)=
2868 + ;;
2869 +
2870 +solaris*)
2871 + case $cc_basename in
2872 + CC*)
2873 + # Adding this requires a known-good setup of shared libraries for
2874 + # Sun compiler versions before 5.6, else PIC objects from an old
2875 + # archive will be linked into the output, leading to subtle bugs.
2876 + _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
2877 + ;;
2878 + esac
2879 + ;;
2880 +esac
2881 +])
2882 +
2883 case " $_LT_AC_TAGVAR(postdeps, $1) " in
2884 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
2885 esac
2886 ])# AC_LIBTOOL_POSTDEP_PREDEP
2887
2888 # AC_LIBTOOL_LANG_F77_CONFIG
2889 -# ------------------------
2890 +# --------------------------
2891 # Ensure that the configuration vars for the C compiler are
2892 # suitably defined. Those variables are subsequently used by
2893 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
2894 @@ -4639,12 +3921,16 @@
2895 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
2896 _LT_AC_SYS_COMPILER
2897
2898 +# save warnings/boilerplate of simple test code
2899 +_LT_COMPILER_BOILERPLATE
2900 +_LT_LINKER_BOILERPLATE
2901 +
2902 # Allow CC to be a program name with arguments.
2903 lt_save_CC="$CC"
2904 CC=${F77-"f77"}
2905 compiler=$CC
2906 _LT_AC_TAGVAR(compiler, $1)=$CC
2907 -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
2908 +_LT_CC_BASENAME([$compiler])
2909
2910 AC_MSG_CHECKING([if libtool supports shared libraries])
2911 AC_MSG_RESULT([$can_build_shared])
2912 @@ -4654,7 +3940,7 @@
2913
2914 # On AIX, shared libraries and static libraries use the same namespace, and
2915 # are all built from PIC.
2916 -case "$host_os" in
2917 +case $host_os in
2918 aix3*)
2919 test "$enable_shared" = yes && enable_static=no
2920 if test -n "$RANLIB"; then
2921 @@ -4663,7 +3949,9 @@
2922 fi
2923 ;;
2924 aix4* | aix5*)
2925 - test "$enable_shared" = yes && enable_static=no
2926 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
2927 + test "$enable_shared" = yes && enable_static=no
2928 + fi
2929 ;;
2930 esac
2931 AC_MSG_RESULT([$enable_shared])
2932 @@ -4673,8 +3961,6 @@
2933 test "$enable_shared" = yes || enable_static=yes
2934 AC_MSG_RESULT([$enable_static])
2935
2936 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
2937 -
2938 _LT_AC_TAGVAR(GCC, $1)="$G77"
2939 _LT_AC_TAGVAR(LD, $1)="$LD"
2940
2941 @@ -4684,8 +3970,6 @@
2942 AC_LIBTOOL_PROG_LD_SHLIBS($1)
2943 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
2944 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
2945 -AC_LIBTOOL_SYS_LIB_STRIP
2946 -
2947
2948 AC_LIBTOOL_CONFIG($1)
2949
2950 @@ -4714,20 +3998,27 @@
2951 lt_simple_compile_test_code="class foo {}\n"
2952
2953 # Code to be used in simple link tests
2954 -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
2955 +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
2956
2957 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
2958 _LT_AC_SYS_COMPILER
2959
2960 +# save warnings/boilerplate of simple test code
2961 +_LT_COMPILER_BOILERPLATE
2962 +_LT_LINKER_BOILERPLATE
2963 +
2964 # Allow CC to be a program name with arguments.
2965 lt_save_CC="$CC"
2966 CC=${GCJ-"gcj"}
2967 compiler=$CC
2968 _LT_AC_TAGVAR(compiler, $1)=$CC
2969 +_LT_CC_BASENAME([$compiler])
2970
2971 # GCJ did not exist at the time GCC didn't implicitly link libc in.
2972 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2973
2974 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2975 +
2976 AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
2977 AC_LIBTOOL_PROG_COMPILER_PIC($1)
2978 AC_LIBTOOL_PROG_CC_C_O($1)
2979 @@ -4735,8 +4026,6 @@
2980 AC_LIBTOOL_PROG_LD_SHLIBS($1)
2981 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
2982 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
2983 -AC_LIBTOOL_SYS_LIB_STRIP
2984 -AC_LIBTOOL_DLOPEN_SELF($1)
2985
2986 AC_LIBTOOL_CONFIG($1)
2987
2988 @@ -4746,7 +4035,7 @@
2989
2990
2991 # AC_LIBTOOL_LANG_RC_CONFIG
2992 -# --------------------------
2993 +# -------------------------
2994 # Ensure that the configuration vars for the Windows resource compiler are
2995 # suitably defined. Those variables are subsequently used by
2996 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
2997 @@ -4770,11 +4059,16 @@
2998 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
2999 _LT_AC_SYS_COMPILER
3000
3001 +# save warnings/boilerplate of simple test code
3002 +_LT_COMPILER_BOILERPLATE
3003 +_LT_LINKER_BOILERPLATE
3004 +
3005 # Allow CC to be a program name with arguments.
3006 lt_save_CC="$CC"
3007 CC=${RC-"windres"}
3008 compiler=$CC
3009 _LT_AC_TAGVAR(compiler, $1)=$CC
3010 +_LT_CC_BASENAME([$compiler])
3011 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
3012
3013 AC_LIBTOOL_CONFIG($1)
3014 @@ -4804,7 +4098,7 @@
3015 # Now quote all the things that may contain metacharacters while being
3016 # careful not to overquote the AC_SUBSTed values. We take copies of the
3017 # variables and quote the copies for generation of the libtool script.
3018 - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
3019 + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
3020 SED SHELL STRIP \
3021 libname_spec library_names_spec soname_spec extract_expsyms_cmds \
3022 old_striplib striplib file_magic_cmd finish_cmds finish_eval \
3023 @@ -4910,7 +4204,7 @@
3024 #
3025 # You should have received a copy of the GNU General Public License
3026 # along with this program; if not, write to the Free Software
3027 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
3028 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
3029 #
3030 # As a special exception to the GNU General Public License, if you
3031 # distribute this file as part of a program that contains a
3032 @@ -4921,11 +4215,11 @@
3033 SED=$lt_SED
3034
3035 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
3036 -Xsed="$SED -e s/^X//"
3037 +Xsed="$SED -e 1s/^X//"
3038
3039 # The HP-UX ksh and POSIX shell print the target directory to stdout
3040 # if CDPATH is set.
3041 -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
3042 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
3043
3044 # The names of the tagged configurations supported by this script.
3045 available_tags=
3046 @@ -4956,6 +4250,12 @@
3047 # The host system.
3048 host_alias=$host_alias
3049 host=$host
3050 +host_os=$host_os
3051 +
3052 +# The build system.
3053 +build_alias=$build_alias
3054 +build=$build
3055 +build_os=$build_os
3056
3057 # An echo program that does not interpret backslashes.
3058 echo=$lt_echo
3059 @@ -4967,6 +4267,9 @@
3060 # A C compiler.
3061 LTCC=$lt_LTCC
3062
3063 +# LTCC compiler flags.
3064 +LTCFLAGS=$lt_LTCFLAGS
3065 +
3066 # A language-specific compiler.
3067 CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
3068
3069 @@ -5032,7 +4335,7 @@
3070 # Does compiler simultaneously support -c and -o options?
3071 compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
3072
3073 -# Must we lock files when doing compilation ?
3074 +# Must we lock files when doing compilation?
3075 need_locks=$lt_need_locks
3076
3077 # Do we need the lib prefix for modules?
3078 @@ -5306,9 +4609,6 @@
3079 # Regexp to match symbols that can be accessed directly from C.
3080 sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
3081
3082 -# Transform the above into a raw symbol and a C symbol.
3083 -symxfrm='\1 \2\3 \3'
3084 -
3085 # Transform an extracted symbol line into a proper C declaration
3086 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
3087
3088 @@ -5330,15 +4630,31 @@
3089 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
3090 lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
3091 ;;
3092 +linux* | k*bsd*-gnu)
3093 + if test "$host_cpu" = ia64; then
3094 + symcode='[[ABCDGIRSTW]]'
3095 + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
3096 + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
3097 + fi
3098 + ;;
3099 irix* | nonstopux*)
3100 symcode='[[BCDEGRST]]'
3101 ;;
3102 osf*)
3103 symcode='[[BCDEGQRST]]'
3104 ;;
3105 -solaris* | sysv5*)
3106 +solaris*)
3107 symcode='[[BDRT]]'
3108 ;;
3109 +sco3.2v5*)
3110 + symcode='[[DT]]'
3111 + ;;
3112 +sysv4.2uw2*)
3113 + symcode='[[DT]]'
3114 + ;;
3115 +sysv5* | sco5v6* | unixware* | OpenUNIX*)
3116 + symcode='[[ABDT]]'
3117 + ;;
3118 sysv4)
3119 symcode='[[DFNSTU]]'
3120 ;;
3121 @@ -5361,8 +4677,11 @@
3122 # Try without a prefix undercore, then with it.
3123 for ac_symprfx in "" "_"; do
3124
3125 + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
3126 + symxfrm="\\1 $ac_symprfx\\2 \\2"
3127 +
3128 # Write the raw and C identifiers.
3129 - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
3130 + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
3131
3132 # Check to see that the pipe works correctly.
3133 pipe_works=no
3134 @@ -5518,6 +4837,10 @@
3135 # DJGPP does not support shared libraries at all
3136 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
3137 ;;
3138 + interix3*)
3139 + # Interix 3.x gcc -fpic/-fPIC options generate broken code.
3140 + # Instead, we relocate shared libraries at runtime.
3141 + ;;
3142 sysv4*MP*)
3143 if test -d /usr/nec; then
3144 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
3145 @@ -5526,7 +4849,7 @@
3146 hpux*)
3147 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
3148 # not for PA HP-UX.
3149 - case "$host_cpu" in
3150 + case $host_cpu in
3151 hppa*64*|ia64*)
3152 ;;
3153 *)
3154 @@ -5551,18 +4874,28 @@
3155 ;;
3156 chorus*)
3157 case $cc_basename in
3158 - cxch68)
3159 + cxch68*)
3160 # Green Hills C++ Compiler
3161 # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
3162 ;;
3163 esac
3164 ;;
3165 + darwin*)
3166 + # PIC is the default on this platform
3167 + # Common symbols not allowed in MH_DYLIB files
3168 + case $cc_basename in
3169 + xlc*)
3170 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
3171 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3172 + ;;
3173 + esac
3174 + ;;
3175 dgux*)
3176 case $cc_basename in
3177 - ec++)
3178 + ec++*)
3179 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3180 ;;
3181 - ghcx)
3182 + ghcx*)
3183 # Green Hills C++ Compiler
3184 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
3185 ;;
3186 @@ -5570,22 +4903,22 @@
3187 ;;
3188 esac
3189 ;;
3190 - freebsd* | kfreebsd*-gnu)
3191 + freebsd* | dragonfly*)
3192 # FreeBSD uses GNU C++
3193 ;;
3194 hpux9* | hpux10* | hpux11*)
3195 case $cc_basename in
3196 - CC)
3197 + CC*)
3198 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3199 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
3200 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
3201 if test "$host_cpu" != ia64; then
3202 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
3203 fi
3204 ;;
3205 - aCC)
3206 + aCC*)
3207 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3208 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
3209 - case "$host_cpu" in
3210 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
3211 + case $host_cpu in
3212 hppa*64*|ia64*)
3213 # +Z the default
3214 ;;
3215 @@ -5598,9 +4931,13 @@
3216 ;;
3217 esac
3218 ;;
3219 + interix*)
3220 + # This is c89, which is MS Visual C++ (no shared libs)
3221 + # Anyone wants to do a port?
3222 + ;;
3223 irix5* | irix6* | nonstopux*)
3224 case $cc_basename in
3225 - CC)
3226 + CC*)
3227 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3228 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
3229 # CC pic flag -KPIC is the default.
3230 @@ -5609,20 +4946,26 @@
3231 ;;
3232 esac
3233 ;;
3234 - linux*)
3235 + linux* | k*bsd*-gnu)
3236 case $cc_basename in
3237 - KCC)
3238 + KCC*)
3239 # KAI C++ Compiler
3240 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
3241 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3242 ;;
3243 - icpc)
3244 + icpc* | ecpc*)
3245 # Intel C++
3246 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3247 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3248 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
3249 ;;
3250 - cxx)
3251 + pgCC*)
3252 + # Portland Group C++ compiler.
3253 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3254 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
3255 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3256 + ;;
3257 + cxx*)
3258 # Compaq C++
3259 # Make sure the PIC flag is empty. It appears that all Alpha
3260 # Linux and Compaq Tru64 Unix objects are PIC.
3261 @@ -5639,25 +4982,25 @@
3262 ;;
3263 mvs*)
3264 case $cc_basename in
3265 - cxx)
3266 + cxx*)
3267 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
3268 ;;
3269 *)
3270 ;;
3271 esac
3272 ;;
3273 - netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
3274 + netbsd* | netbsdelf*-gnu)
3275 ;;
3276 osf3* | osf4* | osf5*)
3277 case $cc_basename in
3278 - KCC)
3279 + KCC*)
3280 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
3281 ;;
3282 - RCC)
3283 + RCC*)
3284 # Rational C++ 2.4.1
3285 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
3286 ;;
3287 - cxx)
3288 + cxx*)
3289 # Digital/Compaq C++
3290 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3291 # Make sure the PIC flag is empty. It appears that all Alpha
3292 @@ -5671,24 +5014,15 @@
3293 ;;
3294 psos*)
3295 ;;
3296 - sco*)
3297 - case $cc_basename in
3298 - CC)
3299 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3300 - ;;
3301 - *)
3302 - ;;
3303 - esac
3304 - ;;
3305 solaris*)
3306 case $cc_basename in
3307 - CC)
3308 + CC*)
3309 # Sun C++ 4.2, 5.x and Centerline C++
3310 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3311 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3312 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
3313 ;;
3314 - gcx)
3315 + gcx*)
3316 # Green Hills C++ Compiler
3317 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
3318 ;;
3319 @@ -5698,12 +5032,12 @@
3320 ;;
3321 sunos4*)
3322 case $cc_basename in
3323 - CC)
3324 + CC*)
3325 # Sun C++ 4.x
3326 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
3327 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3328 ;;
3329 - lcc)
3330 + lcc*)
3331 # Lucid
3332 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
3333 ;;
3334 @@ -5713,7 +5047,7 @@
3335 ;;
3336 tandem*)
3337 case $cc_basename in
3338 - NCC)
3339 + NCC*)
3340 # NonStop-UX NCC 3.20
3341 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3342 ;;
3343 @@ -5721,7 +5055,14 @@
3344 ;;
3345 esac
3346 ;;
3347 - unixware*)
3348 + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
3349 + case $cc_basename in
3350 + CC*)
3351 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3352 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3353 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3354 + ;;
3355 + esac
3356 ;;
3357 vxworks*)
3358 ;;
3359 @@ -5768,6 +5109,11 @@
3360 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
3361 ;;
3362
3363 + interix3*)
3364 + # Interix 3.x gcc -fpic/-fPIC options generate broken code.
3365 + # Instead, we relocate shared libraries at runtime.
3366 + ;;
3367 +
3368 msdosdjgpp*)
3369 # Just because we use GCC doesn't mean we suddenly get shared libraries
3370 # on systems that don't support them.
3371 @@ -5784,7 +5130,7 @@
3372 hpux*)
3373 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
3374 # not for PA HP-UX.
3375 - case "$host_cpu" in
3376 + case $host_cpu in
3377 hppa*64*|ia64*)
3378 # +Z the default
3379 ;;
3380 @@ -5810,6 +5156,16 @@
3381 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
3382 fi
3383 ;;
3384 + darwin*)
3385 + # PIC is the default on this platform
3386 + # Common symbols not allowed in MH_DYLIB files
3387 + case $cc_basename in
3388 + xlc*)
3389 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
3390 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3391 + ;;
3392 + esac
3393 + ;;
3394
3395 mingw* | pw32* | os2*)
3396 # This hack is so that the source file can tell whether it is being
3397 @@ -5821,7 +5177,7 @@
3398 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3399 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
3400 # not for PA HP-UX.
3401 - case "$host_cpu" in
3402 + case $host_cpu in
3403 hppa*64*|ia64*)
3404 # +Z the default
3405 ;;
3406 @@ -5844,13 +5200,20 @@
3407 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3408 ;;
3409
3410 - linux*)
3411 - case $CC in
3412 + linux* | k*bsd*-gnu)
3413 + case $cc_basename in
3414 icc* | ecc*)
3415 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3416 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3417 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
3418 ;;
3419 + pgcc* | pgf77* | pgf90* | pgf95*)
3420 + # Portland Group compilers (*not* the Pentium gcc compiler,
3421 + # which looks to be a dead project)
3422 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3423 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
3424 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3425 + ;;
3426 ccc*)
3427 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3428 # All Alpha code is PIC.
3429 @@ -5865,15 +5228,15 @@
3430 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
3431 ;;
3432
3433 - sco3.2v5*)
3434 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
3435 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
3436 - ;;
3437 -
3438 solaris*)
3439 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3440 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3441 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3442 + case $cc_basename in
3443 + f77* | f90* | f95*)
3444 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
3445 + *)
3446 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
3447 + esac
3448 ;;
3449
3450 sunos4*)
3451 @@ -5882,7 +5245,7 @@
3452 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3453 ;;
3454
3455 - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
3456 + sysv4 | sysv4.2uw2* | sysv4.3*)
3457 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3458 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3459 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3460 @@ -5895,6 +5258,17 @@
3461 fi
3462 ;;
3463
3464 + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
3465 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3466 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3467 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3468 + ;;
3469 +
3470 + unicos*)
3471 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3472 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
3473 + ;;
3474 +
3475 uts4*)
3476 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
3477 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3478 @@ -5922,7 +5296,7 @@
3479 [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
3480 _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
3481 fi
3482 -case "$host_os" in
3483 +case $host_os in
3484 # For platforms which do not support PIC, -DPIC is meaningless:
3485 *djgpp*)
3486 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
3487 @@ -5931,6 +5305,16 @@
3488 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
3489 ;;
3490 esac
3491 +
3492 +#
3493 +# Check to make sure the static flag actually works.
3494 +#
3495 +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
3496 +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
3497 + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
3498 + $lt_tmp_static_flag,
3499 + [],
3500 + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
3501 ])
3502
3503
3504 @@ -5955,9 +5339,9 @@
3505 _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
3506 ;;
3507 cygwin* | mingw*)
3508 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
3509 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
3510 ;;
3511 - linux*)
3512 + linux* | k*bsd*-gnu)
3513 _LT_AC_TAGVAR(link_all_deplibs, $1)=no
3514 ;;
3515 *)
3516 @@ -6001,7 +5385,8 @@
3517 # rely on this symbol name, it's probably fine to never include it in
3518 # preloaded symbol tables.
3519 extract_expsyms_cmds=
3520 -
3521 + # Just being paranoid about ensuring that cc_basename is set.