~ubuntu-branches/ubuntu/oneiric/bluez/oneiric-proposed
» Revision
65
: debian/patches/pkg-config-install-paths.patch
« back to all changes in this revision
Viewing changes to debian/patches/pkg-config-install-paths.patch
- browse files at revision 65
- compare with another revision
- download diff
- download tarball
- view history from revision 65
- Committer: Bazaar Package Importer
- Author(s): Mathieu Trudel-Lapierre
- Date: 2011-07-28 16:47:35 UTC
- mfrom: (1.1.34 upstream) (6.3.15 sid)
- Revision ID: james.westby@ubuntu.com-20110728164735-f34luwrarv52mhlq
Tags: 4.95-0ubuntu1
* New upstream release.
* Resynchronize with Debian unstable, remaining changes:
- debian/source_bluez.py, debian/bluez.install:
+ apport hook made by Baptiste Mille-Mathias.
- debian/rules: don't use simple-patchsys.
- debian/source/format: use source format 3.0.
- debian/patches/pkg-config-install-paths.patch: install bluez-alsa plugin
to the multiarch path, now that alsa-lib has transitioned.
* debian/patches/02_disable_hal.patch: refreshed.
* debian/patches/pkg-config-install-paths.patch: refreshed.
* debian/control, debian/rules: run autoreconf when building as required by
pkg-config-install-paths.patch.
* Resynchronize with Debian unstable, remaining changes:
- debian/source_bluez.py, debian/bluez.install:
+ apport hook made by Baptiste Mille-Mathias.
- debian/rules: don't use simple-patchsys.
- debian/source/format: use source format 3.0.
- debian/patches/pkg-config-install-paths.patch: install bluez-alsa plugin
to the multiarch path, now that alsa-lib has transitioned.
* debian/patches/02_disable_hal.patch: refreshed.
* debian/patches/pkg-config-install-paths.patch: refreshed.
* debian/control, debian/rules: run autoreconf when building as required by
pkg-config-install-paths.patch.
- files added:
- debian/bluez.bluetooth.default
- files removed:
- .pc/pkg-config-install-paths.patch/Makefile.in
- files modified:
- .pc/02_disable_hal.patch/audio/telephony-maemo6.c
added
removed
debian/patches/pkg-config-install-paths.patch
24
24
])
25
25
26
26
AC_DEFUN([AC_PATH_USB], [
27
Index: bluez/aclocal.m4
28
===================================================================
29
--- bluez.orig/aclocal.m4
30
+++ bluez/aclocal.m4
31
@@ -13,8 +13,8 @@
32
33
m4_ifndef([AC_AUTOCONF_VERSION],
34
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
35
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
36
-[m4_warning([this file was generated for autoconf 2.63.
37
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
38
+[m4_warning([this file was generated for autoconf 2.68.
39
You have another version of autoconf. It may work, but is not guaranteed to.
40
If you have problems, you may need to regenerate the build system entirely.
41
To do so, use the procedure documented by the package, typically `autoreconf'.])])
42
@@ -22,7 +22,8 @@
43
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
44
#
45
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
46
-# 2006, 2007, 2008 Free Software Foundation, Inc.
47
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
48
+# Inc.
49
# Written by Gordon Matzigkeit, 1996
50
#
51
# This file is free software; the Free Software Foundation gives
52
@@ -31,7 +32,8 @@
53
54
m4_define([_LT_COPYING], [dnl
55
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
56
-# 2006, 2007, 2008 Free Software Foundation, Inc.
57
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
58
+# Inc.
59
# Written by Gordon Matzigkeit, 1996
60
#
61
# This file is part of GNU Libtool.
62
@@ -58,7 +60,7 @@
63
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
64
])
65
66
-# serial 56 LT_INIT
67
+# serial 57 LT_INIT
68
69
70
# LT_PREREQ(VERSION)
71
@@ -87,6 +89,7 @@
72
# ------------------
73
AC_DEFUN([LT_INIT],
74
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
75
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
76
AC_BEFORE([$0], [LT_LANG])dnl
77
AC_BEFORE([$0], [LT_OUTPUT])dnl
78
AC_BEFORE([$0], [LTDL_INIT])dnl
79
@@ -103,6 +106,8 @@
80
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
81
m4_require([_LT_PROG_LTMAIN])dnl
82
83
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
84
+
85
dnl Parse OPTIONS
86
_LT_SET_OPTIONS([$0], [$1])
87
88
@@ -139,7 +144,7 @@
89
*) break;;
90
esac
91
done
92
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
93
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
94
])
95
96
97
@@ -159,6 +164,9 @@
98
m4_defun([_LT_SETUP],
99
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
100
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
101
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
102
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
103
+
104
_LT_DECL([], [host_alias], [0], [The host system])dnl
105
_LT_DECL([], [host], [0])dnl
106
_LT_DECL([], [host_os], [0])dnl
107
@@ -181,10 +189,13 @@
108
dnl
109
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
110
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
111
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
112
m4_require([_LT_CMD_RELOAD])dnl
113
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
114
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
115
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
116
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
117
+m4_require([_LT_WITH_SYSROOT])dnl
118
119
_LT_CONFIG_LIBTOOL_INIT([
120
# See if we are running on zsh, and set the options which allow our
121
@@ -200,7 +211,6 @@
122
_LT_CHECK_OBJDIR
123
124
m4_require([_LT_TAG_COMPILER])dnl
125
-_LT_PROG_ECHO_BACKSLASH
126
127
case $host_os in
128
aix3*)
129
@@ -214,23 +224,6 @@
130
;;
131
esac
132
133
-# Sed substitution that helps us do robust quoting. It backslashifies
134
-# metacharacters that are still active within double-quoted strings.
135
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
136
-
137
-# Same as above, but do not quote variable references.
138
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
139
-
140
-# Sed substitution to delay expansion of an escaped shell variable in a
141
-# double_quote_subst'ed string.
142
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
143
-
144
-# Sed substitution to delay expansion of an escaped single quote.
145
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
146
-
147
-# Sed substitution to avoid accidental globbing in evaled expressions
148
-no_glob_subst='s/\*/\\\*/g'
149
-
150
# Global variables:
151
ofile=libtool
152
can_build_shared=yes
153
@@ -271,6 +264,28 @@
154
])# _LT_SETUP
155
156
157
+# _LT_PREPARE_SED_QUOTE_VARS
158
+# --------------------------
159
+# Define a few sed substitution that help us do robust quoting.
160
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
161
+[# Backslashify metacharacters that are still active within
162
+# double-quoted strings.
163
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
164
+
165
+# Same as above, but do not quote variable references.
166
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
167
+
168
+# Sed substitution to delay expansion of an escaped shell variable in a
169
+# double_quote_subst'ed string.
170
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
171
+
172
+# Sed substitution to delay expansion of an escaped single quote.
173
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
174
+
175
+# Sed substitution to avoid accidental globbing in evaled expressions
176
+no_glob_subst='s/\*/\\\*/g'
177
+])
178
+
179
# _LT_PROG_LTMAIN
180
# ---------------
181
# Note that this code is called both from `configure', and `config.status'
182
@@ -423,7 +438,7 @@
183
# declaration there will have the same value as in `configure'. VARNAME
184
# must have a single quote delimited value for this to work.
185
m4_define([_LT_CONFIG_STATUS_DECLARE],
186
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
187
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
188
189
190
# _LT_CONFIG_STATUS_DECLARATIONS
191
@@ -433,7 +448,7 @@
192
# embedded single quotes properly. In configure, this macro expands
193
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
194
#
195
-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
196
+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
197
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
198
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
199
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
200
@@ -532,12 +547,20 @@
201
LTCFLAGS='$LTCFLAGS'
202
compiler='$compiler_DEFAULT'
203
204
+# A function that is used when there is no print builtin or printf.
205
+func_fallback_echo ()
206
+{
207
+ eval 'cat <<_LTECHO_EOF
208
+\$[]1
209
+_LTECHO_EOF'
210
+}
211
+
212
# Quote evaled strings.
213
for var in lt_decl_all_varnames([[ \
214
]], lt_decl_quote_varnames); do
215
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
216
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
217
*[[\\\\\\\`\\"\\\$]]*)
218
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
219
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
220
;;
221
*)
222
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
223
@@ -548,9 +571,9 @@
224
# Double-quote double-evaled strings.
225
for var in lt_decl_all_varnames([[ \
226
]], lt_decl_dquote_varnames); do
227
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
228
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
229
*[[\\\\\\\`\\"\\\$]]*)
230
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
231
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
232
;;
233
*)
234
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
235
@@ -558,16 +581,38 @@
236
esac
237
done
238
239
-# Fix-up fallback echo if it was mangled by the above quoting rules.
240
-case \$lt_ECHO in
241
-*'\\\[$]0 --fallback-echo"')dnl "
242
- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
243
- ;;
244
-esac
245
-
246
_LT_OUTPUT_LIBTOOL_INIT
247
])
248
249
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
250
+# ------------------------------------
251
+# Generate a child script FILE with all initialization necessary to
252
+# reuse the environment learned by the parent script, and make the
253
+# file executable. If COMMENT is supplied, it is inserted after the
254
+# `#!' sequence but before initialization text begins. After this
255
+# macro, additional text can be appended to FILE to form the body of
256
+# the child script. The macro ends with non-zero status if the
257
+# file could not be fully written (such as if the disk is full).
258
+m4_ifdef([AS_INIT_GENERATED],
259
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
260
+[m4_defun([_LT_GENERATED_FILE_INIT],
261
+[m4_require([AS_PREPARE])]dnl
262
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
263
+[lt_write_fail=0
264
+cat >$1 <<_ASEOF || lt_write_fail=1
265
+#! $SHELL
266
+# Generated by $as_me.
267
+$2
268
+SHELL=\${CONFIG_SHELL-$SHELL}
269
+export SHELL
270
+_ASEOF
271
+cat >>$1 <<\_ASEOF || lt_write_fail=1
272
+AS_SHELL_SANITIZE
273
+_AS_PREPARE
274
+exec AS_MESSAGE_FD>&1
275
+_ASEOF
276
+test $lt_write_fail = 0 && chmod +x $1[]dnl
277
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
278
279
# LT_OUTPUT
280
# ---------
281
@@ -577,20 +622,11 @@
282
AC_DEFUN([LT_OUTPUT],
283
[: ${CONFIG_LT=./config.lt}
284
AC_MSG_NOTICE([creating $CONFIG_LT])
285
-cat >"$CONFIG_LT" <<_LTEOF
286
-#! $SHELL
287
-# Generated by $as_me.
288
-# Run this file to recreate a libtool stub with the current configuration.
289
-
290
-lt_cl_silent=false
291
-SHELL=\${CONFIG_SHELL-$SHELL}
292
-_LTEOF
293
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
294
+[# Run this file to recreate a libtool stub with the current configuration.])
295
296
cat >>"$CONFIG_LT" <<\_LTEOF
297
-AS_SHELL_SANITIZE
298
-_AS_PREPARE
299
-
300
-exec AS_MESSAGE_FD>&1
301
+lt_cl_silent=false
302
exec AS_MESSAGE_LOG_FD>>config.log
303
{
304
echo
305
@@ -616,7 +652,7 @@
306
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
307
configured by $[0], generated by m4_PACKAGE_STRING.
308
309
-Copyright (C) 2008 Free Software Foundation, Inc.
310
+Copyright (C) 2010 Free Software Foundation, Inc.
311
This config.lt script is free software; the Free Software Foundation
312
gives unlimited permision to copy, distribute and modify it."
313
314
@@ -661,15 +697,13 @@
315
# appending to config.log, which fails on DOS, as config.log is still kept
316
# open by configure. Here we exec the FD to /dev/null, effectively closing
317
# config.log, so it can be properly (re)opened and appended to by config.lt.
318
-if test "$no_create" != yes; then
319
- lt_cl_success=:
320
- test "$silent" = yes &&
321
- lt_config_lt_args="$lt_config_lt_args --quiet"
322
- exec AS_MESSAGE_LOG_FD>/dev/null
323
- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
324
- exec AS_MESSAGE_LOG_FD>>config.log
325
- $lt_cl_success || AS_EXIT(1)
326
-fi
327
+lt_cl_success=:
328
+test "$silent" = yes &&
329
+ lt_config_lt_args="$lt_config_lt_args --quiet"
330
+exec AS_MESSAGE_LOG_FD>/dev/null
331
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
332
+exec AS_MESSAGE_LOG_FD>>config.log
333
+$lt_cl_success || AS_EXIT(1)
334
])# LT_OUTPUT
335
336
337
@@ -732,15 +766,12 @@
338
# if finds mixed CR/LF and LF-only lines. Since sed operates in
339
# text mode, it properly converts lines to CR/LF. This bash problem
340
# is reportedly fixed, but why not run on old versions too?
341
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
342
- || (rm -f "$cfgfile"; exit 1)
343
+ sed '$q' "$ltmain" >> "$cfgfile" \
344
+ || (rm -f "$cfgfile"; exit 1)
345
346
- _LT_PROG_XSI_SHELLFNS
347
+ _LT_PROG_REPLACE_SHELLFNS
348
349
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
350
- || (rm -f "$cfgfile"; exit 1)
351
-
352
- mv -f "$cfgfile" "$ofile" ||
353
+ mv -f "$cfgfile" "$ofile" ||
354
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
355
chmod +x "$ofile"
356
],
357
@@ -846,11 +877,13 @@
358
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
359
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
360
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
361
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
362
dnl aclocal-1.4 backwards compatibility:
363
dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
364
dnl AC_DEFUN([AC_LIBTOOL_F77], [])
365
dnl AC_DEFUN([AC_LIBTOOL_FC], [])
366
dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
367
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
368
369
370
# _LT_TAG_COMPILER
371
@@ -955,6 +988,31 @@
372
[lt_cv_ld_exported_symbols_list=no])
373
LDFLAGS="$save_LDFLAGS"
374
])
375
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
376
+ [lt_cv_ld_force_load=no
377
+ cat > conftest.c << _LT_EOF
378
+int forced_loaded() { return 2;}
379
+_LT_EOF
380
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
381
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
382
+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
383
+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
384
+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
385
+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
386
+ cat > conftest.c << _LT_EOF
387
+int main() { return 0;}
388
+_LT_EOF
389
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
390
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
391
+ _lt_result=$?
392
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
393
+ lt_cv_ld_force_load=yes
394
+ else
395
+ cat conftest.err >&AS_MESSAGE_LOG_FD
396
+ fi
397
+ rm -f conftest.err libconftest.a conftest conftest.c
398
+ rm -rf conftest.dSYM
399
+ ])
400
case $host_os in
401
rhapsody* | darwin1.[[012]])
402
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
403
@@ -982,7 +1040,7 @@
404
else
405
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
406
fi
407
- if test "$DSYMUTIL" != ":"; then
408
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
409
_lt_dsymutil='~$DSYMUTIL $lib || :'
410
else
411
_lt_dsymutil=
412
@@ -1002,7 +1060,11 @@
413
_LT_TAGVAR(hardcode_direct, $1)=no
414
_LT_TAGVAR(hardcode_automatic, $1)=yes
415
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
416
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
417
+ if test "$lt_cv_ld_force_load" = "yes"; then
418
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
419
+ else
420
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
421
+ fi
422
_LT_TAGVAR(link_all_deplibs, $1)=yes
423
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
424
case $cc_basename in
425
@@ -1010,7 +1072,7 @@
426
*) _lt_dar_can_shared=$GCC ;;
427
esac
428
if test "$_lt_dar_can_shared" = "yes"; then
429
- output_verbose_link_cmd=echo
430
+ output_verbose_link_cmd=func_echo_all
431
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
432
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
433
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
434
@@ -1026,203 +1088,142 @@
435
fi
436
])
437
438
-# _LT_SYS_MODULE_PATH_AIX
439
-# -----------------------
440
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
441
+# ----------------------------------
442
# Links a minimal program and checks the executable
443
# for the system default hardcoded library path. In most cases,
444
# this is /usr/lib:/lib, but when the MPI compilers are used
445
# the location of the communication and MPI libs are included too.
446
# If we don't find anything, use the default library path according
447
# to the aix ld manual.
448
+# Store the results from the different compilers for each TAGNAME.
449
+# Allow to override them for all tags through lt_cv_aix_libpath.
450
m4_defun([_LT_SYS_MODULE_PATH_AIX],
451
[m4_require([_LT_DECL_SED])dnl
452
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
453
-lt_aix_libpath_sed='
454
- /Import File Strings/,/^$/ {
455
- /^0/ {
456
- s/^0 *\(.*\)$/\1/
457
- p
458
- }
459
- }'
460
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
461
-# Check for a 64-bit object if we didn't find anything.
462
-if test -z "$aix_libpath"; then
463
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
464
-fi],[])
465
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
466
+if test "${lt_cv_aix_libpath+set}" = set; then
467
+ aix_libpath=$lt_cv_aix_libpath
468
+else
469
+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
470
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
471
+ lt_aix_libpath_sed='[
472
+ /Import File Strings/,/^$/ {
473
+ /^0/ {
474
+ s/^0 *\([^ ]*\) *$/\1/
475
+ p
476
+ }
477
+ }]'
478
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
479
+ # Check for a 64-bit object if we didn't find anything.
480
+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
481
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
482
+ fi],[])
483
+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
484
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
485
+ fi
486
+ ])
487
+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
488
+fi
489
])# _LT_SYS_MODULE_PATH_AIX
490
491
492
# _LT_SHELL_INIT(ARG)
493
# -------------------
494
m4_define([_LT_SHELL_INIT],
495
-[ifdef([AC_DIVERSION_NOTICE],
496
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
497
- [AC_DIVERT_PUSH(NOTICE)])
498
-$1
499
-AC_DIVERT_POP
500
-])# _LT_SHELL_INIT
501
+[m4_divert_text([M4SH-INIT], [$1
502
+])])# _LT_SHELL_INIT
503
+
504
505
506
# _LT_PROG_ECHO_BACKSLASH
507
# -----------------------
508
-# Add some code to the start of the generated configure script which
509
-# will find an echo command which doesn't interpret backslashes.
510
+# Find how we can fake an echo command that does not interpret backslash.
511
+# In particular, with Autoconf 2.60 or later we add some code to the start
512
+# of the generated configure script which will find a shell with a builtin
513
+# printf (which we can use as an echo command).
514
m4_defun([_LT_PROG_ECHO_BACKSLASH],
515
-[_LT_SHELL_INIT([
516
-# Check that we are running under the correct shell.
517
-SHELL=${CONFIG_SHELL-/bin/sh}
518
-
519
-case X$lt_ECHO in
520
-X*--fallback-echo)
521
- # Remove one level of quotation (which was required for Make).
522
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
523
- ;;
524
-esac
525
-
526
-ECHO=${lt_ECHO-echo}
527
-if test "X[$]1" = X--no-reexec; then
528
- # Discard the --no-reexec flag, and continue.
529
- shift
530
-elif test "X[$]1" = X--fallback-echo; then
531
- # Avoid inline document here, it may be left over
532
- :
533
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
534
- # Yippee, $ECHO works!
535
- :
536
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
537
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
538
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
539
+
540
+AC_MSG_CHECKING([how to print strings])
541
+# Test print first, because it will be a builtin if present.
542
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
543
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
544
+ ECHO='print -r --'
545
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
546
+ ECHO='printf %s\n'
547
else
548
- # Restart under the correct shell.
549
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
550
-fi
551
-
552
-if test "X[$]1" = X--fallback-echo; then
553
- # used as fallback echo
554
- shift
555
- cat <<_LT_EOF
556
-[$]*
557
-_LT_EOF
558
- exit 0
559
+ # Use this function as a fallback that always works.
560
+ func_fallback_echo ()
561
+ {
562
+ eval 'cat <<_LTECHO_EOF
563
+$[]1
564
+_LTECHO_EOF'
565
+ }
566
+ ECHO='func_fallback_echo'
567
fi
568
569
-# The HP-UX ksh and POSIX shell print the target directory to stdout
570
-# if CDPATH is set.
571
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
572
-
573
-if test -z "$lt_ECHO"; then
574
- if test "X${echo_test_string+set}" != Xset; then
575
- # find a string as large as possible, as long as the shell can cope with it
576
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
577
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
578
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
579
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
580
- then
581
- break
582
- fi
583
- done
584
- fi
585
-
586
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
587
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
588
- test "X$echo_testing_string" = "X$echo_test_string"; then
589
- :
590
- else
591
- # The Solaris, AIX, and Digital Unix default echo programs unquote
592
- # backslashes. This makes it impossible to quote backslashes using
593
- # echo "$something" | sed 's/\\/\\\\/g'
594
- #
595
- # So, first we look for a working echo in the user's PATH.
596
-
597
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
598
- for dir in $PATH /usr/ucb; do
599
- IFS="$lt_save_ifs"
600
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
601
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
602
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
603
- test "X$echo_testing_string" = "X$echo_test_string"; then
604
- ECHO="$dir/echo"
605
- break
606
- fi
607
- done
608
- IFS="$lt_save_ifs"
609
-
610
- if test "X$ECHO" = Xecho; then
611
- # We didn't find a better echo, so look for alternatives.
612
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
613
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
614
- test "X$echo_testing_string" = "X$echo_test_string"; then
615
- # This shell has a builtin print -r that does the trick.
616
- ECHO='print -r'
617
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
618
- test "X$CONFIG_SHELL" != X/bin/ksh; then
619
- # If we have ksh, try running configure again with it.
620
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
621
- export ORIGINAL_CONFIG_SHELL
622
- CONFIG_SHELL=/bin/ksh
623
- export CONFIG_SHELL
624
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
625
- else
626
- # Try using printf.
627
- ECHO='printf %s\n'
628
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
629
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
630
- test "X$echo_testing_string" = "X$echo_test_string"; then
631
- # Cool, printf works
632
- :
633
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
634
- test "X$echo_testing_string" = 'X\t' &&
635
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
636
- test "X$echo_testing_string" = "X$echo_test_string"; then
637
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
638
- export CONFIG_SHELL
639
- SHELL="$CONFIG_SHELL"
640
- export SHELL
641
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
642
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
643
- test "X$echo_testing_string" = 'X\t' &&
644
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
645
- test "X$echo_testing_string" = "X$echo_test_string"; then
646
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
647
- else
648
- # maybe with a smaller string...
649
- prev=:
650
-
651
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
652
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
653
- then
654
- break
655
- fi
656
- prev="$cmd"
657
- done
658
+# func_echo_all arg...
659
+# Invoke $ECHO with all args, space-separated.
660
+func_echo_all ()
661
+{
662
+ $ECHO "$*"
663
+}
664
665
- if test "$prev" != 'sed 50q "[$]0"'; then
666
- echo_test_string=`eval $prev`
667
- export echo_test_string
668
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
669
- else
670
- # Oops. We lost completely, so just stick with echo.
671
- ECHO=echo
672
- fi
673
- fi
674
- fi
675
- fi
676
- fi
677
-fi
678
+case "$ECHO" in
679
+ printf*) AC_MSG_RESULT([printf]) ;;
680
+ print*) AC_MSG_RESULT([print -r]) ;;
681
+ *) AC_MSG_RESULT([cat]) ;;
682
+esac
683
684
-# Copy echo and quote the copy suitably for passing to libtool from
685
-# the Makefile, instead of quoting the original, which is used later.
686
-lt_ECHO=$ECHO
687
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
688
- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
689
-fi
690
+m4_ifdef([_AS_DETECT_SUGGESTED],
691
+[_AS_DETECT_SUGGESTED([
692
+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
693
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
694
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
695
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
696
+ PATH=/empty FPATH=/empty; export PATH FPATH
697
+ test "X`printf %s $ECHO`" = "X$ECHO" \
698
+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
699
700
-AC_SUBST(lt_ECHO)
701
-])
702
_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
703
-_LT_DECL([], [ECHO], [1],
704
- [An echo program that does not interpret backslashes])
705
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
706
])# _LT_PROG_ECHO_BACKSLASH
707
708
709
+# _LT_WITH_SYSROOT
710
+# ----------------
711
+AC_DEFUN([_LT_WITH_SYSROOT],
712
+[AC_MSG_CHECKING([for sysroot])
713
+AC_ARG_WITH([sysroot],
714
+[ --with-sysroot[=DIR] Search for dependent libraries within DIR
715
+ (or the compiler's sysroot if not specified).],
716
+[], [with_sysroot=no])
717
+
718
+dnl lt_sysroot will always be passed unquoted. We quote it here
719
+dnl in case the user passed a directory name.
720
+lt_sysroot=
721
+case ${with_sysroot} in #(
722
+ yes)
723
+ if test "$GCC" = yes; then
724
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
725
+ fi
726
+ ;; #(
727
+ /*)
728
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
729
+ ;; #(
730
+ no|'')
731
+ ;; #(
732
+ *)
733
+ AC_MSG_RESULT([${with_sysroot}])
734
+ AC_MSG_ERROR([The sysroot must be an absolute path.])
735
+ ;;
736
+esac
737
+
738
+ AC_MSG_RESULT([${lt_sysroot:-no}])
739
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
740
+[dependent libraries, and in which our libraries should be installed.])])
741
+
742
# _LT_ENABLE_LOCK
743
# ---------------
744
m4_defun([_LT_ENABLE_LOCK],
745
@@ -1251,7 +1252,7 @@
746
;;
747
*-*-irix6*)
748
# Find out which ABI we are using.
749
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
750
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
751
if AC_TRY_EVAL(ac_compile); then
752
if test "$lt_cv_prog_gnu_ld" = yes; then
753
case `/usr/bin/file conftest.$ac_objext` in
754
@@ -1369,14 +1370,47 @@
755
])# _LT_ENABLE_LOCK
756
757
758
+# _LT_PROG_AR
759
+# -----------
760
+m4_defun([_LT_PROG_AR],
761
+[AC_CHECK_TOOLS(AR, [ar], false)
762
+: ${AR=ar}
763
+: ${AR_FLAGS=cru}
764
+_LT_DECL([], [AR], [1], [The archiver])
765
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
766
+
767
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
768
+ [lt_cv_ar_at_file=no
769
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
770
+ [echo conftest.$ac_objext > conftest.lst
771
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
772
+ AC_TRY_EVAL([lt_ar_try])
773
+ if test "$ac_status" -eq 0; then
774
+ # Ensure the archiver fails upon bogus file names.
775
+ rm -f conftest.$ac_objext libconftest.a
776
+ AC_TRY_EVAL([lt_ar_try])
777
+ if test "$ac_status" -ne 0; then
778
+ lt_cv_ar_at_file=@
779
+ fi
780
+ fi
781
+ rm -f conftest.* libconftest.a
782
+ ])
783
+ ])
784
+
785
+if test "x$lt_cv_ar_at_file" = xno; then
786
+ archiver_list_spec=
787
+else
788
+ archiver_list_spec=$lt_cv_ar_at_file
789
+fi
790
+_LT_DECL([], [archiver_list_spec], [1],
791
+ [How to feed a file listing to the archiver])
792
+])# _LT_PROG_AR
793
+
794
+
795
# _LT_CMD_OLD_ARCHIVE
796
# -------------------
797
m4_defun([_LT_CMD_OLD_ARCHIVE],
798
-[AC_CHECK_TOOL(AR, ar, false)
799
-test -z "$AR" && AR=ar
800
-test -z "$AR_FLAGS" && AR_FLAGS=cru
801
-_LT_DECL([], [AR], [1], [The archiver])
802
-_LT_DECL([], [AR_FLAGS], [1])
803
+[_LT_PROG_AR
804
805
AC_CHECK_TOOL(STRIP, strip, :)
806
test -z "$STRIP" && STRIP=:
807
@@ -1403,10 +1437,19 @@
808
esac
809
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
810
fi
811
+
812
+case $host_os in
813
+ darwin*)
814
+ lock_old_archive_extraction=yes ;;
815
+ *)
816
+ lock_old_archive_extraction=no ;;
817
+esac
818
_LT_DECL([], [old_postinstall_cmds], [2])
819
_LT_DECL([], [old_postuninstall_cmds], [2])
820
_LT_TAGDECL([], [old_archive_cmds], [2],
821
[Commands used to build an old-style archive])
822
+_LT_DECL([], [lock_old_archive_extraction], [0],
823
+ [Whether to use a lock for old archive extraction])
824
])# _LT_CMD_OLD_ARCHIVE
825
826
827
@@ -1431,15 +1474,15 @@
828
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
829
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
830
-e 's:$: $lt_compiler_flag:'`
831
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
832
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
833
(eval "$lt_compile" 2>conftest.err)
834
ac_status=$?
835
cat conftest.err >&AS_MESSAGE_LOG_FD
836
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
837
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
838
if (exit $ac_status) && test -s "$ac_outfile"; then
839
# The compiler can only warn and ignore the option if not recognized
840
# So say no if there are warnings other than the usual output.
841
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
842
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
843
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
844
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
845
$2=yes
846
@@ -1479,7 +1522,7 @@
847
if test -s conftest.err; then
848
# Append any errors to the config.log.
849
cat conftest.err 1>&AS_MESSAGE_LOG_FD
850
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
851
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
852
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
853
if diff conftest.exp conftest.er2 >/dev/null; then
854
$2=yes
855
@@ -1542,6 +1585,11 @@
856
lt_cv_sys_max_cmd_len=8192;
857
;;
858
859
+ mint*)
860
+ # On MiNT this can take a long time and run out of memory.
861
+ lt_cv_sys_max_cmd_len=8192;
862
+ ;;
863
+
864
amigaos*)
865
# On AmigaOS with pdksh, this test takes hours, literally.
866
# So we just punt and use a minimum line length of 8192.
867
@@ -1606,8 +1654,8 @@
868
# If test is not a shell built-in, we'll probably end up computing a
869
# maximum length that is only half of the actual maximum length, but
870
# we can't tell.
871
- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
872
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
873
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
874
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
875
test $i != 17 # 1/2 MB should be enough
876
do
877
i=`expr $i + 1`
878
@@ -1658,7 +1706,7 @@
879
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
880
lt_status=$lt_dlunknown
881
cat > conftest.$ac_ext <<_LT_EOF
882
-[#line __oline__ "configure"
883
+[#line $LINENO "configure"
884
#include "confdefs.h"
885
886
#if HAVE_DLFCN_H
887
@@ -1699,7 +1747,13 @@
888
# endif
889
#endif
890
891
-void fnord() { int i=42;}
892
+/* When -fvisbility=hidden is used, assume the code has been annotated
893
+ correspondingly for the symbols needed. */
894
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
895
+int fnord () __attribute__((visibility("default")));
896
+#endif
897
+
898
+int fnord () { return 42; }
899
int main ()
900
{
901
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
902
@@ -1708,7 +1762,11 @@
903
if (self)
904
{
905
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
906
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
907
+ else
908
+ {
909
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
910
+ else puts (dlerror ());
911
+ }
912
/* dlclose (self); */
913
}
914
else
915
@@ -1884,16 +1942,16 @@
916
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
917
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
918
-e 's:$: $lt_compiler_flag:'`
919
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
920
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
921
(eval "$lt_compile" 2>out/conftest.err)
922
ac_status=$?
923
cat out/conftest.err >&AS_MESSAGE_LOG_FD
924
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
925
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
926
if (exit $ac_status) && test -s out/conftest2.$ac_objext
927
then
928
# The compiler can only warn and ignore the option if not recognized
929
# So say no if there are warnings
930
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
931
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
932
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
933
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
934
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
935
@@ -2052,6 +2110,7 @@
936
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
937
m4_require([_LT_DECL_OBJDUMP])dnl
938
m4_require([_LT_DECL_SED])dnl
939
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
940
AC_MSG_CHECKING([dynamic linker characteristics])
941
m4_if([$1],
942
[], [
943
@@ -2060,16 +2119,23 @@
944
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
945
*) lt_awk_arg="/^libraries:/" ;;
946
esac
947
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
948
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
949
+ case $host_os in
950
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
951
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
952
+ esac
953
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
954
+ case $lt_search_path_spec in
955
+ *\;*)
956
# if the path contains ";" then we assume it to be the separator
957
# otherwise default to the standard path separator (i.e. ":") - it is
958
# assumed that no part of a normal pathname contains ";" but that should
959
# okay in the real world where ";" in dirpaths is itself problematic.
960
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
961
- else
962
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
963
- fi
964
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
965
+ ;;
966
+ *)
967
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
968
+ ;;
969
+ esac
970
# Ok, now we have the path, separated by spaces, we can step through it
971
# and add multilib dir if necessary.
972
lt_tmp_lt_search_path_spec=
973
@@ -2082,7 +2148,7 @@
974
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
975
fi
976
done
977
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
978
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
979
BEGIN {RS=" "; FS="/|\n";} {
980
lt_foo="";
981
lt_count=0;
982
@@ -2102,7 +2168,13 @@
983
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
984
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
985
}'`
986
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
987
+ # AWK program above erroneously prepends '/' to C:/dos/paths
988
+ # for these hosts.
989
+ case $host_os in
990
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
991
+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
992
+ esac
993
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
994
else
995
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
996
fi])
997
@@ -2190,7 +2262,7 @@
998
m68k)
999
library_names_spec='$libname.ixlibrary $libname.a'
1000
# Create ${libname}_ixlibrary.a entries in /sys/libs.
1001
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
1002
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
1003
;;
1004
esac
1005
;;
1006
@@ -2221,8 +2293,9 @@
1007
need_version=no
1008
need_lib_prefix=no
1009
1010
- case $GCC,$host_os in
1011
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
1012
+ case $GCC,$cc_basename in
1013
+ yes,*)
1014
+ # gcc
1015
library_names_spec='$libname.dll.a'
1016
# DLL is installed to $(libdir)/../bin by postinstall_cmds
1017
postinstall_cmds='base_file=`basename \${file}`~
1018
@@ -2243,36 +2316,83 @@
1019
cygwin*)
1020
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
1021
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1022
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
1023
+m4_if([$1], [],[
1024
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
1025
;;
1026
mingw* | cegcc*)
1027
# MinGW DLLs use traditional 'lib' prefix
1028
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1029
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
1030
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
1031
- # It is most probably a Windows format PATH printed by
1032
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
1033
- # path with ; separators, and with drive letters. We can handle the
1034
- # drive letters (cygwin fileutils understands them), so leave them,
1035
- # especially as we might pass files found there to a mingw objdump,
1036
- # which wouldn't understand a cygwinified path. Ahh.
1037
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1038
- else
1039
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1040
- fi
1041
;;
1042
pw32*)
1043
# pw32 DLLs use 'pw' prefix rather than 'lib'
1044
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1045
;;
1046
esac
1047
+ dynamic_linker='Win32 ld.exe'
1048
+ ;;
1049
+
1050
+ *,cl*)
1051
+ # Native MSVC
1052
+ libname_spec='$name'
1053
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
1054
+ library_names_spec='${libname}.dll.lib'
1055
+
1056
+ case $build_os in
1057
+ mingw*)
1058
+ sys_lib_search_path_spec=
1059
+ lt_save_ifs=$IFS
1060
+ IFS=';'
1061
+ for lt_path in $LIB
1062
+ do
1063
+ IFS=$lt_save_ifs
1064
+ # Let DOS variable expansion print the short 8.3 style file name.
1065
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
1066
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
1067
+ done
1068
+ IFS=$lt_save_ifs
1069
+ # Convert to MSYS style.
1070
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
1071
+ ;;
1072
+ cygwin*)
1073
+ # Convert to unix form, then to dos form, then back to unix form
1074
+ # but this time dos style (no spaces!) so that the unix form looks
1075
+ # like /cygdrive/c/PROGRA~1:/cygdr...
1076
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
1077
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
1078
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1079
+ ;;
1080
+ *)
1081
+ sys_lib_search_path_spec="$LIB"
1082
+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
1083
+ # It is most probably a Windows format PATH.
1084
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
1085
+ else
1086
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1087
+ fi
1088
+ # FIXME: find the short name or the path components, as spaces are
1089
+ # common. (e.g. "Program Files" -> "PROGRA~1")
1090
+ ;;
1091
+ esac
1092
+
1093
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
1094
+ postinstall_cmds='base_file=`basename \${file}`~
1095
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
1096
+ dldir=$destdir/`dirname \$dlpath`~
1097
+ test -d \$dldir || mkdir -p \$dldir~
1098
+ $install_prog $dir/$dlname \$dldir/$dlname'
1099
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
1100
+ dlpath=$dir/\$dldll~
1101
+ $RM \$dlpath'
1102
+ shlibpath_overrides_runpath=yes
1103
+ dynamic_linker='Win32 link.exe'
1104
;;
1105
1106
*)
1107
+ # Assume MSVC wrapper
1108
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
1109
+ dynamic_linker='Win32 ld.exe'
1110
;;
1111
esac
1112
- dynamic_linker='Win32 ld.exe'
1113
# FIXME: first we should search . and the directory the executable is in
1114
shlibpath_var=PATH
1115
;;
1116
@@ -2356,6 +2476,20 @@
1117
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1118
soname_spec='${libname}${release}${shared_ext}$major'
1119
shlibpath_var=LD_LIBRARY_PATH
1120
+ shlibpath_overrides_runpath=no
1121
+ hardcode_into_libs=yes
1122
+ ;;
1123
+
1124
+haiku*)
1125
+ version_type=linux
1126
+ need_lib_prefix=no
1127
+ need_version=no
1128
+ dynamic_linker="$host_os runtime_loader"
1129
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1130
+ soname_spec='${libname}${release}${shared_ext}$major'
1131
+ shlibpath_var=LIBRARY_PATH
1132
+ shlibpath_overrides_runpath=yes
1133
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
1134
hardcode_into_libs=yes
1135
;;
1136
1137
@@ -2401,8 +2535,10 @@
1138
soname_spec='${libname}${release}${shared_ext}$major'
1139
;;
1140
esac
1141
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
1142
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
1143
postinstall_cmds='chmod 555 $lib'
1144
+ # or fails outright, so override atomically:
1145
+ install_override_mode=555
1146
;;
1147
1148
interix[[3-9]]*)
1149
@@ -2460,7 +2596,7 @@
1150
;;
1151
1152
# This must be Linux ELF.
1153
-linux* | k*bsd*-gnu)
1154
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
1155
version_type=linux
1156
need_lib_prefix=no
1157
need_version=no
1158
@@ -2469,29 +2605,31 @@
1159
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
1160
shlibpath_var=LD_LIBRARY_PATH
1161
shlibpath_overrides_runpath=no
1162
+
1163
# Some binutils ld are patched to set DT_RUNPATH
1164
- save_LDFLAGS=$LDFLAGS
1165
- save_libdir=$libdir
1166
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
1167
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
1168
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
1169
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
1170
- [shlibpath_overrides_runpath=yes])])
1171
- LDFLAGS=$save_LDFLAGS
1172
- libdir=$save_libdir
1173
+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
1174
+ [lt_cv_shlibpath_overrides_runpath=no
1175
+ save_LDFLAGS=$LDFLAGS
1176
+ save_libdir=$libdir
1177
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
1178
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
1179
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
1180
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
1181
+ [lt_cv_shlibpath_overrides_runpath=yes])])
1182
+ LDFLAGS=$save_LDFLAGS
1183
+ libdir=$save_libdir
1184
+ ])
1185
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
1186
1187
# This implies no fast_install, which is unacceptable.
1188
# Some rework will be needed to allow for fast_install
1189
# before this can be enabled.
1190
hardcode_into_libs=yes
1191
1192
- # Add ABI-specific directories to the system library path.
1193
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
1194
-
1195
# Append ld.so.conf contents to the search path
1196
if test -f /etc/ld.so.conf; then
1197
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1198
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1199
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
1200
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1201
fi
1202
1203
# We used to test for /lib/ld.so.1 and disable shared libraries on
1204
@@ -2503,6 +2641,18 @@
1205
dynamic_linker='GNU/Linux ld.so'
1206
;;
1207
1208
+netbsdelf*-gnu)
1209
+ version_type=linux
1210
+ need_lib_prefix=no
1211
+ need_version=no
1212
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1213
+ soname_spec='${libname}${release}${shared_ext}$major'
1214
+ shlibpath_var=LD_LIBRARY_PATH
1215
+ shlibpath_overrides_runpath=no
1216
+ hardcode_into_libs=yes
1217
+ dynamic_linker='NetBSD ld.elf_so'
1218
+ ;;
1219
+
1220
netbsd*)
1221
version_type=sunos
1222
need_lib_prefix=no
1223
@@ -2723,6 +2873,8 @@
1224
The last name is the one that the linker finds with -lNAME]])
1225
_LT_DECL([], [soname_spec], [1],
1226
[[The coded name of the library, if different from the real name]])
1227
+_LT_DECL([], [install_override_mode], [1],
1228
+ [Permission mode override for installation of shared libraries])
1229
_LT_DECL([], [postinstall_cmds], [2],
1230
[Command to use after installation of a shared archive])
1231
_LT_DECL([], [postuninstall_cmds], [2],
1232
@@ -2835,6 +2987,7 @@
1233
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1234
m4_require([_LT_DECL_SED])dnl
1235
m4_require([_LT_DECL_EGREP])dnl
1236
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
1237
1238
AC_ARG_WITH([gnu-ld],
1239
[AS_HELP_STRING([--with-gnu-ld],
1240
@@ -2956,6 +3109,11 @@
1241
esac
1242
reload_cmds='$LD$reload_flag -o $output$reload_objs'
1243
case $host_os in
1244
+ cygwin* | mingw* | pw32* | cegcc*)
1245
+ if test "$GCC" != yes; then
1246
+ reload_cmds=false
1247
+ fi
1248
+ ;;
1249
darwin*)
1250
if test "$GCC" = yes; then
1251
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
1252
@@ -2964,8 +3122,8 @@
1253
fi
1254
;;
1255
esac
1256
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
1257
-_LT_DECL([], [reload_cmds], [2])dnl
1258
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
1259
+_LT_TAGDECL([], [reload_cmds], [2])dnl
1260
])# _LT_CMD_RELOAD
1261
1262
1263
@@ -3017,16 +3175,18 @@
1264
# Base MSYS/MinGW do not provide the 'file' command needed by
1265
# func_win32_libid shell function, so use a weaker test based on 'objdump',
1266
# unless we find 'file', for example because we are cross-compiling.
1267
- if ( file / ) >/dev/null 2>&1; then
1268
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
1269
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
1270
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
1271
lt_cv_file_magic_cmd='func_win32_libid'
1272
else
1273
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
1274
+ # Keep this pattern in sync with the one in func_win32_libid.
1275
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
1276
lt_cv_file_magic_cmd='$OBJDUMP -f'
1277
fi
1278
;;
1279
1280
-cegcc)
1281
+cegcc*)
1282
# use the weaker test based on 'objdump'. See mingw*.
1283
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
1284
lt_cv_file_magic_cmd='$OBJDUMP -f'
1285
@@ -3056,6 +3216,10 @@
1286
lt_cv_deplibs_check_method=pass_all
1287
;;
1288
1289
+haiku*)
1290
+ lt_cv_deplibs_check_method=pass_all
1291
+ ;;
1292
+
1293
hpux10.20* | hpux11*)
1294
lt_cv_file_magic_cmd=/usr/bin/file
1295
case $host_cpu in
1296
@@ -3064,11 +3228,11 @@
1297
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
1298
;;
1299
hppa*64*)
1300
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
1301
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
1302
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
1303
;;
1304
*)
1305
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
1306
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
1307
lt_cv_file_magic_test_file=/usr/lib/libc.sl
1308
;;
1309
esac
1310
@@ -3090,11 +3254,11 @@
1311
;;
1312
1313
# This must be Linux ELF.
1314
-linux* | k*bsd*-gnu)
1315
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
1316
lt_cv_deplibs_check_method=pass_all
1317
;;
1318
1319
-netbsd*)
1320
+netbsd* | netbsdelf*-gnu)
1321
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
1322
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
1323
else
1324
@@ -3168,6 +3332,21 @@
1325
;;
1326
esac
1327
])
1328
+
1329
+file_magic_glob=
1330
+want_nocaseglob=no
1331
+if test "$build" = "$host"; then
1332
+ case $host_os in
1333
+ mingw* | pw32*)
1334
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
1335
+ want_nocaseglob=yes
1336
+ else
1337
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
1338
+ fi
1339
+ ;;
1340
+ esac
1341
+fi
1342
+
1343
file_magic_cmd=$lt_cv_file_magic_cmd
1344
deplibs_check_method=$lt_cv_deplibs_check_method
1345
test -z "$deplibs_check_method" && deplibs_check_method=unknown
1346
@@ -3175,7 +3354,11 @@
1347
_LT_DECL([], [deplibs_check_method], [1],
1348
[Method to check whether dependent libraries are shared objects])
1349
_LT_DECL([], [file_magic_cmd], [1],
1350
- [Command to use when deplibs_check_method == "file_magic"])
1351
+ [Command to use when deplibs_check_method = "file_magic"])
1352
+_LT_DECL([], [file_magic_glob], [1],
1353
+ [How to find potential files when deplibs_check_method = "file_magic"])
1354
+_LT_DECL([], [want_nocaseglob], [1],
1355
+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
1356
])# _LT_CHECK_MAGIC_METHOD
1357
1358
1359
@@ -3232,7 +3415,19 @@
1360
NM="$lt_cv_path_NM"
1361
else
1362
# Didn't find any BSD compatible name lister, look for dumpbin.
1363
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
1364
+ if test -n "$DUMPBIN"; then :
1365
+ # Let the user override the test.
1366
+ else
1367
+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
1368
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
1369
+ *COFF*)
1370
+ DUMPBIN="$DUMPBIN -symbols"
1371
+ ;;
1372
+ *)
1373
+ DUMPBIN=:
1374
+ ;;
1375
+ esac
1376
+ fi
1377
AC_SUBST([DUMPBIN])
1378
if test "$DUMPBIN" != ":"; then
1379
NM="$DUMPBIN"
1380
@@ -3245,13 +3440,13 @@
1381
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
1382
[lt_cv_nm_interface="BSD nm"
1383
echo "int some_variable = 0;" > conftest.$ac_ext
1384
- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
1385
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
1386
(eval "$ac_compile" 2>conftest.err)
1387
cat conftest.err >&AS_MESSAGE_LOG_FD
1388
- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
1389
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
1390
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
1391
cat conftest.err >&AS_MESSAGE_LOG_FD
1392
- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
1393
+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
1394
cat conftest.out >&AS_MESSAGE_LOG_FD
1395
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
1396
lt_cv_nm_interface="MS dumpbin"
1397
@@ -3266,6 +3461,67 @@
1398
dnl AC_DEFUN([AM_PROG_NM], [])
1399
dnl AC_DEFUN([AC_PROG_NM], [])
1400
1401
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
1402
+# --------------------------------
1403
+# how to determine the name of the shared library
1404
+# associated with a specific link library.
1405
+# -- PORTME fill in with the dynamic library characteristics
1406
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
1407
+[m4_require([_LT_DECL_EGREP])
1408
+m4_require([_LT_DECL_OBJDUMP])
1409
+m4_require([_LT_DECL_DLLTOOL])
1410
+AC_CACHE_CHECK([how to associate runtime and link libraries],
1411
+lt_cv_sharedlib_from_linklib_cmd,
1412
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
1413
+
1414
+case $host_os in
1415
+cygwin* | mingw* | pw32* | cegcc*)
1416
+ # two different shell functions defined in ltmain.sh
1417
+ # decide which to use based on capabilities of $DLLTOOL
1418
+ case `$DLLTOOL --help 2>&1` in
1419
+ *--identify-strict*)
1420
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
1421
+ ;;
1422
+ *)
1423
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
1424
+ ;;
1425
+ esac
1426
+ ;;
1427
+*)
1428
+ # fallback: assume linklib IS sharedlib
1429
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
1430
+ ;;
1431
+esac
1432
+])
1433
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
1434
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
1435
+
1436
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
1437
+ [Command to associate shared and link libraries])
1438
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
1439
+
1440
+
1441
+# _LT_PATH_MANIFEST_TOOL
1442
+# ----------------------
1443
+# locate the manifest tool
1444
+m4_defun([_LT_PATH_MANIFEST_TOOL],
1445
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
1446
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
1447
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
1448
+ [lt_cv_path_mainfest_tool=no
1449
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
1450
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
1451
+ cat conftest.err >&AS_MESSAGE_LOG_FD
1452
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
1453
+ lt_cv_path_mainfest_tool=yes
1454
+ fi
1455
+ rm -f conftest*])
1456
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
1457
+ MANIFEST_TOOL=:
1458
+fi
1459
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
1460
+])# _LT_PATH_MANIFEST_TOOL
1461
+
1462
1463
# LT_LIB_M
1464
# --------
1465
@@ -3274,7 +3530,7 @@
1466
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1467
LIBM=
1468
case $host in
1469
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
1470
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
1471
# These system don't have libm, or don't need it
1472
;;
1473
*-ncr-sysv4.3*)
1474
@@ -3302,7 +3558,12 @@
1475
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
1476
1477
if test "$GCC" = yes; then
1478
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
1479
+ case $cc_basename in
1480
+ nvcc*)
1481
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
1482
+ *)
1483
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
1484
+ esac
1485
1486
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
1487
lt_cv_prog_compiler_rtti_exceptions,
1488
@@ -3319,6 +3580,7 @@
1489
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
1490
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1491
AC_REQUIRE([AC_PROG_CC])dnl
1492
+AC_REQUIRE([AC_PROG_AWK])dnl
1493
AC_REQUIRE([LT_PATH_NM])dnl
1494
AC_REQUIRE([LT_PATH_LD])dnl
1495
m4_require([_LT_DECL_SED])dnl
1496
@@ -3386,8 +3648,8 @@
1497
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
1498
1499
# Transform an extracted symbol line into symbol name and symbol address
1500
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
1501
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
1502
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
1503
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
1504
1505
# Handle CRLF in mingw tool chain
1506
opt_cr=
1507
@@ -3423,6 +3685,7 @@
1508
else
1509
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
1510
fi
1511
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
1512
1513
# Check to see that the pipe works correctly.
1514
pipe_works=no
1515
@@ -3444,7 +3707,7 @@
1516
if AC_TRY_EVAL(ac_compile); then
1517
# Now try to grab the symbols.
1518
nlist=conftest.nm
1519
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
1520
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
1521
# Try sorting and uniquifying the output.
1522
if sort "$nlist" | uniq > "$nlist"T; then
1523
mv -f "$nlist"T "$nlist"
1524
@@ -3456,6 +3719,18 @@
1525
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
1526
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
1527
cat <<_LT_EOF > conftest.$ac_ext
1528
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
1529
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
1530
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
1531
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
1532
+# define LT@&t@_DLSYM_CONST
1533
+#elif defined(__osf__)
1534
+/* This system does not cope well with relocations in const data. */
1535
+# define LT@&t@_DLSYM_CONST
1536
+#else
1537
+# define LT@&t@_DLSYM_CONST const
1538
+#endif
1539
+
1540
#ifdef __cplusplus
1541
extern "C" {
1542
#endif
1543
@@ -3467,7 +3742,7 @@
1544
cat <<_LT_EOF >> conftest.$ac_ext
1545
1546
/* The mapping between symbol names and symbols. */
1547
-const struct {
1548
+LT@&t@_DLSYM_CONST struct {
1549
const char *name;
1550
void *address;
1551
}
1552
@@ -3493,15 +3768,15 @@
1553
_LT_EOF
1554
# Now try linking the two files.
1555
mv conftest.$ac_objext conftstm.$ac_objext
1556
- lt_save_LIBS="$LIBS"
1557
- lt_save_CFLAGS="$CFLAGS"
1558
+ lt_globsym_save_LIBS=$LIBS
1559
+ lt_globsym_save_CFLAGS=$CFLAGS
1560
LIBS="conftstm.$ac_objext"
1561
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
1562
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
1563
pipe_works=yes
1564
fi
1565
- LIBS="$lt_save_LIBS"
1566
- CFLAGS="$lt_save_CFLAGS"
1567
+ LIBS=$lt_globsym_save_LIBS
1568
+ CFLAGS=$lt_globsym_save_CFLAGS
1569
else
1570
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
1571
fi
1572
@@ -3534,6 +3809,13 @@
1573
AC_MSG_RESULT(ok)
1574
fi
1575
1576
+# Response file support.
1577
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
1578
+ nm_file_list_spec='@'
1579
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
1580
+ nm_file_list_spec='@'
1581
+fi
1582
+
1583
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
1584
[Take the output of nm and produce a listing of raw symbols and C names])
1585
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
1586
@@ -3544,6 +3826,8 @@
1587
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
1588
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
1589
[Transform the output of nm in a C name address pair when lib prefix is needed])
1590
+_LT_DECL([], [nm_file_list_spec], [1],
1591
+ [Specify filename containing input files for $NM])
1592
]) # _LT_CMD_GLOBAL_SYMBOLS
1593
1594
1595
@@ -3555,7 +3839,6 @@
1596
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
1597
_LT_TAGVAR(lt_prog_compiler_static, $1)=
1598
1599
-AC_MSG_CHECKING([for $compiler option to produce PIC])
1600
m4_if([$1], [CXX], [
1601
# C++ specific cases for pic, static, wl, etc.
1602
if test "$GXX" = yes; then
1603
@@ -3606,6 +3889,11 @@
1604
# DJGPP does not support shared libraries at all
1605
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
1606
;;
1607
+ haiku*)
1608
+ # PIC is the default for Haiku.
1609
+ # The "-static" flag exists, but is broken.
1610
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
1611
+ ;;
1612
interix[[3-9]]*)
1613
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
1614
# Instead, we relocate shared libraries at runtime.
1615
@@ -3655,6 +3943,12 @@
1616
;;
1617
esac
1618
;;
1619
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
1620
+ # This hack is so that the source file can tell whether it is being
1621
+ # built for inclusion in a dll (and should export symbols for example).
1622
+ m4_if([$1], [GCJ], [],
1623
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
1624
+ ;;
1625
dgux*)
1626
case $cc_basename in
1627
ec++*)
1628
@@ -3711,7 +4005,7 @@
1629
;;
1630
esac
1631
;;
1632
- linux* | k*bsd*-gnu)
1633
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1634
case $cc_basename in
1635
KCC*)
1636
# KAI C++ Compiler
1637
@@ -3744,8 +4038,8 @@
1638
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
1639
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1640
;;
1641
- xlc* | xlC*)
1642
- # IBM XL 8.0 on PPC
1643
+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
1644
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
1645
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1646
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
1647
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
1648
@@ -3775,7 +4069,7 @@
1649
;;
1650
esac
1651
;;
1652
- netbsd*)
1653
+ netbsd* | netbsdelf*-gnu)
1654
;;
1655
*qnx* | *nto*)
1656
# QNX uses GNU C++, but need to define -shared option too, otherwise
1657
@@ -3807,7 +4101,7 @@
1658
;;
1659
solaris*)
1660
case $cc_basename in
1661
- CC*)
1662
+ CC* | sunCC*)
1663
# Sun C++ 4.2, 5.x and Centerline C++
1664
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1665
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1666
@@ -3911,6 +4205,12 @@
1667
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
1668
;;
1669
1670
+ haiku*)
1671
+ # PIC is the default for Haiku.
1672
+ # The "-static" flag exists, but is broken.
1673
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
1674
+ ;;
1675
+
1676
hpux*)
1677
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
1678
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
1679
@@ -3953,6 +4253,13 @@
1680
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
1681
;;
1682
esac
1683
+
1684
+ case $cc_basename in
1685
+ nvcc*) # Cuda Compiler Driver 2.2
1686
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
1687
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
1688
+ ;;
1689
+ esac
1690
else
1691
# PORTME Check for flag to pass linker flags through the system compiler.
1692
case $host_os in
1693
@@ -3995,7 +4302,7 @@
1694
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1695
;;
1696
1697
- linux* | k*bsd*-gnu)
1698
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1699
case $cc_basename in
1700
# old Intel for x86_64 which still supported -KPIC.
1701
ecc*)
1702
@@ -4016,7 +4323,13 @@
1703
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
1704
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
1705
;;
1706
- pgcc* | pgf77* | pgf90* | pgf95*)
1707
+ nagfor*)
1708
+ # NAG Fortran compiler
1709
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
1710
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
1711
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1712
+ ;;
1713
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
1714
# Portland Group compilers (*not* the Pentium gcc compiler,
1715
# which looks to be a dead project)
1716
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1717
@@ -4028,25 +4341,25 @@
1718
# All Alpha code is PIC.
1719
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1720
;;
1721
- xl*)
1722
- # IBM XL C 8.0/Fortran 10.1 on PPC
1723
+ xl* | bgxl* | bgf* | mpixl*)
1724
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
1725
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1726
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
1727
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
1728
;;
1729
*)
1730
case `$CC -V 2>&1 | sed 5q` in
1731
- *Sun\ C*)
1732
- # Sun C 5.9
1733
+ *Sun\ F* | *Sun*Fortran*)
1734
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
1735
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1736
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1737
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1738
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
1739
;;
1740
- *Sun\ F*)
1741
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
1742
+ *Sun\ C*)
1743
+ # Sun C 5.9
1744
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1745
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1746
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
1747
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1748
;;
1749
esac
1750
;;
1751
@@ -4078,7 +4391,7 @@
1752
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1753
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1754
case $cc_basename in
1755
- f77* | f90* | f95*)
1756
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
1757
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
1758
*)
1759
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
1760
@@ -4135,9 +4448,11 @@
1761
_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
1762
;;
1763
esac
1764
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
1765
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
1766
- [How to pass a linker flag through the compiler])
1767
+
1768
+AC_CACHE_CHECK([for $compiler option to produce PIC],
1769
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
1770
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
1771
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
1772
1773
#
1774
# Check to make sure the PIC flag actually works.
1775
@@ -4156,6 +4471,8 @@
1776
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
1777
[Additional compiler flags for building library objects])
1778
1779
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
1780
+ [How to pass a linker flag through the compiler])
1781
#
1782
# Check to make sure the static flag actually works.
1783
#
1784
@@ -4176,6 +4493,7 @@
1785
m4_defun([_LT_LINKER_SHLIBS],
1786
[AC_REQUIRE([LT_PATH_LD])dnl
1787
AC_REQUIRE([LT_PATH_NM])dnl
1788
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
1789
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1790
m4_require([_LT_DECL_EGREP])dnl
1791
m4_require([_LT_DECL_SED])dnl
1792
@@ -4184,27 +4502,38 @@
1793
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
1794
m4_if([$1], [CXX], [
1795
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1796
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
1797
case $host_os in
1798
aix[[4-9]]*)
1799
# If we're using GNU nm, then we don't want the "-C" option.
1800
# -C means demangle to AIX nm, but means don't demangle with GNU nm
1801
+ # Also, AIX nm treats weak defined symbols like other global defined
1802
+ # symbols, whereas GNU nm marks them as "W".
1803
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
1804
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
1805
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
1806
else
1807
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
1808
fi
1809
;;
1810
pw32*)
1811
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
1812
- ;;
1813
+ ;;
1814
cygwin* | mingw* | cegcc*)
1815
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
1816
- ;;
1817
+ case $cc_basename in
1818
+ cl*) ;;
1819
+ *)
1820
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
1821
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
1822
+ ;;
1823
+ esac
1824
+ ;;
1825
+ linux* | k*bsd*-gnu | gnu*)
1826
+ _LT_TAGVAR(link_all_deplibs, $1)=no
1827
+ ;;
1828
*)
1829
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1830
- ;;
1831
+ ;;
1832
esac
1833
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
1834
], [
1835
runpath_var=
1836
_LT_TAGVAR(allow_undefined_flag, $1)=
1837
@@ -4264,10 +4593,39 @@
1838
openbsd*)
1839
with_gnu_ld=no
1840
;;
1841
+ linux* | k*bsd*-gnu | gnu*)
1842
+ _LT_TAGVAR(link_all_deplibs, $1)=no
1843
+ ;;
1844
esac
1845
1846
_LT_TAGVAR(ld_shlibs, $1)=yes
1847
+
1848
+ # On some targets, GNU ld is compatible enough with the native linker
1849
+ # that we're better off using the native interface for both.
1850
+ lt_use_gnu_ld_interface=no
1851
if test "$with_gnu_ld" = yes; then
1852
+ case $host_os in
1853
+ aix*)
1854
+ # The AIX port of GNU ld has always aspired to compatibility
1855
+ # with the native linker. However, as the warning in the GNU ld
1856
+ # block says, versions before 2.19.5* couldn't really create working
1857
+ # shared libraries, regardless of the interface used.
1858
+ case `$LD -v 2>&1` in
1859
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
1860
+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
1861
+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
1862
+ *)
1863
+ lt_use_gnu_ld_interface=yes
1864
+ ;;
1865
+ esac
1866
+ ;;
1867
+ *)
1868
+ lt_use_gnu_ld_interface=yes
1869
+ ;;
1870
+ esac
1871
+ fi
1872
+
1873
+ if test "$lt_use_gnu_ld_interface" = yes; then
1874
# If archive_cmds runs LD, not CC, wlarc should be empty
1875
wlarc='${wl}'
1876
1877
@@ -4285,6 +4643,7 @@
1878
fi
1879
supports_anon_versioning=no
1880
case `$LD -v 2>&1` in
1881
+ *GNU\ gold*) supports_anon_versioning=yes ;;
1882
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
1883
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
1884
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
1885
@@ -4300,11 +4659,12 @@
1886
_LT_TAGVAR(ld_shlibs, $1)=no
1887
cat <<_LT_EOF 1>&2
1888
1889
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
1890
+*** Warning: the GNU linker, at least up to release 2.19, is reported
1891
*** to be unable to reliably create shared libraries on AIX.
1892
*** Therefore, libtool is disabling shared libraries support. If you
1893
-*** really care for shared libraries, you may want to modify your PATH
1894
-*** so that a non-GNU linker is found, and then restart.
1895
+*** really care for shared libraries, you may want to install binutils
1896
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
1897
+*** You will then need to restart the configuration process.
1898
1899
_LT_EOF
1900
fi
1901
@@ -4340,10 +4700,12 @@
1902
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1903
# as there is no search path for DLLs.
1904
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1905
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
1906
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
1907
_LT_TAGVAR(always_export_symbols, $1)=no
1908
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1909
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
1910
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
1911
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
1912
1913
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
1914
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
1915
@@ -4361,6 +4723,11 @@
1916
fi
1917
;;
1918
1919
+ haiku*)
1920
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1921
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
1922
+ ;;
1923
+
1924
interix[[3-9]]*)
1925
_LT_TAGVAR(hardcode_direct, $1)=no
1926
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
1927
@@ -4376,7 +4743,7 @@
1928
_LT_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'
1929
;;
1930
1931
- gnu* | linux* | tpf* | k*bsd*-gnu)
1932
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
1933
tmp_diet=no
1934
if test "$host_os" = linux-dietlibc; then
1935
case $cc_basename in
1936
@@ -4386,15 +4753,16 @@
1937
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
1938
&& test "$tmp_diet" = no
1939
then
1940
- tmp_addflag=
1941
+ tmp_addflag=' $pic_flag'
1942
tmp_sharedflag='-shared'
1943
case $cc_basename,$host_cpu in
1944
pgcc*) # Portland Group C compiler
1945
- _LT_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'
1946
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
1947
tmp_addflag=' $pic_flag'
1948
;;
1949
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
1950
- _LT_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'
1951
+ pgf77* | pgf90* | pgf95* | pgfortran*)
1952
+ # Portland Group f77 and f90 compilers
1953
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
1954
tmp_addflag=' $pic_flag -Mnomain' ;;
1955
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
1956
tmp_addflag=' -i_dynamic' ;;
1957
@@ -4405,13 +4773,17 @@
1958
lf95*) # Lahey Fortran 8.1
1959
_LT_TAGVAR(whole_archive_flag_spec, $1)=
1960
tmp_sharedflag='--shared' ;;
1961
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
1962
+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
1963
tmp_sharedflag='-qmkshrobj'
1964
tmp_addflag= ;;
1965
+ nvcc*) # Cuda Compiler Driver 2.2
1966
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
1967
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
1968
+ ;;
1969
esac
1970
case `$CC -V 2>&1 | sed 5q` in
1971
*Sun\ C*) # Sun C 5.9
1972
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
1973
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
1974
_LT_TAGVAR(compiler_needs_object, $1)=yes
1975
tmp_sharedflag='-G' ;;
1976
*Sun\ F*) # Sun Fortran 8.3
1977
@@ -4427,17 +4799,17 @@
1978
fi
1979
1980
case $cc_basename in
1981
- xlf*)
1982
+ xlf* | bgf* | bgxlf* | mpixlf*)
1983
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
1984
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
1985
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
1986
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
1987
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
1988
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
1989
if test "x$supports_anon_versioning" = xyes; then
1990
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
1991
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
1992
echo "local: *; };" >> $output_objdir/$libname.ver~
1993
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
1994
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
1995
fi
1996
;;
1997
esac
1998
@@ -4446,13 +4818,13 @@
1999
fi
2000
;;
2001
2002
- netbsd*)
2003
+ netbsd* | netbsdelf*-gnu)
2004
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
2005
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
2006
wlarc=
2007
else
2008
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2009
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2010
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2011
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2012
fi
2013
;;
2014
2015
@@ -4470,8 +4842,8 @@
2016
2017
_LT_EOF
2018
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2019
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2020
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2021
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2022
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2023
else
2024
_LT_TAGVAR(ld_shlibs, $1)=no
2025
fi
2026
@@ -4517,8 +4889,8 @@
2027
2028
*)
2029
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
2030
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2031
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2032
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2033
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2034
else
2035
_LT_TAGVAR(ld_shlibs, $1)=no
2036
fi
2037
@@ -4558,8 +4930,10 @@
2038
else
2039
# If we're using GNU nm, then we don't want the "-C" option.
2040
# -C means demangle to AIX nm, but means don't demangle with GNU nm
2041
+ # Also, AIX nm treats weak defined symbols like other global
2042
+ # defined symbols, whereas GNU nm marks them as "W".
2043
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
2044
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2045
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2046
else
2047
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
2048
fi
2049
@@ -4621,6 +4995,7 @@
2050
if test "$aix_use_runtimelinking" = yes; then
2051
shared_flag="$shared_flag "'${wl}-G'
2052
fi
2053
+ _LT_TAGVAR(link_all_deplibs, $1)=no
2054
else
2055
# not using gcc
2056
if test "$host_cpu" = ia64; then
2057
@@ -4646,9 +5021,9 @@
2058
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
2059
# Determine the default libpath from the value encoded in an
2060
# empty executable.
2061
- _LT_SYS_MODULE_PATH_AIX
2062
+ _LT_SYS_MODULE_PATH_AIX([$1])
2063
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2064
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2065
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2066
else
2067
if test "$host_cpu" = ia64; then
2068
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2069
@@ -4657,14 +5032,19 @@
2070
else
2071
# Determine the default libpath from the value encoded in an
2072
# empty executable.
2073
- _LT_SYS_MODULE_PATH_AIX
2074
+ _LT_SYS_MODULE_PATH_AIX([$1])
2075
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2076
# Warning - without using the other run time loading flags,
2077
# -berok will link without error, but may produce a broken library.
2078
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
2079
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
2080
- # Exported symbols can be pulled into shared objects from archives
2081
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2082
+ if test "$with_gnu_ld" = yes; then
2083
+ # We only use this code for GNU lds that support --whole-archive.
2084
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
2085
+ else
2086
+ # Exported symbols can be pulled into shared objects from archives
2087
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2088
+ fi
2089
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2090
# This is similar to how AIX traditionally builds its shared libraries.
2091
_LT_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'
2092
@@ -4696,20 +5076,63 @@
2093
# Microsoft Visual C++.
2094
# hardcode_libdir_flag_spec is actually meaningless, as there is
2095
# no search path for DLLs.
2096
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
2097
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2098
- # Tell ltmain to make .lib files, not .a files.
2099
- libext=lib
2100
- # Tell ltmain to make .dll files, not .so files.
2101
- shrext_cmds=".dll"
2102
- # FIXME: Setting linknames here is a bad hack.
2103
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
2104
- # The linker will automatically build a .lib file if we build a DLL.
2105
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
2106
- # FIXME: Should let the user specify the lib program.
2107
- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
2108
- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
2109
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2110
+ case $cc_basename in
2111
+ cl*)
2112
+ # Native MSVC
2113
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
2114
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2115
+ _LT_TAGVAR(always_export_symbols, $1)=yes
2116
+ _LT_TAGVAR(file_list_spec, $1)='@'
2117
+ # Tell ltmain to make .lib files, not .a files.
2118
+ libext=lib
2119
+ # Tell ltmain to make .dll files, not .so files.
2120
+ shrext_cmds=".dll"
2121
+ # FIXME: Setting linknames here is a bad hack.
2122
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
2123
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2124
+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
2125
+ else
2126
+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
2127
+ fi~
2128
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
2129
+ linknames='
2130
+ # The linker will not automatically build a static lib if we build a DLL.
2131
+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
2132
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2133
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
2134
+ # Don't use ranlib
2135
+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
2136
+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
2137
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
2138
+ case $lt_outputfile in
2139
+ *.exe|*.EXE) ;;
2140
+ *)
2141
+ lt_outputfile="$lt_outputfile.exe"
2142
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
2143
+ ;;
2144
+ esac~
2145
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
2146
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
2147
+ $RM "$lt_outputfile.manifest";
2148
+ fi'
2149
+ ;;
2150
+ *)
2151
+ # Assume MSVC wrapper
2152
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
2153
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2154
+ # Tell ltmain to make .lib files, not .a files.
2155
+ libext=lib
2156
+ # Tell ltmain to make .dll files, not .so files.
2157
+ shrext_cmds=".dll"
2158
+ # FIXME: Setting linknames here is a bad hack.
2159
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
2160
+ # The linker will automatically build a .lib file if we build a DLL.
2161
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
2162
+ # FIXME: Should let the user specify the lib program.
2163
+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
2164
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2165
+ ;;
2166
+ esac
2167
;;
2168
2169
darwin* | rhapsody*)
2170
@@ -4747,7 +5170,7 @@
2171
2172
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
2173
freebsd* | dragonfly*)
2174
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
2175
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
2176
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
2177
_LT_TAGVAR(hardcode_direct, $1)=yes
2178
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
2179
@@ -4755,7 +5178,7 @@
2180
2181
hpux9*)
2182
if test "$GCC" = yes; then
2183
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2184
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2185
else
2186
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2187
fi
2188
@@ -4770,8 +5193,8 @@
2189
;;
2190
2191
hpux10*)
2192
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
2193
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2194
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
2195
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2196
else
2197
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
2198
fi
2199
@@ -4789,16 +5212,16 @@
2200
;;
2201
2202
hpux11*)
2203
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
2204
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
2205
case $host_cpu in
2206
hppa*64*)
2207
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
2208
;;
2209
ia64*)
2210
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
2211
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
2212
;;
2213
*)
2214
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2215
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2216
;;
2217
esac
2218
else
2219
@@ -4810,7 +5233,14 @@
2220
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
2221
;;
2222
*)
2223
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
2224
+ m4_if($1, [], [
2225
+ # Older versions of the 11.00 compiler do not understand -b yet
2226
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
2227
+ _LT_LINKER_OPTION([if $CC understands -b],
2228
+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
2229
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
2230
+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
2231
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
2232
;;
2233
esac
2234
fi
2235
@@ -4838,19 +5268,34 @@
2236
2237
irix5* | irix6* | nonstopux*)
2238
if test "$GCC" = yes; then
2239
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2240
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2241
# Try to use the -exported_symbol ld option, if it does not
2242
# work, assume that -exports_file does not work either and
2243
# implicitly export all symbols.
2244
- save_LDFLAGS="$LDFLAGS"
2245
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
2246
- AC_LINK_IFELSE(int foo(void) {},
2247
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
2248
- )
2249
- LDFLAGS="$save_LDFLAGS"
2250
+ # This should be the same for all languages, so no per-tag cache variable.
2251
+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
2252
+ [lt_cv_irix_exported_symbol],
2253
+ [save_LDFLAGS="$LDFLAGS"
2254
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
2255
+ AC_LINK_IFELSE(
2256
+ [AC_LANG_SOURCE(
2257
+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
2258
+ [C++], [[int foo (void) { return 0; }]],
2259
+ [Fortran 77], [[
2260
+ subroutine foo
2261
+ end]],
2262
+ [Fortran], [[
2263
+ subroutine foo
2264
+ end]])])],
2265
+ [lt_cv_irix_exported_symbol=yes],
2266
+ [lt_cv_irix_exported_symbol=no])
2267
+ LDFLAGS="$save_LDFLAGS"])
2268
+ if test "$lt_cv_irix_exported_symbol" = yes; then
2269
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
2270
+ fi
2271
else
2272
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2273
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
2274
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2275
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
2276
fi
2277
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
2278
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2279
@@ -4859,7 +5304,7 @@
2280
_LT_TAGVAR(link_all_deplibs, $1)=yes
2281
;;
2282
2283
- netbsd*)
2284
+ netbsd* | netbsdelf*-gnu)
2285
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
2286
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
2287
else
2288
@@ -4912,17 +5357,17 @@
2289
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2290
_LT_TAGVAR(hardcode_minus_L, $1)=yes
2291
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2292
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
2293
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
2294
_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
2295
;;
2296
2297
osf3*)
2298
if test "$GCC" = yes; then
2299
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2300
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2301
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2302
else
2303
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2304
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2305
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2306
fi
2307
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
2308
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2309
@@ -4932,13 +5377,13 @@
2310
osf4* | osf5*) # as osf3* with the addition of -msym flag
2311
if test "$GCC" = yes; then
2312
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2313
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2314
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2315
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2316
else
2317
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2318
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2319
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2320
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
2321
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
2322
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
2323
2324
# Both c and cxx compiler support -rpath directly
2325
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
2326
@@ -4951,9 +5396,9 @@
2327
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
2328
if test "$GCC" = yes; then
2329
wlarc='${wl}'
2330
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
2331
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
2332
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
2333
- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
2334
+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
2335
else
2336
case `$CC -V 2>&1` in
2337
*"Compilers 5.0"*)
2338
@@ -5129,36 +5574,38 @@
2339
# Test whether the compiler implicitly links with -lc since on some
2340
# systems, -lgcc has to come before -lc. If gcc already passes -lc
2341
# to ld, don't add -lc before -lgcc.
2342
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
2343
- $RM conftest*
2344
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2345
-
2346
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
2347
- soname=conftest
2348
- lib=conftest
2349
- libobjs=conftest.$ac_objext
2350
- deplibs=
2351
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
2352
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
2353
- compiler_flags=-v
2354
- linker_flags=-v
2355
- verstring=
2356
- output_objdir=.
2357
- libname=conftest
2358
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
2359
- _LT_TAGVAR(allow_undefined_flag, $1)=
2360
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
2361
- then
2362
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
2363
- else
2364
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2365
- fi
2366
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
2367
- else
2368
- cat conftest.err 1>&5
2369
- fi
2370
- $RM conftest*
2371
- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
2372
+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
2373
+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
2374
+ [$RM conftest*
2375
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2376
+
2377
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
2378
+ soname=conftest
2379
+ lib=conftest
2380
+ libobjs=conftest.$ac_objext
2381
+ deplibs=
2382
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
2383
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
2384
+ compiler_flags=-v
2385
+ linker_flags=-v
2386
+ verstring=
2387
+ output_objdir=.
2388
+ libname=conftest
2389
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
2390
+ _LT_TAGVAR(allow_undefined_flag, $1)=
2391
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
2392
+ then
2393
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
2394
+ else
2395
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2396
+ fi
2397
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
2398
+ else
2399
+ cat conftest.err 1>&5
2400
+ fi
2401
+ $RM conftest*
2402
+ ])
2403
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
2404
;;
2405
esac
2406
fi
2407
@@ -5223,8 +5670,6 @@
2408
to runtime path list])
2409
_LT_TAGDECL([], [link_all_deplibs], [0],
2410
[Whether libtool must link a program against all its dependency libraries])
2411
-_LT_TAGDECL([], [fix_srcfile_path], [1],
2412
- [Fix the shell variable $srcfile for the compiler])
2413
_LT_TAGDECL([], [always_export_symbols], [0],
2414
[Set to "yes" if exported symbols are required])
2415
_LT_TAGDECL([], [export_symbols_cmds], [2],
2416
@@ -5235,6 +5680,8 @@
2417
[Symbols that must always be exported])
2418
_LT_TAGDECL([], [prelink_cmds], [2],
2419
[Commands necessary for linking programs (against libraries) with templates])
2420
+_LT_TAGDECL([], [postlink_cmds], [2],
2421
+ [Commands necessary for finishing linking programs])
2422
_LT_TAGDECL([], [file_list_spec], [1],
2423
[Specify filename containing input files])
2424
dnl FIXME: Not yet implemented
2425
@@ -5324,37 +5771,22 @@
2426
])# _LT_LANG_C_CONFIG
2427
2428
2429
-# _LT_PROG_CXX
2430
-# ------------
2431
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
2432
-# compiler, we have our own version here.
2433
-m4_defun([_LT_PROG_CXX],
2434
-[
2435
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
2436
-AC_PROG_CXX
2437
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
2438
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
2439
- (test "X$CXX" != "Xg++"))) ; then
2440
- AC_PROG_CXXCPP
2441
-else
2442
- _lt_caught_CXX_error=yes
2443
-fi
2444
-popdef([AC_MSG_ERROR])
2445
-])# _LT_PROG_CXX
2446
-
2447
-dnl aclocal-1.4 backwards compatibility:
2448
-dnl AC_DEFUN([_LT_PROG_CXX], [])
2449
-
2450
-
2451
# _LT_LANG_CXX_CONFIG([TAG])
2452
# --------------------------
2453
# Ensure that the configuration variables for a C++ compiler are suitably
2454
# defined. These variables are subsequently used by _LT_CONFIG to write
2455
# the compiler configuration to `libtool'.
2456
m4_defun([_LT_LANG_CXX_CONFIG],
2457
-[AC_REQUIRE([_LT_PROG_CXX])dnl
2458
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2459
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2460
m4_require([_LT_DECL_EGREP])dnl
2461
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
2462
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
2463
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
2464
+ (test "X$CXX" != "Xg++"))) ; then
2465
+ AC_PROG_CXXCPP
2466
+else
2467
+ _lt_caught_CXX_error=yes
2468
+fi
2469
2470
AC_LANG_PUSH(C++)
2471
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
2472
@@ -5376,6 +5808,8 @@
2473
_LT_TAGVAR(module_expsym_cmds, $1)=
2474
_LT_TAGVAR(link_all_deplibs, $1)=unknown
2475
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
2476
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
2477
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
2478
_LT_TAGVAR(no_undefined_flag, $1)=
2479
_LT_TAGVAR(whole_archive_flag_spec, $1)=
2480
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
2481
@@ -5407,6 +5841,7 @@
2482
2483
# Allow CC to be a program name with arguments.
2484
lt_save_CC=$CC
2485
+ lt_save_CFLAGS=$CFLAGS
2486
lt_save_LD=$LD
2487
lt_save_GCC=$GCC
2488
GCC=$GXX
2489
@@ -5424,6 +5859,7 @@
2490
fi
2491
test -z "${LDCXX+set}" || LD=$LDCXX
2492
CC=${CXX-"c++"}
2493
+ CFLAGS=$CXXFLAGS
2494
compiler=$CC
2495
_LT_TAGVAR(compiler, $1)=$CC
2496
_LT_CC_BASENAME([$compiler])
2497
@@ -5445,8 +5881,8 @@
2498
# Check if GNU C++ uses GNU ld as the underlying linker, since the
2499
# archiving commands below assume that GNU ld is being used.
2500
if test "$with_gnu_ld" = yes; then
2501
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
2502
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2503
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
2504
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2505
2506
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2507
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2508
@@ -5478,7 +5914,7 @@
2509
# Commands to make compiler produce verbose output that lists
2510
# what "hidden" libraries, object files and flags are used when
2511
# linking a shared library.
2512
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2513
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2514
2515
else
2516
GXX=no
2517
@@ -5587,10 +6023,10 @@
2518
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
2519
# Determine the default libpath from the value encoded in an empty
2520
# executable.
2521
- _LT_SYS_MODULE_PATH_AIX
2522
+ _LT_SYS_MODULE_PATH_AIX([$1])
2523
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2524
2525
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2526
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2527
else
2528
if test "$host_cpu" = ia64; then
2529
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2530
@@ -5599,14 +6035,19 @@
2531
else
2532
# Determine the default libpath from the value encoded in an
2533
# empty executable.
2534
- _LT_SYS_MODULE_PATH_AIX
2535
+ _LT_SYS_MODULE_PATH_AIX([$1])
2536
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2537
# Warning - without using the other run time loading flags,
2538
# -berok will link without error, but may produce a broken library.
2539
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
2540
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
2541
- # Exported symbols can be pulled into shared objects from archives
2542
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2543
+ if test "$with_gnu_ld" = yes; then
2544
+ # We only use this code for GNU lds that support --whole-archive.
2545
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
2546
+ else
2547
+ # Exported symbols can be pulled into shared objects from archives
2548
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
2549
+ fi
2550
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
2551
# This is similar to how AIX traditionally builds its shared
2552
# libraries.
2553
@@ -5636,28 +6077,75 @@
2554
;;
2555
2556
cygwin* | mingw* | pw32* | cegcc*)
2557
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
2558
- # as there is no search path for DLLs.
2559
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2560
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2561
- _LT_TAGVAR(always_export_symbols, $1)=no
2562
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2563
-
2564
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2565
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2566
- # If the export-symbols file already is a .def file (1st line
2567
- # is EXPORTS), use it as is; otherwise, prepend...
2568
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2569
- cp $export_symbols $output_objdir/$soname.def;
2570
- else
2571
- echo EXPORTS > $output_objdir/$soname.def;
2572
- cat $export_symbols >> $output_objdir/$soname.def;
2573
- fi~
2574
- $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'
2575
- else
2576
- _LT_TAGVAR(ld_shlibs, $1)=no
2577
- fi
2578
- ;;
2579
+ case $GXX,$cc_basename in
2580
+ ,cl* | no,cl*)
2581
+ # Native MSVC
2582
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
2583
+ # no search path for DLLs.
2584
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
2585
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2586
+ _LT_TAGVAR(always_export_symbols, $1)=yes
2587
+ _LT_TAGVAR(file_list_spec, $1)='@'
2588
+ # Tell ltmain to make .lib files, not .a files.
2589
+ libext=lib
2590
+ # Tell ltmain to make .dll files, not .so files.
2591
+ shrext_cmds=".dll"
2592
+ # FIXME: Setting linknames here is a bad hack.
2593
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
2594
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2595
+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
2596
+ else
2597
+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
2598
+ fi~
2599
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
2600
+ linknames='
2601
+ # The linker will not automatically build a static lib if we build a DLL.
2602
+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
2603
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2604
+ # Don't use ranlib
2605
+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
2606
+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
2607
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
2608
+ case $lt_outputfile in
2609
+ *.exe|*.EXE) ;;
2610
+ *)
2611
+ lt_outputfile="$lt_outputfile.exe"
2612
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
2613
+ ;;
2614
+ esac~
2615
+ func_to_tool_file "$lt_outputfile"~
2616
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
2617
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
2618
+ $RM "$lt_outputfile.manifest";
2619
+ fi'
2620
+ ;;
2621
+ *)
2622
+ # g++
2623
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
2624
+ # as there is no search path for DLLs.
2625
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
2626
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
2627
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
2628
+ _LT_TAGVAR(always_export_symbols, $1)=no
2629
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2630
+
2631
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
2632
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
2633
+ # If the export-symbols file already is a .def file (1st line
2634
+ # is EXPORTS), use it as is; otherwise, prepend...
2635
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2636
+ cp $export_symbols $output_objdir/$soname.def;
2637
+ else
2638
+ echo EXPORTS > $output_objdir/$soname.def;
2639
+ cat $export_symbols >> $output_objdir/$soname.def;
2640
+ fi~
2641
+ $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'
2642
+ else
2643
+ _LT_TAGVAR(ld_shlibs, $1)=no
2644
+ fi
2645
+ ;;
2646
+ esac
2647
+ ;;
2648
darwin* | rhapsody*)
2649
_LT_DARWIN_LINKER_FEATURES($1)
2650
;;
2651
@@ -5699,6 +6187,11 @@
2652
gnu*)
2653
;;
2654
2655
+ haiku*)
2656
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2657
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
2658
+ ;;
2659
+
2660
hpux9*)
2661
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
2662
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
2663
@@ -5723,11 +6216,11 @@
2664
# explicitly linking system object files so we need to strip them
2665
# from the output so that they don't get included in the library
2666
# dependencies.
2667
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2668
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
2669
;;
2670
*)
2671
if test "$GXX" = yes; then
2672
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2673
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2674
else
2675
# FIXME: insert proper C++ library support
2676
_LT_TAGVAR(ld_shlibs, $1)=no
2677
@@ -5788,7 +6281,7 @@
2678
# explicitly linking system object files so we need to strip them
2679
# from the output so that they don't get included in the library
2680
# dependencies.
2681
- 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 "X$list" | $Xsed'
2682
+ 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; func_echo_all "$list"'
2683
;;
2684
*)
2685
if test "$GXX" = yes; then
2686
@@ -5798,10 +6291,10 @@
2687
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2688
;;
2689
ia64*)
2690
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2691
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2692
;;
2693
*)
2694
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2695
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2696
;;
2697
esac
2698
fi
2699
@@ -5831,7 +6324,7 @@
2700
case $cc_basename in
2701
CC*)
2702
# SGI C++
2703
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2704
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2705
2706
# Archives containing C++ object files must be created using
2707
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
2708
@@ -5842,9 +6335,9 @@
2709
*)
2710
if test "$GXX" = yes; then
2711
if test "$with_gnu_ld" = no; then
2712
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2713
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2714
else
2715
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
2716
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
2717
fi
2718
fi
2719
_LT_TAGVAR(link_all_deplibs, $1)=yes
2720
@@ -5855,7 +6348,7 @@
2721
_LT_TAGVAR(inherit_rpath, $1)=yes
2722
;;
2723
2724
- linux* | k*bsd*-gnu)
2725
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2726
case $cc_basename in
2727
KCC*)
2728
# Kuck and Associates, Inc. (KAI) C++ Compiler
2729
@@ -5873,7 +6366,7 @@
2730
# explicitly linking system object files so we need to strip them
2731
# from the output so that they don't get included in the library
2732
# dependencies.
2733
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2734
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
2735
2736
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
2737
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2738
@@ -5910,26 +6403,26 @@
2739
pgCC* | pgcpp*)
2740
# Portland Group C++ compiler
2741
case `$CC -V` in
2742
- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
2743
+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
2744
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
2745
rm -rf $tpldir~
2746
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
2747
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
2748
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
2749
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
2750
rm -rf $tpldir~
2751
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
2752
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
2753
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
2754
$RANLIB $oldlib'
2755
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
2756
rm -rf $tpldir~
2757
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
2758
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2759
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2760
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
2761
rm -rf $tpldir~
2762
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
2763
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
2764
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
2765
;;
2766
- *) # Version 6 will use weak symbols
2767
+ *) # Version 6 and above use weak symbols
2768
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
2769
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
2770
;;
2771
@@ -5937,7 +6430,7 @@
2772
2773
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
2774
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2775
- _LT_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'
2776
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
2777
;;
2778
cxx*)
2779
# Compaq C++
2780
@@ -5956,9 +6449,9 @@
2781
# explicitly linking system object files so we need to strip them
2782
# from the output so that they don't get included in the library
2783
# dependencies.
2784
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2785
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
2786
;;
2787
- xl*)
2788
+ xl* | mpixl* | bgxl*)
2789
# IBM XL 8.0 on PPC, with GNU ld
2790
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2791
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2792
@@ -5978,13 +6471,13 @@
2793
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
2794
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
2795
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
2796
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
2797
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
2798
_LT_TAGVAR(compiler_needs_object, $1)=yes
2799
2800
# Not sure whether something based on
2801
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
2802
# would be better.
2803
- output_verbose_link_cmd='echo'
2804
+ output_verbose_link_cmd='func_echo_all'
2805
2806
# Archives containing C++ object files must be created using
2807
# "CC -xar", where "CC" is the Sun C++ compiler. This is
2808
@@ -6053,7 +6546,7 @@
2809
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
2810
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
2811
fi
2812
- output_verbose_link_cmd=echo
2813
+ output_verbose_link_cmd=func_echo_all
2814
else
2815
_LT_TAGVAR(ld_shlibs, $1)=no
2816
fi
2817
@@ -6088,15 +6581,15 @@
2818
case $host in
2819
osf3*)
2820
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2821
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2822
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2823
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
2824
;;
2825
*)
2826
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
2827
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
2828
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
2829
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
2830
echo "-hidden">> $lib.exp~
2831
- $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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
2832
+ $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~
2833
$RM $lib.exp'
2834
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
2835
;;
2836
@@ -6112,17 +6605,17 @@
2837
# explicitly linking system object files so we need to strip them
2838
# from the output so that they don't get included in the library
2839
# dependencies.
2840
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
2841
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
2842
;;
2843
*)
2844
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
2845
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
2846
case $host in
2847
osf3*)
2848
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2849
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2850
;;
2851
*)
2852
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2853
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
2854
;;
2855
esac
2856
2857
@@ -6132,7 +6625,7 @@
2858
# Commands to make compiler produce verbose output that lists
2859
# what "hidden" libraries, object files and flags are used when
2860
# linking a shared library.
2861
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2862
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2863
2864
else
2865
# FIXME: insert proper C++ library support
2866
@@ -6168,7 +6661,7 @@
2867
2868
solaris*)
2869
case $cc_basename in
2870
- CC*)
2871
+ CC* | sunCC*)
2872
# Sun C++ 4.2, 5.x and Centerline C++
2873
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
2874
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
2875
@@ -6189,7 +6682,7 @@
2876
esac
2877
_LT_TAGVAR(link_all_deplibs, $1)=yes
2878
2879
- output_verbose_link_cmd='echo'
2880
+ output_verbose_link_cmd='func_echo_all'
2881
2882
# Archives containing C++ object files must be created using
2883
# "CC -xar", where "CC" is the Sun C++ compiler. This is
2884
@@ -6209,14 +6702,14 @@
2885
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
2886
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
2887
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
2888
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
2889
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
2890
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
2891
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
2892
+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
2893
2894
# Commands to make compiler produce verbose output that lists
2895
# what "hidden" libraries, object files and flags are used when
2896
# linking a shared library.
2897
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2898
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2899
else
2900
# g++ 2.7 appears to require `-G' NOT `-shared' on this
2901
# platform.
2902
@@ -6227,7 +6720,7 @@
2903
# Commands to make compiler produce verbose output that lists
2904
# what "hidden" libraries, object files and flags are used when
2905
# linking a shared library.
2906
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
2907
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
2908
fi
2909
2910
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
2911
@@ -6281,6 +6774,10 @@
2912
CC*)
2913
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2914
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2915
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
2916
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
2917
+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
2918
+ '"$_LT_TAGVAR(reload_cmds, $1)"
2919
;;
2920
*)
2921
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
2922
@@ -6336,6 +6833,7 @@
2923
fi # test -n "$compiler"
2924
2925
CC=$lt_save_CC
2926
+ CFLAGS=$lt_save_CFLAGS
2927
LDCXX=$LD
2928
LD=$lt_save_LD
2929
GCC=$lt_save_GCC
2930
@@ -6350,6 +6848,29 @@
2931
])# _LT_LANG_CXX_CONFIG
2932
2933
2934
+# _LT_FUNC_STRIPNAME_CNF
2935
+# ----------------------
2936
+# func_stripname_cnf prefix suffix name
2937
+# strip PREFIX and SUFFIX off of NAME.
2938
+# PREFIX and SUFFIX must not contain globbing or regex special
2939
+# characters, hashes, percent signs, but SUFFIX may contain a leading
2940
+# dot (in which case that matches only a dot).
2941
+#
2942
+# This function is identical to the (non-XSI) version of func_stripname,
2943
+# except this one can be used by m4 code that may be executed by configure,
2944
+# rather than the libtool script.
2945
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
2946
+AC_REQUIRE([_LT_DECL_SED])
2947
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
2948
+func_stripname_cnf ()
2949
+{
2950
+ case ${2} in
2951
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
2952
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
2953
+ esac
2954
+} # func_stripname_cnf
2955
+])# _LT_FUNC_STRIPNAME_CNF
2956
+
2957
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
2958
# ---------------------------------
2959
# Figure out "hidden" library dependencies from verbose
2960
@@ -6358,6 +6879,7 @@
2961
# objects, libraries and library flags.
2962
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
2963
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2964
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
2965
# Dependencies to place before and after the object being linked:
2966
_LT_TAGVAR(predep_objects, $1)=
2967
_LT_TAGVAR(postdep_objects, $1)=
2968
@@ -6408,6 +6930,13 @@
2969
};
2970
_LT_EOF
2971
])
2972
+
2973
+_lt_libdeps_save_CFLAGS=$CFLAGS
2974
+case "$CC $CFLAGS " in #(
2975
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
2976
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
2977
+esac
2978
+
2979
dnl Parse the compiler output and extract the necessary
2980
dnl objects, libraries and library flags.
2981
if AC_TRY_EVAL(ac_compile); then
2982
@@ -6419,7 +6948,7 @@
2983
pre_test_object_deps_done=no
2984
2985
for p in `eval "$output_verbose_link_cmd"`; do
2986
- case $p in
2987
+ case ${prev}${p} in
2988
2989
-L* | -R* | -l*)
2990
# Some compilers place space between "-{L,R}" and the path.
2991
@@ -6428,13 +6957,22 @@
2992
test $p = "-R"; then
2993
prev=$p
2994
continue
2995
- else
2996
- prev=
2997
fi
2998
2999
+ # Expand the sysroot to ease extracting the directories later.
3000
+ if test -z "$prev"; then
3001
+ case $p in
3002
+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
3003
+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
3004
+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
3005
+ esac
3006
+ fi
3007
+ case $p in
3008
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
3009
+ esac
3010
if test "$pre_test_object_deps_done" = no; then
3011
- case $p in
3012
- -L* | -R*)
3013
+ case ${prev} in
3014
+ -L | -R)
3015
# Internal compiler library paths should come after those
3016
# provided the user. The postdeps already come after the
3017
# user supplied libs so there is no need to process them.
3018
@@ -6454,8 +6992,10 @@
3019
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
3020
fi
3021
fi
3022
+ prev=
3023
;;
3024
3025
+ *.lto.$objext) ;; # Ignore GCC LTO objects
3026
*.$objext)
3027
# This assumes that the test object file only shows up
3028
# once in the compiler output.
3029
@@ -6491,6 +7031,7 @@
3030
fi
3031
3032
$RM -f confest.$objext
3033
+CFLAGS=$_lt_libdeps_save_CFLAGS
3034
3035
# PORTME: override above test on systems where it is broken
3036
m4_if([$1], [CXX],
3037
@@ -6527,7 +7068,7 @@
3038
3039
solaris*)
3040
case $cc_basename in
3041
- CC*)
3042
+ CC* | sunCC*)
3043
# The more standards-conforming stlport4 library is
3044
# incompatible with the Cstd library. Avoid specifying
3045
# it if it's in CXXFLAGS. Ignore libCrun as
3046
@@ -6571,32 +7112,16 @@
3047
])# _LT_SYS_HIDDEN_LIBDEPS
3048
3049
3050
-# _LT_PROG_F77
3051
-# ------------
3052
-# Since AC_PROG_F77 is broken, in that it returns the empty string
3053
-# if there is no fortran compiler, we have our own version here.
3054
-m4_defun([_LT_PROG_F77],
3055
-[
3056
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
3057
-AC_PROG_F77
3058
-if test -z "$F77" || test "X$F77" = "Xno"; then
3059
- _lt_disable_F77=yes
3060
-fi
3061
-popdef([AC_MSG_ERROR])
3062
-])# _LT_PROG_F77
3063
-
3064
-dnl aclocal-1.4 backwards compatibility:
3065
-dnl AC_DEFUN([_LT_PROG_F77], [])
3066
-
3067
-
3068
# _LT_LANG_F77_CONFIG([TAG])
3069
# --------------------------
3070
# Ensure that the configuration variables for a Fortran 77 compiler are
3071
# suitably defined. These variables are subsequently used by _LT_CONFIG
3072
# to write the compiler configuration to `libtool'.
3073
m4_defun([_LT_LANG_F77_CONFIG],
3074
-[AC_REQUIRE([_LT_PROG_F77])dnl
3075
-AC_LANG_PUSH(Fortran 77)
3076
+[AC_LANG_PUSH(Fortran 77)
3077
+if test -z "$F77" || test "X$F77" = "Xno"; then
3078
+ _lt_disable_F77=yes
3079
+fi
3080
3081
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
3082
_LT_TAGVAR(allow_undefined_flag, $1)=
3083
@@ -6615,6 +7140,8 @@
3084
_LT_TAGVAR(module_expsym_cmds, $1)=
3085
_LT_TAGVAR(link_all_deplibs, $1)=unknown
3086
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3087
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
3088
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
3089
_LT_TAGVAR(no_undefined_flag, $1)=
3090
_LT_TAGVAR(whole_archive_flag_spec, $1)=
3091
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
3092
@@ -6654,7 +7181,9 @@
3093
# Allow CC to be a program name with arguments.
3094
lt_save_CC="$CC"
3095
lt_save_GCC=$GCC
3096
+ lt_save_CFLAGS=$CFLAGS
3097
CC=${F77-"f77"}
3098
+ CFLAGS=$FFLAGS
3099
compiler=$CC
3100
_LT_TAGVAR(compiler, $1)=$CC
3101
_LT_CC_BASENAME([$compiler])
3102
@@ -6708,38 +7237,24 @@
3103
3104
GCC=$lt_save_GCC
3105
CC="$lt_save_CC"
3106
+ CFLAGS="$lt_save_CFLAGS"
3107
fi # test "$_lt_disable_F77" != yes
3108
3109
AC_LANG_POP
3110
])# _LT_LANG_F77_CONFIG
3111
3112
3113
-# _LT_PROG_FC
3114
-# -----------
3115
-# Since AC_PROG_FC is broken, in that it returns the empty string
3116
-# if there is no fortran compiler, we have our own version here.
3117
-m4_defun([_LT_PROG_FC],
3118
-[
3119
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
3120
-AC_PROG_FC
3121
-if test -z "$FC" || test "X$FC" = "Xno"; then
3122
- _lt_disable_FC=yes
3123
-fi
3124
-popdef([AC_MSG_ERROR])
3125
-])# _LT_PROG_FC
3126
-
3127
-dnl aclocal-1.4 backwards compatibility:
3128
-dnl AC_DEFUN([_LT_PROG_FC], [])
3129
-
3130
-
3131
# _LT_LANG_FC_CONFIG([TAG])
3132
# -------------------------
3133
# Ensure that the configuration variables for a Fortran compiler are
3134
# suitably defined. These variables are subsequently used by _LT_CONFIG
3135
# to write the compiler configuration to `libtool'.
3136
m4_defun([_LT_LANG_FC_CONFIG],
3137
-[AC_REQUIRE([_LT_PROG_FC])dnl
3138
-AC_LANG_PUSH(Fortran)
3139
+[AC_LANG_PUSH(Fortran)
3140
+
3141
+if test -z "$FC" || test "X$FC" = "Xno"; then
3142
+ _lt_disable_FC=yes
3143
+fi
3144
3145
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
3146
_LT_TAGVAR(allow_undefined_flag, $1)=
3147
@@ -6758,6 +7273,8 @@
3148
_LT_TAGVAR(module_expsym_cmds, $1)=
3149
_LT_TAGVAR(link_all_deplibs, $1)=unknown
3150
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3151
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
3152
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
3153
_LT_TAGVAR(no_undefined_flag, $1)=
3154
_LT_TAGVAR(whole_archive_flag_spec, $1)=
3155
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
3156
@@ -6797,7 +7314,9 @@
3157
# Allow CC to be a program name with arguments.
3158
lt_save_CC="$CC"
3159
lt_save_GCC=$GCC
3160
+ lt_save_CFLAGS=$CFLAGS
3161
CC=${FC-"f95"}
3162
+ CFLAGS=$FCFLAGS
3163
compiler=$CC
3164
GCC=$ac_cv_fc_compiler_gnu
3165
3166
@@ -6853,7 +7372,8 @@
3167
fi # test -n "$compiler"
3168
3169
GCC=$lt_save_GCC
3170
- CC="$lt_save_CC"
3171
+ CC=$lt_save_CC
3172
+ CFLAGS=$lt_save_CFLAGS
3173
fi # test "$_lt_disable_FC" != yes
3174
3175
AC_LANG_POP
3176
@@ -6890,10 +7410,12 @@
3177
_LT_LINKER_BOILERPLATE
3178
3179
# Allow CC to be a program name with arguments.
3180
-lt_save_CC="$CC"
3181
+lt_save_CC=$CC
3182
+lt_save_CFLAGS=$CFLAGS
3183
lt_save_GCC=$GCC
3184
GCC=yes
3185
CC=${GCJ-"gcj"}
3186
+CFLAGS=$GCJFLAGS
3187
compiler=$CC
3188
_LT_TAGVAR(compiler, $1)=$CC
3189
_LT_TAGVAR(LD, $1)="$LD"
3190
@@ -6903,6 +7425,8 @@
3191
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
3192
3193
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
3194
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
3195
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
3196
3197
if test -n "$compiler"; then
3198
_LT_COMPILER_NO_RTTI($1)
3199
@@ -6918,7 +7442,8 @@
3200
AC_LANG_RESTORE
3201
3202
GCC=$lt_save_GCC
3203
-CC="$lt_save_CC"
3204
+CC=$lt_save_CC
3205
+CFLAGS=$lt_save_CFLAGS
3206
])# _LT_LANG_GCJ_CONFIG
3207
3208
3209
@@ -6953,9 +7478,11 @@
3210
3211
# Allow CC to be a program name with arguments.
3212
lt_save_CC="$CC"
3213
+lt_save_CFLAGS=$CFLAGS
3214
lt_save_GCC=$GCC
3215
GCC=
3216
CC=${RC-"windres"}
3217
+CFLAGS=
3218
compiler=$CC
3219
_LT_TAGVAR(compiler, $1)=$CC
3220
_LT_CC_BASENAME([$compiler])
3221
@@ -6968,7 +7495,8 @@
3222
3223
GCC=$lt_save_GCC
3224
AC_LANG_RESTORE
3225
-CC="$lt_save_CC"
3226
+CC=$lt_save_CC
3227
+CFLAGS=$lt_save_CFLAGS
3228
])# _LT_LANG_RC_CONFIG
3229
3230
3231
@@ -7027,6 +7555,15 @@
3232
AC_SUBST([OBJDUMP])
3233
])
3234
3235
+# _LT_DECL_DLLTOOL
3236
+# ----------------
3237
+# Ensure DLLTOOL variable is set.
3238
+m4_defun([_LT_DECL_DLLTOOL],
3239
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
3240
+test -z "$DLLTOOL" && DLLTOOL=dlltool
3241
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
3242
+AC_SUBST([DLLTOOL])
3243
+])
3244
3245
# _LT_DECL_SED
3246
# ------------
3247
@@ -7118,8 +7655,8 @@
3248
# Try some XSI features
3249
xsi_shell=no
3250
( _lt_dummy="a/b/c"
3251
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
3252
- = c,a/b,, \
3253
+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
3254
+ = c,a/b,b/c, \
3255
&& eval 'test $(( 1 + 1 )) -eq 2 \
3256
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
3257
&& xsi_shell=yes
3258
@@ -7158,222 +7695,177 @@
3259
])# _LT_CHECK_SHELL_FEATURES
3260
3261
3262
-# _LT_PROG_XSI_SHELLFNS
3263
-# ---------------------
3264
-# Bourne and XSI compatible variants of some useful shell functions.
3265
-m4_defun([_LT_PROG_XSI_SHELLFNS],
3266
-[case $xsi_shell in
3267
- yes)
3268
- cat << \_LT_EOF >> "$cfgfile"
3269
-
3270
-# func_dirname file append nondir_replacement
3271
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3272
-# otherwise set result to NONDIR_REPLACEMENT.
3273
-func_dirname ()
3274
-{
3275
- case ${1} in
3276
- */*) func_dirname_result="${1%/*}${2}" ;;
3277
- * ) func_dirname_result="${3}" ;;
3278
- esac
3279
-}
3280
-
3281
-# func_basename file
3282
-func_basename ()
3283
-{
3284
- func_basename_result="${1##*/}"
3285
-}
3286
-
3287
-# func_dirname_and_basename file append nondir_replacement
3288
-# perform func_basename and func_dirname in a single function
3289
-# call:
3290
-# dirname: Compute the dirname of FILE. If nonempty,
3291
-# add APPEND to the result, otherwise set result
3292
-# to NONDIR_REPLACEMENT.
3293
-# value returned in "$func_dirname_result"
3294
-# basename: Compute filename of FILE.
3295
-# value retuned in "$func_basename_result"
3296
-# Implementation must be kept synchronized with func_dirname
3297
-# and func_basename. For efficiency, we do not delegate to
3298
-# those functions but instead duplicate the functionality here.
3299
-func_dirname_and_basename ()
3300
-{
3301
- case ${1} in
3302
- */*) func_dirname_result="${1%/*}${2}" ;;
3303
- * ) func_dirname_result="${3}" ;;
3304
- esac
3305
- func_basename_result="${1##*/}"
3306
-}
3307
-
3308
-# func_stripname prefix suffix name
3309
-# strip PREFIX and SUFFIX off of NAME.
3310
-# PREFIX and SUFFIX must not contain globbing or regex special
3311
-# characters, hashes, percent signs, but SUFFIX may contain a leading
3312
-# dot (in which case that matches only a dot).
3313
-func_stripname ()
3314
-{
3315
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3316
- # positional parameters, so assign one to ordinary parameter first.
3317
- func_stripname_result=${3}
3318
- func_stripname_result=${func_stripname_result#"${1}"}
3319
- func_stripname_result=${func_stripname_result%"${2}"}
3320
-}
3321
-
3322
-# func_opt_split
3323
-func_opt_split ()
3324
-{
3325
- func_opt_split_opt=${1%%=*}
3326
- func_opt_split_arg=${1#*=}
3327
-}
3328
-
3329
-# func_lo2o object
3330
-func_lo2o ()
3331
-{
3332
- case ${1} in
3333
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3334
- *) func_lo2o_result=${1} ;;
3335
- esac
3336
-}
3337
-
3338
-# func_xform libobj-or-source
3339
-func_xform ()
3340
-{
3341
- func_xform_result=${1%.*}.lo
3342
-}
3343
-
3344
-# func_arith arithmetic-term...
3345
-func_arith ()
3346
-{
3347
- func_arith_result=$(( $[*] ))
3348
-}
3349
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
3350
+# ------------------------------------------------------
3351
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
3352
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
3353
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
3354
+[dnl {
3355
+sed -e '/^$1 ()$/,/^} # $1 /c\
3356
+$1 ()\
3357
+{\
3358
+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
3359
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
3360
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3361
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3362
+test 0 -eq $? || _lt_function_replace_fail=:
3363
+])
3364
3365
-# func_len string
3366
-# STRING may not start with a hyphen.
3367
-func_len ()
3368
-{
3369
- func_len_result=${#1}
3370
-}
3371
3372
-_LT_EOF
3373
- ;;
3374
- *) # Bourne compatible functions.
3375
- cat << \_LT_EOF >> "$cfgfile"
3376
+# _LT_PROG_REPLACE_SHELLFNS
3377
+# -------------------------
3378
+# Replace existing portable implementations of several shell functions with
3379
+# equivalent extended shell implementations where those features are available..
3380
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
3381
+[if test x"$xsi_shell" = xyes; then
3382
+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
3383
+ case ${1} in
3384
+ */*) func_dirname_result="${1%/*}${2}" ;;
3385
+ * ) func_dirname_result="${3}" ;;
3386
+ esac])
3387
+
3388
+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
3389
+ func_basename_result="${1##*/}"])
3390
+
3391
+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
3392
+ case ${1} in
3393
+ */*) func_dirname_result="${1%/*}${2}" ;;
3394
+ * ) func_dirname_result="${3}" ;;
3395
+ esac
3396
+ func_basename_result="${1##*/}"])
3397
3398
-# func_dirname file append nondir_replacement
3399
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
3400
-# otherwise set result to NONDIR_REPLACEMENT.
3401
-func_dirname ()
3402
-{
3403
- # Extract subdirectory from the argument.
3404
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
3405
- if test "X$func_dirname_result" = "X${1}"; then
3406
- func_dirname_result="${3}"
3407
- else
3408
- func_dirname_result="$func_dirname_result${2}"
3409
- fi
3410
-}
3411
+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
3412
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
3413
+ # positional parameters, so assign one to ordinary parameter first.
3414
+ func_stripname_result=${3}
3415
+ func_stripname_result=${func_stripname_result#"${1}"}
3416
+ func_stripname_result=${func_stripname_result%"${2}"}])
3417
3418
-# func_basename file
3419
-func_basename ()
3420
-{
3421
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
3422
-}
3423
+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
3424
+ func_split_long_opt_name=${1%%=*}
3425
+ func_split_long_opt_arg=${1#*=}])
3426
3427
-dnl func_dirname_and_basename
3428
-dnl A portable version of this function is already defined in general.m4sh
3429
-dnl so there is no need for it here.
3430
+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
3431
+ func_split_short_opt_arg=${1#??}
3432
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
3433
3434
-# func_stripname prefix suffix name
3435
-# strip PREFIX and SUFFIX off of NAME.
3436
-# PREFIX and SUFFIX must not contain globbing or regex special
3437
-# characters, hashes, percent signs, but SUFFIX may contain a leading
3438
-# dot (in which case that matches only a dot).
3439
-# func_strip_suffix prefix name
3440
-func_stripname ()
3441
-{
3442
- case ${2} in
3443
- .*) func_stripname_result=`$ECHO "X${3}" \
3444
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
3445
- *) func_stripname_result=`$ECHO "X${3}" \
3446
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
3447
- esac
3448
-}
3449
+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
3450
+ case ${1} in
3451
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
3452
+ *) func_lo2o_result=${1} ;;
3453
+ esac])
3454
3455
-# sed scripts:
3456
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
3457
-my_sed_long_arg='1s/^-[[^=]]*=//'
3458
+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
3459
3460
-# func_opt_split
3461
-func_opt_split ()
3462
-{
3463
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
3464
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
3465
-}
3466
+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
3467
3468
-# func_lo2o object
3469
-func_lo2o ()
3470
-{
3471
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
3472
-}
3473
+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
3474
+fi
3475
3476
-# func_xform libobj-or-source
3477
-func_xform ()
3478
-{
3479
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
3480
-}
3481
+if test x"$lt_shell_append" = xyes; then
3482
+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
3483
3484
-# func_arith arithmetic-term...
3485
-func_arith ()
3486
-{
3487
- func_arith_result=`expr "$[@]"`
3488
-}
3489
+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
3490
+ func_quote_for_eval "${2}"
3491
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
3492
+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
3493
3494
-# func_len string
3495
-# STRING may not start with a hyphen.
3496
-func_len ()
3497
-{
3498
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
3499
-}
3500
+ # Save a `func_append' function call where possible by direct use of '+='
3501
+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
3502
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3503
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3504
+ test 0 -eq $? || _lt_function_replace_fail=:
3505
+else
3506
+ # Save a `func_append' function call even when '+=' is not available
3507
+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
3508
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
3509
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
3510
+ test 0 -eq $? || _lt_function_replace_fail=:
3511
+fi
3512
3513
-_LT_EOF
3514
-esac
3515
+if test x"$_lt_function_replace_fail" = x":"; then
3516
+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
3517
+fi
3518
+])
3519
3520
-case $lt_shell_append in
3521
- yes)
3522
- cat << \_LT_EOF >> "$cfgfile"
3523
-
3524
-# func_append var value
3525
-# Append VALUE to the end of shell variable VAR.
3526
-func_append ()
3527
-{
3528
- eval "$[1]+=\$[2]"
3529
-}
3530
-_LT_EOF
3531
+# _LT_PATH_CONVERSION_FUNCTIONS
3532
+# -----------------------------
3533
+# Determine which file name conversion functions should be used by
3534
+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
3535
+# for certain cross-compile configurations and native mingw.
3536
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
3537
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
3538
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
3539
+AC_MSG_CHECKING([how to convert $build file names to $host format])
3540
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
3541
+[case $host in
3542
+ *-*-mingw* )
3543
+ case $build in
3544
+ *-*-mingw* ) # actually msys
3545
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
3546
+ ;;
3547
+ *-*-cygwin* )
3548
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
3549
+ ;;
3550
+ * ) # otherwise, assume *nix
3551
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
3552
+ ;;
3553
+ esac
3554
;;
3555
- *)
3556
- cat << \_LT_EOF >> "$cfgfile"
3557
-
3558
-# func_append var value
3559
-# Append VALUE to the end of shell variable VAR.
3560
-func_append ()
3561
-{
3562
- eval "$[1]=\$$[1]\$[2]"
3563
-}
3564
-
3565
-_LT_EOF
3566
+ *-*-cygwin* )
3567
+ case $build in
3568
+ *-*-mingw* ) # actually msys
3569
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
3570
+ ;;
3571
+ *-*-cygwin* )
3572
+ lt_cv_to_host_file_cmd=func_convert_file_noop
3573
+ ;;
3574
+ * ) # otherwise, assume *nix
3575
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
3576
+ ;;
3577
+ esac
3578
;;
3579
- esac
3580
+ * ) # unhandled hosts (and "normal" native builds)
3581
+ lt_cv_to_host_file_cmd=func_convert_file_noop
3582
+ ;;
3583
+esac
3584
+])
3585
+to_host_file_cmd=$lt_cv_to_host_file_cmd
3586
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
3587
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
3588
+ [0], [convert $build file names to $host format])dnl
3589
+
3590
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
3591
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
3592
+[#assume ordinary cross tools, or native build.
3593
+lt_cv_to_tool_file_cmd=func_convert_file_noop
3594
+case $host in
3595
+ *-*-mingw* )
3596
+ case $build in
3597
+ *-*-mingw* ) # actually msys
3598
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
3599
+ ;;
3600
+ esac
3601
+ ;;
3602
+esac
3603
])
3604
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
3605
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
3606
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
3607
+ [0], [convert $build files to toolchain format])dnl
3608
+])# _LT_PATH_CONVERSION_FUNCTIONS
3609
3610
# Helper functions for option handling. -*- Autoconf -*-
3611
#
3612
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
3613
+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
3614
+# Inc.
3615
# Written by Gary V. Vaughan, 2004
3616
#
3617
# This file is free software; the Free Software Foundation gives
3618
# unlimited permission to copy and/or distribute it, with or without
3619
# modifications, as long as this notice is preserved.
3620
3621
-# serial 6 ltoptions.m4
3622
+# serial 7 ltoptions.m4
3623
3624
# This is to help aclocal find these macros, as it can't see m4_define.
3625
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
3626
@@ -7488,7 +7980,7 @@
3627
[enable_win32_dll=yes
3628
3629
case $host in
3630
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
3631
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
3632
AC_CHECK_TOOL(AS, as, false)
3633
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
3634
AC_CHECK_TOOL(OBJDUMP, objdump, false)
3635
@@ -7496,13 +7988,13 @@
3636
esac
3637
3638
test -z "$AS" && AS=as
3639
-_LT_DECL([], [AS], [0], [Assembler program])dnl
3640
+_LT_DECL([], [AS], [1], [Assembler program])dnl
3641
3642
test -z "$DLLTOOL" && DLLTOOL=dlltool
3643
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
3644
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
3645
3646
test -z "$OBJDUMP" && OBJDUMP=objdump
3647
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
3648
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
3649
])# win32-dll
3650
3651
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
3652
@@ -7860,31 +8352,31 @@
3653
# unlimited permission to copy and/or distribute it, with or without
3654
# modifications, as long as this notice is preserved.
3655
3656
-# Generated from ltversion.in.
3657
+# @configure_input@
3658
3659
-# serial 3017 ltversion.m4
3660
+# serial 3293 ltversion.m4
3661
# This file is part of GNU Libtool
3662
3663
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
3664
-m4_define([LT_PACKAGE_REVISION], [1.3017])
3665
+m4_define([LT_PACKAGE_VERSION], [2.4])
3666
+m4_define([LT_PACKAGE_REVISION], [1.3293])
3667
3668
AC_DEFUN([LTVERSION_VERSION],
3669
-[macro_version='2.2.6b'
3670
-macro_revision='1.3017'
3671
+[macro_version='2.4'
3672
+macro_revision='1.3293'
3673
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
3674
_LT_DECL(, macro_revision, 0)
3675
])
3676
3677
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
3678
#
3679
-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
3680
+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
3681
# Written by Scott James Remnant, 2004.
3682
#
3683
# This file is free software; the Free Software Foundation gives
3684
# unlimited permission to copy and/or distribute it, with or without
3685
# modifications, as long as this notice is preserved.
3686
3687
-# serial 4 lt~obsolete.m4
3688
+# serial 5 lt~obsolete.m4
3689
3690
# These exist entirely to fool aclocal when bootstrapping libtool.
3691
#
3692
@@ -7954,7 +8446,6 @@
3693
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
3694
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
3695
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
3696
-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
3697
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
3698
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
3699
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
3700
@@ -7967,8 +8458,16 @@
3701
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
3702
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
3703
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
3704
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
3705
+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
3706
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
3707
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
3708
+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
3709
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
3710
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
3711
3712
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
3713
+# serial 1 (pkg-config-0.24)
3714
#
3715
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
3716
#
3717
@@ -7995,8 +8494,12 @@
3718
# ----------------------------------
3719
AC_DEFUN([PKG_PROG_PKG_CONFIG],
3720
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
3721
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
3722
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
3723
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
3724
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
3725
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
3726
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
3727
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
3728
+
3729
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
3730
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
3731
fi
3732
@@ -8009,7 +8512,6 @@
3733
AC_MSG_RESULT([no])
3734
PKG_CONFIG=""
3735
fi
3736
-
3737
fi[]dnl
3738
])# PKG_PROG_PKG_CONFIG
3739
3740
@@ -8018,21 +8520,20 @@
3741
# Check to see whether a particular set of modules exists. Similar
3742
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
3743
#
3744
-#
3745
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
3746
-# this or PKG_CHECK_MODULES is called, or make sure to call
3747
-# PKG_CHECK_EXISTS manually
3748
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
3749
+# only at the first occurence in configure.ac, so if the first place
3750
+# it's called might be skipped (such as if it is within an "if", you
3751
+# have to call PKG_CHECK_EXISTS manually
3752
# --------------------------------------------------------------
3753
AC_DEFUN([PKG_CHECK_EXISTS],
3754
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
3755
if test -n "$PKG_CONFIG" && \
3756
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
3757
- m4_ifval([$2], [$2], [:])
3758
+ m4_default([$2], [:])
3759
m4_ifvaln([$3], [else
3760
$3])dnl
3761
fi])
3762
3763
-
3764
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
3765
# ---------------------------------------------
3766
m4_define([_PKG_CONFIG],
3767
@@ -8040,7 +8541,8 @@
3768
pkg_cv_[]$1="$$1"
3769
elif test -n "$PKG_CONFIG"; then
3770
PKG_CHECK_EXISTS([$3],
3771
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
3772
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
3773
+ test "x$?" != "x0" && pkg_failed=yes ],
3774
[pkg_failed=yes])
3775
else
3776
pkg_failed=untried
3777
@@ -8085,16 +8587,17 @@
3778
See the pkg-config man page for more details.])
3779
3780
if test $pkg_failed = yes; then
3781
+ AC_MSG_RESULT([no])
3782
_PKG_SHORT_ERRORS_SUPPORTED
3783
if test $_pkg_short_errors_supported = yes; then
3784
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
3785
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
3786
else
3787
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
3788
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
3789
fi
3790
# Put the nasty error message in config.log where it belongs
3791
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
3792
3793
- ifelse([$4], , [AC_MSG_ERROR(dnl
3794
+ m4_default([$4], [AC_MSG_ERROR(
3795
[Package requirements ($2) were not met:
3796
3797
$$1_PKG_ERRORS
3798
@@ -8102,25 +8605,24 @@
3799
Consider adjusting the PKG_CONFIG_PATH environment variable if you
3800
installed software in a non-standard prefix.
3801
3802
-_PKG_TEXT
3803
-])],
3804
- [AC_MSG_RESULT([no])
3805
- $4])
3806
+_PKG_TEXT])[]dnl
3807
+ ])
3808
elif test $pkg_failed = untried; then
3809
- ifelse([$4], , [AC_MSG_FAILURE(dnl
3810
+ AC_MSG_RESULT([no])
3811
+ m4_default([$4], [AC_MSG_FAILURE(
3812
[The pkg-config script could not be found or is too old. Make sure it
3813
is in your PATH or set the PKG_CONFIG environment variable to the full
3814
path to pkg-config.
3815
3816
_PKG_TEXT
3817
3818
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
3819
- [$4])
3820
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
3821
+ ])
3822
else
3823
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
3824
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
3825
AC_MSG_RESULT([yes])
3826
- ifelse([$3], , :, [$3])
3827
+ $3
3828
fi[]dnl
3829
])# PKG_CHECK_MODULES
3830
3831
Index: bluez/Makefile.in
3832
===================================================================
3833
--- bluez.orig/Makefile.in
3834
+++ bluez/Makefile.in
3835
@@ -813,6 +813,7 @@
3836
distcleancheck_listfiles = find . -type f -print
3837
ACLOCAL = @ACLOCAL@
3838
ALSA_CFLAGS = @ALSA_CFLAGS@
3839
+ALSA_LIBDIR = @ALSA_LIBDIR@
3840
ALSA_LIBS = @ALSA_LIBS@
3841
AMTAR = @AMTAR@
3842
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
3843
@@ -834,6 +835,7 @@
3844
DBUS_LIBS = @DBUS_LIBS@
3845
DEFS = @DEFS@
3846
DEPDIR = @DEPDIR@
3847
+DLLTOOL = @DLLTOOL@
3848
DSYMUTIL = @DSYMUTIL@
3849
DUMPBIN = @DUMPBIN@
3850
ECHO_C = @ECHO_C@
3851
@@ -866,6 +868,7 @@
3852
LTLIBOBJS = @LTLIBOBJS@
3853
MAINT = @MAINT@
3854
MAKEINFO = @MAKEINFO@
3855
+MANIFEST_TOOL = @MANIFEST_TOOL@
3856
MKDIR_P = @MKDIR_P@
3857
NM = @NM@
3858
NMEDIT = @NMEDIT@
3859
@@ -878,9 +881,12 @@
3860
PACKAGE_NAME = @PACKAGE_NAME@
3861
PACKAGE_STRING = @PACKAGE_STRING@
3862
PACKAGE_TARNAME = @PACKAGE_TARNAME@
3863
+PACKAGE_URL = @PACKAGE_URL@
3864
PACKAGE_VERSION = @PACKAGE_VERSION@
3865
PATH_SEPARATOR = @PATH_SEPARATOR@
3866
PKG_CONFIG = @PKG_CONFIG@
3867
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
3868
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
3869
RANLIB = @RANLIB@
3870
READLINE_LIBS = @READLINE_LIBS@
3871
SAP_DRIVER = @SAP_DRIVER@
3872
@@ -904,6 +910,7 @@
3873
abs_srcdir = @abs_srcdir@
3874
abs_top_builddir = @abs_top_builddir@
3875
abs_top_srcdir = @abs_top_srcdir@
3876
+ac_ct_AR = @ac_ct_AR@
3877
ac_ct_CC = @ac_ct_CC@
3878
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
3879
am__include = @am__include@
3880
@@ -936,7 +943,6 @@
3881
libexecdir = @libexecdir@
3882
localedir = @localedir@
3883
localstatedir = @localstatedir@
3884
-lt_ECHO = @lt_ECHO@
3885
mandir = @mandir@
3886
mkdir_p = @mkdir_p@
3887
oldincludedir = @oldincludedir@
3888
@@ -1083,7 +1089,7 @@
3889
builtin_files = src/builtin.h $(builtin_nodist)
3890
nodist_src_bluetoothd_SOURCES = $(builtin_files)
3891
man_MANS = src/bluetoothd.8
3892
-@ALSA_TRUE@alsadir = $(libdir)/alsa-lib
3893
+@ALSA_TRUE@alsadir = $(ALSA_LIBDIR)/alsa-lib
3894
@ALSA_TRUE@alsa_LTLIBRARIES = audio/libasound_module_pcm_bluetooth.la \
3895
@ALSA_TRUE@ audio/libasound_module_ctl_bluetooth.la
3896
3897
Index: bluez/configure
3898
===================================================================
3899
--- bluez.orig/configure
3900
+++ bluez/configure
3901
@@ -1,18 +1,22 @@
3902
#! /bin/sh
3903
# Guess values for system-dependent variables and create Makefiles.
3904
-# Generated by GNU Autoconf 2.63 for bluez 4.94.
3905
+# Generated by GNU Autoconf 2.68 for bluez 4.94.
3906
+#
3907
#
3908
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
3909
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3910
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
3911
+# Foundation, Inc.
3912
+#
3913
+#
3914
# This configure script is free software; the Free Software Foundation
3915
# gives unlimited permission to copy, distribute and modify it.
3916
-## --------------------- ##
3917
-## M4sh Initialization. ##
3918
-## --------------------- ##
3919
+## -------------------- ##
3920
+## M4sh Initialization. ##
3921
+## -------------------- ##
3922
3923
# Be more Bourne compatible
3924
DUALCASE=1; export DUALCASE # for MKS sh
3925
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3926
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
3927
emulate sh
3928
NULLCMD=:
3929
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
3930
@@ -20,23 +24,15 @@
3931
alias -g '${1+"$@"}'='"$@"'
3932
setopt NO_GLOB_SUBST
3933
else
3934
- case `(set -o) 2>/dev/null` in
3935
- *posix*) set -o posix ;;
3936
+ case `(set -o) 2>/dev/null` in #(
3937
+ *posix*) :
3938
+ set -o posix ;; #(
3939
+ *) :
3940
+ ;;
3941
esac
3942
-
3943
fi
3944
3945
3946
-
3947
-
3948
-# PATH needs CR
3949
-# Avoid depending upon Character Ranges.
3950
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
3951
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
3952
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
3953
-as_cr_digits='0123456789'
3954
-as_cr_alnum=$as_cr_Letters$as_cr_digits
3955
-
3956
as_nl='
3957
'
3958
export as_nl
3959
@@ -44,7 +40,13 @@
3960
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3961
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
3962
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
3963
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
3964
+# Prefer a ksh shell builtin over an external printf program on Solaris,
3965
+# but without wasting forks for bash or zsh.
3966
+if test -z "$BASH_VERSION$ZSH_VERSION" \
3967
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
3968
+ as_echo='print -r --'
3969
+ as_echo_n='print -rn --'
3970
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
3971
as_echo='printf %s\n'
3972
as_echo_n='printf %s'
3973
else
3974
@@ -55,7 +57,7 @@
3975
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
3976
as_echo_n_body='eval
3977
arg=$1;
3978
- case $arg in
3979
+ case $arg in #(
3980
*"$as_nl"*)
3981
expr "X$arg" : "X\\(.*\\)$as_nl";
3982
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
3983
@@ -78,13 +80,6 @@
3984
}
3985
fi
3986
3987
-# Support unset when possible.
3988
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
3989
- as_unset=unset
3990
-else
3991
- as_unset=false
3992
-fi
3993
-
3994
3995
# IFS
3996
# We need space, tab and new line, in precisely that order. Quoting is
3997
@@ -94,15 +89,16 @@
3998
IFS=" "" $as_nl"
3999
4000
# Find who we are. Look in the path if we contain no directory separator.
4001
-case $0 in
4002
+as_myself=
4003
+case $0 in #((
4004
*[\\/]* ) as_myself=$0 ;;
4005
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4006
for as_dir in $PATH
4007
do
4008
IFS=$as_save_IFS
4009
test -z "$as_dir" && as_dir=.
4010
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
4011
-done
4012
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
4013
+ done
4014
IFS=$as_save_IFS
4015
4016
;;
4017
@@ -114,12 +110,16 @@
4018
fi
4019
if test ! -f "$as_myself"; then
4020
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
4021
- { (exit 1); exit 1; }
4022
+ exit 1
4023
fi
4024
4025
-# Work around bugs in pre-3.0 UWIN ksh.
4026
-for as_var in ENV MAIL MAILPATH
4027
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
4028
+# Unset variables that we do not need and which cause bugs (e.g. in
4029
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
4030
+# suppresses any "Segmentation fault" message there. '((' could
4031
+# trigger a bug in pdksh 5.2.14.
4032
+for as_var in BASH_ENV ENV MAIL MAILPATH
4033
+do eval test x\${$as_var+set} = xset \
4034
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
4035
done
4036
PS1='$ '
4037
PS2='> '
4038
@@ -131,330 +131,314 @@
4039
LANGUAGE=C
4040
export LANGUAGE
4041
4042
-# Required to use basename.
4043
-if expr a : '\(a\)' >/dev/null 2>&1 &&
4044
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
4045
- as_expr=expr
4046
-else
4047
- as_expr=false
4048
-fi
4049
-
4050
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
4051
- as_basename=basename
4052
-else
4053
- as_basename=false
4054
-fi
4055
-
4056
-
4057
-# Name of the executable.
4058
-as_me=`$as_basename -- "$0" ||
4059
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
4060
- X"$0" : 'X\(//\)$' \| \
4061
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
4062
-$as_echo X/"$0" |
4063
- sed '/^.*\/\([^/][^/]*\)\/*$/{
4064
- s//\1/
4065
- q
4066
- }
4067
- /^X\/\(\/\/\)$/{
4068
- s//\1/
4069
- q
4070
- }
4071
- /^X\/\(\/\).*/{
4072
- s//\1/
4073
- q
4074
- }
4075
- s/.*/./; q'`
4076
-
4077
# CDPATH.
4078
-$as_unset CDPATH
4079
-
4080
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
4081
4082
if test "x$CONFIG_SHELL" = x; then
4083
- if (eval ":") 2>/dev/null; then
4084
- as_have_required=yes
4085
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
4086
+ emulate sh
4087
+ NULLCMD=:
4088
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
4089
+ # is contrary to our usage. Disable this feature.
4090
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
4091
+ setopt NO_GLOB_SUBST
4092
else
4093
- as_have_required=no
4094
+ case \`(set -o) 2>/dev/null\` in #(
4095
+ *posix*) :
4096
+ set -o posix ;; #(
4097
+ *) :
4098
+ ;;
4099
+esac
4100
fi
4101
-
4102
- if test $as_have_required = yes && (eval ":
4103
-(as_func_return () {
4104
- (exit \$1)
4105
-}
4106
-as_func_success () {
4107
- as_func_return 0
4108
-}
4109
-as_func_failure () {
4110
- as_func_return 1
4111
-}
4112
-as_func_ret_success () {
4113
- return 0
4114
-}
4115
-as_func_ret_failure () {
4116
- return 1
4117
-}
4118
+"
4119
+ as_required="as_fn_return () { (exit \$1); }
4120
+as_fn_success () { as_fn_return 0; }
4121
+as_fn_failure () { as_fn_return 1; }
4122
+as_fn_ret_success () { return 0; }
4123
+as_fn_ret_failure () { return 1; }
4124
4125
exitcode=0
4126
-if as_func_success; then
4127
- :
4128
-else
4129
- exitcode=1
4130
- echo as_func_success failed.
4131
-fi
4132
-
4133
-if as_func_failure; then
4134
- exitcode=1
4135
- echo as_func_failure succeeded.
4136
-fi
4137
-
4138
-if as_func_ret_success; then
4139
- :
4140
-else
4141
- exitcode=1
4142
- echo as_func_ret_success failed.
4143
-fi
4144
-
4145
-if as_func_ret_failure; then
4146
- exitcode=1
4147
- echo as_func_ret_failure succeeded.
4148
-fi
4149
-
4150
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
4151
- :
4152
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
4153
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
4154
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
4155
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
4156
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
4157
+
4158
+else
4159
+ exitcode=1; echo positional parameters were not saved.
4160
+fi
4161
+test x\$exitcode = x0 || exit 1"
4162
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
4163
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
4164
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
4165
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
4166
+
4167
+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
4168
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
4169
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
4170
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
4171
+ PATH=/empty FPATH=/empty; export PATH FPATH
4172
+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
4173
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
4174
+test \$(( 1 + 1 )) = 2 || exit 1"
4175
+ if (eval "$as_required") 2>/dev/null; then :
4176
+ as_have_required=yes
4177
else
4178
- exitcode=1
4179
- echo positional parameters were not saved.
4180
+ as_have_required=no
4181
fi
4182
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
4183
4184
-test \$exitcode = 0) || { (exit 1); exit 1; }
4185
-
4186
-(
4187
- as_lineno_1=\$LINENO
4188
- as_lineno_2=\$LINENO
4189
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
4190
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
4191
-") 2> /dev/null; then
4192
- :
4193
else
4194
- as_candidate_shells=
4195
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4196
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4197
+as_found=false
4198
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
4199
do
4200
IFS=$as_save_IFS
4201
test -z "$as_dir" && as_dir=.
4202
- case $as_dir in
4203
+ as_found=:
4204
+ case $as_dir in #(
4205
/*)
4206
for as_base in sh bash ksh sh5; do
4207
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
4208
+ # Try only shells that exist, to save several forks.
4209
+ as_shell=$as_dir/$as_base
4210
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
4211
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
4212
+ CONFIG_SHELL=$as_shell as_have_required=yes
4213
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
4214
+ break 2
4215
+fi
4216
+fi
4217
done;;
4218
esac
4219
+ as_found=false
4220
done
4221
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
4222
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
4223
+ CONFIG_SHELL=$SHELL as_have_required=yes
4224
+fi; }
4225
IFS=$as_save_IFS
4226
4227
4228
- for as_shell in $as_candidate_shells $SHELL; do
4229
- # Try only shells that exist, to save several forks.
4230
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
4231
- { ("$as_shell") 2> /dev/null <<\_ASEOF
4232
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
4233
- emulate sh
4234
- NULLCMD=:
4235
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
4236
- # is contrary to our usage. Disable this feature.
4237
- alias -g '${1+"$@"}'='"$@"'
4238
- setopt NO_GLOB_SUBST
4239
-else
4240
- case `(set -o) 2>/dev/null` in
4241
- *posix*) set -o posix ;;
4242
-esac
4243
-
4244
-fi
4245
-
4246
-
4247
-:
4248
-_ASEOF
4249
-}; then
4250
- CONFIG_SHELL=$as_shell
4251
- as_have_required=yes
4252
- if { "$as_shell" 2> /dev/null <<\_ASEOF
4253
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
4254
- emulate sh
4255
- NULLCMD=:
4256
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
4257
- # is contrary to our usage. Disable this feature.
4258
- alias -g '${1+"$@"}'='"$@"'
4259
- setopt NO_GLOB_SUBST
4260
-else
4261
- case `(set -o) 2>/dev/null` in
4262
- *posix*) set -o posix ;;
4263
-esac
4264
-
4265
-fi
4266
-
4267
-
4268
-:
4269
-(as_func_return () {
4270
- (exit $1)
4271
-}
4272
-as_func_success () {
4273
- as_func_return 0
4274
-}
4275
-as_func_failure () {
4276
- as_func_return 1
4277
-}
4278
-as_func_ret_success () {
4279
- return 0
4280
-}
4281
-as_func_ret_failure () {
4282
- return 1
4283
-}
4284
-
4285
-exitcode=0
4286
-if as_func_success; then
4287
- :
4288
-else
4289
- exitcode=1
4290
- echo as_func_success failed.
4291
-fi
4292
-
4293
-if as_func_failure; then
4294
- exitcode=1
4295
- echo as_func_failure succeeded.
4296
-fi
4297
-
4298
-if as_func_ret_success; then
4299
- :
4300
-else
4301
- exitcode=1
4302
- echo as_func_ret_success failed.
4303
-fi
4304
-
4305
-if as_func_ret_failure; then
4306
- exitcode=1
4307
- echo as_func_ret_failure succeeded.
4308
-fi
4309
-
4310
-if ( set x; as_func_ret_success y && test x = "$1" ); then
4311
- :
4312
-else
4313
- exitcode=1
4314
- echo positional parameters were not saved.
4315
+ if test "x$CONFIG_SHELL" != x; then :
4316
+ # We cannot yet assume a decent shell, so we have to provide a
4317
+ # neutralization value for shells without unset; and this also
4318
+ # works around shells that cannot unset nonexistent variables.
4319
+ # Preserve -v and -x to the replacement shell.
4320
+ BASH_ENV=/dev/null
4321
+ ENV=/dev/null
4322
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
4323
+ export CONFIG_SHELL
4324
+ case $- in # ((((
4325
+ *v*x* | *x*v* ) as_opts=-vx ;;
4326
+ *v* ) as_opts=-v ;;
4327
+ *x* ) as_opts=-x ;;
4328
+ * ) as_opts= ;;
4329
+ esac
4330
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
4331
fi
4332
4333
-test $exitcode = 0) || { (exit 1); exit 1; }
4334
-
4335
-(
4336
- as_lineno_1=$LINENO
4337
- as_lineno_2=$LINENO
4338
- test "x$as_lineno_1" != "x$as_lineno_2" &&
4339
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
4340
-
4341
-_ASEOF
4342
-}; then
4343
- break
4344
+ if test x$as_have_required = xno; then :
4345
+ $as_echo "$0: This script requires a shell more modern than all"
4346
+ $as_echo "$0: the shells that I found on your system."
4347
+ if test x${ZSH_VERSION+set} = xset ; then
4348
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
4349
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
4350
+ else
4351
+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
4352
+$0: including any error possibly output before this
4353
+$0: message. Then install a modern shell, or manually run
4354
+$0: the script under such a shell if you do have one."
4355
+ fi
4356
+ exit 1
4357
fi
4358
-
4359
fi
4360
-
4361
- done
4362
-
4363
- if test "x$CONFIG_SHELL" != x; then
4364
- for as_var in BASH_ENV ENV
4365
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
4366
- done
4367
- export CONFIG_SHELL
4368
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
4369
fi
4370
+SHELL=${CONFIG_SHELL-/bin/sh}
4371
+export SHELL
4372
+# Unset more variables known to interfere with behavior of common tools.
4373
+CLICOLOR_FORCE= GREP_OPTIONS=
4374
+unset CLICOLOR_FORCE GREP_OPTIONS
4375
4376
+## --------------------- ##
4377
+## M4sh Shell Functions. ##
4378
+## --------------------- ##
4379
+# as_fn_unset VAR
4380
+# ---------------
4381
+# Portably unset VAR.
4382
+as_fn_unset ()
4383
+{
4384
+ { eval $1=; unset $1;}
4385
+}
4386
+as_unset=as_fn_unset
4387
+
4388
+# as_fn_set_status STATUS
4389
+# -----------------------
4390
+# Set $? to STATUS, without forking.
4391
+as_fn_set_status ()
4392
+{
4393
+ return $1
4394
+} # as_fn_set_status
4395
+
4396
+# as_fn_exit STATUS
4397
+# -----------------
4398
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
4399
+as_fn_exit ()
4400
+{
4401
+ set +e
4402
+ as_fn_set_status $1
4403
+ exit $1
4404
+} # as_fn_exit
4405
+
4406
+# as_fn_mkdir_p
4407
+# -------------
4408
+# Create "$as_dir" as a directory, including parents if necessary.
4409
+as_fn_mkdir_p ()
4410
+{
4411
4412
- if test $as_have_required = no; then
4413
- echo This script requires a shell more modern than all the
4414
- echo shells that I found on your system. Please install a
4415
- echo modern shell, or manually run the script under such a
4416
- echo shell if you do have one.
4417
- { (exit 1); exit 1; }
4418
-fi
4419
-
4420
+ case $as_dir in #(
4421
+ -*) as_dir=./$as_dir;;
4422
+ esac
4423
+ test -d "$as_dir" || eval $as_mkdir_p || {
4424
+ as_dirs=
4425
+ while :; do
4426
+ case $as_dir in #(
4427
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
4428
+ *) as_qdir=$as_dir;;
4429
+ esac
4430
+ as_dirs="'$as_qdir' $as_dirs"
4431
+ as_dir=`$as_dirname -- "$as_dir" ||
4432
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4433
+ X"$as_dir" : 'X\(//\)[^/]' \| \
4434
+ X"$as_dir" : 'X\(//\)$' \| \
4435
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
4436
+$as_echo X"$as_dir" |
4437
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4438
+ s//\1/
4439
+ q
4440
+ }
4441
+ /^X\(\/\/\)[^/].*/{
4442
+ s//\1/
4443
+ q
4444
+ }
4445
+ /^X\(\/\/\)$/{
4446
+ s//\1/
4447
+ q
4448
+ }
4449
+ /^X\(\/\).*/{
4450
+ s//\1/
4451
+ q
4452
+ }
4453
+ s/.*/./; q'`
4454
+ test -d "$as_dir" && break
4455
+ done
4456
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
4457
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
4458
4459
-fi
4460
4461
-fi
4462
+} # as_fn_mkdir_p
4463
+# as_fn_append VAR VALUE
4464
+# ----------------------
4465
+# Append the text in VALUE to the end of the definition contained in VAR. Take
4466
+# advantage of any shell optimizations that allow amortized linear growth over
4467
+# repeated appends, instead of the typical quadratic growth present in naive
4468
+# implementations.
4469
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
4470
+ eval 'as_fn_append ()
4471
+ {
4472
+ eval $1+=\$2
4473
+ }'
4474
+else
4475
+ as_fn_append ()
4476
+ {
4477
+ eval $1=\$$1\$2
4478
+ }
4479
+fi # as_fn_append
4480
4481
+# as_fn_arith ARG...
4482
+# ------------------
4483
+# Perform arithmetic evaluation on the ARGs, and store the result in the
4484
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
4485
+# must be portable across $(()) and expr.
4486
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
4487
+ eval 'as_fn_arith ()
4488
+ {
4489
+ as_val=$(( $* ))
4490
+ }'
4491
+else
4492
+ as_fn_arith ()
4493
+ {
4494
+ as_val=`expr "$@" || test $? -eq 1`
4495
+ }
4496
+fi # as_fn_arith
4497
4498
4499
-(eval "as_func_return () {
4500
- (exit \$1)
4501
-}
4502
-as_func_success () {
4503
- as_func_return 0
4504
-}
4505
-as_func_failure () {
4506
- as_func_return 1
4507
-}
4508
-as_func_ret_success () {
4509
- return 0
4510
-}
4511
-as_func_ret_failure () {
4512
- return 1
4513
-}
4514
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
4515
+# ----------------------------------------
4516
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
4517
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
4518
+# script with STATUS, using 1 if that was 0.
4519
+as_fn_error ()
4520
+{
4521
+ as_status=$1; test $as_status -eq 0 && as_status=1
4522
+ if test "$4"; then
4523
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
4524
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
4525
+ fi
4526
+ $as_echo "$as_me: error: $2" >&2
4527
+ as_fn_exit $as_status
4528
+} # as_fn_error
4529
4530
-exitcode=0
4531
-if as_func_success; then
4532
- :
4533
+if expr a : '\(a\)' >/dev/null 2>&1 &&
4534
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
4535
+ as_expr=expr
4536
else
4537
- exitcode=1
4538
- echo as_func_success failed.
4539
-fi
4540
-
4541
-if as_func_failure; then
4542
- exitcode=1
4543
- echo as_func_failure succeeded.
4544
+ as_expr=false
4545
fi
4546
4547
-if as_func_ret_success; then
4548
- :
4549
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
4550
+ as_basename=basename
4551
else
4552
- exitcode=1
4553
- echo as_func_ret_success failed.
4554
-fi
4555
-
4556
-if as_func_ret_failure; then
4557
- exitcode=1
4558
- echo as_func_ret_failure succeeded.
4559
+ as_basename=false
4560
fi
4561
4562
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
4563
- :
4564
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
4565
+ as_dirname=dirname
4566
else
4567
- exitcode=1
4568
- echo positional parameters were not saved.
4569
+ as_dirname=false
4570
fi
4571
4572
-test \$exitcode = 0") || {
4573
- echo No shell found that supports shell functions.
4574
- echo Please tell bug-autoconf@gnu.org about your system,
4575
- echo including any error possibly output before this message.
4576
- echo This can help us improve future autoconf versions.
4577
- echo Configuration will now proceed without shell functions.
4578
-}
4579
+as_me=`$as_basename -- "$0" ||
4580
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
4581
+ X"$0" : 'X\(//\)$' \| \
4582
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
4583
+$as_echo X/"$0" |
4584
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
4585
+ s//\1/
4586
+ q
4587
+ }
4588
+ /^X\/\(\/\/\)$/{
4589
+ s//\1/
4590
+ q
4591
+ }
4592
+ /^X\/\(\/\).*/{
4593
+ s//\1/
4594
+ q
4595
+ }
4596
+ s/.*/./; q'`
4597
4598
+# Avoid depending upon Character Ranges.
4599
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
4600
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
4601
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
4602
+as_cr_digits='0123456789'
4603
+as_cr_alnum=$as_cr_Letters$as_cr_digits
4604
4605
4606
- as_lineno_1=$LINENO
4607
- as_lineno_2=$LINENO
4608
- test "x$as_lineno_1" != "x$as_lineno_2" &&
4609
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
4610
-
4611
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
4612
- # uniformly replaced by the line number. The first 'sed' inserts a
4613
- # line-number line after each line using $LINENO; the second 'sed'
4614
- # does the real work. The second script uses 'N' to pair each
4615
- # line-number line with the line containing $LINENO, and appends
4616
- # trailing '-' during substitution so that $LINENO is not a special
4617
- # case at line end.
4618
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
4619
- # scripts with optimization help from Paolo Bonzini. Blame Lee
4620
- # E. McMahon (1931-1989) for sed's syntax. :-)
4621
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
4622
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
4623
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
4624
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
4625
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
4626
sed -n '
4627
p
4628
/[$]LINENO/=
4629
@@ -471,8 +455,7 @@
4630
s/-\n.*//
4631
' >$as_me.lineno &&
4632
chmod +x "$as_me.lineno" ||
4633
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
4634
- { (exit 1); exit 1; }; }
4635
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
4636
4637
# Don't try to exec as it changes $[0], causing all sort of problems
4638
# (the dirname of $[0] is not the place where we might find the
4639
@@ -482,29 +465,18 @@
4640
exit
4641
}
4642
4643
-
4644
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
4645
- as_dirname=dirname
4646
-else
4647
- as_dirname=false
4648
-fi
4649
-
4650
ECHO_C= ECHO_N= ECHO_T=
4651
-case `echo -n x` in
4652
+case `echo -n x` in #(((((
4653
-n*)
4654
- case `echo 'x\c'` in
4655
+ case `echo 'xy\c'` in
4656
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
4657
- *) ECHO_C='\c';;
4658
+ xy) ECHO_C='\c';;
4659
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
4660
+ ECHO_T=' ';;
4661
esac;;
4662
*)
4663
ECHO_N='-n';;
4664
esac
4665
-if expr a : '\(a\)' >/dev/null 2>&1 &&
4666
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
4667
- as_expr=expr
4668
-else
4669
- as_expr=false
4670
-fi
4671
4672
rm -f conf$$ conf$$.exe conf$$.file
4673
if test -d conf$$.dir; then
4674
@@ -534,7 +506,7 @@
4675
rmdir conf$$.dir 2>/dev/null
4676
4677
if mkdir -p . 2>/dev/null; then
4678
- as_mkdir_p=:
4679
+ as_mkdir_p='mkdir -p "$as_dir"'
4680
else
4681
test -d ./-p && rmdir ./-p
4682
as_mkdir_p=false
4683
@@ -553,10 +525,10 @@
4684
if test -d "$1"; then
4685
test -d "$1/.";
4686
else
4687
- case $1 in
4688
+ case $1 in #(
4689
-*)set "./$1";;
4690
esac;
4691
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
4692
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
4693
???[sx]*):;;*)false;;esac;fi
4694
'\'' sh
4695
'
4696
@@ -569,161 +541,14 @@
4697
# Sed expression to map a string onto a valid variable name.
4698
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
4699
4700
-
4701
-
4702
-
4703
-# Check that we are running under the correct shell.
4704
SHELL=${CONFIG_SHELL-/bin/sh}
4705
4706
-case X$lt_ECHO in
4707
-X*--fallback-echo)
4708
- # Remove one level of quotation (which was required for Make).
4709
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
4710
- ;;
4711
-esac
4712
-
4713
-ECHO=${lt_ECHO-echo}
4714
-if test "X$1" = X--no-reexec; then
4715
- # Discard the --no-reexec flag, and continue.
4716
- shift
4717
-elif test "X$1" = X--fallback-echo; then
4718
- # Avoid inline document here, it may be left over
4719
- :
4720
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
4721
- # Yippee, $ECHO works!
4722
- :
4723
-else
4724
- # Restart under the correct shell.
4725
- exec $SHELL "$0" --no-reexec ${1+"$@"}
4726
-fi
4727
4728
-if test "X$1" = X--fallback-echo; then
4729
- # used as fallback echo
4730
- shift
4731
- cat <<_LT_EOF
4732
-$*
4733
-_LT_EOF
4734
- exit 0
4735
-fi
4736
-
4737
-# The HP-UX ksh and POSIX shell print the target directory to stdout
4738
-# if CDPATH is set.
4739
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
4740
-
4741
-if test -z "$lt_ECHO"; then
4742
- if test "X${echo_test_string+set}" != Xset; then
4743
- # find a string as large as possible, as long as the shell can cope with it
4744
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
4745
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
4746
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
4747
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
4748
- then
4749
- break
4750
- fi
4751
- done
4752
- fi
4753
-
4754
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
4755
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
4756
- test "X$echo_testing_string" = "X$echo_test_string"; then
4757
- :
4758
- else
4759
- # The Solaris, AIX, and Digital Unix default echo programs unquote
4760
- # backslashes. This makes it impossible to quote backslashes using
4761
- # echo "$something" | sed 's/\\/\\\\/g'
4762
- #
4763
- # So, first we look for a working echo in the user's PATH.
4764
-
4765
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
4766
- for dir in $PATH /usr/ucb; do
4767
- IFS="$lt_save_ifs"
4768
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
4769
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
4770
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
4771
- test "X$echo_testing_string" = "X$echo_test_string"; then
4772
- ECHO="$dir/echo"
4773
- break
4774
- fi
4775
- done
4776
- IFS="$lt_save_ifs"
4777
-
4778
- if test "X$ECHO" = Xecho; then
4779
- # We didn't find a better echo, so look for alternatives.
4780
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
4781
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
4782
- test "X$echo_testing_string" = "X$echo_test_string"; then
4783
- # This shell has a builtin print -r that does the trick.
4784
- ECHO='print -r'
4785
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
4786
- test "X$CONFIG_SHELL" != X/bin/ksh; then
4787
- # If we have ksh, try running configure again with it.
4788
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
4789
- export ORIGINAL_CONFIG_SHELL
4790
- CONFIG_SHELL=/bin/ksh
4791
- export CONFIG_SHELL
4792
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
4793
- else
4794
- # Try using printf.
4795
- ECHO='printf %s\n'
4796
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
4797
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
4798
- test "X$echo_testing_string" = "X$echo_test_string"; then
4799
- # Cool, printf works
4800
- :
4801
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
4802
- test "X$echo_testing_string" = 'X\t' &&
4803
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
4804
- test "X$echo_testing_string" = "X$echo_test_string"; then
4805
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
4806
- export CONFIG_SHELL
4807
- SHELL="$CONFIG_SHELL"
4808
- export SHELL
4809
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
4810
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
4811
- test "X$echo_testing_string" = 'X\t' &&
4812
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
4813
- test "X$echo_testing_string" = "X$echo_test_string"; then
4814
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
4815
- else
4816
- # maybe with a smaller string...
4817
- prev=:
4818
-
4819
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
4820
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
4821
- then
4822
- break
4823
- fi
4824
- prev="$cmd"
4825
- done
4826
-
4827
- if test "$prev" != 'sed 50q "$0"'; then
4828
- echo_test_string=`eval $prev`
4829
- export echo_test_string
4830
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
4831
- else
4832
- # Oops. We lost completely, so just stick with echo.
4833
- ECHO=echo
4834
- fi
4835
- fi
4836
- fi
4837
- fi
4838
- fi
4839
-fi
4840
-
4841
-# Copy echo and quote the copy suitably for passing to libtool from
4842
-# the Makefile, instead of quoting the original, which is used later.
4843
-lt_ECHO=$ECHO
4844
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
4845
- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
4846
-fi
4847
-
4848
-
4849
-
4850
-
4851
-exec 7<&0 </dev/null 6>&1
4852
+test -n "$DJDIR" || exec 7<&0 </dev/null
4853
+exec 6>&1
4854
4855
# Name of the host.
4856
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
4857
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
4858
# so uname gets run too.
4859
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
4860
4861
@@ -738,7 +563,6 @@
4862
subdirs=
4863
MFLAGS=
4864
MAKEFLAGS=
4865
-SHELL=${CONFIG_SHELL-/bin/sh}
4866
4867
# Identity of this package.
4868
PACKAGE_NAME='bluez'
4869
@@ -746,6 +570,7 @@
4870
PACKAGE_VERSION='4.94'
4871
PACKAGE_STRING='bluez 4.94'
4872
PACKAGE_BUGREPORT=''
4873
+PACKAGE_URL=''
4874
4875
ac_default_prefix=/usr/local
4876
# Factoring default headers for most tests.
4877
@@ -868,6 +693,7 @@
4878
GSTREAMER_PLUGINSDIR
4879
GSTREAMER_LIBS
4880
GSTREAMER_CFLAGS
4881
+ALSA_LIBDIR
4882
ALSA_LIBS
4883
ALSA_CFLAGS
4884
GLIB_LIBS
4885
@@ -880,9 +706,11 @@
4886
LIPO
4887
NMEDIT
4888
DSYMUTIL
4889
-lt_ECHO
4890
+MANIFEST_TOOL
4891
RANLIB
4892
+ac_ct_AR
4893
AR
4894
+DLLTOOL
4895
OBJDUMP
4896
LN_S
4897
NM
4898
@@ -926,6 +754,8 @@
4899
UDEV_DIR
4900
STORAGEDIR
4901
CONFIGDIR
4902
+PKG_CONFIG_LIBDIR
4903
+PKG_CONFIG_PATH
4904
PKG_CONFIG
4905
MAINT
4906
MAINTAINER_MODE_FALSE
4907
@@ -985,6 +815,7 @@
4908
program_transform_name
4909
prefix
4910
exec_prefix
4911
+PACKAGE_URL
4912
PACKAGE_BUGREPORT
4913
PACKAGE_STRING
4914
PACKAGE_VERSION
4915
@@ -1003,6 +834,7 @@
4916
with_pic
4917
enable_fast_install
4918
with_gnu_ld
4919
+with_sysroot
4920
enable_libtool_lock
4921
with_ouifile
4922
enable_optimization
4923
@@ -1045,6 +877,8 @@
4924
host_alias
4925
target_alias
4926
PKG_CONFIG
4927
+PKG_CONFIG_PATH
4928
+PKG_CONFIG_LIBDIR
4929
CC
4930
CFLAGS
4931
LDFLAGS
4932
@@ -1131,8 +965,9 @@
4933
fi
4934
4935
case $ac_option in
4936
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
4937
- *) ac_optarg=yes ;;
4938
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
4939
+ *=) ac_optarg= ;;
4940
+ *) ac_optarg=yes ;;
4941
esac
4942
4943
# Accept the important Cygnus configure options, so we can diagnose typos.
4944
@@ -1177,8 +1012,7 @@
4945
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
4946
# Reject names that are not valid shell variable names.
4947
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
4948
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
4949
- { (exit 1); exit 1; }; }
4950
+ as_fn_error $? "invalid feature name: $ac_useropt"
4951
ac_useropt_orig=$ac_useropt
4952
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
4953
case $ac_user_opts in
4954
@@ -1204,8 +1038,7 @@
4955
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
4956
# Reject names that are not valid shell variable names.
4957
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
4958
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
4959
- { (exit 1); exit 1; }; }
4960
+ as_fn_error $? "invalid feature name: $ac_useropt"
4961
ac_useropt_orig=$ac_useropt
4962
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
4963
case $ac_user_opts in
4964
@@ -1409,8 +1242,7 @@
4965
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
4966
# Reject names that are not valid shell variable names.
4967
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
4968
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
4969
- { (exit 1); exit 1; }; }
4970
+ as_fn_error $? "invalid package name: $ac_useropt"
4971
ac_useropt_orig=$ac_useropt
4972
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
4973
case $ac_user_opts in
4974
@@ -1426,8 +1258,7 @@
4975
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
4976
# Reject names that are not valid shell variable names.
4977
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
4978
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
4979
- { (exit 1); exit 1; }; }
4980
+ as_fn_error $? "invalid package name: $ac_useropt"
4981
ac_useropt_orig=$ac_useropt
4982
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
4983
case $ac_user_opts in
4984
@@ -1457,17 +1288,17 @@
4985
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
4986
x_libraries=$ac_optarg ;;
4987
4988
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
4989
-Try \`$0 --help' for more information." >&2
4990
- { (exit 1); exit 1; }; }
4991
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
4992
+Try \`$0 --help' for more information"
4993
;;
4994
4995
*=*)
4996
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
4997
# Reject names that are not valid shell variable names.
4998
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
4999
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
5000
- { (exit 1); exit 1; }; }
5001
+ case $ac_envvar in #(
5002
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
5003
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
5004
+ esac
5005
eval $ac_envvar=\$ac_optarg
5006
export $ac_envvar ;;
5007
5008
@@ -1476,7 +1307,7 @@
5009
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
5010
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
5011
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
5012
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
5013
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
5014
;;
5015
5016
esac
5017
@@ -1484,15 +1315,13 @@
5018
5019
if test -n "$ac_prev"; then
5020
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
5021
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
5022
- { (exit 1); exit 1; }; }
5023
+ as_fn_error $? "missing argument to $ac_option"
5024
fi
5025
5026
if test -n "$ac_unrecognized_opts"; then
5027
case $enable_option_checking in
5028
no) ;;
5029
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
5030
- { (exit 1); exit 1; }; } ;;
5031
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
5032
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
5033
esac
5034
fi
5035
@@ -1515,8 +1344,7 @@
5036
[\\/$]* | ?:[\\/]* ) continue;;
5037
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
5038
esac
5039
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
5040
- { (exit 1); exit 1; }; }
5041
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
5042
done
5043
5044
# There might be people who depend on the old broken behavior: `$host'
5045
@@ -1530,8 +1358,8 @@
5046
if test "x$host_alias" != x; then
5047
if test "x$build_alias" = x; then
5048
cross_compiling=maybe
5049
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
5050
- If a cross compiler is detected then cross compile mode will be used." >&2
5051
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
5052
+ If a cross compiler is detected then cross compile mode will be used" >&2
5053
elif test "x$build_alias" != "x$host_alias"; then
5054
cross_compiling=yes
5055
fi
5056
@@ -1546,11 +1374,9 @@
5057
ac_pwd=`pwd` && test -n "$ac_pwd" &&
5058
ac_ls_di=`ls -di .` &&
5059
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
5060
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
5061
- { (exit 1); exit 1; }; }
5062
+ as_fn_error $? "working directory cannot be determined"
5063
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
5064
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
5065
- { (exit 1); exit 1; }; }
5066
+ as_fn_error $? "pwd does not report name of working directory"
5067
5068
5069
# Find the source files, if location was not specified.
5070
@@ -1589,13 +1415,11 @@
5071
fi
5072
if test ! -r "$srcdir/$ac_unique_file"; then
5073
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
5074
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
5075
- { (exit 1); exit 1; }; }
5076
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
5077
fi
5078
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
5079
ac_abs_confdir=`(
5080
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
5081
- { (exit 1); exit 1; }; }
5082
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
5083
pwd)`
5084
# When building in place, set srcdir=.
5085
if test "$ac_abs_confdir" = "$ac_pwd"; then
5086
@@ -1635,7 +1459,7 @@
5087
--help=short display options specific to this package
5088
--help=recursive display the short help of all the included packages
5089
-V, --version display version information and exit
5090
- -q, --quiet, --silent do not print \`checking...' messages
5091
+ -q, --quiet, --silent do not print \`checking ...' messages
5092
--cache-file=FILE cache test results in FILE [disabled]
5093
-C, --config-cache alias for \`--cache-file=config.cache'
5094
-n, --no-create do not create output files
5095
@@ -1750,21 +1574,28 @@
5096
--with-pic try to use only PIC/non-PIC objects [default=use
5097
both]
5098
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
5099
+ --with-sysroot=DIR Search for dependent libraries within DIR
5100
+ (or the compiler's sysroot if not specified).
5101
--with-ouifile=PATH Path to the oui.txt file [auto]
5102
--with-sap=DRIVER select SAP driver
5103
--with-telephony=DRIVER select telephony driver
5104
5105
Some influential environment variables:
5106
PKG_CONFIG path to pkg-config utility
5107
+ PKG_CONFIG_PATH
5108
+ directories to add to pkg-config's search path
5109
+ PKG_CONFIG_LIBDIR
5110
+ path overriding pkg-config's built-in search path
5111
CC C compiler command
5112
CFLAGS C compiler flags
5113
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
5114
nonstandard directory <lib dir>
5115
LIBS libraries to pass to the linker, e.g. -l<library>
5116
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
5117
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
5118
you have headers in a nonstandard directory <include dir>
5119
- YACC The `Yet Another C Compiler' implementation to use. Defaults to
5120
- the first program found out of: `bison -y', `byacc', `yacc'.
5121
+ YACC The `Yet Another Compiler Compiler' implementation to use.
5122
+ Defaults to the first program found out of: `bison -y', `byacc',
5123
+ `yacc'.
5124
YFLAGS The list of arguments that will be passed by default to $YACC.
5125
This script will default YFLAGS to the empty string to avoid a
5126
default value of `-d' given by some make applications.
5127
@@ -1794,6 +1625,7 @@
5128
Use these variables to override the choices made by `configure' or to help
5129
it to find libraries and programs with nonstandard names/locations.
5130
5131
+Report bugs to the package provider.
5132
_ACEOF
5133
ac_status=$?
5134
fi
5135
@@ -1838,40 +1670,391 @@
5136
esac
5137
ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
5138
5139
- cd "$ac_dir" || { ac_status=$?; continue; }
5140
- # Check for guested configure.
5141
- if test -f "$ac_srcdir/configure.gnu"; then
5142
- echo &&
5143
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
5144
- elif test -f "$ac_srcdir/configure"; then
5145
- echo &&
5146
- $SHELL "$ac_srcdir/configure" --help=recursive
5147
- else
5148
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
5149
- fi || ac_status=$?
5150
- cd "$ac_pwd" || { ac_status=$?; break; }
5151
- done
5152
+ cd "$ac_dir" || { ac_status=$?; continue; }
5153
+ # Check for guested configure.
5154
+ if test -f "$ac_srcdir/configure.gnu"; then
5155
+ echo &&
5156
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
5157
+ elif test -f "$ac_srcdir/configure"; then
5158
+ echo &&
5159
+ $SHELL "$ac_srcdir/configure" --help=recursive
5160
+ else
5161
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
5162
+ fi || ac_status=$?
5163
+ cd "$ac_pwd" || { ac_status=$?; break; }
5164
+ done
5165
+fi
5166
+
5167
+test -n "$ac_init_help" && exit $ac_status
5168
+if $ac_init_version; then
5169
+ cat <<\_ACEOF
5170
+bluez configure 4.94
5171
+generated by GNU Autoconf 2.68
5172
+
5173
+Copyright (C) 2010 Free Software Foundation, Inc.
5174
+This configure script is free software; the Free Software Foundation
5175
+gives unlimited permission to copy, distribute and modify it.
5176
+_ACEOF
5177
+ exit
5178
+fi
5179
+
5180
+## ------------------------ ##
5181
+## Autoconf initialization. ##
5182
+## ------------------------ ##
5183
+
5184
+# ac_fn_c_try_compile LINENO
5185
+# --------------------------
5186
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
5187
+ac_fn_c_try_compile ()
5188
+{
5189
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
5190
+ rm -f conftest.$ac_objext
5191
+ if { { ac_try="$ac_compile"
5192
+case "(($ac_try" in
5193
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5194
+ *) ac_try_echo=$ac_try;;
5195
+esac
5196
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5197
+$as_echo "$ac_try_echo"; } >&5
5198
+ (eval "$ac_compile") 2>conftest.err
5199
+ ac_status=$?
5200
+ if test -s conftest.err; then
5201
+ grep -v '^ *+' conftest.err >conftest.er1
5202
+ cat conftest.er1 >&5
5203
+ mv -f conftest.er1 conftest.err
5204
+ fi
5205
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5206
+ test $ac_status = 0; } && {
5207
+ test -z "$ac_c_werror_flag" ||
5208
+ test ! -s conftest.err
5209
+ } && test -s conftest.$ac_objext; then :
5210
+ ac_retval=0
5211
+else
5212
+ $as_echo "$as_me: failed program was:" >&5
5213
+sed 's/^/| /' conftest.$ac_ext >&5
5214
+
5215
+ ac_retval=1
5216
+fi
5217
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
5218
+ as_fn_set_status $ac_retval
5219
+
5220
+} # ac_fn_c_try_compile
5221
+
5222
+# ac_fn_c_try_link LINENO
5223
+# -----------------------
5224
+# Try to link conftest.$ac_ext, and return whether this succeeded.
5225
+ac_fn_c_try_link ()
5226
+{
5227
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
5228
+ rm -f conftest.$ac_objext conftest$ac_exeext
5229
+ if { { ac_try="$ac_link"
5230
+case "(($ac_try" in
5231
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5232
+ *) ac_try_echo=$ac_try;;
5233
+esac
5234
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5235
+$as_echo "$ac_try_echo"; } >&5
5236
+ (eval "$ac_link") 2>conftest.err
5237
+ ac_status=$?
5238
+ if test -s conftest.err; then
5239
+ grep -v '^ *+' conftest.err >conftest.er1
5240
+ cat conftest.er1 >&5
5241
+ mv -f conftest.er1 conftest.err
5242
+ fi
5243
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5244
+ test $ac_status = 0; } && {
5245
+ test -z "$ac_c_werror_flag" ||
5246
+ test ! -s conftest.err
5247
+ } && test -s conftest$ac_exeext && {
5248
+ test "$cross_compiling" = yes ||
5249
+ $as_test_x conftest$ac_exeext
5250
+ }; then :
5251
+ ac_retval=0
5252
+else
5253
+ $as_echo "$as_me: failed program was:" >&5
5254
+sed 's/^/| /' conftest.$ac_ext >&5
5255
+
5256
+ ac_retval=1
5257
+fi
5258
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
5259
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
5260
+ # interfere with the next link command; also delete a directory that is
5261
+ # left behind by Apple's compiler. We do this before executing the actions.
5262
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
5263
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
5264
+ as_fn_set_status $ac_retval
5265
+
5266
+} # ac_fn_c_try_link
5267
+
5268
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
5269
+# -------------------------------------------------------
5270
+# Tests whether HEADER exists and can be compiled using the include files in
5271
+# INCLUDES, setting the cache variable VAR accordingly.
5272
+ac_fn_c_check_header_compile ()
5273
+{
5274
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
5275
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
5276
+$as_echo_n "checking for $2... " >&6; }
5277
+if eval \${$3+:} false; then :
5278
+ $as_echo_n "(cached) " >&6
5279
+else
5280
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5281
+/* end confdefs.h. */
5282
+$4
5283
+#include <$2>
5284
+_ACEOF
5285
+if ac_fn_c_try_compile "$LINENO"; then :
5286
+ eval "$3=yes"
5287
+else
5288
+ eval "$3=no"
5289
+fi
5290
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5291
+fi
5292
+eval ac_res=\$$3
5293
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
5294
+$as_echo "$ac_res" >&6; }
5295
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
5296
+
5297
+} # ac_fn_c_check_header_compile
5298
+
5299
+# ac_fn_c_try_cpp LINENO
5300
+# ----------------------
5301
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
5302
+ac_fn_c_try_cpp ()
5303
+{
5304
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
5305
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
5306
+case "(($ac_try" in
5307
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5308
+ *) ac_try_echo=$ac_try;;
5309
+esac
5310
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5311
+$as_echo "$ac_try_echo"; } >&5
5312
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
5313
+ ac_status=$?
5314
+ if test -s conftest.err; then
5315
+ grep -v '^ *+' conftest.err >conftest.er1
5316
+ cat conftest.er1 >&5
5317
+ mv -f conftest.er1 conftest.err
5318
+ fi
5319
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5320
+ test $ac_status = 0; } > conftest.i && {
5321
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5322
+ test ! -s conftest.err
5323
+ }; then :
5324
+ ac_retval=0
5325
+else
5326
+ $as_echo "$as_me: failed program was:" >&5
5327
+sed 's/^/| /' conftest.$ac_ext >&5
5328
+
5329
+ ac_retval=1
5330
+fi
5331
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
5332
+ as_fn_set_status $ac_retval
5333
+
5334
+} # ac_fn_c_try_cpp
5335
+
5336
+# ac_fn_c_try_run LINENO
5337
+# ----------------------
5338
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
5339
+# that executables *can* be run.
5340
+ac_fn_c_try_run ()
5341
+{
5342
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
5343
+ if { { ac_try="$ac_link"
5344
+case "(($ac_try" in
5345
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5346
+ *) ac_try_echo=$ac_try;;
5347
+esac
5348
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5349
+$as_echo "$ac_try_echo"; } >&5
5350
+ (eval "$ac_link") 2>&5
5351
+ ac_status=$?
5352
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5353
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
5354
+ { { case "(($ac_try" in
5355
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5356
+ *) ac_try_echo=$ac_try;;
5357
+esac
5358
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5359
+$as_echo "$ac_try_echo"; } >&5
5360
+ (eval "$ac_try") 2>&5
5361
+ ac_status=$?
5362
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5363
+ test $ac_status = 0; }; }; then :
5364
+ ac_retval=0
5365
+else
5366
+ $as_echo "$as_me: program exited with status $ac_status" >&5
5367
+ $as_echo "$as_me: failed program was:" >&5
5368
+sed 's/^/| /' conftest.$ac_ext >&5
5369
+
5370
+ ac_retval=$ac_status
5371
+fi
5372
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
5373
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
5374
+ as_fn_set_status $ac_retval
5375
+
5376
+} # ac_fn_c_try_run
5377
+
5378
+# ac_fn_c_check_func LINENO FUNC VAR
5379
+# ----------------------------------
5380
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
5381
+ac_fn_c_check_func ()
5382
+{
5383
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
5384
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
5385
+$as_echo_n "checking for $2... " >&6; }
5386
+if eval \${$3+:} false; then :
5387
+ $as_echo_n "(cached) " >&6
5388
+else
5389
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5390
+/* end confdefs.h. */
5391
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
5392
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
5393
+#define $2 innocuous_$2
5394
+
5395
+/* System header to define __stub macros and hopefully few prototypes,
5396
+ which can conflict with char $2 (); below.
5397
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
5398
+ <limits.h> exists even on freestanding compilers. */
5399
+
5400
+#ifdef __STDC__
5401
+# include <limits.h>
5402
+#else
5403
+# include <assert.h>
5404
+#endif
5405
+
5406
+#undef $2
5407
+
5408
+/* Override any GCC internal prototype to avoid an error.
5409
+ Use char because int might match the return type of a GCC
5410
+ builtin and then its argument prototype would still apply. */
5411
+#ifdef __cplusplus
5412
+extern "C"
5413
+#endif
5414
+char $2 ();
5415
+/* The GNU C library defines this for functions which it implements
5416
+ to always fail with ENOSYS. Some functions are actually named
5417
+ something starting with __ and the normal name is an alias. */
5418
+#if defined __stub_$2 || defined __stub___$2
5419
+choke me
5420
+#endif
5421
+
5422
+int
5423
+main ()
5424
+{
5425
+return $2 ();
5426
+ ;
5427
+ return 0;
5428
+}
5429
+_ACEOF
5430
+if ac_fn_c_try_link "$LINENO"; then :
5431
+ eval "$3=yes"
5432
+else
5433
+ eval "$3=no"
5434
+fi
5435
+rm -f core conftest.err conftest.$ac_objext \
5436
+ conftest$ac_exeext conftest.$ac_ext
5437
fi
5438
+eval ac_res=\$$3
5439
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
5440
+$as_echo "$ac_res" >&6; }
5441
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
5442
5443
-test -n "$ac_init_help" && exit $ac_status
5444
-if $ac_init_version; then
5445
- cat <<\_ACEOF
5446
-bluez configure 4.94
5447
-generated by GNU Autoconf 2.63
5448
+} # ac_fn_c_check_func
5449
5450
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
5451
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
5452
-This configure script is free software; the Free Software Foundation
5453
-gives unlimited permission to copy, distribute and modify it.
5454
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
5455
+# -------------------------------------------------------
5456
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
5457
+# the include files in INCLUDES and setting the cache variable VAR
5458
+# accordingly.
5459
+ac_fn_c_check_header_mongrel ()
5460
+{
5461
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
5462
+ if eval \${$3+:} false; then :
5463
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
5464
+$as_echo_n "checking for $2... " >&6; }
5465
+if eval \${$3+:} false; then :
5466
+ $as_echo_n "(cached) " >&6
5467
+fi
5468
+eval ac_res=\$$3
5469
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
5470
+$as_echo "$ac_res" >&6; }
5471
+else
5472
+ # Is the header compilable?
5473
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
5474
+$as_echo_n "checking $2 usability... " >&6; }
5475
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5476
+/* end confdefs.h. */
5477
+$4
5478
+#include <$2>
5479
_ACEOF
5480
- exit
5481
+if ac_fn_c_try_compile "$LINENO"; then :
5482
+ ac_header_compiler=yes
5483
+else
5484
+ ac_header_compiler=no
5485
+fi
5486
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5487
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
5488
+$as_echo "$ac_header_compiler" >&6; }
5489
+
5490
+# Is the header present?
5491
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
5492
+$as_echo_n "checking $2 presence... " >&6; }
5493
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5494
+/* end confdefs.h. */
5495
+#include <$2>
5496
+_ACEOF
5497
+if ac_fn_c_try_cpp "$LINENO"; then :
5498
+ ac_header_preproc=yes
5499
+else
5500
+ ac_header_preproc=no
5501
fi
5502
+rm -f conftest.err conftest.i conftest.$ac_ext
5503
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
5504
+$as_echo "$ac_header_preproc" >&6; }
5505
+
5506
+# So? What about this header?
5507
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
5508
+ yes:no: )
5509
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
5510
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
5511
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
5512
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
5513
+ ;;
5514
+ no:yes:* )
5515
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
5516
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
5517
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
5518
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
5519
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
5520
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
5521
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
5522
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
5523
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
5524
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
5525
+ ;;
5526
+esac
5527
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
5528
+$as_echo_n "checking for $2... " >&6; }
5529
+if eval \${$3+:} false; then :
5530
+ $as_echo_n "(cached) " >&6
5531
+else
5532
+ eval "$3=\$ac_header_compiler"
5533
+fi
5534
+eval ac_res=\$$3
5535
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
5536
+$as_echo "$ac_res" >&6; }
5537
+fi
5538
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
5539
+
5540
+} # ac_fn_c_check_header_mongrel
5541
cat >config.log <<_ACEOF
5542
This file contains any messages produced by compilers while
5543
running configure, to aid debugging if configure makes a mistake.
5544
5545
It was created by bluez $as_me 4.94, which was
5546
-generated by GNU Autoconf 2.63. Invocation command line was
5547
+generated by GNU Autoconf 2.68. Invocation command line was
5548
5549
$ $0 $@
5550
5551
@@ -1907,8 +2090,8 @@
5552
do
5553
IFS=$as_save_IFS
5554
test -z "$as_dir" && as_dir=.
5555
- $as_echo "PATH: $as_dir"
5556
-done
5557
+ $as_echo "PATH: $as_dir"
5558
+ done
5559
IFS=$as_save_IFS
5560
5561
} >&5
5562
@@ -1945,9 +2128,9 @@
5563
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
5564
esac
5565
case $ac_pass in
5566
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
5567
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
5568
2)
5569
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
5570
+ as_fn_append ac_configure_args1 " '$ac_arg'"
5571
if test $ac_must_keep_next = true; then
5572
ac_must_keep_next=false # Got value, back to normal.
5573
else
5574
@@ -1963,13 +2146,13 @@
5575
-* ) ac_must_keep_next=true ;;
5576
esac
5577
fi
5578
- ac_configure_args="$ac_configure_args '$ac_arg'"
5579
+ as_fn_append ac_configure_args " '$ac_arg'"
5580
;;
5581
esac
5582
done
5583
done
5584
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
5585
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
5586
+{ ac_configure_args0=; unset ac_configure_args0;}
5587
+{ ac_configure_args1=; unset ac_configure_args1;}
5588
5589
# When interrupted or exit'd, cleanup temporary files, and complete
5590
# config.log. We remove comments because anyway the quotes in there
5591
@@ -1981,11 +2164,9 @@
5592
{
5593
echo
5594
5595
- cat <<\_ASBOX
5596
-## ---------------- ##
5597
+ $as_echo "## ---------------- ##
5598
## Cache variables. ##
5599
-## ---------------- ##
5600
-_ASBOX
5601
+## ---------------- ##"
5602
echo
5603
# The following way of writing the cache mishandles newlines in values,
5604
(
5605
@@ -1994,13 +2175,13 @@
5606
case $ac_val in #(
5607
*${as_nl}*)
5608
case $ac_var in #(
5609
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
5610
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
5611
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
5612
esac
5613
case $ac_var in #(
5614
_ | IFS | as_nl) ;; #(
5615
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
5616
- *) $as_unset $ac_var ;;
5617
+ *) { eval $ac_var=; unset $ac_var;} ;;
5618
esac ;;
5619
esac
5620
done
5621
@@ -2019,11 +2200,9 @@
5622
)
5623
echo
5624
5625
- cat <<\_ASBOX
5626
-## ----------------- ##
5627
+ $as_echo "## ----------------- ##
5628
## Output variables. ##
5629
-## ----------------- ##
5630
-_ASBOX
5631
+## ----------------- ##"
5632
echo
5633
for ac_var in $ac_subst_vars
5634
do
5635
@@ -2036,11 +2215,9 @@
5636
echo
5637
5638
if test -n "$ac_subst_files"; then
5639
- cat <<\_ASBOX
5640
-## ------------------- ##
5641
+ $as_echo "## ------------------- ##
5642
## File substitutions. ##
5643
-## ------------------- ##
5644
-_ASBOX
5645
+## ------------------- ##"
5646
echo
5647
for ac_var in $ac_subst_files
5648
do
5649
@@ -2054,11 +2231,9 @@
5650
fi
5651
5652
if test -s confdefs.h; then
5653
- cat <<\_ASBOX
5654
-## ----------- ##
5655
+ $as_echo "## ----------- ##
5656
## confdefs.h. ##
5657
-## ----------- ##
5658
-_ASBOX
5659
+## ----------- ##"
5660
echo
5661
cat confdefs.h
5662
echo
5663
@@ -2072,46 +2247,53 @@
5664
exit $exit_status
5665
' 0
5666
for ac_signal in 1 2 13 15; do
5667
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
5668
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
5669
done
5670
ac_signal=0
5671
5672
# confdefs.h avoids OS command line length limits that DEFS can exceed.
5673
rm -f -r conftest* confdefs.h
5674
5675
+$as_echo "/* confdefs.h */" > confdefs.h
5676
+
5677
# Predefined preprocessor variables.
5678
5679
cat >>confdefs.h <<_ACEOF
5680
#define PACKAGE_NAME "$PACKAGE_NAME"
5681
_ACEOF
5682
5683
-
5684
cat >>confdefs.h <<_ACEOF
5685
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
5686
_ACEOF
5687
5688
-
5689
cat >>confdefs.h <<_ACEOF
5690
#define PACKAGE_VERSION "$PACKAGE_VERSION"
5691
_ACEOF
5692
5693
-
5694
cat >>confdefs.h <<_ACEOF
5695
#define PACKAGE_STRING "$PACKAGE_STRING"
5696
_ACEOF
5697
5698
-
5699
cat >>confdefs.h <<_ACEOF
5700
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
5701
_ACEOF
5702
5703
+cat >>confdefs.h <<_ACEOF
5704
+#define PACKAGE_URL "$PACKAGE_URL"
5705
+_ACEOF
5706
+
5707
5708
# Let the site file select an alternate cache file if it wants to.
5709
# Prefer an explicitly selected file to automatically selected ones.
5710
ac_site_file1=NONE
5711
ac_site_file2=NONE
5712
if test -n "$CONFIG_SITE"; then
5713
- ac_site_file1=$CONFIG_SITE
5714
+ # We do not want a PATH search for config.site.
5715
+ case $CONFIG_SITE in #((
5716
+ -*) ac_site_file1=./$CONFIG_SITE;;
5717
+ */*) ac_site_file1=$CONFIG_SITE;;
5718
+ *) ac_site_file1=./$CONFIG_SITE;;
5719
+ esac
5720
elif test "x$prefix" != xNONE; then
5721
ac_site_file1=$prefix/share/config.site
5722
ac_site_file2=$prefix/etc/config.site
5723
@@ -2122,19 +2304,23 @@
5724
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
5725
do
5726
test "x$ac_site_file" = xNONE && continue
5727
- if test -r "$ac_site_file"; then
5728
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
5729
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
5730
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
5731
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
5732
sed 's/^/| /' "$ac_site_file" >&5
5733
- . "$ac_site_file"
5734
+ . "$ac_site_file" \
5735
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5736
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5737
+as_fn_error $? "failed to load site script $ac_site_file
5738
+See \`config.log' for more details" "$LINENO" 5; }
5739
fi
5740
done
5741
5742
if test -r "$cache_file"; then
5743
- # Some versions of bash will fail to source /dev/null (special
5744
- # files actually), so we avoid doing that.
5745
- if test -f "$cache_file"; then
5746
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
5747
+ # Some versions of bash will fail to source /dev/null (special files
5748
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
5749
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
5750
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
5751
$as_echo "$as_me: loading cache $cache_file" >&6;}
5752
case $cache_file in
5753
[\\/]* | ?:[\\/]* ) . "$cache_file";;
5754
@@ -2142,7 +2328,7 @@
5755
esac
5756
fi
5757
else
5758
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
5759
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
5760
$as_echo "$as_me: creating cache $cache_file" >&6;}
5761
>$cache_file
5762
fi
5763
@@ -2157,11 +2343,11 @@
5764
eval ac_new_val=\$ac_env_${ac_var}_value
5765
case $ac_old_set,$ac_new_set in
5766
set,)
5767
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
5768
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
5769
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
5770
ac_cache_corrupted=: ;;
5771
,set)
5772
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
5773
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
5774
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
5775
ac_cache_corrupted=: ;;
5776
,);;
5777
@@ -2171,17 +2357,17 @@
5778
ac_old_val_w=`echo x $ac_old_val`
5779
ac_new_val_w=`echo x $ac_new_val`
5780
if test "$ac_old_val_w" != "$ac_new_val_w"; then
5781
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
5782
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
5783
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
5784
ac_cache_corrupted=:
5785
else
5786
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
5787
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
5788
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
5789
eval $ac_var=\$ac_old_val
5790
fi
5791
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
5792
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
5793
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
5794
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
5795
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
5796
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
5797
fi;;
5798
esac
5799
@@ -2193,43 +2379,20 @@
5800
esac
5801
case " $ac_configure_args " in
5802
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
5803
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
5804
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
5805
esac
5806
fi
5807
done
5808
if $ac_cache_corrupted; then
5809
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
5810
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5811
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5812
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
5813
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
5814
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
5815
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
5816
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
5817
- { (exit 1); exit 1; }; }
5818
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
5819
fi
5820
-
5821
-
5822
-
5823
-
5824
-
5825
-
5826
-
5827
-
5828
-
5829
-
5830
-
5831
-
5832
-
5833
-
5834
-
5835
-
5836
-
5837
-
5838
-
5839
-
5840
-
5841
-
5842
-
5843
-
5844
+## -------------------- ##
5845
+## Main body of script. ##
5846
+## -------------------- ##
5847
5848
ac_ext=c
5849
ac_cpp='$CPP $CPPFLAGS'
5850
@@ -2258,9 +2421,7 @@
5851
fi
5852
done
5853
if test -z "$ac_aux_dir"; then
5854
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
5855
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
5856
- { (exit 1); exit 1; }; }
5857
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
5858
fi
5859
5860
# These three variables are undocumented and unsupported,
5861
@@ -2286,10 +2447,10 @@
5862
# OS/2's system install, which has a completely different semantic
5863
# ./install, which can be erroneously created by make from ./install.sh.
5864
# Reject install programs that cannot install multiple files.
5865
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
5866
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
5867
$as_echo_n "checking for a BSD-compatible install... " >&6; }
5868
if test -z "$INSTALL"; then
5869
-if test "${ac_cv_path_install+set}" = set; then
5870
+if ${ac_cv_path_install+:} false; then :
5871
$as_echo_n "(cached) " >&6
5872
else
5873
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5874
@@ -2297,11 +2458,11 @@
5875
do
5876
IFS=$as_save_IFS
5877
test -z "$as_dir" && as_dir=.
5878
- # Account for people who put trailing slashes in PATH elements.
5879
-case $as_dir/ in
5880
- ./ | .// | /cC/* | \
5881
+ # Account for people who put trailing slashes in PATH elements.
5882
+case $as_dir/ in #((
5883
+ ./ | .// | /[cC]/* | \
5884
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
5885
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
5886
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
5887
/usr/ucb/* ) ;;
5888
*)
5889
# OSF1 and SCO ODT 3.0 have their own names for install.
5890
@@ -2338,7 +2499,7 @@
5891
;;
5892
esac
5893
5894
-done
5895
+ done
5896
IFS=$as_save_IFS
5897
5898
rm -rf conftest.one conftest.two conftest.dir
5899
@@ -2354,7 +2515,7 @@
5900
INSTALL=$ac_install_sh
5901
fi
5902
fi
5903
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
5904
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
5905
$as_echo "$INSTALL" >&6; }
5906
5907
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
5908
@@ -2365,7 +2526,7 @@
5909
5910
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
5911
5912
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
5913
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
5914
$as_echo_n "checking whether build environment is sane... " >&6; }
5915
# Just in case
5916
sleep 1
5917
@@ -2376,15 +2537,11 @@
5918
'
5919
case `pwd` in
5920
*[\\\"\#\$\&\'\`$am_lf]*)
5921
- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
5922
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
5923
- { (exit 1); exit 1; }; };;
5924
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
5925
esac
5926
case $srcdir in
5927
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
5928
- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
5929
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
5930
- { (exit 1); exit 1; }; };;
5931
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
5932
esac
5933
5934
# Do `set' in a subshell so we don't clobber the current shell's
5935
@@ -2406,11 +2563,8 @@
5936
# if, for instance, CONFIG_SHELL is bash and it inherits a
5937
# broken ls alias from the environment. This has actually
5938
# happened. Such a system could not be considered "sane".
5939
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
5940
-alias in your environment" >&5
5941
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
5942
-alias in your environment" >&2;}
5943
- { (exit 1); exit 1; }; }
5944
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
5945
+alias in your environment" "$LINENO" 5
5946
fi
5947
5948
test "$2" = conftest.file
5949
@@ -2419,13 +2573,10 @@
5950
# Ok.
5951
:
5952
else
5953
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
5954
-Check your system clock" >&5
5955
-$as_echo "$as_me: error: newly created file is older than distributed files!
5956
-Check your system clock" >&2;}
5957
- { (exit 1); exit 1; }; }
5958
+ as_fn_error $? "newly created file is older than distributed files!
5959
+Check your system clock" "$LINENO" 5
5960
fi
5961
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
5962
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5963
$as_echo "yes" >&6; }
5964
test "$program_prefix" != NONE &&
5965
program_transform_name="s&^&$program_prefix&;$program_transform_name"
5966
@@ -2453,7 +2604,7 @@
5967
am_missing_run="$MISSING --run "
5968
else
5969
am_missing_run=
5970
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
5971
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
5972
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
5973
fi
5974
5975
@@ -2474,9 +2625,9 @@
5976
if test -n "$ac_tool_prefix"; then
5977
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
5978
set dummy ${ac_tool_prefix}strip; ac_word=$2
5979
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5980
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5981
$as_echo_n "checking for $ac_word... " >&6; }
5982
-if test "${ac_cv_prog_STRIP+set}" = set; then
5983
+if ${ac_cv_prog_STRIP+:} false; then :
5984
$as_echo_n "(cached) " >&6
5985
else
5986
if test -n "$STRIP"; then
5987
@@ -2487,24 +2638,24 @@
5988
do
5989
IFS=$as_save_IFS
5990
test -z "$as_dir" && as_dir=.
5991
- for ac_exec_ext in '' $ac_executable_extensions; do
5992
+ for ac_exec_ext in '' $ac_executable_extensions; do
5993
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5994
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
5995
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5996
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5997
break 2
5998
fi
5999
done
6000
-done
6001
+ done
6002
IFS=$as_save_IFS
6003
6004
fi
6005
fi
6006
STRIP=$ac_cv_prog_STRIP
6007
if test -n "$STRIP"; then
6008
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
6009
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
6010
$as_echo "$STRIP" >&6; }
6011
else
6012
- { $as_echo "$as_me:$LINENO: result: no" >&5
6013
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6014
$as_echo "no" >&6; }
6015
fi
6016
6017
@@ -2514,9 +2665,9 @@
6018
ac_ct_STRIP=$STRIP
6019
# Extract the first word of "strip", so it can be a program name with args.
6020
set dummy strip; ac_word=$2
6021
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6022
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6023
$as_echo_n "checking for $ac_word... " >&6; }
6024
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
6025
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
6026
$as_echo_n "(cached) " >&6
6027
else
6028
if test -n "$ac_ct_STRIP"; then
6029
@@ -2527,24 +2678,24 @@
6030
do
6031
IFS=$as_save_IFS
6032
test -z "$as_dir" && as_dir=.
6033
- for ac_exec_ext in '' $ac_executable_extensions; do
6034
+ for ac_exec_ext in '' $ac_executable_extensions; do
6035
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6036
ac_cv_prog_ac_ct_STRIP="strip"
6037
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6038
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6039
break 2
6040
fi
6041
done
6042
-done
6043
+ done
6044
IFS=$as_save_IFS
6045
6046
fi
6047
fi
6048
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
6049
if test -n "$ac_ct_STRIP"; then
6050
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
6051
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
6052
$as_echo "$ac_ct_STRIP" >&6; }
6053
else
6054
- { $as_echo "$as_me:$LINENO: result: no" >&5
6055
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6056
$as_echo "no" >&6; }
6057
fi
6058
6059
@@ -2553,7 +2704,7 @@
6060
else
6061
case $cross_compiling:$ac_tool_warned in
6062
yes:)
6063
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
6064
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6065
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6066
ac_tool_warned=yes ;;
6067
esac
6068
@@ -2566,10 +2717,10 @@
6069
fi
6070
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
6071
6072
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
6073
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
6074
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
6075
if test -z "$MKDIR_P"; then
6076
- if test "${ac_cv_path_mkdir+set}" = set; then
6077
+ if ${ac_cv_path_mkdir+:} false; then :
6078
$as_echo_n "(cached) " >&6
6079
else
6080
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6081
@@ -2577,7 +2728,7 @@
6082
do
6083
IFS=$as_save_IFS
6084
test -z "$as_dir" && as_dir=.
6085
- for ac_prog in mkdir gmkdir; do
6086
+ for ac_prog in mkdir gmkdir; do
6087
for ac_exec_ext in '' $ac_executable_extensions; do
6088
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
6089
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
6090
@@ -2589,11 +2740,12 @@
6091
esac
6092
done
6093
done
6094
-done
6095
+ done
6096
IFS=$as_save_IFS
6097
6098
fi
6099
6100
+ test -d ./--version && rmdir ./--version
6101
if test "${ac_cv_path_mkdir+set}" = set; then
6102
MKDIR_P="$ac_cv_path_mkdir -p"
6103
else
6104
@@ -2601,11 +2753,10 @@
6105
# value for MKDIR_P within a source directory, because that will
6106
# break other packages using the cache if that directory is
6107
# removed, or if the value is a relative name.
6108
- test -d ./--version && rmdir ./--version
6109
MKDIR_P="$ac_install_sh -d"
6110
fi
6111
fi
6112
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
6113
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
6114
$as_echo "$MKDIR_P" >&6; }
6115
6116
mkdir_p="$MKDIR_P"
6117
@@ -2618,9 +2769,9 @@
6118
do
6119
# Extract the first word of "$ac_prog", so it can be a program name with args.
6120
set dummy $ac_prog; ac_word=$2
6121
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6122
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6123
$as_echo_n "checking for $ac_word... " >&6; }
6124
-if test "${ac_cv_prog_AWK+set}" = set; then
6125
+if ${ac_cv_prog_AWK+:} false; then :
6126
$as_echo_n "(cached) " >&6
6127
else
6128
if test -n "$AWK"; then
6129
@@ -2631,24 +2782,24 @@
6130
do
6131
IFS=$as_save_IFS
6132
test -z "$as_dir" && as_dir=.
6133
- for ac_exec_ext in '' $ac_executable_extensions; do
6134
+ for ac_exec_ext in '' $ac_executable_extensions; do
6135
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6136
ac_cv_prog_AWK="$ac_prog"
6137
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6138
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6139
break 2
6140
fi
6141
done
6142
-done
6143
+ done
6144
IFS=$as_save_IFS
6145
6146
fi
6147
fi
6148
AWK=$ac_cv_prog_AWK
6149
if test -n "$AWK"; then
6150
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
6151
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
6152
$as_echo "$AWK" >&6; }
6153
else
6154
- { $as_echo "$as_me:$LINENO: result: no" >&5
6155
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6156
$as_echo "no" >&6; }
6157
fi
6158
6159
@@ -2656,11 +2807,11 @@
6160
test -n "$AWK" && break
6161
done
6162
6163
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
6164
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
6165
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
6166
set x ${MAKE-make}
6167
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
6168
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
6169
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
6170
$as_echo_n "(cached) " >&6
6171
else
6172
cat >conftest.make <<\_ACEOF
6173
@@ -2668,7 +2819,7 @@
6174
all:
6175
@echo '@@@%%%=$(MAKE)=@@@%%%'
6176
_ACEOF
6177
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
6178
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
6179
case `${MAKE-make} -f conftest.make 2>/dev/null` in
6180
*@@@%%%=?*=@@@%%%*)
6181
eval ac_cv_prog_make_${ac_make}_set=yes;;
6182
@@ -2678,11 +2829,11 @@
6183
rm -f conftest.make
6184
fi
6185
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
6186
- { $as_echo "$as_me:$LINENO: result: yes" >&5
6187
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6188
$as_echo "yes" >&6; }
6189
SET_MAKE=
6190
else
6191
- { $as_echo "$as_me:$LINENO: result: no" >&5
6192
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6193
$as_echo "no" >&6; }
6194
SET_MAKE="MAKE=${MAKE-make}"
6195
fi
6196
@@ -2702,9 +2853,7 @@
6197
am__isrc=' -I$(srcdir)'
6198
# test to see if srcdir already configured
6199
if test -f $srcdir/config.status; then
6200
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
6201
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
6202
- { (exit 1); exit 1; }; }
6203
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
6204
fi
6205
fi
6206
6207
@@ -2764,7 +2913,7 @@
6208
6209
6210
# Check whether --enable-silent-rules was given.
6211
-if test "${enable_silent_rules+set}" = set; then
6212
+if test "${enable_silent_rules+set}" = set; then :
6213
enableval=$enable_silent_rules;
6214
fi
6215
6216
@@ -2777,16 +2926,16 @@
6217
6218
6219
6220
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
6221
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
6222
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
6223
# Check whether --enable-maintainer-mode was given.
6224
-if test "${enable_maintainer_mode+set}" = set; then
6225
+if test "${enable_maintainer_mode+set}" = set; then :
6226
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
6227
else
6228
USE_MAINTAINER_MODE=no
6229
fi
6230
6231
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
6232
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
6233
$as_echo "$USE_MAINTAINER_MODE" >&6; }
6234
if test $USE_MAINTAINER_MODE = yes; then
6235
MAINTAINER_MODE_TRUE=
6236
@@ -2802,13 +2951,18 @@
6237
6238
6239
6240
+
6241
+
6242
+
6243
+
6244
+
6245
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
6246
if test -n "$ac_tool_prefix"; then
6247
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
6248
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
6249
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6250
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6251
$as_echo_n "checking for $ac_word... " >&6; }
6252
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
6253
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
6254
$as_echo_n "(cached) " >&6
6255
else
6256
case $PKG_CONFIG in
6257
@@ -2821,14 +2975,14 @@
6258
do
6259
IFS=$as_save_IFS
6260
test -z "$as_dir" && as_dir=.
6261
- for ac_exec_ext in '' $ac_executable_extensions; do
6262
+ for ac_exec_ext in '' $ac_executable_extensions; do
6263
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6264
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
6265
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6266
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6267
break 2
6268
fi
6269
done
6270
-done
6271
+ done
6272
IFS=$as_save_IFS
6273
6274
;;
6275
@@ -2836,10 +2990,10 @@
6276
fi
6277
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
6278
if test -n "$PKG_CONFIG"; then
6279
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
6280
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
6281
$as_echo "$PKG_CONFIG" >&6; }
6282
else
6283
- { $as_echo "$as_me:$LINENO: result: no" >&5
6284
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6285
$as_echo "no" >&6; }
6286
fi
6287
6288
@@ -2849,9 +3003,9 @@
6289
ac_pt_PKG_CONFIG=$PKG_CONFIG
6290
# Extract the first word of "pkg-config", so it can be a program name with args.
6291
set dummy pkg-config; ac_word=$2
6292
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6293
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6294
$as_echo_n "checking for $ac_word... " >&6; }
6295
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
6296
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
6297
$as_echo_n "(cached) " >&6
6298
else
6299
case $ac_pt_PKG_CONFIG in
6300
@@ -2864,14 +3018,14 @@
6301
do
6302
IFS=$as_save_IFS
6303
test -z "$as_dir" && as_dir=.
6304
- for ac_exec_ext in '' $ac_executable_extensions; do
6305
+ for ac_exec_ext in '' $ac_executable_extensions; do
6306
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6307
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
6308
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6309
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6310
break 2
6311
fi
6312
done
6313
-done
6314
+ done
6315
IFS=$as_save_IFS
6316
6317
;;
6318
@@ -2879,10 +3033,10 @@
6319
fi
6320
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
6321
if test -n "$ac_pt_PKG_CONFIG"; then
6322
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
6323
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
6324
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
6325
else
6326
- { $as_echo "$as_me:$LINENO: result: no" >&5
6327
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6328
$as_echo "no" >&6; }
6329
fi
6330
6331
@@ -2891,7 +3045,7 @@
6332
else
6333
case $cross_compiling:$ac_tool_warned in
6334
yes:)
6335
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
6336
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6337
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6338
ac_tool_warned=yes ;;
6339
esac
6340
@@ -2904,17 +3058,16 @@
6341
fi
6342
if test -n "$PKG_CONFIG"; then
6343
_pkg_min_version=0.9.0
6344
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
6345
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
6346
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
6347
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
6348
- { $as_echo "$as_me:$LINENO: result: yes" >&5
6349
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6350
$as_echo "yes" >&6; }
6351
else
6352
- { $as_echo "$as_me:$LINENO: result: no" >&5
6353
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6354
$as_echo "no" >&6; }
6355
PKG_CONFIG=""
6356
fi
6357
-
6358
fi
6359
6360
6361
@@ -3016,9 +3169,9 @@
6362
if test -n "$ac_tool_prefix"; then
6363
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
6364
set dummy ${ac_tool_prefix}gcc; ac_word=$2
6365
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6366
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6367
$as_echo_n "checking for $ac_word... " >&6; }
6368
-if test "${ac_cv_prog_CC+set}" = set; then
6369
+if ${ac_cv_prog_CC+:} false; then :
6370
$as_echo_n "(cached) " >&6
6371
else
6372
if test -n "$CC"; then
6373
@@ -3029,24 +3182,24 @@
6374
do
6375
IFS=$as_save_IFS
6376
test -z "$as_dir" && as_dir=.
6377
- for ac_exec_ext in '' $ac_executable_extensions; do
6378
+ for ac_exec_ext in '' $ac_executable_extensions; do
6379
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6380
ac_cv_prog_CC="${ac_tool_prefix}gcc"
6381
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6382
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6383
break 2
6384
fi
6385
done
6386
-done
6387
+ done
6388
IFS=$as_save_IFS
6389
6390
fi
6391
fi
6392
CC=$ac_cv_prog_CC
6393
if test -n "$CC"; then
6394
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6395
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6396
$as_echo "$CC" >&6; }
6397
else
6398
- { $as_echo "$as_me:$LINENO: result: no" >&5
6399
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6400
$as_echo "no" >&6; }
6401
fi
6402
6403
@@ -3056,9 +3209,9 @@
6404
ac_ct_CC=$CC
6405
# Extract the first word of "gcc", so it can be a program name with args.
6406
set dummy gcc; ac_word=$2
6407
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6408
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6409
$as_echo_n "checking for $ac_word... " >&6; }
6410
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
6411
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
6412
$as_echo_n "(cached) " >&6
6413
else
6414
if test -n "$ac_ct_CC"; then
6415
@@ -3069,24 +3222,24 @@
6416
do
6417
IFS=$as_save_IFS
6418
test -z "$as_dir" && as_dir=.
6419
- for ac_exec_ext in '' $ac_executable_extensions; do
6420
+ for ac_exec_ext in '' $ac_executable_extensions; do
6421
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6422
ac_cv_prog_ac_ct_CC="gcc"
6423
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6424
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6425
break 2
6426
fi
6427
done
6428
-done
6429
+ done
6430
IFS=$as_save_IFS
6431
6432
fi
6433
fi
6434
ac_ct_CC=$ac_cv_prog_ac_ct_CC
6435
if test -n "$ac_ct_CC"; then
6436
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
6437
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
6438
$as_echo "$ac_ct_CC" >&6; }
6439
else
6440
- { $as_echo "$as_me:$LINENO: result: no" >&5
6441
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6442
$as_echo "no" >&6; }
6443
fi
6444
6445
@@ -3095,7 +3248,7 @@
6446
else
6447
case $cross_compiling:$ac_tool_warned in
6448
yes:)
6449
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
6450
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6451
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6452
ac_tool_warned=yes ;;
6453
esac
6454
@@ -3109,9 +3262,9 @@
6455
if test -n "$ac_tool_prefix"; then
6456
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
6457
set dummy ${ac_tool_prefix}cc; ac_word=$2
6458
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6459
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6460
$as_echo_n "checking for $ac_word... " >&6; }
6461
-if test "${ac_cv_prog_CC+set}" = set; then
6462
+if ${ac_cv_prog_CC+:} false; then :
6463
$as_echo_n "(cached) " >&6
6464
else
6465
if test -n "$CC"; then
6466
@@ -3122,24 +3275,24 @@
6467
do
6468
IFS=$as_save_IFS
6469
test -z "$as_dir" && as_dir=.
6470
- for ac_exec_ext in '' $ac_executable_extensions; do
6471
+ for ac_exec_ext in '' $ac_executable_extensions; do
6472
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6473
ac_cv_prog_CC="${ac_tool_prefix}cc"
6474
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6475
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6476
break 2
6477
fi
6478
done
6479
-done
6480
+ done
6481
IFS=$as_save_IFS
6482
6483
fi
6484
fi
6485
CC=$ac_cv_prog_CC
6486
if test -n "$CC"; then
6487
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6488
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6489
$as_echo "$CC" >&6; }
6490
else
6491
- { $as_echo "$as_me:$LINENO: result: no" >&5
6492
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6493
$as_echo "no" >&6; }
6494
fi
6495
6496
@@ -3149,9 +3302,9 @@
6497
if test -z "$CC"; then
6498
# Extract the first word of "cc", so it can be a program name with args.
6499
set dummy cc; ac_word=$2
6500
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6501
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6502
$as_echo_n "checking for $ac_word... " >&6; }
6503
-if test "${ac_cv_prog_CC+set}" = set; then
6504
+if ${ac_cv_prog_CC+:} false; then :
6505
$as_echo_n "(cached) " >&6
6506
else
6507
if test -n "$CC"; then
6508
@@ -3163,18 +3316,18 @@
6509
do
6510
IFS=$as_save_IFS
6511
test -z "$as_dir" && as_dir=.
6512
- for ac_exec_ext in '' $ac_executable_extensions; do
6513
+ for ac_exec_ext in '' $ac_executable_extensions; do
6514
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6515
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
6516
ac_prog_rejected=yes
6517
continue
6518
fi
6519
ac_cv_prog_CC="cc"
6520
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6521
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6522
break 2
6523
fi
6524
done
6525
-done
6526
+ done
6527
IFS=$as_save_IFS
6528
6529
if test $ac_prog_rejected = yes; then
6530
@@ -3193,10 +3346,10 @@
6531
fi
6532
CC=$ac_cv_prog_CC
6533
if test -n "$CC"; then
6534
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6535
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6536
$as_echo "$CC" >&6; }
6537
else
6538
- { $as_echo "$as_me:$LINENO: result: no" >&5
6539
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6540
$as_echo "no" >&6; }
6541
fi
6542
6543
@@ -3208,9 +3361,9 @@
6544
do
6545
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6546
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6547
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6548
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6549
$as_echo_n "checking for $ac_word... " >&6; }
6550
-if test "${ac_cv_prog_CC+set}" = set; then
6551
+if ${ac_cv_prog_CC+:} false; then :
6552
$as_echo_n "(cached) " >&6
6553
else
6554
if test -n "$CC"; then
6555
@@ -3221,24 +3374,24 @@
6556
do
6557
IFS=$as_save_IFS
6558
test -z "$as_dir" && as_dir=.
6559
- for ac_exec_ext in '' $ac_executable_extensions; do
6560
+ for ac_exec_ext in '' $ac_executable_extensions; do
6561
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6562
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
6563
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6564
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6565
break 2
6566
fi
6567
done
6568
-done
6569
+ done
6570
IFS=$as_save_IFS
6571
6572
fi
6573
fi
6574
CC=$ac_cv_prog_CC
6575
if test -n "$CC"; then
6576
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6577
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6578
$as_echo "$CC" >&6; }
6579
else
6580
- { $as_echo "$as_me:$LINENO: result: no" >&5
6581
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6582
$as_echo "no" >&6; }
6583
fi
6584
6585
@@ -3252,9 +3405,9 @@
6586
do
6587
# Extract the first word of "$ac_prog", so it can be a program name with args.
6588
set dummy $ac_prog; ac_word=$2
6589
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6590
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6591
$as_echo_n "checking for $ac_word... " >&6; }
6592
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
6593
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
6594
$as_echo_n "(cached) " >&6
6595
else
6596
if test -n "$ac_ct_CC"; then
6597
@@ -3265,24 +3418,24 @@
6598
do
6599
IFS=$as_save_IFS
6600
test -z "$as_dir" && as_dir=.
6601
- for ac_exec_ext in '' $ac_executable_extensions; do
6602
+ for ac_exec_ext in '' $ac_executable_extensions; do
6603
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6604
ac_cv_prog_ac_ct_CC="$ac_prog"
6605
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6606
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6607
break 2
6608
fi
6609
done
6610
-done
6611
+ done
6612
IFS=$as_save_IFS
6613
6614
fi
6615
fi
6616
ac_ct_CC=$ac_cv_prog_ac_ct_CC
6617
if test -n "$ac_ct_CC"; then
6618
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
6619
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
6620
$as_echo "$ac_ct_CC" >&6; }
6621
else
6622
- { $as_echo "$as_me:$LINENO: result: no" >&5
6623
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6624
$as_echo "no" >&6; }
6625
fi
6626
6627
@@ -3295,7 +3448,7 @@
6628
else
6629
case $cross_compiling:$ac_tool_warned in
6630
yes:)
6631
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
6632
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6633
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6634
ac_tool_warned=yes ;;
6635
esac
6636
@@ -3306,57 +3459,37 @@
6637
fi
6638
6639
6640
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
6641
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6642
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6643
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
6644
-See \`config.log' for more details." >&5
6645
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
6646
-See \`config.log' for more details." >&2;}
6647
- { (exit 1); exit 1; }; }; }
6648
+as_fn_error $? "no acceptable C compiler found in \$PATH
6649
+See \`config.log' for more details" "$LINENO" 5; }
6650
6651
# Provide some information about the compiler.
6652
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
6653
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
6654
set X $ac_compile
6655
ac_compiler=$2
6656
-{ (ac_try="$ac_compiler --version >&5"
6657
-case "(($ac_try" in
6658
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6659
- *) ac_try_echo=$ac_try;;
6660
-esac
6661
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6662
-$as_echo "$ac_try_echo") >&5
6663
- (eval "$ac_compiler --version >&5") 2>&5
6664
- ac_status=$?
6665
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6666
- (exit $ac_status); }
6667
-{ (ac_try="$ac_compiler -v >&5"
6668
-case "(($ac_try" in
6669
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6670
- *) ac_try_echo=$ac_try;;
6671
-esac
6672
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6673
-$as_echo "$ac_try_echo") >&5
6674
- (eval "$ac_compiler -v >&5") 2>&5
6675
- ac_status=$?
6676
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6677
- (exit $ac_status); }
6678
-{ (ac_try="$ac_compiler -V >&5"
6679
+for ac_option in --version -v -V -qversion; do
6680
+ { { ac_try="$ac_compiler $ac_option >&5"
6681
case "(($ac_try" in
6682
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6683
*) ac_try_echo=$ac_try;;
6684
esac
6685
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6686
-$as_echo "$ac_try_echo") >&5
6687
- (eval "$ac_compiler -V >&5") 2>&5
6688
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
6689
+$as_echo "$ac_try_echo"; } >&5
6690
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
6691
ac_status=$?
6692
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6693
- (exit $ac_status); }
6694
+ if test -s conftest.err; then
6695
+ sed '10a\
6696
+... rest of stderr output deleted ...
6697
+ 10q' conftest.err >conftest.er1
6698
+ cat conftest.er1 >&5
6699
+ fi
6700
+ rm -f conftest.er1 conftest.err
6701
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6702
+ test $ac_status = 0; }
6703
+done
6704
6705
-cat >conftest.$ac_ext <<_ACEOF
6706
-/* confdefs.h. */
6707
-_ACEOF
6708
-cat confdefs.h >>conftest.$ac_ext
6709
-cat >>conftest.$ac_ext <<_ACEOF
6710
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6711
/* end confdefs.h. */
6712
6713
int
6714
@@ -3372,8 +3505,8 @@
6715
# Try to create an executable without -o first, disregard a.out.
6716
# It will help us diagnose broken compilers, and finding out an intuition
6717
# of exeext.
6718
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
6719
-$as_echo_n "checking for C compiler default output file name... " >&6; }
6720
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
6721
+$as_echo_n "checking whether the C compiler works... " >&6; }
6722
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
6723
6724
# The possible output files:
6725
@@ -3389,17 +3522,17 @@
6726
done
6727
rm -f $ac_rmfiles
6728
6729
-if { (ac_try="$ac_link_default"
6730
+if { { ac_try="$ac_link_default"
6731
case "(($ac_try" in
6732
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6733
*) ac_try_echo=$ac_try;;
6734
esac
6735
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6736
-$as_echo "$ac_try_echo") >&5
6737
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
6738
+$as_echo "$ac_try_echo"; } >&5
6739
(eval "$ac_link_default") 2>&5
6740
ac_status=$?
6741
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6742
- (exit $ac_status); }; then
6743
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6744
+ test $ac_status = 0; }; then :
6745
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
6746
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
6747
# in a Makefile. We should not override ac_cv_exeext if it was cached,
6748
@@ -3416,7 +3549,7 @@
6749
# certainly right.
6750
break;;
6751
*.* )
6752
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
6753
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
6754
then :; else
6755
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
6756
fi
6757
@@ -3435,84 +3568,41 @@
6758
else
6759
ac_file=''
6760
fi
6761
-
6762
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
6763
-$as_echo "$ac_file" >&6; }
6764
-if test -z "$ac_file"; then
6765
- $as_echo "$as_me: failed program was:" >&5
6766
+if test -z "$ac_file"; then :
6767
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6768
+$as_echo "no" >&6; }
6769
+$as_echo "$as_me: failed program was:" >&5
6770
sed 's/^/| /' conftest.$ac_ext >&5
6771
6772
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
6773
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6774
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6775
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
6776
-See \`config.log' for more details." >&5
6777
-$as_echo "$as_me: error: C compiler cannot create executables
6778
-See \`config.log' for more details." >&2;}
6779
- { (exit 77); exit 77; }; }; }
6780
+as_fn_error 77 "C compiler cannot create executables
6781
+See \`config.log' for more details" "$LINENO" 5; }
6782
+else
6783
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6784
+$as_echo "yes" >&6; }
6785
fi
6786
-
6787
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
6788
+$as_echo_n "checking for C compiler default output file name... " >&6; }
6789
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
6790
+$as_echo "$ac_file" >&6; }
6791
ac_exeext=$ac_cv_exeext
6792
6793
-# Check that the compiler produces executables we can run. If not, either
6794
-# the compiler is broken, or we cross compile.
6795
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
6796
-$as_echo_n "checking whether the C compiler works... " >&6; }
6797
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
6798
-# If not cross compiling, check that we can run a simple program.
6799
-if test "$cross_compiling" != yes; then
6800
- if { ac_try='./$ac_file'
6801
- { (case "(($ac_try" in
6802
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6803
- *) ac_try_echo=$ac_try;;
6804
-esac
6805
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6806
-$as_echo "$ac_try_echo") >&5
6807
- (eval "$ac_try") 2>&5
6808
- ac_status=$?
6809
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6810
- (exit $ac_status); }; }; then
6811
- cross_compiling=no
6812
- else
6813
- if test "$cross_compiling" = maybe; then
6814
- cross_compiling=yes
6815
- else
6816
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
6817
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6818
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
6819
-If you meant to cross compile, use \`--host'.
6820
-See \`config.log' for more details." >&5
6821
-$as_echo "$as_me: error: cannot run C compiled programs.
6822
-If you meant to cross compile, use \`--host'.
6823
-See \`config.log' for more details." >&2;}
6824
- { (exit 1); exit 1; }; }; }
6825
- fi
6826
- fi
6827
-fi
6828
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
6829
-$as_echo "yes" >&6; }
6830
-
6831
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
6832
ac_clean_files=$ac_clean_files_save
6833
-# Check that the compiler produces executables we can run. If not, either
6834
-# the compiler is broken, or we cross compile.
6835
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
6836
-$as_echo_n "checking whether we are cross compiling... " >&6; }
6837
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
6838
-$as_echo "$cross_compiling" >&6; }
6839
-
6840
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
6841
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
6842
$as_echo_n "checking for suffix of executables... " >&6; }
6843
-if { (ac_try="$ac_link"
6844
+if { { ac_try="$ac_link"
6845
case "(($ac_try" in
6846
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6847
*) ac_try_echo=$ac_try;;
6848
esac
6849
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6850
-$as_echo "$ac_try_echo") >&5
6851
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
6852
+$as_echo "$ac_try_echo"; } >&5
6853
(eval "$ac_link") 2>&5
6854
ac_status=$?
6855
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6856
- (exit $ac_status); }; then
6857
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6858
+ test $ac_status = 0; }; then :
6859
# If both `conftest.exe' and `conftest' are `present' (well, observable)
6860
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
6861
# work properly (i.e., refer to `conftest.exe'), while it won't with
6862
@@ -3527,32 +3617,83 @@
6863
esac
6864
done
6865
else
6866
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
6867
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6868
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6869
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
6870
-See \`config.log' for more details." >&5
6871
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
6872
-See \`config.log' for more details." >&2;}
6873
- { (exit 1); exit 1; }; }; }
6874
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
6875
+See \`config.log' for more details" "$LINENO" 5; }
6876
fi
6877
-
6878
-rm -f conftest$ac_cv_exeext
6879
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
6880
+rm -f conftest conftest$ac_cv_exeext
6881
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
6882
$as_echo "$ac_cv_exeext" >&6; }
6883
6884
rm -f conftest.$ac_ext
6885
EXEEXT=$ac_cv_exeext
6886
ac_exeext=$EXEEXT
6887
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
6888
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6889
+/* end confdefs.h. */
6890
+#include <stdio.h>
6891
+int
6892
+main ()
6893
+{
6894
+FILE *f = fopen ("conftest.out", "w");
6895
+ return ferror (f) || fclose (f) != 0;
6896
+
6897
+ ;
6898
+ return 0;
6899
+}
6900
+_ACEOF
6901
+ac_clean_files="$ac_clean_files conftest.out"
6902
+# Check that the compiler produces executables we can run. If not, either
6903
+# the compiler is broken, or we cross compile.
6904
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
6905
+$as_echo_n "checking whether we are cross compiling... " >&6; }
6906
+if test "$cross_compiling" != yes; then
6907
+ { { ac_try="$ac_link"
6908
+case "(($ac_try" in
6909
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6910
+ *) ac_try_echo=$ac_try;;
6911
+esac
6912
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
6913
+$as_echo "$ac_try_echo"; } >&5
6914
+ (eval "$ac_link") 2>&5
6915
+ ac_status=$?
6916
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6917
+ test $ac_status = 0; }
6918
+ if { ac_try='./conftest$ac_cv_exeext'
6919
+ { { case "(($ac_try" in
6920
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6921
+ *) ac_try_echo=$ac_try;;
6922
+esac
6923
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
6924
+$as_echo "$ac_try_echo"; } >&5
6925
+ (eval "$ac_try") 2>&5
6926
+ ac_status=$?
6927
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6928
+ test $ac_status = 0; }; }; then
6929
+ cross_compiling=no
6930
+ else
6931
+ if test "$cross_compiling" = maybe; then
6932
+ cross_compiling=yes
6933
+ else
6934
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6935
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6936
+as_fn_error $? "cannot run C compiled programs.
6937
+If you meant to cross compile, use \`--host'.
6938
+See \`config.log' for more details" "$LINENO" 5; }
6939
+ fi
6940
+ fi
6941
+fi
6942
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
6943
+$as_echo "$cross_compiling" >&6; }
6944
+
6945
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
6946
+ac_clean_files=$ac_clean_files_save
6947
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
6948
$as_echo_n "checking for suffix of object files... " >&6; }
6949
-if test "${ac_cv_objext+set}" = set; then
6950
+if ${ac_cv_objext+:} false; then :
6951
$as_echo_n "(cached) " >&6
6952
else
6953
- cat >conftest.$ac_ext <<_ACEOF
6954
-/* confdefs.h. */
6955
-_ACEOF
6956
-cat confdefs.h >>conftest.$ac_ext
6957
-cat >>conftest.$ac_ext <<_ACEOF
6958
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6959
/* end confdefs.h. */
6960
6961
int
6962
@@ -3564,17 +3705,17 @@
6963
}
6964
_ACEOF
6965
rm -f conftest.o conftest.obj
6966
-if { (ac_try="$ac_compile"
6967
+if { { ac_try="$ac_compile"
6968
case "(($ac_try" in
6969
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6970
*) ac_try_echo=$ac_try;;
6971
esac
6972
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6973
-$as_echo "$ac_try_echo") >&5
6974
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
6975
+$as_echo "$ac_try_echo"; } >&5
6976
(eval "$ac_compile") 2>&5
6977
ac_status=$?
6978
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6979
- (exit $ac_status); }; then
6980
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6981
+ test $ac_status = 0; }; then :
6982
for ac_file in conftest.o conftest.obj conftest.*; do
6983
test -f "$ac_file" || continue;
6984
case $ac_file in
6985
@@ -3587,31 +3728,23 @@
6986
$as_echo "$as_me: failed program was:" >&5
6987
sed 's/^/| /' conftest.$ac_ext >&5
6988
6989
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
6990
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6991
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6992
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
6993
-See \`config.log' for more details." >&5
6994
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
6995
-See \`config.log' for more details." >&2;}
6996
- { (exit 1); exit 1; }; }; }
6997
+as_fn_error $? "cannot compute suffix of object files: cannot compile
6998
+See \`config.log' for more details" "$LINENO" 5; }
6999
fi
7000
-
7001
rm -f conftest.$ac_cv_objext conftest.$ac_ext
7002
fi
7003
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
7004
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
7005
$as_echo "$ac_cv_objext" >&6; }
7006
OBJEXT=$ac_cv_objext
7007
ac_objext=$OBJEXT
7008
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
7009
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
7010
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
7011
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
7012
+if ${ac_cv_c_compiler_gnu+:} false; then :
7013
$as_echo_n "(cached) " >&6
7014
else
7015
- cat >conftest.$ac_ext <<_ACEOF
7016
-/* confdefs.h. */
7017
-_ACEOF
7018
-cat confdefs.h >>conftest.$ac_ext
7019
-cat >>conftest.$ac_ext <<_ACEOF
7020
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7021
/* end confdefs.h. */
7022
7023
int
7024
@@ -3625,37 +3758,16 @@
7025
return 0;
7026
}
7027
_ACEOF
7028
-rm -f conftest.$ac_objext
7029
-if { (ac_try="$ac_compile"
7030
-case "(($ac_try" in
7031
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7032
- *) ac_try_echo=$ac_try;;
7033
-esac
7034
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7035
-$as_echo "$ac_try_echo") >&5
7036
- (eval "$ac_compile") 2>conftest.er1
7037
- ac_status=$?
7038
- grep -v '^ *+' conftest.er1 >conftest.err
7039
- rm -f conftest.er1
7040
- cat conftest.err >&5
7041
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7042
- (exit $ac_status); } && {
7043
- test -z "$ac_c_werror_flag" ||
7044
- test ! -s conftest.err
7045
- } && test -s conftest.$ac_objext; then
7046
+if ac_fn_c_try_compile "$LINENO"; then :
7047
ac_compiler_gnu=yes
7048
else
7049
- $as_echo "$as_me: failed program was:" >&5
7050
-sed 's/^/| /' conftest.$ac_ext >&5
7051
-
7052
- ac_compiler_gnu=no
7053
+ ac_compiler_gnu=no
7054
fi
7055
-
7056
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7057
ac_cv_c_compiler_gnu=$ac_compiler_gnu
7058
7059
fi
7060
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
7061
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
7062
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
7063
if test $ac_compiler_gnu = yes; then
7064
GCC=yes
7065
@@ -3664,20 +3776,16 @@
7066
fi
7067
ac_test_CFLAGS=${CFLAGS+set}
7068
ac_save_CFLAGS=$CFLAGS
7069
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
7070
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
7071
$as_echo_n "checking whether $CC accepts -g... " >&6; }
7072
-if test "${ac_cv_prog_cc_g+set}" = set; then
7073
+if ${ac_cv_prog_cc_g+:} false; then :
7074
$as_echo_n "(cached) " >&6
7075
else
7076
ac_save_c_werror_flag=$ac_c_werror_flag
7077
ac_c_werror_flag=yes
7078
ac_cv_prog_cc_g=no
7079
CFLAGS="-g"
7080
- cat >conftest.$ac_ext <<_ACEOF
7081
-/* confdefs.h. */
7082
-_ACEOF
7083
-cat confdefs.h >>conftest.$ac_ext
7084
-cat >>conftest.$ac_ext <<_ACEOF
7085
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7086
/* end confdefs.h. */
7087
7088
int
7089
@@ -3688,35 +3796,11 @@
7090
return 0;
7091
}
7092
_ACEOF
7093
-rm -f conftest.$ac_objext
7094
-if { (ac_try="$ac_compile"
7095
-case "(($ac_try" in
7096
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7097
- *) ac_try_echo=$ac_try;;
7098
-esac
7099
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7100
-$as_echo "$ac_try_echo") >&5
7101
- (eval "$ac_compile") 2>conftest.er1
7102
- ac_status=$?
7103
- grep -v '^ *+' conftest.er1 >conftest.err
7104
- rm -f conftest.er1
7105
- cat conftest.err >&5
7106
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7107
- (exit $ac_status); } && {
7108
- test -z "$ac_c_werror_flag" ||
7109
- test ! -s conftest.err
7110
- } && test -s conftest.$ac_objext; then
7111
+if ac_fn_c_try_compile "$LINENO"; then :
7112
ac_cv_prog_cc_g=yes
7113
else
7114
- $as_echo "$as_me: failed program was:" >&5
7115
-sed 's/^/| /' conftest.$ac_ext >&5
7116
-
7117
- CFLAGS=""
7118
- cat >conftest.$ac_ext <<_ACEOF
7119
-/* confdefs.h. */
7120
-_ACEOF
7121
-cat confdefs.h >>conftest.$ac_ext
7122
-cat >>conftest.$ac_ext <<_ACEOF
7123
+ CFLAGS=""
7124
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7125
/* end confdefs.h. */
7126
7127
int
7128
@@ -3727,36 +3811,12 @@
7129
return 0;
7130
}
7131
_ACEOF
7132
-rm -f conftest.$ac_objext
7133
-if { (ac_try="$ac_compile"
7134
-case "(($ac_try" in
7135
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7136
- *) ac_try_echo=$ac_try;;
7137
-esac
7138
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7139
-$as_echo "$ac_try_echo") >&5
7140
- (eval "$ac_compile") 2>conftest.er1
7141
- ac_status=$?
7142
- grep -v '^ *+' conftest.er1 >conftest.err
7143
- rm -f conftest.er1
7144
- cat conftest.err >&5
7145
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7146
- (exit $ac_status); } && {
7147
- test -z "$ac_c_werror_flag" ||
7148
- test ! -s conftest.err
7149
- } && test -s conftest.$ac_objext; then
7150
- :
7151
-else
7152
- $as_echo "$as_me: failed program was:" >&5
7153
-sed 's/^/| /' conftest.$ac_ext >&5
7154
+if ac_fn_c_try_compile "$LINENO"; then :
7155
7156
- ac_c_werror_flag=$ac_save_c_werror_flag
7157
+else
7158
+ ac_c_werror_flag=$ac_save_c_werror_flag
7159
CFLAGS="-g"
7160
- cat >conftest.$ac_ext <<_ACEOF
7161
-/* confdefs.h. */
7162
-_ACEOF
7163
-cat confdefs.h >>conftest.$ac_ext
7164
-cat >>conftest.$ac_ext <<_ACEOF
7165
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7166
/* end confdefs.h. */
7167
7168
int
7169
@@ -3767,42 +3827,17 @@
7170
return 0;
7171
}
7172
_ACEOF
7173
-rm -f conftest.$ac_objext
7174
-if { (ac_try="$ac_compile"
7175
-case "(($ac_try" in
7176
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7177
- *) ac_try_echo=$ac_try;;
7178
-esac
7179
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7180
-$as_echo "$ac_try_echo") >&5
7181
- (eval "$ac_compile") 2>conftest.er1
7182
- ac_status=$?
7183
- grep -v '^ *+' conftest.er1 >conftest.err
7184
- rm -f conftest.er1
7185
- cat conftest.err >&5
7186
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7187
- (exit $ac_status); } && {
7188
- test -z "$ac_c_werror_flag" ||
7189
- test ! -s conftest.err
7190
- } && test -s conftest.$ac_objext; then
7191
+if ac_fn_c_try_compile "$LINENO"; then :
7192
ac_cv_prog_cc_g=yes
7193
-else
7194
- $as_echo "$as_me: failed program was:" >&5
7195
-sed 's/^/| /' conftest.$ac_ext >&5
7196
-
7197
-
7198
fi
7199
-
7200
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7201
fi
7202
-
7203
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7204
fi
7205
-
7206
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7207
ac_c_werror_flag=$ac_save_c_werror_flag
7208
fi
7209
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
7210
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
7211
$as_echo "$ac_cv_prog_cc_g" >&6; }
7212
if test "$ac_test_CFLAGS" = set; then
7213
CFLAGS=$ac_save_CFLAGS
7214
@@ -3819,18 +3854,14 @@
7215
CFLAGS=
7216
fi
7217
fi
7218
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
7219
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
7220
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
7221
-if test "${ac_cv_prog_cc_c89+set}" = set; then
7222
+if ${ac_cv_prog_cc_c89+:} false; then :
7223
$as_echo_n "(cached) " >&6
7224
else
7225
ac_cv_prog_cc_c89=no
7226
ac_save_CC=$CC
7227
-cat >conftest.$ac_ext <<_ACEOF
7228
-/* confdefs.h. */
7229
-_ACEOF
7230
-cat confdefs.h >>conftest.$ac_ext
7231
-cat >>conftest.$ac_ext <<_ACEOF
7232
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7233
/* end confdefs.h. */
7234
#include <stdarg.h>
7235
#include <stdio.h>
7236
@@ -3887,32 +3918,9 @@
7237
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7238
do
7239
CC="$ac_save_CC $ac_arg"
7240
- rm -f conftest.$ac_objext
7241
-if { (ac_try="$ac_compile"
7242
-case "(($ac_try" in
7243
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7244
- *) ac_try_echo=$ac_try;;
7245
-esac
7246
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7247
-$as_echo "$ac_try_echo") >&5
7248
- (eval "$ac_compile") 2>conftest.er1
7249
- ac_status=$?
7250
- grep -v '^ *+' conftest.er1 >conftest.err
7251
- rm -f conftest.er1
7252
- cat conftest.err >&5
7253
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7254
- (exit $ac_status); } && {
7255
- test -z "$ac_c_werror_flag" ||
7256
- test ! -s conftest.err
7257
- } && test -s conftest.$ac_objext; then
7258
+ if ac_fn_c_try_compile "$LINENO"; then :
7259
ac_cv_prog_cc_c89=$ac_arg
7260
-else
7261
- $as_echo "$as_me: failed program was:" >&5
7262
-sed 's/^/| /' conftest.$ac_ext >&5
7263
-
7264
-
7265
fi
7266
-
7267
rm -f core conftest.err conftest.$ac_objext
7268
test "x$ac_cv_prog_cc_c89" != "xno" && break
7269
done
7270
@@ -3923,17 +3931,19 @@
7271
# AC_CACHE_VAL
7272
case "x$ac_cv_prog_cc_c89" in
7273
x)
7274
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
7275
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
7276
$as_echo "none needed" >&6; } ;;
7277
xno)
7278
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
7279
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
7280
$as_echo "unsupported" >&6; } ;;
7281
*)
7282
CC="$CC $ac_cv_prog_cc_c89"
7283
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
7284
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
7285
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
7286
esac
7287
+if test "x$ac_cv_prog_cc_c89" != xno; then :
7288
7289
+fi
7290
7291
ac_ext=c
7292
ac_cpp='$CPP $CPPFLAGS'
7293
@@ -3952,7 +3962,7 @@
7294
.PHONY: am__doit
7295
END
7296
# If we don't find an include directive, just comment out the code.
7297
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
7298
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
7299
$as_echo_n "checking for style of include used by $am_make... " >&6; }
7300
am__include="#"
7301
am__quote=
7302
@@ -3980,12 +3990,12 @@
7303
fi
7304
7305
7306
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
7307
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
7308
$as_echo "$_am_result" >&6; }
7309
rm -f confinc confmf
7310
7311
# Check whether --enable-dependency-tracking was given.
7312
-if test "${enable_dependency_tracking+set}" = set; then
7313
+if test "${enable_dependency_tracking+set}" = set; then :
7314
enableval=$enable_dependency_tracking;
7315
fi
7316
7317
@@ -4005,9 +4015,9 @@
7318
7319
depcc="$CC" am_compiler_list=
7320
7321
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
7322
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
7323
$as_echo_n "checking dependency style of $depcc... " >&6; }
7324
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
7325
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
7326
$as_echo_n "(cached) " >&6
7327
else
7328
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
7329
@@ -4115,7 +4125,7 @@
7330
fi
7331
7332
fi
7333
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
7334
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
7335
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
7336
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
7337
7338
@@ -4131,22 +4141,18 @@
7339
7340
7341
if test "x$CC" != xcc; then
7342
- { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
7343
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
7344
$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
7345
else
7346
- { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
7347
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
7348
$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
7349
fi
7350
set dummy $CC; ac_cc=`$as_echo "$2" |
7351
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
7352
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
7353
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
7354
$as_echo_n "(cached) " >&6
7355
else
7356
- cat >conftest.$ac_ext <<_ACEOF
7357
-/* confdefs.h. */
7358
-_ACEOF
7359
-cat confdefs.h >>conftest.$ac_ext
7360
-cat >>conftest.$ac_ext <<_ACEOF
7361
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7362
/* end confdefs.h. */
7363
7364
int
7365
@@ -4162,63 +4168,63 @@
7366
# existing .o file with -o, though they will create one.
7367
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
7368
rm -f conftest2.*
7369
-if { (case "(($ac_try" in
7370
+if { { case "(($ac_try" in
7371
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7372
*) ac_try_echo=$ac_try;;
7373
esac
7374
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7375
-$as_echo "$ac_try_echo") >&5
7376
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7377
+$as_echo "$ac_try_echo"; } >&5
7378
(eval "$ac_try") 2>&5
7379
ac_status=$?
7380
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7381
- (exit $ac_status); } &&
7382
- test -f conftest2.$ac_objext && { (case "(($ac_try" in
7383
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7384
+ test $ac_status = 0; } &&
7385
+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
7386
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7387
*) ac_try_echo=$ac_try;;
7388
esac
7389
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7390
-$as_echo "$ac_try_echo") >&5
7391
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7392
+$as_echo "$ac_try_echo"; } >&5
7393
(eval "$ac_try") 2>&5
7394
ac_status=$?
7395
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7396
- (exit $ac_status); };
7397
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7398
+ test $ac_status = 0; };
7399
then
7400
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
7401
if test "x$CC" != xcc; then
7402
# Test first that cc exists at all.
7403
if { ac_try='cc -c conftest.$ac_ext >&5'
7404
- { (case "(($ac_try" in
7405
+ { { case "(($ac_try" in
7406
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7407
*) ac_try_echo=$ac_try;;
7408
esac
7409
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7410
-$as_echo "$ac_try_echo") >&5
7411
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7412
+$as_echo "$ac_try_echo"; } >&5
7413
(eval "$ac_try") 2>&5
7414
ac_status=$?
7415
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7416
- (exit $ac_status); }; }; then
7417
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7418
+ test $ac_status = 0; }; }; then
7419
ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
7420
rm -f conftest2.*
7421
- if { (case "(($ac_try" in
7422
+ if { { case "(($ac_try" in
7423
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7424
*) ac_try_echo=$ac_try;;
7425
esac
7426
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7427
-$as_echo "$ac_try_echo") >&5
7428
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7429
+$as_echo "$ac_try_echo"; } >&5
7430
(eval "$ac_try") 2>&5
7431
ac_status=$?
7432
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7433
- (exit $ac_status); } &&
7434
- test -f conftest2.$ac_objext && { (case "(($ac_try" in
7435
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7436
+ test $ac_status = 0; } &&
7437
+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
7438
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7439
*) ac_try_echo=$ac_try;;
7440
esac
7441
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7442
-$as_echo "$ac_try_echo") >&5
7443
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7444
+$as_echo "$ac_try_echo"; } >&5
7445
(eval "$ac_try") 2>&5
7446
ac_status=$?
7447
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7448
- (exit $ac_status); };
7449
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7450
+ test $ac_status = 0; };
7451
then
7452
# cc works too.
7453
:
7454
@@ -4235,15 +4241,13 @@
7455
7456
fi
7457
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
7458
- { $as_echo "$as_me:$LINENO: result: yes" >&5
7459
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7460
$as_echo "yes" >&6; }
7461
else
7462
- { $as_echo "$as_me:$LINENO: result: no" >&5
7463
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7464
$as_echo "no" >&6; }
7465
7466
-cat >>confdefs.h <<\_ACEOF
7467
-#define NO_MINUS_C_MINUS_O 1
7468
-_ACEOF
7469
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
7470
7471
fi
7472
7473
@@ -4263,9 +4267,9 @@
7474
7475
7476
7477
- { $as_echo "$as_me:$LINENO: checking whether ${CC-cc} accepts -fPIE" >&5
7478
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -fPIE" >&5
7479
$as_echo_n "checking whether ${CC-cc} accepts -fPIE... " >&6; }
7480
-if test "${ac_cv_prog_cc_pie+set}" = set; then
7481
+if ${ac_cv_prog_cc_pie+:} false; then :
7482
$as_echo_n "(cached) " >&6
7483
else
7484
7485
@@ -4278,109 +4282,17 @@
7486
rm -rf conftest*
7487
7488
fi
7489
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_pie" >&5
7490
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_pie" >&5
7491
$as_echo "$ac_cv_prog_cc_pie" >&6; }
7492
7493
-# Find a good install program. We prefer a C program (faster),
7494
-# so one script is as good as another. But avoid the broken or
7495
-# incompatible versions:
7496
-# SysV /etc/install, /usr/sbin/install
7497
-# SunOS /usr/etc/install
7498
-# IRIX /sbin/install
7499
-# AIX /bin/install
7500
-# AmigaOS /C/install, which installs bootblocks on floppy discs
7501
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
7502
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
7503
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
7504
-# OS/2's system install, which has a completely different semantic
7505
-# ./install, which can be erroneously created by make from ./install.sh.
7506
-# Reject install programs that cannot install multiple files.
7507
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
7508
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
7509
-if test -z "$INSTALL"; then
7510
-if test "${ac_cv_path_install+set}" = set; then
7511
- $as_echo_n "(cached) " >&6
7512
-else
7513
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7514
-for as_dir in $PATH
7515
-do
7516
- IFS=$as_save_IFS
7517
- test -z "$as_dir" && as_dir=.
7518
- # Account for people who put trailing slashes in PATH elements.
7519
-case $as_dir/ in
7520
- ./ | .// | /cC/* | \
7521
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
7522
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
7523
- /usr/ucb/* ) ;;
7524
- *)
7525
- # OSF1 and SCO ODT 3.0 have their own names for install.
7526
- # Don't use installbsd from OSF since it installs stuff as root
7527
- # by default.
7528
- for ac_prog in ginstall scoinst install; do
7529
- for ac_exec_ext in '' $ac_executable_extensions; do
7530
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
7531
- if test $ac_prog = install &&
7532
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
7533
- # AIX install. It has an incompatible calling convention.
7534
- :
7535
- elif test $ac_prog = install &&
7536
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
7537
- # program-specific install script used by HP pwplus--don't use.
7538
- :
7539
- else
7540
- rm -rf conftest.one conftest.two conftest.dir
7541
- echo one > conftest.one
7542
- echo two > conftest.two
7543
- mkdir conftest.dir
7544
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
7545
- test -s conftest.one && test -s conftest.two &&
7546
- test -s conftest.dir/conftest.one &&
7547
- test -s conftest.dir/conftest.two
7548
- then
7549
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
7550
- break 3
7551
- fi
7552
- fi
7553
- fi
7554
- done
7555
- done
7556
- ;;
7557
-esac
7558
-
7559
-done
7560
-IFS=$as_save_IFS
7561
-
7562
-rm -rf conftest.one conftest.two conftest.dir
7563
-
7564
-fi
7565
- if test "${ac_cv_path_install+set}" = set; then
7566
- INSTALL=$ac_cv_path_install
7567
- else
7568
- # As a last resort, use the slow shell script. Don't cache a
7569
- # value for INSTALL within a source directory, because that will
7570
- # break other packages using the cache if that directory is
7571
- # removed, or if the value is a relative name.
7572
- INSTALL=$ac_install_sh
7573
- fi
7574
-fi
7575
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
7576
-$as_echo "$INSTALL" >&6; }
7577
-
7578
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
7579
-# It thinks the first close brace ends the variable substitution.
7580
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
7581
-
7582
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
7583
-
7584
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
7585
7586
for ac_prog in 'bison -y' byacc
7587
do
7588
# Extract the first word of "$ac_prog", so it can be a program name with args.
7589
set dummy $ac_prog; ac_word=$2
7590
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7591
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7592
$as_echo_n "checking for $ac_word... " >&6; }
7593
-if test "${ac_cv_prog_YACC+set}" = set; then
7594
+if ${ac_cv_prog_YACC+:} false; then :
7595
$as_echo_n "(cached) " >&6
7596
else
7597
if test -n "$YACC"; then
7598
@@ -4391,24 +4303,24 @@
7599
do
7600
IFS=$as_save_IFS
7601
test -z "$as_dir" && as_dir=.
7602
- for ac_exec_ext in '' $ac_executable_extensions; do
7603
+ for ac_exec_ext in '' $ac_executable_extensions; do
7604
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7605
ac_cv_prog_YACC="$ac_prog"
7606
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7607
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7608
break 2
7609
fi
7610
done
7611
-done
7612
+ done
7613
IFS=$as_save_IFS
7614
7615
fi
7616
fi
7617
YACC=$ac_cv_prog_YACC
7618
if test -n "$YACC"; then
7619
- { $as_echo "$as_me:$LINENO: result: $YACC" >&5
7620
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
7621
$as_echo "$YACC" >&6; }
7622
else
7623
- { $as_echo "$as_me:$LINENO: result: no" >&5
7624
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7625
$as_echo "no" >&6; }
7626
fi
7627
7628
@@ -4422,9 +4334,9 @@
7629
do
7630
# Extract the first word of "$ac_prog", so it can be a program name with args.
7631
set dummy $ac_prog; ac_word=$2
7632
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7633
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7634
$as_echo_n "checking for $ac_word... " >&6; }
7635
-if test "${ac_cv_prog_LEX+set}" = set; then
7636
+if ${ac_cv_prog_LEX+:} false; then :
7637
$as_echo_n "(cached) " >&6
7638
else
7639
if test -n "$LEX"; then
7640
@@ -4435,24 +4347,24 @@
7641
do
7642
IFS=$as_save_IFS
7643
test -z "$as_dir" && as_dir=.
7644
- for ac_exec_ext in '' $ac_executable_extensions; do
7645
+ for ac_exec_ext in '' $ac_executable_extensions; do
7646
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7647
ac_cv_prog_LEX="$ac_prog"
7648
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7649
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7650
break 2
7651
fi
7652
done
7653
-done
7654
+ done
7655
IFS=$as_save_IFS
7656
7657
fi
7658
fi
7659
LEX=$ac_cv_prog_LEX
7660
if test -n "$LEX"; then
7661
- { $as_echo "$as_me:$LINENO: result: $LEX" >&5
7662
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
7663
$as_echo "$LEX" >&6; }
7664
else
7665
- { $as_echo "$as_me:$LINENO: result: no" >&5
7666
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7667
$as_echo "no" >&6; }
7668
fi
7669
7670
@@ -4481,20 +4393,20 @@
7671
return ! yylex () + ! yywrap ();
7672
}
7673
_ACEOF
7674
-{ (ac_try="$LEX conftest.l"
7675
+{ { ac_try="$LEX conftest.l"
7676
case "(($ac_try" in
7677
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7678
*) ac_try_echo=$ac_try;;
7679
esac
7680
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7681
-$as_echo "$ac_try_echo") >&5
7682
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7683
+$as_echo "$ac_try_echo"; } >&5
7684
(eval "$LEX conftest.l") 2>&5
7685
ac_status=$?
7686
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7687
- (exit $ac_status); }
7688
-{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
7689
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7690
+ test $ac_status = 0; }
7691
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
7692
$as_echo_n "checking lex output file root... " >&6; }
7693
-if test "${ac_cv_prog_lex_root+set}" = set; then
7694
+if ${ac_cv_prog_lex_root+:} false; then :
7695
$as_echo_n "(cached) " >&6
7696
else
7697
7698
@@ -4503,19 +4415,17 @@
7699
elif test -f lexyy.c; then
7700
ac_cv_prog_lex_root=lexyy
7701
else
7702
- { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
7703
-$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
7704
- { (exit 1); exit 1; }; }
7705
+ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
7706
fi
7707
fi
7708
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
7709
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
7710
$as_echo "$ac_cv_prog_lex_root" >&6; }
7711
LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
7712
7713
if test -z "${LEXLIB+set}"; then
7714
- { $as_echo "$as_me:$LINENO: checking lex library" >&5
7715
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
7716
$as_echo_n "checking lex library... " >&6; }
7717
-if test "${ac_cv_lib_lex+set}" = set; then
7718
+if ${ac_cv_lib_lex+:} false; then :
7719
$as_echo_n "(cached) " >&6
7720
else
7721
7722
@@ -4523,55 +4433,29 @@
7723
ac_cv_lib_lex='none needed'
7724
for ac_lib in '' -lfl -ll; do
7725
LIBS="$ac_lib $ac_save_LIBS"
7726
- cat >conftest.$ac_ext <<_ACEOF
7727
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7728
+/* end confdefs.h. */
7729
`cat $LEX_OUTPUT_ROOT.c`
7730
_ACEOF
7731
-rm -f conftest.$ac_objext conftest$ac_exeext
7732
-if { (ac_try="$ac_link"
7733
-case "(($ac_try" in
7734
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7735
- *) ac_try_echo=$ac_try;;
7736
-esac
7737
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7738
-$as_echo "$ac_try_echo") >&5
7739
- (eval "$ac_link") 2>conftest.er1
7740
- ac_status=$?
7741
- grep -v '^ *+' conftest.er1 >conftest.err
7742
- rm -f conftest.er1
7743
- cat conftest.err >&5
7744
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7745
- (exit $ac_status); } && {
7746
- test -z "$ac_c_werror_flag" ||
7747
- test ! -s conftest.err
7748
- } && test -s conftest$ac_exeext && {
7749
- test "$cross_compiling" = yes ||
7750
- $as_test_x conftest$ac_exeext
7751
- }; then
7752
+if ac_fn_c_try_link "$LINENO"; then :
7753
ac_cv_lib_lex=$ac_lib
7754
-else
7755
- $as_echo "$as_me: failed program was:" >&5
7756
-sed 's/^/| /' conftest.$ac_ext >&5
7757
-
7758
-
7759
fi
7760
-
7761
-rm -rf conftest.dSYM
7762
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7763
- conftest$ac_exeext conftest.$ac_ext
7764
+rm -f core conftest.err conftest.$ac_objext \
7765
+ conftest$ac_exeext conftest.$ac_ext
7766
test "$ac_cv_lib_lex" != 'none needed' && break
7767
done
7768
LIBS=$ac_save_LIBS
7769
7770
fi
7771
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
7772
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
7773
$as_echo "$ac_cv_lib_lex" >&6; }
7774
test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
7775
fi
7776
7777
7778
-{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
7779
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
7780
$as_echo_n "checking whether yytext is a pointer... " >&6; }
7781
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
7782
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
7783
$as_echo_n "(cached) " >&6
7784
else
7785
# POSIX says lex can declare yytext either as a pointer or an array; the
7786
@@ -4580,52 +4464,25 @@
7787
ac_cv_prog_lex_yytext_pointer=no
7788
ac_save_LIBS=$LIBS
7789
LIBS="$LEXLIB $ac_save_LIBS"
7790
-cat >conftest.$ac_ext <<_ACEOF
7791
-#define YYTEXT_POINTER 1
7792
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7793
+/* end confdefs.h. */
7794
+
7795
+ #define YYTEXT_POINTER 1
7796
`cat $LEX_OUTPUT_ROOT.c`
7797
_ACEOF
7798
-rm -f conftest.$ac_objext conftest$ac_exeext
7799
-if { (ac_try="$ac_link"
7800
-case "(($ac_try" in
7801
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7802
- *) ac_try_echo=$ac_try;;
7803
-esac
7804
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7805
-$as_echo "$ac_try_echo") >&5
7806
- (eval "$ac_link") 2>conftest.er1
7807
- ac_status=$?
7808
- grep -v '^ *+' conftest.er1 >conftest.err
7809
- rm -f conftest.er1
7810
- cat conftest.err >&5
7811
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7812
- (exit $ac_status); } && {
7813
- test -z "$ac_c_werror_flag" ||
7814
- test ! -s conftest.err
7815
- } && test -s conftest$ac_exeext && {
7816
- test "$cross_compiling" = yes ||
7817
- $as_test_x conftest$ac_exeext
7818
- }; then
7819
+if ac_fn_c_try_link "$LINENO"; then :
7820
ac_cv_prog_lex_yytext_pointer=yes
7821
-else
7822
- $as_echo "$as_me: failed program was:" >&5
7823
-sed 's/^/| /' conftest.$ac_ext >&5
7824
-
7825
-
7826
fi
7827
-
7828
-rm -rf conftest.dSYM
7829
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7830
- conftest$ac_exeext conftest.$ac_ext
7831
+rm -f core conftest.err conftest.$ac_objext \
7832
+ conftest$ac_exeext conftest.$ac_ext
7833
LIBS=$ac_save_LIBS
7834
7835
fi
7836
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
7837
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
7838
$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
7839
if test $ac_cv_prog_lex_yytext_pointer = yes; then
7840
7841
-cat >>confdefs.h <<\_ACEOF
7842
-#define YYTEXT_POINTER 1
7843
-_ACEOF
7844
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
7845
7846
fi
7847
rm -f conftest.l $LEX_OUTPUT_ROOT.c
7848
@@ -4645,7 +4502,7 @@
7849
7850
7851
# Check whether --enable-static was given.
7852
-if test "${enable_static+set}" = set; then
7853
+if test "${enable_static+set}" = set; then :
7854
enableval=$enable_static; p=${PACKAGE-default}
7855
case $enableval in
7856
yes) enable_static=yes ;;
7857
@@ -4677,14 +4534,14 @@
7858
7859
case `pwd` in
7860
*\ * | *\ *)
7861
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
7862
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
7863
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
7864
esac
7865
7866
7867
7868
-macro_version='2.2.6b'
7869
-macro_revision='1.3017'
7870
+macro_version='2.4'
7871
+macro_revision='1.3293'
7872
7873
7874
7875
@@ -4702,35 +4559,27 @@
7876
7877
# Make sure we can run config.sub.
7878
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
7879
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
7880
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
7881
- { (exit 1); exit 1; }; }
7882
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
7883
7884
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
7885
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
7886
$as_echo_n "checking build system type... " >&6; }
7887
-if test "${ac_cv_build+set}" = set; then
7888
+if ${ac_cv_build+:} false; then :
7889
$as_echo_n "(cached) " >&6
7890
else
7891
ac_build_alias=$build_alias
7892
test "x$ac_build_alias" = x &&
7893
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
7894
test "x$ac_build_alias" = x &&
7895
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
7896
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
7897
- { (exit 1); exit 1; }; }
7898
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
7899
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
7900
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
7901
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
7902
- { (exit 1); exit 1; }; }
7903
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
7904
7905
fi
7906
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
7907
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
7908
$as_echo "$ac_cv_build" >&6; }
7909
case $ac_cv_build in
7910
*-*-*) ;;
7911
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
7912
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
7913
- { (exit 1); exit 1; }; };;
7914
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
7915
esac
7916
build=$ac_cv_build
7917
ac_save_IFS=$IFS; IFS='-'
7918
@@ -4746,46 +4595,111 @@
7919
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
7920
7921
7922
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
7923
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
7924
$as_echo_n "checking host system type... " >&6; }
7925
-if test "${ac_cv_host+set}" = set; then
7926
+if ${ac_cv_host+:} false; then :
7927
$as_echo_n "(cached) " >&6
7928
else
7929
if test "x$host_alias" = x; then
7930
ac_cv_host=$ac_cv_build
7931
else
7932
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
7933
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
7934
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
7935
- { (exit 1); exit 1; }; }
7936
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
7937
+fi
7938
+
7939
+fi
7940
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
7941
+$as_echo "$ac_cv_host" >&6; }
7942
+case $ac_cv_host in
7943
+*-*-*) ;;
7944
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
7945
+esac
7946
+host=$ac_cv_host
7947
+ac_save_IFS=$IFS; IFS='-'
7948
+set x $ac_cv_host
7949
+shift
7950
+host_cpu=$1
7951
+host_vendor=$2
7952
+shift; shift
7953
+# Remember, the first character of IFS is used to create $*,
7954
+# except with old shells:
7955
+host_os=$*
7956
+IFS=$ac_save_IFS
7957
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
7958
+
7959
+
7960
+# Backslashify metacharacters that are still active within
7961
+# double-quoted strings.
7962
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
7963
+
7964
+# Same as above, but do not quote variable references.
7965
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
7966
+
7967
+# Sed substitution to delay expansion of an escaped shell variable in a
7968
+# double_quote_subst'ed string.
7969
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
7970
+
7971
+# Sed substitution to delay expansion of an escaped single quote.
7972
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
7973
+
7974
+# Sed substitution to avoid accidental globbing in evaled expressions
7975
+no_glob_subst='s/\*/\\\*/g'
7976
+
7977
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
7978
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
7979
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
7980
+
7981
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
7982
+$as_echo_n "checking how to print strings... " >&6; }
7983
+# Test print first, because it will be a builtin if present.
7984
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
7985
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
7986
+ ECHO='print -r --'
7987
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
7988
+ ECHO='printf %s\n'
7989
+else
7990
+ # Use this function as a fallback that always works.
7991
+ func_fallback_echo ()
7992
+ {
7993
+ eval 'cat <<_LTECHO_EOF
7994
+$1
7995
+_LTECHO_EOF'
7996
+ }
7997
+ ECHO='func_fallback_echo'
7998
fi
7999
8000
-fi
8001
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
8002
-$as_echo "$ac_cv_host" >&6; }
8003
-case $ac_cv_host in
8004
-*-*-*) ;;
8005
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
8006
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
8007
- { (exit 1); exit 1; }; };;
8008
-esac
8009
-host=$ac_cv_host
8010
-ac_save_IFS=$IFS; IFS='-'
8011
-set x $ac_cv_host
8012
-shift
8013
-host_cpu=$1
8014
-host_vendor=$2
8015
-shift; shift
8016
-# Remember, the first character of IFS is used to create $*,
8017
-# except with old shells:
8018
-host_os=$*
8019
-IFS=$ac_save_IFS
8020
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
8021
+# func_echo_all arg...
8022
+# Invoke $ECHO with all args, space-separated.
8023
+func_echo_all ()
8024
+{
8025
+ $ECHO ""
8026
+}
8027
+
8028
+case "$ECHO" in
8029
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
8030
+$as_echo "printf" >&6; } ;;
8031
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
8032
+$as_echo "print -r" >&6; } ;;
8033
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
8034
+$as_echo "cat" >&6; } ;;
8035
+esac
8036
+
8037
+
8038
+
8039
+
8040
+
8041
+
8042
+
8043
+
8044
+
8045
+
8046
+
8047
8048
8049
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
8050
+
8051
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
8052
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
8053
-if test "${ac_cv_path_SED+set}" = set; then
8054
+if ${ac_cv_path_SED+:} false; then :
8055
$as_echo_n "(cached) " >&6
8056
else
8057
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
8058
@@ -4793,7 +4707,7 @@
8059
ac_script="$ac_script$as_nl$ac_script"
8060
done
8061
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
8062
- $as_unset ac_script || ac_script=
8063
+ { ac_script=; unset ac_script;}
8064
if test -z "$SED"; then
8065
ac_path_SED_found=false
8066
# Loop through the user's path and test for each of PROGNAME-LIST
8067
@@ -4802,7 +4716,7 @@
8068
do
8069
IFS=$as_save_IFS
8070
test -z "$as_dir" && as_dir=.
8071
- for ac_prog in sed gsed; do
8072
+ for ac_prog in sed gsed; do
8073
for ac_exec_ext in '' $ac_executable_extensions; do
8074
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
8075
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
8076
@@ -4822,7 +4736,7 @@
8077
$as_echo '' >> "conftest.nl"
8078
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
8079
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8080
- ac_count=`expr $ac_count + 1`
8081
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
8082
if test $ac_count -gt ${ac_path_SED_max-0}; then
8083
# Best one so far, save it but keep looking for a better one
8084
ac_cv_path_SED="$ac_path_SED"
8085
@@ -4837,19 +4751,17 @@
8086
$ac_path_SED_found && break 3
8087
done
8088
done
8089
-done
8090
+ done
8091
IFS=$as_save_IFS
8092
if test -z "$ac_cv_path_SED"; then
8093
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
8094
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
8095
- { (exit 1); exit 1; }; }
8096
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
8097
fi
8098
else
8099
ac_cv_path_SED=$SED
8100
fi
8101
8102
fi
8103
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
8104
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
8105
$as_echo "$ac_cv_path_SED" >&6; }
8106
SED="$ac_cv_path_SED"
8107
rm -f conftest.sed
8108
@@ -4867,9 +4779,9 @@
8109
8110
8111
8112
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
8113
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
8114
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
8115
-if test "${ac_cv_path_GREP+set}" = set; then
8116
+if ${ac_cv_path_GREP+:} false; then :
8117
$as_echo_n "(cached) " >&6
8118
else
8119
if test -z "$GREP"; then
8120
@@ -4880,7 +4792,7 @@
8121
do
8122
IFS=$as_save_IFS
8123
test -z "$as_dir" && as_dir=.
8124
- for ac_prog in grep ggrep; do
8125
+ for ac_prog in grep ggrep; do
8126
for ac_exec_ext in '' $ac_executable_extensions; do
8127
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
8128
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
8129
@@ -4900,7 +4812,7 @@
8130
$as_echo 'GREP' >> "conftest.nl"
8131
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
8132
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8133
- ac_count=`expr $ac_count + 1`
8134
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
8135
if test $ac_count -gt ${ac_path_GREP_max-0}; then
8136
# Best one so far, save it but keep looking for a better one
8137
ac_cv_path_GREP="$ac_path_GREP"
8138
@@ -4915,26 +4827,24 @@
8139
$ac_path_GREP_found && break 3
8140
done
8141
done
8142
-done
8143
+ done
8144
IFS=$as_save_IFS
8145
if test -z "$ac_cv_path_GREP"; then
8146
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
8147
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
8148
- { (exit 1); exit 1; }; }
8149
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
8150
fi
8151
else
8152
ac_cv_path_GREP=$GREP
8153
fi
8154
8155
fi
8156
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
8157
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
8158
$as_echo "$ac_cv_path_GREP" >&6; }
8159
GREP="$ac_cv_path_GREP"
8160
8161
8162
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
8163
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
8164
$as_echo_n "checking for egrep... " >&6; }
8165
-if test "${ac_cv_path_EGREP+set}" = set; then
8166
+if ${ac_cv_path_EGREP+:} false; then :
8167
$as_echo_n "(cached) " >&6
8168
else
8169
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
8170
@@ -4948,7 +4858,7 @@
8171
do
8172
IFS=$as_save_IFS
8173
test -z "$as_dir" && as_dir=.
8174
- for ac_prog in egrep; do
8175
+ for ac_prog in egrep; do
8176
for ac_exec_ext in '' $ac_executable_extensions; do
8177
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
8178
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
8179
@@ -4968,7 +4878,7 @@
8180
$as_echo 'EGREP' >> "conftest.nl"
8181
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
8182
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8183
- ac_count=`expr $ac_count + 1`
8184
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
8185
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
8186
# Best one so far, save it but keep looking for a better one
8187
ac_cv_path_EGREP="$ac_path_EGREP"
8188
@@ -4983,12 +4893,10 @@
8189
$ac_path_EGREP_found && break 3
8190
done
8191
done
8192
-done
8193
+ done
8194
IFS=$as_save_IFS
8195
if test -z "$ac_cv_path_EGREP"; then
8196
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
8197
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
8198
- { (exit 1); exit 1; }; }
8199
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
8200
fi
8201
else
8202
ac_cv_path_EGREP=$EGREP
8203
@@ -4996,14 +4904,14 @@
8204
8205
fi
8206
fi
8207
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
8208
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
8209
$as_echo "$ac_cv_path_EGREP" >&6; }
8210
EGREP="$ac_cv_path_EGREP"
8211
8212
8213
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
8214
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
8215
$as_echo_n "checking for fgrep... " >&6; }
8216
-if test "${ac_cv_path_FGREP+set}" = set; then
8217
+if ${ac_cv_path_FGREP+:} false; then :
8218
$as_echo_n "(cached) " >&6
8219
else
8220
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
8221
@@ -5017,7 +4925,7 @@
8222
do
8223
IFS=$as_save_IFS
8224
test -z "$as_dir" && as_dir=.
8225
- for ac_prog in fgrep; do
8226
+ for ac_prog in fgrep; do
8227
for ac_exec_ext in '' $ac_executable_extensions; do
8228
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
8229
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
8230
@@ -5037,7 +4945,7 @@
8231
$as_echo 'FGREP' >> "conftest.nl"
8232
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
8233
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8234
- ac_count=`expr $ac_count + 1`
8235
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
8236
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
8237
# Best one so far, save it but keep looking for a better one
8238
ac_cv_path_FGREP="$ac_path_FGREP"
8239
@@ -5052,12 +4960,10 @@
8240
$ac_path_FGREP_found && break 3
8241
done
8242
done
8243
-done
8244
+ done
8245
IFS=$as_save_IFS
8246
if test -z "$ac_cv_path_FGREP"; then
8247
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
8248
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
8249
- { (exit 1); exit 1; }; }
8250
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
8251
fi
8252
else
8253
ac_cv_path_FGREP=$FGREP
8254
@@ -5065,7 +4971,7 @@
8255
8256
fi
8257
fi
8258
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
8259
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
8260
$as_echo "$ac_cv_path_FGREP" >&6; }
8261
FGREP="$ac_cv_path_FGREP"
8262
8263
@@ -5091,7 +4997,7 @@
8264
8265
8266
# Check whether --with-gnu-ld was given.
8267
-if test "${with_gnu_ld+set}" = set; then
8268
+if test "${with_gnu_ld+set}" = set; then :
8269
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
8270
else
8271
with_gnu_ld=no
8272
@@ -5100,7 +5006,7 @@
8273
ac_prog=ld
8274
if test "$GCC" = yes; then
8275
# Check if gcc -print-prog-name=ld gives a path.
8276
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
8277
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
8278
$as_echo_n "checking for ld used by $CC... " >&6; }
8279
case $host in
8280
*-*-mingw*)
8281
@@ -5130,13 +5036,13 @@
8282
;;
8283
esac
8284
elif test "$with_gnu_ld" = yes; then
8285
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
8286
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
8287
$as_echo_n "checking for GNU ld... " >&6; }
8288
else
8289
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
8290
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
8291
$as_echo_n "checking for non-GNU ld... " >&6; }
8292
fi
8293
-if test "${lt_cv_path_LD+set}" = set; then
8294
+if ${lt_cv_path_LD+:} false; then :
8295
$as_echo_n "(cached) " >&6
8296
else
8297
if test -z "$LD"; then
8298
@@ -5167,18 +5073,16 @@
8299
8300
LD="$lt_cv_path_LD"
8301
if test -n "$LD"; then
8302
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
8303
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
8304
$as_echo "$LD" >&6; }
8305
else
8306
- { $as_echo "$as_me:$LINENO: result: no" >&5
8307
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8308
$as_echo "no" >&6; }
8309
fi
8310
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
8311
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
8312
- { (exit 1); exit 1; }; }
8313
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
8314
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
8315
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
8316
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
8317
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
8318
+if ${lt_cv_prog_gnu_ld+:} false; then :
8319
$as_echo_n "(cached) " >&6
8320
else
8321
# I'd rather use --version here, but apparently some GNU lds only accept -v.
8322
@@ -5191,7 +5095,7 @@
8323
;;
8324
esac
8325
fi
8326
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
8327
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
8328
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
8329
with_gnu_ld=$lt_cv_prog_gnu_ld
8330
8331
@@ -5203,9 +5107,9 @@
8332
8333
8334
8335
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
8336
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
8337
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
8338
-if test "${lt_cv_path_NM+set}" = set; then
8339
+if ${lt_cv_path_NM+:} false; then :
8340
$as_echo_n "(cached) " >&6
8341
else
8342
if test -n "$NM"; then
8343
@@ -5252,20 +5156,23 @@
8344
: ${lt_cv_path_NM=no}
8345
fi
8346
fi
8347
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
8348
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
8349
$as_echo "$lt_cv_path_NM" >&6; }
8350
if test "$lt_cv_path_NM" != "no"; then
8351
NM="$lt_cv_path_NM"
8352
else
8353
# Didn't find any BSD compatible name lister, look for dumpbin.
8354
- if test -n "$ac_tool_prefix"; then
8355
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
8356
+ if test -n "$DUMPBIN"; then :
8357
+ # Let the user override the test.
8358
+ else
8359
+ if test -n "$ac_tool_prefix"; then
8360
+ for ac_prog in dumpbin "link -dump"
8361
do
8362
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
8363
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
8364
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8365
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8366
$as_echo_n "checking for $ac_word... " >&6; }
8367
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
8368
+if ${ac_cv_prog_DUMPBIN+:} false; then :
8369
$as_echo_n "(cached) " >&6
8370
else
8371
if test -n "$DUMPBIN"; then
8372
@@ -5276,24 +5183,24 @@
8373
do
8374
IFS=$as_save_IFS
8375
test -z "$as_dir" && as_dir=.
8376
- for ac_exec_ext in '' $ac_executable_extensions; do
8377
+ for ac_exec_ext in '' $ac_executable_extensions; do
8378
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8379
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
8380
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8381
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8382
break 2
8383
fi
8384
done
8385
-done
8386
+ done
8387
IFS=$as_save_IFS
8388
8389
fi
8390
fi
8391
DUMPBIN=$ac_cv_prog_DUMPBIN
8392
if test -n "$DUMPBIN"; then
8393
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
8394
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
8395
$as_echo "$DUMPBIN" >&6; }
8396
else
8397
- { $as_echo "$as_me:$LINENO: result: no" >&5
8398
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8399
$as_echo "no" >&6; }
8400
fi
8401
8402
@@ -5303,13 +5210,13 @@
8403
fi
8404
if test -z "$DUMPBIN"; then
8405
ac_ct_DUMPBIN=$DUMPBIN
8406
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
8407
+ for ac_prog in dumpbin "link -dump"
8408
do
8409
# Extract the first word of "$ac_prog", so it can be a program name with args.
8410
set dummy $ac_prog; ac_word=$2
8411
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8412
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8413
$as_echo_n "checking for $ac_word... " >&6; }
8414
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
8415
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
8416
$as_echo_n "(cached) " >&6
8417
else
8418
if test -n "$ac_ct_DUMPBIN"; then
8419
@@ -5320,24 +5227,24 @@
8420
do
8421
IFS=$as_save_IFS
8422
test -z "$as_dir" && as_dir=.
8423
- for ac_exec_ext in '' $ac_executable_extensions; do
8424
+ for ac_exec_ext in '' $ac_executable_extensions; do
8425
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8426
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
8427
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8428
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8429
break 2
8430
fi
8431
done
8432
-done
8433
+ done
8434
IFS=$as_save_IFS
8435
8436
fi
8437
fi
8438
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
8439
if test -n "$ac_ct_DUMPBIN"; then
8440
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
8441
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
8442
$as_echo "$ac_ct_DUMPBIN" >&6; }
8443
else
8444
- { $as_echo "$as_me:$LINENO: result: no" >&5
8445
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8446
$as_echo "no" >&6; }
8447
fi
8448
8449
@@ -5350,7 +5257,7 @@
8450
else
8451
case $cross_compiling:$ac_tool_warned in
8452
yes:)
8453
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
8454
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8455
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8456
ac_tool_warned=yes ;;
8457
esac
8458
@@ -5358,6 +5265,15 @@
8459
fi
8460
fi
8461
8462
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
8463
+ *COFF*)
8464
+ DUMPBIN="$DUMPBIN -symbols"
8465
+ ;;
8466
+ *)
8467
+ DUMPBIN=:
8468
+ ;;
8469
+ esac
8470
+ fi
8471
8472
if test "$DUMPBIN" != ":"; then
8473
NM="$DUMPBIN"
8474
@@ -5370,44 +5286,44 @@
8475
8476
8477
8478
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
8479
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
8480
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
8481
-if test "${lt_cv_nm_interface+set}" = set; then
8482
+if ${lt_cv_nm_interface+:} false; then :
8483
$as_echo_n "(cached) " >&6
8484
else
8485
lt_cv_nm_interface="BSD nm"
8486
echo "int some_variable = 0;" > conftest.$ac_ext
8487
- (eval echo "\"\$as_me:5380: $ac_compile\"" >&5)
8488
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
8489
(eval "$ac_compile" 2>conftest.err)
8490
cat conftest.err >&5
8491
- (eval echo "\"\$as_me:5383: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
8492
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
8493
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
8494
cat conftest.err >&5
8495
- (eval echo "\"\$as_me:5386: output\"" >&5)
8496
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
8497
cat conftest.out >&5
8498
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
8499
lt_cv_nm_interface="MS dumpbin"
8500
fi
8501
rm -f conftest*
8502
fi
8503
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
8504
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
8505
$as_echo "$lt_cv_nm_interface" >&6; }
8506
8507
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
8508
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
8509
$as_echo_n "checking whether ln -s works... " >&6; }
8510
LN_S=$as_ln_s
8511
if test "$LN_S" = "ln -s"; then
8512
- { $as_echo "$as_me:$LINENO: result: yes" >&5
8513
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8514
$as_echo "yes" >&6; }
8515
else
8516
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
8517
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
8518
$as_echo "no, using $LN_S" >&6; }
8519
fi
8520
8521
# find the maximum length of command line arguments
8522
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
8523
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
8524
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
8525
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
8526
+if ${lt_cv_sys_max_cmd_len+:} false; then :
8527
$as_echo_n "(cached) " >&6
8528
else
8529
i=0
8530
@@ -5440,6 +5356,11 @@
8531
lt_cv_sys_max_cmd_len=8192;
8532
;;
8533
8534
+ mint*)
8535
+ # On MiNT this can take a long time and run out of memory.
8536
+ lt_cv_sys_max_cmd_len=8192;
8537
+ ;;
8538
+
8539
amigaos*)
8540
# On AmigaOS with pdksh, this test takes hours, literally.
8541
# So we just punt and use a minimum line length of 8192.
8542
@@ -5504,8 +5425,8 @@
8543
# If test is not a shell built-in, we'll probably end up computing a
8544
# maximum length that is only half of the actual maximum length, but
8545
# we can't tell.
8546
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
8547
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
8548
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
8549
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
8550
test $i != 17 # 1/2 MB should be enough
8551
do
8552
i=`expr $i + 1`
8553
@@ -5525,10 +5446,10 @@
8554
fi
8555
8556
if test -n $lt_cv_sys_max_cmd_len ; then
8557
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
8558
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
8559
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
8560
else
8561
- { $as_echo "$as_me:$LINENO: result: none" >&5
8562
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
8563
$as_echo "none" >&6; }
8564
fi
8565
max_cmd_len=$lt_cv_sys_max_cmd_len
8566
@@ -5542,27 +5463,27 @@
8567
: ${MV="mv -f"}
8568
: ${RM="rm -f"}
8569
8570
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
8571
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
8572
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
8573
# Try some XSI features
8574
xsi_shell=no
8575
( _lt_dummy="a/b/c"
8576
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
8577
- = c,a/b,, \
8578
+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
8579
+ = c,a/b,b/c, \
8580
&& eval 'test $(( 1 + 1 )) -eq 2 \
8581
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
8582
&& xsi_shell=yes
8583
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
8584
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
8585
$as_echo "$xsi_shell" >&6; }
8586
8587
8588
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
8589
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
8590
$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
8591
lt_shell_append=no
8592
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
8593
>/dev/null 2>&1 \
8594
&& lt_shell_append=yes
8595
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
8596
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
8597
$as_echo "$lt_shell_append" >&6; }
8598
8599
8600
@@ -5597,14 +5518,88 @@
8601
8602
8603
8604
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
8605
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
8606
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
8607
+if ${lt_cv_to_host_file_cmd+:} false; then :
8608
+ $as_echo_n "(cached) " >&6
8609
+else
8610
+ case $host in
8611
+ *-*-mingw* )
8612
+ case $build in
8613
+ *-*-mingw* ) # actually msys
8614
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
8615
+ ;;
8616
+ *-*-cygwin* )
8617
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
8618
+ ;;
8619
+ * ) # otherwise, assume *nix
8620
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
8621
+ ;;
8622
+ esac
8623
+ ;;
8624
+ *-*-cygwin* )
8625
+ case $build in
8626
+ *-*-mingw* ) # actually msys
8627
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
8628
+ ;;
8629
+ *-*-cygwin* )
8630
+ lt_cv_to_host_file_cmd=func_convert_file_noop
8631
+ ;;
8632
+ * ) # otherwise, assume *nix
8633
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
8634
+ ;;
8635
+ esac
8636
+ ;;
8637
+ * ) # unhandled hosts (and "normal" native builds)
8638
+ lt_cv_to_host_file_cmd=func_convert_file_noop
8639
+ ;;
8640
+esac
8641
+
8642
+fi
8643
+
8644
+to_host_file_cmd=$lt_cv_to_host_file_cmd
8645
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
8646
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
8647
+
8648
+
8649
+
8650
+
8651
+
8652
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
8653
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
8654
+if ${lt_cv_to_tool_file_cmd+:} false; then :
8655
+ $as_echo_n "(cached) " >&6
8656
+else
8657
+ #assume ordinary cross tools, or native build.
8658
+lt_cv_to_tool_file_cmd=func_convert_file_noop
8659
+case $host in
8660
+ *-*-mingw* )
8661
+ case $build in
8662
+ *-*-mingw* ) # actually msys
8663
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
8664
+ ;;
8665
+ esac
8666
+ ;;
8667
+esac
8668
+
8669
+fi
8670
+
8671
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
8672
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
8673
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
8674
+
8675
+
8676
+
8677
+
8678
+
8679
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
8680
$as_echo_n "checking for $LD option to reload object files... " >&6; }
8681
-if test "${lt_cv_ld_reload_flag+set}" = set; then
8682
+if ${lt_cv_ld_reload_flag+:} false; then :
8683
$as_echo_n "(cached) " >&6
8684
else
8685
lt_cv_ld_reload_flag='-r'
8686
fi
8687
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
8688
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
8689
$as_echo "$lt_cv_ld_reload_flag" >&6; }
8690
reload_flag=$lt_cv_ld_reload_flag
8691
case $reload_flag in
8692
@@ -5613,6 +5608,11 @@
8693
esac
8694
reload_cmds='$LD$reload_flag -o $output$reload_objs'
8695
case $host_os in
8696
+ cygwin* | mingw* | pw32* | cegcc*)
8697
+ if test "$GCC" != yes; then
8698
+ reload_cmds=false
8699
+ fi
8700
+ ;;
8701
darwin*)
8702
if test "$GCC" = yes; then
8703
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
8704
@@ -5633,9 +5633,9 @@
8705
if test -n "$ac_tool_prefix"; then
8706
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
8707
set dummy ${ac_tool_prefix}objdump; ac_word=$2
8708
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8709
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8710
$as_echo_n "checking for $ac_word... " >&6; }
8711
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
8712
+if ${ac_cv_prog_OBJDUMP+:} false; then :
8713
$as_echo_n "(cached) " >&6
8714
else
8715
if test -n "$OBJDUMP"; then
8716
@@ -5646,24 +5646,24 @@
8717
do
8718
IFS=$as_save_IFS
8719
test -z "$as_dir" && as_dir=.
8720
- for ac_exec_ext in '' $ac_executable_extensions; do
8721
+ for ac_exec_ext in '' $ac_executable_extensions; do
8722
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8723
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
8724
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8725
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8726
break 2
8727
fi
8728
done
8729
-done
8730
+ done
8731
IFS=$as_save_IFS
8732
8733
fi
8734
fi
8735
OBJDUMP=$ac_cv_prog_OBJDUMP
8736
if test -n "$OBJDUMP"; then
8737
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
8738
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
8739
$as_echo "$OBJDUMP" >&6; }
8740
else
8741
- { $as_echo "$as_me:$LINENO: result: no" >&5
8742
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8743
$as_echo "no" >&6; }
8744
fi
8745
8746
@@ -5673,9 +5673,9 @@
8747
ac_ct_OBJDUMP=$OBJDUMP
8748
# Extract the first word of "objdump", so it can be a program name with args.
8749
set dummy objdump; ac_word=$2
8750
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8751
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8752
$as_echo_n "checking for $ac_word... " >&6; }
8753
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
8754
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
8755
$as_echo_n "(cached) " >&6
8756
else
8757
if test -n "$ac_ct_OBJDUMP"; then
8758
@@ -5686,24 +5686,24 @@
8759
do
8760
IFS=$as_save_IFS
8761
test -z "$as_dir" && as_dir=.
8762
- for ac_exec_ext in '' $ac_executable_extensions; do
8763
+ for ac_exec_ext in '' $ac_executable_extensions; do
8764
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8765
ac_cv_prog_ac_ct_OBJDUMP="objdump"
8766
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8767
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8768
break 2
8769
fi
8770
done
8771
-done
8772
+ done
8773
IFS=$as_save_IFS
8774
8775
fi
8776
fi
8777
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
8778
if test -n "$ac_ct_OBJDUMP"; then
8779
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
8780
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
8781
$as_echo "$ac_ct_OBJDUMP" >&6; }
8782
else
8783
- { $as_echo "$as_me:$LINENO: result: no" >&5
8784
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8785
$as_echo "no" >&6; }
8786
fi
8787
8788
@@ -5712,7 +5712,7 @@
8789
else
8790
case $cross_compiling:$ac_tool_warned in
8791
yes:)
8792
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
8793
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8794
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8795
ac_tool_warned=yes ;;
8796
esac
8797
@@ -5732,9 +5732,9 @@
8798
8799
8800
8801
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
8802
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
8803
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
8804
-if test "${lt_cv_deplibs_check_method+set}" = set; then
8805
+if ${lt_cv_deplibs_check_method+:} false; then :
8806
$as_echo_n "(cached) " >&6
8807
else
8808
lt_cv_file_magic_cmd='$MAGIC_CMD'
8809
@@ -5776,16 +5776,18 @@
8810
# Base MSYS/MinGW do not provide the 'file' command needed by
8811
# func_win32_libid shell function, so use a weaker test based on 'objdump',
8812
# unless we find 'file', for example because we are cross-compiling.
8813
- if ( file / ) >/dev/null 2>&1; then
8814
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
8815
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
8816
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
8817
lt_cv_file_magic_cmd='func_win32_libid'
8818
else
8819
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
8820
+ # Keep this pattern in sync with the one in func_win32_libid.
8821
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
8822
lt_cv_file_magic_cmd='$OBJDUMP -f'
8823
fi
8824
;;
8825
8826
-cegcc)
8827
+cegcc*)
8828
# use the weaker test based on 'objdump'. See mingw*.
8829
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
8830
lt_cv_file_magic_cmd='$OBJDUMP -f'
8831
@@ -5815,6 +5817,10 @@
8832
lt_cv_deplibs_check_method=pass_all
8833
;;
8834
8835
+haiku*)
8836
+ lt_cv_deplibs_check_method=pass_all
8837
+ ;;
8838
+
8839
hpux10.20* | hpux11*)
8840
lt_cv_file_magic_cmd=/usr/bin/file
8841
case $host_cpu in
8842
@@ -5823,11 +5829,11 @@
8843
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
8844
;;
8845
hppa*64*)
8846
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
8847
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
8848
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
8849
;;
8850
*)
8851
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
8852
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
8853
lt_cv_file_magic_test_file=/usr/lib/libc.sl
8854
;;
8855
esac
8856
@@ -5849,11 +5855,11 @@
8857
;;
8858
8859
# This must be Linux ELF.
8860
-linux* | k*bsd*-gnu)
8861
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
8862
lt_cv_deplibs_check_method=pass_all
8863
;;
8864
8865
-netbsd*)
8866
+netbsd* | netbsdelf*-gnu)
8867
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
8868
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
8869
else
8870
@@ -5928,8 +5934,23 @@
8871
esac
8872
8873
fi
8874
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
8875
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
8876
$as_echo "$lt_cv_deplibs_check_method" >&6; }
8877
+
8878
+file_magic_glob=
8879
+want_nocaseglob=no
8880
+if test "$build" = "$host"; then
8881
+ case $host_os in
8882
+ mingw* | pw32*)
8883
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
8884
+ want_nocaseglob=yes
8885
+ else
8886
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
8887
+ fi
8888
+ ;;
8889
+ esac
8890
+fi
8891
+
8892
file_magic_cmd=$lt_cv_file_magic_cmd
8893
deplibs_check_method=$lt_cv_deplibs_check_method
8894
test -z "$deplibs_check_method" && deplibs_check_method=unknown
8895
@@ -5945,12 +5966,165 @@
8896
8897
8898
8899
+
8900
+
8901
+
8902
+
8903
+
8904
+
8905
+
8906
+
8907
+
8908
+
8909
+if test -n "$ac_tool_prefix"; then
8910
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
8911
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
8912
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8913
+$as_echo_n "checking for $ac_word... " >&6; }
8914
+if ${ac_cv_prog_DLLTOOL+:} false; then :
8915
+ $as_echo_n "(cached) " >&6
8916
+else
8917
+ if test -n "$DLLTOOL"; then
8918
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
8919
+else
8920
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8921
+for as_dir in $PATH
8922
+do
8923
+ IFS=$as_save_IFS
8924
+ test -z "$as_dir" && as_dir=.
8925
+ for ac_exec_ext in '' $ac_executable_extensions; do
8926
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8927
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
8928
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8929
+ break 2
8930
+ fi
8931
+done
8932
+ done
8933
+IFS=$as_save_IFS
8934
+
8935
+fi
8936
+fi
8937
+DLLTOOL=$ac_cv_prog_DLLTOOL
8938
+if test -n "$DLLTOOL"; then
8939
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
8940
+$as_echo "$DLLTOOL" >&6; }
8941
+else
8942
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8943
+$as_echo "no" >&6; }
8944
+fi
8945
+
8946
+
8947
+fi
8948
+if test -z "$ac_cv_prog_DLLTOOL"; then
8949
+ ac_ct_DLLTOOL=$DLLTOOL
8950
+ # Extract the first word of "dlltool", so it can be a program name with args.
8951
+set dummy dlltool; ac_word=$2
8952
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8953
+$as_echo_n "checking for $ac_word... " >&6; }
8954
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
8955
+ $as_echo_n "(cached) " >&6
8956
+else
8957
+ if test -n "$ac_ct_DLLTOOL"; then
8958
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
8959
+else
8960
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8961
+for as_dir in $PATH
8962
+do
8963
+ IFS=$as_save_IFS
8964
+ test -z "$as_dir" && as_dir=.
8965
+ for ac_exec_ext in '' $ac_executable_extensions; do
8966
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8967
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
8968
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8969
+ break 2
8970
+ fi
8971
+done
8972
+ done
8973
+IFS=$as_save_IFS
8974
+
8975
+fi
8976
+fi
8977
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
8978
+if test -n "$ac_ct_DLLTOOL"; then
8979
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
8980
+$as_echo "$ac_ct_DLLTOOL" >&6; }
8981
+else
8982
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8983
+$as_echo "no" >&6; }
8984
+fi
8985
+
8986
+ if test "x$ac_ct_DLLTOOL" = x; then
8987
+ DLLTOOL="false"
8988
+ else
8989
+ case $cross_compiling:$ac_tool_warned in
8990
+yes:)
8991
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8992
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8993
+ac_tool_warned=yes ;;
8994
+esac
8995
+ DLLTOOL=$ac_ct_DLLTOOL
8996
+ fi
8997
+else
8998
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
8999
+fi
9000
+
9001
+test -z "$DLLTOOL" && DLLTOOL=dlltool
9002
+
9003
+
9004
+
9005
+
9006
+
9007
+
9008
+
9009
+
9010
+
9011
+
9012
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
9013
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
9014
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
9015
+ $as_echo_n "(cached) " >&6
9016
+else
9017
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
9018
+
9019
+case $host_os in
9020
+cygwin* | mingw* | pw32* | cegcc*)
9021
+ # two different shell functions defined in ltmain.sh
9022
+ # decide which to use based on capabilities of $DLLTOOL
9023
+ case `$DLLTOOL --help 2>&1` in
9024
+ *--identify-strict*)
9025
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
9026
+ ;;
9027
+ *)
9028
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
9029
+ ;;
9030
+ esac
9031
+ ;;
9032
+*)
9033
+ # fallback: assume linklib IS sharedlib
9034
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
9035
+ ;;
9036
+esac
9037
+
9038
+fi
9039
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
9040
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
9041
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
9042
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
9043
+
9044
+
9045
+
9046
+
9047
+
9048
+
9049
+
9050
if test -n "$ac_tool_prefix"; then
9051
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
9052
-set dummy ${ac_tool_prefix}ar; ac_word=$2
9053
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9054
+ for ac_prog in ar
9055
+ do
9056
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
9057
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
9058
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9059
$as_echo_n "checking for $ac_word... " >&6; }
9060
-if test "${ac_cv_prog_AR+set}" = set; then
9061
+if ${ac_cv_prog_AR+:} false; then :
9062
$as_echo_n "(cached) " >&6
9063
else
9064
if test -n "$AR"; then
9065
@@ -5961,36 +6135,40 @@
9066
do
9067
IFS=$as_save_IFS
9068
test -z "$as_dir" && as_dir=.
9069
- for ac_exec_ext in '' $ac_executable_extensions; do
9070
+ for ac_exec_ext in '' $ac_executable_extensions; do
9071
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9072
- ac_cv_prog_AR="${ac_tool_prefix}ar"
9073
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9074
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
9075
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9076
break 2
9077
fi
9078
done
9079
-done
9080
+ done
9081
IFS=$as_save_IFS
9082
9083
fi
9084
fi
9085
AR=$ac_cv_prog_AR
9086
if test -n "$AR"; then
9087
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
9088
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
9089
$as_echo "$AR" >&6; }
9090
else
9091
- { $as_echo "$as_me:$LINENO: result: no" >&5
9092
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9093
$as_echo "no" >&6; }
9094
fi
9095
9096
9097
+ test -n "$AR" && break
9098
+ done
9099
fi
9100
-if test -z "$ac_cv_prog_AR"; then
9101
+if test -z "$AR"; then
9102
ac_ct_AR=$AR
9103
- # Extract the first word of "ar", so it can be a program name with args.
9104
-set dummy ar; ac_word=$2
9105
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9106
+ for ac_prog in ar
9107
+do
9108
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
9109
+set dummy $ac_prog; ac_word=$2
9110
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9111
$as_echo_n "checking for $ac_word... " >&6; }
9112
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
9113
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
9114
$as_echo_n "(cached) " >&6
9115
else
9116
if test -n "$ac_ct_AR"; then
9117
@@ -6001,44 +6179,48 @@
9118
do
9119
IFS=$as_save_IFS
9120
test -z "$as_dir" && as_dir=.
9121
- for ac_exec_ext in '' $ac_executable_extensions; do
9122
+ for ac_exec_ext in '' $ac_executable_extensions; do
9123
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9124
- ac_cv_prog_ac_ct_AR="ar"
9125
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9126
+ ac_cv_prog_ac_ct_AR="$ac_prog"
9127
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9128
break 2
9129
fi
9130
done
9131
-done
9132
+ done
9133
IFS=$as_save_IFS
9134
9135
fi
9136
fi
9137
ac_ct_AR=$ac_cv_prog_ac_ct_AR
9138
if test -n "$ac_ct_AR"; then
9139
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
9140
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
9141
$as_echo "$ac_ct_AR" >&6; }
9142
else
9143
- { $as_echo "$as_me:$LINENO: result: no" >&5
9144
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9145
$as_echo "no" >&6; }
9146
fi
9147
9148
+
9149
+ test -n "$ac_ct_AR" && break
9150
+done
9151
+
9152
if test "x$ac_ct_AR" = x; then
9153
AR="false"
9154
else
9155
case $cross_compiling:$ac_tool_warned in
9156
yes:)
9157
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
9158
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9159
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9160
ac_tool_warned=yes ;;
9161
esac
9162
AR=$ac_ct_AR
9163
fi
9164
-else
9165
- AR="$ac_cv_prog_AR"
9166
fi
9167
9168
-test -z "$AR" && AR=ar
9169
-test -z "$AR_FLAGS" && AR_FLAGS=cru
9170
+: ${AR=ar}
9171
+: ${AR_FLAGS=cru}
9172
+
9173
+
9174
9175
9176
9177
@@ -6048,14 +6230,70 @@
9178
9179
9180
9181
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
9182
+$as_echo_n "checking for archiver @FILE support... " >&6; }
9183
+if ${lt_cv_ar_at_file+:} false; then :
9184
+ $as_echo_n "(cached) " >&6
9185
+else
9186
+ lt_cv_ar_at_file=no
9187
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9188
+/* end confdefs.h. */
9189
+
9190
+int
9191
+main ()
9192
+{
9193
+
9194
+ ;
9195
+ return 0;
9196
+}
9197
+_ACEOF
9198
+if ac_fn_c_try_compile "$LINENO"; then :
9199
+ echo conftest.$ac_objext > conftest.lst
9200
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
9201
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
9202
+ (eval $lt_ar_try) 2>&5
9203
+ ac_status=$?
9204
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9205
+ test $ac_status = 0; }
9206
+ if test "$ac_status" -eq 0; then
9207
+ # Ensure the archiver fails upon bogus file names.
9208
+ rm -f conftest.$ac_objext libconftest.a
9209
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
9210
+ (eval $lt_ar_try) 2>&5
9211
+ ac_status=$?
9212
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9213
+ test $ac_status = 0; }
9214
+ if test "$ac_status" -ne 0; then
9215
+ lt_cv_ar_at_file=@
9216
+ fi
9217
+ fi
9218
+ rm -f conftest.* libconftest.a
9219
+
9220
+fi
9221
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9222
+
9223
+fi
9224
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
9225
+$as_echo "$lt_cv_ar_at_file" >&6; }
9226
+
9227
+if test "x$lt_cv_ar_at_file" = xno; then
9228
+ archiver_list_spec=
9229
+else
9230
+ archiver_list_spec=$lt_cv_ar_at_file
9231
+fi
9232
+
9233
+
9234
+
9235
+
9236
+
9237
9238
9239
if test -n "$ac_tool_prefix"; then
9240
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
9241
set dummy ${ac_tool_prefix}strip; ac_word=$2
9242
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9243
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9244
$as_echo_n "checking for $ac_word... " >&6; }
9245
-if test "${ac_cv_prog_STRIP+set}" = set; then
9246
+if ${ac_cv_prog_STRIP+:} false; then :
9247
$as_echo_n "(cached) " >&6
9248
else
9249
if test -n "$STRIP"; then
9250
@@ -6066,24 +6304,24 @@
9251
do
9252
IFS=$as_save_IFS
9253
test -z "$as_dir" && as_dir=.
9254
- for ac_exec_ext in '' $ac_executable_extensions; do
9255
+ for ac_exec_ext in '' $ac_executable_extensions; do
9256
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9257
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
9258
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9259
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9260
break 2
9261
fi
9262
done
9263
-done
9264
+ done
9265
IFS=$as_save_IFS
9266
9267
fi
9268
fi
9269
STRIP=$ac_cv_prog_STRIP
9270
if test -n "$STRIP"; then
9271
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
9272
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
9273
$as_echo "$STRIP" >&6; }
9274
else
9275
- { $as_echo "$as_me:$LINENO: result: no" >&5
9276
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9277
$as_echo "no" >&6; }
9278
fi
9279
9280
@@ -6093,9 +6331,9 @@
9281
ac_ct_STRIP=$STRIP
9282
# Extract the first word of "strip", so it can be a program name with args.
9283
set dummy strip; ac_word=$2
9284
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9285
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9286
$as_echo_n "checking for $ac_word... " >&6; }
9287
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
9288
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
9289
$as_echo_n "(cached) " >&6
9290
else
9291
if test -n "$ac_ct_STRIP"; then
9292
@@ -6106,24 +6344,24 @@
9293
do
9294
IFS=$as_save_IFS
9295
test -z "$as_dir" && as_dir=.
9296
- for ac_exec_ext in '' $ac_executable_extensions; do
9297
+ for ac_exec_ext in '' $ac_executable_extensions; do
9298
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9299
ac_cv_prog_ac_ct_STRIP="strip"
9300
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9301
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9302
break 2
9303
fi
9304
done
9305
-done
9306
+ done
9307
IFS=$as_save_IFS
9308
9309
fi
9310
fi
9311
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
9312
if test -n "$ac_ct_STRIP"; then
9313
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
9314
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
9315
$as_echo "$ac_ct_STRIP" >&6; }
9316
else
9317
- { $as_echo "$as_me:$LINENO: result: no" >&5
9318
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9319
$as_echo "no" >&6; }
9320
fi
9321
9322
@@ -6132,7 +6370,7 @@
9323
else
9324
case $cross_compiling:$ac_tool_warned in
9325
yes:)
9326
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
9327
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9328
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9329
ac_tool_warned=yes ;;
9330
esac
9331
@@ -6152,9 +6390,9 @@
9332
if test -n "$ac_tool_prefix"; then
9333
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
9334
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
9335
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9336
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9337
$as_echo_n "checking for $ac_word... " >&6; }
9338
-if test "${ac_cv_prog_RANLIB+set}" = set; then
9339
+if ${ac_cv_prog_RANLIB+:} false; then :
9340
$as_echo_n "(cached) " >&6
9341
else
9342
if test -n "$RANLIB"; then
9343
@@ -6165,24 +6403,24 @@
9344
do
9345
IFS=$as_save_IFS
9346
test -z "$as_dir" && as_dir=.
9347
- for ac_exec_ext in '' $ac_executable_extensions; do
9348
+ for ac_exec_ext in '' $ac_executable_extensions; do
9349
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9350
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
9351
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9352
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9353
break 2
9354
fi
9355
done
9356
-done
9357
+ done
9358
IFS=$as_save_IFS
9359
9360
fi
9361
fi
9362
RANLIB=$ac_cv_prog_RANLIB
9363
if test -n "$RANLIB"; then
9364
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
9365
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
9366
$as_echo "$RANLIB" >&6; }
9367
else
9368
- { $as_echo "$as_me:$LINENO: result: no" >&5
9369
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9370
$as_echo "no" >&6; }
9371
fi
9372
9373
@@ -6192,9 +6430,9 @@
9374
ac_ct_RANLIB=$RANLIB
9375
# Extract the first word of "ranlib", so it can be a program name with args.
9376
set dummy ranlib; ac_word=$2
9377
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9378
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9379
$as_echo_n "checking for $ac_word... " >&6; }
9380
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
9381
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
9382
$as_echo_n "(cached) " >&6
9383
else
9384
if test -n "$ac_ct_RANLIB"; then
9385
@@ -6205,24 +6443,24 @@
9386
do
9387
IFS=$as_save_IFS
9388
test -z "$as_dir" && as_dir=.
9389
- for ac_exec_ext in '' $ac_executable_extensions; do
9390
+ for ac_exec_ext in '' $ac_executable_extensions; do
9391
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9392
ac_cv_prog_ac_ct_RANLIB="ranlib"
9393
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9394
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9395
break 2
9396
fi
9397
done
9398
-done
9399
+ done
9400
IFS=$as_save_IFS
9401
9402
fi
9403
fi
9404
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
9405
if test -n "$ac_ct_RANLIB"; then
9406
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
9407
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
9408
$as_echo "$ac_ct_RANLIB" >&6; }
9409
else
9410
- { $as_echo "$as_me:$LINENO: result: no" >&5
9411
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9412
$as_echo "no" >&6; }
9413
fi
9414
9415
@@ -6231,7 +6469,7 @@
9416
else
9417
case $cross_compiling:$ac_tool_warned in
9418
yes:)
9419
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
9420
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9421
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9422
ac_tool_warned=yes ;;
9423
esac
9424
@@ -6265,6 +6503,18 @@
9425
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
9426
fi
9427
9428
+case $host_os in
9429
+ darwin*)
9430
+ lock_old_archive_extraction=yes ;;
9431
+ *)
9432
+ lock_old_archive_extraction=no ;;
9433
+esac
9434
+
9435
+
9436
+
9437
+
9438
+
9439
+
9440
9441
9442
9443
@@ -6309,9 +6559,9 @@
9444
9445
9446
# Check for command to grab the raw symbol name followed by C symbol from nm.
9447
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
9448
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
9449
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
9450
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
9451
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
9452
$as_echo_n "(cached) " >&6
9453
else
9454
9455
@@ -6372,8 +6622,8 @@
9456
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
9457
9458
# Transform an extracted symbol line into symbol name and symbol address
9459
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
9460
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
9461
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
9462
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
9463
9464
# Handle CRLF in mingw tool chain
9465
opt_cr=
9466
@@ -6409,6 +6659,7 @@
9467
else
9468
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
9469
fi
9470
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
9471
9472
# Check to see that the pipe works correctly.
9473
pipe_works=no
9474
@@ -6427,18 +6678,18 @@
9475
int main(){nm_test_var='a';nm_test_func();return(0);}
9476
_LT_EOF
9477
9478
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9479
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9480
(eval $ac_compile) 2>&5
9481
ac_status=$?
9482
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9483
- (exit $ac_status); }; then
9484
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9485
+ test $ac_status = 0; }; then
9486
# Now try to grab the symbols.
9487
nlist=conftest.nm
9488
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
9489
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
9490
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
9491
+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
9492
ac_status=$?
9493
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9494
- (exit $ac_status); } && test -s "$nlist"; then
9495
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9496
+ test $ac_status = 0; } && test -s "$nlist"; then
9497
# Try sorting and uniquifying the output.
9498
if sort "$nlist" | uniq > "$nlist"T; then
9499
mv -f "$nlist"T "$nlist"
9500
@@ -6450,6 +6701,18 @@
9501
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
9502
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
9503
cat <<_LT_EOF > conftest.$ac_ext
9504
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
9505
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
9506
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
9507
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
9508
+# define LT_DLSYM_CONST
9509
+#elif defined(__osf__)
9510
+/* This system does not cope well with relocations in const data. */
9511
+# define LT_DLSYM_CONST
9512
+#else
9513
+# define LT_DLSYM_CONST const
9514
+#endif
9515
+
9516
#ifdef __cplusplus
9517
extern "C" {
9518
#endif
9519
@@ -6461,7 +6724,7 @@
9520
cat <<_LT_EOF >> conftest.$ac_ext
9521
9522
/* The mapping between symbol names and symbols. */
9523
-const struct {
9524
+LT_DLSYM_CONST struct {
9525
const char *name;
9526
void *address;
9527
}
9528
@@ -6487,19 +6750,19 @@
9529
_LT_EOF
9530
# Now try linking the two files.
9531
mv conftest.$ac_objext conftstm.$ac_objext
9532
- lt_save_LIBS="$LIBS"
9533
- lt_save_CFLAGS="$CFLAGS"
9534
+ lt_globsym_save_LIBS=$LIBS
9535
+ lt_globsym_save_CFLAGS=$CFLAGS
9536
LIBS="conftstm.$ac_objext"
9537
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
9538
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9539
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
9540
(eval $ac_link) 2>&5
9541
ac_status=$?
9542
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9543
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
9544
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9545
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
9546
pipe_works=yes
9547
fi
9548
- LIBS="$lt_save_LIBS"
9549
- CFLAGS="$lt_save_CFLAGS"
9550
+ LIBS=$lt_globsym_save_LIBS
9551
+ CFLAGS=$lt_globsym_save_CFLAGS
9552
else
9553
echo "cannot find nm_test_func in $nlist" >&5
9554
fi
9555
@@ -6529,13 +6792,30 @@
9556
lt_cv_sys_global_symbol_to_cdecl=
9557
fi
9558
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
9559
- { $as_echo "$as_me:$LINENO: result: failed" >&5
9560
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
9561
$as_echo "failed" >&6; }
9562
else
9563
- { $as_echo "$as_me:$LINENO: result: ok" >&5
9564
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
9565
$as_echo "ok" >&6; }
9566
fi
9567
9568
+# Response file support.
9569
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
9570
+ nm_file_list_spec='@'
9571
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
9572
+ nm_file_list_spec='@'
9573
+fi
9574
+
9575
+
9576
+
9577
+
9578
+
9579
+
9580
+
9581
+
9582
+
9583
+
9584
+
9585
9586
9587
9588
@@ -6552,13 +6832,45 @@
9589
9590
9591
9592
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
9593
+$as_echo_n "checking for sysroot... " >&6; }
9594
+
9595
+# Check whether --with-sysroot was given.
9596
+if test "${with_sysroot+set}" = set; then :
9597
+ withval=$with_sysroot;
9598
+else
9599
+ with_sysroot=no
9600
+fi
9601
+
9602
+
9603
+lt_sysroot=
9604
+case ${with_sysroot} in #(
9605
+ yes)
9606
+ if test "$GCC" = yes; then
9607
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
9608
+ fi
9609
+ ;; #(
9610
+ /*)
9611
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
9612
+ ;; #(
9613
+ no|'')
9614
+ ;; #(
9615
+ *)
9616
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
9617
+$as_echo "${with_sysroot}" >&6; }
9618
+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
9619
+ ;;
9620
+esac
9621
+
9622
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
9623
+$as_echo "${lt_sysroot:-no}" >&6; }
9624
9625
9626
9627
9628
9629
# Check whether --enable-libtool-lock was given.
9630
-if test "${enable_libtool_lock+set}" = set; then
9631
+if test "${enable_libtool_lock+set}" = set; then :
9632
enableval=$enable_libtool_lock;
9633
fi
9634
9635
@@ -6570,11 +6882,11 @@
9636
ia64-*-hpux*)
9637
# Find out which ABI we are using.
9638
echo 'int i;' > conftest.$ac_ext
9639
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9640
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9641
(eval $ac_compile) 2>&5
9642
ac_status=$?
9643
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9644
- (exit $ac_status); }; then
9645
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9646
+ test $ac_status = 0; }; then
9647
case `/usr/bin/file conftest.$ac_objext` in
9648
*ELF-32*)
9649
HPUX_IA64_MODE="32"
9650
@@ -6588,12 +6900,12 @@
9651
;;
9652
*-*-irix6*)
9653
# Find out which ABI we are using.
9654
- echo '#line 6591 "configure"' > conftest.$ac_ext
9655
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9656
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
9657
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9658
(eval $ac_compile) 2>&5
9659
ac_status=$?
9660
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9661
- (exit $ac_status); }; then
9662
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9663
+ test $ac_status = 0; }; then
9664
if test "$lt_cv_prog_gnu_ld" = yes; then
9665
case `/usr/bin/file conftest.$ac_objext` in
9666
*32-bit*)
9667
@@ -6627,11 +6939,11 @@
9668
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
9669
# Find out which ABI we are using.
9670
echo 'int i;' > conftest.$ac_ext
9671
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9672
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9673
(eval $ac_compile) 2>&5
9674
ac_status=$?
9675
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9676
- (exit $ac_status); }; then
9677
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9678
+ test $ac_status = 0; }; then
9679
case `/usr/bin/file conftest.o` in
9680
*32-bit*)
9681
case $host in
9682
@@ -6680,9 +6992,9 @@
9683
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
9684
SAVE_CFLAGS="$CFLAGS"
9685
CFLAGS="$CFLAGS -belf"
9686
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
9687
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
9688
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
9689
-if test "${lt_cv_cc_needs_belf+set}" = set; then
9690
+if ${lt_cv_cc_needs_belf+:} false; then :
9691
$as_echo_n "(cached) " >&6
9692
else
9693
ac_ext=c
9694
@@ -6691,11 +7003,7 @@
9695
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
9696
ac_compiler_gnu=$ac_cv_c_compiler_gnu
9697
9698
- cat >conftest.$ac_ext <<_ACEOF
9699
-/* confdefs.h. */
9700
-_ACEOF
9701
-cat confdefs.h >>conftest.$ac_ext
9702
-cat >>conftest.$ac_ext <<_ACEOF
9703
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9704
/* end confdefs.h. */
9705
9706
int
9707
@@ -6706,38 +7014,13 @@
9708
return 0;
9709
}
9710
_ACEOF
9711
-rm -f conftest.$ac_objext conftest$ac_exeext
9712
-if { (ac_try="$ac_link"
9713
-case "(($ac_try" in
9714
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9715
- *) ac_try_echo=$ac_try;;
9716
-esac
9717
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9718
-$as_echo "$ac_try_echo") >&5
9719
- (eval "$ac_link") 2>conftest.er1
9720
- ac_status=$?
9721
- grep -v '^ *+' conftest.er1 >conftest.err
9722
- rm -f conftest.er1
9723
- cat conftest.err >&5
9724
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9725
- (exit $ac_status); } && {
9726
- test -z "$ac_c_werror_flag" ||
9727
- test ! -s conftest.err
9728
- } && test -s conftest$ac_exeext && {
9729
- test "$cross_compiling" = yes ||
9730
- $as_test_x conftest$ac_exeext
9731
- }; then
9732
+if ac_fn_c_try_link "$LINENO"; then :
9733
lt_cv_cc_needs_belf=yes
9734
else
9735
- $as_echo "$as_me: failed program was:" >&5
9736
-sed 's/^/| /' conftest.$ac_ext >&5
9737
-
9738
- lt_cv_cc_needs_belf=no
9739
+ lt_cv_cc_needs_belf=no
9740
fi
9741
-
9742
-rm -rf conftest.dSYM
9743
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9744
- conftest$ac_exeext conftest.$ac_ext
9745
+rm -f core conftest.err conftest.$ac_objext \
9746
+ conftest$ac_exeext conftest.$ac_ext
9747
ac_ext=c
9748
ac_cpp='$CPP $CPPFLAGS'
9749
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
9750
@@ -6745,7 +7028,7 @@
9751
ac_compiler_gnu=$ac_cv_c_compiler_gnu
9752
9753
fi
9754
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
9755
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
9756
$as_echo "$lt_cv_cc_needs_belf" >&6; }
9757
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
9758
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
9759
@@ -6755,11 +7038,11 @@
9760
sparc*-*solaris*)
9761
# Find out which ABI we are using.
9762
echo 'int i;' > conftest.$ac_ext
9763
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9764
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9765
(eval $ac_compile) 2>&5
9766
ac_status=$?
9767
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9768
- (exit $ac_status); }; then
9769
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9770
+ test $ac_status = 0; }; then
9771
case `/usr/bin/file conftest.o` in
9772
*64-bit*)
9773
case $lt_cv_prog_gnu_ld in
9774
@@ -6779,15 +7062,132 @@
9775
9776
need_locks="$enable_libtool_lock"
9777
9778
+if test -n "$ac_tool_prefix"; then
9779
+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
9780
+set dummy ${ac_tool_prefix}mt; ac_word=$2
9781
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9782
+$as_echo_n "checking for $ac_word... " >&6; }
9783
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
9784
+ $as_echo_n "(cached) " >&6
9785
+else
9786
+ if test -n "$MANIFEST_TOOL"; then
9787
+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
9788
+else
9789
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9790
+for as_dir in $PATH
9791
+do
9792
+ IFS=$as_save_IFS
9793
+ test -z "$as_dir" && as_dir=.
9794
+ for ac_exec_ext in '' $ac_executable_extensions; do
9795
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9796
+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
9797
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9798
+ break 2
9799
+ fi
9800
+done
9801
+ done
9802
+IFS=$as_save_IFS
9803
+
9804
+fi
9805
+fi
9806
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
9807
+if test -n "$MANIFEST_TOOL"; then
9808
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
9809
+$as_echo "$MANIFEST_TOOL" >&6; }
9810
+else
9811
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9812
+$as_echo "no" >&6; }
9813
+fi
9814
+
9815
+
9816
+fi
9817
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
9818
+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
9819
+ # Extract the first word of "mt", so it can be a program name with args.
9820
+set dummy mt; ac_word=$2
9821
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9822
+$as_echo_n "checking for $ac_word... " >&6; }
9823
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
9824
+ $as_echo_n "(cached) " >&6
9825
+else
9826
+ if test -n "$ac_ct_MANIFEST_TOOL"; then
9827
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
9828
+else
9829
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9830
+for as_dir in $PATH
9831
+do
9832
+ IFS=$as_save_IFS
9833
+ test -z "$as_dir" && as_dir=.
9834
+ for ac_exec_ext in '' $ac_executable_extensions; do
9835
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9836
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
9837
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9838
+ break 2
9839
+ fi
9840
+done
9841
+ done
9842
+IFS=$as_save_IFS
9843
+
9844
+fi
9845
+fi
9846
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
9847
+if test -n "$ac_ct_MANIFEST_TOOL"; then
9848
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
9849
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
9850
+else
9851
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9852
+$as_echo "no" >&6; }
9853
+fi
9854
+
9855
+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
9856
+ MANIFEST_TOOL=":"
9857
+ else
9858
+ case $cross_compiling:$ac_tool_warned in
9859
+yes:)
9860
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9861
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9862
+ac_tool_warned=yes ;;
9863
+esac
9864
+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
9865
+ fi
9866
+else
9867
+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
9868
+fi
9869
+
9870
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
9871
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
9872
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
9873
+if ${lt_cv_path_mainfest_tool+:} false; then :
9874
+ $as_echo_n "(cached) " >&6
9875
+else
9876
+ lt_cv_path_mainfest_tool=no
9877
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
9878
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
9879
+ cat conftest.err >&5
9880
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
9881
+ lt_cv_path_mainfest_tool=yes
9882
+ fi
9883
+ rm -f conftest*
9884
+fi
9885
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
9886
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
9887
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
9888
+ MANIFEST_TOOL=:
9889
+fi
9890
+
9891
+
9892
+
9893
+
9894
+
9895
9896
case $host_os in
9897
rhapsody* | darwin*)
9898
if test -n "$ac_tool_prefix"; then
9899
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
9900
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
9901
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9902
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9903
$as_echo_n "checking for $ac_word... " >&6; }
9904
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
9905
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
9906
$as_echo_n "(cached) " >&6
9907
else
9908
if test -n "$DSYMUTIL"; then
9909
@@ -6798,24 +7198,24 @@
9910
do
9911
IFS=$as_save_IFS
9912
test -z "$as_dir" && as_dir=.
9913
- for ac_exec_ext in '' $ac_executable_extensions; do
9914
+ for ac_exec_ext in '' $ac_executable_extensions; do
9915
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9916
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
9917
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9918
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9919
break 2
9920
fi
9921
done
9922
-done
9923
+ done
9924
IFS=$as_save_IFS
9925
9926
fi
9927
fi
9928
DSYMUTIL=$ac_cv_prog_DSYMUTIL
9929
if test -n "$DSYMUTIL"; then
9930
- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
9931
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
9932
$as_echo "$DSYMUTIL" >&6; }
9933
else
9934
- { $as_echo "$as_me:$LINENO: result: no" >&5
9935
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9936
$as_echo "no" >&6; }
9937
fi
9938
9939
@@ -6825,9 +7225,9 @@
9940
ac_ct_DSYMUTIL=$DSYMUTIL
9941
# Extract the first word of "dsymutil", so it can be a program name with args.
9942
set dummy dsymutil; ac_word=$2
9943
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9944
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9945
$as_echo_n "checking for $ac_word... " >&6; }
9946
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
9947
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
9948
$as_echo_n "(cached) " >&6
9949
else
9950
if test -n "$ac_ct_DSYMUTIL"; then
9951
@@ -6838,24 +7238,24 @@
9952
do
9953
IFS=$as_save_IFS
9954
test -z "$as_dir" && as_dir=.
9955
- for ac_exec_ext in '' $ac_executable_extensions; do
9956
+ for ac_exec_ext in '' $ac_executable_extensions; do
9957
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
9958
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
9959
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9960
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9961
break 2
9962
fi
9963
done
9964
-done
9965
+ done
9966
IFS=$as_save_IFS
9967
9968
fi
9969
fi
9970
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
9971
if test -n "$ac_ct_DSYMUTIL"; then
9972
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
9973
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
9974
$as_echo "$ac_ct_DSYMUTIL" >&6; }
9975
else
9976
- { $as_echo "$as_me:$LINENO: result: no" >&5
9977
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9978
$as_echo "no" >&6; }
9979
fi
9980
9981
@@ -6864,7 +7264,7 @@
9982
else
9983
case $cross_compiling:$ac_tool_warned in
9984
yes:)
9985
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
9986
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9987
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9988
ac_tool_warned=yes ;;
9989
esac
9990
@@ -6877,9 +7277,9 @@
9991
if test -n "$ac_tool_prefix"; then
9992
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
9993
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
9994
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
9995
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9996
$as_echo_n "checking for $ac_word... " >&6; }
9997
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
9998
+if ${ac_cv_prog_NMEDIT+:} false; then :
9999
$as_echo_n "(cached) " >&6
10000
else
10001
if test -n "$NMEDIT"; then
10002
@@ -6890,24 +7290,24 @@
10003
do
10004
IFS=$as_save_IFS
10005
test -z "$as_dir" && as_dir=.
10006
- for ac_exec_ext in '' $ac_executable_extensions; do
10007
+ for ac_exec_ext in '' $ac_executable_extensions; do
10008
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10009
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
10010
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10011
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10012
break 2
10013
fi
10014
done
10015
-done
10016
+ done
10017
IFS=$as_save_IFS
10018
10019
fi
10020
fi
10021
NMEDIT=$ac_cv_prog_NMEDIT
10022
if test -n "$NMEDIT"; then
10023
- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
10024
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
10025
$as_echo "$NMEDIT" >&6; }
10026
else
10027
- { $as_echo "$as_me:$LINENO: result: no" >&5
10028
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10029
$as_echo "no" >&6; }
10030
fi
10031
10032
@@ -6917,9 +7317,9 @@
10033
ac_ct_NMEDIT=$NMEDIT
10034
# Extract the first word of "nmedit", so it can be a program name with args.
10035
set dummy nmedit; ac_word=$2
10036
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10037
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10038
$as_echo_n "checking for $ac_word... " >&6; }
10039
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
10040
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
10041
$as_echo_n "(cached) " >&6
10042
else
10043
if test -n "$ac_ct_NMEDIT"; then
10044
@@ -6930,24 +7330,24 @@
10045
do
10046
IFS=$as_save_IFS
10047
test -z "$as_dir" && as_dir=.
10048
- for ac_exec_ext in '' $ac_executable_extensions; do
10049
+ for ac_exec_ext in '' $ac_executable_extensions; do
10050
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10051
ac_cv_prog_ac_ct_NMEDIT="nmedit"
10052
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10053
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10054
break 2
10055
fi
10056
done
10057
-done
10058
+ done
10059
IFS=$as_save_IFS
10060
10061
fi
10062
fi
10063
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
10064
if test -n "$ac_ct_NMEDIT"; then
10065
- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
10066
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
10067
$as_echo "$ac_ct_NMEDIT" >&6; }
10068
else
10069
- { $as_echo "$as_me:$LINENO: result: no" >&5
10070
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10071
$as_echo "no" >&6; }
10072
fi
10073
10074
@@ -6956,7 +7356,7 @@
10075
else
10076
case $cross_compiling:$ac_tool_warned in
10077
yes:)
10078
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
10079
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10080
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10081
ac_tool_warned=yes ;;
10082
esac
10083
@@ -6969,9 +7369,9 @@
10084
if test -n "$ac_tool_prefix"; then
10085
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
10086
set dummy ${ac_tool_prefix}lipo; ac_word=$2
10087
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10088
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10089
$as_echo_n "checking for $ac_word... " >&6; }
10090
-if test "${ac_cv_prog_LIPO+set}" = set; then
10091
+if ${ac_cv_prog_LIPO+:} false; then :
10092
$as_echo_n "(cached) " >&6
10093
else
10094
if test -n "$LIPO"; then
10095
@@ -6982,24 +7382,24 @@
10096
do
10097
IFS=$as_save_IFS
10098
test -z "$as_dir" && as_dir=.
10099
- for ac_exec_ext in '' $ac_executable_extensions; do
10100
+ for ac_exec_ext in '' $ac_executable_extensions; do
10101
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10102
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
10103
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10104
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10105
break 2
10106
fi
10107
done
10108
-done
10109
+ done
10110
IFS=$as_save_IFS
10111
10112
fi
10113
fi
10114
LIPO=$ac_cv_prog_LIPO
10115
if test -n "$LIPO"; then
10116
- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
10117
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
10118
$as_echo "$LIPO" >&6; }
10119
else
10120
- { $as_echo "$as_me:$LINENO: result: no" >&5
10121
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10122
$as_echo "no" >&6; }
10123
fi
10124
10125
@@ -7009,9 +7409,9 @@
10126
ac_ct_LIPO=$LIPO
10127
# Extract the first word of "lipo", so it can be a program name with args.
10128
set dummy lipo; ac_word=$2
10129
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10130
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10131
$as_echo_n "checking for $ac_word... " >&6; }
10132
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
10133
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
10134
$as_echo_n "(cached) " >&6
10135
else
10136
if test -n "$ac_ct_LIPO"; then
10137
@@ -7022,24 +7422,24 @@
10138
do
10139
IFS=$as_save_IFS
10140
test -z "$as_dir" && as_dir=.
10141
- for ac_exec_ext in '' $ac_executable_extensions; do
10142
+ for ac_exec_ext in '' $ac_executable_extensions; do
10143
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10144
ac_cv_prog_ac_ct_LIPO="lipo"
10145
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10146
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10147
break 2
10148
fi
10149
done
10150
-done
10151
+ done
10152
IFS=$as_save_IFS
10153
10154
fi
10155
fi
10156
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
10157
if test -n "$ac_ct_LIPO"; then
10158
- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
10159
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
10160
$as_echo "$ac_ct_LIPO" >&6; }
10161
else
10162
- { $as_echo "$as_me:$LINENO: result: no" >&5
10163
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10164
$as_echo "no" >&6; }
10165
fi
10166
10167
@@ -7048,7 +7448,7 @@
10168
else
10169
case $cross_compiling:$ac_tool_warned in
10170
yes:)
10171
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
10172
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10173
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10174
ac_tool_warned=yes ;;
10175
esac
10176
@@ -7061,9 +7461,9 @@
10177
if test -n "$ac_tool_prefix"; then
10178
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
10179
set dummy ${ac_tool_prefix}otool; ac_word=$2
10180
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10181
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10182
$as_echo_n "checking for $ac_word... " >&6; }
10183
-if test "${ac_cv_prog_OTOOL+set}" = set; then
10184
+if ${ac_cv_prog_OTOOL+:} false; then :
10185
$as_echo_n "(cached) " >&6
10186
else
10187
if test -n "$OTOOL"; then
10188
@@ -7074,24 +7474,24 @@
10189
do
10190
IFS=$as_save_IFS
10191
test -z "$as_dir" && as_dir=.
10192
- for ac_exec_ext in '' $ac_executable_extensions; do
10193
+ for ac_exec_ext in '' $ac_executable_extensions; do
10194
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10195
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
10196
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10197
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10198
break 2
10199
fi
10200
done
10201
-done
10202
+ done
10203
IFS=$as_save_IFS
10204
10205
fi
10206
fi
10207
OTOOL=$ac_cv_prog_OTOOL
10208
if test -n "$OTOOL"; then
10209
- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
10210
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
10211
$as_echo "$OTOOL" >&6; }
10212
else
10213
- { $as_echo "$as_me:$LINENO: result: no" >&5
10214
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10215
$as_echo "no" >&6; }
10216
fi
10217
10218
@@ -7101,9 +7501,9 @@
10219
ac_ct_OTOOL=$OTOOL
10220
# Extract the first word of "otool", so it can be a program name with args.
10221
set dummy otool; ac_word=$2
10222
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10223
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10224
$as_echo_n "checking for $ac_word... " >&6; }
10225
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
10226
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
10227
$as_echo_n "(cached) " >&6
10228
else
10229
if test -n "$ac_ct_OTOOL"; then
10230
@@ -7114,24 +7514,24 @@
10231
do
10232
IFS=$as_save_IFS
10233
test -z "$as_dir" && as_dir=.
10234
- for ac_exec_ext in '' $ac_executable_extensions; do
10235
+ for ac_exec_ext in '' $ac_executable_extensions; do
10236
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10237
ac_cv_prog_ac_ct_OTOOL="otool"
10238
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10239
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10240
break 2
10241
fi
10242
done
10243
-done
10244
+ done
10245
IFS=$as_save_IFS
10246
10247
fi
10248
fi
10249
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
10250
if test -n "$ac_ct_OTOOL"; then
10251
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
10252
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
10253
$as_echo "$ac_ct_OTOOL" >&6; }
10254
else
10255
- { $as_echo "$as_me:$LINENO: result: no" >&5
10256
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10257
$as_echo "no" >&6; }
10258
fi
10259
10260
@@ -7140,7 +7540,7 @@
10261
else
10262
case $cross_compiling:$ac_tool_warned in
10263
yes:)
10264
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
10265
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10266
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10267
ac_tool_warned=yes ;;
10268
esac
10269
@@ -7153,9 +7553,9 @@
10270
if test -n "$ac_tool_prefix"; then
10271
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
10272
set dummy ${ac_tool_prefix}otool64; ac_word=$2
10273
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10274
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10275
$as_echo_n "checking for $ac_word... " >&6; }
10276
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
10277
+if ${ac_cv_prog_OTOOL64+:} false; then :
10278
$as_echo_n "(cached) " >&6
10279
else
10280
if test -n "$OTOOL64"; then
10281
@@ -7166,24 +7566,24 @@
10282
do
10283
IFS=$as_save_IFS
10284
test -z "$as_dir" && as_dir=.
10285
- for ac_exec_ext in '' $ac_executable_extensions; do
10286
+ for ac_exec_ext in '' $ac_executable_extensions; do
10287
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10288
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
10289
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10290
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10291
break 2
10292
fi
10293
done
10294
-done
10295
+ done
10296
IFS=$as_save_IFS
10297
10298
fi
10299
fi
10300
OTOOL64=$ac_cv_prog_OTOOL64
10301
if test -n "$OTOOL64"; then
10302
- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
10303
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
10304
$as_echo "$OTOOL64" >&6; }
10305
else
10306
- { $as_echo "$as_me:$LINENO: result: no" >&5
10307
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10308
$as_echo "no" >&6; }
10309
fi
10310
10311
@@ -7193,9 +7593,9 @@
10312
ac_ct_OTOOL64=$OTOOL64
10313
# Extract the first word of "otool64", so it can be a program name with args.
10314
set dummy otool64; ac_word=$2
10315
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10316
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10317
$as_echo_n "checking for $ac_word... " >&6; }
10318
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
10319
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
10320
$as_echo_n "(cached) " >&6
10321
else
10322
if test -n "$ac_ct_OTOOL64"; then
10323
@@ -7206,24 +7606,24 @@
10324
do
10325
IFS=$as_save_IFS
10326
test -z "$as_dir" && as_dir=.
10327
- for ac_exec_ext in '' $ac_executable_extensions; do
10328
+ for ac_exec_ext in '' $ac_executable_extensions; do
10329
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10330
ac_cv_prog_ac_ct_OTOOL64="otool64"
10331
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10332
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10333
break 2
10334
fi
10335
done
10336
-done
10337
+ done
10338
IFS=$as_save_IFS
10339
10340
fi
10341
fi
10342
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
10343
if test -n "$ac_ct_OTOOL64"; then
10344
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
10345
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
10346
$as_echo "$ac_ct_OTOOL64" >&6; }
10347
else
10348
- { $as_echo "$as_me:$LINENO: result: no" >&5
10349
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10350
$as_echo "no" >&6; }
10351
fi
10352
10353
@@ -7232,7 +7632,7 @@
10354
else
10355
case $cross_compiling:$ac_tool_warned in
10356
yes:)
10357
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
10358
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10359
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10360
ac_tool_warned=yes ;;
10361
esac
10362
@@ -7268,9 +7668,9 @@
10363
10364
10365
10366
- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
10367
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
10368
$as_echo_n "checking for -single_module linker flag... " >&6; }
10369
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
10370
+if ${lt_cv_apple_cc_single_mod+:} false; then :
10371
$as_echo_n "(cached) " >&6
10372
else
10373
lt_cv_apple_cc_single_mod=no
10374
@@ -7295,22 +7695,18 @@
10375
rm -f conftest.*
10376
fi
10377
fi
10378
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
10379
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
10380
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
10381
- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
10382
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
10383
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
10384
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
10385
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
10386
$as_echo_n "(cached) " >&6
10387
else
10388
lt_cv_ld_exported_symbols_list=no
10389
save_LDFLAGS=$LDFLAGS
10390
echo "_main" > conftest.sym
10391
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
10392
- cat >conftest.$ac_ext <<_ACEOF
10393
-/* confdefs.h. */
10394
-_ACEOF
10395
-cat confdefs.h >>conftest.$ac_ext
10396
-cat >>conftest.$ac_ext <<_ACEOF
10397
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10398
/* end confdefs.h. */
10399
10400
int
10401
@@ -7321,43 +7717,50 @@
10402
return 0;
10403
}
10404
_ACEOF
10405
-rm -f conftest.$ac_objext conftest$ac_exeext
10406
-if { (ac_try="$ac_link"
10407
-case "(($ac_try" in
10408
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10409
- *) ac_try_echo=$ac_try;;
10410
-esac
10411
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10412
-$as_echo "$ac_try_echo") >&5
10413
- (eval "$ac_link") 2>conftest.er1
10414
- ac_status=$?
10415
- grep -v '^ *+' conftest.er1 >conftest.err
10416
- rm -f conftest.er1
10417
- cat conftest.err >&5
10418
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10419
- (exit $ac_status); } && {
10420
- test -z "$ac_c_werror_flag" ||
10421
- test ! -s conftest.err
10422
- } && test -s conftest$ac_exeext && {
10423
- test "$cross_compiling" = yes ||
10424
- $as_test_x conftest$ac_exeext
10425
- }; then
10426
+if ac_fn_c_try_link "$LINENO"; then :
10427
lt_cv_ld_exported_symbols_list=yes
10428
else
10429
- $as_echo "$as_me: failed program was:" >&5
10430
-sed 's/^/| /' conftest.$ac_ext >&5
10431
-
10432
- lt_cv_ld_exported_symbols_list=no
10433
+ lt_cv_ld_exported_symbols_list=no
10434
fi
10435
-
10436
-rm -rf conftest.dSYM
10437
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10438
- conftest$ac_exeext conftest.$ac_ext
10439
+rm -f core conftest.err conftest.$ac_objext \
10440
+ conftest$ac_exeext conftest.$ac_ext
10441
LDFLAGS="$save_LDFLAGS"
10442
10443
fi
10444
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
10445
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
10446
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
10447
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
10448
+$as_echo_n "checking for -force_load linker flag... " >&6; }
10449
+if ${lt_cv_ld_force_load+:} false; then :
10450
+ $as_echo_n "(cached) " >&6
10451
+else
10452
+ lt_cv_ld_force_load=no
10453
+ cat > conftest.c << _LT_EOF
10454
+int forced_loaded() { return 2;}
10455
+_LT_EOF
10456
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
10457
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
10458
+ echo "$AR cru libconftest.a conftest.o" >&5
10459
+ $AR cru libconftest.a conftest.o 2>&5
10460
+ echo "$RANLIB libconftest.a" >&5
10461
+ $RANLIB libconftest.a 2>&5
10462
+ cat > conftest.c << _LT_EOF
10463
+int main() { return 0;}
10464
+_LT_EOF
10465
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
10466
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
10467
+ _lt_result=$?
10468
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
10469
+ lt_cv_ld_force_load=yes
10470
+ else
10471
+ cat conftest.err >&5
10472
+ fi
10473
+ rm -f conftest.err libconftest.a conftest conftest.c
10474
+ rm -rf conftest.dSYM
10475
+
10476
+fi
10477
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
10478
+$as_echo "$lt_cv_ld_force_load" >&6; }
10479
case $host_os in
10480
rhapsody* | darwin1.[012])
10481
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
10482
@@ -7385,7 +7788,7 @@
10483
else
10484
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
10485
fi
10486
- if test "$DSYMUTIL" != ":"; then
10487
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
10488
_lt_dsymutil='~$DSYMUTIL $lib || :'
10489
else
10490
_lt_dsymutil=
10491
@@ -7398,14 +7801,14 @@
10492
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10493
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10494
ac_compiler_gnu=$ac_cv_c_compiler_gnu
10495
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
10496
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
10497
$as_echo_n "checking how to run the C preprocessor... " >&6; }
10498
# On Suns, sometimes $CPP names a directory.
10499
if test -n "$CPP" && test -d "$CPP"; then
10500
CPP=
10501
fi
10502
if test -z "$CPP"; then
10503
- if test "${ac_cv_prog_CPP+set}" = set; then
10504
+ if ${ac_cv_prog_CPP+:} false; then :
10505
$as_echo_n "(cached) " >&6
10506
else
10507
# Double quotes because CPP needs to be expanded
10508
@@ -7420,11 +7823,7 @@
10509
# <limits.h> exists even on freestanding compilers.
10510
# On the NeXT, cc -E runs the code through the compiler's parser,
10511
# not just through cpp. "Syntax error" is here to catch this case.
10512
- cat >conftest.$ac_ext <<_ACEOF
10513
-/* confdefs.h. */
10514
-_ACEOF
10515
-cat confdefs.h >>conftest.$ac_ext
10516
-cat >>conftest.$ac_ext <<_ACEOF
10517
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10518
/* end confdefs.h. */
10519
#ifdef __STDC__
10520
# include <limits.h>
10521
@@ -7433,78 +7832,34 @@
10522
#endif
10523
Syntax error
10524
_ACEOF
10525
-if { (ac_try="$ac_cpp conftest.$ac_ext"
10526
-case "(($ac_try" in
10527
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10528
- *) ac_try_echo=$ac_try;;
10529
-esac
10530
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10531
-$as_echo "$ac_try_echo") >&5
10532
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
10533
- ac_status=$?
10534
- grep -v '^ *+' conftest.er1 >conftest.err
10535
- rm -f conftest.er1
10536
- cat conftest.err >&5
10537
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10538
- (exit $ac_status); } >/dev/null && {
10539
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
10540
- test ! -s conftest.err
10541
- }; then
10542
- :
10543
-else
10544
- $as_echo "$as_me: failed program was:" >&5
10545
-sed 's/^/| /' conftest.$ac_ext >&5
10546
+if ac_fn_c_try_cpp "$LINENO"; then :
10547
10548
+else
10549
# Broken: fails on valid input.
10550
continue
10551
fi
10552
-
10553
-rm -f conftest.err conftest.$ac_ext
10554
+rm -f conftest.err conftest.i conftest.$ac_ext
10555
10556
# OK, works on sane cases. Now check whether nonexistent headers
10557
# can be detected and how.
10558
- cat >conftest.$ac_ext <<_ACEOF
10559
-/* confdefs.h. */
10560
-_ACEOF
10561
-cat confdefs.h >>conftest.$ac_ext
10562
-cat >>conftest.$ac_ext <<_ACEOF
10563
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10564
/* end confdefs.h. */
10565
#include <ac_nonexistent.h>
10566
_ACEOF
10567
-if { (ac_try="$ac_cpp conftest.$ac_ext"
10568
-case "(($ac_try" in
10569
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10570
- *) ac_try_echo=$ac_try;;
10571
-esac
10572
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10573
-$as_echo "$ac_try_echo") >&5
10574
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
10575
- ac_status=$?
10576
- grep -v '^ *+' conftest.er1 >conftest.err
10577
- rm -f conftest.er1
10578
- cat conftest.err >&5
10579
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10580
- (exit $ac_status); } >/dev/null && {
10581
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
10582
- test ! -s conftest.err
10583
- }; then
10584
+if ac_fn_c_try_cpp "$LINENO"; then :
10585
# Broken: success on invalid input.
10586
continue
10587
else
10588
- $as_echo "$as_me: failed program was:" >&5
10589
-sed 's/^/| /' conftest.$ac_ext >&5
10590
-
10591
# Passes both tests.
10592
ac_preproc_ok=:
10593
break
10594
fi
10595
-
10596
-rm -f conftest.err conftest.$ac_ext
10597
+rm -f conftest.err conftest.i conftest.$ac_ext
10598
10599
done
10600
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
10601
-rm -f conftest.err conftest.$ac_ext
10602
-if $ac_preproc_ok; then
10603
+rm -f conftest.i conftest.err conftest.$ac_ext
10604
+if $ac_preproc_ok; then :
10605
break
10606
fi
10607
10608
@@ -7516,7 +7871,7 @@
10609
else
10610
ac_cv_prog_CPP=$CPP
10611
fi
10612
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
10613
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
10614
$as_echo "$CPP" >&6; }
10615
ac_preproc_ok=false
10616
for ac_c_preproc_warn_flag in '' yes
10617
@@ -7527,11 +7882,7 @@
10618
# <limits.h> exists even on freestanding compilers.
10619
# On the NeXT, cc -E runs the code through the compiler's parser,
10620
# not just through cpp. "Syntax error" is here to catch this case.
10621
- cat >conftest.$ac_ext <<_ACEOF
10622
-/* confdefs.h. */
10623
-_ACEOF
10624
-cat confdefs.h >>conftest.$ac_ext
10625
-cat >>conftest.$ac_ext <<_ACEOF
10626
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10627
/* end confdefs.h. */
10628
#ifdef __STDC__
10629
# include <limits.h>
10630
@@ -7540,87 +7891,40 @@
10631
#endif
10632
Syntax error
10633
_ACEOF
10634
-if { (ac_try="$ac_cpp conftest.$ac_ext"
10635
-case "(($ac_try" in
10636
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10637
- *) ac_try_echo=$ac_try;;
10638
-esac
10639
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10640
-$as_echo "$ac_try_echo") >&5
10641
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
10642
- ac_status=$?
10643
- grep -v '^ *+' conftest.er1 >conftest.err
10644
- rm -f conftest.er1
10645
- cat conftest.err >&5
10646
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10647
- (exit $ac_status); } >/dev/null && {
10648
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
10649
- test ! -s conftest.err
10650
- }; then
10651
- :
10652
-else
10653
- $as_echo "$as_me: failed program was:" >&5
10654
-sed 's/^/| /' conftest.$ac_ext >&5
10655
+if ac_fn_c_try_cpp "$LINENO"; then :
10656
10657
+else
10658
# Broken: fails on valid input.
10659
continue
10660
fi
10661
-
10662
-rm -f conftest.err conftest.$ac_ext
10663
+rm -f conftest.err conftest.i conftest.$ac_ext
10664
10665
# OK, works on sane cases. Now check whether nonexistent headers
10666
# can be detected and how.
10667
- cat >conftest.$ac_ext <<_ACEOF
10668
-/* confdefs.h. */
10669
-_ACEOF
10670
-cat confdefs.h >>conftest.$ac_ext
10671
-cat >>conftest.$ac_ext <<_ACEOF
10672
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10673
/* end confdefs.h. */
10674
#include <ac_nonexistent.h>
10675
_ACEOF
10676
-if { (ac_try="$ac_cpp conftest.$ac_ext"
10677
-case "(($ac_try" in
10678
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10679
- *) ac_try_echo=$ac_try;;
10680
-esac
10681
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10682
-$as_echo "$ac_try_echo") >&5
10683
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
10684
- ac_status=$?
10685
- grep -v '^ *+' conftest.er1 >conftest.err
10686
- rm -f conftest.er1
10687
- cat conftest.err >&5
10688
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10689
- (exit $ac_status); } >/dev/null && {
10690
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
10691
- test ! -s conftest.err
10692
- }; then
10693
+if ac_fn_c_try_cpp "$LINENO"; then :
10694
# Broken: success on invalid input.
10695
continue
10696
else
10697
- $as_echo "$as_me: failed program was:" >&5
10698
-sed 's/^/| /' conftest.$ac_ext >&5
10699
-
10700
# Passes both tests.
10701
ac_preproc_ok=:
10702
break
10703
fi
10704
-
10705
-rm -f conftest.err conftest.$ac_ext
10706
+rm -f conftest.err conftest.i conftest.$ac_ext
10707
10708
done
10709
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
10710
-rm -f conftest.err conftest.$ac_ext
10711
-if $ac_preproc_ok; then
10712
- :
10713
+rm -f conftest.i conftest.err conftest.$ac_ext
10714
+if $ac_preproc_ok; then :
10715
+
10716
else
10717
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10718
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10719
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10720
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
10721
-See \`config.log' for more details." >&5
10722
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
10723
-See \`config.log' for more details." >&2;}
10724
- { (exit 1); exit 1; }; }; }
10725
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
10726
+See \`config.log' for more details" "$LINENO" 5; }
10727
fi
10728
10729
ac_ext=c
10730
@@ -7630,16 +7934,12 @@
10731
ac_compiler_gnu=$ac_cv_c_compiler_gnu
10732
10733
10734
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
10735
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
10736
$as_echo_n "checking for ANSI C header files... " >&6; }
10737
-if test "${ac_cv_header_stdc+set}" = set; then
10738
+if ${ac_cv_header_stdc+:} false; then :
10739
$as_echo_n "(cached) " >&6
10740
else
10741
- cat >conftest.$ac_ext <<_ACEOF
10742
-/* confdefs.h. */
10743
-_ACEOF
10744
-cat confdefs.h >>conftest.$ac_ext
10745
-cat >>conftest.$ac_ext <<_ACEOF
10746
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10747
/* end confdefs.h. */
10748
#include <stdlib.h>
10749
#include <stdarg.h>
10750
@@ -7647,55 +7947,30 @@
10751
#include <float.h>
10752
10753
int
10754
-main ()
10755
-{
10756
-
10757
- ;
10758
- return 0;
10759
-}
10760
-_ACEOF
10761
-rm -f conftest.$ac_objext
10762
-if { (ac_try="$ac_compile"
10763
-case "(($ac_try" in
10764
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10765
- *) ac_try_echo=$ac_try;;
10766
-esac
10767
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10768
-$as_echo "$ac_try_echo") >&5
10769
- (eval "$ac_compile") 2>conftest.er1
10770
- ac_status=$?
10771
- grep -v '^ *+' conftest.er1 >conftest.err
10772
- rm -f conftest.er1
10773
- cat conftest.err >&5
10774
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10775
- (exit $ac_status); } && {
10776
- test -z "$ac_c_werror_flag" ||
10777
- test ! -s conftest.err
10778
- } && test -s conftest.$ac_objext; then
10779
+main ()
10780
+{
10781
+
10782
+ ;
10783
+ return 0;
10784
+}
10785
+_ACEOF
10786
+if ac_fn_c_try_compile "$LINENO"; then :
10787
ac_cv_header_stdc=yes
10788
else
10789
- $as_echo "$as_me: failed program was:" >&5
10790
-sed 's/^/| /' conftest.$ac_ext >&5
10791
-
10792
- ac_cv_header_stdc=no
10793
+ ac_cv_header_stdc=no
10794
fi
10795
-
10796
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10797
10798
if test $ac_cv_header_stdc = yes; then
10799
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
10800
- cat >conftest.$ac_ext <<_ACEOF
10801
-/* confdefs.h. */
10802
-_ACEOF
10803
-cat confdefs.h >>conftest.$ac_ext
10804
-cat >>conftest.$ac_ext <<_ACEOF
10805
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10806
/* end confdefs.h. */
10807
#include <string.h>
10808
10809
_ACEOF
10810
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
10811
- $EGREP "memchr" >/dev/null 2>&1; then
10812
- :
10813
+ $EGREP "memchr" >/dev/null 2>&1; then :
10814
+
10815
else
10816
ac_cv_header_stdc=no
10817
fi
10818
@@ -7705,18 +7980,14 @@
10819
10820
if test $ac_cv_header_stdc = yes; then
10821
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
10822
- cat >conftest.$ac_ext <<_ACEOF
10823
-/* confdefs.h. */
10824
-_ACEOF
10825
-cat confdefs.h >>conftest.$ac_ext
10826
-cat >>conftest.$ac_ext <<_ACEOF
10827
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10828
/* end confdefs.h. */
10829
#include <stdlib.h>
10830
10831
_ACEOF
10832
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
10833
- $EGREP "free" >/dev/null 2>&1; then
10834
- :
10835
+ $EGREP "free" >/dev/null 2>&1; then :
10836
+
10837
else
10838
ac_cv_header_stdc=no
10839
fi
10840
@@ -7726,14 +7997,10 @@
10841
10842
if test $ac_cv_header_stdc = yes; then
10843
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
10844
- if test "$cross_compiling" = yes; then
10845
+ if test "$cross_compiling" = yes; then :
10846
:
10847
else
10848
- cat >conftest.$ac_ext <<_ACEOF
10849
-/* confdefs.h. */
10850
-_ACEOF
10851
-cat confdefs.h >>conftest.$ac_ext
10852
-cat >>conftest.$ac_ext <<_ACEOF
10853
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10854
/* end confdefs.h. */
10855
#include <ctype.h>
10856
#include <stdlib.h>
10857
@@ -7760,118 +8027,33 @@
10858
return 0;
10859
}
10860
_ACEOF
10861
-rm -f conftest$ac_exeext
10862
-if { (ac_try="$ac_link"
10863
-case "(($ac_try" in
10864
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10865
- *) ac_try_echo=$ac_try;;
10866
-esac
10867
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10868
-$as_echo "$ac_try_echo") >&5
10869
- (eval "$ac_link") 2>&5
10870
- ac_status=$?
10871
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10872
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10873
- { (case "(($ac_try" in
10874
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10875
- *) ac_try_echo=$ac_try;;
10876
-esac
10877
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10878
-$as_echo "$ac_try_echo") >&5
10879
- (eval "$ac_try") 2>&5
10880
- ac_status=$?
10881
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10882
- (exit $ac_status); }; }; then
10883
- :
10884
-else
10885
- $as_echo "$as_me: program exited with status $ac_status" >&5
10886
-$as_echo "$as_me: failed program was:" >&5
10887
-sed 's/^/| /' conftest.$ac_ext >&5
10888
+if ac_fn_c_try_run "$LINENO"; then :
10889
10890
-( exit $ac_status )
10891
-ac_cv_header_stdc=no
10892
+else
10893
+ ac_cv_header_stdc=no
10894
fi
10895
-rm -rf conftest.dSYM
10896
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10897
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
10898
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
10899
fi
10900
10901
-
10902
fi
10903
fi
10904
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
10905
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
10906
$as_echo "$ac_cv_header_stdc" >&6; }
10907
if test $ac_cv_header_stdc = yes; then
10908
10909
-cat >>confdefs.h <<\_ACEOF
10910
-#define STDC_HEADERS 1
10911
-_ACEOF
10912
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
10913
10914
fi
10915
10916
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
10917
-
10918
-
10919
-
10920
-
10921
-
10922
-
10923
-
10924
-
10925
-
10926
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
10927
inttypes.h stdint.h unistd.h
10928
-do
10929
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
10930
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
10931
-$as_echo_n "checking for $ac_header... " >&6; }
10932
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10933
- $as_echo_n "(cached) " >&6
10934
-else
10935
- cat >conftest.$ac_ext <<_ACEOF
10936
-/* confdefs.h. */
10937
-_ACEOF
10938
-cat confdefs.h >>conftest.$ac_ext
10939
-cat >>conftest.$ac_ext <<_ACEOF
10940
-/* end confdefs.h. */
10941
-$ac_includes_default
10942
-
10943
-#include <$ac_header>
10944
-_ACEOF
10945
-rm -f conftest.$ac_objext
10946
-if { (ac_try="$ac_compile"
10947
-case "(($ac_try" in
10948
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10949
- *) ac_try_echo=$ac_try;;
10950
-esac
10951
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10952
-$as_echo "$ac_try_echo") >&5
10953
- (eval "$ac_compile") 2>conftest.er1
10954
- ac_status=$?
10955
- grep -v '^ *+' conftest.er1 >conftest.err
10956
- rm -f conftest.er1
10957
- cat conftest.err >&5
10958
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10959
- (exit $ac_status); } && {
10960
- test -z "$ac_c_werror_flag" ||
10961
- test ! -s conftest.err
10962
- } && test -s conftest.$ac_objext; then
10963
- eval "$as_ac_Header=yes"
10964
-else
10965
- $as_echo "$as_me: failed program was:" >&5
10966
-sed 's/^/| /' conftest.$ac_ext >&5
10967
-
10968
- eval "$as_ac_Header=no"
10969
-fi
10970
-
10971
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10972
-fi
10973
-ac_res=`eval 'as_val=${'$as_ac_Header'}
10974
- $as_echo "$as_val"'`
10975
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10976
-$as_echo "$ac_res" >&6; }
10977
-as_val=`eval 'as_val=${'$as_ac_Header'}
10978
- $as_echo "$as_val"'`
10979
- if test "x$as_val" = x""yes; then
10980
+do :
10981
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
10982
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
10983
+"
10984
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
10985
cat >>confdefs.h <<_ACEOF
10986
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
10987
_ACEOF
10988
@@ -7881,62 +8063,13 @@
10989
done
10990
10991
10992
-
10993
for ac_header in dlfcn.h
10994
-do
10995
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
10996
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
10997
-$as_echo_n "checking for $ac_header... " >&6; }
10998
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10999
- $as_echo_n "(cached) " >&6
11000
-else
11001
- cat >conftest.$ac_ext <<_ACEOF
11002
-/* confdefs.h. */
11003
-_ACEOF
11004
-cat confdefs.h >>conftest.$ac_ext
11005
-cat >>conftest.$ac_ext <<_ACEOF
11006
-/* end confdefs.h. */
11007
-$ac_includes_default
11008
-
11009
-#include <$ac_header>
11010
-_ACEOF
11011
-rm -f conftest.$ac_objext
11012
-if { (ac_try="$ac_compile"
11013
-case "(($ac_try" in
11014
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11015
- *) ac_try_echo=$ac_try;;
11016
-esac
11017
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11018
-$as_echo "$ac_try_echo") >&5
11019
- (eval "$ac_compile") 2>conftest.er1
11020
- ac_status=$?
11021
- grep -v '^ *+' conftest.er1 >conftest.err
11022
- rm -f conftest.er1
11023
- cat conftest.err >&5
11024
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11025
- (exit $ac_status); } && {
11026
- test -z "$ac_c_werror_flag" ||
11027
- test ! -s conftest.err
11028
- } && test -s conftest.$ac_objext; then
11029
- eval "$as_ac_Header=yes"
11030
-else
11031
- $as_echo "$as_me: failed program was:" >&5
11032
-sed 's/^/| /' conftest.$ac_ext >&5
11033
-
11034
- eval "$as_ac_Header=no"
11035
-fi
11036
-
11037
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11038
-fi
11039
-ac_res=`eval 'as_val=${'$as_ac_Header'}
11040
- $as_echo "$as_val"'`
11041
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
11042
-$as_echo "$ac_res" >&6; }
11043
-as_val=`eval 'as_val=${'$as_ac_Header'}
11044
- $as_echo "$as_val"'`
11045
- if test "x$as_val" = x""yes; then
11046
+do :
11047
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
11048
+"
11049
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
11050
cat >>confdefs.h <<_ACEOF
11051
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
11052
+#define HAVE_DLFCN_H 1
11053
_ACEOF
11054
11055
fi
11056
@@ -7945,6 +8078,8 @@
11057
11058
11059
11060
+
11061
+
11062
# Set options
11063
11064
11065
@@ -7956,7 +8091,7 @@
11066
11067
11068
# Check whether --enable-shared was given.
11069
-if test "${enable_shared+set}" = set; then
11070
+if test "${enable_shared+set}" = set; then :
11071
enableval=$enable_shared; p=${PACKAGE-default}
11072
case $enableval in
11073
yes) enable_shared=yes ;;
11074
@@ -7989,7 +8124,7 @@
11075
11076
11077
# Check whether --with-pic was given.
11078
-if test "${with_pic+set}" = set; then
11079
+if test "${with_pic+set}" = set; then :
11080
withval=$with_pic; pic_mode="$withval"
11081
else
11082
pic_mode=default
11083
@@ -8005,7 +8140,7 @@
11084
11085
11086
# Check whether --enable-fast-install was given.
11087
-if test "${enable_fast_install+set}" = set; then
11088
+if test "${enable_fast_install+set}" = set; then :
11089
enableval=$enable_fast_install; p=${PACKAGE-default}
11090
case $enableval in
11091
yes) enable_fast_install=yes ;;
11092
@@ -8067,6 +8202,7 @@
11093
11094
11095
11096
+
11097
test -z "$LN_S" && LN_S="ln -s"
11098
11099
11100
@@ -8086,9 +8222,9 @@
11101
setopt NO_GLOB_SUBST
11102
fi
11103
11104
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
11105
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
11106
$as_echo_n "checking for objdir... " >&6; }
11107
-if test "${lt_cv_objdir+set}" = set; then
11108
+if ${lt_cv_objdir+:} false; then :
11109
$as_echo_n "(cached) " >&6
11110
else
11111
rm -f .libs 2>/dev/null
11112
@@ -8101,7 +8237,7 @@
11113
fi
11114
rmdir .libs 2>/dev/null
11115
fi
11116
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
11117
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
11118
$as_echo "$lt_cv_objdir" >&6; }
11119
objdir=$lt_cv_objdir
11120
11121
@@ -8116,19 +8252,6 @@
11122
11123
11124
11125
-
11126
-
11127
-
11128
-
11129
-
11130
-
11131
-
11132
-
11133
-
11134
-
11135
-
11136
-
11137
-
11138
case $host_os in
11139
aix3*)
11140
# AIX sometimes has problems with the GCC collect2 program. For some
11141
@@ -8141,23 +8264,6 @@
11142
;;
11143
esac
11144
11145
-# Sed substitution that helps us do robust quoting. It backslashifies
11146
-# metacharacters that are still active within double-quoted strings.
11147
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
11148
-
11149
-# Same as above, but do not quote variable references.
11150
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
11151
-
11152
-# Sed substitution to delay expansion of an escaped shell variable in a
11153
-# double_quote_subst'ed string.
11154
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
11155
-
11156
-# Sed substitution to delay expansion of an escaped single quote.
11157
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
11158
-
11159
-# Sed substitution to avoid accidental globbing in evaled expressions
11160
-no_glob_subst='s/\*/\\\*/g'
11161
-
11162
# Global variables:
11163
ofile=libtool
11164
can_build_shared=yes
11165
@@ -8186,7 +8292,7 @@
11166
*) break;;
11167
esac
11168
done
11169
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
11170
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
11171
11172
11173
# Only perform the check for file, if the check method requires it
11174
@@ -8194,9 +8300,9 @@
11175
case $deplibs_check_method in
11176
file_magic*)
11177
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
11178
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
11179
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
11180
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
11181
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
11182
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
11183
$as_echo_n "(cached) " >&6
11184
else
11185
case $MAGIC_CMD in
11186
@@ -8247,10 +8353,10 @@
11187
11188
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
11189
if test -n "$MAGIC_CMD"; then
11190
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
11191
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
11192
$as_echo "$MAGIC_CMD" >&6; }
11193
else
11194
- { $as_echo "$as_me:$LINENO: result: no" >&5
11195
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11196
$as_echo "no" >&6; }
11197
fi
11198
11199
@@ -8260,9 +8366,9 @@
11200
11201
if test -z "$lt_cv_path_MAGIC_CMD"; then
11202
if test -n "$ac_tool_prefix"; then
11203
- { $as_echo "$as_me:$LINENO: checking for file" >&5
11204
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
11205
$as_echo_n "checking for file... " >&6; }
11206
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
11207
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
11208
$as_echo_n "(cached) " >&6
11209
else
11210
case $MAGIC_CMD in
11211
@@ -8313,10 +8419,10 @@
11212
11213
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
11214
if test -n "$MAGIC_CMD"; then
11215
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
11216
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
11217
$as_echo "$MAGIC_CMD" >&6; }
11218
else
11219
- { $as_echo "$as_me:$LINENO: result: no" >&5
11220
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11221
$as_echo "no" >&6; }
11222
fi
11223
11224
@@ -8391,11 +8497,16 @@
11225
lt_prog_compiler_no_builtin_flag=
11226
11227
if test "$GCC" = yes; then
11228
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
11229
+ case $cc_basename in
11230
+ nvcc*)
11231
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
11232
+ *)
11233
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
11234
+ esac
11235
11236
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
11237
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
11238
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
11239
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
11240
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
11241
$as_echo_n "(cached) " >&6
11242
else
11243
lt_cv_prog_compiler_rtti_exceptions=no
11244
@@ -8411,15 +8522,15 @@
11245
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11246
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11247
-e 's:$: $lt_compiler_flag:'`
11248
- (eval echo "\"\$as_me:8414: $lt_compile\"" >&5)
11249
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
11250
(eval "$lt_compile" 2>conftest.err)
11251
ac_status=$?
11252
cat conftest.err >&5
11253
- echo "$as_me:8418: \$? = $ac_status" >&5
11254
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11255
if (exit $ac_status) && test -s "$ac_outfile"; then
11256
# The compiler can only warn and ignore the option if not recognized
11257
# So say no if there are warnings other than the usual output.
11258
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
11259
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
11260
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
11261
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
11262
lt_cv_prog_compiler_rtti_exceptions=yes
11263
@@ -8428,7 +8539,7 @@
11264
$RM conftest*
11265
11266
fi
11267
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
11268
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
11269
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
11270
11271
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
11272
@@ -8448,8 +8559,6 @@
11273
lt_prog_compiler_pic=
11274
lt_prog_compiler_static=
11275
11276
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
11277
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11278
11279
if test "$GCC" = yes; then
11280
lt_prog_compiler_wl='-Wl,'
11281
@@ -8497,6 +8606,12 @@
11282
lt_prog_compiler_pic='-fno-common'
11283
;;
11284
11285
+ haiku*)
11286
+ # PIC is the default for Haiku.
11287
+ # The "-static" flag exists, but is broken.
11288
+ lt_prog_compiler_static=
11289
+ ;;
11290
+
11291
hpux*)
11292
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
11293
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
11294
@@ -8539,6 +8654,13 @@
11295
lt_prog_compiler_pic='-fPIC'
11296
;;
11297
esac
11298
+
11299
+ case $cc_basename in
11300
+ nvcc*) # Cuda Compiler Driver 2.2
11301
+ lt_prog_compiler_wl='-Xlinker '
11302
+ lt_prog_compiler_pic='-Xcompiler -fPIC'
11303
+ ;;
11304
+ esac
11305
else
11306
# PORTME Check for flag to pass linker flags through the system compiler.
11307
case $host_os in
11308
@@ -8580,7 +8702,7 @@
11309
lt_prog_compiler_static='-non_shared'
11310
;;
11311
11312
- linux* | k*bsd*-gnu)
11313
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
11314
case $cc_basename in
11315
# old Intel for x86_64 which still supported -KPIC.
11316
ecc*)
11317
@@ -8601,7 +8723,13 @@
11318
lt_prog_compiler_pic='--shared'
11319
lt_prog_compiler_static='--static'
11320
;;
11321
- pgcc* | pgf77* | pgf90* | pgf95*)
11322
+ nagfor*)
11323
+ # NAG Fortran compiler
11324
+ lt_prog_compiler_wl='-Wl,-Wl,,'
11325
+ lt_prog_compiler_pic='-PIC'
11326
+ lt_prog_compiler_static='-Bstatic'
11327
+ ;;
11328
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
11329
# Portland Group compilers (*not* the Pentium gcc compiler,
11330
# which looks to be a dead project)
11331
lt_prog_compiler_wl='-Wl,'
11332
@@ -8613,25 +8741,25 @@
11333
# All Alpha code is PIC.
11334
lt_prog_compiler_static='-non_shared'
11335
;;
11336
- xl*)
11337
- # IBM XL C 8.0/Fortran 10.1 on PPC
11338
+ xl* | bgxl* | bgf* | mpixl*)
11339
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
11340
lt_prog_compiler_wl='-Wl,'
11341
lt_prog_compiler_pic='-qpic'
11342
lt_prog_compiler_static='-qstaticlink'
11343
;;
11344
*)
11345
case `$CC -V 2>&1 | sed 5q` in
11346
- *Sun\ C*)
11347
- # Sun C 5.9
11348
+ *Sun\ F* | *Sun*Fortran*)
11349
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
11350
lt_prog_compiler_pic='-KPIC'
11351
lt_prog_compiler_static='-Bstatic'
11352
- lt_prog_compiler_wl='-Wl,'
11353
+ lt_prog_compiler_wl=''
11354
;;
11355
- *Sun\ F*)
11356
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
11357
+ *Sun\ C*)
11358
+ # Sun C 5.9
11359
lt_prog_compiler_pic='-KPIC'
11360
lt_prog_compiler_static='-Bstatic'
11361
- lt_prog_compiler_wl=''
11362
+ lt_prog_compiler_wl='-Wl,'
11363
;;
11364
esac
11365
;;
11366
@@ -8663,7 +8791,7 @@
11367
lt_prog_compiler_pic='-KPIC'
11368
lt_prog_compiler_static='-Bstatic'
11369
case $cc_basename in
11370
- f77* | f90* | f95*)
11371
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
11372
lt_prog_compiler_wl='-Qoption ld ';;
11373
*)
11374
lt_prog_compiler_wl='-Wl,';;
11375
@@ -8720,21 +8848,25 @@
11376
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
11377
;;
11378
esac
11379
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
11380
-$as_echo "$lt_prog_compiler_pic" >&6; }
11381
-
11382
-
11383
-
11384
-
11385
11386
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
11387
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11388
+if ${lt_cv_prog_compiler_pic+:} false; then :
11389
+ $as_echo_n "(cached) " >&6
11390
+else
11391
+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
11392
+fi
11393
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
11394
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
11395
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
11396
11397
#
11398
# Check to make sure the PIC flag actually works.
11399
#
11400
if test -n "$lt_prog_compiler_pic"; then
11401
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
11402
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
11403
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
11404
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
11405
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
11406
$as_echo_n "(cached) " >&6
11407
else
11408
lt_cv_prog_compiler_pic_works=no
11409
@@ -8750,15 +8882,15 @@
11410
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11411
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11412
-e 's:$: $lt_compiler_flag:'`
11413
- (eval echo "\"\$as_me:8753: $lt_compile\"" >&5)
11414
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
11415
(eval "$lt_compile" 2>conftest.err)
11416
ac_status=$?
11417
cat conftest.err >&5
11418
- echo "$as_me:8757: \$? = $ac_status" >&5
11419
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11420
if (exit $ac_status) && test -s "$ac_outfile"; then
11421
# The compiler can only warn and ignore the option if not recognized
11422
# So say no if there are warnings other than the usual output.
11423
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
11424
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
11425
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
11426
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
11427
lt_cv_prog_compiler_pic_works=yes
11428
@@ -8767,7 +8899,7 @@
11429
$RM conftest*
11430
11431
fi
11432
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
11433
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
11434
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
11435
11436
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
11437
@@ -8787,13 +8919,18 @@
11438
11439
11440
11441
+
11442
+
11443
+
11444
+
11445
+
11446
#
11447
# Check to make sure the static flag actually works.
11448
#
11449
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
11450
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
11451
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
11452
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
11453
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
11454
+if ${lt_cv_prog_compiler_static_works+:} false; then :
11455
$as_echo_n "(cached) " >&6
11456
else
11457
lt_cv_prog_compiler_static_works=no
11458
@@ -8806,7 +8943,7 @@
11459
if test -s conftest.err; then
11460
# Append any errors to the config.log.
11461
cat conftest.err 1>&5
11462
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
11463
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
11464
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
11465
if diff conftest.exp conftest.er2 >/dev/null; then
11466
lt_cv_prog_compiler_static_works=yes
11467
@@ -8819,7 +8956,7 @@
11468
LDFLAGS="$save_LDFLAGS"
11469
11470
fi
11471
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
11472
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
11473
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
11474
11475
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
11476
@@ -8834,9 +8971,9 @@
11477
11478
11479
11480
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
11481
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
11482
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
11483
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
11484
+if ${lt_cv_prog_compiler_c_o+:} false; then :
11485
$as_echo_n "(cached) " >&6
11486
else
11487
lt_cv_prog_compiler_c_o=no
11488
@@ -8855,16 +8992,16 @@
11489
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11490
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11491
-e 's:$: $lt_compiler_flag:'`
11492
- (eval echo "\"\$as_me:8858: $lt_compile\"" >&5)
11493
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
11494
(eval "$lt_compile" 2>out/conftest.err)
11495
ac_status=$?
11496
cat out/conftest.err >&5
11497
- echo "$as_me:8862: \$? = $ac_status" >&5
11498
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11499
if (exit $ac_status) && test -s out/conftest2.$ac_objext
11500
then
11501
# The compiler can only warn and ignore the option if not recognized
11502
# So say no if there are warnings
11503
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
11504
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
11505
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
11506
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
11507
lt_cv_prog_compiler_c_o=yes
11508
@@ -8881,7 +9018,7 @@
11509
$RM conftest*
11510
11511
fi
11512
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
11513
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
11514
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
11515
11516
11517
@@ -8889,9 +9026,9 @@
11518
11519
11520
11521
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
11522
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
11523
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
11524
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
11525
+if ${lt_cv_prog_compiler_c_o+:} false; then :
11526
$as_echo_n "(cached) " >&6
11527
else
11528
lt_cv_prog_compiler_c_o=no
11529
@@ -8910,16 +9047,16 @@
11530
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
11531
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
11532
-e 's:$: $lt_compiler_flag:'`
11533
- (eval echo "\"\$as_me:8913: $lt_compile\"" >&5)
11534
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
11535
(eval "$lt_compile" 2>out/conftest.err)
11536
ac_status=$?
11537
cat out/conftest.err >&5
11538
- echo "$as_me:8917: \$? = $ac_status" >&5
11539
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11540
if (exit $ac_status) && test -s out/conftest2.$ac_objext
11541
then
11542
# The compiler can only warn and ignore the option if not recognized
11543
# So say no if there are warnings
11544
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
11545
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
11546
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
11547
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
11548
lt_cv_prog_compiler_c_o=yes
11549
@@ -8936,7 +9073,7 @@
11550
$RM conftest*
11551
11552
fi
11553
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
11554
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
11555
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
11556
11557
11558
@@ -8945,7 +9082,7 @@
11559
hard_links="nottested"
11560
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
11561
# do not overwrite the value of need_locks provided by the user
11562
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
11563
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
11564
$as_echo_n "checking if we can lock with hard links... " >&6; }
11565
hard_links=yes
11566
$RM conftest*
11567
@@ -8953,10 +9090,10 @@
11568
touch conftest.a
11569
ln conftest.a conftest.b 2>&5 || hard_links=no
11570
ln conftest.a conftest.b 2>/dev/null && hard_links=no
11571
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
11572
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
11573
$as_echo "$hard_links" >&6; }
11574
if test "$hard_links" = no; then
11575
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
11576
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
11577
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
11578
need_locks=warn
11579
fi
11580
@@ -8969,7 +9106,7 @@
11581
11582
11583
11584
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
11585
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
11586
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
11587
11588
runpath_var=
11589
@@ -9029,10 +9166,39 @@
11590
openbsd*)
11591
with_gnu_ld=no
11592
;;
11593
+ linux* | k*bsd*-gnu | gnu*)
11594
+ link_all_deplibs=no
11595
+ ;;
11596
esac
11597
11598
ld_shlibs=yes
11599
+
11600
+ # On some targets, GNU ld is compatible enough with the native linker
11601
+ # that we're better off using the native interface for both.
11602
+ lt_use_gnu_ld_interface=no
11603
if test "$with_gnu_ld" = yes; then
11604
+ case $host_os in
11605
+ aix*)
11606
+ # The AIX port of GNU ld has always aspired to compatibility
11607
+ # with the native linker. However, as the warning in the GNU ld
11608
+ # block says, versions before 2.19.5* couldn't really create working
11609
+ # shared libraries, regardless of the interface used.
11610
+ case `$LD -v 2>&1` in
11611
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
11612
+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
11613
+ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
11614
+ *)
11615
+ lt_use_gnu_ld_interface=yes
11616
+ ;;
11617
+ esac
11618
+ ;;
11619
+ *)
11620
+ lt_use_gnu_ld_interface=yes
11621
+ ;;
11622
+ esac
11623
+ fi
11624
+
11625
+ if test "$lt_use_gnu_ld_interface" = yes; then
11626
# If archive_cmds runs LD, not CC, wlarc should be empty
11627
wlarc='${wl}'
11628
11629
@@ -9050,6 +9216,7 @@
11630
fi
11631
supports_anon_versioning=no
11632
case `$LD -v 2>&1` in
11633
+ *GNU\ gold*) supports_anon_versioning=yes ;;
11634
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
11635
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
11636
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
11637
@@ -9065,11 +9232,12 @@
11638
ld_shlibs=no
11639
cat <<_LT_EOF 1>&2
11640
11641
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
11642
+*** Warning: the GNU linker, at least up to release 2.19, is reported
11643
*** to be unable to reliably create shared libraries on AIX.
11644
*** Therefore, libtool is disabling shared libraries support. If you
11645
-*** really care for shared libraries, you may want to modify your PATH
11646
-*** so that a non-GNU linker is found, and then restart.
11647
+*** really care for shared libraries, you may want to install binutils
11648
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
11649
+*** You will then need to restart the configuration process.
11650
11651
_LT_EOF
11652
fi
11653
@@ -9105,10 +9273,12 @@
11654
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
11655
# as there is no search path for DLLs.
11656
hardcode_libdir_flag_spec='-L$libdir'
11657
+ export_dynamic_flag_spec='${wl}--export-all-symbols'
11658
allow_undefined_flag=unsupported
11659
always_export_symbols=no
11660
enable_shared_with_static_runtimes=yes
11661
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
11662
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
11663
+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
11664
11665
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
11666
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11667
@@ -9126,6 +9296,11 @@
11668
fi
11669
;;
11670
11671
+ haiku*)
11672
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11673
+ link_all_deplibs=yes
11674
+ ;;
11675
+
11676
interix[3-9]*)
11677
hardcode_direct=no
11678
hardcode_shlibpath_var=no
11679
@@ -9141,7 +9316,7 @@
11680
archive_expsym_cmds='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'
11681
;;
11682
11683
- gnu* | linux* | tpf* | k*bsd*-gnu)
11684
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
11685
tmp_diet=no
11686
if test "$host_os" = linux-dietlibc; then
11687
case $cc_basename in
11688
@@ -9151,15 +9326,16 @@
11689
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
11690
&& test "$tmp_diet" = no
11691
then
11692
- tmp_addflag=
11693
+ tmp_addflag=' $pic_flag'
11694
tmp_sharedflag='-shared'
11695
case $cc_basename,$host_cpu in
11696
pgcc*) # Portland Group C compiler
11697
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
11698
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
11699
tmp_addflag=' $pic_flag'
11700
;;
11701
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
11702
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
11703
+ pgf77* | pgf90* | pgf95* | pgfortran*)
11704
+ # Portland Group f77 and f90 compilers
11705
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
11706
tmp_addflag=' $pic_flag -Mnomain' ;;
11707
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
11708
tmp_addflag=' -i_dynamic' ;;
11709
@@ -9170,13 +9346,17 @@
11710
lf95*) # Lahey Fortran 8.1
11711
whole_archive_flag_spec=
11712
tmp_sharedflag='--shared' ;;
11713
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
11714
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
11715
tmp_sharedflag='-qmkshrobj'
11716
tmp_addflag= ;;
11717
+ nvcc*) # Cuda Compiler Driver 2.2
11718
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
11719
+ compiler_needs_object=yes
11720
+ ;;
11721
esac
11722
case `$CC -V 2>&1 | sed 5q` in
11723
*Sun\ C*) # Sun C 5.9
11724
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
11725
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
11726
compiler_needs_object=yes
11727
tmp_sharedflag='-G' ;;
11728
*Sun\ F*) # Sun Fortran 8.3
11729
@@ -9192,17 +9372,17 @@
11730
fi
11731
11732
case $cc_basename in
11733
- xlf*)
11734
+ xlf* | bgf* | bgxlf* | mpixlf*)
11735
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
11736
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
11737
hardcode_libdir_flag_spec=
11738
hardcode_libdir_flag_spec_ld='-rpath $libdir'
11739
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
11740
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
11741
if test "x$supports_anon_versioning" = xyes; then
11742
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
11743
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11744
echo "local: *; };" >> $output_objdir/$libname.ver~
11745
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11746
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11747
fi
11748
;;
11749
esac
11750
@@ -9211,13 +9391,13 @@
11751
fi
11752
;;
11753
11754
- netbsd*)
11755
+ netbsd* | netbsdelf*-gnu)
11756
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
11757
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11758
wlarc=
11759
else
11760
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11761
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11762
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11763
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11764
fi
11765
;;
11766
11767
@@ -9235,8 +9415,8 @@
11768
11769
_LT_EOF
11770
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11771
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11772
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11773
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11774
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11775
else
11776
ld_shlibs=no
11777
fi
11778
@@ -9282,8 +9462,8 @@
11779
11780
*)
11781
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
11782
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11783
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11784
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11785
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11786
else
11787
ld_shlibs=no
11788
fi
11789
@@ -9323,8 +9503,10 @@
11790
else
11791
# If we're using GNU nm, then we don't want the "-C" option.
11792
# -C means demangle to AIX nm, but means don't demangle with GNU nm
11793
+ # Also, AIX nm treats weak defined symbols like other global
11794
+ # defined symbols, whereas GNU nm marks them as "W".
11795
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
11796
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
11797
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
11798
else
11799
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
11800
fi
11801
@@ -9386,6 +9568,7 @@
11802
if test "$aix_use_runtimelinking" = yes; then
11803
shared_flag="$shared_flag "'${wl}-G'
11804
fi
11805
+ link_all_deplibs=no
11806
else
11807
# not using gcc
11808
if test "$host_cpu" = ia64; then
11809
@@ -9411,11 +9594,13 @@
11810
allow_undefined_flag='-berok'
11811
# Determine the default libpath from the value encoded in an
11812
# empty executable.
11813
- cat >conftest.$ac_ext <<_ACEOF
11814
-/* confdefs.h. */
11815
-_ACEOF
11816
-cat confdefs.h >>conftest.$ac_ext
11817
-cat >>conftest.$ac_ext <<_ACEOF
11818
+ if test "${lt_cv_aix_libpath+set}" = set; then
11819
+ aix_libpath=$lt_cv_aix_libpath
11820
+else
11821
+ if ${lt_cv_aix_libpath_+:} false; then :
11822
+ $as_echo_n "(cached) " >&6
11823
+else
11824
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11825
/* end confdefs.h. */
11826
11827
int
11828
@@ -9426,54 +9611,34 @@
11829
return 0;
11830
}
11831
_ACEOF
11832
-rm -f conftest.$ac_objext conftest$ac_exeext
11833
-if { (ac_try="$ac_link"
11834
-case "(($ac_try" in
11835
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11836
- *) ac_try_echo=$ac_try;;
11837
-esac
11838
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11839
-$as_echo "$ac_try_echo") >&5
11840
- (eval "$ac_link") 2>conftest.er1
11841
- ac_status=$?
11842
- grep -v '^ *+' conftest.er1 >conftest.err
11843
- rm -f conftest.er1
11844
- cat conftest.err >&5
11845
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11846
- (exit $ac_status); } && {
11847
- test -z "$ac_c_werror_flag" ||
11848
- test ! -s conftest.err
11849
- } && test -s conftest$ac_exeext && {
11850
- test "$cross_compiling" = yes ||
11851
- $as_test_x conftest$ac_exeext
11852
- }; then
11853
+if ac_fn_c_try_link "$LINENO"; then :
11854
11855
-lt_aix_libpath_sed='
11856
- /Import File Strings/,/^$/ {
11857
- /^0/ {
11858
- s/^0 *\(.*\)$/\1/
11859
- p
11860
- }
11861
- }'
11862
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11863
-# Check for a 64-bit object if we didn't find anything.
11864
-if test -z "$aix_libpath"; then
11865
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11866
+ lt_aix_libpath_sed='
11867
+ /Import File Strings/,/^$/ {
11868
+ /^0/ {
11869
+ s/^0 *\([^ ]*\) *$/\1/
11870
+ p
11871
+ }
11872
+ }'
11873
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11874
+ # Check for a 64-bit object if we didn't find anything.
11875
+ if test -z "$lt_cv_aix_libpath_"; then
11876
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11877
+ fi
11878
fi
11879
-else
11880
- $as_echo "$as_me: failed program was:" >&5
11881
-sed 's/^/| /' conftest.$ac_ext >&5
11882
-
11883
+rm -f core conftest.err conftest.$ac_objext \
11884
+ conftest$ac_exeext conftest.$ac_ext
11885
+ if test -z "$lt_cv_aix_libpath_"; then
11886
+ lt_cv_aix_libpath_="/usr/lib:/lib"
11887
+ fi
11888
11889
fi
11890
11891
-rm -rf conftest.dSYM
11892
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11893
- conftest$ac_exeext conftest.$ac_ext
11894
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11895
+ aix_libpath=$lt_cv_aix_libpath_
11896
+fi
11897
11898
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11899
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11900
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
11901
else
11902
if test "$host_cpu" = ia64; then
11903
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
11904
@@ -9482,11 +9647,13 @@
11905
else
11906
# Determine the default libpath from the value encoded in an
11907
# empty executable.
11908
- cat >conftest.$ac_ext <<_ACEOF
11909
-/* confdefs.h. */
11910
-_ACEOF
11911
-cat confdefs.h >>conftest.$ac_ext
11912
-cat >>conftest.$ac_ext <<_ACEOF
11913
+ if test "${lt_cv_aix_libpath+set}" = set; then
11914
+ aix_libpath=$lt_cv_aix_libpath
11915
+else
11916
+ if ${lt_cv_aix_libpath_+:} false; then :
11917
+ $as_echo_n "(cached) " >&6
11918
+else
11919
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11920
/* end confdefs.h. */
11921
11922
int
11923
@@ -9497,59 +9664,44 @@
11924
return 0;
11925
}
11926
_ACEOF
11927
-rm -f conftest.$ac_objext conftest$ac_exeext
11928
-if { (ac_try="$ac_link"
11929
-case "(($ac_try" in
11930
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11931
- *) ac_try_echo=$ac_try;;
11932
-esac
11933
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11934
-$as_echo "$ac_try_echo") >&5
11935
- (eval "$ac_link") 2>conftest.er1
11936
- ac_status=$?
11937
- grep -v '^ *+' conftest.er1 >conftest.err
11938
- rm -f conftest.er1
11939
- cat conftest.err >&5
11940
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11941
- (exit $ac_status); } && {
11942
- test -z "$ac_c_werror_flag" ||
11943
- test ! -s conftest.err
11944
- } && test -s conftest$ac_exeext && {
11945
- test "$cross_compiling" = yes ||
11946
- $as_test_x conftest$ac_exeext
11947
- }; then
11948
+if ac_fn_c_try_link "$LINENO"; then :
11949
11950
-lt_aix_libpath_sed='
11951
- /Import File Strings/,/^$/ {
11952
- /^0/ {
11953
- s/^0 *\(.*\)$/\1/
11954
- p
11955
- }
11956
- }'
11957
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11958
-# Check for a 64-bit object if we didn't find anything.
11959
-if test -z "$aix_libpath"; then
11960
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11961
+ lt_aix_libpath_sed='
11962
+ /Import File Strings/,/^$/ {
11963
+ /^0/ {
11964
+ s/^0 *\([^ ]*\) *$/\1/
11965
+ p
11966
+ }
11967
+ }'
11968
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11969
+ # Check for a 64-bit object if we didn't find anything.
11970
+ if test -z "$lt_cv_aix_libpath_"; then
11971
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
11972
+ fi
11973
fi
11974
-else
11975
- $as_echo "$as_me: failed program was:" >&5
11976
-sed 's/^/| /' conftest.$ac_ext >&5
11977
-
11978
+rm -f core conftest.err conftest.$ac_objext \
11979
+ conftest$ac_exeext conftest.$ac_ext
11980
+ if test -z "$lt_cv_aix_libpath_"; then
11981
+ lt_cv_aix_libpath_="/usr/lib:/lib"
11982
+ fi
11983
11984
fi
11985
11986
-rm -rf conftest.dSYM
11987
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11988
- conftest$ac_exeext conftest.$ac_ext
11989
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
11990
+ aix_libpath=$lt_cv_aix_libpath_
11991
+fi
11992
11993
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
11994
# Warning - without using the other run time loading flags,
11995
# -berok will link without error, but may produce a broken library.
11996
no_undefined_flag=' ${wl}-bernotok'
11997
allow_undefined_flag=' ${wl}-berok'
11998
- # Exported symbols can be pulled into shared objects from archives
11999
- whole_archive_flag_spec='$convenience'
12000
+ if test "$with_gnu_ld" = yes; then
12001
+ # We only use this code for GNU lds that support --whole-archive.
12002
+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
12003
+ else
12004
+ # Exported symbols can be pulled into shared objects from archives
12005
+ whole_archive_flag_spec='$convenience'
12006
+ fi
12007
archive_cmds_need_lc=yes
12008
# This is similar to how AIX traditionally builds its shared libraries.
12009
archive_expsym_cmds="\$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'
12010
@@ -9581,20 +9733,63 @@
12011
# Microsoft Visual C++.
12012
# hardcode_libdir_flag_spec is actually meaningless, as there is
12013
# no search path for DLLs.
12014
- hardcode_libdir_flag_spec=' '
12015
- allow_undefined_flag=unsupported
12016
- # Tell ltmain to make .lib files, not .a files.
12017
- libext=lib
12018
- # Tell ltmain to make .dll files, not .so files.
12019
- shrext_cmds=".dll"
12020
- # FIXME: Setting linknames here is a bad hack.
12021
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
12022
- # The linker will automatically build a .lib file if we build a DLL.
12023
- old_archive_from_new_cmds='true'
12024
- # FIXME: Should let the user specify the lib program.
12025
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
12026
- fix_srcfile_path='`cygpath -w "$srcfile"`'
12027
- enable_shared_with_static_runtimes=yes
12028
+ case $cc_basename in
12029
+ cl*)
12030
+ # Native MSVC
12031
+ hardcode_libdir_flag_spec=' '
12032
+ allow_undefined_flag=unsupported
12033
+ always_export_symbols=yes
12034
+ file_list_spec='@'
12035
+ # Tell ltmain to make .lib files, not .a files.
12036
+ libext=lib
12037
+ # Tell ltmain to make .dll files, not .so files.
12038
+ shrext_cmds=".dll"
12039
+ # FIXME: Setting linknames here is a bad hack.
12040
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
12041
+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12042
+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
12043
+ else
12044
+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
12045
+ fi~
12046
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
12047
+ linknames='
12048
+ # The linker will not automatically build a static lib if we build a DLL.
12049
+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
12050
+ enable_shared_with_static_runtimes=yes
12051
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
12052
+ # Don't use ranlib
12053
+ old_postinstall_cmds='chmod 644 $oldlib'
12054
+ postlink_cmds='lt_outputfile="@OUTPUT@"~
12055
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
12056
+ case $lt_outputfile in
12057
+ *.exe|*.EXE) ;;
12058
+ *)
12059
+ lt_outputfile="$lt_outputfile.exe"
12060
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
12061
+ ;;
12062
+ esac~
12063
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
12064
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
12065
+ $RM "$lt_outputfile.manifest";
12066
+ fi'
12067
+ ;;
12068
+ *)
12069
+ # Assume MSVC wrapper
12070
+ hardcode_libdir_flag_spec=' '
12071
+ allow_undefined_flag=unsupported
12072
+ # Tell ltmain to make .lib files, not .a files.
12073
+ libext=lib
12074
+ # Tell ltmain to make .dll files, not .so files.
12075
+ shrext_cmds=".dll"
12076
+ # FIXME: Setting linknames here is a bad hack.
12077
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
12078
+ # The linker will automatically build a .lib file if we build a DLL.
12079
+ old_archive_from_new_cmds='true'
12080
+ # FIXME: Should let the user specify the lib program.
12081
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
12082
+ enable_shared_with_static_runtimes=yes
12083
+ ;;
12084
+ esac
12085
;;
12086
12087
darwin* | rhapsody*)
12088
@@ -9604,7 +9799,11 @@
12089
hardcode_direct=no
12090
hardcode_automatic=yes
12091
hardcode_shlibpath_var=unsupported
12092
- whole_archive_flag_spec=''
12093
+ if test "$lt_cv_ld_force_load" = "yes"; then
12094
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
12095
+ else
12096
+ whole_archive_flag_spec=''
12097
+ fi
12098
link_all_deplibs=yes
12099
allow_undefined_flag="$_lt_dar_allow_undefined"
12100
case $cc_basename in
12101
@@ -9612,7 +9811,7 @@
12102
*) _lt_dar_can_shared=$GCC ;;
12103
esac
12104
if test "$_lt_dar_can_shared" = "yes"; then
12105
- output_verbose_link_cmd=echo
12106
+ output_verbose_link_cmd=func_echo_all
12107
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
12108
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
12109
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
12110
@@ -9655,7 +9854,7 @@
12111
12112
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
12113
freebsd* | dragonfly*)
12114
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
12115
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
12116
hardcode_libdir_flag_spec='-R$libdir'
12117
hardcode_direct=yes
12118
hardcode_shlibpath_var=no
12119
@@ -9663,7 +9862,7 @@
12120
12121
hpux9*)
12122
if test "$GCC" = yes; then
12123
- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
12124
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
12125
else
12126
archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
12127
fi
12128
@@ -9678,8 +9877,8 @@
12129
;;
12130
12131
hpux10*)
12132
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
12133
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12134
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
12135
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12136
else
12137
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
12138
fi
12139
@@ -9697,16 +9896,16 @@
12140
;;
12141
12142
hpux11*)
12143
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
12144
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
12145
case $host_cpu in
12146
hppa*64*)
12147
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12148
;;
12149
ia64*)
12150
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12151
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12152
;;
12153
*)
12154
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12155
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12156
;;
12157
esac
12158
else
12159
@@ -9718,7 +9917,46 @@
12160
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12161
;;
12162
*)
12163
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12164
+
12165
+ # Older versions of the 11.00 compiler do not understand -b yet
12166
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
12167
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
12168
+$as_echo_n "checking if $CC understands -b... " >&6; }
12169
+if ${lt_cv_prog_compiler__b+:} false; then :
12170
+ $as_echo_n "(cached) " >&6
12171
+else
12172
+ lt_cv_prog_compiler__b=no
12173
+ save_LDFLAGS="$LDFLAGS"
12174
+ LDFLAGS="$LDFLAGS -b"
12175
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
12176
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
12177
+ # The linker can only warn and ignore the option if not recognized
12178
+ # So say no if there are warnings
12179
+ if test -s conftest.err; then
12180
+ # Append any errors to the config.log.
12181
+ cat conftest.err 1>&5
12182
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
12183
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
12184
+ if diff conftest.exp conftest.er2 >/dev/null; then
12185
+ lt_cv_prog_compiler__b=yes
12186
+ fi
12187
+ else
12188
+ lt_cv_prog_compiler__b=yes
12189
+ fi
12190
+ fi
12191
+ $RM -r conftest*
12192
+ LDFLAGS="$save_LDFLAGS"
12193
+
12194
+fi
12195
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
12196
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
12197
+
12198
+if test x"$lt_cv_prog_compiler__b" = xyes; then
12199
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12200
+else
12201
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
12202
+fi
12203
+
12204
;;
12205
esac
12206
fi
12207
@@ -9746,52 +9984,39 @@
12208
12209
irix5* | irix6* | nonstopux*)
12210
if test "$GCC" = yes; then
12211
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12212
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12213
# Try to use the -exported_symbol ld option, if it does not
12214
# work, assume that -exports_file does not work either and
12215
# implicitly export all symbols.
12216
- save_LDFLAGS="$LDFLAGS"
12217
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
12218
- cat >conftest.$ac_ext <<_ACEOF
12219
-int foo(void) {}
12220
+ # This should be the same for all languages, so no per-tag cache variable.
12221
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
12222
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
12223
+if ${lt_cv_irix_exported_symbol+:} false; then :
12224
+ $as_echo_n "(cached) " >&6
12225
+else
12226
+ save_LDFLAGS="$LDFLAGS"
12227
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
12228
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12229
+/* end confdefs.h. */
12230
+int foo (void) { return 0; }
12231
_ACEOF
12232
-rm -f conftest.$ac_objext conftest$ac_exeext
12233
-if { (ac_try="$ac_link"
12234
-case "(($ac_try" in
12235
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12236
- *) ac_try_echo=$ac_try;;
12237
-esac
12238
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12239
-$as_echo "$ac_try_echo") >&5
12240
- (eval "$ac_link") 2>conftest.er1
12241
- ac_status=$?
12242
- grep -v '^ *+' conftest.er1 >conftest.err
12243
- rm -f conftest.er1
12244
- cat conftest.err >&5
12245
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12246
- (exit $ac_status); } && {
12247
- test -z "$ac_c_werror_flag" ||
12248
- test ! -s conftest.err
12249
- } && test -s conftest$ac_exeext && {
12250
- test "$cross_compiling" = yes ||
12251
- $as_test_x conftest$ac_exeext
12252
- }; then
12253
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
12254
-
12255
+if ac_fn_c_try_link "$LINENO"; then :
12256
+ lt_cv_irix_exported_symbol=yes
12257
else
12258
- $as_echo "$as_me: failed program was:" >&5
12259
-sed 's/^/| /' conftest.$ac_ext >&5
12260
-
12261
-
12262
+ lt_cv_irix_exported_symbol=no
12263
fi
12264
-
12265
-rm -rf conftest.dSYM
12266
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12267
- conftest$ac_exeext conftest.$ac_ext
12268
- LDFLAGS="$save_LDFLAGS"
12269
+rm -f core conftest.err conftest.$ac_objext \
12270
+ conftest$ac_exeext conftest.$ac_ext
12271
+ LDFLAGS="$save_LDFLAGS"
12272
+fi
12273
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
12274
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
12275
+ if test "$lt_cv_irix_exported_symbol" = yes; then
12276
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
12277
+ fi
12278
else
12279
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
12280
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
12281
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
12282
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
12283
fi
12284
archive_cmds_need_lc='no'
12285
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
12286
@@ -9800,7 +10025,7 @@
12287
link_all_deplibs=yes
12288
;;
12289
12290
- netbsd*)
12291
+ netbsd* | netbsdelf*-gnu)
12292
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
12293
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
12294
else
12295
@@ -9853,17 +10078,17 @@
12296
hardcode_libdir_flag_spec='-L$libdir'
12297
hardcode_minus_L=yes
12298
allow_undefined_flag=unsupported
12299
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
12300
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
12301
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
12302
;;
12303
12304
osf3*)
12305
if test "$GCC" = yes; then
12306
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
12307
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12308
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12309
else
12310
allow_undefined_flag=' -expect_unresolved \*'
12311
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
12312
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
12313
fi
12314
archive_cmds_need_lc='no'
12315
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
12316
@@ -9873,13 +10098,13 @@
12317
osf4* | osf5*) # as osf3* with the addition of -msym flag
12318
if test "$GCC" = yes; then
12319
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
12320
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12321
+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12322
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
12323
else
12324
allow_undefined_flag=' -expect_unresolved \*'
12325
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
12326
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
12327
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
12328
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
12329
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
12330
12331
# Both c and cxx compiler support -rpath directly
12332
hardcode_libdir_flag_spec='-rpath $libdir'
12333
@@ -9892,9 +10117,9 @@
12334
no_undefined_flag=' -z defs'
12335
if test "$GCC" = yes; then
12336
wlarc='${wl}'
12337
- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12338
+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12339
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
12340
- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
12341
+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
12342
else
12343
case `$CC -V 2>&1` in
12344
*"Compilers 5.0"*)
12345
@@ -10043,7 +10268,7 @@
12346
fi
12347
fi
12348
12349
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
12350
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
12351
$as_echo "$ld_shlibs" >&6; }
12352
test "$ld_shlibs" = no && can_build_shared=no
12353
12354
@@ -10080,46 +10305,52 @@
12355
# Test whether the compiler implicitly links with -lc since on some
12356
# systems, -lgcc has to come before -lc. If gcc already passes -lc
12357
# to ld, don't add -lc before -lgcc.
12358
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
12359
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
12360
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
12361
- $RM conftest*
12362
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
12363
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
12364
+ $as_echo_n "(cached) " >&6
12365
+else
12366
+ $RM conftest*
12367
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
12368
12369
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12370
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
12371
(eval $ac_compile) 2>&5
12372
ac_status=$?
12373
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12374
- (exit $ac_status); } 2>conftest.err; then
12375
- soname=conftest
12376
- lib=conftest
12377
- libobjs=conftest.$ac_objext
12378
- deplibs=
12379
- wl=$lt_prog_compiler_wl
12380
- pic_flag=$lt_prog_compiler_pic
12381
- compiler_flags=-v
12382
- linker_flags=-v
12383
- verstring=
12384
- output_objdir=.
12385
- libname=conftest
12386
- lt_save_allow_undefined_flag=$allow_undefined_flag
12387
- allow_undefined_flag=
12388
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
12389
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12390
+ test $ac_status = 0; } 2>conftest.err; then
12391
+ soname=conftest
12392
+ lib=conftest
12393
+ libobjs=conftest.$ac_objext
12394
+ deplibs=
12395
+ wl=$lt_prog_compiler_wl
12396
+ pic_flag=$lt_prog_compiler_pic
12397
+ compiler_flags=-v
12398
+ linker_flags=-v
12399
+ verstring=
12400
+ output_objdir=.
12401
+ libname=conftest
12402
+ lt_save_allow_undefined_flag=$allow_undefined_flag
12403
+ allow_undefined_flag=
12404
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
12405
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
12406
ac_status=$?
12407
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12408
- (exit $ac_status); }
12409
- then
12410
- archive_cmds_need_lc=no
12411
- else
12412
- archive_cmds_need_lc=yes
12413
- fi
12414
- allow_undefined_flag=$lt_save_allow_undefined_flag
12415
- else
12416
- cat conftest.err 1>&5
12417
- fi
12418
- $RM conftest*
12419
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
12420
-$as_echo "$archive_cmds_need_lc" >&6; }
12421
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12422
+ test $ac_status = 0; }
12423
+ then
12424
+ lt_cv_archive_cmds_need_lc=no
12425
+ else
12426
+ lt_cv_archive_cmds_need_lc=yes
12427
+ fi
12428
+ allow_undefined_flag=$lt_save_allow_undefined_flag
12429
+ else
12430
+ cat conftest.err 1>&5
12431
+ fi
12432
+ $RM conftest*
12433
+
12434
+fi
12435
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
12436
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
12437
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
12438
;;
12439
esac
12440
fi
12441
@@ -10282,7 +10513,7 @@
12442
12443
12444
12445
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
12446
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
12447
$as_echo_n "checking dynamic linker characteristics... " >&6; }
12448
12449
if test "$GCC" = yes; then
12450
@@ -10290,16 +10521,23 @@
12451
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
12452
*) lt_awk_arg="/^libraries:/" ;;
12453
esac
12454
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
12455
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
12456
+ case $host_os in
12457
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
12458
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
12459
+ esac
12460
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
12461
+ case $lt_search_path_spec in
12462
+ *\;*)
12463
# if the path contains ";" then we assume it to be the separator
12464
# otherwise default to the standard path separator (i.e. ":") - it is
12465
# assumed that no part of a normal pathname contains ";" but that should
12466
# okay in the real world where ";" in dirpaths is itself problematic.
12467
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
12468
- else
12469
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12470
- fi
12471
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
12472
+ ;;
12473
+ *)
12474
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
12475
+ ;;
12476
+ esac
12477
# Ok, now we have the path, separated by spaces, we can step through it
12478
# and add multilib dir if necessary.
12479
lt_tmp_lt_search_path_spec=
12480
@@ -10312,7 +10550,7 @@
12481
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
12482
fi
12483
done
12484
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
12485
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
12486
BEGIN {RS=" "; FS="/|\n";} {
12487
lt_foo="";
12488
lt_count=0;
12489
@@ -10332,7 +10570,13 @@
12490
if (lt_foo != "") { lt_freq[lt_foo]++; }
12491
if (lt_freq[lt_foo] == 1) { print lt_foo; }
12492
}'`
12493
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
12494
+ # AWK program above erroneously prepends '/' to C:/dos/paths
12495
+ # for these hosts.
12496
+ case $host_os in
12497
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
12498
+ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
12499
+ esac
12500
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
12501
else
12502
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
12503
fi
12504
@@ -10420,7 +10664,7 @@
12505
m68k)
12506
library_names_spec='$libname.ixlibrary $libname.a'
12507
# Create ${libname}_ixlibrary.a entries in /sys/libs.
12508
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
12509
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
12510
;;
12511
esac
12512
;;
12513
@@ -10451,8 +10695,9 @@
12514
need_version=no
12515
need_lib_prefix=no
12516
12517
- case $GCC,$host_os in
12518
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
12519
+ case $GCC,$cc_basename in
12520
+ yes,*)
12521
+ # gcc
12522
library_names_spec='$libname.dll.a'
12523
# DLL is installed to $(libdir)/../bin by postinstall_cmds
12524
postinstall_cmds='base_file=`basename \${file}`~
12525
@@ -10473,36 +10718,83 @@
12526
cygwin*)
12527
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
12528
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12529
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
12530
+
12531
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
12532
;;
12533
mingw* | cegcc*)
12534
# MinGW DLLs use traditional 'lib' prefix
12535
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12536
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
12537
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
12538
- # It is most probably a Windows format PATH printed by
12539
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
12540
- # path with ; separators, and with drive letters. We can handle the
12541
- # drive letters (cygwin fileutils understands them), so leave them,
12542
- # especially as we might pass files found there to a mingw objdump,
12543
- # which wouldn't understand a cygwinified path. Ahh.
12544
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
12545
- else
12546
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12547
- fi
12548
;;
12549
pw32*)
12550
# pw32 DLLs use 'pw' prefix rather than 'lib'
12551
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12552
;;
12553
esac
12554
+ dynamic_linker='Win32 ld.exe'
12555
+ ;;
12556
+
12557
+ *,cl*)
12558
+ # Native MSVC
12559
+ libname_spec='$name'
12560
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
12561
+ library_names_spec='${libname}.dll.lib'
12562
+
12563
+ case $build_os in
12564
+ mingw*)
12565
+ sys_lib_search_path_spec=
12566
+ lt_save_ifs=$IFS
12567
+ IFS=';'
12568
+ for lt_path in $LIB
12569
+ do
12570
+ IFS=$lt_save_ifs
12571
+ # Let DOS variable expansion print the short 8.3 style file name.
12572
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
12573
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
12574
+ done
12575
+ IFS=$lt_save_ifs
12576
+ # Convert to MSYS style.
12577
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
12578
+ ;;
12579
+ cygwin*)
12580
+ # Convert to unix form, then to dos form, then back to unix form
12581
+ # but this time dos style (no spaces!) so that the unix form looks
12582
+ # like /cygdrive/c/PROGRA~1:/cygdr...
12583
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
12584
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
12585
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12586
+ ;;
12587
+ *)
12588
+ sys_lib_search_path_spec="$LIB"
12589
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
12590
+ # It is most probably a Windows format PATH.
12591
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
12592
+ else
12593
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
12594
+ fi
12595
+ # FIXME: find the short name or the path components, as spaces are
12596
+ # common. (e.g. "Program Files" -> "PROGRA~1")
12597
+ ;;
12598
+ esac
12599
+
12600
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
12601
+ postinstall_cmds='base_file=`basename \${file}`~
12602
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
12603
+ dldir=$destdir/`dirname \$dlpath`~
12604
+ test -d \$dldir || mkdir -p \$dldir~
12605
+ $install_prog $dir/$dlname \$dldir/$dlname'
12606
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
12607
+ dlpath=$dir/\$dldll~
12608
+ $RM \$dlpath'
12609
+ shlibpath_overrides_runpath=yes
12610
+ dynamic_linker='Win32 link.exe'
12611
;;
12612
12613
*)
12614
+ # Assume MSVC wrapper
12615
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
12616
+ dynamic_linker='Win32 ld.exe'
12617
;;
12618
esac
12619
- dynamic_linker='Win32 ld.exe'
12620
# FIXME: first we should search . and the directory the executable is in
12621
shlibpath_var=PATH
12622
;;
12623
@@ -10586,6 +10878,20 @@
12624
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
12625
soname_spec='${libname}${release}${shared_ext}$major'
12626
shlibpath_var=LD_LIBRARY_PATH
12627
+ shlibpath_overrides_runpath=no
12628
+ hardcode_into_libs=yes
12629
+ ;;
12630
+
12631
+haiku*)
12632
+ version_type=linux
12633
+ need_lib_prefix=no
12634
+ need_version=no
12635
+ dynamic_linker="$host_os runtime_loader"
12636
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
12637
+ soname_spec='${libname}${release}${shared_ext}$major'
12638
+ shlibpath_var=LIBRARY_PATH
12639
+ shlibpath_overrides_runpath=yes
12640
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
12641
hardcode_into_libs=yes
12642
;;
12643
12644
@@ -10631,8 +10937,10 @@
12645
soname_spec='${libname}${release}${shared_ext}$major'
12646
;;
12647
esac
12648
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
12649
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
12650
postinstall_cmds='chmod 555 $lib'
12651
+ # or fails outright, so override atomically:
12652
+ install_override_mode=555
12653
;;
12654
12655
interix[3-9]*)
12656
@@ -10690,7 +10998,7 @@
12657
;;
12658
12659
# This must be Linux ELF.
12660
-linux* | k*bsd*-gnu)
12661
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
12662
version_type=linux
12663
need_lib_prefix=no
12664
need_version=no
12665
@@ -10699,16 +11007,17 @@
12666
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
12667
shlibpath_var=LD_LIBRARY_PATH
12668
shlibpath_overrides_runpath=no
12669
+
12670
# Some binutils ld are patched to set DT_RUNPATH
12671
- save_LDFLAGS=$LDFLAGS
12672
- save_libdir=$libdir
12673
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
12674
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
12675
- cat >conftest.$ac_ext <<_ACEOF
12676
-/* confdefs.h. */
12677
-_ACEOF
12678
-cat confdefs.h >>conftest.$ac_ext
12679
-cat >>conftest.$ac_ext <<_ACEOF
12680
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
12681
+ $as_echo_n "(cached) " >&6
12682
+else
12683
+ lt_cv_shlibpath_overrides_runpath=no
12684
+ save_LDFLAGS=$LDFLAGS
12685
+ save_libdir=$libdir
12686
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
12687
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
12688
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12689
/* end confdefs.h. */
12690
12691
int
12692
@@ -10719,56 +11028,29 @@
12693
return 0;
12694
}
12695
_ACEOF
12696
-rm -f conftest.$ac_objext conftest$ac_exeext
12697
-if { (ac_try="$ac_link"
12698
-case "(($ac_try" in
12699
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12700
- *) ac_try_echo=$ac_try;;
12701
-esac
12702
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12703
-$as_echo "$ac_try_echo") >&5
12704
- (eval "$ac_link") 2>conftest.er1
12705
- ac_status=$?
12706
- grep -v '^ *+' conftest.er1 >conftest.err
12707
- rm -f conftest.er1
12708
- cat conftest.err >&5
12709
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12710
- (exit $ac_status); } && {
12711
- test -z "$ac_c_werror_flag" ||
12712
- test ! -s conftest.err
12713
- } && test -s conftest$ac_exeext && {
12714
- test "$cross_compiling" = yes ||
12715
- $as_test_x conftest$ac_exeext
12716
- }; then
12717
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
12718
- shlibpath_overrides_runpath=yes
12719
+if ac_fn_c_try_link "$LINENO"; then :
12720
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
12721
+ lt_cv_shlibpath_overrides_runpath=yes
12722
fi
12723
-
12724
-else
12725
- $as_echo "$as_me: failed program was:" >&5
12726
-sed 's/^/| /' conftest.$ac_ext >&5
12727
-
12728
+fi
12729
+rm -f core conftest.err conftest.$ac_objext \
12730
+ conftest$ac_exeext conftest.$ac_ext
12731
+ LDFLAGS=$save_LDFLAGS
12732
+ libdir=$save_libdir
12733
12734
fi
12735
12736
-rm -rf conftest.dSYM
12737
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12738
- conftest$ac_exeext conftest.$ac_ext
12739
- LDFLAGS=$save_LDFLAGS
12740
- libdir=$save_libdir
12741
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
12742
12743
# This implies no fast_install, which is unacceptable.
12744
# Some rework will be needed to allow for fast_install
12745
# before this can be enabled.
12746
hardcode_into_libs=yes
12747
12748
- # Add ABI-specific directories to the system library path.
12749
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
12750
-
12751
# Append ld.so.conf contents to the search path
12752
if test -f /etc/ld.so.conf; then
12753
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
12754
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
12755
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
12756
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
12757
fi
12758
12759
# We used to test for /lib/ld.so.1 and disable shared libraries on
12760
@@ -10780,6 +11062,18 @@
12761
dynamic_linker='GNU/Linux ld.so'
12762
;;
12763
12764
+netbsdelf*-gnu)
12765
+ version_type=linux
12766
+ need_lib_prefix=no
12767
+ need_version=no
12768
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
12769
+ soname_spec='${libname}${release}${shared_ext}$major'
12770
+ shlibpath_var=LD_LIBRARY_PATH
12771
+ shlibpath_overrides_runpath=no
12772
+ hardcode_into_libs=yes
12773
+ dynamic_linker='NetBSD ld.elf_so'
12774
+ ;;
12775
+
12776
netbsd*)
12777
version_type=sunos
12778
need_lib_prefix=no
12779
@@ -10968,7 +11262,7 @@
12780
dynamic_linker=no
12781
;;
12782
esac
12783
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
12784
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
12785
$as_echo "$dynamic_linker" >&6; }
12786
test "$dynamic_linker" = no && can_build_shared=no
12787
12788
@@ -11070,7 +11364,12 @@
12789
12790
12791
12792
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
12793
+
12794
+
12795
+
12796
+
12797
+
12798
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
12799
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
12800
hardcode_action=
12801
if test -n "$hardcode_libdir_flag_spec" ||
12802
@@ -11095,7 +11394,7 @@
12803
# directories.
12804
hardcode_action=unsupported
12805
fi
12806
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
12807
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
12808
$as_echo "$hardcode_action" >&6; }
12809
12810
if test "$hardcode_action" = relink ||
12811
@@ -11139,185 +11438,15 @@
12812
;;
12813
12814
darwin*)
12815
- # if libdl is installed we need to link against it
12816
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
12817
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
12818
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
12819
- $as_echo_n "(cached) " >&6
12820
-else
12821
- ac_check_lib_save_LIBS=$LIBS
12822
-LIBS="-ldl $LIBS"
12823
-cat >conftest.$ac_ext <<_ACEOF
12824
-/* confdefs.h. */
12825
-_ACEOF
12826
-cat confdefs.h >>conftest.$ac_ext
12827
-cat >>conftest.$ac_ext <<_ACEOF
12828
-/* end confdefs.h. */
12829
-
12830
-/* Override any GCC internal prototype to avoid an error.
12831
- Use char because int might match the return type of a GCC
12832
- builtin and then its argument prototype would still apply. */
12833
-#ifdef __cplusplus
12834
-extern "C"
12835
-#endif
12836
-char dlopen ();
12837
-int
12838
-main ()
12839
-{
12840
-return dlopen ();
12841
- ;
12842
- return 0;
12843
-}
12844
-_ACEOF
12845
-rm -f conftest.$ac_objext conftest$ac_exeext
12846
-if { (ac_try="$ac_link"
12847
-case "(($ac_try" in
12848
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12849
- *) ac_try_echo=$ac_try;;
12850
-esac
12851
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12852
-$as_echo "$ac_try_echo") >&5
12853
- (eval "$ac_link") 2>conftest.er1
12854
- ac_status=$?
12855
- grep -v '^ *+' conftest.er1 >conftest.err
12856
- rm -f conftest.er1
12857
- cat conftest.err >&5
12858
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12859
- (exit $ac_status); } && {
12860
- test -z "$ac_c_werror_flag" ||
12861
- test ! -s conftest.err
12862
- } && test -s conftest$ac_exeext && {
12863
- test "$cross_compiling" = yes ||
12864
- $as_test_x conftest$ac_exeext
12865
- }; then
12866
- ac_cv_lib_dl_dlopen=yes
12867
-else
12868
- $as_echo "$as_me: failed program was:" >&5
12869
-sed 's/^/| /' conftest.$ac_ext >&5
12870
-
12871
- ac_cv_lib_dl_dlopen=no
12872
-fi
12873
-
12874
-rm -rf conftest.dSYM
12875
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12876
- conftest$ac_exeext conftest.$ac_ext
12877
-LIBS=$ac_check_lib_save_LIBS
12878
-fi
12879
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
12880
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
12881
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
12882
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
12883
-else
12884
-
12885
- lt_cv_dlopen="dyld"
12886
- lt_cv_dlopen_libs=
12887
- lt_cv_dlopen_self=yes
12888
-
12889
-fi
12890
-
12891
- ;;
12892
-
12893
- *)
12894
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
12895
-$as_echo_n "checking for shl_load... " >&6; }
12896
-if test "${ac_cv_func_shl_load+set}" = set; then
12897
- $as_echo_n "(cached) " >&6
12898
-else
12899
- cat >conftest.$ac_ext <<_ACEOF
12900
-/* confdefs.h. */
12901
-_ACEOF
12902
-cat confdefs.h >>conftest.$ac_ext
12903
-cat >>conftest.$ac_ext <<_ACEOF
12904
-/* end confdefs.h. */
12905
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
12906
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
12907
-#define shl_load innocuous_shl_load
12908
-
12909
-/* System header to define __stub macros and hopefully few prototypes,
12910
- which can conflict with char shl_load (); below.
12911
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
12912
- <limits.h> exists even on freestanding compilers. */
12913
-
12914
-#ifdef __STDC__
12915
-# include <limits.h>
12916
-#else
12917
-# include <assert.h>
12918
-#endif
12919
-
12920
-#undef shl_load
12921
-
12922
-/* Override any GCC internal prototype to avoid an error.
12923
- Use char because int might match the return type of a GCC
12924
- builtin and then its argument prototype would still apply. */
12925
-#ifdef __cplusplus
12926
-extern "C"
12927
-#endif
12928
-char shl_load ();
12929
-/* The GNU C library defines this for functions which it implements
12930
- to always fail with ENOSYS. Some functions are actually named
12931
- something starting with __ and the normal name is an alias. */
12932
-#if defined __stub_shl_load || defined __stub___shl_load
12933
-choke me
12934
-#endif
12935
-
12936
-int
12937
-main ()
12938
-{
12939
-return shl_load ();
12940
- ;
12941
- return 0;
12942
-}
12943
-_ACEOF
12944
-rm -f conftest.$ac_objext conftest$ac_exeext
12945
-if { (ac_try="$ac_link"
12946
-case "(($ac_try" in
12947
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12948
- *) ac_try_echo=$ac_try;;
12949
-esac
12950
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12951
-$as_echo "$ac_try_echo") >&5
12952
- (eval "$ac_link") 2>conftest.er1
12953
- ac_status=$?
12954
- grep -v '^ *+' conftest.er1 >conftest.err
12955
- rm -f conftest.er1
12956
- cat conftest.err >&5
12957
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12958
- (exit $ac_status); } && {
12959
- test -z "$ac_c_werror_flag" ||
12960
- test ! -s conftest.err
12961
- } && test -s conftest$ac_exeext && {
12962
- test "$cross_compiling" = yes ||
12963
- $as_test_x conftest$ac_exeext
12964
- }; then
12965
- ac_cv_func_shl_load=yes
12966
-else
12967
- $as_echo "$as_me: failed program was:" >&5
12968
-sed 's/^/| /' conftest.$ac_ext >&5
12969
-
12970
- ac_cv_func_shl_load=no
12971
-fi
12972
-
12973
-rm -rf conftest.dSYM
12974
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12975
- conftest$ac_exeext conftest.$ac_ext
12976
-fi
12977
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
12978
-$as_echo "$ac_cv_func_shl_load" >&6; }
12979
-if test "x$ac_cv_func_shl_load" = x""yes; then
12980
- lt_cv_dlopen="shl_load"
12981
-else
12982
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
12983
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
12984
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
12985
+ # if libdl is installed we need to link against it
12986
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
12987
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
12988
+if ${ac_cv_lib_dl_dlopen+:} false; then :
12989
$as_echo_n "(cached) " >&6
12990
else
12991
ac_check_lib_save_LIBS=$LIBS
12992
-LIBS="-ldld $LIBS"
12993
-cat >conftest.$ac_ext <<_ACEOF
12994
-/* confdefs.h. */
12995
-_ACEOF
12996
-cat confdefs.h >>conftest.$ac_ext
12997
-cat >>conftest.$ac_ext <<_ACEOF
12998
+LIBS="-ldl $LIBS"
12999
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13000
/* end confdefs.h. */
13001
13002
/* Override any GCC internal prototype to avoid an error.
13003
@@ -11326,81 +11455,52 @@
13004
#ifdef __cplusplus
13005
extern "C"
13006
#endif
13007
-char shl_load ();
13008
+char dlopen ();
13009
int
13010
main ()
13011
{
13012
-return shl_load ();
13013
+return dlopen ();
13014
;
13015
return 0;
13016
}
13017
_ACEOF
13018
-rm -f conftest.$ac_objext conftest$ac_exeext
13019
-if { (ac_try="$ac_link"
13020
-case "(($ac_try" in
13021
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13022
- *) ac_try_echo=$ac_try;;
13023
-esac
13024
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13025
-$as_echo "$ac_try_echo") >&5
13026
- (eval "$ac_link") 2>conftest.er1
13027
- ac_status=$?
13028
- grep -v '^ *+' conftest.er1 >conftest.err
13029
- rm -f conftest.er1
13030
- cat conftest.err >&5
13031
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13032
- (exit $ac_status); } && {
13033
- test -z "$ac_c_werror_flag" ||
13034
- test ! -s conftest.err
13035
- } && test -s conftest$ac_exeext && {
13036
- test "$cross_compiling" = yes ||
13037
- $as_test_x conftest$ac_exeext
13038
- }; then
13039
- ac_cv_lib_dld_shl_load=yes
13040
+if ac_fn_c_try_link "$LINENO"; then :
13041
+ ac_cv_lib_dl_dlopen=yes
13042
else
13043
- $as_echo "$as_me: failed program was:" >&5
13044
-sed 's/^/| /' conftest.$ac_ext >&5
13045
-
13046
- ac_cv_lib_dld_shl_load=no
13047
+ ac_cv_lib_dl_dlopen=no
13048
fi
13049
-
13050
-rm -rf conftest.dSYM
13051
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13052
- conftest$ac_exeext conftest.$ac_ext
13053
+rm -f core conftest.err conftest.$ac_objext \
13054
+ conftest$ac_exeext conftest.$ac_ext
13055
LIBS=$ac_check_lib_save_LIBS
13056
fi
13057
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
13058
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
13059
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
13060
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
13061
-else
13062
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
13063
-$as_echo_n "checking for dlopen... " >&6; }
13064
-if test "${ac_cv_func_dlopen+set}" = set; then
13065
- $as_echo_n "(cached) " >&6
13066
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
13067
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
13068
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
13069
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
13070
else
13071
- cat >conftest.$ac_ext <<_ACEOF
13072
-/* confdefs.h. */
13073
-_ACEOF
13074
-cat confdefs.h >>conftest.$ac_ext
13075
-cat >>conftest.$ac_ext <<_ACEOF
13076
-/* end confdefs.h. */
13077
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
13078
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
13079
-#define dlopen innocuous_dlopen
13080
13081
-/* System header to define __stub macros and hopefully few prototypes,
13082
- which can conflict with char dlopen (); below.
13083
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
13084
- <limits.h> exists even on freestanding compilers. */
13085
+ lt_cv_dlopen="dyld"
13086
+ lt_cv_dlopen_libs=
13087
+ lt_cv_dlopen_self=yes
13088
13089
-#ifdef __STDC__
13090
-# include <limits.h>
13091
-#else
13092
-# include <assert.h>
13093
-#endif
13094
+fi
13095
+
13096
+ ;;
13097
13098
-#undef dlopen
13099
+ *)
13100
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
13101
+if test "x$ac_cv_func_shl_load" = xyes; then :
13102
+ lt_cv_dlopen="shl_load"
13103
+else
13104
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
13105
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
13106
+if ${ac_cv_lib_dld_shl_load+:} false; then :
13107
+ $as_echo_n "(cached) " >&6
13108
+else
13109
+ ac_check_lib_save_LIBS=$LIBS
13110
+LIBS="-ldld $LIBS"
13111
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13112
+/* end confdefs.h. */
13113
13114
/* Override any GCC internal prototype to avoid an error.
13115
Use char because int might match the return type of a GCC
13116
@@ -11408,72 +11508,41 @@
13117
#ifdef __cplusplus
13118
extern "C"
13119
#endif
13120
-char dlopen ();
13121
-/* The GNU C library defines this for functions which it implements
13122
- to always fail with ENOSYS. Some functions are actually named
13123
- something starting with __ and the normal name is an alias. */
13124
-#if defined __stub_dlopen || defined __stub___dlopen
13125
-choke me
13126
-#endif
13127
-
13128
+char shl_load ();
13129
int
13130
main ()
13131
{
13132
-return dlopen ();
13133
+return shl_load ();
13134
;
13135
return 0;
13136
}
13137
_ACEOF
13138
-rm -f conftest.$ac_objext conftest$ac_exeext
13139
-if { (ac_try="$ac_link"
13140
-case "(($ac_try" in
13141
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13142
- *) ac_try_echo=$ac_try;;
13143
-esac
13144
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13145
-$as_echo "$ac_try_echo") >&5
13146
- (eval "$ac_link") 2>conftest.er1
13147
- ac_status=$?
13148
- grep -v '^ *+' conftest.er1 >conftest.err
13149
- rm -f conftest.er1
13150
- cat conftest.err >&5
13151
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13152
- (exit $ac_status); } && {
13153
- test -z "$ac_c_werror_flag" ||
13154
- test ! -s conftest.err
13155
- } && test -s conftest$ac_exeext && {
13156
- test "$cross_compiling" = yes ||
13157
- $as_test_x conftest$ac_exeext
13158
- }; then
13159
- ac_cv_func_dlopen=yes
13160
+if ac_fn_c_try_link "$LINENO"; then :
13161
+ ac_cv_lib_dld_shl_load=yes
13162
else
13163
- $as_echo "$as_me: failed program was:" >&5
13164
-sed 's/^/| /' conftest.$ac_ext >&5
13165
-
13166
- ac_cv_func_dlopen=no
13167
+ ac_cv_lib_dld_shl_load=no
13168
fi
13169
-
13170
-rm -rf conftest.dSYM
13171
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13172
- conftest$ac_exeext conftest.$ac_ext
13173
+rm -f core conftest.err conftest.$ac_objext \
13174
+ conftest$ac_exeext conftest.$ac_ext
13175
+LIBS=$ac_check_lib_save_LIBS
13176
fi
13177
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
13178
-$as_echo "$ac_cv_func_dlopen" >&6; }
13179
-if test "x$ac_cv_func_dlopen" = x""yes; then
13180
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
13181
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
13182
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
13183
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
13184
+else
13185
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
13186
+if test "x$ac_cv_func_dlopen" = xyes; then :
13187
lt_cv_dlopen="dlopen"
13188
else
13189
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
13190
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
13191
$as_echo_n "checking for dlopen in -ldl... " >&6; }
13192
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
13193
+if ${ac_cv_lib_dl_dlopen+:} false; then :
13194
$as_echo_n "(cached) " >&6
13195
else
13196
ac_check_lib_save_LIBS=$LIBS
13197
LIBS="-ldl $LIBS"
13198
-cat >conftest.$ac_ext <<_ACEOF
13199
-/* confdefs.h. */
13200
-_ACEOF
13201
-cat confdefs.h >>conftest.$ac_ext
13202
-cat >>conftest.$ac_ext <<_ACEOF
13203
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13204
/* end confdefs.h. */
13205
13206
/* Override any GCC internal prototype to avoid an error.
13207
@@ -11491,57 +11560,28 @@
13208
return 0;
13209
}
13210
_ACEOF
13211
-rm -f conftest.$ac_objext conftest$ac_exeext
13212
-if { (ac_try="$ac_link"
13213
-case "(($ac_try" in
13214
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13215
- *) ac_try_echo=$ac_try;;
13216
-esac
13217
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13218
-$as_echo "$ac_try_echo") >&5
13219
- (eval "$ac_link") 2>conftest.er1
13220
- ac_status=$?
13221
- grep -v '^ *+' conftest.er1 >conftest.err
13222
- rm -f conftest.er1
13223
- cat conftest.err >&5
13224
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13225
- (exit $ac_status); } && {
13226
- test -z "$ac_c_werror_flag" ||
13227
- test ! -s conftest.err
13228
- } && test -s conftest$ac_exeext && {
13229
- test "$cross_compiling" = yes ||
13230
- $as_test_x conftest$ac_exeext
13231
- }; then
13232
+if ac_fn_c_try_link "$LINENO"; then :
13233
ac_cv_lib_dl_dlopen=yes
13234
else
13235
- $as_echo "$as_me: failed program was:" >&5
13236
-sed 's/^/| /' conftest.$ac_ext >&5
13237
-
13238
- ac_cv_lib_dl_dlopen=no
13239
+ ac_cv_lib_dl_dlopen=no
13240
fi
13241
-
13242
-rm -rf conftest.dSYM
13243
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13244
- conftest$ac_exeext conftest.$ac_ext
13245
+rm -f core conftest.err conftest.$ac_objext \
13246
+ conftest$ac_exeext conftest.$ac_ext
13247
LIBS=$ac_check_lib_save_LIBS
13248
fi
13249
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
13250
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
13251
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
13252
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
13253
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
13254
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
13255
else
13256
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
13257
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
13258
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
13259
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
13260
+if ${ac_cv_lib_svld_dlopen+:} false; then :
13261
$as_echo_n "(cached) " >&6
13262
else
13263
ac_check_lib_save_LIBS=$LIBS
13264
LIBS="-lsvld $LIBS"
13265
-cat >conftest.$ac_ext <<_ACEOF
13266
-/* confdefs.h. */
13267
-_ACEOF
13268
-cat confdefs.h >>conftest.$ac_ext
13269
-cat >>conftest.$ac_ext <<_ACEOF
13270
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13271
/* end confdefs.h. */
13272
13273
/* Override any GCC internal prototype to avoid an error.
13274
@@ -11559,57 +11599,28 @@
13275
return 0;
13276
}
13277
_ACEOF
13278
-rm -f conftest.$ac_objext conftest$ac_exeext
13279
-if { (ac_try="$ac_link"
13280
-case "(($ac_try" in
13281
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13282
- *) ac_try_echo=$ac_try;;
13283
-esac
13284
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13285
-$as_echo "$ac_try_echo") >&5
13286
- (eval "$ac_link") 2>conftest.er1
13287
- ac_status=$?
13288
- grep -v '^ *+' conftest.er1 >conftest.err
13289
- rm -f conftest.er1
13290
- cat conftest.err >&5
13291
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13292
- (exit $ac_status); } && {
13293
- test -z "$ac_c_werror_flag" ||
13294
- test ! -s conftest.err
13295
- } && test -s conftest$ac_exeext && {
13296
- test "$cross_compiling" = yes ||
13297
- $as_test_x conftest$ac_exeext
13298
- }; then
13299
+if ac_fn_c_try_link "$LINENO"; then :
13300
ac_cv_lib_svld_dlopen=yes
13301
else
13302
- $as_echo "$as_me: failed program was:" >&5
13303
-sed 's/^/| /' conftest.$ac_ext >&5
13304
-
13305
- ac_cv_lib_svld_dlopen=no
13306
+ ac_cv_lib_svld_dlopen=no
13307
fi
13308
-
13309
-rm -rf conftest.dSYM
13310
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13311
- conftest$ac_exeext conftest.$ac_ext
13312
+rm -f core conftest.err conftest.$ac_objext \
13313
+ conftest$ac_exeext conftest.$ac_ext
13314
LIBS=$ac_check_lib_save_LIBS
13315
fi
13316
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
13317
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
13318
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
13319
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
13320
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
13321
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
13322
else
13323
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
13324
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
13325
$as_echo_n "checking for dld_link in -ldld... " >&6; }
13326
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
13327
+if ${ac_cv_lib_dld_dld_link+:} false; then :
13328
$as_echo_n "(cached) " >&6
13329
else
13330
ac_check_lib_save_LIBS=$LIBS
13331
LIBS="-ldld $LIBS"
13332
-cat >conftest.$ac_ext <<_ACEOF
13333
-/* confdefs.h. */
13334
-_ACEOF
13335
-cat confdefs.h >>conftest.$ac_ext
13336
-cat >>conftest.$ac_ext <<_ACEOF
13337
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13338
/* end confdefs.h. */
13339
13340
/* Override any GCC internal prototype to avoid an error.
13341
@@ -11627,43 +11638,18 @@
13342
return 0;
13343
}
13344
_ACEOF
13345
-rm -f conftest.$ac_objext conftest$ac_exeext
13346
-if { (ac_try="$ac_link"
13347
-case "(($ac_try" in
13348
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13349
- *) ac_try_echo=$ac_try;;
13350
-esac
13351
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13352
-$as_echo "$ac_try_echo") >&5
13353
- (eval "$ac_link") 2>conftest.er1
13354
- ac_status=$?
13355
- grep -v '^ *+' conftest.er1 >conftest.err
13356
- rm -f conftest.er1
13357
- cat conftest.err >&5
13358
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13359
- (exit $ac_status); } && {
13360
- test -z "$ac_c_werror_flag" ||
13361
- test ! -s conftest.err
13362
- } && test -s conftest$ac_exeext && {
13363
- test "$cross_compiling" = yes ||
13364
- $as_test_x conftest$ac_exeext
13365
- }; then
13366
+if ac_fn_c_try_link "$LINENO"; then :
13367
ac_cv_lib_dld_dld_link=yes
13368
else
13369
- $as_echo "$as_me: failed program was:" >&5
13370
-sed 's/^/| /' conftest.$ac_ext >&5
13371
-
13372
- ac_cv_lib_dld_dld_link=no
13373
+ ac_cv_lib_dld_dld_link=no
13374
fi
13375
-
13376
-rm -rf conftest.dSYM
13377
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13378
- conftest$ac_exeext conftest.$ac_ext
13379
+rm -f core conftest.err conftest.$ac_objext \
13380
+ conftest$ac_exeext conftest.$ac_ext
13381
LIBS=$ac_check_lib_save_LIBS
13382
fi
13383
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
13384
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
13385
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
13386
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
13387
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
13388
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
13389
fi
13390
13391
@@ -11702,9 +11688,9 @@
13392
save_LIBS="$LIBS"
13393
LIBS="$lt_cv_dlopen_libs $LIBS"
13394
13395
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
13396
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
13397
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
13398
-if test "${lt_cv_dlopen_self+set}" = set; then
13399
+if ${lt_cv_dlopen_self+:} false; then :
13400
$as_echo_n "(cached) " >&6
13401
else
13402
if test "$cross_compiling" = yes; then :
13403
@@ -11713,7 +11699,7 @@
13404
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
13405
lt_status=$lt_dlunknown
13406
cat > conftest.$ac_ext <<_LT_EOF
13407
-#line 11716 "configure"
13408
+#line $LINENO "configure"
13409
#include "confdefs.h"
13410
13411
#if HAVE_DLFCN_H
13412
@@ -11754,7 +11740,13 @@
13413
# endif
13414
#endif
13415
13416
-void fnord() { int i=42;}
13417
+/* When -fvisbility=hidden is used, assume the code has been annotated
13418
+ correspondingly for the symbols needed. */
13419
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
13420
+int fnord () __attribute__((visibility("default")));
13421
+#endif
13422
+
13423
+int fnord () { return 42; }
13424
int main ()
13425
{
13426
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
13427
@@ -11763,7 +11755,11 @@
13428
if (self)
13429
{
13430
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
13431
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
13432
+ else
13433
+ {
13434
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
13435
+ else puts (dlerror ());
13436
+ }
13437
/* dlclose (self); */
13438
}
13439
else
13440
@@ -11772,11 +11768,11 @@
13441
return status;
13442
}
13443
_LT_EOF
13444
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13445
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13446
(eval $ac_link) 2>&5
13447
ac_status=$?
13448
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13449
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
13450
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13451
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
13452
(./conftest; exit; ) >&5 2>/dev/null
13453
lt_status=$?
13454
case x$lt_status in
13455
@@ -11793,14 +11789,14 @@
13456
13457
13458
fi
13459
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
13460
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
13461
$as_echo "$lt_cv_dlopen_self" >&6; }
13462
13463
if test "x$lt_cv_dlopen_self" = xyes; then
13464
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
13465
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
13466
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
13467
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
13468
-if test "${lt_cv_dlopen_self_static+set}" = set; then
13469
+if ${lt_cv_dlopen_self_static+:} false; then :
13470
$as_echo_n "(cached) " >&6
13471
else
13472
if test "$cross_compiling" = yes; then :
13473
@@ -11809,7 +11805,7 @@
13474
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
13475
lt_status=$lt_dlunknown
13476
cat > conftest.$ac_ext <<_LT_EOF
13477
-#line 11812 "configure"
13478
+#line $LINENO "configure"
13479
#include "confdefs.h"
13480
13481
#if HAVE_DLFCN_H
13482
@@ -11850,7 +11846,13 @@
13483
# endif
13484
#endif
13485
13486
-void fnord() { int i=42;}
13487
+/* When -fvisbility=hidden is used, assume the code has been annotated
13488
+ correspondingly for the symbols needed. */
13489
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
13490
+int fnord () __attribute__((visibility("default")));
13491
+#endif
13492
+
13493
+int fnord () { return 42; }
13494
int main ()
13495
{
13496
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
13497
@@ -11859,7 +11861,11 @@
13498
if (self)
13499
{
13500
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
13501
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
13502
+ else
13503
+ {
13504
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
13505
+ else puts (dlerror ());
13506
+ }
13507
/* dlclose (self); */
13508
}
13509
else
13510
@@ -11868,11 +11874,11 @@
13511
return status;
13512
}
13513
_LT_EOF
13514
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13515
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13516
(eval $ac_link) 2>&5
13517
ac_status=$?
13518
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13519
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
13520
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13521
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
13522
(./conftest; exit; ) >&5 2>/dev/null
13523
lt_status=$?
13524
case x$lt_status in
13525
@@ -11889,7 +11895,7 @@
13526
13527
13528
fi
13529
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
13530
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
13531
$as_echo "$lt_cv_dlopen_self_static" >&6; }
13532
fi
13533
13534
@@ -11928,12 +11934,12 @@
13535
13536
striplib=
13537
old_striplib=
13538
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
13539
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
13540
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
13541
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
13542
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
13543
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
13544
- { $as_echo "$as_me:$LINENO: result: yes" >&5
13545
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13546
$as_echo "yes" >&6; }
13547
else
13548
# FIXME - insert some real tests, host_os isn't really good enough
13549
@@ -11942,15 +11948,15 @@
13550
if test -n "$STRIP" ; then
13551
striplib="$STRIP -x"
13552
old_striplib="$STRIP -S"
13553
- { $as_echo "$as_me:$LINENO: result: yes" >&5
13554
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13555
$as_echo "yes" >&6; }
13556
else
13557
- { $as_echo "$as_me:$LINENO: result: no" >&5
13558
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13559
$as_echo "no" >&6; }
13560
fi
13561
;;
13562
*)
13563
- { $as_echo "$as_me:$LINENO: result: no" >&5
13564
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13565
$as_echo "no" >&6; }
13566
;;
13567
esac
13568
@@ -11968,12 +11974,12 @@
13569
13570
13571
# Report which library types will actually be built
13572
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
13573
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
13574
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
13575
- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
13576
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
13577
$as_echo "$can_build_shared" >&6; }
13578
13579
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
13580
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
13581
$as_echo_n "checking whether to build shared libraries... " >&6; }
13582
test "$can_build_shared" = "no" && enable_shared=no
13583
13584
@@ -11994,14 +12000,14 @@
13585
fi
13586
;;
13587
esac
13588
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
13589
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
13590
$as_echo "$enable_shared" >&6; }
13591
13592
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
13593
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
13594
$as_echo_n "checking whether to build static libraries... " >&6; }
13595
# Make sure either enable_shared or enable_static is yes.
13596
test "$enable_shared" = yes || enable_static=yes
13597
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
13598
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
13599
$as_echo "$enable_static" >&6; }
13600
13601
13602
@@ -12038,115 +12044,25 @@
13603
13604
13605
13606
- { $as_echo "$as_me:$LINENO: checking for ppoll" >&5
13607
-$as_echo_n "checking for ppoll... " >&6; }
13608
-if test "${ac_cv_func_ppoll+set}" = set; then
13609
- $as_echo_n "(cached) " >&6
13610
-else
13611
- cat >conftest.$ac_ext <<_ACEOF
13612
-/* confdefs.h. */
13613
-_ACEOF
13614
-cat confdefs.h >>conftest.$ac_ext
13615
-cat >>conftest.$ac_ext <<_ACEOF
13616
-/* end confdefs.h. */
13617
-/* Define ppoll to an innocuous variant, in case <limits.h> declares ppoll.
13618
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
13619
-#define ppoll innocuous_ppoll
13620
-
13621
-/* System header to define __stub macros and hopefully few prototypes,
13622
- which can conflict with char ppoll (); below.
13623
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
13624
- <limits.h> exists even on freestanding compilers. */
13625
-
13626
-#ifdef __STDC__
13627
-# include <limits.h>
13628
-#else
13629
-# include <assert.h>
13630
-#endif
13631
-
13632
-#undef ppoll
13633
-
13634
-/* Override any GCC internal prototype to avoid an error.
13635
- Use char because int might match the return type of a GCC
13636
- builtin and then its argument prototype would still apply. */
13637
-#ifdef __cplusplus
13638
-extern "C"
13639
-#endif
13640
-char ppoll ();
13641
-/* The GNU C library defines this for functions which it implements
13642
- to always fail with ENOSYS. Some functions are actually named
13643
- something starting with __ and the normal name is an alias. */
13644
-#if defined __stub_ppoll || defined __stub___ppoll
13645
-choke me
13646
-#endif
13647
-
13648
-int
13649
-main ()
13650
-{
13651
-return ppoll ();
13652
- ;
13653
- return 0;
13654
-}
13655
-_ACEOF
13656
-rm -f conftest.$ac_objext conftest$ac_exeext
13657
-if { (ac_try="$ac_link"
13658
-case "(($ac_try" in
13659
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13660
- *) ac_try_echo=$ac_try;;
13661
-esac
13662
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13663
-$as_echo "$ac_try_echo") >&5
13664
- (eval "$ac_link") 2>conftest.er1
13665
- ac_status=$?
13666
- grep -v '^ *+' conftest.er1 >conftest.err
13667
- rm -f conftest.er1
13668
- cat conftest.err >&5
13669
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13670
- (exit $ac_status); } && {
13671
- test -z "$ac_c_werror_flag" ||
13672
- test ! -s conftest.err
13673
- } && test -s conftest$ac_exeext && {
13674
- test "$cross_compiling" = yes ||
13675
- $as_test_x conftest$ac_exeext
13676
- }; then
13677
- ac_cv_func_ppoll=yes
13678
-else
13679
- $as_echo "$as_me: failed program was:" >&5
13680
-sed 's/^/| /' conftest.$ac_ext >&5
13681
-
13682
- ac_cv_func_ppoll=no
13683
-fi
13684
-
13685
-rm -rf conftest.dSYM
13686
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13687
- conftest$ac_exeext conftest.$ac_ext
13688
-fi
13689
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ppoll" >&5
13690
-$as_echo "$ac_cv_func_ppoll" >&6; }
13691
-if test "x$ac_cv_func_ppoll" = x""yes; then
13692
+ ac_fn_c_check_func "$LINENO" "ppoll" "ac_cv_func_ppoll"
13693
+if test "x$ac_cv_func_ppoll" = xyes; then :
13694
dummy=yes
13695
else
13696
13697
-cat >>confdefs.h <<\_ACEOF
13698
-#define NEED_PPOLL 1
13699
-_ACEOF
13700
+$as_echo "#define NEED_PPOLL 1" >>confdefs.h
13701
13702
fi
13703
13704
13705
13706
-{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
13707
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
13708
$as_echo_n "checking for dlopen in -ldl... " >&6; }
13709
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
13710
+if ${ac_cv_lib_dl_dlopen+:} false; then :
13711
$as_echo_n "(cached) " >&6
13712
else
13713
ac_check_lib_save_LIBS=$LIBS
13714
LIBS="-ldl $LIBS"
13715
-cat >conftest.$ac_ext <<_ACEOF
13716
-/* confdefs.h. */
13717
-_ACEOF
13718
-cat confdefs.h >>conftest.$ac_ext
13719
-cat >>conftest.$ac_ext <<_ACEOF
13720
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13721
/* end confdefs.h. */
13722
13723
/* Override any GCC internal prototype to avoid an error.
13724
@@ -12164,67 +12080,41 @@
13725
return 0;
13726
}
13727
_ACEOF
13728
-rm -f conftest.$ac_objext conftest$ac_exeext
13729
-if { (ac_try="$ac_link"
13730
-case "(($ac_try" in
13731
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13732
- *) ac_try_echo=$ac_try;;
13733
-esac
13734
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13735
-$as_echo "$ac_try_echo") >&5
13736
- (eval "$ac_link") 2>conftest.er1
13737
- ac_status=$?
13738
- grep -v '^ *+' conftest.er1 >conftest.err
13739
- rm -f conftest.er1
13740
- cat conftest.err >&5
13741
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13742
- (exit $ac_status); } && {
13743
- test -z "$ac_c_werror_flag" ||
13744
- test ! -s conftest.err
13745
- } && test -s conftest$ac_exeext && {
13746
- test "$cross_compiling" = yes ||
13747
- $as_test_x conftest$ac_exeext
13748
- }; then
13749
+if ac_fn_c_try_link "$LINENO"; then :
13750
ac_cv_lib_dl_dlopen=yes
13751
else
13752
- $as_echo "$as_me: failed program was:" >&5
13753
-sed 's/^/| /' conftest.$ac_ext >&5
13754
-
13755
- ac_cv_lib_dl_dlopen=no
13756
+ ac_cv_lib_dl_dlopen=no
13757
fi
13758
-
13759
-rm -rf conftest.dSYM
13760
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13761
- conftest$ac_exeext conftest.$ac_ext
13762
+rm -f core conftest.err conftest.$ac_objext \
13763
+ conftest$ac_exeext conftest.$ac_ext
13764
LIBS=$ac_check_lib_save_LIBS
13765
fi
13766
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
13767
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
13768
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
13769
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
13770
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
13771
dummy=yes
13772
else
13773
- { { $as_echo "$as_me:$LINENO: error: dynamic linking loader is required" >&5
13774
-$as_echo "$as_me: error: dynamic linking loader is required" >&2;}
13775
- { (exit 1); exit 1; }; }
13776
+ as_fn_error $? "dynamic linking loader is required" "$LINENO" 5
13777
fi
13778
13779
13780
13781
13782
pkg_failed=no
13783
-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
13784
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
13785
$as_echo_n "checking for DBUS... " >&6; }
13786
13787
if test -n "$DBUS_CFLAGS"; then
13788
pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
13789
elif test -n "$PKG_CONFIG"; then
13790
if test -n "$PKG_CONFIG" && \
13791
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0\"") >&5
13792
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0\""; } >&5
13793
($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0") 2>&5
13794
ac_status=$?
13795
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13796
- (exit $ac_status); }; then
13797
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13798
+ test $ac_status = 0; }; then
13799
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0" 2>/dev/null`
13800
+ test "x$?" != "x0" && pkg_failed=yes
13801
else
13802
pkg_failed=yes
13803
fi
13804
@@ -12235,12 +12125,13 @@
13805
pkg_cv_DBUS_LIBS="$DBUS_LIBS"
13806
elif test -n "$PKG_CONFIG"; then
13807
if test -n "$PKG_CONFIG" && \
13808
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0\"") >&5
13809
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0\""; } >&5
13810
($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0") 2>&5
13811
ac_status=$?
13812
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13813
- (exit $ac_status); }; then
13814
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13815
+ test $ac_status = 0; }; then
13816
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0" 2>/dev/null`
13817
+ test "x$?" != "x0" && pkg_failed=yes
13818
else
13819
pkg_failed=yes
13820
fi
13821
@@ -12251,6 +12142,8 @@
13822
13823
13824
if test $pkg_failed = yes; then
13825
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13826
+$as_echo "no" >&6; }
13827
13828
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13829
_pkg_short_errors_supported=yes
13830
@@ -12258,41 +12151,33 @@
13831
_pkg_short_errors_supported=no
13832
fi
13833
if test $_pkg_short_errors_supported = yes; then
13834
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.0" 2>&1`
13835
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.0" 2>&1`
13836
else
13837
- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.0" 2>&1`
13838
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.0" 2>&1`
13839
fi
13840
# Put the nasty error message in config.log where it belongs
13841
echo "$DBUS_PKG_ERRORS" >&5
13842
13843
- { $as_echo "$as_me:$LINENO: result: no" >&5
13844
-$as_echo "no" >&6; }
13845
- { { $as_echo "$as_me:$LINENO: error: D-Bus library is required" >&5
13846
-$as_echo "$as_me: error: D-Bus library is required" >&2;}
13847
- { (exit 1); exit 1; }; }
13848
+ as_fn_error $? "D-Bus library is required" "$LINENO" 5
13849
elif test $pkg_failed = untried; then
13850
- { { $as_echo "$as_me:$LINENO: error: D-Bus library is required" >&5
13851
-$as_echo "$as_me: error: D-Bus library is required" >&2;}
13852
- { (exit 1); exit 1; }; }
13853
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13854
+$as_echo "no" >&6; }
13855
+ as_fn_error $? "D-Bus library is required" "$LINENO" 5
13856
else
13857
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
13858
DBUS_LIBS=$pkg_cv_DBUS_LIBS
13859
- { $as_echo "$as_me:$LINENO: result: yes" >&5
13860
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13861
$as_echo "yes" >&6; }
13862
dummy=yes
13863
fi
13864
- { $as_echo "$as_me:$LINENO: checking for dbus_watch_get_unix_fd in -ldbus-1" >&5
13865
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus_watch_get_unix_fd in -ldbus-1" >&5
13866
$as_echo_n "checking for dbus_watch_get_unix_fd in -ldbus-1... " >&6; }
13867
-if test "${ac_cv_lib_dbus_1_dbus_watch_get_unix_fd+set}" = set; then
13868
+if ${ac_cv_lib_dbus_1_dbus_watch_get_unix_fd+:} false; then :
13869
$as_echo_n "(cached) " >&6
13870
else
13871
ac_check_lib_save_LIBS=$LIBS
13872
LIBS="-ldbus-1 $LIBS"
13873
-cat >conftest.$ac_ext <<_ACEOF
13874
-/* confdefs.h. */
13875
-_ACEOF
13876
-cat confdefs.h >>conftest.$ac_ext
13877
-cat >>conftest.$ac_ext <<_ACEOF
13878
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13879
/* end confdefs.h. */
13880
13881
/* Override any GCC internal prototype to avoid an error.
13882
@@ -12310,64 +12195,33 @@
13883
return 0;
13884
}
13885
_ACEOF
13886
-rm -f conftest.$ac_objext conftest$ac_exeext
13887
-if { (ac_try="$ac_link"
13888
-case "(($ac_try" in
13889
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13890
- *) ac_try_echo=$ac_try;;
13891
-esac
13892
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13893
-$as_echo "$ac_try_echo") >&5
13894
- (eval "$ac_link") 2>conftest.er1
13895
- ac_status=$?
13896
- grep -v '^ *+' conftest.er1 >conftest.err
13897
- rm -f conftest.er1
13898
- cat conftest.err >&5
13899
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13900
- (exit $ac_status); } && {
13901
- test -z "$ac_c_werror_flag" ||
13902
- test ! -s conftest.err
13903
- } && test -s conftest$ac_exeext && {
13904
- test "$cross_compiling" = yes ||
13905
- $as_test_x conftest$ac_exeext
13906
- }; then
13907
+if ac_fn_c_try_link "$LINENO"; then :
13908
ac_cv_lib_dbus_1_dbus_watch_get_unix_fd=yes
13909
else
13910
- $as_echo "$as_me: failed program was:" >&5
13911
-sed 's/^/| /' conftest.$ac_ext >&5
13912
-
13913
- ac_cv_lib_dbus_1_dbus_watch_get_unix_fd=no
13914
+ ac_cv_lib_dbus_1_dbus_watch_get_unix_fd=no
13915
fi
13916
-
13917
-rm -rf conftest.dSYM
13918
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13919
- conftest$ac_exeext conftest.$ac_ext
13920
+rm -f core conftest.err conftest.$ac_objext \
13921
+ conftest$ac_exeext conftest.$ac_ext
13922
LIBS=$ac_check_lib_save_LIBS
13923
fi
13924
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" >&5
13925
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" >&5
13926
$as_echo "$ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" >&6; }
13927
-if test "x$ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" = x""yes; then
13928
+if test "x$ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" = xyes; then :
13929
dummy=yes
13930
else
13931
13932
-cat >>confdefs.h <<\_ACEOF
13933
-#define NEED_DBUS_WATCH_GET_UNIX_FD 1
13934
-_ACEOF
13935
+$as_echo "#define NEED_DBUS_WATCH_GET_UNIX_FD 1" >>confdefs.h
13936
13937
fi
13938
13939
- { $as_echo "$as_me:$LINENO: checking for dbus_connection_can_send_type in -ldbus-1" >&5
13940
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus_connection_can_send_type in -ldbus-1" >&5
13941
$as_echo_n "checking for dbus_connection_can_send_type in -ldbus-1... " >&6; }
13942
-if test "${ac_cv_lib_dbus_1_dbus_connection_can_send_type+set}" = set; then
13943
+if ${ac_cv_lib_dbus_1_dbus_connection_can_send_type+:} false; then :
13944
$as_echo_n "(cached) " >&6
13945
else
13946
ac_check_lib_save_LIBS=$LIBS
13947
LIBS="-ldbus-1 $LIBS"
13948
-cat >conftest.$ac_ext <<_ACEOF
13949
-/* confdefs.h. */
13950
-_ACEOF
13951
-cat confdefs.h >>conftest.$ac_ext
13952
-cat >>conftest.$ac_ext <<_ACEOF
13953
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13954
/* end confdefs.h. */
13955
13956
/* Override any GCC internal prototype to avoid an error.
13957
@@ -12376,58 +12230,31 @@
13958
#ifdef __cplusplus
13959
extern "C"
13960
#endif
13961
-char dbus_connection_can_send_type ();
13962
-int
13963
-main ()
13964
-{
13965
-return dbus_connection_can_send_type ();
13966
- ;
13967
- return 0;
13968
-}
13969
-_ACEOF
13970
-rm -f conftest.$ac_objext conftest$ac_exeext
13971
-if { (ac_try="$ac_link"
13972
-case "(($ac_try" in
13973
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13974
- *) ac_try_echo=$ac_try;;
13975
-esac
13976
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
13977
-$as_echo "$ac_try_echo") >&5
13978
- (eval "$ac_link") 2>conftest.er1
13979
- ac_status=$?
13980
- grep -v '^ *+' conftest.er1 >conftest.err
13981
- rm -f conftest.er1
13982
- cat conftest.err >&5
13983
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
13984
- (exit $ac_status); } && {
13985
- test -z "$ac_c_werror_flag" ||
13986
- test ! -s conftest.err
13987
- } && test -s conftest$ac_exeext && {
13988
- test "$cross_compiling" = yes ||
13989
- $as_test_x conftest$ac_exeext
13990
- }; then
13991
+char dbus_connection_can_send_type ();
13992
+int
13993
+main ()
13994
+{
13995
+return dbus_connection_can_send_type ();
13996
+ ;
13997
+ return 0;
13998
+}
13999
+_ACEOF
14000
+if ac_fn_c_try_link "$LINENO"; then :
14001
ac_cv_lib_dbus_1_dbus_connection_can_send_type=yes
14002
else
14003
- $as_echo "$as_me: failed program was:" >&5
14004
-sed 's/^/| /' conftest.$ac_ext >&5
14005
-
14006
- ac_cv_lib_dbus_1_dbus_connection_can_send_type=no
14007
+ ac_cv_lib_dbus_1_dbus_connection_can_send_type=no
14008
fi
14009
-
14010
-rm -rf conftest.dSYM
14011
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14012
- conftest$ac_exeext conftest.$ac_ext
14013
+rm -f core conftest.err conftest.$ac_objext \
14014
+ conftest$ac_exeext conftest.$ac_ext
14015
LIBS=$ac_check_lib_save_LIBS
14016
fi
14017
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_connection_can_send_type" >&5
14018
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbus_1_dbus_connection_can_send_type" >&5
14019
$as_echo "$ac_cv_lib_dbus_1_dbus_connection_can_send_type" >&6; }
14020
-if test "x$ac_cv_lib_dbus_1_dbus_connection_can_send_type" = x""yes; then
14021
+if test "x$ac_cv_lib_dbus_1_dbus_connection_can_send_type" = xyes; then :
14022
dummy=yes
14023
else
14024
14025
-cat >>confdefs.h <<\_ACEOF
14026
-#define NEED_DBUS_CONNECTION_CAN_SEND_TYPE 1
14027
-_ACEOF
14028
+$as_echo "#define NEED_DBUS_CONNECTION_CAN_SEND_TYPE 1" >>confdefs.h
14029
14030
fi
14031
14032
@@ -12437,19 +12264,20 @@
14033
14034
14035
pkg_failed=no
14036
-{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
14037
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
14038
$as_echo_n "checking for GLIB... " >&6; }
14039
14040
if test -n "$GLIB_CFLAGS"; then
14041
pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
14042
elif test -n "$PKG_CONFIG"; then
14043
if test -n "$PKG_CONFIG" && \
14044
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\"") >&5
14045
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
14046
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
14047
ac_status=$?
14048
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14049
- (exit $ac_status); }; then
14050
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14051
+ test $ac_status = 0; }; then
14052
pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16" 2>/dev/null`
14053
+ test "x$?" != "x0" && pkg_failed=yes
14054
else
14055
pkg_failed=yes
14056
fi
14057
@@ -12460,12 +12288,13 @@
14058
pkg_cv_GLIB_LIBS="$GLIB_LIBS"
14059
elif test -n "$PKG_CONFIG"; then
14060
if test -n "$PKG_CONFIG" && \
14061
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\"") >&5
14062
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
14063
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
14064
ac_status=$?
14065
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14066
- (exit $ac_status); }; then
14067
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14068
+ test $ac_status = 0; }; then
14069
pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16" 2>/dev/null`
14070
+ test "x$?" != "x0" && pkg_failed=yes
14071
else
14072
pkg_failed=yes
14073
fi
14074
@@ -12476,6 +12305,8 @@
14075
14076
14077
if test $pkg_failed = yes; then
14078
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14079
+$as_echo "no" >&6; }
14080
14081
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14082
_pkg_short_errors_supported=yes
14083
@@ -12483,26 +12314,22 @@
14084
_pkg_short_errors_supported=no
14085
fi
14086
if test $_pkg_short_errors_supported = yes; then
14087
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.16" 2>&1`
14088
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16" 2>&1`
14089
else
14090
- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.16" 2>&1`
14091
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16" 2>&1`
14092
fi
14093
# Put the nasty error message in config.log where it belongs
14094
echo "$GLIB_PKG_ERRORS" >&5
14095
14096
- { $as_echo "$as_me:$LINENO: result: no" >&5
14097
-$as_echo "no" >&6; }
14098
- { { $as_echo "$as_me:$LINENO: error: GLib library version 2.16 or later is required" >&5
14099
-$as_echo "$as_me: error: GLib library version 2.16 or later is required" >&2;}
14100
- { (exit 1); exit 1; }; }
14101
+ as_fn_error $? "GLib library version 2.16 or later is required" "$LINENO" 5
14102
elif test $pkg_failed = untried; then
14103
- { { $as_echo "$as_me:$LINENO: error: GLib library version 2.16 or later is required" >&5
14104
-$as_echo "$as_me: error: GLib library version 2.16 or later is required" >&2;}
14105
- { (exit 1); exit 1; }; }
14106
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14107
+$as_echo "no" >&6; }
14108
+ as_fn_error $? "GLib library version 2.16 or later is required" "$LINENO" 5
14109
else
14110
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
14111
GLIB_LIBS=$pkg_cv_GLIB_LIBS
14112
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14113
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14114
$as_echo "yes" >&6; }
14115
dummy=yes
14116
fi
14117
@@ -12512,19 +12339,20 @@
14118
14119
14120
pkg_failed=no
14121
-{ $as_echo "$as_me:$LINENO: checking for ALSA" >&5
14122
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
14123
$as_echo_n "checking for ALSA... " >&6; }
14124
14125
if test -n "$ALSA_CFLAGS"; then
14126
pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
14127
elif test -n "$PKG_CONFIG"; then
14128
if test -n "$PKG_CONFIG" && \
14129
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
14130
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
14131
($PKG_CONFIG --exists --print-errors "alsa") 2>&5
14132
ac_status=$?
14133
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14134
- (exit $ac_status); }; then
14135
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14136
+ test $ac_status = 0; }; then
14137
pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
14138
+ test "x$?" != "x0" && pkg_failed=yes
14139
else
14140
pkg_failed=yes
14141
fi
14142
@@ -12535,12 +12363,13 @@
14143
pkg_cv_ALSA_LIBS="$ALSA_LIBS"
14144
elif test -n "$PKG_CONFIG"; then
14145
if test -n "$PKG_CONFIG" && \
14146
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
14147
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
14148
($PKG_CONFIG --exists --print-errors "alsa") 2>&5
14149
ac_status=$?
14150
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14151
- (exit $ac_status); }; then
14152
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14153
+ test $ac_status = 0; }; then
14154
pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
14155
+ test "x$?" != "x0" && pkg_failed=yes
14156
else
14157
pkg_failed=yes
14158
fi
14159
@@ -12551,6 +12380,8 @@
14160
14161
14162
if test $pkg_failed = yes; then
14163
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14164
+$as_echo "no" >&6; }
14165
14166
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14167
_pkg_short_errors_supported=yes
14168
@@ -12558,37 +12389,33 @@
14169
_pkg_short_errors_supported=no
14170
fi
14171
if test $_pkg_short_errors_supported = yes; then
14172
- ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`
14173
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa" 2>&1`
14174
else
14175
- ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`
14176
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa" 2>&1`
14177
fi
14178
# Put the nasty error message in config.log where it belongs
14179
echo "$ALSA_PKG_ERRORS" >&5
14180
14181
- { $as_echo "$as_me:$LINENO: result: no" >&5
14182
-$as_echo "no" >&6; }
14183
- alsa_found=no
14184
+ alsa_found=no
14185
elif test $pkg_failed = untried; then
14186
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14187
+$as_echo "no" >&6; }
14188
alsa_found=no
14189
else
14190
ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
14191
ALSA_LIBS=$pkg_cv_ALSA_LIBS
14192
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14193
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14194
$as_echo "yes" >&6; }
14195
alsa_found=yes
14196
fi
14197
- { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
14198
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
14199
$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
14200
-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
14201
+if ${ac_cv_lib_rt_clock_gettime+:} false; then :
14202
$as_echo_n "(cached) " >&6
14203
else
14204
ac_check_lib_save_LIBS=$LIBS
14205
LIBS="-lrt $LIBS"
14206
-cat >conftest.$ac_ext <<_ACEOF
14207
-/* confdefs.h. */
14208
-_ACEOF
14209
-cat confdefs.h >>conftest.$ac_ext
14210
-cat >>conftest.$ac_ext <<_ACEOF
14211
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14212
/* end confdefs.h. */
14213
14214
/* Override any GCC internal prototype to avoid an error.
14215
@@ -12606,43 +12433,18 @@
14216
return 0;
14217
}
14218
_ACEOF
14219
-rm -f conftest.$ac_objext conftest$ac_exeext
14220
-if { (ac_try="$ac_link"
14221
-case "(($ac_try" in
14222
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14223
- *) ac_try_echo=$ac_try;;
14224
-esac
14225
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14226
-$as_echo "$ac_try_echo") >&5
14227
- (eval "$ac_link") 2>conftest.er1
14228
- ac_status=$?
14229
- grep -v '^ *+' conftest.er1 >conftest.err
14230
- rm -f conftest.er1
14231
- cat conftest.err >&5
14232
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14233
- (exit $ac_status); } && {
14234
- test -z "$ac_c_werror_flag" ||
14235
- test ! -s conftest.err
14236
- } && test -s conftest$ac_exeext && {
14237
- test "$cross_compiling" = yes ||
14238
- $as_test_x conftest$ac_exeext
14239
- }; then
14240
+if ac_fn_c_try_link "$LINENO"; then :
14241
ac_cv_lib_rt_clock_gettime=yes
14242
else
14243
- $as_echo "$as_me: failed program was:" >&5
14244
-sed 's/^/| /' conftest.$ac_ext >&5
14245
-
14246
- ac_cv_lib_rt_clock_gettime=no
14247
+ ac_cv_lib_rt_clock_gettime=no
14248
fi
14249
-
14250
-rm -rf conftest.dSYM
14251
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14252
- conftest$ac_exeext conftest.$ac_ext
14253
+rm -f core conftest.err conftest.$ac_objext \
14254
+ conftest$ac_exeext conftest.$ac_ext
14255
LIBS=$ac_check_lib_save_LIBS
14256
fi
14257
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
14258
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
14259
$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
14260
-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
14261
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
14262
ALSA_LIBS="$ALSA_LIBS -lrt"
14263
else
14264
alsa_found=no
14265
@@ -12650,23 +12452,26 @@
14266
14267
14268
14269
+ ALSA_LIBDIR=`$PKG_CONFIG --variable=libdir alsa 2>/dev/null`
14270
+
14271
14272
14273
14274
pkg_failed=no
14275
-{ $as_echo "$as_me:$LINENO: checking for GSTREAMER" >&5
14276
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
14277
$as_echo_n "checking for GSTREAMER... " >&6; }
14278
14279
if test -n "$GSTREAMER_CFLAGS"; then
14280
pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
14281
elif test -n "$PKG_CONFIG"; then
14282
if test -n "$PKG_CONFIG" && \
14283
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10\"") >&5
14284
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10\""; } >&5
14285
($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10") 2>&5
14286
ac_status=$?
14287
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14288
- (exit $ac_status); }; then
14289
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14290
+ test $ac_status = 0; }; then
14291
pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10" 2>/dev/null`
14292
+ test "x$?" != "x0" && pkg_failed=yes
14293
else
14294
pkg_failed=yes
14295
fi
14296
@@ -12677,12 +12482,13 @@
14297
pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
14298
elif test -n "$PKG_CONFIG"; then
14299
if test -n "$PKG_CONFIG" && \
14300
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10\"") >&5
14301
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10\""; } >&5
14302
($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10") 2>&5
14303
ac_status=$?
14304
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14305
- (exit $ac_status); }; then
14306
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14307
+ test $ac_status = 0; }; then
14308
pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10" 2>/dev/null`
14309
+ test "x$?" != "x0" && pkg_failed=yes
14310
else
14311
pkg_failed=yes
14312
fi
14313
@@ -12693,6 +12499,8 @@
14314
14315
14316
if test $pkg_failed = yes; then
14317
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14318
+$as_echo "no" >&6; }
14319
14320
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14321
_pkg_short_errors_supported=yes
14322
@@ -12700,24 +12508,24 @@
14323
_pkg_short_errors_supported=no
14324
fi
14325
if test $_pkg_short_errors_supported = yes; then
14326
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10" 2>&1`
14327
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10" 2>&1`
14328
else
14329
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10" 2>&1`
14330
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10" 2>&1`
14331
fi
14332
# Put the nasty error message in config.log where it belongs
14333
echo "$GSTREAMER_PKG_ERRORS" >&5
14334
14335
- { $as_echo "$as_me:$LINENO: result: no" >&5
14336
-$as_echo "no" >&6; }
14337
- { $as_echo "$as_me:$LINENO: WARNING: GStreamer library version 0.10.30 or later is required" >&5
14338
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer library version 0.10.30 or later is required" >&5
14339
$as_echo "$as_me: WARNING: GStreamer library version 0.10.30 or later is required" >&2;};gstreamer_found=no
14340
elif test $pkg_failed = untried; then
14341
- { $as_echo "$as_me:$LINENO: WARNING: GStreamer library version 0.10.30 or later is required" >&5
14342
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14343
+$as_echo "no" >&6; }
14344
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer library version 0.10.30 or later is required" >&5
14345
$as_echo "$as_me: WARNING: GStreamer library version 0.10.30 or later is required" >&2;};gstreamer_found=no
14346
else
14347
GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
14348
GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
14349
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14350
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14351
$as_echo "yes" >&6; }
14352
gstreamer_found=yes
14353
fi
14354
@@ -12729,19 +12537,20 @@
14355
14356
14357
pkg_failed=no
14358
-{ $as_echo "$as_me:$LINENO: checking for USB" >&5
14359
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5
14360
$as_echo_n "checking for USB... " >&6; }
14361
14362
if test -n "$USB_CFLAGS"; then
14363
pkg_cv_USB_CFLAGS="$USB_CFLAGS"
14364
elif test -n "$PKG_CONFIG"; then
14365
if test -n "$PKG_CONFIG" && \
14366
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
14367
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5
14368
($PKG_CONFIG --exists --print-errors "libusb") 2>&5
14369
ac_status=$?
14370
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14371
- (exit $ac_status); }; then
14372
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14373
+ test $ac_status = 0; }; then
14374
pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null`
14375
+ test "x$?" != "x0" && pkg_failed=yes
14376
else
14377
pkg_failed=yes
14378
fi
14379
@@ -12752,12 +12561,13 @@
14380
pkg_cv_USB_LIBS="$USB_LIBS"
14381
elif test -n "$PKG_CONFIG"; then
14382
if test -n "$PKG_CONFIG" && \
14383
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
14384
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5
14385
($PKG_CONFIG --exists --print-errors "libusb") 2>&5
14386
ac_status=$?
14387
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14388
- (exit $ac_status); }; then
14389
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14390
+ test $ac_status = 0; }; then
14391
pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb" 2>/dev/null`
14392
+ test "x$?" != "x0" && pkg_failed=yes
14393
else
14394
pkg_failed=yes
14395
fi
14396
@@ -12768,6 +12578,8 @@
14397
14398
14399
if test $pkg_failed = yes; then
14400
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14401
+$as_echo "no" >&6; }
14402
14403
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14404
_pkg_short_errors_supported=yes
14405
@@ -12775,39 +12587,35 @@
14406
_pkg_short_errors_supported=no
14407
fi
14408
if test $_pkg_short_errors_supported = yes; then
14409
- USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb" 2>&1`
14410
+ USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb" 2>&1`
14411
else
14412
- USB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb" 2>&1`
14413
+ USB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb" 2>&1`
14414
fi
14415
# Put the nasty error message in config.log where it belongs
14416
echo "$USB_PKG_ERRORS" >&5
14417
14418
- { $as_echo "$as_me:$LINENO: result: no" >&5
14419
-$as_echo "no" >&6; }
14420
- usb_found=no
14421
+ usb_found=no
14422
elif test $pkg_failed = untried; then
14423
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14424
+$as_echo "no" >&6; }
14425
usb_found=no
14426
else
14427
USB_CFLAGS=$pkg_cv_USB_CFLAGS
14428
USB_LIBS=$pkg_cv_USB_LIBS
14429
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14430
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14431
$as_echo "yes" >&6; }
14432
usb_found=yes
14433
fi
14434
14435
14436
- { $as_echo "$as_me:$LINENO: checking for usb_get_busses in -lusb" >&5
14437
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_get_busses in -lusb" >&5
14438
$as_echo_n "checking for usb_get_busses in -lusb... " >&6; }
14439
-if test "${ac_cv_lib_usb_usb_get_busses+set}" = set; then
14440
+if ${ac_cv_lib_usb_usb_get_busses+:} false; then :
14441
$as_echo_n "(cached) " >&6
14442
else
14443
ac_check_lib_save_LIBS=$LIBS
14444
LIBS="-lusb $LIBS"
14445
-cat >conftest.$ac_ext <<_ACEOF
14446
-/* confdefs.h. */
14447
-_ACEOF
14448
-cat confdefs.h >>conftest.$ac_ext
14449
-cat >>conftest.$ac_ext <<_ACEOF
14450
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14451
/* end confdefs.h. */
14452
14453
/* Override any GCC internal prototype to avoid an error.
14454
@@ -12825,64 +12633,33 @@
14455
return 0;
14456
}
14457
_ACEOF
14458
-rm -f conftest.$ac_objext conftest$ac_exeext
14459
-if { (ac_try="$ac_link"
14460
-case "(($ac_try" in
14461
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14462
- *) ac_try_echo=$ac_try;;
14463
-esac
14464
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14465
-$as_echo "$ac_try_echo") >&5
14466
- (eval "$ac_link") 2>conftest.er1
14467
- ac_status=$?
14468
- grep -v '^ *+' conftest.er1 >conftest.err
14469
- rm -f conftest.er1
14470
- cat conftest.err >&5
14471
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14472
- (exit $ac_status); } && {
14473
- test -z "$ac_c_werror_flag" ||
14474
- test ! -s conftest.err
14475
- } && test -s conftest$ac_exeext && {
14476
- test "$cross_compiling" = yes ||
14477
- $as_test_x conftest$ac_exeext
14478
- }; then
14479
+if ac_fn_c_try_link "$LINENO"; then :
14480
ac_cv_lib_usb_usb_get_busses=yes
14481
else
14482
- $as_echo "$as_me: failed program was:" >&5
14483
-sed 's/^/| /' conftest.$ac_ext >&5
14484
-
14485
- ac_cv_lib_usb_usb_get_busses=no
14486
+ ac_cv_lib_usb_usb_get_busses=no
14487
fi
14488
-
14489
-rm -rf conftest.dSYM
14490
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14491
- conftest$ac_exeext conftest.$ac_ext
14492
+rm -f core conftest.err conftest.$ac_objext \
14493
+ conftest$ac_exeext conftest.$ac_ext
14494
LIBS=$ac_check_lib_save_LIBS
14495
fi
14496
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb_usb_get_busses" >&5
14497
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_get_busses" >&5
14498
$as_echo "$ac_cv_lib_usb_usb_get_busses" >&6; }
14499
-if test "x$ac_cv_lib_usb_usb_get_busses" = x""yes; then
14500
+if test "x$ac_cv_lib_usb_usb_get_busses" = xyes; then :
14501
dummy=yes
14502
else
14503
14504
-cat >>confdefs.h <<\_ACEOF
14505
-#define NEED_USB_GET_BUSSES 1
14506
-_ACEOF
14507
+$as_echo "#define NEED_USB_GET_BUSSES 1" >>confdefs.h
14508
14509
fi
14510
14511
- { $as_echo "$as_me:$LINENO: checking for usb_interrupt_read in -lusb" >&5
14512
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
14513
$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
14514
-if test "${ac_cv_lib_usb_usb_interrupt_read+set}" = set; then
14515
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
14516
$as_echo_n "(cached) " >&6
14517
else
14518
ac_check_lib_save_LIBS=$LIBS
14519
LIBS="-lusb $LIBS"
14520
-cat >conftest.$ac_ext <<_ACEOF
14521
-/* confdefs.h. */
14522
-_ACEOF
14523
-cat confdefs.h >>conftest.$ac_ext
14524
-cat >>conftest.$ac_ext <<_ACEOF
14525
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14526
/* end confdefs.h. */
14527
14528
/* Override any GCC internal prototype to avoid an error.
14529
@@ -12900,49 +12677,22 @@
14530
return 0;
14531
}
14532
_ACEOF
14533
-rm -f conftest.$ac_objext conftest$ac_exeext
14534
-if { (ac_try="$ac_link"
14535
-case "(($ac_try" in
14536
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14537
- *) ac_try_echo=$ac_try;;
14538
-esac
14539
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14540
-$as_echo "$ac_try_echo") >&5
14541
- (eval "$ac_link") 2>conftest.er1
14542
- ac_status=$?
14543
- grep -v '^ *+' conftest.er1 >conftest.err
14544
- rm -f conftest.er1
14545
- cat conftest.err >&5
14546
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14547
- (exit $ac_status); } && {
14548
- test -z "$ac_c_werror_flag" ||
14549
- test ! -s conftest.err
14550
- } && test -s conftest$ac_exeext && {
14551
- test "$cross_compiling" = yes ||
14552
- $as_test_x conftest$ac_exeext
14553
- }; then
14554
+if ac_fn_c_try_link "$LINENO"; then :
14555
ac_cv_lib_usb_usb_interrupt_read=yes
14556
else
14557
- $as_echo "$as_me: failed program was:" >&5
14558
-sed 's/^/| /' conftest.$ac_ext >&5
14559
-
14560
- ac_cv_lib_usb_usb_interrupt_read=no
14561
+ ac_cv_lib_usb_usb_interrupt_read=no
14562
fi
14563
-
14564
-rm -rf conftest.dSYM
14565
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14566
- conftest$ac_exeext conftest.$ac_ext
14567
+rm -f core conftest.err conftest.$ac_objext \
14568
+ conftest$ac_exeext conftest.$ac_ext
14569
LIBS=$ac_check_lib_save_LIBS
14570
fi
14571
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
14572
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
14573
$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
14574
-if test "x$ac_cv_lib_usb_usb_interrupt_read" = x""yes; then
14575
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
14576
dummy=yes
14577
else
14578
14579
-cat >>confdefs.h <<\_ACEOF
14580
-#define NEED_USB_INTERRUPT_READ 1
14581
-_ACEOF
14582
+$as_echo "#define NEED_USB_INTERRUPT_READ 1" >>confdefs.h
14583
14584
fi
14585
14586
@@ -12950,19 +12700,20 @@
14587
14588
14589
pkg_failed=no
14590
-{ $as_echo "$as_me:$LINENO: checking for UDEV" >&5
14591
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
14592
$as_echo_n "checking for UDEV... " >&6; }
14593
14594
if test -n "$UDEV_CFLAGS"; then
14595
pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
14596
elif test -n "$PKG_CONFIG"; then
14597
if test -n "$PKG_CONFIG" && \
14598
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libudev\"") >&5
14599
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
14600
($PKG_CONFIG --exists --print-errors "libudev") 2>&5
14601
ac_status=$?
14602
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14603
- (exit $ac_status); }; then
14604
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14605
+ test $ac_status = 0; }; then
14606
pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
14607
+ test "x$?" != "x0" && pkg_failed=yes
14608
else
14609
pkg_failed=yes
14610
fi
14611
@@ -12973,12 +12724,13 @@
14612
pkg_cv_UDEV_LIBS="$UDEV_LIBS"
14613
elif test -n "$PKG_CONFIG"; then
14614
if test -n "$PKG_CONFIG" && \
14615
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libudev\"") >&5
14616
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
14617
($PKG_CONFIG --exists --print-errors "libudev") 2>&5
14618
ac_status=$?
14619
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14620
- (exit $ac_status); }; then
14621
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14622
+ test $ac_status = 0; }; then
14623
pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev" 2>/dev/null`
14624
+ test "x$?" != "x0" && pkg_failed=yes
14625
else
14626
pkg_failed=yes
14627
fi
14628
@@ -12989,6 +12741,8 @@
14629
14630
14631
if test $pkg_failed = yes; then
14632
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14633
+$as_echo "no" >&6; }
14634
14635
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14636
_pkg_short_errors_supported=yes
14637
@@ -12996,22 +12750,22 @@
14638
_pkg_short_errors_supported=no
14639
fi
14640
if test $_pkg_short_errors_supported = yes; then
14641
- UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev" 2>&1`
14642
+ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev" 2>&1`
14643
else
14644
- UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev" 2>&1`
14645
+ UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev" 2>&1`
14646
fi
14647
# Put the nasty error message in config.log where it belongs
14648
echo "$UDEV_PKG_ERRORS" >&5
14649
14650
- { $as_echo "$as_me:$LINENO: result: no" >&5
14651
-$as_echo "no" >&6; }
14652
- udev_found=no
14653
+ udev_found=no
14654
elif test $pkg_failed = untried; then
14655
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14656
+$as_echo "no" >&6; }
14657
udev_found=no
14658
else
14659
UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
14660
UDEV_LIBS=$pkg_cv_UDEV_LIBS
14661
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14662
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14663
$as_echo "yes" >&6; }
14664
udev_found=yes
14665
fi
14666
@@ -13021,19 +12775,20 @@
14667
14668
14669
pkg_failed=no
14670
-{ $as_echo "$as_me:$LINENO: checking for SNDFILE" >&5
14671
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
14672
$as_echo_n "checking for SNDFILE... " >&6; }
14673
14674
if test -n "$SNDFILE_CFLAGS"; then
14675
pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
14676
elif test -n "$PKG_CONFIG"; then
14677
if test -n "$PKG_CONFIG" && \
14678
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile\"") >&5
14679
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile\""; } >&5
14680
($PKG_CONFIG --exists --print-errors "sndfile") 2>&5
14681
ac_status=$?
14682
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14683
- (exit $ac_status); }; then
14684
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14685
+ test $ac_status = 0; }; then
14686
pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile" 2>/dev/null`
14687
+ test "x$?" != "x0" && pkg_failed=yes
14688
else
14689
pkg_failed=yes
14690
fi
14691
@@ -13044,12 +12799,13 @@
14692
pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
14693
elif test -n "$PKG_CONFIG"; then
14694
if test -n "$PKG_CONFIG" && \
14695
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile\"") >&5
14696
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile\""; } >&5
14697
($PKG_CONFIG --exists --print-errors "sndfile") 2>&5
14698
ac_status=$?
14699
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14700
- (exit $ac_status); }; then
14701
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14702
+ test $ac_status = 0; }; then
14703
pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile" 2>/dev/null`
14704
+ test "x$?" != "x0" && pkg_failed=yes
14705
else
14706
pkg_failed=yes
14707
fi
14708
@@ -13060,6 +12816,8 @@
14709
14710
14711
if test $pkg_failed = yes; then
14712
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14713
+$as_echo "no" >&6; }
14714
14715
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14716
_pkg_short_errors_supported=yes
14717
@@ -13067,22 +12825,22 @@
14718
_pkg_short_errors_supported=no
14719
fi
14720
if test $_pkg_short_errors_supported = yes; then
14721
- SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sndfile" 2>&1`
14722
+ SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndfile" 2>&1`
14723
else
14724
- SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sndfile" 2>&1`
14725
+ SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndfile" 2>&1`
14726
fi
14727
# Put the nasty error message in config.log where it belongs
14728
echo "$SNDFILE_PKG_ERRORS" >&5
14729
14730
- { $as_echo "$as_me:$LINENO: result: no" >&5
14731
-$as_echo "no" >&6; }
14732
- sndfile_found=no
14733
+ sndfile_found=no
14734
elif test $pkg_failed = untried; then
14735
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14736
+$as_echo "no" >&6; }
14737
sndfile_found=no
14738
else
14739
SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
14740
SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
14741
- { $as_echo "$as_me:$LINENO: result: yes" >&5
14742
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14743
$as_echo "yes" >&6; }
14744
sndfile_found=yes
14745
fi
14746
@@ -13092,7 +12850,7 @@
14747
14748
14749
# Check whether --with-ouifile was given.
14750
-if test "${with_ouifile+set}" = set; then
14751
+if test "${with_ouifile+set}" = set; then :
14752
withval=$with_ouifile; ac_with_ouifile=$withval
14753
else
14754
ac_with_ouifile="/var/lib/misc/oui.txt"
14755
@@ -13105,146 +12863,16 @@
14756
14757
14758
14759
- if test "${ac_cv_header_readline_readline_h+set}" = set; then
14760
- { $as_echo "$as_me:$LINENO: checking for readline/readline.h" >&5
14761
-$as_echo_n "checking for readline/readline.h... " >&6; }
14762
-if test "${ac_cv_header_readline_readline_h+set}" = set; then
14763
- $as_echo_n "(cached) " >&6
14764
-fi
14765
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
14766
-$as_echo "$ac_cv_header_readline_readline_h" >&6; }
14767
-else
14768
- # Is the header compilable?
14769
-{ $as_echo "$as_me:$LINENO: checking readline/readline.h usability" >&5
14770
-$as_echo_n "checking readline/readline.h usability... " >&6; }
14771
-cat >conftest.$ac_ext <<_ACEOF
14772
-/* confdefs.h. */
14773
-_ACEOF
14774
-cat confdefs.h >>conftest.$ac_ext
14775
-cat >>conftest.$ac_ext <<_ACEOF
14776
-/* end confdefs.h. */
14777
-$ac_includes_default
14778
-#include <readline/readline.h>
14779
-_ACEOF
14780
-rm -f conftest.$ac_objext
14781
-if { (ac_try="$ac_compile"
14782
-case "(($ac_try" in
14783
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14784
- *) ac_try_echo=$ac_try;;
14785
-esac
14786
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14787
-$as_echo "$ac_try_echo") >&5
14788
- (eval "$ac_compile") 2>conftest.er1
14789
- ac_status=$?
14790
- grep -v '^ *+' conftest.er1 >conftest.err
14791
- rm -f conftest.er1
14792
- cat conftest.err >&5
14793
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14794
- (exit $ac_status); } && {
14795
- test -z "$ac_c_werror_flag" ||
14796
- test ! -s conftest.err
14797
- } && test -s conftest.$ac_objext; then
14798
- ac_header_compiler=yes
14799
-else
14800
- $as_echo "$as_me: failed program was:" >&5
14801
-sed 's/^/| /' conftest.$ac_ext >&5
14802
-
14803
- ac_header_compiler=no
14804
-fi
14805
-
14806
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14807
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14808
-$as_echo "$ac_header_compiler" >&6; }
14809
-
14810
-# Is the header present?
14811
-{ $as_echo "$as_me:$LINENO: checking readline/readline.h presence" >&5
14812
-$as_echo_n "checking readline/readline.h presence... " >&6; }
14813
-cat >conftest.$ac_ext <<_ACEOF
14814
-/* confdefs.h. */
14815
-_ACEOF
14816
-cat confdefs.h >>conftest.$ac_ext
14817
-cat >>conftest.$ac_ext <<_ACEOF
14818
-/* end confdefs.h. */
14819
-#include <readline/readline.h>
14820
-_ACEOF
14821
-if { (ac_try="$ac_cpp conftest.$ac_ext"
14822
-case "(($ac_try" in
14823
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14824
- *) ac_try_echo=$ac_try;;
14825
-esac
14826
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14827
-$as_echo "$ac_try_echo") >&5
14828
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
14829
- ac_status=$?
14830
- grep -v '^ *+' conftest.er1 >conftest.err
14831
- rm -f conftest.er1
14832
- cat conftest.err >&5
14833
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14834
- (exit $ac_status); } >/dev/null && {
14835
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14836
- test ! -s conftest.err
14837
- }; then
14838
- ac_header_preproc=yes
14839
-else
14840
- $as_echo "$as_me: failed program was:" >&5
14841
-sed 's/^/| /' conftest.$ac_ext >&5
14842
-
14843
- ac_header_preproc=no
14844
-fi
14845
-
14846
-rm -f conftest.err conftest.$ac_ext
14847
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14848
-$as_echo "$ac_header_preproc" >&6; }
14849
-
14850
-# So? What about this header?
14851
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14852
- yes:no: )
14853
- { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5
14854
-$as_echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
14855
- { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5
14856
-$as_echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;}
14857
- ac_header_preproc=yes
14858
- ;;
14859
- no:yes:* )
14860
- { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5
14861
-$as_echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;}
14862
- { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5
14863
-$as_echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;}
14864
- { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5
14865
-$as_echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;}
14866
- { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&5
14867
-$as_echo "$as_me: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&2;}
14868
- { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5
14869
-$as_echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;}
14870
- { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5
14871
-$as_echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;}
14872
-
14873
- ;;
14874
-esac
14875
-{ $as_echo "$as_me:$LINENO: checking for readline/readline.h" >&5
14876
-$as_echo_n "checking for readline/readline.h... " >&6; }
14877
-if test "${ac_cv_header_readline_readline_h+set}" = set; then
14878
- $as_echo_n "(cached) " >&6
14879
-else
14880
- ac_cv_header_readline_readline_h=$ac_header_preproc
14881
-fi
14882
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
14883
-$as_echo "$ac_cv_header_readline_readline_h" >&6; }
14884
-
14885
-fi
14886
-if test "x$ac_cv_header_readline_readline_h" = x""yes; then
14887
- { $as_echo "$as_me:$LINENO: checking for main in -lreadline" >&5
14888
+ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
14889
+if test "x$ac_cv_header_readline_readline_h" = xyes; then :
14890
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lreadline" >&5
14891
$as_echo_n "checking for main in -lreadline... " >&6; }
14892
-if test "${ac_cv_lib_readline_main+set}" = set; then
14893
+if ${ac_cv_lib_readline_main+:} false; then :
14894
$as_echo_n "(cached) " >&6
14895
else
14896
ac_check_lib_save_LIBS=$LIBS
14897
LIBS="-lreadline $LIBS"
14898
-cat >conftest.$ac_ext <<_ACEOF
14899
-/* confdefs.h. */
14900
-_ACEOF
14901
-cat confdefs.h >>conftest.$ac_ext
14902
-cat >>conftest.$ac_ext <<_ACEOF
14903
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14904
/* end confdefs.h. */
14905
14906
14907
@@ -13256,43 +12884,18 @@
14908
return 0;
14909
}
14910
_ACEOF
14911
-rm -f conftest.$ac_objext conftest$ac_exeext
14912
-if { (ac_try="$ac_link"
14913
-case "(($ac_try" in
14914
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14915
- *) ac_try_echo=$ac_try;;
14916
-esac
14917
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14918
-$as_echo "$ac_try_echo") >&5
14919
- (eval "$ac_link") 2>conftest.er1
14920
- ac_status=$?
14921
- grep -v '^ *+' conftest.er1 >conftest.err
14922
- rm -f conftest.er1
14923
- cat conftest.err >&5
14924
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14925
- (exit $ac_status); } && {
14926
- test -z "$ac_c_werror_flag" ||
14927
- test ! -s conftest.err
14928
- } && test -s conftest$ac_exeext && {
14929
- test "$cross_compiling" = yes ||
14930
- $as_test_x conftest$ac_exeext
14931
- }; then
14932
+if ac_fn_c_try_link "$LINENO"; then :
14933
ac_cv_lib_readline_main=yes
14934
else
14935
- $as_echo "$as_me: failed program was:" >&5
14936
-sed 's/^/| /' conftest.$ac_ext >&5
14937
-
14938
- ac_cv_lib_readline_main=no
14939
+ ac_cv_lib_readline_main=no
14940
fi
14941
-
14942
-rm -rf conftest.dSYM
14943
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14944
- conftest$ac_exeext conftest.$ac_ext
14945
+rm -f core conftest.err conftest.$ac_objext \
14946
+ conftest$ac_exeext conftest.$ac_ext
14947
LIBS=$ac_check_lib_save_LIBS
14948
fi
14949
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_main" >&5
14950
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_main" >&5
14951
$as_echo "$ac_cv_lib_readline_main" >&6; }
14952
-if test "x$ac_cv_lib_readline_main" = x""yes; then
14953
+if test "x$ac_cv_lib_readline_main" = xyes; then :
14954
readline_found=yes
14955
READLINE_LIBS="-lreadline"
14956
14957
@@ -13344,7 +12947,7 @@
14958
dbusoob_enable=no
14959
14960
# Check whether --enable-optimization was given.
14961
-if test "${enable_optimization+set}" = set; then
14962
+if test "${enable_optimization+set}" = set; then :
14963
enableval=$enable_optimization;
14964
optimization_enable=${enableval}
14965
14966
@@ -13352,7 +12955,7 @@
14967
14968
14969
# Check whether --enable-fortify was given.
14970
-if test "${enable_fortify+set}" = set; then
14971
+if test "${enable_fortify+set}" = set; then :
14972
enableval=$enable_fortify;
14973
fortify_enable=${enableval}
14974
14975
@@ -13360,7 +12963,7 @@
14976
14977
14978
# Check whether --enable-pie was given.
14979
-if test "${enable_pie+set}" = set; then
14980
+if test "${enable_pie+set}" = set; then :
14981
enableval=$enable_pie;
14982
pie_enable=${enableval}
14983
14984
@@ -13368,7 +12971,7 @@
14985
14986
14987
# Check whether --enable-network was given.
14988
-if test "${enable_network+set}" = set; then
14989
+if test "${enable_network+set}" = set; then :
14990
enableval=$enable_network;
14991
network_enable=${enableval}
14992
14993
@@ -13376,7 +12979,7 @@
14994
14995
14996
# Check whether --enable-sap was given.
14997
-if test "${enable_sap+set}" = set; then
14998
+if test "${enable_sap+set}" = set; then :
14999
enableval=$enable_sap;
15000
sap_enable=${enableval}
15001
15002
@@ -13385,7 +12988,7 @@
15003
15004
15005
# Check whether --with-sap was given.
15006
-if test "${with_sap+set}" = set; then
15007
+if test "${with_sap+set}" = set; then :
15008
withval=$with_sap;
15009
sap_driver=${withval}
15010
15011
@@ -13395,7 +12998,7 @@
15012
15013
15014
# Check whether --enable-serial was given.
15015
-if test "${enable_serial+set}" = set; then
15016
+if test "${enable_serial+set}" = set; then :
15017
enableval=$enable_serial;
15018
serial_enable=${enableval}
15019
15020
@@ -13403,7 +13006,7 @@
15021
15022
15023
# Check whether --enable-input was given.
15024
-if test "${enable_input+set}" = set; then
15025
+if test "${enable_input+set}" = set; then :
15026
enableval=$enable_input;
15027
input_enable=${enableval}
15028
15029
@@ -13411,7 +13014,7 @@
15030
15031
15032
# Check whether --enable-audio was given.
15033
-if test "${enable_audio+set}" = set; then
15034
+if test "${enable_audio+set}" = set; then :
15035
enableval=$enable_audio;
15036
audio_enable=${enableval}
15037
15038
@@ -13419,7 +13022,7 @@
15039
15040
15041
# Check whether --enable-service was given.
15042
-if test "${enable_service+set}" = set; then
15043
+if test "${enable_service+set}" = set; then :
15044
enableval=$enable_service;
15045
service_enable=${enableval}
15046
15047
@@ -13427,7 +13030,7 @@
15048
15049
15050
# Check whether --enable-health was given.
15051
-if test "${enable_health+set}" = set; then
15052
+if test "${enable_health+set}" = set; then :
15053
enableval=$enable_health;
15054
health_enable=${enableval}
15055
15056
@@ -13435,7 +13038,7 @@
15057
15058
15059
# Check whether --enable-pnat was given.
15060
-if test "${enable_pnat+set}" = set; then
15061
+if test "${enable_pnat+set}" = set; then :
15062
enableval=$enable_pnat;
15063
pnat_enable=${enableval}
15064
15065
@@ -13443,7 +13046,7 @@
15066
15067
15068
# Check whether --enable-gatt-example was given.
15069
-if test "${enable_gatt_example+set}" = set; then
15070
+if test "${enable_gatt_example+set}" = set; then :
15071
enableval=$enable_gatt_example;
15072
gatt_example_enable=${enableval}
15073
15074
@@ -13451,7 +13054,7 @@
15075
15076
15077
# Check whether --enable-gstreamer was given.
15078
-if test "${enable_gstreamer+set}" = set; then
15079
+if test "${enable_gstreamer+set}" = set; then :
15080
enableval=$enable_gstreamer;
15081
gstreamer_enable=${enableval}
15082
15083
@@ -13459,7 +13062,7 @@
15084
15085
15086
# Check whether --enable-alsa was given.
15087
-if test "${enable_alsa+set}" = set; then
15088
+if test "${enable_alsa+set}" = set; then :
15089
enableval=$enable_alsa;
15090
alsa_enable=${enableval}
15091
15092
@@ -13467,7 +13070,7 @@
15093
15094
15095
# Check whether --enable-usb was given.
15096
-if test "${enable_usb+set}" = set; then
15097
+if test "${enable_usb+set}" = set; then :
15098
enableval=$enable_usb;
15099
usb_enable=${enableval}
15100
15101
@@ -13475,7 +13078,7 @@
15102
15103
15104
# Check whether --enable-tracer was given.
15105
-if test "${enable_tracer+set}" = set; then
15106
+if test "${enable_tracer+set}" = set; then :
15107
enableval=$enable_tracer;
15108
tracer_enable=${enableval}
15109
15110
@@ -13483,7 +13086,7 @@
15111
15112
15113
# Check whether --enable-tools was given.
15114
-if test "${enable_tools+set}" = set; then
15115
+if test "${enable_tools+set}" = set; then :
15116
enableval=$enable_tools;
15117
tools_enable=${enableval}
15118
15119
@@ -13491,7 +13094,7 @@
15120
15121
15122
# Check whether --enable-bccmd was given.
15123
-if test "${enable_bccmd+set}" = set; then
15124
+if test "${enable_bccmd+set}" = set; then :
15125
enableval=$enable_bccmd;
15126
bccmd_enable=${enableval}
15127
15128
@@ -13499,7 +13102,7 @@
15129
15130
15131
# Check whether --enable-pcmcia was given.
15132
-if test "${enable_pcmcia+set}" = set; then
15133
+if test "${enable_pcmcia+set}" = set; then :
15134
enableval=$enable_pcmcia;
15135
pcmcia_enable=${enableval}
15136
15137
@@ -13507,7 +13110,7 @@
15138
15139
15140
# Check whether --enable-hid2hci was given.
15141
-if test "${enable_hid2hci+set}" = set; then
15142
+if test "${enable_hid2hci+set}" = set; then :
15143
enableval=$enable_hid2hci;
15144
hid2hci_enable=${enableval}
15145
15146
@@ -13515,7 +13118,7 @@
15147
15148
15149
# Check whether --enable-dfutool was given.
15150
-if test "${enable_dfutool+set}" = set; then
15151
+if test "${enable_dfutool+set}" = set; then :
15152
enableval=$enable_dfutool;
15153
dfutool_enable=${enableval}
15154
15155
@@ -13523,7 +13126,7 @@
15156
15157
15158
# Check whether --enable-hidd was given.
15159
-if test "${enable_hidd+set}" = set; then
15160
+if test "${enable_hidd+set}" = set; then :
15161
enableval=$enable_hidd;
15162
hidd_enable=${enableval}
15163
15164
@@ -13531,7 +13134,7 @@
15165
15166
15167
# Check whether --enable-pand was given.
15168
-if test "${enable_pand+set}" = set; then
15169
+if test "${enable_pand+set}" = set; then :
15170
enableval=$enable_pand;
15171
pand_enable=${enableval}
15172
15173
@@ -13539,7 +13142,7 @@
15174
15175
15176
# Check whether --enable-dund was given.
15177
-if test "${enable_dund+set}" = set; then
15178
+if test "${enable_dund+set}" = set; then :
15179
enableval=$enable_dund;
15180
dund_enable=${enableval}
15181
15182
@@ -13547,7 +13150,7 @@
15183
15184
15185
# Check whether --enable-cups was given.
15186
-if test "${enable_cups+set}" = set; then
15187
+if test "${enable_cups+set}" = set; then :
15188
enableval=$enable_cups;
15189
cups_enable=${enableval}
15190
15191
@@ -13555,7 +13158,7 @@
15192
15193
15194
# Check whether --enable-test was given.
15195
-if test "${enable_test+set}" = set; then
15196
+if test "${enable_test+set}" = set; then :
15197
enableval=$enable_test;
15198
test_enable=${enableval}
15199
15200
@@ -13563,7 +13166,7 @@
15201
15202
15203
# Check whether --enable-udevrules was given.
15204
-if test "${enable_udevrules+set}" = set; then
15205
+if test "${enable_udevrules+set}" = set; then :
15206
enableval=$enable_udevrules;
15207
udevrules_enable=${enableval}
15208
15209
@@ -13571,7 +13174,7 @@
15210
15211
15212
# Check whether --enable-configfiles was given.
15213
-if test "${enable_configfiles+set}" = set; then
15214
+if test "${enable_configfiles+set}" = set; then :
15215
enableval=$enable_configfiles;
15216
configfiles_enable=${enableval}
15217
15218
@@ -13579,7 +13182,7 @@
15219
15220
15221
# Check whether --enable-debug was given.
15222
-if test "${enable_debug+set}" = set; then
15223
+if test "${enable_debug+set}" = set; then :
15224
enableval=$enable_debug;
15225
debug_enable=${enableval}
15226
15227
@@ -13588,7 +13191,7 @@
15228
15229
15230
# Check whether --with-telephony was given.
15231
-if test "${with_telephony+set}" = set; then
15232
+if test "${with_telephony+set}" = set; then :
15233
withval=$with_telephony;
15234
telephony_driver=${withval}
15235
15236
@@ -13599,7 +13202,7 @@
15237
15238
15239
# Check whether --enable-maemo6 was given.
15240
-if test "${enable_maemo6+set}" = set; then
15241
+if test "${enable_maemo6+set}" = set; then :
15242
enableval=$enable_maemo6;
15243
maemo6_enable=${enableval}
15244
15245
@@ -13607,7 +13210,7 @@
15246
15247
15248
# Check whether --enable-dbusoob was given.
15249
-if test "${enable_dbusoob+set}" = set; then
15250
+if test "${enable_dbusoob+set}" = set; then :
15251
enableval=$enable_dbusoob;
15252
dbusoob_enable=${enableval}
15253
15254
@@ -13615,7 +13218,7 @@
15255
15256
15257
# Check whether --enable-hal was given.
15258
-if test "${enable_hal+set}" = set; then
15259
+if test "${enable_hal+set}" = set; then :
15260
enableval=$enable_hal;
15261
hal_enable=${enableval}
15262
15263
@@ -13641,9 +13244,7 @@
15264
15265
if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
15266
15267
-cat >>confdefs.h <<\_ACEOF
15268
-#define HAVE_LIBUSB 1
15269
-_ACEOF
15270
+$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
15271
15272
fi
15273
15274
@@ -13915,26 +13516,27 @@
15275
15276
15277
# Check whether --enable-capng was given.
15278
-if test "${enable_capng+set}" = set; then
15279
+if test "${enable_capng+set}" = set; then :
15280
enableval=$enable_capng; enable_capng=${enableval}
15281
fi
15282
15283
if (test "${enable_capng}" = "yes"); then
15284
15285
pkg_failed=no
15286
-{ $as_echo "$as_me:$LINENO: checking for CAPNG" >&5
15287
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAPNG" >&5
15288
$as_echo_n "checking for CAPNG... " >&6; }
15289
15290
if test -n "$CAPNG_CFLAGS"; then
15291
pkg_cv_CAPNG_CFLAGS="$CAPNG_CFLAGS"
15292
elif test -n "$PKG_CONFIG"; then
15293
if test -n "$PKG_CONFIG" && \
15294
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcap-ng\"") >&5
15295
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcap-ng\""; } >&5
15296
($PKG_CONFIG --exists --print-errors "libcap-ng") 2>&5
15297
ac_status=$?
15298
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15299
- (exit $ac_status); }; then
15300
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15301
+ test $ac_status = 0; }; then
15302
pkg_cv_CAPNG_CFLAGS=`$PKG_CONFIG --cflags "libcap-ng" 2>/dev/null`
15303
+ test "x$?" != "x0" && pkg_failed=yes
15304
else
15305
pkg_failed=yes
15306
fi
15307
@@ -13945,12 +13547,13 @@
15308
pkg_cv_CAPNG_LIBS="$CAPNG_LIBS"
15309
elif test -n "$PKG_CONFIG"; then
15310
if test -n "$PKG_CONFIG" && \
15311
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcap-ng\"") >&5
15312
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcap-ng\""; } >&5
15313
($PKG_CONFIG --exists --print-errors "libcap-ng") 2>&5
15314
ac_status=$?
15315
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15316
- (exit $ac_status); }; then
15317
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15318
+ test $ac_status = 0; }; then
15319
pkg_cv_CAPNG_LIBS=`$PKG_CONFIG --libs "libcap-ng" 2>/dev/null`
15320
+ test "x$?" != "x0" && pkg_failed=yes
15321
else
15322
pkg_failed=yes
15323
fi
15324
@@ -13961,6 +13564,8 @@
15325
15326
15327
if test $pkg_failed = yes; then
15328
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15329
+$as_echo "no" >&6; }
15330
15331
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
15332
_pkg_short_errors_supported=yes
15333
@@ -13968,35 +13573,29 @@
15334
_pkg_short_errors_supported=no
15335
fi
15336
if test $_pkg_short_errors_supported = yes; then
15337
- CAPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcap-ng" 2>&1`
15338
+ CAPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcap-ng" 2>&1`
15339
else
15340
- CAPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcap-ng" 2>&1`
15341
+ CAPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcap-ng" 2>&1`
15342
fi
15343
# Put the nasty error message in config.log where it belongs
15344
echo "$CAPNG_PKG_ERRORS" >&5
15345
15346
- { $as_echo "$as_me:$LINENO: result: no" >&5
15347
-$as_echo "no" >&6; }
15348
- { { $as_echo "$as_me:$LINENO: error: Capabilities library is required" >&5
15349
-$as_echo "$as_me: error: Capabilities library is required" >&2;}
15350
- { (exit 1); exit 1; }; }
15351
+ as_fn_error $? "Capabilities library is required" "$LINENO" 5
15352
elif test $pkg_failed = untried; then
15353
- { { $as_echo "$as_me:$LINENO: error: Capabilities library is required" >&5
15354
-$as_echo "$as_me: error: Capabilities library is required" >&2;}
15355
- { (exit 1); exit 1; }; }
15356
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15357
+$as_echo "no" >&6; }
15358
+ as_fn_error $? "Capabilities library is required" "$LINENO" 5
15359
else
15360
CAPNG_CFLAGS=$pkg_cv_CAPNG_CFLAGS
15361
CAPNG_LIBS=$pkg_cv_CAPNG_LIBS
15362
- { $as_echo "$as_me:$LINENO: result: yes" >&5
15363
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15364
$as_echo "yes" >&6; }
15365
dummy=yes
15366
fi
15367
15368
15369
15370
-cat >>confdefs.h <<\_ACEOF
15371
-#define HAVE_CAPNG 1
15372
-_ACEOF
15373
+$as_echo "#define HAVE_CAPNG 1" >>confdefs.h
15374
15375
fi
15376
15377
@@ -14029,13 +13628,13 @@
15378
case $ac_val in #(
15379
*${as_nl}*)
15380
case $ac_var in #(
15381
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
15382
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
15383
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
15384
esac
15385
case $ac_var in #(
15386
_ | IFS | as_nl) ;; #(
15387
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
15388
- *) $as_unset $ac_var ;;
15389
+ *) { eval $ac_var=; unset $ac_var;} ;;
15390
esac ;;
15391
esac
15392
done
15393
@@ -14043,8 +13642,8 @@
15394
(set) 2>&1 |
15395
case $as_nl`(ac_space=' '; set) 2>&1` in #(
15396
*${as_nl}ac_space=\ *)
15397
- # `set' does not quote correctly, so add quotes (double-quote
15398
- # substitution turns \\\\ into \\, and sed turns \\ into \).
15399
+ # `set' does not quote correctly, so add quotes: double-quote
15400
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
15401
sed -n \
15402
"s/'/'\\\\''/g;
15403
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
15404
@@ -14066,12 +13665,23 @@
15405
:end' >>confcache
15406
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
15407
if test -w "$cache_file"; then
15408
- test "x$cache_file" != "x/dev/null" &&
15409
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
15410
+ if test "x$cache_file" != "x/dev/null"; then
15411
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
15412
$as_echo "$as_me: updating cache $cache_file" >&6;}
15413
- cat confcache >$cache_file
15414
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
15415
+ cat confcache >"$cache_file"
15416
+ else
15417
+ case $cache_file in #(
15418
+ */* | ?:*)
15419
+ mv -f confcache "$cache_file"$$ &&
15420
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
15421
+ *)
15422
+ mv -f confcache "$cache_file" ;;
15423
+ esac
15424
+ fi
15425
+ fi
15426
else
15427
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
15428
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
15429
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
15430
fi
15431
fi
15432
@@ -14085,14 +13695,15 @@
15433
15434
ac_libobjs=
15435
ac_ltlibobjs=
15436
+U=
15437
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
15438
# 1. Remove the extension, and $U if already installed.
15439
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
15440
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
15441
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
15442
# will be set to the directory where LIBOBJS objects are built.
15443
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
15444
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
15445
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
15446
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
15447
done
15448
LIBOBJS=$ac_libobjs
15449
15450
@@ -14108,265 +13719,158 @@
15451
fi
15452
15453
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
15454
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
15455
-Usually this means the macro was only invoked conditionally." >&5
15456
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
15457
-Usually this means the macro was only invoked conditionally." >&2;}
15458
- { (exit 1); exit 1; }; }
15459
+ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
15460
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15461
fi
15462
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
15463
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
15464
-Usually this means the macro was only invoked conditionally." >&5
15465
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
15466
-Usually this means the macro was only invoked conditionally." >&2;}
15467
- { (exit 1); exit 1; }; }
15468
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
15469
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15470
fi
15471
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
15472
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
15473
-Usually this means the macro was only invoked conditionally." >&5
15474
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
15475
-Usually this means the macro was only invoked conditionally." >&2;}
15476
- { (exit 1); exit 1; }; }
15477
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
15478
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15479
fi
15480
if test -z "${SNDFILE_TRUE}" && test -z "${SNDFILE_FALSE}"; then
15481
- { { $as_echo "$as_me:$LINENO: error: conditional \"SNDFILE\" was never defined.
15482
-Usually this means the macro was only invoked conditionally." >&5
15483
-$as_echo "$as_me: error: conditional \"SNDFILE\" was never defined.
15484
-Usually this means the macro was only invoked conditionally." >&2;}
15485
- { (exit 1); exit 1; }; }
15486
+ as_fn_error $? "conditional \"SNDFILE\" was never defined.
15487
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15488
fi
15489
if test -z "${USB_TRUE}" && test -z "${USB_FALSE}"; then
15490
- { { $as_echo "$as_me:$LINENO: error: conditional \"USB\" was never defined.
15491
-Usually this means the macro was only invoked conditionally." >&5
15492
-$as_echo "$as_me: error: conditional \"USB\" was never defined.
15493
-Usually this means the macro was only invoked conditionally." >&2;}
15494
- { (exit 1); exit 1; }; }
15495
+ as_fn_error $? "conditional \"USB\" was never defined.
15496
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15497
fi
15498
if test -z "${SBC_TRUE}" && test -z "${SBC_FALSE}"; then
15499
- { { $as_echo "$as_me:$LINENO: error: conditional \"SBC\" was never defined.
15500
-Usually this means the macro was only invoked conditionally." >&5
15501
-$as_echo "$as_me: error: conditional \"SBC\" was never defined.
15502
-Usually this means the macro was only invoked conditionally." >&2;}
15503
- { (exit 1); exit 1; }; }
15504
+ as_fn_error $? "conditional \"SBC\" was never defined.
15505
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15506
fi
15507
if test -z "${ALSA_TRUE}" && test -z "${ALSA_FALSE}"; then
15508
- { { $as_echo "$as_me:$LINENO: error: conditional \"ALSA\" was never defined.
15509
-Usually this means the macro was only invoked conditionally." >&5
15510
-$as_echo "$as_me: error: conditional \"ALSA\" was never defined.
15511
-Usually this means the macro was only invoked conditionally." >&2;}
15512
- { (exit 1); exit 1; }; }
15513
+ as_fn_error $? "conditional \"ALSA\" was never defined.
15514
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15515
fi
15516
if test -z "${GSTREAMER_TRUE}" && test -z "${GSTREAMER_FALSE}"; then
15517
- { { $as_echo "$as_me:$LINENO: error: conditional \"GSTREAMER\" was never defined.
15518
-Usually this means the macro was only invoked conditionally." >&5
15519
-$as_echo "$as_me: error: conditional \"GSTREAMER\" was never defined.
15520
-Usually this means the macro was only invoked conditionally." >&2;}
15521
- { (exit 1); exit 1; }; }
15522
+ as_fn_error $? "conditional \"GSTREAMER\" was never defined.
15523
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15524
fi
15525
if test -z "${AUDIOPLUGIN_TRUE}" && test -z "${AUDIOPLUGIN_FALSE}"; then
15526
- { { $as_echo "$as_me:$LINENO: error: conditional \"AUDIOPLUGIN\" was never defined.
15527
-Usually this means the macro was only invoked conditionally." >&5
15528
-$as_echo "$as_me: error: conditional \"AUDIOPLUGIN\" was never defined.
15529
-Usually this means the macro was only invoked conditionally." >&2;}
15530
- { (exit 1); exit 1; }; }
15531
+ as_fn_error $? "conditional \"AUDIOPLUGIN\" was never defined.
15532
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15533
fi
15534
if test -z "${INPUTPLUGIN_TRUE}" && test -z "${INPUTPLUGIN_FALSE}"; then
15535
- { { $as_echo "$as_me:$LINENO: error: conditional \"INPUTPLUGIN\" was never defined.
15536
-Usually this means the macro was only invoked conditionally." >&5
15537
-$as_echo "$as_me: error: conditional \"INPUTPLUGIN\" was never defined.
15538
-Usually this means the macro was only invoked conditionally." >&2;}
15539
- { (exit 1); exit 1; }; }
15540
+ as_fn_error $? "conditional \"INPUTPLUGIN\" was never defined.
15541
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15542
fi
15543
if test -z "${SERIALPLUGIN_TRUE}" && test -z "${SERIALPLUGIN_FALSE}"; then
15544
- { { $as_echo "$as_me:$LINENO: error: conditional \"SERIALPLUGIN\" was never defined.
15545
-Usually this means the macro was only invoked conditionally." >&5
15546
-$as_echo "$as_me: error: conditional \"SERIALPLUGIN\" was never defined.
15547
-Usually this means the macro was only invoked conditionally." >&2;}
15548
- { (exit 1); exit 1; }; }
15549
+ as_fn_error $? "conditional \"SERIALPLUGIN\" was never defined.
15550
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15551
fi
15552
if test -z "${NETWORKPLUGIN_TRUE}" && test -z "${NETWORKPLUGIN_FALSE}"; then
15553
- { { $as_echo "$as_me:$LINENO: error: conditional \"NETWORKPLUGIN\" was never defined.
15554
-Usually this means the macro was only invoked conditionally." >&5
15555
-$as_echo "$as_me: error: conditional \"NETWORKPLUGIN\" was never defined.
15556
-Usually this means the macro was only invoked conditionally." >&2;}
15557
- { (exit 1); exit 1; }; }
15558
+ as_fn_error $? "conditional \"NETWORKPLUGIN\" was never defined.
15559
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15560
fi
15561
if test -z "${SAPPLUGIN_TRUE}" && test -z "${SAPPLUGIN_FALSE}"; then
15562
- { { $as_echo "$as_me:$LINENO: error: conditional \"SAPPLUGIN\" was never defined.
15563
-Usually this means the macro was only invoked conditionally." >&5
15564
-$as_echo "$as_me: error: conditional \"SAPPLUGIN\" was never defined.
15565
-Usually this means the macro was only invoked conditionally." >&2;}
15566
- { (exit 1); exit 1; }; }
15567
+ as_fn_error $? "conditional \"SAPPLUGIN\" was never defined.
15568
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15569
fi
15570
if test -z "${SERVICEPLUGIN_TRUE}" && test -z "${SERVICEPLUGIN_FALSE}"; then
15571
- { { $as_echo "$as_me:$LINENO: error: conditional \"SERVICEPLUGIN\" was never defined.
15572
-Usually this means the macro was only invoked conditionally." >&5
15573
-$as_echo "$as_me: error: conditional \"SERVICEPLUGIN\" was never defined.
15574
-Usually this means the macro was only invoked conditionally." >&2;}
15575
- { (exit 1); exit 1; }; }
15576
+ as_fn_error $? "conditional \"SERVICEPLUGIN\" was never defined.
15577
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15578
fi
15579
if test -z "${HEALTHPLUGIN_TRUE}" && test -z "${HEALTHPLUGIN_FALSE}"; then
15580
- { { $as_echo "$as_me:$LINENO: error: conditional \"HEALTHPLUGIN\" was never defined.
15581
-Usually this means the macro was only invoked conditionally." >&5
15582
-$as_echo "$as_me: error: conditional \"HEALTHPLUGIN\" was never defined.
15583
-Usually this means the macro was only invoked conditionally." >&2;}
15584
- { (exit 1); exit 1; }; }
15585
+ as_fn_error $? "conditional \"HEALTHPLUGIN\" was never defined.
15586
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15587
fi
15588
if test -z "${MCAP_TRUE}" && test -z "${MCAP_FALSE}"; then
15589
- { { $as_echo "$as_me:$LINENO: error: conditional \"MCAP\" was never defined.
15590
-Usually this means the macro was only invoked conditionally." >&5
15591
-$as_echo "$as_me: error: conditional \"MCAP\" was never defined.
15592
-Usually this means the macro was only invoked conditionally." >&2;}
15593
- { (exit 1); exit 1; }; }
15594
+ as_fn_error $? "conditional \"MCAP\" was never defined.
15595
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15596
fi
15597
if test -z "${HAL_TRUE}" && test -z "${HAL_FALSE}"; then
15598
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAL\" was never defined.
15599
-Usually this means the macro was only invoked conditionally." >&5
15600
-$as_echo "$as_me: error: conditional \"HAL\" was never defined.
15601
-Usually this means the macro was only invoked conditionally." >&2;}
15602
- { (exit 1); exit 1; }; }
15603
+ as_fn_error $? "conditional \"HAL\" was never defined.
15604
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15605
fi
15606
if test -z "${READLINE_TRUE}" && test -z "${READLINE_FALSE}"; then
15607
- { { $as_echo "$as_me:$LINENO: error: conditional \"READLINE\" was never defined.
15608
-Usually this means the macro was only invoked conditionally." >&5
15609
-$as_echo "$as_me: error: conditional \"READLINE\" was never defined.
15610
-Usually this means the macro was only invoked conditionally." >&2;}
15611
- { (exit 1); exit 1; }; }
15612
+ as_fn_error $? "conditional \"READLINE\" was never defined.
15613
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15614
fi
15615
if test -z "${GATT_EXAMPLE_PLUGIN_TRUE}" && test -z "${GATT_EXAMPLE_PLUGIN_FALSE}"; then
15616
- { { $as_echo "$as_me:$LINENO: error: conditional \"GATT_EXAMPLE_PLUGIN\" was never defined.
15617
-Usually this means the macro was only invoked conditionally." >&5
15618
-$as_echo "$as_me: error: conditional \"GATT_EXAMPLE_PLUGIN\" was never defined.
15619
-Usually this means the macro was only invoked conditionally." >&2;}
15620
- { (exit 1); exit 1; }; }
15621
+ as_fn_error $? "conditional \"GATT_EXAMPLE_PLUGIN\" was never defined.
15622
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15623
fi
15624
if test -z "${ECHOPLUGIN_TRUE}" && test -z "${ECHOPLUGIN_FALSE}"; then
15625
- { { $as_echo "$as_me:$LINENO: error: conditional \"ECHOPLUGIN\" was never defined.
15626
-Usually this means the macro was only invoked conditionally." >&5
15627
-$as_echo "$as_me: error: conditional \"ECHOPLUGIN\" was never defined.
15628
-Usually this means the macro was only invoked conditionally." >&2;}
15629
- { (exit 1); exit 1; }; }
15630
+ as_fn_error $? "conditional \"ECHOPLUGIN\" was never defined.
15631
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15632
fi
15633
if test -z "${PNATPLUGIN_TRUE}" && test -z "${PNATPLUGIN_FALSE}"; then
15634
- { { $as_echo "$as_me:$LINENO: error: conditional \"PNATPLUGIN\" was never defined.
15635
-Usually this means the macro was only invoked conditionally." >&5
15636
-$as_echo "$as_me: error: conditional \"PNATPLUGIN\" was never defined.
15637
-Usually this means the macro was only invoked conditionally." >&2;}
15638
- { (exit 1); exit 1; }; }
15639
+ as_fn_error $? "conditional \"PNATPLUGIN\" was never defined.
15640
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15641
fi
15642
if test -z "${TRACER_TRUE}" && test -z "${TRACER_FALSE}"; then
15643
- { { $as_echo "$as_me:$LINENO: error: conditional \"TRACER\" was never defined.
15644
-Usually this means the macro was only invoked conditionally." >&5
15645
-$as_echo "$as_me: error: conditional \"TRACER\" was never defined.
15646
-Usually this means the macro was only invoked conditionally." >&2;}
15647
- { (exit 1); exit 1; }; }
15648
+ as_fn_error $? "conditional \"TRACER\" was never defined.
15649
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15650
fi
15651
if test -z "${HIDD_TRUE}" && test -z "${HIDD_FALSE}"; then
15652
- { { $as_echo "$as_me:$LINENO: error: conditional \"HIDD\" was never defined.
15653
-Usually this means the macro was only invoked conditionally." >&5
15654
-$as_echo "$as_me: error: conditional \"HIDD\" was never defined.
15655
-Usually this means the macro was only invoked conditionally." >&2;}
15656
- { (exit 1); exit 1; }; }
15657
+ as_fn_error $? "conditional \"HIDD\" was never defined.
15658
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15659
fi
15660
if test -z "${PAND_TRUE}" && test -z "${PAND_FALSE}"; then
15661
- { { $as_echo "$as_me:$LINENO: error: conditional \"PAND\" was never defined.
15662
-Usually this means the macro was only invoked conditionally." >&5
15663
-$as_echo "$as_me: error: conditional \"PAND\" was never defined.
15664
-Usually this means the macro was only invoked conditionally." >&2;}
15665
- { (exit 1); exit 1; }; }
15666
+ as_fn_error $? "conditional \"PAND\" was never defined.
15667
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15668
fi
15669
if test -z "${DUND_TRUE}" && test -z "${DUND_FALSE}"; then
15670
- { { $as_echo "$as_me:$LINENO: error: conditional \"DUND\" was never defined.
15671
-Usually this means the macro was only invoked conditionally." >&5
15672
-$as_echo "$as_me: error: conditional \"DUND\" was never defined.
15673
-Usually this means the macro was only invoked conditionally." >&2;}
15674
- { (exit 1); exit 1; }; }
15675
+ as_fn_error $? "conditional \"DUND\" was never defined.
15676
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15677
fi
15678
if test -z "${CUPS_TRUE}" && test -z "${CUPS_FALSE}"; then
15679
- { { $as_echo "$as_me:$LINENO: error: conditional \"CUPS\" was never defined.
15680
-Usually this means the macro was only invoked conditionally." >&5
15681
-$as_echo "$as_me: error: conditional \"CUPS\" was never defined.
15682
-Usually this means the macro was only invoked conditionally." >&2;}
15683
- { (exit 1); exit 1; }; }
15684
+ as_fn_error $? "conditional \"CUPS\" was never defined.
15685
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15686
fi
15687
if test -z "${TEST_TRUE}" && test -z "${TEST_FALSE}"; then
15688
- { { $as_echo "$as_me:$LINENO: error: conditional \"TEST\" was never defined.
15689
-Usually this means the macro was only invoked conditionally." >&5
15690
-$as_echo "$as_me: error: conditional \"TEST\" was never defined.
15691
-Usually this means the macro was only invoked conditionally." >&2;}
15692
- { (exit 1); exit 1; }; }
15693
+ as_fn_error $? "conditional \"TEST\" was never defined.
15694
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15695
fi
15696
if test -z "${TOOLS_TRUE}" && test -z "${TOOLS_FALSE}"; then
15697
- { { $as_echo "$as_me:$LINENO: error: conditional \"TOOLS\" was never defined.
15698
-Usually this means the macro was only invoked conditionally." >&5
15699
-$as_echo "$as_me: error: conditional \"TOOLS\" was never defined.
15700
-Usually this means the macro was only invoked conditionally." >&2;}
15701
- { (exit 1); exit 1; }; }
15702
+ as_fn_error $? "conditional \"TOOLS\" was never defined.
15703
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15704
fi
15705
if test -z "${BCCMD_TRUE}" && test -z "${BCCMD_FALSE}"; then
15706
- { { $as_echo "$as_me:$LINENO: error: conditional \"BCCMD\" was never defined.
15707
-Usually this means the macro was only invoked conditionally." >&5
15708
-$as_echo "$as_me: error: conditional \"BCCMD\" was never defined.
15709
-Usually this means the macro was only invoked conditionally." >&2;}
15710
- { (exit 1); exit 1; }; }
15711
+ as_fn_error $? "conditional \"BCCMD\" was never defined.
15712
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15713
fi
15714
if test -z "${PCMCIA_TRUE}" && test -z "${PCMCIA_FALSE}"; then
15715
- { { $as_echo "$as_me:$LINENO: error: conditional \"PCMCIA\" was never defined.
15716
-Usually this means the macro was only invoked conditionally." >&5
15717
-$as_echo "$as_me: error: conditional \"PCMCIA\" was never defined.
15718
-Usually this means the macro was only invoked conditionally." >&2;}
15719
- { (exit 1); exit 1; }; }
15720
+ as_fn_error $? "conditional \"PCMCIA\" was never defined.
15721
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15722
fi
15723
if test -z "${HID2HCI_TRUE}" && test -z "${HID2HCI_FALSE}"; then
15724
- { { $as_echo "$as_me:$LINENO: error: conditional \"HID2HCI\" was never defined.
15725
-Usually this means the macro was only invoked conditionally." >&5
15726
-$as_echo "$as_me: error: conditional \"HID2HCI\" was never defined.
15727
-Usually this means the macro was only invoked conditionally." >&2;}
15728
- { (exit 1); exit 1; }; }
15729
+ as_fn_error $? "conditional \"HID2HCI\" was never defined.
15730
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15731
fi
15732
if test -z "${DFUTOOL_TRUE}" && test -z "${DFUTOOL_FALSE}"; then
15733
- { { $as_echo "$as_me:$LINENO: error: conditional \"DFUTOOL\" was never defined.
15734
-Usually this means the macro was only invoked conditionally." >&5
15735
-$as_echo "$as_me: error: conditional \"DFUTOOL\" was never defined.
15736
-Usually this means the macro was only invoked conditionally." >&2;}
15737
- { (exit 1); exit 1; }; }
15738
+ as_fn_error $? "conditional \"DFUTOOL\" was never defined.
15739
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15740
fi
15741
if test -z "${UDEVRULES_TRUE}" && test -z "${UDEVRULES_FALSE}"; then
15742
- { { $as_echo "$as_me:$LINENO: error: conditional \"UDEVRULES\" was never defined.
15743
-Usually this means the macro was only invoked conditionally." >&5
15744
-$as_echo "$as_me: error: conditional \"UDEVRULES\" was never defined.
15745
-Usually this means the macro was only invoked conditionally." >&2;}
15746
- { (exit 1); exit 1; }; }
15747
+ as_fn_error $? "conditional \"UDEVRULES\" was never defined.
15748
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15749
fi
15750
if test -z "${CONFIGFILES_TRUE}" && test -z "${CONFIGFILES_FALSE}"; then
15751
- { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIGFILES\" was never defined.
15752
-Usually this means the macro was only invoked conditionally." >&5
15753
-$as_echo "$as_me: error: conditional \"CONFIGFILES\" was never defined.
15754
-Usually this means the macro was only invoked conditionally." >&2;}
15755
- { (exit 1); exit 1; }; }
15756
+ as_fn_error $? "conditional \"CONFIGFILES\" was never defined.
15757
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15758
fi
15759
if test -z "${MAEMO6PLUGIN_TRUE}" && test -z "${MAEMO6PLUGIN_FALSE}"; then
15760
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAEMO6PLUGIN\" was never defined.
15761
-Usually this means the macro was only invoked conditionally." >&5
15762
-$as_echo "$as_me: error: conditional \"MAEMO6PLUGIN\" was never defined.
15763
-Usually this means the macro was only invoked conditionally." >&2;}
15764
- { (exit 1); exit 1; }; }
15765
+ as_fn_error $? "conditional \"MAEMO6PLUGIN\" was never defined.
15766
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15767
fi
15768
if test -z "${DBUSOOBPLUGIN_TRUE}" && test -z "${DBUSOOBPLUGIN_FALSE}"; then
15769
- { { $as_echo "$as_me:$LINENO: error: conditional \"DBUSOOBPLUGIN\" was never defined.
15770
-Usually this means the macro was only invoked conditionally." >&5
15771
-$as_echo "$as_me: error: conditional \"DBUSOOBPLUGIN\" was never defined.
15772
-Usually this means the macro was only invoked conditionally." >&2;}
15773
- { (exit 1); exit 1; }; }
15774
+ as_fn_error $? "conditional \"DBUSOOBPLUGIN\" was never defined.
15775
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15776
fi
15777
15778
-: ${CONFIG_STATUS=./config.status}
15779
+: "${CONFIG_STATUS=./config.status}"
15780
ac_write_fail=0
15781
ac_clean_files_save=$ac_clean_files
15782
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
15783
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
15784
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
15785
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
15786
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15787
+as_write_fail=0
15788
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
15789
#! $SHELL
15790
# Generated by $as_me.
15791
# Run this file to recreate the current configuration.
15792
@@ -14376,17 +13880,18 @@
15793
debug=false
15794
ac_cs_recheck=false
15795
ac_cs_silent=false
15796
-SHELL=\${CONFIG_SHELL-$SHELL}
15797
-_ACEOF
15798
15799
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
15800
-## --------------------- ##
15801
-## M4sh Initialization. ##
15802
-## --------------------- ##
15803
+SHELL=\${CONFIG_SHELL-$SHELL}
15804
+export SHELL
15805
+_ASEOF
15806
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
15807
+## -------------------- ##
15808
+## M4sh Initialization. ##
15809
+## -------------------- ##
15810
15811
# Be more Bourne compatible
15812
DUALCASE=1; export DUALCASE # for MKS sh
15813
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
15814
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
15815
emulate sh
15816
NULLCMD=:
15817
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
15818
@@ -14394,23 +13899,15 @@
15819
alias -g '${1+"$@"}'='"$@"'
15820
setopt NO_GLOB_SUBST
15821
else
15822
- case `(set -o) 2>/dev/null` in
15823
- *posix*) set -o posix ;;
15824
+ case `(set -o) 2>/dev/null` in #(
15825
+ *posix*) :
15826
+ set -o posix ;; #(
15827
+ *) :
15828
+ ;;
15829
esac
15830
-
15831
fi
15832
15833
15834
-
15835
-
15836
-# PATH needs CR
15837
-# Avoid depending upon Character Ranges.
15838
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
15839
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
15840
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
15841
-as_cr_digits='0123456789'
15842
-as_cr_alnum=$as_cr_Letters$as_cr_digits
15843
-
15844
as_nl='
15845
'
15846
export as_nl
15847
@@ -14418,7 +13915,13 @@
15848
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
15849
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
15850
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
15851
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
15852
+# Prefer a ksh shell builtin over an external printf program on Solaris,
15853
+# but without wasting forks for bash or zsh.
15854
+if test -z "$BASH_VERSION$ZSH_VERSION" \
15855
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
15856
+ as_echo='print -r --'
15857
+ as_echo_n='print -rn --'
15858
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
15859
as_echo='printf %s\n'
15860
as_echo_n='printf %s'
15861
else
15862
@@ -14429,7 +13932,7 @@
15863
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
15864
as_echo_n_body='eval
15865
arg=$1;
15866
- case $arg in
15867
+ case $arg in #(
15868
*"$as_nl"*)
15869
expr "X$arg" : "X\\(.*\\)$as_nl";
15870
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
15871
@@ -14452,13 +13955,6 @@
15872
}
15873
fi
15874
15875
-# Support unset when possible.
15876
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
15877
- as_unset=unset
15878
-else
15879
- as_unset=false
15880
-fi
15881
-
15882
15883
# IFS
15884
# We need space, tab and new line, in precisely that order. Quoting is
15885
@@ -14468,15 +13964,16 @@
15886
IFS=" "" $as_nl"
15887
15888
# Find who we are. Look in the path if we contain no directory separator.
15889
-case $0 in
15890
+as_myself=
15891
+case $0 in #((
15892
*[\\/]* ) as_myself=$0 ;;
15893
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15894
for as_dir in $PATH
15895
do
15896
IFS=$as_save_IFS
15897
test -z "$as_dir" && as_dir=.
15898
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
15899
-done
15900
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
15901
+ done
15902
IFS=$as_save_IFS
15903
15904
;;
15905
@@ -14488,12 +13985,16 @@
15906
fi
15907
if test ! -f "$as_myself"; then
15908
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
15909
- { (exit 1); exit 1; }
15910
+ exit 1
15911
fi
15912
15913
-# Work around bugs in pre-3.0 UWIN ksh.
15914
-for as_var in ENV MAIL MAILPATH
15915
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
15916
+# Unset variables that we do not need and which cause bugs (e.g. in
15917
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
15918
+# suppresses any "Segmentation fault" message there. '((' could
15919
+# trigger a bug in pdksh 5.2.14.
15920
+for as_var in BASH_ENV ENV MAIL MAILPATH
15921
+do eval test x\${$as_var+set} = xset \
15922
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
15923
done
15924
PS1='$ '
15925
PS2='> '
15926
@@ -14505,7 +14006,89 @@
15927
LANGUAGE=C
15928
export LANGUAGE
15929
15930
-# Required to use basename.
15931
+# CDPATH.
15932
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
15933
+
15934
+
15935
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
15936
+# ----------------------------------------
15937
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
15938
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
15939
+# script with STATUS, using 1 if that was 0.
15940
+as_fn_error ()
15941
+{
15942
+ as_status=$1; test $as_status -eq 0 && as_status=1
15943
+ if test "$4"; then
15944
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
15945
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
15946
+ fi
15947
+ $as_echo "$as_me: error: $2" >&2
15948
+ as_fn_exit $as_status
15949
+} # as_fn_error
15950
+
15951
+
15952
+# as_fn_set_status STATUS
15953
+# -----------------------
15954
+# Set $? to STATUS, without forking.
15955
+as_fn_set_status ()
15956
+{
15957
+ return $1
15958
+} # as_fn_set_status
15959
+
15960
+# as_fn_exit STATUS
15961
+# -----------------
15962
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
15963
+as_fn_exit ()
15964
+{
15965
+ set +e
15966
+ as_fn_set_status $1
15967
+ exit $1
15968
+} # as_fn_exit
15969
+
15970
+# as_fn_unset VAR
15971
+# ---------------
15972
+# Portably unset VAR.
15973
+as_fn_unset ()
15974
+{
15975
+ { eval $1=; unset $1;}
15976
+}
15977
+as_unset=as_fn_unset
15978
+# as_fn_append VAR VALUE
15979
+# ----------------------
15980
+# Append the text in VALUE to the end of the definition contained in VAR. Take
15981
+# advantage of any shell optimizations that allow amortized linear growth over
15982
+# repeated appends, instead of the typical quadratic growth present in naive
15983
+# implementations.
15984
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
15985
+ eval 'as_fn_append ()
15986
+ {
15987
+ eval $1+=\$2
15988
+ }'
15989
+else
15990
+ as_fn_append ()
15991
+ {
15992
+ eval $1=\$$1\$2
15993
+ }
15994
+fi # as_fn_append
15995
+
15996
+# as_fn_arith ARG...
15997
+# ------------------
15998
+# Perform arithmetic evaluation on the ARGs, and store the result in the
15999
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
16000
+# must be portable across $(()) and expr.
16001
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
16002
+ eval 'as_fn_arith ()
16003
+ {
16004
+ as_val=$(( $* ))
16005
+ }'
16006
+else
16007
+ as_fn_arith ()
16008
+ {
16009
+ as_val=`expr "$@" || test $? -eq 1`
16010
+ }
16011
+fi # as_fn_arith
16012
+
16013
+
16014
if expr a : '\(a\)' >/dev/null 2>&1 &&
16015
test "X`expr 00001 : '.*\(...\)'`" = X001; then
16016
as_expr=expr
16017
@@ -14519,8 +14102,12 @@
16018
as_basename=false
16019
fi
16020
16021
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
16022
+ as_dirname=dirname
16023
+else
16024
+ as_dirname=false
16025
+fi
16026
16027
-# Name of the executable.
16028
as_me=`$as_basename -- "$0" ||
16029
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
16030
X"$0" : 'X\(//\)$' \| \
16031
@@ -14540,76 +14127,25 @@
16032
}
16033
s/.*/./; q'`
16034
16035
-# CDPATH.
16036
-$as_unset CDPATH
16037
-
16038
-
16039
-
16040
- as_lineno_1=$LINENO
16041
- as_lineno_2=$LINENO
16042
- test "x$as_lineno_1" != "x$as_lineno_2" &&
16043
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
16044
-
16045
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
16046
- # uniformly replaced by the line number. The first 'sed' inserts a
16047
- # line-number line after each line using $LINENO; the second 'sed'
16048
- # does the real work. The second script uses 'N' to pair each
16049
- # line-number line with the line containing $LINENO, and appends
16050
- # trailing '-' during substitution so that $LINENO is not a special
16051
- # case at line end.
16052
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
16053
- # scripts with optimization help from Paolo Bonzini. Blame Lee
16054
- # E. McMahon (1931-1989) for sed's syntax. :-)
16055
- sed -n '
16056
- p
16057
- /[$]LINENO/=
16058
- ' <$as_myself |
16059
- sed '
16060
- s/[$]LINENO.*/&-/
16061
- t lineno
16062
- b
16063
- :lineno
16064
- N
16065
- :loop
16066
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
16067
- t loop
16068
- s/-\n.*//
16069
- ' >$as_me.lineno &&
16070
- chmod +x "$as_me.lineno" ||
16071
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
16072
- { (exit 1); exit 1; }; }
16073
-
16074
- # Don't try to exec as it changes $[0], causing all sort of problems
16075
- # (the dirname of $[0] is not the place where we might find the
16076
- # original and so on. Autoconf is especially sensitive to this).
16077
- . "./$as_me.lineno"
16078
- # Exit status is that of the last command.
16079
- exit
16080
-}
16081
-
16082
-
16083
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
16084
- as_dirname=dirname
16085
-else
16086
- as_dirname=false
16087
-fi
16088
+# Avoid depending upon Character Ranges.
16089
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
16090
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
16091
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
16092
+as_cr_digits='0123456789'
16093
+as_cr_alnum=$as_cr_Letters$as_cr_digits
16094
16095
ECHO_C= ECHO_N= ECHO_T=
16096
-case `echo -n x` in
16097
+case `echo -n x` in #(((((
16098
-n*)
16099
- case `echo 'x\c'` in
16100
+ case `echo 'xy\c'` in
16101
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
16102
- *) ECHO_C='\c';;
16103
+ xy) ECHO_C='\c';;
16104
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
16105
+ ECHO_T=' ';;
16106
esac;;
16107
*)
16108
ECHO_N='-n';;
16109
esac
16110
-if expr a : '\(a\)' >/dev/null 2>&1 &&
16111
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
16112
- as_expr=expr
16113
-else
16114
- as_expr=false
16115
-fi
16116
16117
rm -f conf$$ conf$$.exe conf$$.file
16118
if test -d conf$$.dir; then
16119
@@ -14638,8 +14174,56 @@
16120
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
16121
rmdir conf$$.dir 2>/dev/null
16122
16123
+
16124
+# as_fn_mkdir_p
16125
+# -------------
16126
+# Create "$as_dir" as a directory, including parents if necessary.
16127
+as_fn_mkdir_p ()
16128
+{
16129
+
16130
+ case $as_dir in #(
16131
+ -*) as_dir=./$as_dir;;
16132
+ esac
16133
+ test -d "$as_dir" || eval $as_mkdir_p || {
16134
+ as_dirs=
16135
+ while :; do
16136
+ case $as_dir in #(
16137
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
16138
+ *) as_qdir=$as_dir;;
16139
+ esac
16140
+ as_dirs="'$as_qdir' $as_dirs"
16141
+ as_dir=`$as_dirname -- "$as_dir" ||
16142
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
16143
+ X"$as_dir" : 'X\(//\)[^/]' \| \
16144
+ X"$as_dir" : 'X\(//\)$' \| \
16145
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
16146
+$as_echo X"$as_dir" |
16147
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
16148
+ s//\1/
16149
+ q
16150
+ }
16151
+ /^X\(\/\/\)[^/].*/{
16152
+ s//\1/
16153
+ q
16154
+ }
16155
+ /^X\(\/\/\)$/{
16156
+ s//\1/
16157
+ q
16158
+ }
16159
+ /^X\(\/\).*/{
16160
+ s//\1/
16161
+ q
16162
+ }
16163
+ s/.*/./; q'`
16164
+ test -d "$as_dir" && break
16165
+ done
16166
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
16167
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
16168
+
16169
+
16170
+} # as_fn_mkdir_p
16171
if mkdir -p . 2>/dev/null; then
16172
- as_mkdir_p=:
16173
+ as_mkdir_p='mkdir -p "$as_dir"'
16174
else
16175
test -d ./-p && rmdir ./-p
16176
as_mkdir_p=false
16177
@@ -14658,10 +14242,10 @@
16178
if test -d "$1"; then
16179
test -d "$1/.";
16180
else
16181
- case $1 in
16182
+ case $1 in #(
16183
-*)set "./$1";;
16184
esac;
16185
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
16186
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
16187
???[sx]*):;;*)false;;esac;fi
16188
'\'' sh
16189
'
16190
@@ -14676,13 +14260,19 @@
16191
16192
16193
exec 6>&1
16194
+## ----------------------------------- ##
16195
+## Main body of $CONFIG_STATUS script. ##
16196
+## ----------------------------------- ##
16197
+_ASEOF
16198
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
16199
16200
-# Save the log message, to keep $[0] and so on meaningful, and to
16201
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16202
+# Save the log message, to keep $0 and so on meaningful, and to
16203
# report actual input values of CONFIG_FILES etc. instead of their
16204
# values after options handling.
16205
ac_log="
16206
This file was extended by bluez $as_me 4.94, which was
16207
-generated by GNU Autoconf 2.63. Invocation command line was
16208
+generated by GNU Autoconf 2.68. Invocation command line was
16209
16210
CONFIG_FILES = $CONFIG_FILES
16211
CONFIG_HEADERS = $CONFIG_HEADERS
16212
@@ -14714,13 +14304,15 @@
16213
16214
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16215
ac_cs_usage="\
16216
-\`$as_me' instantiates files from templates according to the
16217
-current configuration.
16218
+\`$as_me' instantiates files and other configuration actions
16219
+from templates according to the current configuration. Unless the files
16220
+and actions are specified as TAGs, all are instantiated by default.
16221
16222
-Usage: $0 [OPTION]... [FILE]...
16223
+Usage: $0 [OPTION]... [TAG]...
16224
16225
-h, --help print this help, then exit
16226
-V, --version print version number and configuration settings, then exit
16227
+ --config print configuration, then exit
16228
-q, --quiet, --silent
16229
do not print progress messages
16230
-d, --debug don't remove temporary files
16231
@@ -14739,16 +14331,17 @@
16232
Configuration commands:
16233
$config_commands
16234
16235
-Report bugs to <bug-autoconf@gnu.org>."
16236
+Report bugs to the package provider."
16237
16238
_ACEOF
16239
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16240
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
16241
ac_cs_version="\\
16242
bluez config.status 4.94
16243
-configured by $0, generated by GNU Autoconf 2.63,
16244
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
16245
+configured by $0, generated by GNU Autoconf 2.68,
16246
+ with options \\"\$ac_cs_config\\"
16247
16248
-Copyright (C) 2008 Free Software Foundation, Inc.
16249
+Copyright (C) 2010 Free Software Foundation, Inc.
16250
This config.status script is free software; the Free Software Foundation
16251
gives unlimited permission to copy, distribute and modify it."
16252
16253
@@ -14766,11 +14359,16 @@
16254
while test $# != 0
16255
do
16256
case $1 in
16257
- --*=*)
16258
+ --*=?*)
16259
ac_option=`expr "X$1" : 'X\([^=]*\)='`
16260
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
16261
ac_shift=:
16262
;;
16263
+ --*=)
16264
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
16265
+ ac_optarg=
16266
+ ac_shift=:
16267
+ ;;
16268
*)
16269
ac_option=$1
16270
ac_optarg=$2
16271
@@ -14784,27 +14382,29 @@
16272
ac_cs_recheck=: ;;
16273
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
16274
$as_echo "$ac_cs_version"; exit ;;
16275
+ --config | --confi | --conf | --con | --co | --c )
16276
+ $as_echo "$ac_cs_config"; exit ;;
16277
--debug | --debu | --deb | --de | --d | -d )
16278
debug=: ;;
16279
--file | --fil | --fi | --f )
16280
$ac_shift
16281
case $ac_optarg in
16282
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
16283
+ '') as_fn_error $? "missing file argument" ;;
16284
esac
16285
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
16286
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
16287
ac_need_defaults=false;;
16288
--header | --heade | --head | --hea )
16289
$ac_shift
16290
case $ac_optarg in
16291
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
16292
esac
16293
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
16294
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
16295
ac_need_defaults=false;;
16296
--he | --h)
16297
# Conflict between --help and --header
16298
- { $as_echo "$as_me: error: ambiguous option: $1
16299
-Try \`$0 --help' for more information." >&2
16300
- { (exit 1); exit 1; }; };;
16301
+ as_fn_error $? "ambiguous option: \`$1'
16302
+Try \`$0 --help' for more information.";;
16303
--help | --hel | -h )
16304
$as_echo "$ac_cs_usage"; exit ;;
16305
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
16306
@@ -14812,11 +14412,10 @@
16307
ac_cs_silent=: ;;
16308
16309
# This is an error.
16310
- -*) { $as_echo "$as_me: error: unrecognized option: $1
16311
-Try \`$0 --help' for more information." >&2
16312
- { (exit 1); exit 1; }; } ;;
16313
+ -*) as_fn_error $? "unrecognized option: \`$1'
16314
+Try \`$0 --help' for more information." ;;
16315
16316
- *) ac_config_targets="$ac_config_targets $1"
16317
+ *) as_fn_append ac_config_targets " $1"
16318
ac_need_defaults=false ;;
16319
16320
esac
16321
@@ -14867,131 +14466,153 @@
16322
sed_quote_subst='$sed_quote_subst'
16323
double_quote_subst='$double_quote_subst'
16324
delay_variable_subst='$delay_variable_subst'
16325
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
16326
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
16327
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
16328
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
16329
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
16330
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
16331
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
16332
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
16333
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
16334
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
16335
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
16336
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
16337
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
16338
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
16339
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
16340
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
16341
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
16342
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
16343
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
16344
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
16345
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
16346
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
16347
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
16348
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
16349
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
16350
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
16351
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
16352
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16353
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
16354
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
16355
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
16356
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
16357
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
16358
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
16359
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
16360
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16361
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16362
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16363
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
16364
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
16365
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
16366
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
16367
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
16368
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
16369
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
16370
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
16371
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
16372
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
16373
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
16374
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
16375
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
16376
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
16377
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
16378
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
16379
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
16380
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
16381
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
16382
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
16383
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
16384
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
16385
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
16386
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
16387
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16388
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16389
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
16390
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
16391
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
16392
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
16393
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
16394
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16395
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16396
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16397
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16398
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16399
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16400
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
16401
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
16402
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
16403
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
16404
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
16405
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
16406
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
16407
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
16408
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
16409
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
16410
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
16411
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
16412
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
16413
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
16414
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
16415
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16416
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
16417
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
16418
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16419
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
16420
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
16421
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
16422
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
16423
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
16424
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
16425
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
16426
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
16427
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
16428
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
16429
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
16430
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16431
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16432
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16433
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
16434
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
16435
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
16436
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
16437
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
16438
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
16439
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
16440
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
16441
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
16442
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
16443
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
16444
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
16445
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
16446
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
16447
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
16448
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
16449
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
16450
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
16451
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
16452
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
16453
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
16454
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
16455
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
16456
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
16457
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
16458
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
16459
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
16460
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
16461
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
16462
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
16463
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
16464
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
16465
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
16466
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
16467
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
16468
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
16469
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
16470
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
16471
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
16472
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
16473
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
16474
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
16475
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
16476
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
16477
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
16478
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
16479
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
16480
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
16481
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
16482
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
16483
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
16484
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
16485
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
16486
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
16487
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
16488
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
16489
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
16490
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
16491
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
16492
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
16493
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
16494
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
16495
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
16496
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
16497
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
16498
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
16499
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
16500
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
16501
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
16502
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
16503
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
16504
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
16505
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
16506
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
16507
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
16508
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
16509
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
16510
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
16511
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
16512
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
16513
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
16514
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
16515
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
16516
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
16517
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
16518
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
16519
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
16520
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
16521
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
16522
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
16523
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
16524
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
16525
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
16526
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
16527
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
16528
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
16529
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
16530
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
16531
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
16532
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
16533
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
16534
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
16535
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
16536
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
16537
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
16538
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
16539
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
16540
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
16541
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
16542
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
16543
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
16544
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
16545
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
16546
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
16547
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
16548
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
16549
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
16550
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
16551
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
16552
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
16553
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
16554
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
16555
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
16556
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
16557
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
16558
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
16559
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
16560
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
16561
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
16562
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
16563
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
16564
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
16565
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
16566
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
16567
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
16568
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
16569
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
16570
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
16571
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
16572
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
16573
16574
LTCC='$LTCC'
16575
LTCFLAGS='$LTCFLAGS'
16576
compiler='$compiler_DEFAULT'
16577
16578
+# A function that is used when there is no print builtin or printf.
16579
+func_fallback_echo ()
16580
+{
16581
+ eval 'cat <<_LTECHO_EOF
16582
+\$1
16583
+_LTECHO_EOF'
16584
+}
16585
+
16586
# Quote evaled strings.
16587
-for var in SED \
16588
+for var in SHELL \
16589
+ECHO \
16590
+SED \
16591
GREP \
16592
EGREP \
16593
FGREP \
16594
@@ -15004,8 +14625,13 @@
16595
OBJDUMP \
16596
deplibs_check_method \
16597
file_magic_cmd \
16598
+file_magic_glob \
16599
+want_nocaseglob \
16600
+DLLTOOL \
16601
+sharedlib_from_linklib_cmd \
16602
AR \
16603
AR_FLAGS \
16604
+archiver_list_spec \
16605
STRIP \
16606
RANLIB \
16607
CC \
16608
@@ -15015,14 +14641,14 @@
16609
lt_cv_sys_global_symbol_to_cdecl \
16610
lt_cv_sys_global_symbol_to_c_name_address \
16611
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
16612
-SHELL \
16613
-ECHO \
16614
+nm_file_list_spec \
16615
lt_prog_compiler_no_builtin_flag \
16616
-lt_prog_compiler_wl \
16617
lt_prog_compiler_pic \
16618
+lt_prog_compiler_wl \
16619
lt_prog_compiler_static \
16620
lt_cv_prog_compiler_c_o \
16621
need_locks \
16622
+MANIFEST_TOOL \
16623
DSYMUTIL \
16624
NMEDIT \
16625
LIPO \
16626
@@ -15038,7 +14664,6 @@
16627
hardcode_libdir_flag_spec \
16628
hardcode_libdir_flag_spec_ld \
16629
hardcode_libdir_separator \
16630
-fix_srcfile_path \
16631
exclude_expsyms \
16632
include_expsyms \
16633
file_list_spec \
16634
@@ -15046,12 +14671,13 @@
16635
libname_spec \
16636
library_names_spec \
16637
soname_spec \
16638
+install_override_mode \
16639
finish_eval \
16640
old_striplib \
16641
striplib; do
16642
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
16643
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
16644
*[\\\\\\\`\\"\\\$]*)
16645
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
16646
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
16647
;;
16648
*)
16649
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
16650
@@ -15073,14 +14699,15 @@
16651
module_expsym_cmds \
16652
export_symbols_cmds \
16653
prelink_cmds \
16654
+postlink_cmds \
16655
postinstall_cmds \
16656
postuninstall_cmds \
16657
finish_cmds \
16658
sys_lib_search_path_spec \
16659
sys_lib_dlsearch_path_spec; do
16660
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
16661
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
16662
*[\\\\\\\`\\"\\\$]*)
16663
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
16664
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
16665
;;
16666
*)
16667
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
16668
@@ -15088,12 +14715,6 @@
16669
esac
16670
done
16671
16672
-# Fix-up fallback echo if it was mangled by the above quoting rules.
16673
-case \$lt_ECHO in
16674
-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
16675
- ;;
16676
-esac
16677
-
16678
ac_aux_dir='$ac_aux_dir'
16679
xsi_shell='$xsi_shell'
16680
lt_shell_append='$lt_shell_append'
16681
@@ -15131,9 +14752,7 @@
16682
"src/bluetoothd.8") CONFIG_FILES="$CONFIG_FILES src/bluetoothd.8" ;;
16683
"bluez.pc") CONFIG_FILES="$CONFIG_FILES bluez.pc" ;;
16684
16685
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
16686
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
16687
- { (exit 1); exit 1; }; };;
16688
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
16689
esac
16690
done
16691
16692
@@ -15156,26 +14775,24 @@
16693
# after its creation but before its name has been assigned to `$tmp'.
16694
$debug ||
16695
{
16696
- tmp=
16697
+ tmp= ac_tmp=
16698
trap 'exit_status=$?
16699
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
16700
+ : "${ac_tmp:=$tmp}"
16701
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
16702
' 0
16703
- trap '{ (exit 1); exit 1; }' 1 2 13 15
16704
+ trap 'as_fn_exit 1' 1 2 13 15
16705
}
16706
# Create a (secure) tmp directory for tmp files.
16707
16708
{
16709
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
16710
- test -n "$tmp" && test -d "$tmp"
16711
+ test -d "$tmp"
16712
} ||
16713
{
16714
tmp=./conf$$-$RANDOM
16715
(umask 077 && mkdir "$tmp")
16716
-} ||
16717
-{
16718
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
16719
- { (exit 1); exit 1; }
16720
-}
16721
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
16722
+ac_tmp=$tmp
16723
16724
# Set up the scripts for CONFIG_FILES section.
16725
# No need to generate them if there are no CONFIG_FILES.
16726
@@ -15183,7 +14800,13 @@
16727
if test -n "$CONFIG_FILES"; then
16728
16729
16730
-ac_cr='
b"'"
16731
+ac_cr=`echo X | tr X '\015'`
16732
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
16733
+# But we know of no other shell where ac_cr would be empty at this
16734
+# point, so we can use a bashism as a fallback.
16735
+if test "x$ac_cr" = x; then
16736
+ eval ac_cr=\$\'\\r\'
16737
+fi
16738
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
16739
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
16740
ac_cs_awk_cr='\\r'
16741
@@ -15191,7 +14814,7 @@
16742
ac_cs_awk_cr=$ac_cr
16743
fi
16744
16745
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
16746
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
16747
_ACEOF
16748
16749
16750
@@ -15200,24 +14823,18 @@
16751
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
16752
echo "_ACEOF"
16753
} >conf$$subs.sh ||
16754
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
16755
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
16756
- { (exit 1); exit 1; }; }
16757
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
16758
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
16759
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
16760
ac_delim='%!_!# '
16761
for ac_last_try in false false false false false :; do
16762
. ./conf$$subs.sh ||
16763
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
16764
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
16765
- { (exit 1); exit 1; }; }
16766
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
16767
16768
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
16769
if test $ac_delim_n = $ac_delim_num; then
16770
break
16771
elif $ac_last_try; then
16772
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
16773
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
16774
- { (exit 1); exit 1; }; }
16775
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
16776
else
16777
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
16778
fi
16779
@@ -15225,7 +14842,7 @@
16780
rm -f conf$$subs.sh
16781
16782
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16783
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
16784
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
16785
_ACEOF
16786
sed -n '
16787
h
16788
@@ -15239,7 +14856,7 @@
16789
t delim
16790
:nl
16791
h
16792
-s/\(.\{148\}\).*/\1/
16793
+s/\(.\{148\}\)..*/\1/
16794
t more1
16795
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
16796
p
16797
@@ -15253,7 +14870,7 @@
16798
t nl
16799
:delim
16800
h
16801
-s/\(.\{148\}\).*/\1/
16802
+s/\(.\{148\}\)..*/\1/
16803
t more2
16804
s/["\\]/\\&/g; s/^/"/; s/$/"/
16805
p
16806
@@ -15273,7 +14890,7 @@
16807
rm -f conf$$subs.awk
16808
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16809
_ACAWK
16810
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
16811
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
16812
for (key in S) S_is_set[key] = 1
16813
FS = ""
16814
16815
@@ -15305,23 +14922,29 @@
16816
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
16817
else
16818
cat
16819
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
16820
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
16821
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
16822
- { (exit 1); exit 1; }; }
16823
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
16824
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
16825
_ACEOF
16826
16827
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
16828
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
16829
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
16830
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
16831
# trailing colons and then remove the whole line if VPATH becomes empty
16832
# (actually we leave an empty line to preserve line numbers).
16833
if test "x$srcdir" = x.; then
16834
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
16835
-s/:*\$(srcdir):*/:/
16836
-s/:*\${srcdir}:*/:/
16837
-s/:*@srcdir@:*/:/
16838
-s/^\([^=]*=[ ]*\):*/\1/
16839
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
16840
+h
16841
+s///
16842
+s/^/:/
16843
+s/[ ]*$/:/
16844
+s/:\$(srcdir):/:/g
16845
+s/:\${srcdir}:/:/g
16846
+s/:@srcdir@:/:/g
16847
+s/^:*//
16848
s/:*$//
16849
+x
16850
+s/\(=[ ]*\).*/\1/
16851
+G
16852
+s/\n//
16853
s/^[^=]*=[ ]*$//
16854
}'
16855
fi
16856
@@ -15333,7 +14956,7 @@
16857
# No need to generate them if there are no CONFIG_HEADERS.
16858
# This happens for instance with `./config.status Makefile'.
16859
if test -n "$CONFIG_HEADERS"; then
16860
-cat >"$tmp/defines.awk" <<\_ACAWK ||
16861
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
16862
BEGIN {
16863
_ACEOF
16864
16865
@@ -15345,13 +14968,11 @@
16866
# handling of long lines.
16867
ac_delim='%!_!# '
16868
for ac_last_try in false false :; do
16869
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
16870
- if test -z "$ac_t"; then
16871
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
16872
+ if test -z "$ac_tt"; then
16873
break
16874
elif $ac_last_try; then
16875
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
16876
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
16877
- { (exit 1); exit 1; }; }
16878
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
16879
else
16880
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
16881
fi
16882
@@ -15436,9 +15057,7 @@
16883
_ACAWK
16884
_ACEOF
16885
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16886
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
16887
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
16888
- { (exit 1); exit 1; }; }
16889
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
16890
fi # test -n "$CONFIG_HEADERS"
16891
16892
16893
@@ -15451,9 +15070,7 @@
16894
esac
16895
case $ac_mode$ac_tag in
16896
:[FHL]*:*);;
16897
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
16898
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
16899
- { (exit 1); exit 1; }; };;
16900
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
16901
:[FH]-) ac_tag=-:-;;
16902
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
16903
esac
16904
@@ -15472,7 +15089,7 @@
16905
for ac_f
16906
do
16907
case $ac_f in
16908
- -) ac_f="$tmp/stdin";;
16909
+ -) ac_f="$ac_tmp/stdin";;
16910
*) # Look for the file first in the build tree, then in the source tree
16911
# (if the path is not absolute). The absolute path cannot be DOS-style,
16912
# because $ac_f cannot contain `:'.
16913
@@ -15481,12 +15098,10 @@
16914
[\\/$]*) false;;
16915
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
16916
esac ||
16917
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
16918
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
16919
- { (exit 1); exit 1; }; };;
16920
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
16921
esac
16922
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
16923
- ac_file_inputs="$ac_file_inputs '$ac_f'"
16924
+ as_fn_append ac_file_inputs " '$ac_f'"
16925
done
16926
16927
# Let's still pretend it is `configure' which instantiates (i.e., don't
16928
@@ -15497,7 +15112,7 @@
16929
`' by configure.'
16930
if test x"$ac_file" != x-; then
16931
configure_input="$ac_file. $configure_input"
16932
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
16933
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
16934
$as_echo "$as_me: creating $ac_file" >&6;}
16935
fi
16936
# Neutralize special characters interpreted by sed in replacement strings.
16937
@@ -15509,10 +15124,8 @@
16938
esac
16939
16940
case $ac_tag in
16941
- *:-:* | *:-) cat >"$tmp/stdin" \
16942
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
16943
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
16944
- { (exit 1); exit 1; }; } ;;
16945
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
16946
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
16947
esac
16948
;;
16949
esac
16950
@@ -15540,47 +15153,7 @@
16951
q
16952
}
16953
s/.*/./; q'`
16954
- { as_dir="$ac_dir"
16955
- case $as_dir in #(
16956
- -*) as_dir=./$as_dir;;
16957
- esac
16958
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
16959
- as_dirs=
16960
- while :; do
16961
- case $as_dir in #(
16962
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
16963
- *) as_qdir=$as_dir;;
16964
- esac
16965
- as_dirs="'$as_qdir' $as_dirs"
16966
- as_dir=`$as_dirname -- "$as_dir" ||
16967
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
16968
- X"$as_dir" : 'X\(//\)[^/]' \| \
16969
- X"$as_dir" : 'X\(//\)$' \| \
16970
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
16971
-$as_echo X"$as_dir" |
16972
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
16973
- s//\1/
16974
- q
16975
- }
16976
- /^X\(\/\/\)[^/].*/{
16977
- s//\1/
16978
- q
16979
- }
16980
- /^X\(\/\/\)$/{
16981
- s//\1/
16982
- q
16983
- }
16984
- /^X\(\/\).*/{
16985
- s//\1/
16986
- q
16987
- }
16988
- s/.*/./; q'`
16989
- test -d "$as_dir" && break
16990
- done
16991
- test -z "$as_dirs" || eval "mkdir $as_dirs"
16992
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
16993
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
16994
- { (exit 1); exit 1; }; }; }
16995
+ as_dir="$ac_dir"; as_fn_mkdir_p
16996
ac_builddir=.
16997
16998
case "$ac_dir" in
16999
@@ -15637,7 +15210,6 @@
17000
# If the template does not know about datarootdir, expand it.
17001
# FIXME: This hack should be removed a few years after 2.60.
17002
ac_datarootdir_hack=; ac_datarootdir_seen=
17003
-
17004
ac_sed_dataroot='
17005
/datarootdir/ {
17006
p
17007
@@ -15647,12 +15219,11 @@
17008
/@docdir@/p
17009
/@infodir@/p
17010
/@localedir@/p
17011
-/@mandir@/p
17012
-'
17013
+/@mandir@/p'
17014
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
17015
*datarootdir*) ac_datarootdir_seen=yes;;
17016
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
17017
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
17018
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
17019
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
17020
_ACEOF
17021
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17022
@@ -15662,7 +15233,7 @@
17023
s&@infodir@&$infodir&g
17024
s&@localedir@&$localedir&g
17025
s&@mandir@&$mandir&g
17026
- s&\\\${datarootdir}&$datarootdir&g' ;;
17027
+ s&\\\${datarootdir}&$datarootdir&g' ;;
17028
esac
17029
_ACEOF
17030
17031
@@ -15690,27 +15261,24 @@
17032
s&@MKDIR_P@&$ac_MKDIR_P&;t t
17033
$ac_datarootdir_hack
17034
"
17035
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
17036
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
17037
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
17038
- { (exit 1); exit 1; }; }
17039
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
17040
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
17041
17042
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
17043
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
17044
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
17045
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
17046
-which seems to be undefined. Please make sure it is defined." >&5
17047
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
17048
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
17049
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
17050
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
17051
+which seems to be undefined. Please make sure it is defined" >&5
17052
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
17053
-which seems to be undefined. Please make sure it is defined." >&2;}
17054
+which seems to be undefined. Please make sure it is defined" >&2;}
17055
17056
- rm -f "$tmp/stdin"
17057
+ rm -f "$ac_tmp/stdin"
17058
case $ac_file in
17059
- -) cat "$tmp/out" && rm -f "$tmp/out";;
17060
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
17061
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
17062
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
17063
esac \
17064
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
17065
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
17066
- { (exit 1); exit 1; }; }
17067
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
17068
;;
17069
:H)
17070
#
17071
@@ -15719,27 +15287,21 @@
17072
if test x"$ac_file" != x-; then
17073
{
17074
$as_echo "/* $configure_input */" \
17075
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
17076
- } >"$tmp/config.h" \
17077
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
17078
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
17079
- { (exit 1); exit 1; }; }
17080
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
17081
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
17082
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
17083
+ } >"$ac_tmp/config.h" \
17084
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
17085
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
17086
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
17087
$as_echo "$as_me: $ac_file is unchanged" >&6;}
17088
else
17089
rm -f "$ac_file"
17090
- mv "$tmp/config.h" "$ac_file" \
17091
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
17092
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
17093
- { (exit 1); exit 1; }; }
17094
+ mv "$ac_tmp/config.h" "$ac_file" \
17095
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
17096
fi
17097
else
17098
$as_echo "/* $configure_input */" \
17099
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
17100
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
17101
-$as_echo "$as_me: error: could not create -" >&2;}
17102
- { (exit 1); exit 1; }; }
17103
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
17104
+ || as_fn_error $? "could not create -" "$LINENO" 5
17105
fi
17106
# Compute "$ac_file"'s index in $config_headers.
17107
_am_arg="$ac_file"
17108
@@ -15777,7 +15339,7 @@
17109
s/.*/./; q'`/stamp-h$_am_stamp_count
17110
;;
17111
17112
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
17113
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
17114
$as_echo "$as_me: executing $ac_file commands" >&6;}
17115
;;
17116
esac
17117
@@ -15872,47 +15434,7 @@
17118
q
17119
}
17120
s/.*/./; q'`
17121
- { as_dir=$dirpart/$fdir
17122
- case $as_dir in #(
17123
- -*) as_dir=./$as_dir;;
17124
- esac
17125
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
17126
- as_dirs=
17127
- while :; do
17128
- case $as_dir in #(
17129
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
17130
- *) as_qdir=$as_dir;;
17131
- esac
17132
- as_dirs="'$as_qdir' $as_dirs"
17133
- as_dir=`$as_dirname -- "$as_dir" ||
17134
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
17135
- X"$as_dir" : 'X\(//\)[^/]' \| \
17136
- X"$as_dir" : 'X\(//\)$' \| \
17137
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
17138
-$as_echo X"$as_dir" |
17139
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17140
- s//\1/
17141
- q
17142
- }
17143
- /^X\(\/\/\)[^/].*/{
17144
- s//\1/
17145
- q
17146
- }
17147
- /^X\(\/\/\)$/{
17148
- s//\1/
17149
- q
17150
- }
17151
- /^X\(\/\).*/{
17152
- s//\1/
17153
- q
17154
- }
17155
- s/.*/./; q'`
17156
- test -d "$as_dir" && break
17157
- done
17158
- test -z "$as_dirs" || eval "mkdir $as_dirs"
17159
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
17160
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
17161
- { (exit 1); exit 1; }; }; }
17162
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
17163
# echo "creating $dirpart/$file"
17164
echo '# dummy' > "$dirpart/$file"
17165
done
17166
@@ -15940,7 +15462,8 @@
17167
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
17168
#
17169
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
17170
-# 2006, 2007, 2008 Free Software Foundation, Inc.
17171
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
17172
+# Inc.
17173
# Written by Gordon Matzigkeit, 1996
17174
#
17175
# This file is part of GNU Libtool.
17176
@@ -15988,6 +15511,12 @@
17177
# Whether or not to optimize for fast installation.
17178
fast_install=$enable_fast_install
17179
17180
+# Shell to use when invoking shell scripts.
17181
+SHELL=$lt_SHELL
17182
+
17183
+# An echo program that protects backslashes.
17184
+ECHO=$lt_ECHO
17185
+
17186
# The host system.
17187
host_alias=$host_alias
17188
host=$host
17189
@@ -16037,9 +15566,11 @@
17190
# turn newlines into spaces.
17191
NL2SP=$lt_lt_NL2SP
17192
17193
-# How to create reloadable object files.
17194
-reload_flag=$lt_reload_flag
17195
-reload_cmds=$lt_reload_cmds
17196
+# convert \$build file names to \$host format.
17197
+to_host_file_cmd=$lt_cv_to_host_file_cmd
17198
+
17199
+# convert \$build files to toolchain format.
17200
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
17201
17202
# An object symbol dumper.
17203
OBJDUMP=$lt_OBJDUMP
17204
@@ -16047,13 +15578,30 @@
17205
# Method to check whether dependent libraries are shared objects.
17206
deplibs_check_method=$lt_deplibs_check_method
17207
17208
-# Command to use when deplibs_check_method == "file_magic".
17209
+# Command to use when deplibs_check_method = "file_magic".
17210
file_magic_cmd=$lt_file_magic_cmd
17211
17212
+# How to find potential files when deplibs_check_method = "file_magic".
17213
+file_magic_glob=$lt_file_magic_glob
17214
+
17215
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
17216
+want_nocaseglob=$lt_want_nocaseglob
17217
+
17218
+# DLL creation program.
17219
+DLLTOOL=$lt_DLLTOOL
17220
+
17221
+# Command to associate shared and link libraries.
17222
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
17223
+
17224
# The archiver.
17225
AR=$lt_AR
17226
+
17227
+# Flags to create an archive.
17228
AR_FLAGS=$lt_AR_FLAGS
17229
17230
+# How to feed a file listing to the archiver.
17231
+archiver_list_spec=$lt_archiver_list_spec
17232
+
17233
# A symbol stripping program.
17234
STRIP=$lt_STRIP
17235
17236
@@ -16062,6 +15610,9 @@
17237
old_postinstall_cmds=$lt_old_postinstall_cmds
17238
old_postuninstall_cmds=$lt_old_postuninstall_cmds
17239
17240
+# Whether to use a lock for old archive extraction.
17241
+lock_old_archive_extraction=$lock_old_archive_extraction
17242
+
17243
# A C compiler.
17244
LTCC=$lt_CC
17245
17246
@@ -16080,14 +15631,14 @@
17247
# Transform the output of nm in a C name address pair when lib prefix is needed.
17248
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
17249
17250
-# The name of the directory that contains temporary libtool files.
17251
-objdir=$objdir
17252
+# Specify filename containing input files for \$NM.
17253
+nm_file_list_spec=$lt_nm_file_list_spec
17254
17255
-# Shell to use when invoking shell scripts.
17256
-SHELL=$lt_SHELL
17257
+# The root where to search for dependent libraries,and in which our libraries should be installed.
17258
+lt_sysroot=$lt_sysroot
17259
17260
-# An echo program that does not interpret backslashes.
17261
-ECHO=$lt_ECHO
17262
+# The name of the directory that contains temporary libtool files.
17263
+objdir=$objdir
17264
17265
# Used to examine libraries when file_magic_cmd begins with "file".
17266
MAGIC_CMD=$MAGIC_CMD
17267
@@ -16095,6 +15646,9 @@
17268
# Must we lock files when doing compilation?
17269
need_locks=$lt_need_locks
17270
17271
+# Manifest tool.
17272
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
17273
+
17274
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
17275
DSYMUTIL=$lt_DSYMUTIL
17276
17277
@@ -16151,6 +15705,9 @@
17278
# The coded name of the library, if different from the real name.
17279
soname_spec=$lt_soname_spec
17280
17281
+# Permission mode override for installation of shared libraries.
17282
+install_override_mode=$lt_install_override_mode
17283
+
17284
# Command to use after installation of a shared archive.
17285
postinstall_cmds=$lt_postinstall_cmds
17286
17287
@@ -16190,6 +15747,10 @@
17288
# The linker used to build libraries.
17289
LD=$lt_LD
17290
17291
+# How to create reloadable object files.
17292
+reload_flag=$lt_reload_flag
17293
+reload_cmds=$lt_reload_cmds
17294
+
17295
# Commands used to build an old-style archive.
17296
old_archive_cmds=$lt_old_archive_cmds
17297
17298
@@ -16202,12 +15763,12 @@
17299
# Compiler flag to turn off builtin functions.
17300
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
17301
17302
-# How to pass a linker flag through the compiler.
17303
-wl=$lt_lt_prog_compiler_wl
17304
-
17305
# Additional compiler flags for building library objects.
17306
pic_flag=$lt_lt_prog_compiler_pic
17307
17308
+# How to pass a linker flag through the compiler.
17309
+wl=$lt_lt_prog_compiler_wl
17310
+
17311
# Compiler flag to prevent dynamic linking.
17312
link_static_flag=$lt_lt_prog_compiler_static
17313
17314
@@ -16294,9 +15855,6 @@
17315
# Whether libtool must link a program against all its dependency libraries.
17316
link_all_deplibs=$link_all_deplibs
17317
17318
-# Fix the shell variable \$srcfile for the compiler.
17319
-fix_srcfile_path=$lt_fix_srcfile_path
17320
-
17321
# Set to "yes" if exported symbols are required.
17322
always_export_symbols=$always_export_symbols
17323
17324
@@ -16312,6 +15870,9 @@
17325
# Commands necessary for linking programs (against libraries) with templates.
17326
prelink_cmds=$lt_prelink_cmds
17327
17328
+# Commands necessary for finishing linking programs.
17329
+postlink_cmds=$lt_postlink_cmds
17330
+
17331
# Specify filename containing input files.
17332
file_list_spec=$lt_file_list_spec
17333
17334
@@ -16344,212 +15905,169 @@
17335
# if finds mixed CR/LF and LF-only lines. Since sed operates in
17336
# text mode, it properly converts lines to CR/LF. This bash problem
17337
# is reportedly fixed, but why not run on old versions too?
17338
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
17339
- || (rm -f "$cfgfile"; exit 1)
17340
-
17341
- case $xsi_shell in
17342
- yes)
17343
- cat << \_LT_EOF >> "$cfgfile"
17344
-
17345
-# func_dirname file append nondir_replacement
17346
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
17347
-# otherwise set result to NONDIR_REPLACEMENT.
17348
-func_dirname ()
17349
-{
17350
- case ${1} in
17351
- */*) func_dirname_result="${1%/*}${2}" ;;
17352
- * ) func_dirname_result="${3}" ;;
17353
- esac
17354
-}
17355
-
17356
-# func_basename file
17357
-func_basename ()
17358
-{
17359
- func_basename_result="${1##*/}"
17360
-}
17361
-
17362
-# func_dirname_and_basename file append nondir_replacement
17363
-# perform func_basename and func_dirname in a single function
17364
-# call:
17365
-# dirname: Compute the dirname of FILE. If nonempty,
17366
-# add APPEND to the result, otherwise set result
17367
-# to NONDIR_REPLACEMENT.
17368
-# value returned in "$func_dirname_result"
17369
-# basename: Compute filename of FILE.
17370
-# value retuned in "$func_basename_result"
17371
-# Implementation must be kept synchronized with func_dirname
17372
-# and func_basename. For efficiency, we do not delegate to
17373
-# those functions but instead duplicate the functionality here.
17374
-func_dirname_and_basename ()
17375
-{
17376
- case ${1} in
17377
- */*) func_dirname_result="${1%/*}${2}" ;;
17378
- * ) func_dirname_result="${3}" ;;
17379
- esac
17380
- func_basename_result="${1##*/}"
17381
-}
17382
-
17383
-# func_stripname prefix suffix name
17384
-# strip PREFIX and SUFFIX off of NAME.
17385
-# PREFIX and SUFFIX must not contain globbing or regex special
17386
-# characters, hashes, percent signs, but SUFFIX may contain a leading
17387
-# dot (in which case that matches only a dot).
17388
-func_stripname ()
17389
-{
17390
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
17391
- # positional parameters, so assign one to ordinary parameter first.
17392
- func_stripname_result=${3}
17393
- func_stripname_result=${func_stripname_result#"${1}"}
17394
- func_stripname_result=${func_stripname_result%"${2}"}
17395
-}
17396
-
17397
-# func_opt_split
17398
-func_opt_split ()
17399
-{
17400
- func_opt_split_opt=${1%%=*}
17401
- func_opt_split_arg=${1#*=}
17402
-}
17403
-
17404
-# func_lo2o object
17405
-func_lo2o ()
17406
-{
17407
- case ${1} in
17408
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
17409
- *) func_lo2o_result=${1} ;;
17410
- esac
17411
-}
17412
-
17413
-# func_xform libobj-or-source
17414
-func_xform ()
17415
-{
17416
- func_xform_result=${1%.*}.lo
17417
-}
17418
-
17419
-# func_arith arithmetic-term...
17420
-func_arith ()
17421
-{
17422
- func_arith_result=$(( $* ))
17423
-}
17424
-
17425
-# func_len string
17426
-# STRING may not start with a hyphen.
17427
-func_len ()
17428
-{
17429
- func_len_result=${#1}
17430
-}
17431
-
17432
-_LT_EOF
17433
- ;;
17434
- *) # Bourne compatible functions.
17435
- cat << \_LT_EOF >> "$cfgfile"
17436
-
17437
-# func_dirname file append nondir_replacement
17438
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
17439
-# otherwise set result to NONDIR_REPLACEMENT.
17440
-func_dirname ()
17441
-{
17442
- # Extract subdirectory from the argument.
17443
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
17444
- if test "X$func_dirname_result" = "X${1}"; then
17445
- func_dirname_result="${3}"
17446
- else
17447
- func_dirname_result="$func_dirname_result${2}"
17448
- fi
17449
-}
17450
-
17451
-# func_basename file
17452
-func_basename ()
17453
-{
17454
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
17455
-}
17456
-
17457
-
17458
-# func_stripname prefix suffix name
17459
-# strip PREFIX and SUFFIX off of NAME.
17460
-# PREFIX and SUFFIX must not contain globbing or regex special
17461
-# characters, hashes, percent signs, but SUFFIX may contain a leading
17462
-# dot (in which case that matches only a dot).
17463
-# func_strip_suffix prefix name
17464
-func_stripname ()
17465
-{
17466
- case ${2} in
17467
- .*) func_stripname_result=`$ECHO "X${3}" \
17468
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
17469
- *) func_stripname_result=`$ECHO "X${3}" \
17470
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
17471
- esac
17472
-}
17473
-
17474
-# sed scripts:
17475
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
17476
-my_sed_long_arg='1s/^-[^=]*=//'
17477
-
17478
-# func_opt_split
17479
-func_opt_split ()
17480
-{
17481
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
17482
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
17483
-}
17484
-
17485
-# func_lo2o object
17486
-func_lo2o ()
17487
-{
17488
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
17489
-}
17490
-
17491
-# func_xform libobj-or-source
17492
-func_xform ()
17493
-{
17494
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
17495
-}
17496
-
17497
-# func_arith arithmetic-term...
17498
-func_arith ()
17499
-{
17500
- func_arith_result=`expr "$@"`
17501
-}
17502
-
17503
-# func_len string
17504
-# STRING may not start with a hyphen.
17505
-func_len ()
17506
-{
17507
- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
17508
-}
17509
-
17510
-_LT_EOF
17511
-esac
17512
-
17513
-case $lt_shell_append in
17514
- yes)
17515
- cat << \_LT_EOF >> "$cfgfile"
17516
-
17517
-# func_append var value
17518
-# Append VALUE to the end of shell variable VAR.
17519
-func_append ()
17520
-{
17521
- eval "$1+=\$2"
17522
-}
17523
-_LT_EOF
17524
- ;;
17525
- *)
17526
- cat << \_LT_EOF >> "$cfgfile"
17527
-
17528
-# func_append var value
17529
-# Append VALUE to the end of shell variable VAR.
17530
-func_append ()
17531
-{
17532
- eval "$1=\$$1\$2"
17533
-}
17534
-
17535
-_LT_EOF
17536
- ;;
17537
- esac
17538
+ sed '$q' "$ltmain" >> "$cfgfile" \
17539
+ || (rm -f "$cfgfile"; exit 1)
17540
17541
+ if test x"$xsi_shell" = xyes; then
17542
+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
17543
+func_dirname ()\
17544
+{\
17545
+\ case ${1} in\
17546
+\ */*) func_dirname_result="${1%/*}${2}" ;;\
17547
+\ * ) func_dirname_result="${3}" ;;\
17548
+\ esac\
17549
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
17550
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17551
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17552
+test 0 -eq $? || _lt_function_replace_fail=:
17553
+
17554
+
17555
+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
17556
+func_basename ()\
17557
+{\
17558
+\ func_basename_result="${1##*/}"\
17559
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
17560
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17561
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17562
+test 0 -eq $? || _lt_function_replace_fail=:
17563
+
17564
+
17565
+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
17566
+func_dirname_and_basename ()\
17567
+{\
17568
+\ case ${1} in\
17569
+\ */*) func_dirname_result="${1%/*}${2}" ;;\
17570
+\ * ) func_dirname_result="${3}" ;;\
17571
+\ esac\
17572
+\ func_basename_result="${1##*/}"\
17573
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
17574
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17575
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17576
+test 0 -eq $? || _lt_function_replace_fail=:
17577
+
17578
+
17579
+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
17580
+func_stripname ()\
17581
+{\
17582
+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
17583
+\ # positional parameters, so assign one to ordinary parameter first.\
17584
+\ func_stripname_result=${3}\
17585
+\ func_stripname_result=${func_stripname_result#"${1}"}\
17586
+\ func_stripname_result=${func_stripname_result%"${2}"}\
17587
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
17588
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17589
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17590
+test 0 -eq $? || _lt_function_replace_fail=:
17591
+
17592
+
17593
+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
17594
+func_split_long_opt ()\
17595
+{\
17596
+\ func_split_long_opt_name=${1%%=*}\
17597
+\ func_split_long_opt_arg=${1#*=}\
17598
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
17599
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17600
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17601
+test 0 -eq $? || _lt_function_replace_fail=:
17602
+
17603
+
17604
+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
17605
+func_split_short_opt ()\
17606
+{\
17607
+\ func_split_short_opt_arg=${1#??}\
17608
+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
17609
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
17610
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17611
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17612
+test 0 -eq $? || _lt_function_replace_fail=:
17613
+
17614
+
17615
+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
17616
+func_lo2o ()\
17617
+{\
17618
+\ case ${1} in\
17619
+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
17620
+\ *) func_lo2o_result=${1} ;;\
17621
+\ esac\
17622
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
17623
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17624
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17625
+test 0 -eq $? || _lt_function_replace_fail=:
17626
+
17627
+
17628
+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
17629
+func_xform ()\
17630
+{\
17631
+ func_xform_result=${1%.*}.lo\
17632
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
17633
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17634
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17635
+test 0 -eq $? || _lt_function_replace_fail=:
17636
+
17637
+
17638
+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
17639
+func_arith ()\
17640
+{\
17641
+ func_arith_result=$(( $* ))\
17642
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
17643
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17644
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17645
+test 0 -eq $? || _lt_function_replace_fail=:
17646
+
17647
+
17648
+ sed -e '/^func_len ()$/,/^} # func_len /c\
17649
+func_len ()\
17650
+{\
17651
+ func_len_result=${#1}\
17652
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
17653
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17654
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17655
+test 0 -eq $? || _lt_function_replace_fail=:
17656
+
17657
+fi
17658
+
17659
+if test x"$lt_shell_append" = xyes; then
17660
+ sed -e '/^func_append ()$/,/^} # func_append /c\
17661
+func_append ()\
17662
+{\
17663
+ eval "${1}+=\\${2}"\
17664
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
17665
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17666
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17667
+test 0 -eq $? || _lt_function_replace_fail=:
17668
+
17669
+
17670
+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
17671
+func_append_quoted ()\
17672
+{\
17673
+\ func_quote_for_eval "${2}"\
17674
+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
17675
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
17676
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17677
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17678
+test 0 -eq $? || _lt_function_replace_fail=:
17679
+
17680
+
17681
+ # Save a `func_append' function call where possible by direct use of '+='
17682
+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
17683
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17684
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17685
+ test 0 -eq $? || _lt_function_replace_fail=:
17686
+else
17687
+ # Save a `func_append' function call even when '+=' is not available
17688
+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
17689
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
17690
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
17691
+ test 0 -eq $? || _lt_function_replace_fail=:
17692
+fi
17693
+
17694
+if test x"$_lt_function_replace_fail" = x":"; then
17695
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
17696
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
17697
+fi
17698
17699
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
17700
- || (rm -f "$cfgfile"; exit 1)
17701
17702
- mv -f "$cfgfile" "$ofile" ||
17703
+ mv -f "$cfgfile" "$ofile" ||
17704
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
17705
chmod +x "$ofile"
17706
17707
@@ -16559,15 +16077,12 @@
17708
done # for ac_tag
17709
17710
17711
-{ (exit 0); exit 0; }
17712
+as_fn_exit 0
17713
_ACEOF
17714
-chmod +x $CONFIG_STATUS
17715
ac_clean_files=$ac_clean_files_save
17716
17717
test $ac_write_fail = 0 ||
17718
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
17719
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
17720
- { (exit 1); exit 1; }; }
17721
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
17722
17723
17724
# configure is writing to config.log, and then calls config.status.
17725
@@ -16588,10 +16103,10 @@
17726
exec 5>>config.log
17727
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
17728
# would make configure fail if this is the last instruction.
17729
- $ac_cs_success || { (exit 1); exit 1; }
17730
+ $ac_cs_success || as_fn_exit 1
17731
fi
17732
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
17733
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
17734
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
17735
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
17736
fi
17737
17738
Index: bluez/ltmain.sh
17739
===================================================================
17740
--- bluez.orig/ltmain.sh
17741
+++ bluez/ltmain.sh
17742
@@ -1,9 +1,9 @@
17743
-# Generated from ltmain.m4sh.
17744
17745
-# ltmain.sh (GNU libtool) 2.2.6b
17746
+# libtool (GNU libtool) 2.4
17747
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
17748
17749
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
17750
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
17751
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
17752
# This is free software; see the source for copying conditions. There is NO
17753
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17754
17755
@@ -32,50 +32,56 @@
17756
#
17757
# Provide generalized library-building support services.
17758
#
17759
-# --config show all configuration variables
17760
-# --debug enable verbose shell tracing
17761
-# -n, --dry-run display commands without modifying any files
17762
-# --features display basic configuration information and exit
17763
-# --mode=MODE use operation mode MODE
17764
-# --preserve-dup-deps don't remove duplicate dependency libraries
17765
-# --quiet, --silent don't print informational messages
17766
-# --tag=TAG use configuration variables from tag TAG
17767
-# -v, --verbose print informational messages (default)
17768
-# --version print version information
17769
-# -h, --help print short or long help message
17770
+# --config show all configuration variables
17771
+# --debug enable verbose shell tracing
17772
+# -n, --dry-run display commands without modifying any files
17773
+# --features display basic configuration information and exit
17774
+# --mode=MODE use operation mode MODE
17775
+# --preserve-dup-deps don't remove duplicate dependency libraries
17776
+# --quiet, --silent don't print informational messages
17777
+# --no-quiet, --no-silent
17778
+# print informational messages (default)
17779
+# --tag=TAG use configuration variables from tag TAG
17780
+# -v, --verbose print more informational messages than default
17781
+# --no-verbose don't print the extra informational messages
17782
+# --version print version information
17783
+# -h, --help, --help-all print short, long, or detailed help message
17784
#
17785
# MODE must be one of the following:
17786
#
17787
-# clean remove files from the build directory
17788
-# compile compile a source file into a libtool object
17789
-# execute automatically set library path, then run a program
17790
-# finish complete the installation of libtool libraries
17791
-# install install libraries or executables
17792
-# link create a library or an executable
17793
-# uninstall remove libraries from an installed directory
17794
+# clean remove files from the build directory
17795
+# compile compile a source file into a libtool object
17796
+# execute automatically set library path, then run a program
17797
+# finish complete the installation of libtool libraries
17798
+# install install libraries or executables
17799
+# link create a library or an executable
17800
+# uninstall remove libraries from an installed directory
17801
#
17802
-# MODE-ARGS vary depending on the MODE.
17803
+# MODE-ARGS vary depending on the MODE. When passed as first option,
17804
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
17805
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
17806
#
17807
# When reporting a bug, please describe a test case to reproduce it and
17808
# include the following information:
17809
#
17810
-# host-triplet: $host
17811
-# shell: $SHELL
17812
-# compiler: $LTCC
17813
-# compiler flags: $LTCFLAGS
17814
-# linker: $LD (gnu? $with_gnu_ld)
17815
-# $progname: (GNU libtool) 2.2.6b
17816
-# automake: $automake_version
17817
-# autoconf: $autoconf_version
17818
+# host-triplet: $host
17819
+# shell: $SHELL
17820
+# compiler: $LTCC
17821
+# compiler flags: $LTCFLAGS
17822
+# linker: $LD (gnu? $with_gnu_ld)
17823
+# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1
17824
+# automake: $automake_version
17825
+# autoconf: $autoconf_version
17826
#
17827
# Report bugs to <bug-libtool@gnu.org>.
17828
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
17829
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
17830
17831
-PROGRAM=ltmain.sh
17832
+PROGRAM=libtool
17833
PACKAGE=libtool
17834
-VERSION=2.2.6b
17835
+VERSION="2.4 Debian-2.4-2ubuntu1"
17836
TIMESTAMP=""
17837
-package_revision=1.3017
17838
+package_revision=1.3293
17839
17840
# Be Bourne compatible
17841
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
17842
@@ -91,10 +97,15 @@
17843
BIN_SH=xpg4; export BIN_SH # for Tru64
17844
DUALCASE=1; export DUALCASE # for MKS sh
17845
17846
+# A function that is used when there is no print builtin or printf.
17847
+func_fallback_echo ()
17848
+{
17849
+ eval 'cat <<_LTECHO_EOF
17850
+$1
17851
+_LTECHO_EOF'
17852
+}
17853
+
17854
# NLS nuisances: We save the old values to restore during execute mode.
17855
-# Only set LANG and LC_ALL to C if already set.
17856
-# These must not be set unconditionally because not all systems understand
17857
-# e.g. LANG=C (notably SCO).
17858
lt_user_locale=
17859
lt_safe_locale=
17860
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
17861
@@ -107,15 +118,24 @@
17862
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
17863
fi"
17864
done
17865
+LC_ALL=C
17866
+LANGUAGE=C
17867
+export LANGUAGE LC_ALL
17868
17869
$lt_unset CDPATH
17870
17871
17872
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
17873
+# is ksh but when the shell is invoked as "sh" and the current value of
17874
+# the _XPG environment variable is not equal to 1 (one), the special
17875
+# positional parameter $0, within a function call, is the name of the
17876
+# function.
17877
+progpath="$0"
17878
17879
17880
17881
: ${CP="cp -f"}
17882
-: ${ECHO="echo"}
17883
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
17884
: ${EGREP="/bin/grep -E"}
17885
: ${FGREP="/bin/grep -F"}
17886
: ${GREP="/bin/grep"}
17887
@@ -144,6 +164,27 @@
17888
dirname="s,/[^/]*$,,"
17889
basename="s,^.*/,,"
17890
17891
+# func_dirname file append nondir_replacement
17892
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
17893
+# otherwise set result to NONDIR_REPLACEMENT.
17894
+func_dirname ()
17895
+{
17896
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
17897
+ if test "X$func_dirname_result" = "X${1}"; then
17898
+ func_dirname_result="${3}"
17899
+ else
17900
+ func_dirname_result="$func_dirname_result${2}"
17901
+ fi
17902
+} # func_dirname may be replaced by extended shell implementation
17903
+
17904
+
17905
+# func_basename file
17906
+func_basename ()
17907
+{
17908
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
17909
+} # func_basename may be replaced by extended shell implementation
17910
+
17911
+
17912
# func_dirname_and_basename file append nondir_replacement
17913
# perform func_basename and func_dirname in a single function
17914
# call:
17915
@@ -158,33 +199,183 @@
17916
# those functions but instead duplicate the functionality here.
17917
func_dirname_and_basename ()
17918
{
17919
- # Extract subdirectory from the argument.
17920
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
17921
- if test "X$func_dirname_result" = "X${1}"; then
17922
- func_dirname_result="${3}"
17923
- else
17924
- func_dirname_result="$func_dirname_result${2}"
17925
- fi
17926
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
17927
+ # Extract subdirectory from the argument.
17928
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
17929
+ if test "X$func_dirname_result" = "X${1}"; then
17930
+ func_dirname_result="${3}"
17931
+ else
17932
+ func_dirname_result="$func_dirname_result${2}"
17933
+ fi
17934
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
17935
+} # func_dirname_and_basename may be replaced by extended shell implementation
17936
+
17937
+
17938
+# func_stripname prefix suffix name
17939
+# strip PREFIX and SUFFIX off of NAME.
17940
+# PREFIX and SUFFIX must not contain globbing or regex special
17941
+# characters, hashes, percent signs, but SUFFIX may contain a leading
17942
+# dot (in which case that matches only a dot).
17943
+# func_strip_suffix prefix name
17944
+func_stripname ()
17945
+{
17946
+ case ${2} in
17947
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
17948
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
17949
+ esac
17950
+} # func_stripname may be replaced by extended shell implementation
17951
+
17952
+
17953
+# These SED scripts presuppose an absolute path with a trailing slash.
17954
+pathcar='s,^/\([^/]*\).*$,\1,'
17955
+pathcdr='s,^/[^/]*,,'
17956
+removedotparts=':dotsl
17957
+ s@/\./@/@g
17958
+ t dotsl
17959
+ s,/\.$,/,'
17960
+collapseslashes='s@/\{1,\}@/@g'
17961
+finalslash='s,/*$,/,'
17962
+
17963
+# func_normal_abspath PATH
17964
+# Remove doubled-up and trailing slashes, "." path components,
17965
+# and cancel out any ".." path components in PATH after making
17966
+# it an absolute path.
17967
+# value returned in "$func_normal_abspath_result"
17968
+func_normal_abspath ()
17969
+{
17970
+ # Start from root dir and reassemble the path.
17971
+ func_normal_abspath_result=
17972
+ func_normal_abspath_tpath=$1
17973
+ func_normal_abspath_altnamespace=
17974
+ case $func_normal_abspath_tpath in
17975
+ "")
17976
+ # Empty path, that just means $cwd.
17977
+ func_stripname '' '/' "`pwd`"
17978
+ func_normal_abspath_result=$func_stripname_result
17979
+ return
17980
+ ;;
17981
+ # The next three entries are used to spot a run of precisely
17982
+ # two leading slashes without using negated character classes;
17983
+ # we take advantage of case's first-match behaviour.
17984
+ ///*)
17985
+ # Unusual form of absolute path, do nothing.
17986
+ ;;
17987
+ //*)
17988
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
17989
+ # and for example Cygwin uses it to access remote file shares
17990
+ # over CIFS/SMB, so we conserve a leading double slash if found.
17991
+ func_normal_abspath_altnamespace=/
17992
+ ;;
17993
+ /*)
17994
+ # Absolute path, do nothing.
17995
+ ;;
17996
+ *)
17997
+ # Relative path, prepend $cwd.
17998
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
17999
+ ;;
18000
+ esac
18001
+ # Cancel out all the simple stuff to save iterations. We also want
18002
+ # the path to end with a slash for ease of parsing, so make sure
18003
+ # there is one (and only one) here.
18004
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
18005
+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
18006
+ while :; do
18007
+ # Processed it all yet?
18008
+ if test "$func_normal_abspath_tpath" = / ; then
18009
+ # If we ascended to the root using ".." the result may be empty now.
18010
+ if test -z "$func_normal_abspath_result" ; then
18011
+ func_normal_abspath_result=/
18012
+ fi
18013
+ break
18014
+ fi
18015
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
18016
+ -e "$pathcar"`
18017
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
18018
+ -e "$pathcdr"`
18019
+ # Figure out what to do with it
18020
+ case $func_normal_abspath_tcomponent in
18021
+ "")
18022
+ # Trailing empty path component, ignore it.
18023
+ ;;
18024
+ ..)
18025
+ # Parent dir; strip last assembled component from result.
18026
+ func_dirname "$func_normal_abspath_result"
18027
+ func_normal_abspath_result=$func_dirname_result
18028
+ ;;
18029
+ *)
18030
+ # Actual path component, append it.
18031
+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
18032
+ ;;
18033
+ esac
18034
+ done
18035
+ # Restore leading double-slash if one was found on entry.
18036
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
18037
}
18038
18039
-# Generated shell functions inserted here.
18040
+# func_relative_path SRCDIR DSTDIR
18041
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
18042
+# slash if non-empty, suitable for immediately appending a filename
18043
+# without needing to append a separator.
18044
+# value returned in "$func_relative_path_result"
18045
+func_relative_path ()
18046
+{
18047
+ func_relative_path_result=
18048
+ func_normal_abspath "$1"
18049
+ func_relative_path_tlibdir=$func_normal_abspath_result
18050
+ func_normal_abspath "$2"
18051
+ func_relative_path_tbindir=$func_normal_abspath_result
18052
+
18053
+ # Ascend the tree starting from libdir
18054
+ while :; do
18055
+ # check if we have found a prefix of bindir
18056
+ case $func_relative_path_tbindir in
18057
+ $func_relative_path_tlibdir)
18058
+ # found an exact match
18059
+ func_relative_path_tcancelled=
18060
+ break
18061
+ ;;
18062
+ $func_relative_path_tlibdir*)
18063
+ # found a matching prefix
18064
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
18065
+ func_relative_path_tcancelled=$func_stripname_result
18066
+ if test -z "$func_relative_path_result"; then
18067
+ func_relative_path_result=.
18068
+ fi
18069
+ break
18070
+ ;;
18071
+ *)
18072
+ func_dirname $func_relative_path_tlibdir
18073
+ func_relative_path_tlibdir=${func_dirname_result}
18074
+ if test "x$func_relative_path_tlibdir" = x ; then
18075
+ # Have to descend all the way to the root!
18076
+ func_relative_path_result=../$func_relative_path_result
18077
+ func_relative_path_tcancelled=$func_relative_path_tbindir
18078
+ break
18079
+ fi
18080
+ func_relative_path_result=../$func_relative_path_result
18081
+ ;;
18082
+ esac
18083
+ done
18084
18085
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
18086
-# is ksh but when the shell is invoked as "sh" and the current value of
18087
-# the _XPG environment variable is not equal to 1 (one), the special
18088
-# positional parameter $0, within a function call, is the name of the
18089
-# function.
18090
-progpath="$0"
18091
+ # Now calculate path; take care to avoid doubling-up slashes.
18092
+ func_stripname '' '/' "$func_relative_path_result"
18093
+ func_relative_path_result=$func_stripname_result
18094
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
18095
+ if test "x$func_stripname_result" != x ; then
18096
+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
18097
+ fi
18098
+
18099
+ # Normalisation. If bindir is libdir, return empty string,
18100
+ # else relative path ending with a slash; either way, target
18101
+ # file name can be directly appended.
18102
+ if test ! -z "$func_relative_path_result"; then
18103
+ func_stripname './' '' "$func_relative_path_result/"
18104
+ func_relative_path_result=$func_stripname_result
18105
+ fi
18106
+}
18107
18108
# The name of this program:
18109
-# In the unlikely event $progname began with a '-', it would play havoc with
18110
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
18111
func_dirname_and_basename "$progpath"
18112
progname=$func_basename_result
18113
-case $progname in
18114
- -*) progname=./$progname ;;
18115
-esac
18116
18117
# Make sure we have an absolute path for reexecution:
18118
case $progpath in
18119
@@ -215,6 +406,15 @@
18120
# Same as above, but do not quote variable references.
18121
double_quote_subst='s/\(["`\\]\)/\\\1/g'
18122
18123
+# Sed substitution that turns a string into a regex matching for the
18124
+# string literally.
18125
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
18126
+
18127
+# Sed substitution that converts a w32 file name or path
18128
+# which contains forward slashes, into one that contains
18129
+# (escaped) backslashes. A very naive implementation.
18130
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
18131
+
18132
# Re-`\' parameter expansions in output of double_quote_subst that were
18133
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
18134
# in input to double_quote_subst, that '$' was protected from expansion.
18135
@@ -243,7 +443,7 @@
18136
# name if it has been set yet.
18137
func_echo ()
18138
{
18139
- $ECHO "$progname${mode+: }$mode: $*"
18140
+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
18141
}
18142
18143
# func_verbose arg...
18144
@@ -258,18 +458,25 @@
18145
:
18146
}
18147
18148
+# func_echo_all arg...
18149
+# Invoke $ECHO with all args, space-separated.
18150
+func_echo_all ()
18151
+{
18152
+ $ECHO "$*"
18153
+}
18154
+
18155
# func_error arg...
18156
# Echo program name prefixed message to standard error.
18157
func_error ()
18158
{
18159
- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
18160
+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
18161
}
18162
18163
# func_warning arg...
18164
# Echo program name prefixed warning message to standard error.
18165
func_warning ()
18166
{
18167
- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
18168
+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
18169
18170
# bash bug again:
18171
:
18172
@@ -326,9 +533,9 @@
18173
case $my_directory_path in */*) ;; *) break ;; esac
18174
18175
# ...otherwise throw away the child directory and loop
18176
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
18177
+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
18178
done
18179
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
18180
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
18181
18182
save_mkdir_p_IFS="$IFS"; IFS=':'
18183
for my_dir in $my_dir_list; do
18184
@@ -378,7 +585,7 @@
18185
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
18186
fi
18187
18188
- $ECHO "X$my_tmpdir" | $Xsed
18189
+ $ECHO "$my_tmpdir"
18190
}
18191
18192
18193
@@ -392,7 +599,7 @@
18194
{
18195
case $1 in
18196
*[\\\`\"\$]*)
18197
- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
18198
+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
18199
*)
18200
func_quote_for_eval_unquoted_result="$1" ;;
18201
esac
18202
@@ -419,7 +626,7 @@
18203
{
18204
case $1 in
18205
*[\\\`\"]*)
18206
- my_arg=`$ECHO "X$1" | $Xsed \
18207
+ my_arg=`$ECHO "$1" | $SED \
18208
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
18209
*)
18210
my_arg="$1" ;;
18211
@@ -488,15 +695,39 @@
18212
fi
18213
}
18214
18215
-
18216
-
18217
+# func_tr_sh
18218
+# Turn $1 into a string suitable for a shell variable name.
18219
+# Result is stored in $func_tr_sh_result. All characters
18220
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
18221
+# if $1 begins with a digit, a '_' is prepended as well.
18222
+func_tr_sh ()
18223
+{
18224
+ case $1 in
18225
+ [0-9]* | *[!a-zA-Z0-9_]*)
18226
+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
18227
+ ;;
18228
+ * )
18229
+ func_tr_sh_result=$1
18230
+ ;;
18231
+ esac
18232
+}
18233
18234
18235
# func_version
18236
# Echo version message to standard output and exit.
18237
func_version ()
18238
{
18239
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
18240
+ $opt_debug
18241
+
18242
+ $SED -n '/(C)/!b go
18243
+ :more
18244
+ /\./!{
18245
+ N
18246
+ s/\n# / /
18247
+ b more
18248
+ }
18249
+ :go
18250
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
18251
s/^# //
18252
s/^# *$//
18253
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
18254
@@ -509,22 +740,28 @@
18255
# Echo short help message to standard output and exit.
18256
func_usage ()
18257
{
18258
- $SED -n '/^# Usage:/,/# -h/ {
18259
+ $opt_debug
18260
+
18261
+ $SED -n '/^# Usage:/,/^# *.*--help/ {
18262
s/^# //
18263
s/^# *$//
18264
s/\$progname/'$progname'/
18265
p
18266
}' < "$progpath"
18267
- $ECHO
18268
+ echo
18269
$ECHO "run \`$progname --help | more' for full usage"
18270
exit $?
18271
}
18272
18273
-# func_help
18274
-# Echo long help message to standard output and exit.
18275
+# func_help [NOEXIT]
18276
+# Echo long help message to standard output and exit,
18277
+# unless 'noexit' is passed as argument.
18278
func_help ()
18279
{
18280
+ $opt_debug
18281
+
18282
$SED -n '/^# Usage:/,/# Report bugs to/ {
18283
+ :print
18284
s/^# //
18285
s/^# *$//
18286
s*\$progname*'$progname'*
18287
@@ -537,8 +774,15 @@
18288
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
18289
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
18290
p
18291
- }' < "$progpath"
18292
- exit $?
18293
+ d
18294
+ }
18295
+ /^# .* home page:/b print
18296
+ /^# General help using/b print
18297
+ ' < "$progpath"
18298
+ ret=$?
18299
+ if test -z "$1"; then
18300
+ exit $ret
18301
+ fi
18302
}
18303
18304
# func_missing_arg argname
18305
@@ -546,63 +790,106 @@
18306
# exit_cmd.
18307
func_missing_arg ()
18308
{
18309
- func_error "missing argument for $1"
18310
+ $opt_debug
18311
+
18312
+ func_error "missing argument for $1."
18313
exit_cmd=exit
18314
}
18315
18316
-exit_cmd=:
18317
18318
+# func_split_short_opt shortopt
18319
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
18320
+# variables after splitting SHORTOPT after the 2nd character.
18321
+func_split_short_opt ()
18322
+{
18323
+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
18324
+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
18325
+
18326
+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
18327
+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
18328
+} # func_split_short_opt may be replaced by extended shell implementation
18329
+
18330
+
18331
+# func_split_long_opt longopt
18332
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
18333
+# variables after splitting LONGOPT at the `=' sign.
18334
+func_split_long_opt ()
18335
+{
18336
+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
18337
+ my_sed_long_arg='1s/^--[^=]*=//'
18338
+
18339
+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
18340
+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
18341
+} # func_split_long_opt may be replaced by extended shell implementation
18342
18343
+exit_cmd=:
18344
18345
18346
18347
-# Check that we have a working $ECHO.
18348
-if test "X$1" = X--no-reexec; then
18349
- # Discard the --no-reexec flag, and continue.
18350
- shift
18351
-elif test "X$1" = X--fallback-echo; then
18352
- # Avoid inline document here, it may be left over
18353
- :
18354
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
18355
- # Yippee, $ECHO works!
18356
- :
18357
-else
18358
- # Restart under the correct shell, and then maybe $ECHO will work.
18359
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
18360
-fi
18361
18362
-if test "X$1" = X--fallback-echo; then
18363
- # used as fallback echo
18364
- shift
18365
- cat <<EOF
18366
-$*
18367
-EOF
18368
- exit $EXIT_SUCCESS
18369
-fi
18370
18371
magic="%%%MAGIC variable%%%"
18372
magic_exe="%%%MAGIC EXE variable%%%"
18373
18374
# Global variables.
18375
-# $mode is unset
18376
nonopt=
18377
-execute_dlfiles=
18378
preserve_args=
18379
lo2o="s/\\.lo\$/.${objext}/"
18380
o2lo="s/\\.${objext}\$/.lo/"
18381
extracted_archives=
18382
extracted_serial=0
18383
18384
-opt_dry_run=false
18385
-opt_duplicate_deps=false
18386
-opt_silent=false
18387
-opt_debug=:
18388
-
18389
# If this variable is set in any of the actions, the command in it
18390
# will be execed at the end. This prevents here-documents from being
18391
# left over by shells.
18392
exec_cmd=
18393
18394
+# func_append var value
18395
+# Append VALUE to the end of shell variable VAR.
18396
+func_append ()
18397
+{
18398
+ eval "${1}=\$${1}\${2}"
18399
+} # func_append may be replaced by extended shell implementation
18400
+
18401
+# func_append_quoted var value
18402
+# Quote VALUE and append to the end of shell variable VAR, separated
18403
+# by a space.
18404
+func_append_quoted ()
18405
+{
18406
+ func_quote_for_eval "${2}"
18407
+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
18408
+} # func_append_quoted may be replaced by extended shell implementation
18409
+
18410
+
18411
+# func_arith arithmetic-term...
18412
+func_arith ()
18413
+{
18414
+ func_arith_result=`expr "${@}"`
18415
+} # func_arith may be replaced by extended shell implementation
18416
+
18417
+
18418
+# func_len string
18419
+# STRING may not start with a hyphen.
18420
+func_len ()
18421
+{
18422
+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
18423
+} # func_len may be replaced by extended shell implementation
18424
+
18425
+
18426
+# func_lo2o object
18427
+func_lo2o ()
18428
+{
18429
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
18430
+} # func_lo2o may be replaced by extended shell implementation
18431
+
18432
+
18433
+# func_xform libobj-or-source
18434
+func_xform ()
18435
+{
18436
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
18437
+} # func_xform may be replaced by extended shell implementation
18438
+
18439
+
18440
# func_fatal_configuration arg...
18441
# Echo program name prefixed message to standard error, followed by
18442
# a configuration failure hint, and exit.
18443
@@ -636,16 +923,16 @@
18444
# Display the features supported by this script.
18445
func_features ()
18446
{
18447
- $ECHO "host: $host"
18448
+ echo "host: $host"
18449
if test "$build_libtool_libs" = yes; then
18450
- $ECHO "enable shared libraries"
18451
+ echo "enable shared libraries"
18452
else
18453
- $ECHO "disable shared libraries"
18454
+ echo "disable shared libraries"
18455
fi
18456
if test "$build_old_libs" = yes; then
18457
- $ECHO "enable static libraries"
18458
+ echo "enable static libraries"
18459
else
18460
- $ECHO "disable static libraries"
18461
+ echo "disable static libraries"
18462
fi
18463
18464
exit $?
18465
@@ -692,117 +979,204 @@
18466
esac
18467
}
18468
18469
-# Parse options once, thoroughly. This comes as soon as possible in
18470
-# the script to make things like `libtool --version' happen quickly.
18471
+# func_check_version_match
18472
+# Ensure that we are using m4 macros, and libtool script from the same
18473
+# release of libtool.
18474
+func_check_version_match ()
18475
{
18476
+ if test "$package_revision" != "$macro_revision"; then
18477
+ if test "$VERSION" != "$macro_version"; then
18478
+ if test -z "$macro_version"; then
18479
+ cat >&2 <<_LT_EOF
18480
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
18481
+$progname: definition of this LT_INIT comes from an older release.
18482
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
18483
+$progname: and run autoconf again.
18484
+_LT_EOF
18485
+ else
18486
+ cat >&2 <<_LT_EOF
18487
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
18488
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
18489
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
18490
+$progname: and run autoconf again.
18491
+_LT_EOF
18492
+ fi
18493
+ else
18494
+ cat >&2 <<_LT_EOF
18495
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
18496
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
18497
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
18498
+$progname: of $PACKAGE $VERSION and run autoconf again.
18499
+_LT_EOF
18500
+ fi
18501
18502
- # Shorthand for --mode=foo, only valid as the first argument
18503
- case $1 in
18504
- clean|clea|cle|cl)
18505
- shift; set dummy --mode clean ${1+"$@"}; shift
18506
- ;;
18507
- compile|compil|compi|comp|com|co|c)
18508
- shift; set dummy --mode compile ${1+"$@"}; shift
18509
- ;;
18510
- execute|execut|execu|exec|exe|ex|e)
18511
- shift; set dummy --mode execute ${1+"$@"}; shift
18512
- ;;
18513
- finish|finis|fini|fin|fi|f)
18514
- shift; set dummy --mode finish ${1+"$@"}; shift
18515
- ;;
18516
- install|instal|insta|inst|ins|in|i)
18517
- shift; set dummy --mode install ${1+"$@"}; shift
18518
- ;;
18519
- link|lin|li|l)
18520
- shift; set dummy --mode link ${1+"$@"}; shift
18521
- ;;
18522
- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
18523
- shift; set dummy --mode uninstall ${1+"$@"}; shift
18524
- ;;
18525
- esac
18526
+ exit $EXIT_MISMATCH
18527
+ fi
18528
+}
18529
18530
- # Parse non-mode specific arguments:
18531
- while test "$#" -gt 0; do
18532
+
18533
+# Shorthand for --mode=foo, only valid as the first argument
18534
+case $1 in
18535
+clean|clea|cle|cl)
18536
+ shift; set dummy --mode clean ${1+"$@"}; shift
18537
+ ;;
18538
+compile|compil|compi|comp|com|co|c)
18539
+ shift; set dummy --mode compile ${1+"$@"}; shift
18540
+ ;;
18541
+execute|execut|execu|exec|exe|ex|e)
18542
+ shift; set dummy --mode execute ${1+"$@"}; shift
18543
+ ;;
18544
+finish|finis|fini|fin|fi|f)
18545
+ shift; set dummy --mode finish ${1+"$@"}; shift
18546
+ ;;
18547
+install|instal|insta|inst|ins|in|i)
18548
+ shift; set dummy --mode install ${1+"$@"}; shift
18549
+ ;;
18550
+link|lin|li|l)
18551
+ shift; set dummy --mode link ${1+"$@"}; shift
18552
+ ;;
18553
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
18554
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
18555
+ ;;
18556
+esac
18557
+
18558
+
18559
+
18560
+# Option defaults:
18561
+opt_debug=:
18562
+opt_dry_run=false
18563
+opt_config=false
18564
+opt_preserve_dup_deps=false
18565
+opt_features=false
18566
+opt_finish=false
18567
+opt_help=false
18568
+opt_help_all=false
18569
+opt_silent=:
18570
+opt_verbose=:
18571
+opt_silent=false
18572
+opt_verbose=false
18573
+
18574
+
18575
+# Parse options once, thoroughly. This comes as soon as possible in the
18576
+# script to make things like `--version' happen as quickly as we can.
18577
+{
18578
+ # this just eases exit handling
18579
+ while test $# -gt 0; do
18580
opt="$1"
18581
shift
18582
-
18583
case $opt in
18584
- --config) func_config ;;
18585
-
18586
- --debug) preserve_args="$preserve_args $opt"
18587
+ --debug|-x) opt_debug='set -x'
18588
func_echo "enabling shell trace mode"
18589
- opt_debug='set -x'
18590
$opt_debug
18591
;;
18592
-
18593
- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
18594
- execute_dlfiles="$execute_dlfiles $1"
18595
- shift
18596
+ --dry-run|--dryrun|-n)
18597
+ opt_dry_run=:
18598
;;
18599
-
18600
- --dry-run | -n) opt_dry_run=: ;;
18601
- --features) func_features ;;
18602
- --finish) mode="finish" ;;
18603
-
18604
- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
18605
- case $1 in
18606
- # Valid mode arguments:
18607
- clean) ;;
18608
- compile) ;;
18609
- execute) ;;
18610
- finish) ;;
18611
- install) ;;
18612
- link) ;;
18613
- relink) ;;
18614
- uninstall) ;;
18615
-
18616
- # Catch anything else as an error
18617
- *) func_error "invalid argument for $opt"
18618
- exit_cmd=exit
18619
- break
18620
- ;;
18621
- esac
18622
-
18623
- mode="$1"
18624
+ --config)
18625
+ opt_config=:
18626
+func_config
18627
+ ;;
18628
+ --dlopen|-dlopen)
18629
+ optarg="$1"
18630
+ opt_dlopen="${opt_dlopen+$opt_dlopen
18631
+}$optarg"
18632
shift
18633
;;
18634
-
18635
--preserve-dup-deps)
18636
- opt_duplicate_deps=: ;;
18637
-
18638
- --quiet|--silent) preserve_args="$preserve_args $opt"
18639
- opt_silent=:
18640
+ opt_preserve_dup_deps=:
18641
;;
18642
-
18643
- --verbose| -v) preserve_args="$preserve_args $opt"
18644
+ --features)
18645
+ opt_features=:
18646
+func_features
18647
+ ;;
18648
+ --finish)
18649
+ opt_finish=:
18650
+set dummy --mode finish ${1+"$@"}; shift
18651
+ ;;
18652
+ --help)
18653
+ opt_help=:
18654
+ ;;
18655
+ --help-all)
18656
+ opt_help_all=:
18657
+opt_help=': help-all'
18658
+ ;;
18659
+ --mode)
18660
+ test $# = 0 && func_missing_arg $opt && break
18661
+ optarg="$1"
18662
+ opt_mode="$optarg"
18663
+case $optarg in
18664
+ # Valid mode arguments:
18665
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
18666
+
18667
+ # Catch anything else as an error
18668
+ *) func_error "invalid argument for $opt"
18669
+ exit_cmd=exit
18670
+ break
18671
+ ;;
18672
+esac
18673
+ shift
18674
+ ;;
18675
+ --no-silent|--no-quiet)
18676
opt_silent=false
18677
+func_append preserve_args " $opt"
18678
;;
18679
-
18680
- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
18681
- preserve_args="$preserve_args $opt $1"
18682
- func_enable_tag "$1" # tagname is set here
18683
+ --no-verbose)
18684
+ opt_verbose=false
18685
+func_append preserve_args " $opt"
18686
+ ;;
18687
+ --silent|--quiet)
18688
+ opt_silent=:
18689
+func_append preserve_args " $opt"
18690
+ opt_verbose=false
18691
+ ;;
18692
+ --verbose|-v)
18693
+ opt_verbose=:
18694
+func_append preserve_args " $opt"
18695
+opt_silent=false
18696
+ ;;
18697
+ --tag)
18698
+ test $# = 0 && func_missing_arg $opt && break
18699
+ optarg="$1"
18700
+ opt_tag="$optarg"
18701
+func_append preserve_args " $opt $optarg"
18702
+func_enable_tag "$optarg"
18703
shift
18704
;;
18705
18706
+ -\?|-h) func_usage ;;
18707
+ --help) func_help ;;
18708
+ --version) func_version ;;
18709
+
18710
# Separate optargs to long options:
18711
- -dlopen=*|--mode=*|--tag=*)
18712
- func_opt_split "$opt"
18713
- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
18714
+ --*=*)
18715
+ func_split_long_opt "$opt"
18716
+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
18717
shift
18718
;;
18719
18720
- -\?|-h) func_usage ;;
18721
- --help) opt_help=: ;;
18722
- --version) func_version ;;
18723
-
18724
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
18725
-
18726
- *) nonopt="$opt"
18727
- break
18728
+ # Separate non-argument short options:
18729
+ -\?*|-h*|-n*|-v*)
18730
+ func_split_short_opt "$opt"
18731
+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
18732
+ shift
18733
;;
18734
+
18735
+ --) break ;;
18736
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
18737
+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
18738
esac
18739
done
18740
18741
+ # Validate options:
18742
+
18743
+ # save first non-option argument
18744
+ if test "$#" -gt 0; then
18745
+ nonopt="$opt"
18746
+ shift
18747
+ fi
18748
+
18749
+ # preserve --debug
18750
+ test "$opt_debug" = : || func_append preserve_args " --debug"
18751
18752
case $host in
18753
*cygwin* | *mingw* | *pw32* | *cegcc*)
18754
@@ -810,82 +1184,44 @@
18755
opt_duplicate_compiler_generated_deps=:
18756
;;
18757
*)
18758
- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
18759
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
18760
;;
18761
esac
18762
18763
- # Having warned about all mis-specified options, bail out if
18764
- # anything was wrong.
18765
- $exit_cmd $EXIT_FAILURE
18766
-}
18767
+ $opt_help || {
18768
+ # Sanity checks first:
18769
+ func_check_version_match
18770
18771
-# func_check_version_match
18772
-# Ensure that we are using m4 macros, and libtool script from the same
18773
-# release of libtool.
18774
-func_check_version_match ()
18775
-{
18776
- if test "$package_revision" != "$macro_revision"; then
18777
- if test "$VERSION" != "$macro_version"; then
18778
- if test -z "$macro_version"; then
18779
- cat >&2 <<_LT_EOF
18780
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
18781
-$progname: definition of this LT_INIT comes from an older release.
18782
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
18783
-$progname: and run autoconf again.
18784
-_LT_EOF
18785
- else
18786
- cat >&2 <<_LT_EOF
18787
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
18788
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
18789
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
18790
-$progname: and run autoconf again.
18791
-_LT_EOF
18792
- fi
18793
- else
18794
- cat >&2 <<_LT_EOF
18795
-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
18796
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
18797
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
18798
-$progname: of $PACKAGE $VERSION and run autoconf again.
18799
-_LT_EOF
18800
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
18801
+ func_fatal_configuration "not configured to build any kind of library"
18802
fi
18803
18804
- exit $EXIT_MISMATCH
18805
- fi
18806
-}
18807
-
18808
-
18809
-## ----------- ##
18810
-## Main. ##
18811
-## ----------- ##
18812
+ # Darwin sucks
18813
+ eval std_shrext=\"$shrext_cmds\"
18814
18815
-$opt_help || {
18816
- # Sanity checks first:
18817
- func_check_version_match
18818
+ # Only execute mode is allowed to have -dlopen flags.
18819
+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
18820
+ func_error "unrecognized option \`-dlopen'"
18821
+ $ECHO "$help" 1>&2
18822
+ exit $EXIT_FAILURE
18823
+ fi
18824
18825
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
18826
- func_fatal_configuration "not configured to build any kind of library"
18827
- fi
18828
+ # Change the help message to a mode-specific one.
18829
+ generic_help="$help"
18830
+ help="Try \`$progname --help --mode=$opt_mode' for more information."
18831
+ }
18832
18833
- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
18834
18835
+ # Bail if the options were screwed
18836
+ $exit_cmd $EXIT_FAILURE
18837
+}
18838
18839
- # Darwin sucks
18840
- eval std_shrext=\"$shrext_cmds\"
18841
18842
18843
- # Only execute mode is allowed to have -dlopen flags.
18844
- if test -n "$execute_dlfiles" && test "$mode" != execute; then
18845
- func_error "unrecognized option \`-dlopen'"
18846
- $ECHO "$help" 1>&2
18847
- exit $EXIT_FAILURE
18848
- fi
18849
-
18850
- # Change the help message to a mode-specific one.
18851
- generic_help="$help"
18852
- help="Try \`$progname --help --mode=$mode' for more information."
18853
-}
18854
18855
+## ----------- ##
18856
+## Main. ##
18857
+## ----------- ##
18858
18859
# func_lalib_p file
18860
# True iff FILE is a libtool `.la' library or `.lo' object file.
18861
@@ -950,12 +1286,9 @@
18862
# temporary ltwrapper_script.
18863
func_ltwrapper_scriptname ()
18864
{
18865
- func_ltwrapper_scriptname_result=""
18866
- if func_ltwrapper_executable_p "$1"; then
18867
- func_dirname_and_basename "$1" "" "."
18868
- func_stripname '' '.exe' "$func_basename_result"
18869
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
18870
- fi
18871
+ func_dirname_and_basename "$1" "" "."
18872
+ func_stripname '' '.exe' "$func_basename_result"
18873
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
18874
}
18875
18876
# func_ltwrapper_p file
18877
@@ -1001,6 +1334,37 @@
18878
}
18879
18880
18881
+# func_resolve_sysroot PATH
18882
+# Replace a leading = in PATH with a sysroot. Store the result into
18883
+# func_resolve_sysroot_result
18884
+func_resolve_sysroot ()
18885
+{
18886
+ func_resolve_sysroot_result=$1
18887
+ case $func_resolve_sysroot_result in
18888
+ =*)
18889
+ func_stripname '=' '' "$func_resolve_sysroot_result"
18890
+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
18891
+ ;;
18892
+ esac
18893
+}
18894
+
18895
+# func_replace_sysroot PATH
18896
+# If PATH begins with the sysroot, replace it with = and
18897
+# store the result into func_replace_sysroot_result.
18898
+func_replace_sysroot ()
18899
+{
18900
+ case "$lt_sysroot:$1" in
18901
+ ?*:"$lt_sysroot"*)
18902
+ func_stripname "$lt_sysroot" '' "$1"
18903
+ func_replace_sysroot_result="=$func_stripname_result"
18904
+ ;;
18905
+ *)
18906
+ # Including no sysroot.
18907
+ func_replace_sysroot_result=$1
18908
+ ;;
18909
+ esac
18910
+}
18911
+
18912
# func_infer_tag arg
18913
# Infer tagged configuration to use if any are available and
18914
# if one wasn't chosen via the "--tag" command line option.
18915
@@ -1013,13 +1377,15 @@
18916
if test -n "$available_tags" && test -z "$tagname"; then
18917
CC_quoted=
18918
for arg in $CC; do
18919
- func_quote_for_eval "$arg"
18920
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
18921
+ func_append_quoted CC_quoted "$arg"
18922
done
18923
+ CC_expanded=`func_echo_all $CC`
18924
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
18925
case $@ in
18926
# Blanks in the command may have been stripped by the calling shell,
18927
# but not from the CC environment variable when configure was run.
18928
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
18929
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
18930
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
18931
# Blanks at the start of $base_compile will cause this to fail
18932
# if we don't check for them as well.
18933
*)
18934
@@ -1030,11 +1396,13 @@
18935
CC_quoted=
18936
for arg in $CC; do
18937
# Double-quote args containing other shell metacharacters.
18938
- func_quote_for_eval "$arg"
18939
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
18940
+ func_append_quoted CC_quoted "$arg"
18941
done
18942
+ CC_expanded=`func_echo_all $CC`
18943
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
18944
case "$@ " in
18945
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
18946
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
18947
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
18948
# The compiler in the base compile command matches
18949
# the one in the tagged configuration.
18950
# Assume this is the tagged configuration we want.
18951
@@ -1097,6 +1465,486 @@
18952
}
18953
}
18954
18955
+
18956
+##################################################
18957
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
18958
+##################################################
18959
+
18960
+# func_convert_core_file_wine_to_w32 ARG
18961
+# Helper function used by file name conversion functions when $build is *nix,
18962
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
18963
+# correctly configured wine environment available, with the winepath program
18964
+# in $build's $PATH.
18965
+#
18966
+# ARG is the $build file name to be converted to w32 format.
18967
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
18968
+# be empty on error (or when ARG is empty)
18969
+func_convert_core_file_wine_to_w32 ()
18970
+{
18971
+ $opt_debug
18972
+ func_convert_core_file_wine_to_w32_result="$1"
18973
+ if test -n "$1"; then
18974
+ # Unfortunately, winepath does not exit with a non-zero error code, so we
18975
+ # are forced to check the contents of stdout. On the other hand, if the
18976
+ # command is not found, the shell will set an exit code of 127 and print
18977
+ # *an error message* to stdout. So we must check for both error code of
18978
+ # zero AND non-empty stdout, which explains the odd construction:
18979
+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
18980
+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
18981
+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
18982
+ $SED -e "$lt_sed_naive_backslashify"`
18983
+ else
18984
+ func_convert_core_file_wine_to_w32_result=
18985
+ fi
18986
+ fi
18987
+}
18988
+# end: func_convert_core_file_wine_to_w32
18989
+
18990
+
18991
+# func_convert_core_path_wine_to_w32 ARG
18992
+# Helper function used by path conversion functions when $build is *nix, and
18993
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
18994
+# configured wine environment available, with the winepath program in $build's
18995
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
18996
+#
18997
+# ARG is path to be converted from $build format to win32.
18998
+# Result is available in $func_convert_core_path_wine_to_w32_result.
18999
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
19000
+# are convertible, then the result may be empty.
19001
+func_convert_core_path_wine_to_w32 ()
19002
+{
19003
+ $opt_debug
19004
+ # unfortunately, winepath doesn't convert paths, only file names
19005
+ func_convert_core_path_wine_to_w32_result=""
19006
+ if test -n "$1"; then
19007
+ oldIFS=$IFS
19008
+ IFS=:
19009
+ for func_convert_core_path_wine_to_w32_f in $1; do
19010
+ IFS=$oldIFS
19011
+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
19012
+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
19013
+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
19014
+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
19015
+ else
19016
+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
19017
+ fi
19018
+ fi
19019
+ done
19020
+ IFS=$oldIFS
19021
+ fi
19022
+}
19023
+# end: func_convert_core_path_wine_to_w32
19024
+
19025
+
19026
+# func_cygpath ARGS...
19027
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
19028
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
19029
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
19030
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
19031
+# file name or path is assumed to be in w32 format, as previously converted
19032
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
19033
+# or path in func_cygpath_result (input file name or path is assumed to be in
19034
+# Cygwin format). Returns an empty string on error.
19035
+#
19036
+# ARGS are passed to cygpath, with the last one being the file name or path to
19037
+# be converted.
19038
+#
19039
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
19040
+# environment variable; do not put it in $PATH.
19041
+func_cygpath ()
19042
+{
19043
+ $opt_debug
19044
+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
19045
+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
19046
+ if test "$?" -ne 0; then
19047
+ # on failure, ensure result is empty
19048
+ func_cygpath_result=
19049
+ fi
19050
+ else
19051
+ func_cygpath_result=
19052
+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
19053
+ fi
19054
+}
19055
+#end: func_cygpath
19056
+
19057
+
19058
+# func_convert_core_msys_to_w32 ARG
19059
+# Convert file name or path ARG from MSYS format to w32 format. Return
19060
+# result in func_convert_core_msys_to_w32_result.
19061
+func_convert_core_msys_to_w32 ()
19062
+{
19063
+ $opt_debug
19064
+ # awkward: cmd appends spaces to result
19065
+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
19066
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
19067
+}
19068
+#end: func_convert_core_msys_to_w32
19069
+
19070
+
19071
+# func_convert_file_check ARG1 ARG2
19072
+# Verify that ARG1 (a file name in $build format) was converted to $host
19073
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
19074
+# func_to_host_file_result to ARG1).
19075
+func_convert_file_check ()
19076
+{
19077
+ $opt_debug
19078
+ if test -z "$2" && test -n "$1" ; then
19079
+ func_error "Could not determine host file name corresponding to"
19080
+ func_error " \`$1'"
19081
+ func_error "Continuing, but uninstalled executables may not work."
19082
+ # Fallback:
19083
+ func_to_host_file_result="$1"
19084
+ fi
19085
+}
19086
+# end func_convert_file_check
19087
+
19088
+
19089
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
19090
+# Verify that FROM_PATH (a path in $build format) was converted to $host
19091
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
19092
+# func_to_host_file_result to a simplistic fallback value (see below).
19093
+func_convert_path_check ()
19094
+{
19095
+ $opt_debug
19096
+ if test -z "$4" && test -n "$3"; then
19097
+ func_error "Could not determine the host path corresponding to"
19098
+ func_error " \`$3'"
19099
+ func_error "Continuing, but uninstalled executables may not work."
19100
+ # Fallback. This is a deliberately simplistic "conversion" and
19101
+ # should not be "improved". See libtool.info.
19102
+ if test "x$1" != "x$2"; then
19103
+ lt_replace_pathsep_chars="s|$1|$2|g"
19104
+ func_to_host_path_result=`echo "$3" |
19105
+ $SED -e "$lt_replace_pathsep_chars"`
19106
+ else
19107
+ func_to_host_path_result="$3"
19108
+ fi
19109
+ fi
19110
+}
19111
+# end func_convert_path_check
19112
+
19113
+
19114
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
19115
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
19116
+# and appending REPL if ORIG matches BACKPAT.
19117
+func_convert_path_front_back_pathsep ()
19118
+{
19119
+ $opt_debug
19120
+ case $4 in
19121
+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
19122
+ ;;
19123
+ esac
19124
+ case $4 in
19125
+ $2 ) func_append func_to_host_path_result "$3"
19126
+ ;;
19127
+ esac
19128
+}
19129
+# end func_convert_path_front_back_pathsep
19130
+
19131
+
19132
+##################################################
19133
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
19134
+##################################################
19135
+# invoked via `$to_host_file_cmd ARG'
19136
+#
19137
+# In each case, ARG is the path to be converted from $build to $host format.
19138
+# Result will be available in $func_to_host_file_result.
19139
+
19140
+
19141
+# func_to_host_file ARG
19142
+# Converts the file name ARG from $build format to $host format. Return result
19143
+# in func_to_host_file_result.
19144
+func_to_host_file ()
19145
+{
19146
+ $opt_debug
19147
+ $to_host_file_cmd "$1"
19148
+}
19149
+# end func_to_host_file
19150
+
19151
+
19152
+# func_to_tool_file ARG LAZY
19153
+# converts the file name ARG from $build format to toolchain format. Return
19154
+# result in func_to_tool_file_result. If the conversion in use is listed
19155
+# in (the comma separated) LAZY, no conversion takes place.
19156
+func_to_tool_file ()
19157
+{
19158
+ $opt_debug
19159
+ case ,$2, in
19160
+ *,"$to_tool_file_cmd",*)
19161
+ func_to_tool_file_result=$1
19162
+ ;;
19163
+ *)
19164
+ $to_tool_file_cmd "$1"
19165
+ func_to_tool_file_result=$func_to_host_file_result
19166
+ ;;
19167
+ esac
19168
+}
19169
+# end func_to_tool_file
19170
+
19171
+
19172
+# func_convert_file_noop ARG
19173
+# Copy ARG to func_to_host_file_result.
19174
+func_convert_file_noop ()
19175
+{
19176
+ func_to_host_file_result="$1"
19177
+}
19178
+# end func_convert_file_noop
19179
+
19180
+
19181
+# func_convert_file_msys_to_w32 ARG
19182
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
19183
+# conversion to w32 is not available inside the cwrapper. Returns result in
19184
+# func_to_host_file_result.
19185
+func_convert_file_msys_to_w32 ()
19186
+{
19187
+ $opt_debug
19188
+ func_to_host_file_result="$1"
19189
+ if test -n "$1"; then
19190
+ func_convert_core_msys_to_w32 "$1"
19191
+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
19192
+ fi
19193
+ func_convert_file_check "$1" "$func_to_host_file_result"
19194
+}
19195
+# end func_convert_file_msys_to_w32
19196
+
19197
+
19198
+# func_convert_file_cygwin_to_w32 ARG
19199
+# Convert file name ARG from Cygwin to w32 format. Returns result in
19200
+# func_to_host_file_result.
19201
+func_convert_file_cygwin_to_w32 ()
19202
+{
19203
+ $opt_debug
19204
+ func_to_host_file_result="$1"
19205
+ if test -n "$1"; then
19206
+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
19207
+ # LT_CYGPATH in this case.
19208
+ func_to_host_file_result=`cygpath -m "$1"`
19209
+ fi
19210
+ func_convert_file_check "$1" "$func_to_host_file_result"
19211
+}
19212
+# end func_convert_file_cygwin_to_w32
19213
+
19214
+
19215
+# func_convert_file_nix_to_w32 ARG
19216
+# Convert file name ARG from *nix to w32 format. Requires a wine environment
19217
+# and a working winepath. Returns result in func_to_host_file_result.
19218
+func_convert_file_nix_to_w32 ()
19219
+{
19220
+ $opt_debug
19221
+ func_to_host_file_result="$1"
19222
+ if test -n "$1"; then
19223
+ func_convert_core_file_wine_to_w32 "$1"
19224
+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
19225
+ fi
19226
+ func_convert_file_check "$1" "$func_to_host_file_result"
19227
+}
19228
+# end func_convert_file_nix_to_w32
19229
+
19230
+
19231
+# func_convert_file_msys_to_cygwin ARG
19232
+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
19233
+# Returns result in func_to_host_file_result.
19234
+func_convert_file_msys_to_cygwin ()
19235
+{
19236
+ $opt_debug
19237
+ func_to_host_file_result="$1"
19238
+ if test -n "$1"; then
19239
+ func_convert_core_msys_to_w32 "$1"
19240
+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
19241
+ func_to_host_file_result="$func_cygpath_result"
19242
+ fi
19243
+ func_convert_file_check "$1" "$func_to_host_file_result"
19244
+}
19245
+# end func_convert_file_msys_to_cygwin
19246
+
19247
+
19248
+# func_convert_file_nix_to_cygwin ARG
19249
+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
19250
+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
19251
+# in func_to_host_file_result.
19252
+func_convert_file_nix_to_cygwin ()
19253
+{
19254
+ $opt_debug
19255
+ func_to_host_file_result="$1"
19256
+ if test -n "$1"; then
19257
+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
19258
+ func_convert_core_file_wine_to_w32 "$1"
19259
+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
19260
+ func_to_host_file_result="$func_cygpath_result"
19261
+ fi
19262
+ func_convert_file_check "$1" "$func_to_host_file_result"
19263
+}
19264
+# end func_convert_file_nix_to_cygwin
19265
+
19266
+
19267
+#############################################
19268
+# $build to $host PATH CONVERSION FUNCTIONS #
19269
+#############################################
19270
+# invoked via `$to_host_path_cmd ARG'
19271
+#
19272
+# In each case, ARG is the path to be converted from $build to $host format.
19273
+# The result will be available in $func_to_host_path_result.
19274
+#
19275
+# Path separators are also converted from $build format to $host format. If
19276
+# ARG begins or ends with a path separator character, it is preserved (but
19277
+# converted to $host format) on output.
19278
+#
19279
+# All path conversion functions are named using the following convention:
19280
+# file name conversion function : func_convert_file_X_to_Y ()
19281
+# path conversion function : func_convert_path_X_to_Y ()
19282
+# where, for any given $build/$host combination the 'X_to_Y' value is the
19283
+# same. If conversion functions are added for new $build/$host combinations,
19284
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
19285
+# will break.
19286
+
19287
+
19288
+# func_init_to_host_path_cmd
19289
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
19290
+# appropriate value, based on the value of $to_host_file_cmd.
19291
+to_host_path_cmd=
19292
+func_init_to_host_path_cmd ()
19293
+{
19294
+ $opt_debug
19295
+ if test -z "$to_host_path_cmd"; then
19296
+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
19297
+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
19298
+ fi
19299
+}
19300
+
19301
+
19302
+# func_to_host_path ARG
19303
+# Converts the path ARG from $build format to $host format. Return result
19304
+# in func_to_host_path_result.
19305
+func_to_host_path ()
19306
+{
19307
+ $opt_debug
19308
+ func_init_to_host_path_cmd
19309
+ $to_host_path_cmd "$1"
19310
+}
19311
+# end func_to_host_path
19312
+
19313
+
19314
+# func_convert_path_noop ARG
19315
+# Copy ARG to func_to_host_path_result.
19316
+func_convert_path_noop ()
19317
+{
19318
+ func_to_host_path_result="$1"
19319
+}
19320
+# end func_convert_path_noop
19321
+
19322
+
19323
+# func_convert_path_msys_to_w32 ARG
19324
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
19325
+# conversion to w32 is not available inside the cwrapper. Returns result in
19326
+# func_to_host_path_result.
19327
+func_convert_path_msys_to_w32 ()
19328
+{
19329
+ $opt_debug
19330
+ func_to_host_path_result="$1"
19331
+ if test -n "$1"; then
19332
+ # Remove leading and trailing path separator characters from ARG. MSYS
19333
+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
19334
+ # and winepath ignores them completely.
19335
+ func_stripname : : "$1"
19336
+ func_to_host_path_tmp1=$func_stripname_result
19337
+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
19338
+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
19339
+ func_convert_path_check : ";" \
19340
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
19341
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
19342
+ fi
19343
+}
19344
+# end func_convert_path_msys_to_w32
19345
+
19346
+
19347
+# func_convert_path_cygwin_to_w32 ARG
19348
+# Convert path ARG from Cygwin to w32 format. Returns result in
19349
+# func_to_host_file_result.
19350
+func_convert_path_cygwin_to_w32 ()
19351
+{
19352
+ $opt_debug
19353
+ func_to_host_path_result="$1"
19354
+ if test -n "$1"; then
19355
+ # See func_convert_path_msys_to_w32:
19356
+ func_stripname : : "$1"
19357
+ func_to_host_path_tmp1=$func_stripname_result
19358
+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
19359
+ func_convert_path_check : ";" \
19360
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
19361
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
19362
+ fi
19363
+}
19364
+# end func_convert_path_cygwin_to_w32
19365
+
19366
+
19367
+# func_convert_path_nix_to_w32 ARG
19368
+# Convert path ARG from *nix to w32 format. Requires a wine environment and
19369
+# a working winepath. Returns result in func_to_host_file_result.
19370
+func_convert_path_nix_to_w32 ()
19371
+{
19372
+ $opt_debug
19373
+ func_to_host_path_result="$1"
19374
+ if test -n "$1"; then
19375
+ # See func_convert_path_msys_to_w32:
19376
+ func_stripname : : "$1"
19377
+ func_to_host_path_tmp1=$func_stripname_result
19378
+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
19379
+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
19380
+ func_convert_path_check : ";" \
19381
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
19382
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
19383
+ fi
19384
+}
19385
+# end func_convert_path_nix_to_w32
19386
+
19387
+
19388
+# func_convert_path_msys_to_cygwin ARG
19389
+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
19390
+# Returns result in func_to_host_file_result.
19391
+func_convert_path_msys_to_cygwin ()
19392
+{
19393
+ $opt_debug
19394
+ func_to_host_path_result="$1"
19395
+ if test -n "$1"; then
19396
+ # See func_convert_path_msys_to_w32:
19397
+ func_stripname : : "$1"
19398
+ func_to_host_path_tmp1=$func_stripname_result
19399
+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
19400
+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
19401
+ func_to_host_path_result="$func_cygpath_result"
19402
+ func_convert_path_check : : \
19403
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
19404
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
19405
+ fi
19406
+}
19407
+# end func_convert_path_msys_to_cygwin
19408
+
19409
+
19410
+# func_convert_path_nix_to_cygwin ARG
19411
+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
19412
+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
19413
+# func_to_host_file_result.
19414
+func_convert_path_nix_to_cygwin ()
19415
+{
19416
+ $opt_debug
19417
+ func_to_host_path_result="$1"
19418
+ if test -n "$1"; then
19419
+ # Remove leading and trailing path separator characters from
19420
+ # ARG. msys behavior is inconsistent here, cygpath turns them
19421
+ # into '.;' and ';.', and winepath ignores them completely.
19422
+ func_stripname : : "$1"
19423
+ func_to_host_path_tmp1=$func_stripname_result
19424
+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
19425
+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
19426
+ func_to_host_path_result="$func_cygpath_result"
19427
+ func_convert_path_check : : \
19428
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
19429
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
19430
+ fi
19431
+}
19432
+# end func_convert_path_nix_to_cygwin
19433
+
19434
+
19435
# func_mode_compile arg...
19436
func_mode_compile ()
19437
{
19438
@@ -1137,12 +1985,12 @@
19439
;;
19440
19441
-pie | -fpie | -fPIE)
19442
- pie_flag="$pie_flag $arg"
19443
+ func_append pie_flag " $arg"
19444
continue
19445
;;
19446
19447
-shared | -static | -prefer-pic | -prefer-non-pic)
19448
- later="$later $arg"
19449
+ func_append later " $arg"
19450
continue
19451
;;
19452
19453
@@ -1163,15 +2011,14 @@
19454
save_ifs="$IFS"; IFS=','
19455
for arg in $args; do
19456
IFS="$save_ifs"
19457
- func_quote_for_eval "$arg"
19458
- lastarg="$lastarg $func_quote_for_eval_result"
19459
+ func_append_quoted lastarg "$arg"
19460
done
19461
IFS="$save_ifs"
19462
func_stripname ' ' '' "$lastarg"
19463
lastarg=$func_stripname_result
19464
19465
# Add the arguments to base_compile.
19466
- base_compile="$base_compile $lastarg"
19467
+ func_append base_compile " $lastarg"
19468
continue
19469
;;
19470
19471
@@ -1187,8 +2034,7 @@
19472
esac # case $arg_mode
19473
19474
# Aesthetically quote the previous argument.
19475
- func_quote_for_eval "$lastarg"
19476
- base_compile="$base_compile $func_quote_for_eval_result"
19477
+ func_append_quoted base_compile "$lastarg"
19478
done # for arg
19479
19480
case $arg_mode in
19481
@@ -1213,7 +2059,7 @@
19482
*.[cCFSifmso] | \
19483
*.ada | *.adb | *.ads | *.asm | \
19484
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
19485
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
19486
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
19487
func_xform "$libobj"
19488
libobj=$func_xform_result
19489
;;
19490
@@ -1288,7 +2134,7 @@
19491
# Calculate the filename of the output object if compiler does
19492
# not support -o with -c
19493
if test "$compiler_c_o" = no; then
19494
- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
19495
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
19496
lockfile="$output_obj.lock"
19497
else
19498
output_obj=
19499
@@ -1319,17 +2165,16 @@
19500
$opt_dry_run || $RM $removelist
19501
exit $EXIT_FAILURE
19502
fi
19503
- removelist="$removelist $output_obj"
19504
+ func_append removelist " $output_obj"
19505
$ECHO "$srcfile" > "$lockfile"
19506
fi
19507
19508
$opt_dry_run || $RM $removelist
19509
- removelist="$removelist $lockfile"
19510
+ func_append removelist " $lockfile"
19511
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
19512
19513
- if test -n "$fix_srcfile_path"; then
19514
- eval srcfile=\"$fix_srcfile_path\"
19515
- fi
19516
+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
19517
+ srcfile=$func_to_tool_file_result
19518
func_quote_for_eval "$srcfile"
19519
qsrcfile=$func_quote_for_eval_result
19520
19521
@@ -1349,7 +2194,7 @@
19522
19523
if test -z "$output_obj"; then
19524
# Place PIC objects in $objdir
19525
- command="$command -o $lobj"
19526
+ func_append command " -o $lobj"
19527
fi
19528
19529
func_show_eval_locale "$command" \
19530
@@ -1396,11 +2241,11 @@
19531
command="$base_compile $qsrcfile $pic_flag"
19532
fi
19533
if test "$compiler_c_o" = yes; then
19534
- command="$command -o $obj"
19535
+ func_append command " -o $obj"
19536
fi
19537
19538
# Suppress compiler output if we already did a PIC compilation.
19539
- command="$command$suppress_output"
19540
+ func_append command "$suppress_output"
19541
func_show_eval_locale "$command" \
19542
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
19543
19544
@@ -1445,13 +2290,13 @@
19545
}
19546
19547
$opt_help || {
19548
-test "$mode" = compile && func_mode_compile ${1+"$@"}
19549
+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
19550
}
19551
19552
func_mode_help ()
19553
{
19554
# We need to display help for each of the modes.
19555
- case $mode in
19556
+ case $opt_mode in
19557
"")
19558
# Generic help is extracted from the usage comments
19559
# at the start of this file.
19560
@@ -1482,10 +2327,11 @@
19561
19562
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
19563
-no-suppress do not suppress compiler output for multiple passes
19564
- -prefer-pic try to building PIC objects only
19565
- -prefer-non-pic try to building non-PIC objects only
19566
+ -prefer-pic try to build PIC objects only
19567
+ -prefer-non-pic try to build non-PIC objects only
19568
-shared do not build a \`.o' file suitable for static linking
19569
-static only build a \`.o' file suitable for static linking
19570
+ -Wc,FLAG pass FLAG directly to the compiler
19571
19572
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
19573
from the given SOURCEFILE.
19574
@@ -1538,7 +2384,7 @@
19575
19576
The following components of INSTALL-COMMAND are treated specially:
19577
19578
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
19579
+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
19580
19581
The rest of the components are interpreted as arguments to that command (only
19582
BSD-compatible install options are recognized)."
19583
@@ -1558,6 +2404,8 @@
19584
19585
-all-static do not do any dynamic linking at all
19586
-avoid-version do not add a version suffix if possible
19587
+ -bindir BINDIR specify path to binaries directory (for systems where
19588
+ libraries must be found in the PATH setting at runtime)
19589
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
19590
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
19591
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
19592
@@ -1586,6 +2434,11 @@
19593
-version-info CURRENT[:REVISION[:AGE]]
19594
specify library version info [each variable defaults to 0]
19595
-weak LIBNAME declare that the target provides the LIBNAME interface
19596
+ -Wc,FLAG
19597
+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
19598
+ -Wl,FLAG
19599
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
19600
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
19601
19602
All other options (arguments beginning with \`-') are ignored.
19603
19604
@@ -1619,18 +2472,44 @@
19605
;;
19606
19607
*)
19608
- func_fatal_help "invalid operation mode \`$mode'"
19609
+ func_fatal_help "invalid operation mode \`$opt_mode'"
19610
;;
19611
esac
19612
19613
- $ECHO
19614
+ echo
19615
$ECHO "Try \`$progname --help' for more information about other modes."
19616
-
19617
- exit $?
19618
}
19619
19620
- # Now that we've collected a possible --mode arg, show help if necessary
19621
- $opt_help && func_mode_help
19622
+# Now that we've collected a possible --mode arg, show help if necessary
19623
+if $opt_help; then
19624
+ if test "$opt_help" = :; then
19625
+ func_mode_help
19626
+ else
19627
+ {
19628
+ func_help noexit
19629
+ for opt_mode in compile link execute install finish uninstall clean; do
19630
+ func_mode_help
19631
+ done
19632
+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
19633
+ {
19634
+ func_help noexit
19635
+ for opt_mode in compile link execute install finish uninstall clean; do
19636
+ echo
19637
+ func_mode_help
19638
+ done
19639
+ } |
19640
+ sed '1d
19641
+ /^When reporting/,/^Report/{
19642
+ H
19643
+ d
19644
+ }
19645
+ $x
19646
+ /information about other modes/d
19647
+ /more detailed .*MODE/d
19648
+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
19649
+ fi
19650
+ exit $?
19651
+fi
19652
19653
19654
# func_mode_execute arg...
19655
@@ -1643,13 +2522,16 @@
19656
func_fatal_help "you must specify a COMMAND"
19657
19658
# Handle -dlopen flags immediately.
19659
- for file in $execute_dlfiles; do
19660
+ for file in $opt_dlopen; do
19661
test -f "$file" \
19662
|| func_fatal_help "\`$file' is not a file"
19663
19664
dir=
19665
case $file in
19666
*.la)
19667
+ func_resolve_sysroot "$file"
19668
+ file=$func_resolve_sysroot_result
19669
+
19670
# Check to see that this really is a libtool archive.
19671
func_lalib_unsafe_p "$file" \
19672
|| func_fatal_help "\`$lib' is not a valid libtool archive"
19673
@@ -1671,7 +2553,7 @@
19674
dir="$func_dirname_result"
19675
19676
if test -f "$dir/$objdir/$dlname"; then
19677
- dir="$dir/$objdir"
19678
+ func_append dir "/$objdir"
19679
else
19680
if test ! -f "$dir/$dlname"; then
19681
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
19682
@@ -1712,7 +2594,7 @@
19683
for file
19684
do
19685
case $file in
19686
- -*) ;;
19687
+ -* | *.la | *.lo ) ;;
19688
*)
19689
# Do a test to see if this is really a libtool program.
19690
if func_ltwrapper_script_p "$file"; then
19691
@@ -1728,8 +2610,7 @@
19692
;;
19693
esac
19694
# Quote arguments (to preserve shell metacharacters).
19695
- func_quote_for_eval "$file"
19696
- args="$args $func_quote_for_eval_result"
19697
+ func_append_quoted args "$file"
19698
done
19699
19700
if test "X$opt_dry_run" = Xfalse; then
19701
@@ -1754,29 +2635,66 @@
19702
# Display what would be done.
19703
if test -n "$shlibpath_var"; then
19704
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
19705
- $ECHO "export $shlibpath_var"
19706
+ echo "export $shlibpath_var"
19707
fi
19708
$ECHO "$cmd$args"
19709
exit $EXIT_SUCCESS
19710
fi
19711
}
19712
19713
-test "$mode" = execute && func_mode_execute ${1+"$@"}
19714
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
19715
19716
19717
# func_mode_finish arg...
19718
func_mode_finish ()
19719
{
19720
$opt_debug
19721
- libdirs="$nonopt"
19722
+ libs=
19723
+ libdirs=
19724
admincmds=
19725
19726
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
19727
- for dir
19728
- do
19729
- libdirs="$libdirs $dir"
19730
- done
19731
+ for opt in "$nonopt" ${1+"$@"}
19732
+ do
19733
+ if test -d "$opt"; then
19734
+ func_append libdirs " $opt"
19735
+
19736
+ elif test -f "$opt"; then
19737
+ if func_lalib_unsafe_p "$opt"; then
19738
+ func_append libs " $opt"
19739
+ else
19740
+ func_warning "\`$opt' is not a valid libtool archive"
19741
+ fi
19742
19743
+ else
19744
+ func_fatal_error "invalid argument \`$opt'"
19745
+ fi
19746
+ done
19747
+
19748
+ if test -n "$libs"; then
19749
+ if test -n "$lt_sysroot"; then
19750
+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
19751
+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
19752
+ else
19753
+ sysroot_cmd=
19754
+ fi
19755
+
19756
+ # Remove sysroot references
19757
+ if $opt_dry_run; then
19758
+ for lib in $libs; do
19759
+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
19760
+ done
19761
+ else
19762
+ tmpdir=`func_mktempdir`
19763
+ for lib in $libs; do
19764
+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
19765
+ > $tmpdir/tmp-la
19766
+ mv -f $tmpdir/tmp-la $lib
19767
+ done
19768
+ ${RM}r "$tmpdir"
19769
+ fi
19770
+ fi
19771
+
19772
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
19773
for libdir in $libdirs; do
19774
if test -n "$finish_cmds"; then
19775
# Do each command in the finish commands.
19776
@@ -1786,7 +2704,7 @@
19777
if test -n "$finish_eval"; then
19778
# Do the single finish_eval.
19779
eval cmds=\"$finish_eval\"
19780
- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
19781
+ $opt_dry_run || eval "$cmds" || func_append admincmds "
19782
$cmds"
19783
fi
19784
done
19785
@@ -1795,53 +2713,55 @@
19786
# Exit here if they wanted silent mode.
19787
$opt_silent && exit $EXIT_SUCCESS
19788
19789
- $ECHO "X----------------------------------------------------------------------" | $Xsed
19790
- $ECHO "Libraries have been installed in:"
19791
- for libdir in $libdirs; do
19792
- $ECHO " $libdir"
19793
- done
19794
- $ECHO
19795
- $ECHO "If you ever happen to want to link against installed libraries"
19796
- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
19797
- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
19798
- $ECHO "flag during linking and do at least one of the following:"
19799
- if test -n "$shlibpath_var"; then
19800
- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
19801
- $ECHO " during execution"
19802
- fi
19803
- if test -n "$runpath_var"; then
19804
- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
19805
- $ECHO " during linking"
19806
- fi
19807
- if test -n "$hardcode_libdir_flag_spec"; then
19808
- libdir=LIBDIR
19809
- eval flag=\"$hardcode_libdir_flag_spec\"
19810
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
19811
+ echo "----------------------------------------------------------------------"
19812
+ echo "Libraries have been installed in:"
19813
+ for libdir in $libdirs; do
19814
+ $ECHO " $libdir"
19815
+ done
19816
+ echo
19817
+ echo "If you ever happen to want to link against installed libraries"
19818
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
19819
+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
19820
+ echo "flag during linking and do at least one of the following:"
19821
+ if test -n "$shlibpath_var"; then
19822
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
19823
+ echo " during execution"
19824
+ fi
19825
+ if test -n "$runpath_var"; then
19826
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
19827
+ echo " during linking"
19828
+ fi
19829
+ if test -n "$hardcode_libdir_flag_spec"; then
19830
+ libdir=LIBDIR
19831
+ eval flag=\"$hardcode_libdir_flag_spec\"
19832
+
19833
+ $ECHO " - use the \`$flag' linker flag"
19834
+ fi
19835
+ if test -n "$admincmds"; then
19836
+ $ECHO " - have your system administrator run these commands:$admincmds"
19837
+ fi
19838
+ if test -f /etc/ld.so.conf; then
19839
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
19840
+ fi
19841
+ echo
19842
19843
- $ECHO " - use the \`$flag' linker flag"
19844
- fi
19845
- if test -n "$admincmds"; then
19846
- $ECHO " - have your system administrator run these commands:$admincmds"
19847
- fi
19848
- if test -f /etc/ld.so.conf; then
19849
- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
19850
+ echo "See any operating system documentation about shared libraries for"
19851
+ case $host in
19852
+ solaris2.[6789]|solaris2.1[0-9])
19853
+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
19854
+ echo "pages."
19855
+ ;;
19856
+ *)
19857
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
19858
+ ;;
19859
+ esac
19860
+ echo "----------------------------------------------------------------------"
19861
fi
19862
- $ECHO
19863
-
19864
- $ECHO "See any operating system documentation about shared libraries for"
19865
- case $host in
19866
- solaris2.[6789]|solaris2.1[0-9])
19867
- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
19868
- $ECHO "pages."
19869
- ;;
19870
- *)
19871
- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
19872
- ;;
19873
- esac
19874
- $ECHO "X----------------------------------------------------------------------" | $Xsed
19875
exit $EXIT_SUCCESS
19876
}
19877
19878
-test "$mode" = finish && func_mode_finish ${1+"$@"}
19879
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
19880
19881
19882
# func_mode_install arg...
19883
@@ -1852,7 +2772,7 @@
19884
# install_prog (especially on Windows NT).
19885
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
19886
# Allow the use of GNU shtool's install command.
19887
- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
19888
+ case $nonopt in *shtool*) :;; *) false;; esac; then
19889
# Aesthetically quote it.
19890
func_quote_for_eval "$nonopt"
19891
install_prog="$func_quote_for_eval_result "
19892
@@ -1866,7 +2786,12 @@
19893
# The real first argument should be the name of the installation program.
19894
# Aesthetically quote it.
19895
func_quote_for_eval "$arg"
19896
- install_prog="$install_prog$func_quote_for_eval_result"
19897
+ func_append install_prog "$func_quote_for_eval_result"
19898
+ install_shared_prog=$install_prog
19899
+ case " $install_prog " in
19900
+ *[\\\ /]cp\ *) install_cp=: ;;
19901
+ *) install_cp=false ;;
19902
+ esac
19903
19904
# We need to accept at least all the BSD install flags.
19905
dest=
19906
@@ -1876,10 +2801,12 @@
19907
install_type=
19908
isdir=no
19909
stripme=
19910
+ no_mode=:
19911
for arg
19912
do
19913
+ arg2=
19914
if test -n "$dest"; then
19915
- files="$files $dest"
19916
+ func_append files " $dest"
19917
dest=$arg
19918
continue
19919
fi
19920
@@ -1887,10 +2814,9 @@
19921
case $arg in
19922
-d) isdir=yes ;;
19923
-f)
19924
- case " $install_prog " in
19925
- *[\\\ /]cp\ *) ;;
19926
- *) prev=$arg ;;
19927
- esac
19928
+ if $install_cp; then :; else
19929
+ prev=$arg
19930
+ fi
19931
;;
19932
-g | -m | -o)
19933
prev=$arg
19934
@@ -1904,6 +2830,10 @@
19935
*)
19936
# If the previous option needed an argument, then skip it.
19937
if test -n "$prev"; then
19938
+ if test "x$prev" = x-m && test -n "$install_override_mode"; then
19939
+ arg2=$install_override_mode
19940
+ no_mode=false
19941
+ fi
19942
prev=
19943
else
19944
dest=$arg
19945
@@ -1914,7 +2844,11 @@
19946
19947
# Aesthetically quote the argument.
19948
func_quote_for_eval "$arg"
19949
- install_prog="$install_prog $func_quote_for_eval_result"
19950
+ func_append install_prog " $func_quote_for_eval_result"
19951
+ if test -n "$arg2"; then
19952
+ func_quote_for_eval "$arg2"
19953
+ fi
19954
+ func_append install_shared_prog " $func_quote_for_eval_result"
19955
done
19956
19957
test -z "$install_prog" && \
19958
@@ -1923,6 +2857,13 @@
19959
test -n "$prev" && \
19960
func_fatal_help "the \`$prev' option requires an argument"
19961
19962
+ if test -n "$install_override_mode" && $no_mode; then
19963
+ if $install_cp; then :; else
19964
+ func_quote_for_eval "$install_override_mode"
19965
+ func_append install_shared_prog " -m $func_quote_for_eval_result"
19966
+ fi
19967
+ fi
19968
+
19969
if test -z "$files"; then
19970
if test -z "$dest"; then
19971
func_fatal_help "no file or destination specified"
19972
@@ -1977,10 +2918,13 @@
19973
case $file in
19974
*.$libext)
19975
# Do the static libraries later.
19976
- staticlibs="$staticlibs $file"
19977
+ func_append staticlibs " $file"
19978
;;
19979
19980
*.la)
19981
+ func_resolve_sysroot "$file"
19982
+ file=$func_resolve_sysroot_result
19983
+
19984
# Check to see that this really is a libtool archive.
19985
func_lalib_unsafe_p "$file" \
19986
|| func_fatal_help "\`$file' is not a valid libtool archive"
19987
@@ -1994,23 +2938,23 @@
19988
if test "X$destdir" = "X$libdir"; then
19989
case "$current_libdirs " in
19990
*" $libdir "*) ;;
19991
- *) current_libdirs="$current_libdirs $libdir" ;;
19992
+ *) func_append current_libdirs " $libdir" ;;
19993
esac
19994
else
19995
# Note the libdir as a future libdir.
19996
case "$future_libdirs " in
19997
*" $libdir "*) ;;
19998
- *) future_libdirs="$future_libdirs $libdir" ;;
19999
+ *) func_append future_libdirs " $libdir" ;;
20000
esac
20001
fi
20002
20003
func_dirname "$file" "/" ""
20004
dir="$func_dirname_result"
20005
- dir="$dir$objdir"
20006
+ func_append dir "$objdir"
20007
20008
if test -n "$relink_command"; then
20009
# Determine the prefix the user has applied to our future dir.
20010
- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
20011
+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
20012
20013
# Don't allow the user to place us outside of our expected
20014
# location b/c this prevents finding dependent libraries that
20015
@@ -2023,9 +2967,9 @@
20016
20017
if test -n "$inst_prefix_dir"; then
20018
# Stick the inst_prefix_dir data into the link command.
20019
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
20020
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
20021
else
20022
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
20023
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
20024
fi
20025
20026
func_warning "relinking \`$file'"
20027
@@ -2043,7 +2987,7 @@
20028
test -n "$relink_command" && srcname="$realname"T
20029
20030
# Install the shared library and build the symlinks.
20031
- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
20032
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
20033
'exit $?'
20034
tstripme="$stripme"
20035
case $host_os in
20036
@@ -2083,7 +3027,7 @@
20037
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
20038
20039
# Maybe install the static library, too.
20040
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
20041
+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
20042
;;
20043
20044
*.lo)
20045
@@ -2183,7 +3127,7 @@
20046
if test -f "$lib"; then
20047
func_source "$lib"
20048
fi
20049
- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
20050
+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
20051
if test -n "$libdir" && test ! -f "$libfile"; then
20052
func_warning "\`$lib' has not been installed in \`$libdir'"
20053
finalize=no
20054
@@ -2202,7 +3146,7 @@
20055
file="$func_basename_result"
20056
outputname="$tmpdir/$file"
20057
# Replace the output file specification.
20058
- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
20059
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
20060
20061
$opt_silent || {
20062
func_quote_for_expand "$relink_command"
20063
@@ -2221,7 +3165,7 @@
20064
}
20065
else
20066
# Install the binary that we compiled earlier.
20067
- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
20068
+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
20069
fi
20070
fi
20071
20072
@@ -2280,7 +3224,7 @@
20073
fi
20074
}
20075
20076
-test "$mode" = install && func_mode_install ${1+"$@"}
20077
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
20078
20079
20080
# func_generate_dlsyms outputname originator pic_p
20081
@@ -2323,6 +3267,22 @@
20082
extern \"C\" {
20083
#endif
20084
20085
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
20086
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
20087
+#endif
20088
+
20089
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
20090
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
20091
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
20092
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
20093
+# define LT_DLSYM_CONST
20094
+#elif defined(__osf__)
20095
+/* This system does not cope well with relocations in const data. */
20096
+# define LT_DLSYM_CONST
20097
+#else
20098
+# define LT_DLSYM_CONST const
20099
+#endif
20100
+
20101
/* External symbol declarations for the compiler. */\
20102
"
20103
20104
@@ -2332,10 +3292,11 @@
20105
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
20106
20107
# Add our own program objects to the symbol list.
20108
- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
20109
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
20110
for progfile in $progfiles; do
20111
- func_verbose "extracting global C symbols from \`$progfile'"
20112
- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
20113
+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
20114
+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
20115
+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
20116
done
20117
20118
if test -n "$exclude_expsyms"; then
20119
@@ -2371,7 +3332,7 @@
20120
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
20121
eval '$MV "$nlist"T "$nlist"'
20122
case $host in
20123
- *cygwin | *mingw* | *cegcc* )
20124
+ *cygwin* | *mingw* | *cegcc* )
20125
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
20126
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
20127
;;
20128
@@ -2384,10 +3345,52 @@
20129
func_verbose "extracting global C symbols from \`$dlprefile'"
20130
func_basename "$dlprefile"
20131
name="$func_basename_result"
20132
- $opt_dry_run || {
20133
- eval '$ECHO ": $name " >> "$nlist"'
20134
- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
20135
- }
20136
+ case $host in
20137
+ *cygwin* | *mingw* | *cegcc* )
20138
+ # if an import library, we need to obtain dlname
20139
+ if func_win32_import_lib_p "$dlprefile"; then
20140
+ func_tr_sh "$dlprefile"
20141
+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
20142
+ dlprefile_dlbasename=""
20143
+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
20144
+ # Use subshell, to avoid clobbering current variable values
20145
+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
20146
+ if test -n "$dlprefile_dlname" ; then
20147
+ func_basename "$dlprefile_dlname"
20148
+ dlprefile_dlbasename="$func_basename_result"
20149
+ else
20150
+ # no lafile. user explicitly requested -dlpreopen <import library>.
20151
+ $sharedlib_from_linklib_cmd "$dlprefile"
20152
+ dlprefile_dlbasename=$sharedlib_from_linklib_result
20153
+ fi
20154
+ fi
20155
+ $opt_dry_run || {
20156
+ if test -n "$dlprefile_dlbasename" ; then
20157
+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
20158
+ else
20159
+ func_warning "Could not compute DLL name from $name"
20160
+ eval '$ECHO ": $name " >> "$nlist"'
20161
+ fi
20162
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
20163
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
20164
+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
20165
+ }
20166
+ else # not an import lib
20167
+ $opt_dry_run || {
20168
+ eval '$ECHO ": $name " >> "$nlist"'
20169
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
20170
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
20171
+ }
20172
+ fi
20173
+ ;;
20174
+ *)
20175
+ $opt_dry_run || {
20176
+ eval '$ECHO ": $name " >> "$nlist"'
20177
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
20178
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
20179
+ }
20180
+ ;;
20181
+ esac
20182
done
20183
20184
$opt_dry_run || {
20185
@@ -2415,36 +3418,19 @@
20186
if test -f "$nlist"S; then
20187
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
20188
else
20189
- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
20190
+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
20191
fi
20192
20193
- $ECHO >> "$output_objdir/$my_dlsyms" "\
20194
+ echo >> "$output_objdir/$my_dlsyms" "\
20195
20196
/* The mapping between symbol names and symbols. */
20197
typedef struct {
20198
const char *name;
20199
void *address;
20200
} lt_dlsymlist;
20201
-"
20202
- case $host in
20203
- *cygwin* | *mingw* | *cegcc* )
20204
- $ECHO >> "$output_objdir/$my_dlsyms" "\
20205
-/* DATA imports from DLLs on WIN32 con't be const, because
20206
- runtime relocations are performed -- see ld's documentation
20207
- on pseudo-relocs. */"
20208
- lt_dlsym_const= ;;
20209
- *osf5*)
20210
- echo >> "$output_objdir/$my_dlsyms" "\
20211
-/* This system does not cope well with relocations in const data */"
20212
- lt_dlsym_const= ;;
20213
- *)
20214
- lt_dlsym_const=const ;;
20215
- esac
20216
-
20217
- $ECHO >> "$output_objdir/$my_dlsyms" "\
20218
-extern $lt_dlsym_const lt_dlsymlist
20219
+extern LT_DLSYM_CONST lt_dlsymlist
20220
lt_${my_prefix}_LTX_preloaded_symbols[];
20221
-$lt_dlsym_const lt_dlsymlist
20222
+LT_DLSYM_CONST lt_dlsymlist
20223
lt_${my_prefix}_LTX_preloaded_symbols[] =
20224
{\
20225
{ \"$my_originator\", (void *) 0 },"
20226
@@ -2457,7 +3443,7 @@
20227
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
20228
;;
20229
esac
20230
- $ECHO >> "$output_objdir/$my_dlsyms" "\
20231
+ echo >> "$output_objdir/$my_dlsyms" "\
20232
{0, (void *) 0}
20233
};
20234
20235
@@ -2500,7 +3486,7 @@
20236
for arg in $LTCFLAGS; do
20237
case $arg in
20238
-pie | -fpie | -fPIE) ;;
20239
- *) symtab_cflags="$symtab_cflags $arg" ;;
20240
+ *) func_append symtab_cflags " $arg" ;;
20241
esac
20242
done
20243
20244
@@ -2515,16 +3501,16 @@
20245
case $host in
20246
*cygwin* | *mingw* | *cegcc* )
20247
if test -f "$output_objdir/$my_outputname.def"; then
20248
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
20249
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
20250
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
20251
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
20252
else
20253
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
20254
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
20255
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
20256
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
20257
fi
20258
;;
20259
*)
20260
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
20261
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
20262
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
20263
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
20264
;;
20265
esac
20266
;;
20267
@@ -2538,8 +3524,8 @@
20268
# really was required.
20269
20270
# Nullify the symbol file.
20271
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
20272
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
20273
+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
20274
+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
20275
fi
20276
}
20277
20278
@@ -2549,6 +3535,7 @@
20279
# Need a lot of goo to handle *both* DLLs and import libs
20280
# Has to be a shell function in order to 'eat' the argument
20281
# that is supplied when $file_magic_command is called.
20282
+# Despite the name, also deal with 64 bit binaries.
20283
func_win32_libid ()
20284
{
20285
$opt_debug
20286
@@ -2559,9 +3546,11 @@
20287
win32_libid_type="x86 archive import"
20288
;;
20289
*ar\ archive*) # could be an import, or static
20290
+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
20291
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
20292
- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
20293
- win32_nmres=`eval $NM -f posix -A $1 |
20294
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
20295
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
20296
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
20297
$SED -n -e '
20298
1,100{
20299
/ I /{
20300
@@ -2590,6 +3579,131 @@
20301
$ECHO "$win32_libid_type"
20302
}
20303
20304
+# func_cygming_dll_for_implib ARG
20305
+#
20306
+# Platform-specific function to extract the
20307
+# name of the DLL associated with the specified
20308
+# import library ARG.
20309
+# Invoked by eval'ing the libtool variable
20310
+# $sharedlib_from_linklib_cmd
20311
+# Result is available in the variable
20312
+# $sharedlib_from_linklib_result
20313
+func_cygming_dll_for_implib ()
20314
+{
20315
+ $opt_debug
20316
+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
20317
+}
20318
+
20319
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
20320
+#
20321
+# The is the core of a fallback implementation of a
20322
+# platform-specific function to extract the name of the
20323
+# DLL associated with the specified import library LIBNAME.
20324
+#
20325
+# SECTION_NAME is either .idata$6 or .idata$7, depending
20326
+# on the platform and compiler that created the implib.
20327
+#
20328
+# Echos the name of the DLL associated with the
20329
+# specified import library.
20330
+func_cygming_dll_for_implib_fallback_core ()
20331
+{
20332
+ $opt_debug
20333
+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
20334
+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
20335
+ $SED '/^Contents of section '"$match_literal"':/{
20336
+ # Place marker at beginning of archive member dllname section
20337
+ s/.*/====MARK====/
20338
+ p
20339
+ d
20340
+ }
20341
+ # These lines can sometimes be longer than 43 characters, but
20342
+ # are always uninteresting
20343
+ /:[ ]*file format pe[i]\{,1\}-/d
20344
+ /^In archive [^:]*:/d
20345
+ # Ensure marker is printed
20346
+ /^====MARK====/p
20347
+ # Remove all lines with less than 43 characters
20348
+ /^.\{43\}/!d
20349
+ # From remaining lines, remove first 43 characters
20350
+ s/^.\{43\}//' |
20351
+ $SED -n '
20352
+ # Join marker and all lines until next marker into a single line
20353
+ /^====MARK====/ b para
20354
+ H
20355
+ $ b para
20356
+ b
20357
+ :para
20358
+ x
20359
+ s/\n//g
20360
+ # Remove the marker
20361
+ s/^====MARK====//
20362
+ # Remove trailing dots and whitespace
20363
+ s/[\. \t]*$//
20364
+ # Print
20365
+ /./p' |
20366
+ # we now have a list, one entry per line, of the stringified
20367
+ # contents of the appropriate section of all members of the
20368
+ # archive which possess that section. Heuristic: eliminate
20369
+ # all those which have a first or second character that is
20370
+ # a '.' (that is, objdump's representation of an unprintable
20371
+ # character.) This should work for all archives with less than
20372
+ # 0x302f exports -- but will fail for DLLs whose name actually
20373
+ # begins with a literal '.' or a single character followed by
20374
+ # a '.'.
20375
+ #
20376
+ # Of those that remain, print the first one.
20377
+ $SED -e '/^\./d;/^.\./d;q'
20378
+}
20379
+
20380
+# func_cygming_gnu_implib_p ARG
20381
+# This predicate returns with zero status (TRUE) if
20382
+# ARG is a GNU/binutils-style import library. Returns
20383
+# with nonzero status (FALSE) otherwise.
20384
+func_cygming_gnu_implib_p ()
20385
+{
20386
+ $opt_debug
20387
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
20388
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
20389
+ test -n "$func_cygming_gnu_implib_tmp"
20390
+}
20391
+
20392
+# func_cygming_ms_implib_p ARG
20393
+# This predicate returns with zero status (TRUE) if
20394
+# ARG is an MS-style import library. Returns
20395
+# with nonzero status (FALSE) otherwise.
20396
+func_cygming_ms_implib_p ()
20397
+{
20398
+ $opt_debug
20399
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
20400
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
20401
+ test -n "$func_cygming_ms_implib_tmp"
20402
+}
20403
+
20404
+# func_cygming_dll_for_implib_fallback ARG
20405
+# Platform-specific function to extract the
20406
+# name of the DLL associated with the specified
20407
+# import library ARG.
20408
+#
20409
+# This fallback implementation is for use when $DLLTOOL
20410
+# does not support the --identify-strict option.
20411
+# Invoked by eval'ing the libtool variable
20412
+# $sharedlib_from_linklib_cmd
20413
+# Result is available in the variable
20414
+# $sharedlib_from_linklib_result
20415
+func_cygming_dll_for_implib_fallback ()
20416
+{
20417
+ $opt_debug
20418
+ if func_cygming_gnu_implib_p "$1" ; then
20419
+ # binutils import library
20420
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
20421
+ elif func_cygming_ms_implib_p "$1" ; then
20422
+ # ms-generated import library
20423
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
20424
+ else
20425
+ # unknown
20426
+ sharedlib_from_linklib_result=""
20427
+ fi
20428
+}
20429
20430
20431
# func_extract_an_archive dir oldlib
20432
@@ -2598,7 +3712,18 @@
20433
$opt_debug
20434
f_ex_an_ar_dir="$1"; shift
20435
f_ex_an_ar_oldlib="$1"
20436
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
20437
+ if test "$lock_old_archive_extraction" = yes; then
20438
+ lockfile=$f_ex_an_ar_oldlib.lock
20439
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
20440
+ func_echo "Waiting for $lockfile to be removed"
20441
+ sleep 2
20442
+ done
20443
+ fi
20444
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
20445
+ 'stat=$?; rm -f "$lockfile"; exit $stat'
20446
+ if test "$lock_old_archive_extraction" = yes; then
20447
+ $opt_dry_run || rm -f "$lockfile"
20448
+ fi
20449
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
20450
:
20451
else
20452
@@ -2669,7 +3794,7 @@
20453
darwin_file=
20454
darwin_files=
20455
for darwin_file in $darwin_filelist; do
20456
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
20457
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
20458
$LIPO -create -output "$darwin_file" $darwin_files
20459
done # $darwin_filelist
20460
$RM -rf unfat-$$
20461
@@ -2684,25 +3809,30 @@
20462
func_extract_an_archive "$my_xdir" "$my_xabs"
20463
;;
20464
esac
20465
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
20466
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
20467
done
20468
20469
func_extract_archives_result="$my_oldobjs"
20470
}
20471
20472
20473
-
20474
-# func_emit_wrapper_part1 [arg=no]
20475
+# func_emit_wrapper [arg=no]
20476
#
20477
-# Emit the first part of a libtool wrapper script on stdout.
20478
-# For more information, see the description associated with
20479
-# func_emit_wrapper(), below.
20480
-func_emit_wrapper_part1 ()
20481
-{
20482
- func_emit_wrapper_part1_arg1=no
20483
- if test -n "$1" ; then
20484
- func_emit_wrapper_part1_arg1=$1
20485
- fi
20486
+# Emit a libtool wrapper script on stdout.
20487
+# Don't directly open a file because we may want to
20488
+# incorporate the script contents within a cygwin/mingw
20489
+# wrapper executable. Must ONLY be called from within
20490
+# func_mode_link because it depends on a number of variables
20491
+# set therein.
20492
+#
20493
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
20494
+# variable will take. If 'yes', then the emitted script
20495
+# will assume that the directory in which it is stored is
20496
+# the $objdir directory. This is a cygwin/mingw-specific
20497
+# behavior.
20498
+func_emit_wrapper ()
20499
+{
20500
+ func_emit_wrapper_arg1=${1-no}
20501
20502
$ECHO "\
20503
#! $SHELL
20504
@@ -2718,7 +3848,6 @@
20505
20506
# Sed substitution that helps us do robust quoting. It backslashifies
20507
# metacharacters that are still active within double-quoted strings.
20508
-Xsed='${SED} -e 1s/^X//'
20509
sed_quote_subst='$sed_quote_subst'
20510
20511
# Be Bourne compatible
20512
@@ -2749,31 +3878,132 @@
20513
else
20514
# When we are sourced in execute mode, \$file and \$ECHO are already set.
20515
if test \"\$libtool_execute_magic\" != \"$magic\"; then
20516
- ECHO=\"$qecho\"
20517
- file=\"\$0\"
20518
- # Make sure echo works.
20519
- if test \"X\$1\" = X--no-reexec; then
20520
- # Discard the --no-reexec flag, and continue.
20521
- shift
20522
- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
20523
- # Yippee, \$ECHO works!
20524
- :
20525
- else
20526
- # Restart under the correct shell, and then maybe \$ECHO will work.
20527
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
20528
- fi
20529
- fi\
20530
+ file=\"\$0\""
20531
+
20532
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
20533
+ $ECHO "\
20534
+
20535
+# A function that is used when there is no print builtin or printf.
20536
+func_fallback_echo ()
20537
+{
20538
+ eval 'cat <<_LTECHO_EOF
20539
+\$1
20540
+_LTECHO_EOF'
20541
+}
20542
+ ECHO=\"$qECHO\"
20543
+ fi
20544
+
20545
+# Very basic option parsing. These options are (a) specific to
20546
+# the libtool wrapper, (b) are identical between the wrapper
20547
+# /script/ and the wrapper /executable/ which is used only on
20548
+# windows platforms, and (c) all begin with the string "--lt-"
20549
+# (application programs are unlikely to have options which match
20550
+# this pattern).
20551
+#
20552
+# There are only two supported options: --lt-debug and
20553
+# --lt-dump-script. There is, deliberately, no --lt-help.
20554
+#
20555
+# The first argument to this parsing function should be the
20556
+# script's $0 value, followed by "$@".
20557
+lt_option_debug=
20558
+func_parse_lt_options ()
20559
+{
20560
+ lt_script_arg0=\$0
20561
+ shift
20562
+ for lt_opt
20563
+ do
20564
+ case \"\$lt_opt\" in
20565
+ --lt-debug) lt_option_debug=1 ;;
20566
+ --lt-dump-script)
20567
+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
20568
+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
20569
+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
20570
+ cat \"\$lt_dump_D/\$lt_dump_F\"
20571
+ exit 0
20572
+ ;;
20573
+ --lt-*)
20574
+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
20575
+ exit 1
20576
+ ;;
20577
+ esac
20578
+ done
20579
+
20580
+ # Print the debug banner immediately:
20581
+ if test -n \"\$lt_option_debug\"; then
20582
+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
20583
+ fi
20584
+}
20585
+
20586
+# Used when --lt-debug. Prints its arguments to stdout
20587
+# (redirection is the responsibility of the caller)
20588
+func_lt_dump_args ()
20589
+{
20590
+ lt_dump_args_N=1;
20591
+ for lt_arg
20592
+ do
20593
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
20594
+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
20595
+ done
20596
+}
20597
+
20598
+# Core function for launching the target application
20599
+func_exec_program_core ()
20600
+{
20601
"
20602
- $ECHO "\
20603
+ case $host in
20604
+ # Backslashes separate directories on plain windows
20605
+ *-*-mingw | *-*-os2* | *-cegcc*)
20606
+ $ECHO "\
20607
+ if test -n \"\$lt_option_debug\"; then
20608
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
20609
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
20610
+ fi
20611
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
20612
+"
20613
+ ;;
20614
+
20615
+ *)
20616
+ $ECHO "\
20617
+ if test -n \"\$lt_option_debug\"; then
20618
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
20619
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
20620
+ fi
20621
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
20622
+"
20623
+ ;;
20624
+ esac
20625
+ $ECHO "\
20626
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
20627
+ exit 1
20628
+}
20629
+
20630
+# A function to encapsulate launching the target application
20631
+# Strips options in the --lt-* namespace from \$@ and
20632
+# launches target application with the remaining arguments.
20633
+func_exec_program ()
20634
+{
20635
+ for lt_wr_arg
20636
+ do
20637
+ case \$lt_wr_arg in
20638
+ --lt-*) ;;
20639
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
20640
+ esac
20641
+ shift
20642
+ done
20643
+ func_exec_program_core \${1+\"\$@\"}
20644
+}
20645
+
20646
+ # Parse options
20647
+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
20648
20649
# Find the directory that this script lives in.
20650
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
20651
+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
20652
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
20653
20654
# Follow symbolic links until we get to the real thisdir.
20655
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
20656
+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
20657
while test -n \"\$file\"; do
20658
- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
20659
+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
20660
20661
# If there was a directory component, then change thisdir.
20662
if test \"x\$destdir\" != \"x\$file\"; then
20663
@@ -2783,30 +4013,13 @@
20664
esac
20665
fi
20666
20667
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
20668
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
20669
+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
20670
+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
20671
done
20672
-"
20673
-}
20674
-# end: func_emit_wrapper_part1
20675
-
20676
-# func_emit_wrapper_part2 [arg=no]
20677
-#
20678
-# Emit the second part of a libtool wrapper script on stdout.
20679
-# For more information, see the description associated with
20680
-# func_emit_wrapper(), below.
20681
-func_emit_wrapper_part2 ()
20682
-{
20683
- func_emit_wrapper_part2_arg1=no
20684
- if test -n "$1" ; then
20685
- func_emit_wrapper_part2_arg1=$1
20686
- fi
20687
-
20688
- $ECHO "\
20689
20690
# Usually 'no', except on cygwin/mingw when embedded into
20691
# the cwrapper.
20692
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
20693
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
20694
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
20695
# special case for '.'
20696
if test \"\$thisdir\" = \".\"; then
20697
@@ -2814,7 +4027,7 @@
20698
fi
20699
# remove .libs from thisdir
20700
case \"\$thisdir\" in
20701
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
20702
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
20703
$objdir ) thisdir=. ;;
20704
esac
20705
fi
20706
@@ -2869,6 +4082,18 @@
20707
20708
if test -f \"\$progdir/\$program\"; then"
20709
20710
+ # fixup the dll searchpath if we need to.
20711
+ #
20712
+ # Fix the DLL searchpath if we need to. Do this before prepending
20713
+ # to shlibpath, because on Windows, both are PATH and uninstalled
20714
+ # libraries must come first.
20715
+ if test -n "$dllsearchpath"; then
20716
+ $ECHO "\
20717
+ # Add the dll search path components to the executable PATH
20718
+ PATH=$dllsearchpath:\$PATH
20719
+"
20720
+ fi
20721
+
20722
# Export our shlibpath_var if we have one.
20723
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
20724
$ECHO "\
20725
@@ -2877,253 +4102,28 @@
20726
20727
# Some systems cannot cope with colon-terminated $shlibpath_var
20728
# The second colon is a workaround for a bug in BeOS R4 sed
20729
- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
20730
+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
20731
20732
export $shlibpath_var
20733
"
20734
fi
20735
20736
- # fixup the dll searchpath if we need to.
20737
- if test -n "$dllsearchpath"; then
20738
- $ECHO "\
20739
- # Add the dll search path components to the executable PATH
20740
- PATH=$dllsearchpath:\$PATH
20741
-"
20742
- fi
20743
-
20744
$ECHO "\
20745
if test \"\$libtool_execute_magic\" != \"$magic\"; then
20746
# Run the actual program with our arguments.
20747
-"
20748
- case $host in
20749
- # Backslashes separate directories on plain windows
20750
- *-*-mingw | *-*-os2* | *-cegcc*)
20751
- $ECHO "\
20752
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
20753
-"
20754
- ;;
20755
-
20756
- *)
20757
- $ECHO "\
20758
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
20759
-"
20760
- ;;
20761
- esac
20762
- $ECHO "\
20763
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
20764
- exit 1
20765
+ func_exec_program \${1+\"\$@\"}
20766
fi
20767
else
20768
# The program doesn't exist.
20769
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
20770
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
20771
- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
20772
+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
20773
exit 1
20774
fi
20775
fi\
20776
"
20777
}
20778
-# end: func_emit_wrapper_part2
20779
-
20780
-
20781
-# func_emit_wrapper [arg=no]
20782
-#
20783
-# Emit a libtool wrapper script on stdout.
20784
-# Don't directly open a file because we may want to
20785
-# incorporate the script contents within a cygwin/mingw
20786
-# wrapper executable. Must ONLY be called from within
20787
-# func_mode_link because it depends on a number of variables
20788
-# set therein.
20789
-#
20790
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
20791
-# variable will take. If 'yes', then the emitted script
20792
-# will assume that the directory in which it is stored is
20793
-# the $objdir directory. This is a cygwin/mingw-specific
20794
-# behavior.
20795
-func_emit_wrapper ()
20796
-{
20797
- func_emit_wrapper_arg1=no
20798
- if test -n "$1" ; then
20799
- func_emit_wrapper_arg1=$1
20800
- fi
20801
-
20802
- # split this up so that func_emit_cwrapperexe_src
20803
- # can call each part independently.
20804
- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
20805
- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
20806
-}
20807
-
20808
-
20809
-# func_to_host_path arg
20810
-#
20811
-# Convert paths to host format when used with build tools.
20812
-# Intended for use with "native" mingw (where libtool itself
20813
-# is running under the msys shell), or in the following cross-
20814
-# build environments:
20815
-# $build $host
20816
-# mingw (msys) mingw [e.g. native]
20817
-# cygwin mingw
20818
-# *nix + wine mingw
20819
-# where wine is equipped with the `winepath' executable.
20820
-# In the native mingw case, the (msys) shell automatically
20821
-# converts paths for any non-msys applications it launches,
20822
-# but that facility isn't available from inside the cwrapper.
20823
-# Similar accommodations are necessary for $host mingw and
20824
-# $build cygwin. Calling this function does no harm for other
20825
-# $host/$build combinations not listed above.
20826
-#
20827
-# ARG is the path (on $build) that should be converted to
20828
-# the proper representation for $host. The result is stored
20829
-# in $func_to_host_path_result.
20830
-func_to_host_path ()
20831
-{
20832
- func_to_host_path_result="$1"
20833
- if test -n "$1" ; then
20834
- case $host in
20835
- *mingw* )
20836
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
20837
- case $build in
20838
- *mingw* ) # actually, msys
20839
- # awkward: cmd appends spaces to result
20840
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
20841
- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
20842
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
20843
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
20844
- $SED -e "$lt_sed_naive_backslashify"`
20845
- ;;
20846
- *cygwin* )
20847
- func_to_host_path_tmp1=`cygpath -w "$1"`
20848
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
20849
- $SED -e "$lt_sed_naive_backslashify"`
20850
- ;;
20851
- * )
20852
- # Unfortunately, winepath does not exit with a non-zero
20853
- # error code, so we are forced to check the contents of
20854
- # stdout. On the other hand, if the command is not
20855
- # found, the shell will set an exit code of 127 and print
20856
- # *an error message* to stdout. So we must check for both
20857
- # error code of zero AND non-empty stdout, which explains
20858
- # the odd construction:
20859
- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
20860
- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
20861
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
20862
- $SED -e "$lt_sed_naive_backslashify"`
20863
- else
20864
- # Allow warning below.
20865
- func_to_host_path_result=""
20866
- fi
20867
- ;;
20868
- esac
20869
- if test -z "$func_to_host_path_result" ; then
20870
- func_error "Could not determine host path corresponding to"
20871
- func_error " '$1'"
20872
- func_error "Continuing, but uninstalled executables may not work."
20873
- # Fallback:
20874
- func_to_host_path_result="$1"
20875
- fi
20876
- ;;
20877
- esac
20878
- fi
20879
-}
20880
-# end: func_to_host_path
20881
20882
-# func_to_host_pathlist arg
20883
-#
20884
-# Convert pathlists to host format when used with build tools.
20885
-# See func_to_host_path(), above. This function supports the
20886
-# following $build/$host combinations (but does no harm for
20887
-# combinations not listed here):
20888
-# $build $host
20889
-# mingw (msys) mingw [e.g. native]
20890
-# cygwin mingw
20891
-# *nix + wine mingw
20892
-#
20893
-# Path separators are also converted from $build format to
20894
-# $host format. If ARG begins or ends with a path separator
20895
-# character, it is preserved (but converted to $host format)
20896
-# on output.
20897
-#
20898
-# ARG is a pathlist (on $build) that should be converted to
20899
-# the proper representation on $host. The result is stored
20900
-# in $func_to_host_pathlist_result.
20901
-func_to_host_pathlist ()
20902
-{
20903
- func_to_host_pathlist_result="$1"
20904
- if test -n "$1" ; then
20905
- case $host in
20906
- *mingw* )
20907
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
20908
- # Remove leading and trailing path separator characters from
20909
- # ARG. msys behavior is inconsistent here, cygpath turns them
20910
- # into '.;' and ';.', and winepath ignores them completely.
20911
- func_to_host_pathlist_tmp2="$1"
20912
- # Once set for this call, this variable should not be
20913
- # reassigned. It is used in tha fallback case.
20914
- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
20915
- $SED -e 's|^:*||' -e 's|:*$||'`
20916
- case $build in
20917
- *mingw* ) # Actually, msys.
20918
- # Awkward: cmd appends spaces to result.
20919
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
20920
- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
20921
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
20922
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
20923
- $SED -e "$lt_sed_naive_backslashify"`
20924
- ;;
20925
- *cygwin* )
20926
- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
20927
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
20928
- $SED -e "$lt_sed_naive_backslashify"`
20929
- ;;
20930
- * )
20931
- # unfortunately, winepath doesn't convert pathlists
20932
- func_to_host_pathlist_result=""
20933
- func_to_host_pathlist_oldIFS=$IFS
20934
- IFS=:
20935
- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
20936
- IFS=$func_to_host_pathlist_oldIFS
20937
- if test -n "$func_to_host_pathlist_f" ; then
20938
- func_to_host_path "$func_to_host_pathlist_f"
20939
- if test -n "$func_to_host_path_result" ; then
20940
- if test -z "$func_to_host_pathlist_result" ; then
20941
- func_to_host_pathlist_result="$func_to_host_path_result"
20942
- else
20943
- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
20944
- fi
20945
- fi
20946
- fi
20947
- IFS=:
20948
- done
20949
- IFS=$func_to_host_pathlist_oldIFS
20950
- ;;
20951
- esac
20952
- if test -z "$func_to_host_pathlist_result" ; then
20953
- func_error "Could not determine the host path(s) corresponding to"
20954
- func_error " '$1'"
20955
- func_error "Continuing, but uninstalled executables may not work."
20956
- # Fallback. This may break if $1 contains DOS-style drive
20957
- # specifications. The fix is not to complicate the expression
20958
- # below, but for the user to provide a working wine installation
20959
- # with winepath so that path translation in the cross-to-mingw
20960
- # case works properly.
20961
- lt_replace_pathsep_nix_to_dos="s|:|;|g"
20962
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
20963
- $SED -e "$lt_replace_pathsep_nix_to_dos"`
20964
- fi
20965
- # Now, add the leading and trailing path separators back
20966
- case "$1" in
20967
- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
20968
- ;;
20969
- esac
20970
- case "$1" in
20971
- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
20972
- ;;
20973
- esac
20974
- ;;
20975
- esac
20976
- fi
20977
-}
20978
-# end: func_to_host_pathlist
20979
20980
# func_emit_cwrapperexe_src
20981
# emit the source code for a wrapper executable on stdout
20982
@@ -3141,41 +4141,71 @@
20983
20984
This wrapper executable should never be moved out of the build directory.
20985
If it is, it will not operate correctly.
20986
-
20987
- Currently, it simply execs the wrapper *script* "$SHELL $output",
20988
- but could eventually absorb all of the scripts functionality and
20989
- exec $objdir/$outputname directly.
20990
*/
20991
EOF
20992
cat <<"EOF"
20993
+#ifdef _MSC_VER
20994
+# define _CRT_SECURE_NO_DEPRECATE 1
20995
+#endif
20996
#include <stdio.h>
20997
#include <stdlib.h>
20998
#ifdef _MSC_VER
20999
# include <direct.h>
21000
# include <process.h>
21001
# include <io.h>
21002
-# define setmode _setmode
21003
#else
21004
# include <unistd.h>
21005
# include <stdint.h>
21006
# ifdef __CYGWIN__
21007
# include <io.h>
21008
-# define HAVE_SETENV
21009
-# ifdef __STRICT_ANSI__
21010
+# endif
21011
+#endif
21012
+#include <malloc.h>
21013
+#include <stdarg.h>
21014
+#include <assert.h>
21015
+#include <string.h>
21016
+#include <ctype.h>
21017
+#include <errno.h>
21018
+#include <fcntl.h>
21019
+#include <sys/stat.h>
21020
+
21021
+/* declarations of non-ANSI functions */
21022
+#if defined(__MINGW32__)
21023
+# ifdef __STRICT_ANSI__
21024
+int _putenv (const char *);
21025
+# endif
21026
+#elif defined(__CYGWIN__)
21027
+# ifdef __STRICT_ANSI__
21028
char *realpath (const char *, char *);
21029
int putenv (char *);
21030
int setenv (const char *, const char *, int);
21031
-# endif
21032
# endif
21033
+/* #elif defined (other platforms) ... */
21034
+#endif
21035
+
21036
+/* portability defines, excluding path handling macros */
21037
+#if defined(_MSC_VER)
21038
+# define setmode _setmode
21039
+# define stat _stat
21040
+# define chmod _chmod
21041
+# define getcwd _getcwd
21042
+# define putenv _putenv
21043
+# define S_IXUSR _S_IEXEC
21044
+# ifndef _INTPTR_T_DEFINED
21045
+# define _INTPTR_T_DEFINED
21046
+# define intptr_t int
21047
+# endif
21048
+#elif defined(__MINGW32__)
21049
+# define setmode _setmode
21050
+# define stat _stat
21051
+# define chmod _chmod
21052
+# define getcwd _getcwd
21053
+# define putenv _putenv
21054
+#elif defined(__CYGWIN__)
21055
+# define HAVE_SETENV
21056
+# define FOPEN_WB "wb"
21057
+/* #elif defined (other platforms) ... */
21058
#endif
21059
-#include <malloc.h>
21060
-#include <stdarg.h>
21061
-#include <assert.h>
21062
-#include <string.h>
21063
-#include <ctype.h>
21064
-#include <errno.h>
21065
-#include <fcntl.h>
21066
-#include <sys/stat.h>
21067
21068
#if defined(PATH_MAX)
21069
# define LT_PATHMAX PATH_MAX
21070
@@ -3192,14 +4222,7 @@
21071
# define S_IXGRP 0
21072
#endif
21073
21074
-#ifdef _MSC_VER
21075
-# define S_IXUSR _S_IEXEC
21076
-# define stat _stat
21077
-# ifndef _INTPTR_T_DEFINED
21078
-# define intptr_t int
21079
-# endif
21080
-#endif
21081
-
21082
+/* path handling portability macros */
21083
#ifndef DIR_SEPARATOR
21084
# define DIR_SEPARATOR '/'
21085
# define PATH_SEPARATOR ':'
21086
@@ -3230,10 +4253,6 @@
21087
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
21088
#endif /* PATH_SEPARATOR_2 */
21089
21090
-#ifdef __CYGWIN__
21091
-# define FOPEN_WB "wb"
21092
-#endif
21093
-
21094
#ifndef FOPEN_WB
21095
# define FOPEN_WB "w"
21096
#endif
21097
@@ -3246,22 +4265,13 @@
21098
if (stale) { free ((void *) stale); stale = 0; } \
21099
} while (0)
21100
21101
-#undef LTWRAPPER_DEBUGPRINTF
21102
-#if defined DEBUGWRAPPER
21103
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
21104
-static void
21105
-ltwrapper_debugprintf (const char *fmt, ...)
21106
-{
21107
- va_list args;
21108
- va_start (args, fmt);
21109
- (void) vfprintf (stderr, fmt, args);
21110
- va_end (args);
21111
-}
21112
+#if defined(LT_DEBUGWRAPPER)
21113
+static int lt_debug = 1;
21114
#else
21115
-# define LTWRAPPER_DEBUGPRINTF(args)
21116
+static int lt_debug = 0;
21117
#endif
21118
21119
-const char *program_name = NULL;
21120
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
21121
21122
void *xmalloc (size_t num);
21123
char *xstrdup (const char *string);
21124
@@ -3271,41 +4281,27 @@
21125
int make_executable (const char *path);
21126
int check_executable (const char *path);
21127
char *strendzap (char *str, const char *pat);
21128
-void lt_fatal (const char *message, ...);
21129
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
21130
+void lt_fatal (const char *file, int line, const char *message, ...);
21131
+static const char *nonnull (const char *s);
21132
+static const char *nonempty (const char *s);
21133
void lt_setenv (const char *name, const char *value);
21134
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
21135
-void lt_opt_process_env_set (const char *arg);
21136
-void lt_opt_process_env_prepend (const char *arg);
21137
-void lt_opt_process_env_append (const char *arg);
21138
-int lt_split_name_value (const char *arg, char** name, char** value);
21139
void lt_update_exe_path (const char *name, const char *value);
21140
void lt_update_lib_path (const char *name, const char *value);
21141
-
21142
-static const char *script_text_part1 =
21143
-EOF
21144
-
21145
- func_emit_wrapper_part1 yes |
21146
- $SED -e 's/\([\\"]\)/\\\1/g' \
21147
- -e 's/^/ "/' -e 's/$/\\n"/'
21148
- echo ";"
21149
- cat <<EOF
21150
-
21151
-static const char *script_text_part2 =
21152
+char **prepare_spawn (char **argv);
21153
+void lt_dump_script (FILE *f);
21154
EOF
21155
- func_emit_wrapper_part2 yes |
21156
- $SED -e 's/\([\\"]\)/\\\1/g' \
21157
- -e 's/^/ "/' -e 's/$/\\n"/'
21158
- echo ";"
21159
21160
cat <<EOF
21161
-const char * MAGIC_EXE = "$magic_exe";
21162
+volatile const char * MAGIC_EXE = "$magic_exe";
21163
const char * LIB_PATH_VARNAME = "$shlibpath_var";
21164
EOF
21165
21166
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
21167
- func_to_host_pathlist "$temp_rpath"
21168
+ func_to_host_path "$temp_rpath"
21169
cat <<EOF
21170
-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
21171
+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
21172
EOF
21173
else
21174
cat <<"EOF"
21175
@@ -3314,10 +4310,10 @@
21176
fi
21177
21178
if test -n "$dllsearchpath"; then
21179
- func_to_host_pathlist "$dllsearchpath:"
21180
+ func_to_host_path "$dllsearchpath:"
21181
cat <<EOF
21182
const char * EXE_PATH_VARNAME = "PATH";
21183
-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
21184
+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
21185
EOF
21186
else
21187
cat <<"EOF"
21188
@@ -3340,24 +4336,10 @@
21189
cat <<"EOF"
21190
21191
#define LTWRAPPER_OPTION_PREFIX "--lt-"
21192
-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
21193
21194
-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
21195
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
21196
-
21197
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
21198
-
21199
-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
21200
-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
21201
- /* argument is putenv-style "foo=bar", value of foo is set to bar */
21202
-
21203
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
21204
-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
21205
- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
21206
-
21207
-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
21208
-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
21209
- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
21210
+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
21211
21212
int
21213
main (int argc, char *argv[])
21214
@@ -3374,10 +4356,13 @@
21215
int i;
21216
21217
program_name = (char *) xstrdup (base_name (argv[0]));
21218
- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
21219
- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
21220
+ newargz = XMALLOC (char *, argc + 1);
21221
21222
- /* very simple arg parsing; don't want to rely on getopt */
21223
+ /* very simple arg parsing; don't want to rely on getopt
21224
+ * also, copy all non cwrapper options to newargz, except
21225
+ * argz[0], which is handled differently
21226
+ */
21227
+ newargc=0;
21228
for (i = 1; i < argc; i++)
21229
{
21230
if (strcmp (argv[i], dumpscript_opt) == 0)
21231
@@ -3391,25 +4376,57 @@
21232
esac
21233
21234
cat <<"EOF"
21235
- printf ("%s", script_text_part1);
21236
- printf ("%s", script_text_part2);
21237
+ lt_dump_script (stdout);
21238
return 0;
21239
}
21240
+ if (strcmp (argv[i], debug_opt) == 0)
21241
+ {
21242
+ lt_debug = 1;
21243
+ continue;
21244
+ }
21245
+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
21246
+ {
21247
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
21248
+ namespace, but it is not one of the ones we know about and
21249
+ have already dealt with, above (inluding dump-script), then
21250
+ report an error. Otherwise, targets might begin to believe
21251
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
21252
+ namespace. The first time any user complains about this, we'll
21253
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
21254
+ or a configure.ac-settable value.
21255
+ */
21256
+ lt_fatal (__FILE__, __LINE__,
21257
+ "unrecognized %s option: '%s'",
21258
+ ltwrapper_option_prefix, argv[i]);
21259
+ }
21260
+ /* otherwise ... */
21261
+ newargz[++newargc] = xstrdup (argv[i]);
21262
}
21263
+ newargz[++newargc] = NULL;
21264
+
21265
+EOF
21266
+ cat <<EOF
21267
+ /* The GNU banner must be the first non-error debug message */
21268
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
21269
+EOF
21270
+ cat <<"EOF"
21271
+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
21272
+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
21273
21274
- newargz = XMALLOC (char *, argc + 1);
21275
tmp_pathspec = find_executable (argv[0]);
21276
if (tmp_pathspec == NULL)
21277
- lt_fatal ("Couldn't find %s", argv[0]);
21278
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
21279
- tmp_pathspec));
21280
+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
21281
+ lt_debugprintf (__FILE__, __LINE__,
21282
+ "(main) found exe (before symlink chase) at: %s\n",
21283
+ tmp_pathspec);
21284
21285
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
21286
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
21287
- actual_cwrapper_path));
21288
+ lt_debugprintf (__FILE__, __LINE__,
21289
+ "(main) found exe (after symlink chase) at: %s\n",
21290
+ actual_cwrapper_path);
21291
XFREE (tmp_pathspec);
21292
21293
- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
21294
+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
21295
strendzap (actual_cwrapper_path, actual_cwrapper_name);
21296
21297
/* wrapper name transforms */
21298
@@ -3427,8 +4444,9 @@
21299
target_name = tmp_pathspec;
21300
tmp_pathspec = 0;
21301
21302
- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
21303
- target_name));
21304
+ lt_debugprintf (__FILE__, __LINE__,
21305
+ "(main) libtool target name: %s\n",
21306
+ target_name);
21307
EOF
21308
21309
cat <<EOF
21310
@@ -3478,80 +4496,19 @@
21311
21312
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
21313
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
21314
- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
21315
+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
21316
+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
21317
+ because on Windows, both *_VARNAMEs are PATH but uninstalled
21318
+ libraries must come first. */
21319
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
21320
+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
21321
21322
- newargc=0;
21323
- for (i = 1; i < argc; i++)
21324
- {
21325
- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
21326
- {
21327
- if (argv[i][env_set_opt_len] == '=')
21328
- {
21329
- const char *p = argv[i] + env_set_opt_len + 1;
21330
- lt_opt_process_env_set (p);
21331
- }
21332
- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
21333
- {
21334
- lt_opt_process_env_set (argv[++i]); /* don't copy */
21335
- }
21336
- else
21337
- lt_fatal ("%s missing required argument", env_set_opt);
21338
- continue;
21339
- }
21340
- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
21341
- {
21342
- if (argv[i][env_prepend_opt_len] == '=')
21343
- {
21344
- const char *p = argv[i] + env_prepend_opt_len + 1;
21345
- lt_opt_process_env_prepend (p);
21346
- }
21347
- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
21348
- {
21349
- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
21350
- }
21351
- else
21352
- lt_fatal ("%s missing required argument", env_prepend_opt);
21353
- continue;
21354
- }
21355
- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
21356
- {
21357
- if (argv[i][env_append_opt_len] == '=')
21358
- {
21359
- const char *p = argv[i] + env_append_opt_len + 1;
21360
- lt_opt_process_env_append (p);
21361
- }
21362
- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
21363
- {
21364
- lt_opt_process_env_append (argv[++i]); /* don't copy */
21365
- }
21366
- else
21367
- lt_fatal ("%s missing required argument", env_append_opt);
21368
- continue;
21369
- }
21370
- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
21371
- {
21372
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
21373
- namespace, but it is not one of the ones we know about and
21374
- have already dealt with, above (inluding dump-script), then
21375
- report an error. Otherwise, targets might begin to believe
21376
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
21377
- namespace. The first time any user complains about this, we'll
21378
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
21379
- or a configure.ac-settable value.
21380
- */
21381
- lt_fatal ("Unrecognized option in %s namespace: '%s'",
21382
- ltwrapper_option_prefix, argv[i]);
21383
- }
21384
- /* otherwise ... */
21385
- newargz[++newargc] = xstrdup (argv[i]);
21386
- }
21387
- newargz[++newargc] = NULL;
21388
-
21389
- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
21390
+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
21391
+ nonnull (lt_argv_zero));
21392
for (i = 0; i < newargc; i++)
21393
{
21394
- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
21395
+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
21396
+ i, nonnull (newargz[i]));
21397
}
21398
21399
EOF
21400
@@ -3560,11 +4517,14 @@
21401
mingw*)
21402
cat <<"EOF"
21403
/* execv doesn't actually work on mingw as expected on unix */
21404
+ newargz = prepare_spawn (newargz);
21405
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
21406
if (rval == -1)
21407
{
21408
/* failed to start process */
21409
- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
21410
+ lt_debugprintf (__FILE__, __LINE__,
21411
+ "(main) failed to launch target \"%s\": %s\n",
21412
+ lt_argv_zero, nonnull (strerror (errno)));
21413
return 127;
21414
}
21415
return rval;
21416
@@ -3586,7 +4546,7 @@
21417
{
21418
void *p = (void *) malloc (num);
21419
if (!p)
21420
- lt_fatal ("Memory exhausted");
21421
+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
21422
21423
return p;
21424
}
21425
@@ -3620,8 +4580,8 @@
21426
{
21427
struct stat st;
21428
21429
- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
21430
- path ? (*path ? path : "EMPTY!") : "NULL!"));
21431
+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
21432
+ nonempty (path));
21433
if ((!path) || (!*path))
21434
return 0;
21435
21436
@@ -3638,8 +4598,8 @@
21437
int rval = 0;
21438
struct stat st;
21439
21440
- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
21441
- path ? (*path ? path : "EMPTY!") : "NULL!"));
21442
+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
21443
+ nonempty (path));
21444
if ((!path) || (!*path))
21445
return 0;
21446
21447
@@ -3665,8 +4625,8 @@
21448
int tmp_len;
21449
char *concat_name;
21450
21451
- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
21452
- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
21453
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
21454
+ nonempty (wrapper));
21455
21456
if ((wrapper == NULL) || (*wrapper == '\0'))
21457
return NULL;
21458
@@ -3719,7 +4679,8 @@
21459
{
21460
/* empty path: current directory */
21461
if (getcwd (tmp, LT_PATHMAX) == NULL)
21462
- lt_fatal ("getcwd failed");
21463
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
21464
+ nonnull (strerror (errno)));
21465
tmp_len = strlen (tmp);
21466
concat_name =
21467
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
21468
@@ -3744,7 +4705,8 @@
21469
}
21470
/* Relative path | not found in path: prepend cwd */
21471
if (getcwd (tmp, LT_PATHMAX) == NULL)
21472
- lt_fatal ("getcwd failed");
21473
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
21474
+ nonnull (strerror (errno)));
21475
tmp_len = strlen (tmp);
21476
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
21477
memcpy (concat_name, tmp, tmp_len);
21478
@@ -3770,8 +4732,9 @@
21479
int has_symlinks = 0;
21480
while (strlen (tmp_pathspec) && !has_symlinks)
21481
{
21482
- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
21483
- tmp_pathspec));
21484
+ lt_debugprintf (__FILE__, __LINE__,
21485
+ "checking path component for symlinks: %s\n",
21486
+ tmp_pathspec);
21487
if (lstat (tmp_pathspec, &s) == 0)
21488
{
21489
if (S_ISLNK (s.st_mode) != 0)
21490
@@ -3793,8 +4756,9 @@
21491
}
21492
else
21493
{
21494
- char *errstr = strerror (errno);
21495
- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
21496
+ lt_fatal (__FILE__, __LINE__,
21497
+ "error accessing file \"%s\": %s",
21498
+ tmp_pathspec, nonnull (strerror (errno)));
21499
}
21500
}
21501
XFREE (tmp_pathspec);
21502
@@ -3807,7 +4771,8 @@
21503
tmp_pathspec = realpath (pathspec, buf);
21504
if (tmp_pathspec == 0)
21505
{
21506
- lt_fatal ("Could not follow symlinks for %s", pathspec);
21507
+ lt_fatal (__FILE__, __LINE__,
21508
+ "could not follow symlinks for %s", pathspec);
21509
}
21510
return xstrdup (tmp_pathspec);
21511
#endif
21512
@@ -3833,11 +4798,25 @@
21513
return str;
21514
}
21515
21516
+void
21517
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
21518
+{
21519
+ va_list args;
21520
+ if (lt_debug)
21521
+ {
21522
+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
21523
+ va_start (args, fmt);
21524
+ (void) vfprintf (stderr, fmt, args);
21525
+ va_end (args);
21526
+ }
21527
+}
21528
+
21529
static void
21530
-lt_error_core (int exit_status, const char *mode,
21531
+lt_error_core (int exit_status, const char *file,
21532
+ int line, const char *mode,
21533
const char *message, va_list ap)
21534
{
21535
- fprintf (stderr, "%s: %s: ", program_name, mode);
21536
+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
21537
vfprintf (stderr, message, ap);
21538
fprintf (stderr, ".\n");
21539
21540
@@ -3846,20 +4825,32 @@
21541
}
21542
21543
void
21544
-lt_fatal (const char *message, ...)
21545
+lt_fatal (const char *file, int line, const char *message, ...)
21546
{
21547
va_list ap;
21548
va_start (ap, message);
21549
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
21550
+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
21551
va_end (ap);
21552
}
21553
21554
+static const char *
21555
+nonnull (const char *s)
21556
+{
21557
+ return s ? s : "(null)";
21558
+}
21559
+
21560
+static const char *
21561
+nonempty (const char *s)
21562
+{
21563
+ return (s && !*s) ? "(empty)" : nonnull (s);
21564
+}
21565
+
21566
void
21567
lt_setenv (const char *name, const char *value)
21568
{
21569
- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
21570
- (name ? name : "<NULL>"),
21571
- (value ? value : "<NULL>")));
21572
+ lt_debugprintf (__FILE__, __LINE__,
21573
+ "(lt_setenv) setting '%s' to '%s'\n",
21574
+ nonnull (name), nonnull (value));
21575
{
21576
#ifdef HAVE_SETENV
21577
/* always make a copy, for consistency with !HAVE_SETENV */
21578
@@ -3904,95 +4895,12 @@
21579
return new_value;
21580
}
21581
21582
-int
21583
-lt_split_name_value (const char *arg, char** name, char** value)
21584
-{
21585
- const char *p;
21586
- int len;
21587
- if (!arg || !*arg)
21588
- return 1;
21589
-
21590
- p = strchr (arg, (int)'=');
21591
-
21592
- if (!p)
21593
- return 1;
21594
-
21595
- *value = xstrdup (++p);
21596
-
21597
- len = strlen (arg) - strlen (*value);
21598
- *name = XMALLOC (char, len);
21599
- strncpy (*name, arg, len-1);
21600
- (*name)[len - 1] = '\0';
21601
-
21602
- return 0;
21603
-}
21604
-
21605
-void
21606
-lt_opt_process_env_set (const char *arg)
21607
-{
21608
- char *name = NULL;
21609
- char *value = NULL;
21610
-
21611
- if (lt_split_name_value (arg, &name, &value) != 0)
21612
- {
21613
- XFREE (name);
21614
- XFREE (value);
21615
- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
21616
- }
21617
-
21618
- lt_setenv (name, value);
21619
- XFREE (name);
21620
- XFREE (value);
21621
-}
21622
-
21623
-void
21624
-lt_opt_process_env_prepend (const char *arg)
21625
-{
21626
- char *name = NULL;
21627
- char *value = NULL;
21628
- char *new_value = NULL;
21629
-
21630
- if (lt_split_name_value (arg, &name, &value) != 0)
21631
- {
21632
- XFREE (name);
21633
- XFREE (value);
21634
- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
21635
- }
21636
-
21637
- new_value = lt_extend_str (getenv (name), value, 0);
21638
- lt_setenv (name, new_value);
21639
- XFREE (new_value);
21640
- XFREE (name);
21641
- XFREE (value);
21642
-}
21643
-
21644
-void
21645
-lt_opt_process_env_append (const char *arg)
21646
-{
21647
- char *name = NULL;
21648
- char *value = NULL;
21649
- char *new_value = NULL;
21650
-
21651
- if (lt_split_name_value (arg, &name, &value) != 0)
21652
- {
21653
- XFREE (name);
21654
- XFREE (value);
21655
- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
21656
- }
21657
-
21658
- new_value = lt_extend_str (getenv (name), value, 1);
21659
- lt_setenv (name, new_value);
21660
- XFREE (new_value);
21661
- XFREE (name);
21662
- XFREE (value);
21663
-}
21664
-
21665
void
21666
lt_update_exe_path (const char *name, const char *value)
21667
{
21668
- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
21669
- (name ? name : "<NULL>"),
21670
- (value ? value : "<NULL>")));
21671
+ lt_debugprintf (__FILE__, __LINE__,
21672
+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
21673
+ nonnull (name), nonnull (value));
21674
21675
if (name && *name && value && *value)
21676
{
21677
@@ -4011,9 +4919,9 @@
21678
void
21679
lt_update_lib_path (const char *name, const char *value)
21680
{
21681
- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
21682
- (name ? name : "<NULL>"),
21683
- (value ? value : "<NULL>")));
21684
+ lt_debugprintf (__FILE__, __LINE__,
21685
+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
21686
+ nonnull (name), nonnull (value));
21687
21688
if (name && *name && value && *value)
21689
{
21690
@@ -4023,11 +4931,152 @@
21691
}
21692
}
21693
21694
+EOF
21695
+ case $host_os in
21696
+ mingw*)
21697
+ cat <<"EOF"
21698
+
21699
+/* Prepares an argument vector before calling spawn().
21700
+ Note that spawn() does not by itself call the command interpreter
21701
+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
21702
+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
21703
+ GetVersionEx(&v);
21704
+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
21705
+ }) ? "cmd.exe" : "command.com").
21706
+ Instead it simply concatenates the arguments, separated by ' ', and calls
21707
+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
21708
+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
21709
+ special way:
21710
+ - Space and tab are interpreted as delimiters. They are not treated as
21711
+ delimiters if they are surrounded by double quotes: "...".
21712
+ - Unescaped double quotes are removed from the input. Their only effect is
21713
+ that within double quotes, space and tab are treated like normal
21714
+ characters.
21715
+ - Backslashes not followed by double quotes are not special.
21716
+ - But 2*n+1 backslashes followed by a double quote become
21717
+ n backslashes followed by a double quote (n >= 0):
21718
+ \" -> "
21719
+ \\\" -> \"
21720
+ \\\\\" -> \\"
21721
+ */
21722
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
21723
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
21724
+char **
21725
+prepare_spawn (char **argv)
21726
+{
21727
+ size_t argc;
21728
+ char **new_argv;
21729
+ size_t i;
21730
+
21731
+ /* Count number of arguments. */
21732
+ for (argc = 0; argv[argc] != NULL; argc++)
21733
+ ;
21734
+
21735
+ /* Allocate new argument vector. */
21736
+ new_argv = XMALLOC (char *, argc + 1);
21737
+
21738
+ /* Put quoted arguments into the new argument vector. */
21739
+ for (i = 0; i < argc; i++)
21740
+ {
21741
+ const char *string = argv[i];
21742
+
21743
+ if (string[0] == '\0')
21744
+ new_argv[i] = xstrdup ("\"\"");
21745
+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
21746
+ {
21747
+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
21748
+ size_t length;
21749
+ unsigned int backslashes;
21750
+ const char *s;
21751
+ char *quoted_string;
21752
+ char *p;
21753
+
21754
+ length = 0;
21755
+ backslashes = 0;
21756
+ if (quote_around)
21757
+ length++;
21758
+ for (s = string; *s != '\0'; s++)
21759
+ {
21760
+ char c = *s;
21761
+ if (c == '"')
21762
+ length += backslashes + 1;
21763
+ length++;
21764
+ if (c == '\\')
21765
+ backslashes++;
21766
+ else
21767
+ backslashes = 0;
21768
+ }
21769
+ if (quote_around)
21770
+ length += backslashes + 1;
21771
+
21772
+ quoted_string = XMALLOC (char, length + 1);
21773
+
21774
+ p = quoted_string;
21775
+ backslashes = 0;
21776
+ if (quote_around)
21777
+ *p++ = '"';
21778
+ for (s = string; *s != '\0'; s++)
21779
+ {
21780
+ char c = *s;
21781
+ if (c == '"')
21782
+ {
21783
+ unsigned int j;
21784
+ for (j = backslashes + 1; j > 0; j--)
21785
+ *p++ = '\\';
21786
+ }
21787
+ *p++ = c;
21788
+ if (c == '\\')
21789
+ backslashes++;
21790
+ else
21791
+ backslashes = 0;
21792
+ }
21793
+ if (quote_around)
21794
+ {
21795
+ unsigned int j;
21796
+ for (j = backslashes; j > 0; j--)
21797
+ *p++ = '\\';
21798
+ *p++ = '"';
21799
+ }
21800
+ *p = '\0';
21801
+
21802
+ new_argv[i] = quoted_string;
21803
+ }
21804
+ else
21805
+ new_argv[i] = (char *) string;
21806
+ }
21807
+ new_argv[argc] = NULL;
21808
+
21809
+ return new_argv;
21810
+}
21811
+EOF
21812
+ ;;
21813
+ esac
21814
+
21815
+ cat <<"EOF"
21816
+void lt_dump_script (FILE* f)
21817
+{
21818
+EOF
21819
+ func_emit_wrapper yes |
21820
+ $SED -e 's/\([\\"]\)/\\\1/g' \
21821
+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
21822
21823
+ cat <<"EOF"
21824
+}
21825
EOF
21826
}
21827
# end: func_emit_cwrapperexe_src
21828
21829
+# func_win32_import_lib_p ARG
21830
+# True if ARG is an import lib, as indicated by $file_magic_cmd
21831
+func_win32_import_lib_p ()
21832
+{
21833
+ $opt_debug
21834
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
21835
+ *import*) : ;;
21836
+ *) false ;;
21837
+ esac
21838
+}
21839
+
21840
# func_mode_link arg...
21841
func_mode_link ()
21842
{
21843
@@ -4072,6 +5121,7 @@
21844
new_inherited_linker_flags=
21845
21846
avoid_version=no
21847
+ bindir=
21848
dlfiles=
21849
dlprefiles=
21850
dlself=no
21851
@@ -4164,6 +5214,11 @@
21852
esac
21853
21854
case $prev in
21855
+ bindir)
21856
+ bindir="$arg"
21857
+ prev=
21858
+ continue
21859
+ ;;
21860
dlfiles|dlprefiles)
21861
if test "$preload" = no; then
21862
# Add the symbol object into the linking commands.
21863
@@ -4195,9 +5250,9 @@
21864
;;
21865
*)
21866
if test "$prev" = dlfiles; then
21867
- dlfiles="$dlfiles $arg"
21868
+ func_append dlfiles " $arg"
21869
else
21870
- dlprefiles="$dlprefiles $arg"
21871
+ func_append dlprefiles " $arg"
21872
fi
21873
prev=
21874
continue
21875
@@ -4221,7 +5276,7 @@
21876
*-*-darwin*)
21877
case "$deplibs " in
21878
*" $qarg.ltframework "*) ;;
21879
- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
21880
+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
21881
;;
21882
esac
21883
;;
21884
@@ -4240,7 +5295,7 @@
21885
moreargs=
21886
for fil in `cat "$save_arg"`
21887
do
21888
-# moreargs="$moreargs $fil"
21889
+# func_append moreargs " $fil"
21890
arg=$fil
21891
# A libtool-controlled object.
21892
21893
@@ -4269,7 +5324,7 @@
21894
21895
if test "$prev" = dlfiles; then
21896
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
21897
- dlfiles="$dlfiles $pic_object"
21898
+ func_append dlfiles " $pic_object"
21899
prev=
21900
continue
21901
else
21902
@@ -4281,7 +5336,7 @@
21903
# CHECK ME: I think I busted this. -Ossama
21904
if test "$prev" = dlprefiles; then
21905
# Preload the old-style object.
21906
- dlprefiles="$dlprefiles $pic_object"
21907
+ func_append dlprefiles " $pic_object"
21908
prev=
21909
fi
21910
21911
@@ -4351,12 +5406,12 @@
21912
if test "$prev" = rpath; then
21913
case "$rpath " in
21914
*" $arg "*) ;;
21915
- *) rpath="$rpath $arg" ;;
21916
+ *) func_append rpath " $arg" ;;
21917
esac
21918
else
21919
case "$xrpath " in
21920
*" $arg "*) ;;
21921
- *) xrpath="$xrpath $arg" ;;
21922
+ *) func_append xrpath " $arg" ;;
21923
esac
21924
fi
21925
prev=
21926
@@ -4368,28 +5423,28 @@
21927
continue
21928
;;
21929
weak)
21930
- weak_libs="$weak_libs $arg"
21931
+ func_append weak_libs " $arg"
21932
prev=
21933
continue
21934
;;
21935
xcclinker)
21936
- linker_flags="$linker_flags $qarg"
21937
- compiler_flags="$compiler_flags $qarg"
21938
+ func_append linker_flags " $qarg"
21939
+ func_append compiler_flags " $qarg"
21940
prev=
21941
func_append compile_command " $qarg"
21942
func_append finalize_command " $qarg"
21943
continue
21944
;;
21945
xcompiler)
21946
- compiler_flags="$compiler_flags $qarg"
21947
+ func_append compiler_flags " $qarg"
21948
prev=
21949
func_append compile_command " $qarg"
21950
func_append finalize_command " $qarg"
21951
continue
21952
;;
21953
xlinker)
21954
- linker_flags="$linker_flags $qarg"
21955
- compiler_flags="$compiler_flags $wl$qarg"
21956
+ func_append linker_flags " $qarg"
21957
+ func_append compiler_flags " $wl$qarg"
21958
prev=
21959
func_append compile_command " $wl$qarg"
21960
func_append finalize_command " $wl$qarg"
21961
@@ -4425,6 +5480,11 @@
21962
continue
21963
;;
21964
21965
+ -bindir)
21966
+ prev=bindir
21967
+ continue
21968
+ ;;
21969
+
21970
-dlopen)
21971
prev=dlfiles
21972
continue
21973
@@ -4475,15 +5535,16 @@
21974
;;
21975
21976
-L*)
21977
- func_stripname '-L' '' "$arg"
21978
- dir=$func_stripname_result
21979
- if test -z "$dir"; then
21980
+ func_stripname "-L" '' "$arg"
21981
+ if test -z "$func_stripname_result"; then
21982
if test "$#" -gt 0; then
21983
func_fatal_error "require no space between \`-L' and \`$1'"
21984
else
21985
func_fatal_error "need path for \`-L' option"
21986
fi
21987
fi
21988
+ func_resolve_sysroot "$func_stripname_result"
21989
+ dir=$func_resolve_sysroot_result
21990
# We need an absolute path.
21991
case $dir in
21992
[\\/]* | [A-Za-z]:[\\/]*) ;;
21993
@@ -4495,24 +5556,30 @@
21994
;;
21995
esac
21996
case "$deplibs " in
21997
- *" -L$dir "*) ;;
21998
+ *" -L$dir "* | *" $arg "*)
21999
+ # Will only happen for absolute or sysroot arguments
22000
+ ;;
22001
*)
22002
- deplibs="$deplibs -L$dir"
22003
- lib_search_path="$lib_search_path $dir"
22004
+ # Preserve sysroot, but never include relative directories
22005
+ case $dir in
22006
+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
22007
+ *) func_append deplibs " -L$dir" ;;
22008
+ esac
22009
+ func_append lib_search_path " $dir"
22010
;;
22011
esac
22012
case $host in
22013
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
22014
- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
22015
+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
22016
case :$dllsearchpath: in
22017
*":$dir:"*) ;;
22018
::) dllsearchpath=$dir;;
22019
- *) dllsearchpath="$dllsearchpath:$dir";;
22020
+ *) func_append dllsearchpath ":$dir";;
22021
esac
22022
case :$dllsearchpath: in
22023
*":$testbindir:"*) ;;
22024
::) dllsearchpath=$testbindir;;
22025
- *) dllsearchpath="$dllsearchpath:$testbindir";;
22026
+ *) func_append dllsearchpath ":$testbindir";;
22027
esac
22028
;;
22029
esac
22030
@@ -4522,7 +5589,7 @@
22031
-l*)
22032
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
22033
case $host in
22034
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
22035
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
22036
# These systems don't actually have a C or math library (as such)
22037
continue
22038
;;
22039
@@ -4536,7 +5603,7 @@
22040
;;
22041
*-*-rhapsody* | *-*-darwin1.[012])
22042
# Rhapsody C and math libraries are in the System framework
22043
- deplibs="$deplibs System.ltframework"
22044
+ func_append deplibs " System.ltframework"
22045
continue
22046
;;
22047
*-*-sco3.2v5* | *-*-sco5v6*)
22048
@@ -4556,7 +5623,7 @@
22049
;;
22050
esac
22051
fi
22052
- deplibs="$deplibs $arg"
22053
+ func_append deplibs " $arg"
22054
continue
22055
;;
22056
22057
@@ -4568,8 +5635,8 @@
22058
# Tru64 UNIX uses -model [arg] to determine the layout of C++
22059
# classes, name mangling, and exception handling.
22060
# Darwin uses the -arch flag to determine output architecture.
22061
- -model|-arch|-isysroot)
22062
- compiler_flags="$compiler_flags $arg"
22063
+ -model|-arch|-isysroot|--sysroot)
22064
+ func_append compiler_flags " $arg"
22065
func_append compile_command " $arg"
22066
func_append finalize_command " $arg"
22067
prev=xcompiler
22068
@@ -4577,12 +5644,12 @@
22069
;;
22070
22071
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
22072
- compiler_flags="$compiler_flags $arg"
22073
+ func_append compiler_flags " $arg"
22074
func_append compile_command " $arg"
22075
func_append finalize_command " $arg"
22076
case "$new_inherited_linker_flags " in
22077
*" $arg "*) ;;
22078
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
22079
+ * ) func_append new_inherited_linker_flags " $arg" ;;
22080
esac
22081
continue
22082
;;
22083
@@ -4649,13 +5716,17 @@
22084
# We need an absolute path.
22085
case $dir in
22086
[\\/]* | [A-Za-z]:[\\/]*) ;;
22087
+ =*)
22088
+ func_stripname '=' '' "$dir"
22089
+ dir=$lt_sysroot$func_stripname_result
22090
+ ;;
22091
*)
22092
func_fatal_error "only absolute run-paths are allowed"
22093
;;
22094
esac
22095
case "$xrpath " in
22096
*" $dir "*) ;;
22097
- *) xrpath="$xrpath $dir" ;;
22098
+ *) func_append xrpath " $dir" ;;
22099
esac
22100
continue
22101
;;
22102
@@ -4708,8 +5779,8 @@
22103
for flag in $args; do
22104
IFS="$save_ifs"
22105
func_quote_for_eval "$flag"
22106
- arg="$arg $wl$func_quote_for_eval_result"
22107
- compiler_flags="$compiler_flags $func_quote_for_eval_result"
22108
+ func_append arg " $func_quote_for_eval_result"
22109
+ func_append compiler_flags " $func_quote_for_eval_result"
22110
done
22111
IFS="$save_ifs"
22112
func_stripname ' ' '' "$arg"
22113
@@ -4724,9 +5795,9 @@
22114
for flag in $args; do
22115
IFS="$save_ifs"
22116
func_quote_for_eval "$flag"
22117
- arg="$arg $wl$func_quote_for_eval_result"
22118
- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
22119
- linker_flags="$linker_flags $func_quote_for_eval_result"
22120
+ func_append arg " $wl$func_quote_for_eval_result"
22121
+ func_append compiler_flags " $wl$func_quote_for_eval_result"
22122
+ func_append linker_flags " $func_quote_for_eval_result"
22123
done
22124
IFS="$save_ifs"
22125
func_stripname ' ' '' "$arg"
22126
@@ -4754,23 +5825,27 @@
22127
arg="$func_quote_for_eval_result"
22128
;;
22129
22130
- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
22131
- # -r[0-9][0-9]* specifies the processor on the SGI compiler
22132
- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
22133
- # +DA*, +DD* enable 64-bit mode on the HP compiler
22134
- # -q* pass through compiler args for the IBM compiler
22135
- # -m*, -t[45]*, -txscale* pass through architecture-specific
22136
- # compiler args for GCC
22137
- # -F/path gives path to uninstalled frameworks, gcc on darwin
22138
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
22139
- # @file GCC response files
22140
+ # Flags to be passed through unchanged, with rationale:
22141
+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
22142
+ # -r[0-9][0-9]* specify processor for the SGI compiler
22143
+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
22144
+ # +DA*, +DD* enable 64-bit mode for the HP compiler
22145
+ # -q* compiler args for the IBM compiler
22146
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
22147
+ # -F/path path to uninstalled frameworks, gcc on darwin
22148
+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
22149
+ # @file GCC response files
22150
+ # -tp=* Portland pgcc target processor selection
22151
+ # --sysroot=* for sysroot support
22152
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
22153
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
22154
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
22155
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
22156
+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
22157
func_quote_for_eval "$arg"
22158
arg="$func_quote_for_eval_result"
22159
func_append compile_command " $arg"
22160
func_append finalize_command " $arg"
22161
- compiler_flags="$compiler_flags $arg"
22162
+ func_append compiler_flags " $arg"
22163
continue
22164
;;
22165
22166
@@ -4782,7 +5857,7 @@
22167
22168
*.$objext)
22169
# A standard object.
22170
- objs="$objs $arg"
22171
+ func_append objs " $arg"
22172
;;
22173
22174
*.lo)
22175
@@ -4813,7 +5888,7 @@
22176
22177
if test "$prev" = dlfiles; then
22178
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
22179
- dlfiles="$dlfiles $pic_object"
22180
+ func_append dlfiles " $pic_object"
22181
prev=
22182
continue
22183
else
22184
@@ -4825,7 +5900,7 @@
22185
# CHECK ME: I think I busted this. -Ossama
22186
if test "$prev" = dlprefiles; then
22187
# Preload the old-style object.
22188
- dlprefiles="$dlprefiles $pic_object"
22189
+ func_append dlprefiles " $pic_object"
22190
prev=
22191
fi
22192
22193
@@ -4870,24 +5945,25 @@
22194
22195
*.$libext)
22196
# An archive.
22197
- deplibs="$deplibs $arg"
22198
- old_deplibs="$old_deplibs $arg"
22199
+ func_append deplibs " $arg"
22200
+ func_append old_deplibs " $arg"
22201
continue
22202
;;
22203
22204
*.la)
22205
# A libtool-controlled library.
22206
22207
+ func_resolve_sysroot "$arg"
22208
if test "$prev" = dlfiles; then
22209
# This library was specified with -dlopen.
22210
- dlfiles="$dlfiles $arg"
22211
+ func_append dlfiles " $func_resolve_sysroot_result"
22212
prev=
22213
elif test "$prev" = dlprefiles; then
22214
# The library was specified with -dlpreopen.
22215
- dlprefiles="$dlprefiles $arg"
22216
+ func_append dlprefiles " $func_resolve_sysroot_result"
22217
prev=
22218
else
22219
- deplibs="$deplibs $arg"
22220
+ func_append deplibs " $func_resolve_sysroot_result"
22221
fi
22222
continue
22223
;;
22224
@@ -4925,7 +6001,7 @@
22225
22226
if test -n "$shlibpath_var"; then
22227
# get the directories listed in $shlibpath_var
22228
- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
22229
+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
22230
else
22231
shlib_search_path=
22232
fi
22233
@@ -4934,6 +6010,8 @@
22234
22235
func_dirname "$output" "/" ""
22236
output_objdir="$func_dirname_result$objdir"
22237
+ func_to_tool_file "$output_objdir/"
22238
+ tool_output_objdir=$func_to_tool_file_result
22239
# Create the object directory.
22240
func_mkdir_p "$output_objdir"
22241
22242
@@ -4954,12 +6032,12 @@
22243
# Find all interdependent deplibs by searching for libraries
22244
# that are linked more than once (e.g. -la -lb -la)
22245
for deplib in $deplibs; do
22246
- if $opt_duplicate_deps ; then
22247
+ if $opt_preserve_dup_deps ; then
22248
case "$libs " in
22249
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
22250
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
22251
esac
22252
fi
22253
- libs="$libs $deplib"
22254
+ func_append libs " $deplib"
22255
done
22256
22257
if test "$linkmode" = lib; then
22258
@@ -4972,9 +6050,9 @@
22259
if $opt_duplicate_compiler_generated_deps; then
22260
for pre_post_dep in $predeps $postdeps; do
22261
case "$pre_post_deps " in
22262
- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
22263
+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
22264
esac
22265
- pre_post_deps="$pre_post_deps $pre_post_dep"
22266
+ func_append pre_post_deps " $pre_post_dep"
22267
done
22268
fi
22269
pre_post_deps=
22270
@@ -5033,7 +6111,10 @@
22271
case $pass in
22272
dlopen) libs="$dlfiles" ;;
22273
dlpreopen) libs="$dlprefiles" ;;
22274
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
22275
+ link)
22276
+ libs="$deplibs %DEPLIBS%"
22277
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
22278
+ ;;
22279
esac
22280
fi
22281
if test "$linkmode,$pass" = "lib,dlpreopen"; then
22282
@@ -5041,17 +6122,19 @@
22283
for lib in $dlprefiles; do
22284
# Ignore non-libtool-libs
22285
dependency_libs=
22286
+ func_resolve_sysroot "$lib"
22287
case $lib in
22288
- *.la) func_source "$lib" ;;
22289
+ *.la) func_source "$func_resolve_sysroot_result" ;;
22290
esac
22291
22292
# Collect preopened libtool deplibs, except any this library
22293
# has declared as weak libs
22294
for deplib in $dependency_libs; do
22295
- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
22296
+ func_basename "$deplib"
22297
+ deplib_base=$func_basename_result
22298
case " $weak_libs " in
22299
*" $deplib_base "*) ;;
22300
- *) deplibs="$deplibs $deplib" ;;
22301
+ *) func_append deplibs " $deplib" ;;
22302
esac
22303
done
22304
done
22305
@@ -5072,11 +6155,11 @@
22306
compile_deplibs="$deplib $compile_deplibs"
22307
finalize_deplibs="$deplib $finalize_deplibs"
22308
else
22309
- compiler_flags="$compiler_flags $deplib"
22310
+ func_append compiler_flags " $deplib"
22311
if test "$linkmode" = lib ; then
22312
case "$new_inherited_linker_flags " in
22313
*" $deplib "*) ;;
22314
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
22315
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
22316
esac
22317
fi
22318
fi
22319
@@ -5161,7 +6244,7 @@
22320
if test "$linkmode" = lib ; then
22321
case "$new_inherited_linker_flags " in
22322
*" $deplib "*) ;;
22323
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
22324
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
22325
esac
22326
fi
22327
fi
22328
@@ -5174,7 +6257,8 @@
22329
test "$pass" = conv && continue
22330
newdependency_libs="$deplib $newdependency_libs"
22331
func_stripname '-L' '' "$deplib"
22332
- newlib_search_path="$newlib_search_path $func_stripname_result"
22333
+ func_resolve_sysroot "$func_stripname_result"
22334
+ func_append newlib_search_path " $func_resolve_sysroot_result"
22335
;;
22336
prog)
22337
if test "$pass" = conv; then
22338
@@ -5188,7 +6272,8 @@
22339
finalize_deplibs="$deplib $finalize_deplibs"
22340
fi
22341
func_stripname '-L' '' "$deplib"
22342
- newlib_search_path="$newlib_search_path $func_stripname_result"
22343
+ func_resolve_sysroot "$func_stripname_result"
22344
+ func_append newlib_search_path " $func_resolve_sysroot_result"
22345
;;
22346
*)
22347
func_warning "\`-L' is ignored for archives/objects"
22348
@@ -5199,17 +6284,21 @@
22349
-R*)
22350
if test "$pass" = link; then
22351
func_stripname '-R' '' "$deplib"
22352
- dir=$func_stripname_result
22353
+ func_resolve_sysroot "$func_stripname_result"
22354
+ dir=$func_resolve_sysroot_result
22355
# Make sure the xrpath contains only unique directories.
22356
case "$xrpath " in
22357
*" $dir "*) ;;
22358
- *) xrpath="$xrpath $dir" ;;
22359
+ *) func_append xrpath " $dir" ;;
22360
esac
22361
fi
22362
deplibs="$deplib $deplibs"
22363
continue
22364
;;
22365
- *.la) lib="$deplib" ;;
22366
+ *.la)
22367
+ func_resolve_sysroot "$deplib"
22368
+ lib=$func_resolve_sysroot_result
22369
+ ;;
22370
*.$libext)
22371
if test "$pass" = conv; then
22372
deplibs="$deplib $deplibs"
22373
@@ -5227,7 +6316,7 @@
22374
match_pattern*)
22375
set dummy $deplibs_check_method; shift
22376
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
22377
- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
22378
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
22379
| $EGREP "$match_pattern_regex" > /dev/null; then
22380
valid_a_lib=yes
22381
fi
22382
@@ -5237,15 +6326,15 @@
22383
;;
22384
esac
22385
if test "$valid_a_lib" != yes; then
22386
- $ECHO
22387
+ echo
22388
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
22389
- $ECHO "*** I have the capability to make that library automatically link in when"
22390
- $ECHO "*** you link to this library. But I can only do this if you have a"
22391
- $ECHO "*** shared version of the library, which you do not appear to have"
22392
- $ECHO "*** because the file extensions .$libext of this argument makes me believe"
22393
- $ECHO "*** that it is just a static archive that I should not use here."
22394
+ echo "*** I have the capability to make that library automatically link in when"
22395
+ echo "*** you link to this library. But I can only do this if you have a"
22396
+ echo "*** shared version of the library, which you do not appear to have"
22397
+ echo "*** because the file extensions .$libext of this argument makes me believe"
22398
+ echo "*** that it is just a static archive that I should not use here."
22399
else
22400
- $ECHO
22401
+ echo
22402
$ECHO "*** Warning: Linking the shared library $output against the"
22403
$ECHO "*** static library $deplib is not portable!"
22404
deplibs="$deplib $deplibs"
22405
@@ -5272,11 +6361,11 @@
22406
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
22407
# If there is no dlopen support or we're linking statically,
22408
# we need to preload.
22409
- newdlprefiles="$newdlprefiles $deplib"
22410
+ func_append newdlprefiles " $deplib"
22411
compile_deplibs="$deplib $compile_deplibs"
22412
finalize_deplibs="$deplib $finalize_deplibs"
22413
else
22414
- newdlfiles="$newdlfiles $deplib"
22415
+ func_append newdlfiles " $deplib"
22416
fi
22417
fi
22418
continue
22419
@@ -5318,20 +6407,20 @@
22420
22421
# Convert "-framework foo" to "foo.ltframework"
22422
if test -n "$inherited_linker_flags"; then
22423
- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
22424
+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
22425
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
22426
case " $new_inherited_linker_flags " in
22427
*" $tmp_inherited_linker_flag "*) ;;
22428
- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
22429
+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
22430
esac
22431
done
22432
fi
22433
- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
22434
+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
22435
if test "$linkmode,$pass" = "lib,link" ||
22436
test "$linkmode,$pass" = "prog,scan" ||
22437
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
22438
- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
22439
- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
22440
+ test -n "$dlopen" && func_append dlfiles " $dlopen"
22441
+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
22442
fi
22443
22444
if test "$pass" = conv; then
22445
@@ -5342,30 +6431,36 @@
22446
func_fatal_error "cannot find name of link library for \`$lib'"
22447
fi
22448
# It is a libtool convenience library, so add in its objects.
22449
- convenience="$convenience $ladir/$objdir/$old_library"
22450
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
22451
+ func_append convenience " $ladir/$objdir/$old_library"
22452
+ func_append old_convenience " $ladir/$objdir/$old_library"
22453
+ tmp_libs=
22454
+ for deplib in $dependency_libs; do
22455
+ deplibs="$deplib $deplibs"
22456
+ if $opt_preserve_dup_deps ; then
22457
+ case "$tmp_libs " in
22458
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
22459
+ esac
22460
+ fi
22461
+ func_append tmp_libs " $deplib"
22462
+ done
22463
elif test "$linkmode" != prog && test "$linkmode" != lib; then
22464
func_fatal_error "\`$lib' is not a convenience library"
22465
fi
22466
- tmp_libs=
22467
- for deplib in $dependency_libs; do
22468
- deplibs="$deplib $deplibs"
22469
- if $opt_duplicate_deps ; then
22470
- case "$tmp_libs " in
22471
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
22472
- esac
22473
- fi
22474
- tmp_libs="$tmp_libs $deplib"
22475
- done
22476
continue
22477
fi # $pass = conv
22478
22479
22480
# Get the name of the library we link against.
22481
linklib=
22482
- for l in $old_library $library_names; do
22483
- linklib="$l"
22484
- done
22485
+ if test -n "$old_library" &&
22486
+ { test "$prefer_static_libs" = yes ||
22487
+ test "$prefer_static_libs,$installed" = "built,no"; }; then
22488
+ linklib=$old_library
22489
+ else
22490
+ for l in $old_library $library_names; do
22491
+ linklib="$l"
22492
+ done
22493
+ fi
22494
if test -z "$linklib"; then
22495
func_fatal_error "cannot find name of link library for \`$lib'"
22496
fi
22497
@@ -5382,9 +6477,9 @@
22498
# statically, we need to preload. We also need to preload any
22499
# dependent libraries so libltdl's deplib preloader doesn't
22500
# bomb out in the load deplibs phase.
22501
- dlprefiles="$dlprefiles $lib $dependency_libs"
22502
+ func_append dlprefiles " $lib $dependency_libs"
22503
else
22504
- newdlfiles="$newdlfiles $lib"
22505
+ func_append newdlfiles " $lib"
22506
fi
22507
continue
22508
fi # $pass = dlopen
22509
@@ -5406,14 +6501,14 @@
22510
22511
# Find the relevant object directory and library name.
22512
if test "X$installed" = Xyes; then
22513
- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
22514
+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
22515
func_warning "library \`$lib' was moved."
22516
dir="$ladir"
22517
absdir="$abs_ladir"
22518
libdir="$abs_ladir"
22519
else
22520
- dir="$libdir"
22521
- absdir="$libdir"
22522
+ dir="$lt_sysroot$libdir"
22523
+ absdir="$lt_sysroot$libdir"
22524
fi
22525
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
22526
else
22527
@@ -5421,12 +6516,12 @@
22528
dir="$ladir"
22529
absdir="$abs_ladir"
22530
# Remove this search path later
22531
- notinst_path="$notinst_path $abs_ladir"
22532
+ func_append notinst_path " $abs_ladir"
22533
else
22534
dir="$ladir/$objdir"
22535
absdir="$abs_ladir/$objdir"
22536
# Remove this search path later
22537
- notinst_path="$notinst_path $abs_ladir"
22538
+ func_append notinst_path " $abs_ladir"
22539
fi
22540
fi # $installed = yes
22541
func_stripname 'lib' '.la' "$laname"
22542
@@ -5437,20 +6532,46 @@
22543
if test -z "$libdir" && test "$linkmode" = prog; then
22544
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
22545
fi
22546
- # Prefer using a static library (so that no silly _DYNAMIC symbols
22547
- # are required to link).
22548
- if test -n "$old_library"; then
22549
- newdlprefiles="$newdlprefiles $dir/$old_library"
22550
- # Keep a list of preopened convenience libraries to check
22551
- # that they are being used correctly in the link pass.
22552
- test -z "$libdir" && \
22553
- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
22554
- # Otherwise, use the dlname, so that lt_dlopen finds it.
22555
- elif test -n "$dlname"; then
22556
- newdlprefiles="$newdlprefiles $dir/$dlname"
22557
- else
22558
- newdlprefiles="$newdlprefiles $dir/$linklib"
22559
- fi
22560
+ case "$host" in
22561
+ # special handling for platforms with PE-DLLs.
22562
+ *cygwin* | *mingw* | *cegcc* )
22563
+ # Linker will automatically link against shared library if both
22564
+ # static and shared are present. Therefore, ensure we extract
22565
+ # symbols from the import library if a shared library is present
22566
+ # (otherwise, the dlopen module name will be incorrect). We do
22567
+ # this by putting the import library name into $newdlprefiles.
22568
+ # We recover the dlopen module name by 'saving' the la file
22569
+ # name in a special purpose variable, and (later) extracting the
22570
+ # dlname from the la file.
22571
+ if test -n "$dlname"; then
22572
+ func_tr_sh "$dir/$linklib"
22573
+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
22574
+ func_append newdlprefiles " $dir/$linklib"
22575
+ else
22576
+ func_append newdlprefiles " $dir/$old_library"
22577
+ # Keep a list of preopened convenience libraries to check
22578
+ # that they are being used correctly in the link pass.
22579
+ test -z "$libdir" && \
22580
+ func_append dlpreconveniencelibs " $dir/$old_library"
22581
+ fi
22582
+ ;;
22583
+ * )
22584
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
22585
+ # are required to link).
22586
+ if test -n "$old_library"; then
22587
+ func_append newdlprefiles " $dir/$old_library"
22588
+ # Keep a list of preopened convenience libraries to check
22589
+ # that they are being used correctly in the link pass.
22590
+ test -z "$libdir" && \
22591
+ func_append dlpreconveniencelibs " $dir/$old_library"
22592
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
22593
+ elif test -n "$dlname"; then
22594
+ func_append newdlprefiles " $dir/$dlname"
22595
+ else
22596
+ func_append newdlprefiles " $dir/$linklib"
22597
+ fi
22598
+ ;;
22599
+ esac
22600
fi # $pass = dlpreopen
22601
22602
if test -z "$libdir"; then
22603
@@ -5468,7 +6589,7 @@
22604
22605
22606
if test "$linkmode" = prog && test "$pass" != link; then
22607
- newlib_search_path="$newlib_search_path $ladir"
22608
+ func_append newlib_search_path " $ladir"
22609
deplibs="$lib $deplibs"
22610
22611
linkalldeplibs=no
22612
@@ -5481,7 +6602,8 @@
22613
for deplib in $dependency_libs; do
22614
case $deplib in
22615
-L*) func_stripname '-L' '' "$deplib"
22616
- newlib_search_path="$newlib_search_path $func_stripname_result"
22617
+ func_resolve_sysroot "$func_stripname_result"
22618
+ func_append newlib_search_path " $func_resolve_sysroot_result"
22619
;;
22620
esac
22621
# Need to link against all dependency_libs?
22622
@@ -5492,12 +6614,12 @@
22623
# or/and link against static libraries
22624
newdependency_libs="$deplib $newdependency_libs"
22625
fi
22626
- if $opt_duplicate_deps ; then
22627
+ if $opt_preserve_dup_deps ; then
22628
case "$tmp_libs " in
22629
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
22630
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
22631
esac
22632
fi
22633
- tmp_libs="$tmp_libs $deplib"
22634
+ func_append tmp_libs " $deplib"
22635
done # for deplib
22636
continue
22637
fi # $linkmode = prog...
22638
@@ -5512,7 +6634,7 @@
22639
# Make sure the rpath contains only unique directories.
22640
case "$temp_rpath:" in
22641
*"$absdir:"*) ;;
22642
- *) temp_rpath="$temp_rpath$absdir:" ;;
22643
+ *) func_append temp_rpath "$absdir:" ;;
22644
esac
22645
fi
22646
22647
@@ -5524,7 +6646,7 @@
22648
*)
22649
case "$compile_rpath " in
22650
*" $absdir "*) ;;
22651
- *) compile_rpath="$compile_rpath $absdir"
22652
+ *) func_append compile_rpath " $absdir" ;;
22653
esac
22654
;;
22655
esac
22656
@@ -5533,7 +6655,7 @@
22657
*)
22658
case "$finalize_rpath " in
22659
*" $libdir "*) ;;
22660
- *) finalize_rpath="$finalize_rpath $libdir"
22661
+ *) func_append finalize_rpath " $libdir" ;;
22662
esac
22663
;;
22664
esac
22665
@@ -5558,12 +6680,12 @@
22666
case $host in
22667
*cygwin* | *mingw* | *cegcc*)
22668
# No point in relinking DLLs because paths are not encoded
22669
- notinst_deplibs="$notinst_deplibs $lib"
22670
+ func_append notinst_deplibs " $lib"
22671
need_relink=no
22672
;;
22673
*)
22674
if test "$installed" = no; then
22675
- notinst_deplibs="$notinst_deplibs $lib"
22676
+ func_append notinst_deplibs " $lib"
22677
need_relink=yes
22678
fi
22679
;;
22680
@@ -5580,7 +6702,7 @@
22681
fi
22682
done
22683
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
22684
- $ECHO
22685
+ echo
22686
if test "$linkmode" = prog; then
22687
$ECHO "*** Warning: Linking the executable $output against the loadable module"
22688
else
22689
@@ -5598,7 +6720,7 @@
22690
*)
22691
case "$compile_rpath " in
22692
*" $absdir "*) ;;
22693
- *) compile_rpath="$compile_rpath $absdir"
22694
+ *) func_append compile_rpath " $absdir" ;;
22695
esac
22696
;;
22697
esac
22698
@@ -5607,7 +6729,7 @@
22699
*)
22700
case "$finalize_rpath " in
22701
*" $libdir "*) ;;
22702
- *) finalize_rpath="$finalize_rpath $libdir"
22703
+ *) func_append finalize_rpath " $libdir" ;;
22704
esac
22705
;;
22706
esac
22707
@@ -5661,7 +6783,7 @@
22708
linklib=$newlib
22709
fi # test -n "$old_archive_from_expsyms_cmds"
22710
22711
- if test "$linkmode" = prog || test "$mode" != relink; then
22712
+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
22713
add_shlibpath=
22714
add_dir=
22715
add=
22716
@@ -5683,9 +6805,9 @@
22717
if test "X$dlopenmodule" != "X$lib"; then
22718
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
22719
if test -z "$old_library" ; then
22720
- $ECHO
22721
- $ECHO "*** And there doesn't seem to be a static archive available"
22722
- $ECHO "*** The link will probably fail, sorry"
22723
+ echo
22724
+ echo "*** And there doesn't seem to be a static archive available"
22725
+ echo "*** The link will probably fail, sorry"
22726
else
22727
add="$dir/$old_library"
22728
fi
22729
@@ -5717,7 +6839,7 @@
22730
if test -n "$inst_prefix_dir"; then
22731
case $libdir in
22732
[\\/]*)
22733
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
22734
+ func_append add_dir " -L$inst_prefix_dir$libdir"
22735
;;
22736
esac
22737
fi
22738
@@ -5739,7 +6861,7 @@
22739
if test -n "$add_shlibpath"; then
22740
case :$compile_shlibpath: in
22741
*":$add_shlibpath:"*) ;;
22742
- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
22743
+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
22744
esac
22745
fi
22746
if test "$linkmode" = prog; then
22747
@@ -5753,13 +6875,13 @@
22748
test "$hardcode_shlibpath_var" = yes; then
22749
case :$finalize_shlibpath: in
22750
*":$libdir:"*) ;;
22751
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
22752
+ *) func_append finalize_shlibpath "$libdir:" ;;
22753
esac
22754
fi
22755
fi
22756
fi
22757
22758
- if test "$linkmode" = prog || test "$mode" = relink; then
22759
+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
22760
add_shlibpath=
22761
add_dir=
22762
add=
22763
@@ -5773,7 +6895,7 @@
22764
elif test "$hardcode_shlibpath_var" = yes; then
22765
case :$finalize_shlibpath: in
22766
*":$libdir:"*) ;;
22767
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
22768
+ *) func_append finalize_shlibpath "$libdir:" ;;
22769
esac
22770
add="-l$name"
22771
elif test "$hardcode_automatic" = yes; then
22772
@@ -5790,7 +6912,7 @@
22773
if test -n "$inst_prefix_dir"; then
22774
case $libdir in
22775
[\\/]*)
22776
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
22777
+ func_append add_dir " -L$inst_prefix_dir$libdir"
22778
;;
22779
esac
22780
fi
22781
@@ -5825,21 +6947,21 @@
22782
22783
# Just print a warning and add the library to dependency_libs so
22784
# that the program can be linked against the static library.
22785
- $ECHO
22786
+ echo
22787
$ECHO "*** Warning: This system can not link to static lib archive $lib."
22788
- $ECHO "*** I have the capability to make that library automatically link in when"
22789
- $ECHO "*** you link to this library. But I can only do this if you have a"
22790
- $ECHO "*** shared version of the library, which you do not appear to have."
22791
+ echo "*** I have the capability to make that library automatically link in when"
22792
+ echo "*** you link to this library. But I can only do this if you have a"
22793
+ echo "*** shared version of the library, which you do not appear to have."
22794
if test "$module" = yes; then
22795
- $ECHO "*** But as you try to build a module library, libtool will still create "
22796
- $ECHO "*** a static module, that should work as long as the dlopening application"
22797
- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
22798
+ echo "*** But as you try to build a module library, libtool will still create "
22799
+ echo "*** a static module, that should work as long as the dlopening application"
22800
+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
22801
if test -z "$global_symbol_pipe"; then
22802
- $ECHO
22803
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
22804
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
22805
- $ECHO "*** not find such a program. So, this module is probably useless."
22806
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
22807
+ echo
22808
+ echo "*** However, this would only work if libtool was able to extract symbol"
22809
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
22810
+ echo "*** not find such a program. So, this module is probably useless."
22811
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
22812
fi
22813
if test "$build_old_libs" = no; then
22814
build_libtool_libs=module
22815
@@ -5867,37 +6989,46 @@
22816
temp_xrpath=$func_stripname_result
22817
case " $xrpath " in
22818
*" $temp_xrpath "*) ;;
22819
- *) xrpath="$xrpath $temp_xrpath";;
22820
+ *) func_append xrpath " $temp_xrpath";;
22821
esac;;
22822
- *) temp_deplibs="$temp_deplibs $libdir";;
22823
+ *) func_append temp_deplibs " $libdir";;
22824
esac
22825
done
22826
dependency_libs="$temp_deplibs"
22827
fi
22828
22829
- newlib_search_path="$newlib_search_path $absdir"
22830
+ func_append newlib_search_path " $absdir"
22831
# Link against this library
22832
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
22833
# ... and its dependency_libs
22834
tmp_libs=
22835
for deplib in $dependency_libs; do
22836
newdependency_libs="$deplib $newdependency_libs"
22837
- if $opt_duplicate_deps ; then
22838
+ case $deplib in
22839
+ -L*) func_stripname '-L' '' "$deplib"
22840
+ func_resolve_sysroot "$func_stripname_result";;
22841
+ *) func_resolve_sysroot "$deplib" ;;
22842
+ esac
22843
+ if $opt_preserve_dup_deps ; then
22844
case "$tmp_libs " in
22845
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
22846
+ *" $func_resolve_sysroot_result "*)
22847
+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
22848
esac
22849
fi
22850
- tmp_libs="$tmp_libs $deplib"
22851
+ func_append tmp_libs " $func_resolve_sysroot_result"
22852
done
22853
22854
if test "$link_all_deplibs" != no; then
22855
# Add the search paths of all dependency libraries
22856
for deplib in $dependency_libs; do
22857
+ path=
22858
case $deplib in
22859
-L*) path="$deplib" ;;
22860
*.la)
22861
+ func_resolve_sysroot "$deplib"
22862
+ deplib=$func_resolve_sysroot_result
22863
func_dirname "$deplib" "" "."
22864
- dir="$func_dirname_result"
22865
+ dir=$func_dirname_result
22866
# We need an absolute path.
22867
case $dir in
22868
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
22869
@@ -5924,8 +7055,8 @@
22870
if test -z "$darwin_install_name"; then
22871
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
22872
fi
22873
- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
22874
- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
22875
+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
22876
+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
22877
path=
22878
fi
22879
fi
22880
@@ -5958,7 +7089,7 @@
22881
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
22882
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
22883
else
22884
- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
22885
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
22886
fi
22887
fi
22888
dependency_libs="$newdependency_libs"
22889
@@ -5975,7 +7106,7 @@
22890
for dir in $newlib_search_path; do
22891
case "$lib_search_path " in
22892
*" $dir "*) ;;
22893
- *) lib_search_path="$lib_search_path $dir" ;;
22894
+ *) func_append lib_search_path " $dir" ;;
22895
esac
22896
done
22897
newlib_search_path=
22898
@@ -6033,10 +7164,10 @@
22899
-L*)
22900
case " $tmp_libs " in
22901
*" $deplib "*) ;;
22902
- *) tmp_libs="$tmp_libs $deplib" ;;
22903
+ *) func_append tmp_libs " $deplib" ;;
22904
esac
22905
;;
22906
- *) tmp_libs="$tmp_libs $deplib" ;;
22907
+ *) func_append tmp_libs " $deplib" ;;
22908
esac
22909
done
22910
eval $var=\"$tmp_libs\"
22911
@@ -6052,7 +7183,7 @@
22912
;;
22913
esac
22914
if test -n "$i" ; then
22915
- tmp_libs="$tmp_libs $i"
22916
+ func_append tmp_libs " $i"
22917
fi
22918
done
22919
dependency_libs=$tmp_libs
22920
@@ -6093,7 +7224,7 @@
22921
# Now set the variables for building old libraries.
22922
build_libtool_libs=no
22923
oldlibs="$output"
22924
- objs="$objs$old_deplibs"
22925
+ func_append objs "$old_deplibs"
22926
;;
22927
22928
lib)
22929
@@ -6126,10 +7257,10 @@
22930
if test "$deplibs_check_method" != pass_all; then
22931
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
22932
else
22933
- $ECHO
22934
+ echo
22935
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
22936
$ECHO "*** objects $objs is not portable!"
22937
- libobjs="$libobjs $objs"
22938
+ func_append libobjs " $objs"
22939
fi
22940
fi
22941
22942
@@ -6194,7 +7325,7 @@
22943
age="$number_minor"
22944
revision="$number_revision"
22945
;;
22946
- freebsd-aout|freebsd-elf|sunos)
22947
+ freebsd-aout|freebsd-elf|qnx|sunos)
22948
current="$number_major"
22949
revision="$number_minor"
22950
age="0"
22951
@@ -6206,6 +7337,9 @@
22952
revision="$number_minor"
22953
lt_irix_increment=no
22954
;;
22955
+ *)
22956
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
22957
+ ;;
22958
esac
22959
;;
22960
no)
22961
@@ -6327,7 +7461,7 @@
22962
done
22963
22964
# Make executables depend on our current version.
22965
- verstring="$verstring:${current}.0"
22966
+ func_append verstring ":${current}.0"
22967
;;
22968
22969
qnx)
22970
@@ -6395,10 +7529,10 @@
22971
fi
22972
22973
func_generate_dlsyms "$libname" "$libname" "yes"
22974
- libobjs="$libobjs $symfileobj"
22975
+ func_append libobjs " $symfileobj"
22976
test "X$libobjs" = "X " && libobjs=
22977
22978
- if test "$mode" != relink; then
22979
+ if test "$opt_mode" != relink; then
22980
# Remove our outputs, but don't remove object files since they
22981
# may have been created when compiling PIC objects.
22982
removelist=
22983
@@ -6414,7 +7548,7 @@
22984
continue
22985
fi
22986
fi
22987
- removelist="$removelist $p"
22988
+ func_append removelist " $p"
22989
;;
22990
*) ;;
22991
esac
22992
@@ -6425,27 +7559,28 @@
22993
22994
# Now set the variables for building old libraries.
22995
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
22996
- oldlibs="$oldlibs $output_objdir/$libname.$libext"
22997
+ func_append oldlibs " $output_objdir/$libname.$libext"
22998
22999
# Transform .lo files to .o files.
23000
- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
23001
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
23002
fi
23003
23004
# Eliminate all temporary directories.
23005
#for path in $notinst_path; do
23006
- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
23007
- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
23008
- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
23009
+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
23010
+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
23011
+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
23012
#done
23013
23014
if test -n "$xrpath"; then
23015
# If the user specified any rpath flags, then add them.
23016
temp_xrpath=
23017
for libdir in $xrpath; do
23018
- temp_xrpath="$temp_xrpath -R$libdir"
23019
+ func_replace_sysroot "$libdir"
23020
+ func_append temp_xrpath " -R$func_replace_sysroot_result"
23021
case "$finalize_rpath " in
23022
*" $libdir "*) ;;
23023
- *) finalize_rpath="$finalize_rpath $libdir" ;;
23024
+ *) func_append finalize_rpath " $libdir" ;;
23025
esac
23026
done
23027
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
23028
@@ -6459,7 +7594,7 @@
23029
for lib in $old_dlfiles; do
23030
case " $dlprefiles $dlfiles " in
23031
*" $lib "*) ;;
23032
- *) dlfiles="$dlfiles $lib" ;;
23033
+ *) func_append dlfiles " $lib" ;;
23034
esac
23035
done
23036
23037
@@ -6469,19 +7604,19 @@
23038
for lib in $old_dlprefiles; do
23039
case "$dlprefiles " in
23040
*" $lib "*) ;;
23041
- *) dlprefiles="$dlprefiles $lib" ;;
23042
+ *) func_append dlprefiles " $lib" ;;
23043
esac
23044
done
23045
23046
if test "$build_libtool_libs" = yes; then
23047
if test -n "$rpath"; then
23048
case $host in
23049
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
23050
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
23051
# these systems don't actually have a c library (as such)!
23052
;;
23053
*-*-rhapsody* | *-*-darwin1.[012])
23054
# Rhapsody C library is in the System framework
23055
- deplibs="$deplibs System.ltframework"
23056
+ func_append deplibs " System.ltframework"
23057
;;
23058
*-*-netbsd*)
23059
# Don't link with libc until the a.out ld.so is fixed.
23060
@@ -6498,7 +7633,7 @@
23061
*)
23062
# Add libc to deplibs on all other systems if necessary.
23063
if test "$build_libtool_need_lc" = "yes"; then
23064
- deplibs="$deplibs -lc"
23065
+ func_append deplibs " -lc"
23066
fi
23067
;;
23068
esac
23069
@@ -6547,7 +7682,7 @@
23070
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
23071
case " $predeps $postdeps " in
23072
*" $i "*)
23073
- newdeplibs="$newdeplibs $i"
23074
+ func_append newdeplibs " $i"
23075
i=""
23076
;;
23077
esac
23078
@@ -6558,21 +7693,21 @@
23079
set dummy $deplib_matches; shift
23080
deplib_match=$1
23081
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
23082
- newdeplibs="$newdeplibs $i"
23083
+ func_append newdeplibs " $i"
23084
else
23085
droppeddeps=yes
23086
- $ECHO
23087
+ echo
23088
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
23089
- $ECHO "*** I have the capability to make that library automatically link in when"
23090
- $ECHO "*** you link to this library. But I can only do this if you have a"
23091
- $ECHO "*** shared version of the library, which I believe you do not have"
23092
- $ECHO "*** because a test_compile did reveal that the linker did not use it for"
23093
- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
23094
+ echo "*** I have the capability to make that library automatically link in when"
23095
+ echo "*** you link to this library. But I can only do this if you have a"
23096
+ echo "*** shared version of the library, which I believe you do not have"
23097
+ echo "*** because a test_compile did reveal that the linker did not use it for"
23098
+ echo "*** its dynamic dependency list that programs get resolved with at runtime."
23099
fi
23100
fi
23101
;;
23102
*)
23103
- newdeplibs="$newdeplibs $i"
23104
+ func_append newdeplibs " $i"
23105
;;
23106
esac
23107
done
23108
@@ -6590,7 +7725,7 @@
23109
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
23110
case " $predeps $postdeps " in
23111
*" $i "*)
23112
- newdeplibs="$newdeplibs $i"
23113
+ func_append newdeplibs " $i"
23114
i=""
23115
;;
23116
esac
23117
@@ -6601,29 +7736,29 @@
23118
set dummy $deplib_matches; shift
23119
deplib_match=$1
23120
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
23121
- newdeplibs="$newdeplibs $i"
23122
+ func_append newdeplibs " $i"
23123
else
23124
droppeddeps=yes
23125
- $ECHO
23126
+ echo
23127
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
23128
- $ECHO "*** I have the capability to make that library automatically link in when"
23129
- $ECHO "*** you link to this library. But I can only do this if you have a"
23130
- $ECHO "*** shared version of the library, which you do not appear to have"
23131
- $ECHO "*** because a test_compile did reveal that the linker did not use this one"
23132
- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
23133
+ echo "*** I have the capability to make that library automatically link in when"
23134
+ echo "*** you link to this library. But I can only do this if you have a"
23135
+ echo "*** shared version of the library, which you do not appear to have"
23136
+ echo "*** because a test_compile did reveal that the linker did not use this one"
23137
+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
23138
fi
23139
fi
23140
else
23141
droppeddeps=yes
23142
- $ECHO
23143
+ echo
23144
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
23145
- $ECHO "*** make it link in! You will probably need to install it or some"
23146
- $ECHO "*** library that it depends on before this library will be fully"
23147
- $ECHO "*** functional. Installing it before continuing would be even better."
23148
+ echo "*** make it link in! You will probably need to install it or some"
23149
+ echo "*** library that it depends on before this library will be fully"
23150
+ echo "*** functional. Installing it before continuing would be even better."
23151
fi
23152
;;
23153
*)
23154
- newdeplibs="$newdeplibs $i"
23155
+ func_append newdeplibs " $i"
23156
;;
23157
esac
23158
done
23159
@@ -6640,15 +7775,27 @@
23160
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
23161
case " $predeps $postdeps " in
23162
*" $a_deplib "*)
23163
- newdeplibs="$newdeplibs $a_deplib"
23164
+ func_append newdeplibs " $a_deplib"
23165
a_deplib=""
23166
;;
23167
esac
23168
fi
23169
if test -n "$a_deplib" ; then
23170
libname=`eval "\\$ECHO \"$libname_spec\""`
23171
+ if test -n "$file_magic_glob"; then
23172
+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
23173
+ else
23174
+ libnameglob=$libname
23175
+ fi
23176
+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
23177
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
23178
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
23179
+ if test "$want_nocaseglob" = yes; then
23180
+ shopt -s nocaseglob
23181
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
23182
+ $nocaseglob
23183
+ else
23184
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
23185
+ fi
23186
for potent_lib in $potential_libs; do
23187
# Follow soft links.
23188
if ls -lLd "$potent_lib" 2>/dev/null |
23189
@@ -6665,13 +7812,13 @@
23190
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
23191
case $potliblink in
23192
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
23193
- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
23194
+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
23195
esac
23196
done
23197
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
23198
$SED -e 10q |
23199
$EGREP "$file_magic_regex" > /dev/null; then
23200
- newdeplibs="$newdeplibs $a_deplib"
23201
+ func_append newdeplibs " $a_deplib"
23202
a_deplib=""
23203
break 2
23204
fi
23205
@@ -6680,12 +7827,12 @@
23206
fi
23207
if test -n "$a_deplib" ; then
23208
droppeddeps=yes
23209
- $ECHO
23210
+ echo
23211
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
23212
- $ECHO "*** I have the capability to make that library automatically link in when"
23213
- $ECHO "*** you link to this library. But I can only do this if you have a"
23214
- $ECHO "*** shared version of the library, which you do not appear to have"
23215
- $ECHO "*** because I did check the linker path looking for a file starting"
23216
+ echo "*** I have the capability to make that library automatically link in when"
23217
+ echo "*** you link to this library. But I can only do this if you have a"
23218
+ echo "*** shared version of the library, which you do not appear to have"
23219
+ echo "*** because I did check the linker path looking for a file starting"
23220
if test -z "$potlib" ; then
23221
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
23222
else
23223
@@ -6696,7 +7843,7 @@
23224
;;
23225
*)
23226
# Add a -L argument.
23227
- newdeplibs="$newdeplibs $a_deplib"
23228
+ func_append newdeplibs " $a_deplib"
23229
;;
23230
esac
23231
done # Gone through all deplibs.
23232
@@ -6712,7 +7859,7 @@
23233
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
23234
case " $predeps $postdeps " in
23235
*" $a_deplib "*)
23236
- newdeplibs="$newdeplibs $a_deplib"
23237
+ func_append newdeplibs " $a_deplib"
23238
a_deplib=""
23239
;;
23240
esac
23241
@@ -6723,9 +7870,9 @@
23242
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
23243
for potent_lib in $potential_libs; do
23244
potlib="$potent_lib" # see symlink-check above in file_magic test
23245
- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
23246
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
23247
$EGREP "$match_pattern_regex" > /dev/null; then
23248
- newdeplibs="$newdeplibs $a_deplib"
23249
+ func_append newdeplibs " $a_deplib"
23250
a_deplib=""
23251
break 2
23252
fi
23253
@@ -6734,12 +7881,12 @@
23254
fi
23255
if test -n "$a_deplib" ; then
23256
droppeddeps=yes
23257
- $ECHO
23258
+ echo
23259
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
23260
- $ECHO "*** I have the capability to make that library automatically link in when"
23261
- $ECHO "*** you link to this library. But I can only do this if you have a"
23262
- $ECHO "*** shared version of the library, which you do not appear to have"
23263
- $ECHO "*** because I did check the linker path looking for a file starting"
23264
+ echo "*** I have the capability to make that library automatically link in when"
23265
+ echo "*** you link to this library. But I can only do this if you have a"
23266
+ echo "*** shared version of the library, which you do not appear to have"
23267
+ echo "*** because I did check the linker path looking for a file starting"
23268
if test -z "$potlib" ; then
23269
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
23270
else
23271
@@ -6750,32 +7897,32 @@
23272
;;
23273
*)
23274
# Add a -L argument.
23275
- newdeplibs="$newdeplibs $a_deplib"
23276
+ func_append newdeplibs " $a_deplib"
23277
;;
23278
esac
23279
done # Gone through all deplibs.
23280
;;
23281
none | unknown | *)
23282
newdeplibs=""
23283
- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
23284
- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
23285
+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
23286
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
23287
for i in $predeps $postdeps ; do
23288
# can't use Xsed below, because $i might contain '/'
23289
- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
23290
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
23291
done
23292
fi
23293
- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
23294
- $GREP . >/dev/null; then
23295
- $ECHO
23296
+ case $tmp_deplibs in
23297
+ *[!\ \ ]*)
23298
+ echo
23299
if test "X$deplibs_check_method" = "Xnone"; then
23300
- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
23301
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
23302
else
23303
- $ECHO "*** Warning: inter-library dependencies are not known to be supported."
23304
+ echo "*** Warning: inter-library dependencies are not known to be supported."
23305
fi
23306
- $ECHO "*** All declared inter-library dependencies are being dropped."
23307
+ echo "*** All declared inter-library dependencies are being dropped."
23308
droppeddeps=yes
23309
- fi
23310
+ ;;
23311
+ esac
23312
;;
23313
esac
23314
versuffix=$versuffix_save
23315
@@ -6787,23 +7934,23 @@
23316
case $host in
23317
*-*-rhapsody* | *-*-darwin1.[012])
23318
# On Rhapsody replace the C library with the System framework
23319
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
23320
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
23321
;;
23322
esac
23323
23324
if test "$droppeddeps" = yes; then
23325
if test "$module" = yes; then
23326
- $ECHO
23327
- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
23328
+ echo
23329
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
23330
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
23331
- $ECHO "*** a static module, that should work as long as the dlopening"
23332
- $ECHO "*** application is linked with the -dlopen flag."
23333
+ echo "*** a static module, that should work as long as the dlopening"
23334
+ echo "*** application is linked with the -dlopen flag."
23335
if test -z "$global_symbol_pipe"; then
23336
- $ECHO
23337
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
23338
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
23339
- $ECHO "*** not find such a program. So, this module is probably useless."
23340
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
23341
+ echo
23342
+ echo "*** However, this would only work if libtool was able to extract symbol"
23343
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
23344
+ echo "*** not find such a program. So, this module is probably useless."
23345
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
23346
fi
23347
if test "$build_old_libs" = no; then
23348
oldlibs="$output_objdir/$libname.$libext"
23349
@@ -6813,16 +7960,16 @@
23350
build_libtool_libs=no
23351
fi
23352
else
23353
- $ECHO "*** The inter-library dependencies that have been dropped here will be"
23354
- $ECHO "*** automatically added whenever a program is linked with this library"
23355
- $ECHO "*** or is declared to -dlopen it."
23356
+ echo "*** The inter-library dependencies that have been dropped here will be"
23357
+ echo "*** automatically added whenever a program is linked with this library"
23358
+ echo "*** or is declared to -dlopen it."
23359
23360
if test "$allow_undefined" = no; then
23361
- $ECHO
23362
- $ECHO "*** Since this library must not contain undefined symbols,"
23363
- $ECHO "*** because either the platform does not support them or"
23364
- $ECHO "*** it was explicitly requested with -no-undefined,"
23365
- $ECHO "*** libtool will only create a static version of it."
23366
+ echo
23367
+ echo "*** Since this library must not contain undefined symbols,"
23368
+ echo "*** because either the platform does not support them or"
23369
+ echo "*** it was explicitly requested with -no-undefined,"
23370
+ echo "*** libtool will only create a static version of it."
23371
if test "$build_old_libs" = no; then
23372
oldlibs="$output_objdir/$libname.$libext"
23373
build_libtool_libs=module
23374
@@ -6839,9 +7986,9 @@
23375
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
23376
case $host in
23377
*-*-darwin*)
23378
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
23379
- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
23380
- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
23381
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
23382
+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
23383
+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
23384
;;
23385
esac
23386
23387
@@ -6854,7 +8001,7 @@
23388
*)
23389
case " $deplibs " in
23390
*" -L$path/$objdir "*)
23391
- new_libs="$new_libs -L$path/$objdir" ;;
23392
+ func_append new_libs " -L$path/$objdir" ;;
23393
esac
23394
;;
23395
esac
23396
@@ -6864,10 +8011,10 @@
23397
-L*)
23398
case " $new_libs " in
23399
*" $deplib "*) ;;
23400
- *) new_libs="$new_libs $deplib" ;;
23401
+ *) func_append new_libs " $deplib" ;;
23402
esac
23403
;;
23404
- *) new_libs="$new_libs $deplib" ;;
23405
+ *) func_append new_libs " $deplib" ;;
23406
esac
23407
done
23408
deplibs="$new_libs"
23409
@@ -6884,10 +8031,12 @@
23410
hardcode_libdirs=
23411
dep_rpath=
23412
rpath="$finalize_rpath"
23413
- test "$mode" != relink && rpath="$compile_rpath$rpath"
23414
+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
23415
for libdir in $rpath; do
23416
if test -n "$hardcode_libdir_flag_spec"; then
23417
if test -n "$hardcode_libdir_separator"; then
23418
+ func_replace_sysroot "$libdir"
23419
+ libdir=$func_replace_sysroot_result
23420
if test -z "$hardcode_libdirs"; then
23421
hardcode_libdirs="$libdir"
23422
else
23423
@@ -6896,18 +8045,18 @@
23424
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
23425
;;
23426
*)
23427
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
23428
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
23429
;;
23430
esac
23431
fi
23432
else
23433
eval flag=\"$hardcode_libdir_flag_spec\"
23434
- dep_rpath="$dep_rpath $flag"
23435
+ func_append dep_rpath " $flag"
23436
fi
23437
elif test -n "$runpath_var"; then
23438
case "$perm_rpath " in
23439
*" $libdir "*) ;;
23440
- *) perm_rpath="$perm_rpath $libdir" ;;
23441
+ *) func_apped perm_rpath " $libdir" ;;
23442
esac
23443
fi
23444
done
23445
@@ -6925,7 +8074,7 @@
23446
# We should set the runpath_var.
23447
rpath=
23448
for dir in $perm_rpath; do
23449
- rpath="$rpath$dir:"
23450
+ func_append rpath "$dir:"
23451
done
23452
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
23453
fi
23454
@@ -6933,7 +8082,7 @@
23455
fi
23456
23457
shlibpath="$finalize_shlibpath"
23458
- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
23459
+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
23460
if test -n "$shlibpath"; then
23461
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
23462
fi
23463
@@ -6959,18 +8108,18 @@
23464
linknames=
23465
for link
23466
do
23467
- linknames="$linknames $link"
23468
+ func_append linknames " $link"
23469
done
23470
23471
# Use standard objects if they are pic
23472
- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
23473
+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
23474
test "X$libobjs" = "X " && libobjs=
23475
23476
delfiles=
23477
if test -n "$export_symbols" && test -n "$include_expsyms"; then
23478
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
23479
export_symbols="$output_objdir/$libname.uexp"
23480
- delfiles="$delfiles $export_symbols"
23481
+ func_append delfiles " $export_symbols"
23482
fi
23483
23484
orig_export_symbols=
23485
@@ -7001,13 +8150,45 @@
23486
$opt_dry_run || $RM $export_symbols
23487
cmds=$export_symbols_cmds
23488
save_ifs="$IFS"; IFS='~'
23489
- for cmd in $cmds; do
23490
+ for cmd1 in $cmds; do
23491
IFS="$save_ifs"
23492
- eval cmd=\"$cmd\"
23493
- func_len " $cmd"
23494
- len=$func_len_result
23495
- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
23496
+ # Take the normal branch if the nm_file_list_spec branch
23497
+ # doesn't work or if tool conversion is not needed.
23498
+ case $nm_file_list_spec~$to_tool_file_cmd in
23499
+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
23500
+ try_normal_branch=yes
23501
+ eval cmd=\"$cmd1\"
23502
+ func_len " $cmd"
23503
+ len=$func_len_result
23504
+ ;;
23505
+ *)
23506
+ try_normal_branch=no
23507
+ ;;
23508
+ esac
23509
+ if test "$try_normal_branch" = yes \
23510
+ && { test "$len" -lt "$max_cmd_len" \
23511
+ || test "$max_cmd_len" -le -1; }
23512
+ then
23513
+ func_show_eval "$cmd" 'exit $?'
23514
+ skipped_export=false
23515
+ elif test -n "$nm_file_list_spec"; then
23516
+ func_basename "$output"
23517
+ output_la=$func_basename_result
23518
+ save_libobjs=$libobjs
23519
+ save_output=$output
23520
+ output=${output_objdir}/${output_la}.nm
23521
+ func_to_tool_file "$output"
23522
+ libobjs=$nm_file_list_spec$func_to_tool_file_result
23523
+ func_append delfiles " $output"
23524
+ func_verbose "creating $NM input file list: $output"
23525
+ for obj in $save_libobjs; do
23526
+ func_to_tool_file "$obj"
23527
+ $ECHO "$func_to_tool_file_result"
23528
+ done > "$output"
23529
+ eval cmd=\"$cmd1\"
23530
func_show_eval "$cmd" 'exit $?'
23531
+ output=$save_output
23532
+ libobjs=$save_libobjs
23533
skipped_export=false
23534
else
23535
# The command line is too long to execute in one step.
23536
@@ -7029,7 +8210,7 @@
23537
if test -n "$export_symbols" && test -n "$include_expsyms"; then
23538
tmp_export_symbols="$export_symbols"
23539
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
23540
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
23541
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
23542
fi
23543
23544
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
23545
@@ -7041,7 +8222,7 @@
23546
# global variables. join(1) would be nice here, but unfortunately
23547
# isn't a blessed tool.
23548
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
23549
- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
23550
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
23551
export_symbols=$output_objdir/$libname.def
23552
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
23553
fi
23554
@@ -7051,7 +8232,7 @@
23555
case " $convenience " in
23556
*" $test_deplib "*) ;;
23557
*)
23558
- tmp_deplibs="$tmp_deplibs $test_deplib"
23559
+ func_append tmp_deplibs " $test_deplib"
23560
;;
23561
esac
23562
done
23563
@@ -7071,21 +8252,21 @@
23564
test "X$libobjs" = "X " && libobjs=
23565
else
23566
gentop="$output_objdir/${outputname}x"
23567
- generated="$generated $gentop"
23568
+ func_append generated " $gentop"
23569
23570
func_extract_archives $gentop $convenience
23571
- libobjs="$libobjs $func_extract_archives_result"
23572
+ func_append libobjs " $func_extract_archives_result"
23573
test "X$libobjs" = "X " && libobjs=
23574
fi
23575
fi
23576
23577
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
23578
eval flag=\"$thread_safe_flag_spec\"
23579
- linker_flags="$linker_flags $flag"
23580
+ func_append linker_flags " $flag"
23581
fi
23582
23583
# Make a backup of the uninstalled library when relinking
23584
- if test "$mode" = relink; then
23585
+ if test "$opt_mode" = relink; then
23586
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
23587
fi
23588
23589
@@ -7130,7 +8311,8 @@
23590
save_libobjs=$libobjs
23591
fi
23592
save_output=$output
23593
- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
23594
+ func_basename "$output"
23595
+ output_la=$func_basename_result
23596
23597
# Clear the reloadable object creation command queue and
23598
# initialize k to one.
23599
@@ -7143,13 +8325,16 @@
23600
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
23601
output=${output_objdir}/${output_la}.lnkscript
23602
func_verbose "creating GNU ld script: $output"
23603
- $ECHO 'INPUT (' > $output
23604
+ echo 'INPUT (' > $output
23605
for obj in $save_libobjs
23606
do
23607
- $ECHO "$obj" >> $output
23608
+ func_to_tool_file "$obj"
23609
+ $ECHO "$func_to_tool_file_result" >> $output
23610
done
23611
- $ECHO ')' >> $output
23612
- delfiles="$delfiles $output"
23613
+ echo ')' >> $output
23614
+ func_append delfiles " $output"
23615
+ func_to_tool_file "$output"
23616
+ output=$func_to_tool_file_result
23617
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
23618
output=${output_objdir}/${output_la}.lnk
23619
func_verbose "creating linker input file list: $output"
23620
@@ -7163,10 +8348,12 @@
23621
fi
23622
for obj
23623
do
23624
- $ECHO "$obj" >> $output
23625
+ func_to_tool_file "$obj"
23626
+ $ECHO "$func_to_tool_file_result" >> $output
23627
done
23628
- delfiles="$delfiles $output"
23629
- output=$firstobj\"$file_list_spec$output\"
23630
+ func_append delfiles " $output"
23631
+ func_to_tool_file "$output"
23632
+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
23633
else
23634
if test -n "$save_libobjs"; then
23635
func_verbose "creating reloadable object files..."
23636
@@ -7190,17 +8377,19 @@
23637
# command to the queue.
23638
if test "$k" -eq 1 ; then
23639
# The first file doesn't have a previous command to add.
23640
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
23641
+ reload_objs=$objlist
23642
+ eval concat_cmds=\"$reload_cmds\"
23643
else
23644
# All subsequent reloadable object files will link in
23645
# the last one created.
23646
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
23647
+ reload_objs="$objlist $last_robj"
23648
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
23649
fi
23650
last_robj=$output_objdir/$output_la-${k}.$objext
23651
func_arith $k + 1
23652
k=$func_arith_result
23653
output=$output_objdir/$output_la-${k}.$objext
23654
- objlist=$obj
23655
+ objlist=" $obj"
23656
func_len " $last_robj"
23657
func_arith $len0 + $func_len_result
23658
len=$func_arith_result
23659
@@ -7210,11 +8399,12 @@
23660
# reloadable object file. All subsequent reloadable object
23661
# files will link in the last one created.
23662
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
23663
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
23664
+ reload_objs="$objlist $last_robj"
23665
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
23666
if test -n "$last_robj"; then
23667
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
23668
fi
23669
- delfiles="$delfiles $output"
23670
+ func_append delfiles " $output"
23671
23672
else
23673
output=
23674
@@ -7248,7 +8438,7 @@
23675
lt_exit=$?
23676
23677
# Restore the uninstalled library and exit
23678
- if test "$mode" = relink; then
23679
+ if test "$opt_mode" = relink; then
23680
( cd "$output_objdir" && \
23681
$RM "${realname}T" && \
23682
$MV "${realname}U" "$realname" )
23683
@@ -7269,7 +8459,7 @@
23684
if test -n "$export_symbols" && test -n "$include_expsyms"; then
23685
tmp_export_symbols="$export_symbols"
23686
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
23687
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
23688
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
23689
fi
23690
23691
if test -n "$orig_export_symbols"; then
23692
@@ -7281,7 +8471,7 @@
23693
# global variables. join(1) would be nice here, but unfortunately
23694
# isn't a blessed tool.
23695
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
23696
- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
23697
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
23698
export_symbols=$output_objdir/$libname.def
23699
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
23700
fi
23701
@@ -7322,10 +8512,10 @@
23702
# Add any objects from preloaded convenience libraries
23703
if test -n "$dlprefiles"; then
23704
gentop="$output_objdir/${outputname}x"
23705
- generated="$generated $gentop"
23706
+ func_append generated " $gentop"
23707
23708
func_extract_archives $gentop $dlprefiles
23709
- libobjs="$libobjs $func_extract_archives_result"
23710
+ func_append libobjs " $func_extract_archives_result"
23711
test "X$libobjs" = "X " && libobjs=
23712
fi
23713
23714
@@ -7341,7 +8531,7 @@
23715
lt_exit=$?
23716
23717
# Restore the uninstalled library and exit
23718
- if test "$mode" = relink; then
23719
+ if test "$opt_mode" = relink; then
23720
( cd "$output_objdir" && \
23721
$RM "${realname}T" && \
23722
$MV "${realname}U" "$realname" )
23723
@@ -7353,7 +8543,7 @@
23724
IFS="$save_ifs"
23725
23726
# Restore the uninstalled library and exit
23727
- if test "$mode" = relink; then
23728
+ if test "$opt_mode" = relink; then
23729
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
23730
23731
if test -n "$convenience"; then
23732
@@ -7434,18 +8624,21 @@
23733
if test -n "$convenience"; then
23734
if test -n "$whole_archive_flag_spec"; then
23735
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
23736
- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
23737
+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
23738
else
23739
gentop="$output_objdir/${obj}x"
23740
- generated="$generated $gentop"
23741
+ func_append generated " $gentop"
23742
23743
func_extract_archives $gentop $convenience
23744
reload_conv_objs="$reload_objs $func_extract_archives_result"
23745
fi
23746
fi
23747
23748
+ # If we're not building shared, we need to use non_pic_objs
23749
+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
23750
+
23751
# Create the old-style object.
23752
- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
23753
+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
23754
23755
output="$obj"
23756
func_execute_cmds "$reload_cmds" 'exit $?'
23757
@@ -7505,8 +8698,8 @@
23758
case $host in
23759
*-*-rhapsody* | *-*-darwin1.[012])
23760
# On Rhapsody replace the C library is the System framework
23761
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
23762
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
23763
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
23764
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
23765
;;
23766
esac
23767
23768
@@ -7517,14 +8710,14 @@
23769
if test "$tagname" = CXX ; then
23770
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
23771
10.[0123])
23772
- compile_command="$compile_command ${wl}-bind_at_load"
23773
- finalize_command="$finalize_command ${wl}-bind_at_load"
23774
+ func_append compile_command " ${wl}-bind_at_load"
23775
+ func_append finalize_command " ${wl}-bind_at_load"
23776
;;
23777
esac
23778
fi
23779
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
23780
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
23781
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
23782
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
23783
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
23784
;;
23785
esac
23786
23787
@@ -7538,7 +8731,7 @@
23788
*)
23789
case " $compile_deplibs " in
23790
*" -L$path/$objdir "*)
23791
- new_libs="$new_libs -L$path/$objdir" ;;
23792
+ func_append new_libs " -L$path/$objdir" ;;
23793
esac
23794
;;
23795
esac
23796
@@ -7548,17 +8741,17 @@
23797
-L*)
23798
case " $new_libs " in
23799
*" $deplib "*) ;;
23800
- *) new_libs="$new_libs $deplib" ;;
23801
+ *) func_append new_libs " $deplib" ;;
23802
esac
23803
;;
23804
- *) new_libs="$new_libs $deplib" ;;
23805
+ *) func_append new_libs " $deplib" ;;
23806
esac
23807
done
23808
compile_deplibs="$new_libs"
23809
23810
23811
- compile_command="$compile_command $compile_deplibs"
23812
- finalize_command="$finalize_command $finalize_deplibs"
23813
+ func_append compile_command " $compile_deplibs"
23814
+ func_append finalize_command " $finalize_deplibs"
23815
23816
if test -n "$rpath$xrpath"; then
23817
# If the user specified any rpath flags, then add them.
23818
@@ -7566,7 +8759,7 @@
23819
# This is the magic to use -rpath.
23820
case "$finalize_rpath " in
23821
*" $libdir "*) ;;
23822
- *) finalize_rpath="$finalize_rpath $libdir" ;;
23823
+ *) func_append finalize_rpath " $libdir" ;;
23824
esac
23825
done
23826
fi
23827
@@ -7585,18 +8778,18 @@
23828
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
23829
;;
23830
*)
23831
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
23832
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
23833
;;
23834
esac
23835
fi
23836
else
23837
eval flag=\"$hardcode_libdir_flag_spec\"
23838
- rpath="$rpath $flag"
23839
+ func_append rpath " $flag"
23840
fi
23841
elif test -n "$runpath_var"; then
23842
case "$perm_rpath " in
23843
*" $libdir "*) ;;
23844
- *) perm_rpath="$perm_rpath $libdir" ;;
23845
+ *) func_append perm_rpath " $libdir" ;;
23846
esac
23847
fi
23848
case $host in
23849
@@ -7605,12 +8798,12 @@
23850
case :$dllsearchpath: in
23851
*":$libdir:"*) ;;
23852
::) dllsearchpath=$libdir;;
23853
- *) dllsearchpath="$dllsearchpath:$libdir";;
23854
+ *) func_append dllsearchpath ":$libdir";;
23855
esac
23856
case :$dllsearchpath: in
23857
*":$testbindir:"*) ;;
23858
::) dllsearchpath=$testbindir;;
23859
- *) dllsearchpath="$dllsearchpath:$testbindir";;
23860
+ *) func_append dllsearchpath ":$testbindir";;
23861
esac
23862
;;
23863
esac
23864
@@ -7636,18 +8829,18 @@
23865
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
23866
;;
23867
*)
23868
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
23869
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
23870
;;
23871
esac
23872
fi
23873
else
23874
eval flag=\"$hardcode_libdir_flag_spec\"
23875
- rpath="$rpath $flag"
23876
+ func_append rpath " $flag"
23877
fi
23878
elif test -n "$runpath_var"; then
23879
case "$finalize_perm_rpath " in
23880
*" $libdir "*) ;;
23881
- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
23882
+ *) func_append finalize_perm_rpath " $libdir" ;;
23883
esac
23884
fi
23885
done
23886
@@ -7661,8 +8854,8 @@
23887
23888
if test -n "$libobjs" && test "$build_old_libs" = yes; then
23889
# Transform all the library objects into standard objects.
23890
- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
23891
- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
23892
+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
23893
+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
23894
fi
23895
23896
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
23897
@@ -7674,15 +8867,15 @@
23898
23899
wrappers_required=yes
23900
case $host in
23901
+ *cegcc* | *mingw32ce*)
23902
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
23903
+ wrappers_required=no
23904
+ ;;
23905
*cygwin* | *mingw* )
23906
if test "$build_libtool_libs" != yes; then
23907
wrappers_required=no
23908
fi
23909
;;
23910
- *cegcc)
23911
- # Disable wrappers for cegcc, we are cross compiling anyway.
23912
- wrappers_required=no
23913
- ;;
23914
*)
23915
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
23916
wrappers_required=no
23917
@@ -7691,13 +8884,19 @@
23918
esac
23919
if test "$wrappers_required" = no; then
23920
# Replace the output file specification.
23921
- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
23922
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
23923
link_command="$compile_command$compile_rpath"
23924
23925
# We have no uninstalled library dependencies, so finalize right now.
23926
exit_status=0
23927
func_show_eval "$link_command" 'exit_status=$?'
23928
23929
+ if test -n "$postlink_cmds"; then
23930
+ func_to_tool_file "$output"
23931
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
23932
+ func_execute_cmds "$postlink_cmds" 'exit $?'
23933
+ fi
23934
+
23935
# Delete the generated files.
23936
if test -f "$output_objdir/${outputname}S.${objext}"; then
23937
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
23938
@@ -7720,7 +8919,7 @@
23939
# We should set the runpath_var.
23940
rpath=
23941
for dir in $perm_rpath; do
23942
- rpath="$rpath$dir:"
23943
+ func_append rpath "$dir:"
23944
done
23945
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
23946
fi
23947
@@ -7728,7 +8927,7 @@
23948
# We should set the runpath_var.
23949
rpath=
23950
for dir in $finalize_perm_rpath; do
23951
- rpath="$rpath$dir:"
23952
+ func_append rpath "$dir:"
23953
done
23954
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
23955
fi
23956
@@ -7738,11 +8937,18 @@
23957
# We don't need to create a wrapper script.
23958
link_command="$compile_var$compile_command$compile_rpath"
23959
# Replace the output file specification.
23960
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
23961
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
23962
# Delete the old output file.
23963
$opt_dry_run || $RM $output
23964
# Link the executable and exit
23965
func_show_eval "$link_command" 'exit $?'
23966
+
23967
+ if test -n "$postlink_cmds"; then
23968
+ func_to_tool_file "$output"
23969
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
23970
+ func_execute_cmds "$postlink_cmds" 'exit $?'
23971
+ fi
23972
+
23973
exit $EXIT_SUCCESS
23974
fi
23975
23976
@@ -7757,7 +8963,7 @@
23977
if test "$fast_install" != no; then
23978
link_command="$finalize_var$compile_command$finalize_rpath"
23979
if test "$fast_install" = yes; then
23980
- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
23981
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
23982
else
23983
# fast_install is set to needless
23984
relink_command=
23985
@@ -7769,13 +8975,19 @@
23986
fi
23987
23988
# Replace the output file specification.
23989
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
23990
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
23991
23992
# Delete the old output files.
23993
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
23994
23995
func_show_eval "$link_command" 'exit $?'
23996
23997
+ if test -n "$postlink_cmds"; then
23998
+ func_to_tool_file "$output_objdir/$outputname"
23999
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
24000
+ func_execute_cmds "$postlink_cmds" 'exit $?'
24001
+ fi
24002
+
24003
# Now create the wrapper script.
24004
func_verbose "creating $output"
24005
24006
@@ -7793,18 +9005,7 @@
24007
fi
24008
done
24009
relink_command="(cd `pwd`; $relink_command)"
24010
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
24011
- fi
24012
-
24013
- # Quote $ECHO for shipping.
24014
- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
24015
- case $progpath in
24016
- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
24017
- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
24018
- esac
24019
- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
24020
- else
24021
- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
24022
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
24023
fi
24024
24025
# Only actually do things if not in dry run mode.
24026
@@ -7884,7 +9085,7 @@
24027
else
24028
oldobjs="$old_deplibs $non_pic_objects"
24029
if test "$preload" = yes && test -f "$symfileobj"; then
24030
- oldobjs="$oldobjs $symfileobj"
24031
+ func_append oldobjs " $symfileobj"
24032
fi
24033
fi
24034
addlibs="$old_convenience"
24035
@@ -7892,10 +9093,10 @@
24036
24037
if test -n "$addlibs"; then
24038
gentop="$output_objdir/${outputname}x"
24039
- generated="$generated $gentop"
24040
+ func_append generated " $gentop"
24041
24042
func_extract_archives $gentop $addlibs
24043
- oldobjs="$oldobjs $func_extract_archives_result"
24044
+ func_append oldobjs " $func_extract_archives_result"
24045
fi
24046
24047
# Do each command in the archive commands.
24048
@@ -7906,10 +9107,10 @@
24049
# Add any objects from preloaded convenience libraries
24050
if test -n "$dlprefiles"; then
24051
gentop="$output_objdir/${outputname}x"
24052
- generated="$generated $gentop"
24053
+ func_append generated " $gentop"
24054
24055
func_extract_archives $gentop $dlprefiles
24056
- oldobjs="$oldobjs $func_extract_archives_result"
24057
+ func_append oldobjs " $func_extract_archives_result"
24058
fi
24059
24060
# POSIX demands no paths to be encoded in archives. We have
24061
@@ -7925,9 +9126,9 @@
24062
done | sort | sort -uc >/dev/null 2>&1); then
24063
:
24064
else
24065
- $ECHO "copying selected object files to avoid basename conflicts..."
24066
+ echo "copying selected object files to avoid basename conflicts..."
24067
gentop="$output_objdir/${outputname}x"
24068
- generated="$generated $gentop"
24069
+ func_append generated " $gentop"
24070
func_mkdir_p "$gentop"
24071
save_oldobjs=$oldobjs
24072
oldobjs=
24073
@@ -7951,9 +9152,9 @@
24074
esac
24075
done
24076
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
24077
- oldobjs="$oldobjs $gentop/$newobj"
24078
+ func_append oldobjs " $gentop/$newobj"
24079
;;
24080
- *) oldobjs="$oldobjs $obj" ;;
24081
+ *) func_append oldobjs " $obj" ;;
24082
esac
24083
done
24084
fi
24085
@@ -7963,6 +9164,16 @@
24086
len=$func_len_result
24087
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
24088
cmds=$old_archive_cmds
24089
+ elif test -n "$archiver_list_spec"; then
24090
+ func_verbose "using command file archive linking..."
24091
+ for obj in $oldobjs
24092
+ do
24093
+ func_to_tool_file "$obj"
24094
+ $ECHO "$func_to_tool_file_result"
24095
+ done > $output_objdir/$libname.libcmd
24096
+ func_to_tool_file "$output_objdir/$libname.libcmd"
24097
+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
24098
+ cmds=$old_archive_cmds
24099
else
24100
# the command line is too long to link in one step, link in parts
24101
func_verbose "using piecewise archive linking..."
24102
@@ -8036,7 +9247,7 @@
24103
done
24104
# Quote the link command for shipping.
24105
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
24106
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
24107
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
24108
if test "$hardcode_automatic" = yes ; then
24109
relink_command=
24110
fi
24111
@@ -8059,9 +9270,19 @@
24112
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
24113
test -z "$libdir" && \
24114
func_fatal_error "\`$deplib' is not a valid libtool archive"
24115
- newdependency_libs="$newdependency_libs $libdir/$name"
24116
+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
24117
+ ;;
24118
+ -L*)
24119
+ func_stripname -L '' "$deplib"
24120
+ func_replace_sysroot "$func_stripname_result"
24121
+ func_append newdependency_libs " -L$func_replace_sysroot_result"
24122
;;
24123
- *) newdependency_libs="$newdependency_libs $deplib" ;;
24124
+ -R*)
24125
+ func_stripname -R '' "$deplib"
24126
+ func_replace_sysroot "$func_stripname_result"
24127
+ func_append newdependency_libs " -R$func_replace_sysroot_result"
24128
+ ;;
24129
+ *) func_append newdependency_libs " $deplib" ;;
24130
esac
24131
done
24132
dependency_libs="$newdependency_libs"
24133
@@ -8075,9 +9296,9 @@
24134
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
24135
test -z "$libdir" && \
24136
func_fatal_error "\`$lib' is not a valid libtool archive"
24137
- newdlfiles="$newdlfiles $libdir/$name"
24138
+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
24139
;;
24140
- *) newdlfiles="$newdlfiles $lib" ;;
24141
+ *) func_append newdlfiles " $lib" ;;
24142
esac
24143
done
24144
dlfiles="$newdlfiles"
24145
@@ -8094,7 +9315,7 @@
24146
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
24147
test -z "$libdir" && \
24148
func_fatal_error "\`$lib' is not a valid libtool archive"
24149
- newdlprefiles="$newdlprefiles $libdir/$name"
24150
+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
24151
;;
24152
esac
24153
done
24154
@@ -8106,7 +9327,7 @@
24155
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
24156
*) abs=`pwd`"/$lib" ;;
24157
esac
24158
- newdlfiles="$newdlfiles $abs"
24159
+ func_append newdlfiles " $abs"
24160
done
24161
dlfiles="$newdlfiles"
24162
newdlprefiles=
24163
@@ -8115,15 +9336,33 @@
24164
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
24165
*) abs=`pwd`"/$lib" ;;
24166
esac
24167
- newdlprefiles="$newdlprefiles $abs"
24168
+ func_append newdlprefiles " $abs"
24169
done
24170
dlprefiles="$newdlprefiles"
24171
fi
24172
$RM $output
24173
# place dlname in correct position for cygwin
24174
+ # In fact, it would be nice if we could use this code for all target
24175
+ # systems that can't hard-code library paths into their executables
24176
+ # and that have no shared library path variable independent of PATH,
24177
+ # but it turns out we can't easily determine that from inspecting
24178
+ # libtool variables, so we have to hard-code the OSs to which it
24179
+ # applies here; at the moment, that means platforms that use the PE
24180
+ # object format with DLL files. See the long comment at the top of
24181
+ # tests/bindir.at for full details.
24182
tdlname=$dlname
24183
case $host,$output,$installed,$module,$dlname in
24184
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
24185
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
24186
+ # If a -bindir argument was supplied, place the dll there.
24187
+ if test "x$bindir" != x ;
24188
+ then
24189
+ func_relative_path "$install_libdir" "$bindir"
24190
+ tdlname=$func_relative_path_result$dlname
24191
+ else
24192
+ # Otherwise fall back on heuristic.
24193
+ tdlname=../bin/$dlname
24194
+ fi
24195
+ ;;
24196
esac
24197
$ECHO > $output "\
24198
# $outputname - a libtool library file
24199
@@ -8182,7 +9421,7 @@
24200
exit $EXIT_SUCCESS
24201
}
24202
24203
-{ test "$mode" = link || test "$mode" = relink; } &&
24204
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
24205
func_mode_link ${1+"$@"}
24206
24207
24208
@@ -8202,9 +9441,9 @@
24209
for arg
24210
do
24211
case $arg in
24212
- -f) RM="$RM $arg"; rmforce=yes ;;
24213
- -*) RM="$RM $arg" ;;
24214
- *) files="$files $arg" ;;
24215
+ -f) func_append RM " $arg"; rmforce=yes ;;
24216
+ -*) func_append RM " $arg" ;;
24217
+ *) func_append files " $arg" ;;
24218
esac
24219
done
24220
24221
@@ -8213,24 +9452,23 @@
24222
24223
rmdirs=
24224
24225
- origobjdir="$objdir"
24226
for file in $files; do
24227
func_dirname "$file" "" "."
24228
dir="$func_dirname_result"
24229
if test "X$dir" = X.; then
24230
- objdir="$origobjdir"
24231
+ odir="$objdir"
24232
else
24233
- objdir="$dir/$origobjdir"
24234
+ odir="$dir/$objdir"
24235
fi
24236
func_basename "$file"
24237
name="$func_basename_result"
24238
- test "$mode" = uninstall && objdir="$dir"
24239
+ test "$opt_mode" = uninstall && odir="$dir"
24240
24241
- # Remember objdir for removal later, being careful to avoid duplicates
24242
- if test "$mode" = clean; then
24243
+ # Remember odir for removal later, being careful to avoid duplicates
24244
+ if test "$opt_mode" = clean; then
24245
case " $rmdirs " in
24246
- *" $objdir "*) ;;
24247
- *) rmdirs="$rmdirs $objdir" ;;
24248
+ *" $odir "*) ;;
24249
+ *) func_append rmdirs " $odir" ;;
24250
esac
24251
fi
24252
24253
@@ -8256,18 +9494,17 @@
24254
24255
# Delete the libtool libraries and symlinks.
24256
for n in $library_names; do
24257
- rmfiles="$rmfiles $objdir/$n"
24258
+ func_append rmfiles " $odir/$n"
24259
done
24260
- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
24261
+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
24262
24263
- case "$mode" in
24264
+ case "$opt_mode" in
24265
clean)
24266
- case " $library_names " in
24267
- # " " in the beginning catches empty $dlname
24268
+ case " $library_names " in
24269
*" $dlname "*) ;;
24270
- *) rmfiles="$rmfiles $objdir/$dlname" ;;
24271
+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
24272
esac
24273
- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
24274
+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
24275
;;
24276
uninstall)
24277
if test -n "$library_names"; then
24278
@@ -8295,19 +9532,19 @@
24279
# Add PIC object to the list of files to remove.
24280
if test -n "$pic_object" &&
24281
test "$pic_object" != none; then
24282
- rmfiles="$rmfiles $dir/$pic_object"
24283
+ func_append rmfiles " $dir/$pic_object"
24284
fi
24285
24286
# Add non-PIC object to the list of files to remove.
24287
if test -n "$non_pic_object" &&
24288
test "$non_pic_object" != none; then
24289
- rmfiles="$rmfiles $dir/$non_pic_object"
24290
+ func_append rmfiles " $dir/$non_pic_object"
24291
fi
24292
fi
24293
;;
24294
24295
*)
24296
- if test "$mode" = clean ; then
24297
+ if test "$opt_mode" = clean ; then
24298
noexename=$name
24299
case $file in
24300
*.exe)
24301
@@ -8317,7 +9554,7 @@
24302
noexename=$func_stripname_result
24303
# $file with .exe has already been added to rmfiles,
24304
# add $file without .exe
24305
- rmfiles="$rmfiles $file"
24306
+ func_append rmfiles " $file"
24307
;;
24308
esac
24309
# Do a test to see if this is a libtool program.
24310
@@ -8326,7 +9563,7 @@
24311
func_ltwrapper_scriptname "$file"
24312
relink_command=
24313
func_source $func_ltwrapper_scriptname_result
24314
- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
24315
+ func_append rmfiles " $func_ltwrapper_scriptname_result"
24316
else
24317
relink_command=
24318
func_source $dir/$noexename
24319
@@ -8334,12 +9571,12 @@
24320
24321
# note $name still contains .exe if it was in $file originally
24322
# as does the version of $file that was added into $rmfiles
24323
- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
24324
+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
24325
if test "$fast_install" = yes && test -n "$relink_command"; then
24326
- rmfiles="$rmfiles $objdir/lt-$name"
24327
+ func_append rmfiles " $odir/lt-$name"
24328
fi
24329
if test "X$noexename" != "X$name" ; then
24330
- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
24331
+ func_append rmfiles " $odir/lt-${noexename}.c"
24332
fi
24333
fi
24334
fi
24335
@@ -8347,7 +9584,6 @@
24336
esac
24337
func_show_eval "$RM $rmfiles" 'exit_status=1'
24338
done
24339
- objdir="$origobjdir"
24340
24341
# Try to remove the ${objdir}s in the directories where we deleted files
24342
for dir in $rmdirs; do
24343
@@ -8359,16 +9595,16 @@
24344
exit $exit_status
24345
}
24346
24347
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
24348
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
24349
func_mode_uninstall ${1+"$@"}
24350
24351
-test -z "$mode" && {
24352
+test -z "$opt_mode" && {
24353
help="$generic_help"
24354
func_fatal_help "you must specify a MODE"
24355
}
24356
24357
test -z "$exec_cmd" && \
24358
- func_fatal_help "invalid operation mode \`$mode'"
24359
+ func_fatal_help "invalid operation mode \`$opt_mode'"
24360
24361
if test -n "$exec_cmd"; then
24362
eval exec "$exec_cmd"
24363
Index: bluez/config.h.in
24364
===================================================================
24365
--- bluez.orig/config.h.in
24366
+++ bluez/config.h.in
24367
@@ -79,6 +79,9 @@
24368
/* Define to the one symbol short name of this package. */
24369
#undef PACKAGE_TARNAME
24370
24371
+/* Define to the home page for this package. */
24372
+#undef PACKAGE_URL
24373
+
24374
/* Define to the version of this package. */
24375
#undef PACKAGE_VERSION
24376
Loggerhead is a web-based interface for Breezy
Version: 2.0.1