Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From 0f45262ef0d656c576adbb0b0f42b8f417895008 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 14 Feb 2016 17:04:07 +0000 |
| 4 | Subject: [PATCH] Use libtool 2.4 |
| 5 | |
| 6 | get libtool sysroot support |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | bfd/Makefile.in | 3 + |
| 13 | bfd/configure | 1333 +++++++++--- |
| 14 | bfd/configure.ac | 2 +- |
| 15 | binutils/Makefile.in | 3 + |
| 16 | binutils/configure | 1331 +++++++++--- |
| 17 | gas/Makefile.in | 3 + |
| 18 | gas/configure | 1331 +++++++++--- |
| 19 | gdbsupport/Makefile.in | 1 + |
| 20 | gprof/Makefile.in | 3 + |
| 21 | gprof/configure | 1331 +++++++++--- |
| 22 | gprofng/Makefile.in | 2 + |
| 23 | gprofng/configure | 1701 ++++++++++++---- |
| 24 | gprofng/doc/Makefile.in | 2 + |
| 25 | gprofng/gp-display-html/Makefile.in | 2 + |
| 26 | gprofng/libcollector/Makefile.in | 2 + |
| 27 | gprofng/libcollector/configure | 1703 ++++++++++++---- |
| 28 | gprofng/src/Makefile.in | 2 + |
| 29 | ld/Makefile.in | 3 + |
| 30 | ld/configure | 1704 ++++++++++++---- |
| 31 | libbacktrace/Makefile.in | 3 + |
| 32 | libbacktrace/configure | 1331 +++++++++--- |
| 33 | libctf/Makefile.in | 2 + |
| 34 | libctf/configure | 1330 +++++++++--- |
| 35 | libtool.m4 | 1093 ++++++---- |
| 36 | ltmain.sh | 2925 ++++++++++++++++++--------- |
| 37 | ltoptions.m4 | 2 +- |
| 38 | ltversion.m4 | 12 +- |
| 39 | lt~obsolete.m4 | 2 +- |
| 40 | opcodes/Makefile.in | 3 + |
| 41 | opcodes/configure | 1331 +++++++++--- |
| 42 | sim/Makefile.in | 3 + |
| 43 | zlib/Makefile.in | 204 +- |
| 44 | zlib/aclocal.m4 | 218 +- |
| 45 | zlib/configure | 1554 +++++++++----- |
| 46 | 34 files changed, 14804 insertions(+), 5671 deletions(-) |
| 47 | |
| 48 | diff --git a/bfd/Makefile.in b/bfd/Makefile.in |
| 49 | index a26f74d7199..6edacdfeb0e 100644 |
| 50 | --- a/bfd/Makefile.in |
| 51 | +++ b/bfd/Makefile.in |
| 52 | @@ -346,6 +346,7 @@ DATADIRNAME = @DATADIRNAME@ |
| 53 | DEBUGDIR = @DEBUGDIR@ |
| 54 | DEFS = @DEFS@ |
| 55 | DEPDIR = @DEPDIR@ |
| 56 | +DLLTOOL = @DLLTOOL@ |
| 57 | DSYMUTIL = @DSYMUTIL@ |
| 58 | DUMPBIN = @DUMPBIN@ |
| 59 | ECHO_C = @ECHO_C@ |
| 60 | @@ -380,6 +381,7 @@ LN_S = @LN_S@ |
| 61 | LTLIBOBJS = @LTLIBOBJS@ |
| 62 | MAINT = @MAINT@ |
| 63 | MAKEINFO = @MAKEINFO@ |
| 64 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 65 | MKDIR_P = @MKDIR_P@ |
| 66 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
| 67 | MSGFMT = @MSGFMT@ |
| 68 | @@ -421,6 +423,7 @@ abs_builddir = @abs_builddir@ |
| 69 | abs_srcdir = @abs_srcdir@ |
| 70 | abs_top_builddir = @abs_top_builddir@ |
| 71 | abs_top_srcdir = @abs_top_srcdir@ |
| 72 | +ac_ct_AR = @ac_ct_AR@ |
| 73 | ac_ct_CC = @ac_ct_CC@ |
| 74 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 75 | all_backends = @all_backends@ |
| 76 | diff --git a/bfd/configure b/bfd/configure |
| 77 | index 4f591b750d8..d90db11744b 100755 |
| 78 | --- a/bfd/configure |
| 79 | +++ b/bfd/configure |
| 80 | @@ -702,6 +702,9 @@ OTOOL |
| 81 | LIPO |
| 82 | NMEDIT |
| 83 | DSYMUTIL |
| 84 | +MANIFEST_TOOL |
| 85 | +ac_ct_AR |
| 86 | +DLLTOOL |
| 87 | OBJDUMP |
| 88 | LN_S |
| 89 | NM |
| 90 | @@ -820,6 +823,7 @@ enable_static |
| 91 | with_pic |
| 92 | enable_fast_install |
| 93 | with_gnu_ld |
| 94 | +with_libtool_sysroot |
| 95 | enable_libtool_lock |
| 96 | enable_plugins |
| 97 | enable_largefile |
| 98 | @@ -1504,6 +1508,8 @@ Optional Packages: |
| 99 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 100 | both] |
| 101 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 102 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 103 | + (or the compiler's sysroot if not specified). |
| 104 | --with-mmap try using mmap for BFD input files if available |
| 105 | --with-separate-debug-dir=DIR |
| 106 | Look for global separate debug info in DIR |
| 107 | @@ -5024,8 +5030,8 @@ esac |
| 108 | |
| 109 | |
| 110 | |
| 111 | -macro_version='2.2.7a' |
| 112 | -macro_revision='1.3134' |
| 113 | +macro_version='2.4' |
| 114 | +macro_revision='1.3293' |
| 115 | |
| 116 | |
| 117 | |
| 118 | @@ -5065,7 +5071,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 119 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 120 | $as_echo_n "checking how to print strings... " >&6; } |
| 121 | # Test print first, because it will be a builtin if present. |
| 122 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 123 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 124 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 125 | ECHO='print -r --' |
| 126 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 127 | @@ -5758,8 +5764,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 128 | # Try some XSI features |
| 129 | xsi_shell=no |
| 130 | ( _lt_dummy="a/b/c" |
| 131 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 132 | - = c,a/b,, \ |
| 133 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 134 | + = c,a/b,b/c, \ |
| 135 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 136 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 137 | && xsi_shell=yes |
| 138 | @@ -5808,6 +5814,80 @@ esac |
| 139 | |
| 140 | |
| 141 | |
| 142 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 143 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 144 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 145 | + $as_echo_n "(cached) " >&6 |
| 146 | +else |
| 147 | + case $host in |
| 148 | + *-*-mingw* ) |
| 149 | + case $build in |
| 150 | + *-*-mingw* ) # actually msys |
| 151 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 152 | + ;; |
| 153 | + *-*-cygwin* ) |
| 154 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 155 | + ;; |
| 156 | + * ) # otherwise, assume *nix |
| 157 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 158 | + ;; |
| 159 | + esac |
| 160 | + ;; |
| 161 | + *-*-cygwin* ) |
| 162 | + case $build in |
| 163 | + *-*-mingw* ) # actually msys |
| 164 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 165 | + ;; |
| 166 | + *-*-cygwin* ) |
| 167 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 168 | + ;; |
| 169 | + * ) # otherwise, assume *nix |
| 170 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 171 | + ;; |
| 172 | + esac |
| 173 | + ;; |
| 174 | + * ) # unhandled hosts (and "normal" native builds) |
| 175 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 176 | + ;; |
| 177 | +esac |
| 178 | + |
| 179 | +fi |
| 180 | + |
| 181 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 182 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 183 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 184 | + |
| 185 | + |
| 186 | + |
| 187 | + |
| 188 | + |
| 189 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 190 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 191 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 192 | + $as_echo_n "(cached) " >&6 |
| 193 | +else |
| 194 | + #assume ordinary cross tools, or native build. |
| 195 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 196 | +case $host in |
| 197 | + *-*-mingw* ) |
| 198 | + case $build in |
| 199 | + *-*-mingw* ) # actually msys |
| 200 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 201 | + ;; |
| 202 | + esac |
| 203 | + ;; |
| 204 | +esac |
| 205 | + |
| 206 | +fi |
| 207 | + |
| 208 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 209 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 210 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 211 | + |
| 212 | + |
| 213 | + |
| 214 | + |
| 215 | + |
| 216 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 217 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 218 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 219 | @@ -5824,6 +5904,11 @@ case $reload_flag in |
| 220 | esac |
| 221 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 222 | case $host_os in |
| 223 | + cygwin* | mingw* | pw32* | cegcc*) |
| 224 | + if test "$GCC" != yes; then |
| 225 | + reload_cmds=false |
| 226 | + fi |
| 227 | + ;; |
| 228 | darwin*) |
| 229 | if test "$GCC" = yes; then |
| 230 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 231 | @@ -5992,7 +6077,8 @@ mingw* | pw32*) |
| 232 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 233 | lt_cv_file_magic_cmd='func_win32_libid' |
| 234 | else |
| 235 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 236 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 237 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 238 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 239 | fi |
| 240 | ;; |
| 241 | @@ -6146,6 +6232,21 @@ esac |
| 242 | fi |
| 243 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 244 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 245 | + |
| 246 | +file_magic_glob= |
| 247 | +want_nocaseglob=no |
| 248 | +if test "$build" = "$host"; then |
| 249 | + case $host_os in |
| 250 | + mingw* | pw32*) |
| 251 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 252 | + want_nocaseglob=yes |
| 253 | + else |
| 254 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 255 | + fi |
| 256 | + ;; |
| 257 | + esac |
| 258 | +fi |
| 259 | + |
| 260 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 261 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 262 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 263 | @@ -6161,6 +6262,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 264 | |
| 265 | |
| 266 | |
| 267 | + |
| 268 | + |
| 269 | + |
| 270 | + |
| 271 | + |
| 272 | + |
| 273 | + |
| 274 | + |
| 275 | + |
| 276 | + |
| 277 | +if test -n "$ac_tool_prefix"; then |
| 278 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 279 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 280 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 281 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 282 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 283 | + $as_echo_n "(cached) " >&6 |
| 284 | +else |
| 285 | + if test -n "$DLLTOOL"; then |
| 286 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 287 | +else |
| 288 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 289 | +for as_dir in $PATH |
| 290 | +do |
| 291 | + IFS=$as_save_IFS |
| 292 | + test -z "$as_dir" && as_dir=. |
| 293 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 294 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 295 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 296 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 297 | + break 2 |
| 298 | + fi |
| 299 | +done |
| 300 | + done |
| 301 | +IFS=$as_save_IFS |
| 302 | + |
| 303 | +fi |
| 304 | +fi |
| 305 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 306 | +if test -n "$DLLTOOL"; then |
| 307 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 308 | +$as_echo "$DLLTOOL" >&6; } |
| 309 | +else |
| 310 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 311 | +$as_echo "no" >&6; } |
| 312 | +fi |
| 313 | + |
| 314 | + |
| 315 | +fi |
| 316 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 317 | + ac_ct_DLLTOOL=$DLLTOOL |
| 318 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 319 | +set dummy dlltool; ac_word=$2 |
| 320 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 321 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 322 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 323 | + $as_echo_n "(cached) " >&6 |
| 324 | +else |
| 325 | + if test -n "$ac_ct_DLLTOOL"; then |
| 326 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 327 | +else |
| 328 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 329 | +for as_dir in $PATH |
| 330 | +do |
| 331 | + IFS=$as_save_IFS |
| 332 | + test -z "$as_dir" && as_dir=. |
| 333 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 334 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 335 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 336 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 337 | + break 2 |
| 338 | + fi |
| 339 | +done |
| 340 | + done |
| 341 | +IFS=$as_save_IFS |
| 342 | + |
| 343 | +fi |
| 344 | +fi |
| 345 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 346 | +if test -n "$ac_ct_DLLTOOL"; then |
| 347 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 348 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 349 | +else |
| 350 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 351 | +$as_echo "no" >&6; } |
| 352 | +fi |
| 353 | + |
| 354 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 355 | + DLLTOOL="false" |
| 356 | + else |
| 357 | + case $cross_compiling:$ac_tool_warned in |
| 358 | +yes:) |
| 359 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 360 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 361 | +ac_tool_warned=yes ;; |
| 362 | +esac |
| 363 | + DLLTOOL=$ac_ct_DLLTOOL |
| 364 | + fi |
| 365 | +else |
| 366 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 367 | +fi |
| 368 | + |
| 369 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 370 | + |
| 371 | + |
| 372 | + |
| 373 | + |
| 374 | + |
| 375 | + |
| 376 | + |
| 377 | + |
| 378 | + |
| 379 | + |
| 380 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 381 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 382 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 383 | + $as_echo_n "(cached) " >&6 |
| 384 | +else |
| 385 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 386 | + |
| 387 | +case $host_os in |
| 388 | +cygwin* | mingw* | pw32* | cegcc*) |
| 389 | + # two different shell functions defined in ltmain.sh |
| 390 | + # decide which to use based on capabilities of $DLLTOOL |
| 391 | + case `$DLLTOOL --help 2>&1` in |
| 392 | + *--identify-strict*) |
| 393 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 394 | + ;; |
| 395 | + *) |
| 396 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 397 | + ;; |
| 398 | + esac |
| 399 | + ;; |
| 400 | +*) |
| 401 | + # fallback: assume linklib IS sharedlib |
| 402 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 403 | + ;; |
| 404 | +esac |
| 405 | + |
| 406 | +fi |
| 407 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 408 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 409 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 410 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 411 | + |
| 412 | + |
| 413 | + |
| 414 | + |
| 415 | + |
| 416 | + |
| 417 | + |
| 418 | plugin_option= |
| 419 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 420 | for plugin in $plugin_names; do |
| 421 | @@ -6175,8 +6427,10 @@ for plugin in $plugin_names; do |
| 422 | done |
| 423 | |
| 424 | if test -n "$ac_tool_prefix"; then |
| 425 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 426 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 427 | + for ac_prog in ar |
| 428 | + do |
| 429 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 430 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 431 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 432 | $as_echo_n "checking for $ac_word... " >&6; } |
| 433 | if ${ac_cv_prog_AR+:} false; then : |
| 434 | @@ -6192,7 +6446,7 @@ do |
| 435 | test -z "$as_dir" && as_dir=. |
| 436 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 437 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 438 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 439 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 440 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 441 | break 2 |
| 442 | fi |
| 443 | @@ -6212,11 +6466,15 @@ $as_echo "no" >&6; } |
| 444 | fi |
| 445 | |
| 446 | |
| 447 | + test -n "$AR" && break |
| 448 | + done |
| 449 | fi |
| 450 | -if test -z "$ac_cv_prog_AR"; then |
| 451 | +if test -z "$AR"; then |
| 452 | ac_ct_AR=$AR |
| 453 | - # Extract the first word of "ar", so it can be a program name with args. |
| 454 | -set dummy ar; ac_word=$2 |
| 455 | + for ac_prog in ar |
| 456 | +do |
| 457 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 458 | +set dummy $ac_prog; ac_word=$2 |
| 459 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 460 | $as_echo_n "checking for $ac_word... " >&6; } |
| 461 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 462 | @@ -6232,7 +6490,7 @@ do |
| 463 | test -z "$as_dir" && as_dir=. |
| 464 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 465 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 466 | - ac_cv_prog_ac_ct_AR="ar" |
| 467 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 468 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 469 | break 2 |
| 470 | fi |
| 471 | @@ -6251,6 +6509,10 @@ else |
| 472 | $as_echo "no" >&6; } |
| 473 | fi |
| 474 | |
| 475 | + |
| 476 | + test -n "$ac_ct_AR" && break |
| 477 | +done |
| 478 | + |
| 479 | if test "x$ac_ct_AR" = x; then |
| 480 | AR="false" |
| 481 | else |
| 482 | @@ -6262,25 +6524,20 @@ ac_tool_warned=yes ;; |
| 483 | esac |
| 484 | AR=$ac_ct_AR |
| 485 | fi |
| 486 | -else |
| 487 | - AR="$ac_cv_prog_AR" |
| 488 | fi |
| 489 | |
| 490 | -test -z "$AR" && AR=ar |
| 491 | -if test -n "$plugin_option"; then |
| 492 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 493 | - touch conftest.c |
| 494 | - $AR $plugin_option rc conftest.a conftest.c |
| 495 | - if test "$?" != 0; then |
| 496 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 497 | + touch conftest.c |
| 498 | + $AR $plugin_option rc conftest.a conftest.c |
| 499 | + if test "$?" != 0; then |
| 500 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 501 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 502 | - else |
| 503 | - AR="$AR $plugin_option" |
| 504 | - fi |
| 505 | - rm -f conftest.* |
| 506 | + else |
| 507 | + AR="$AR $plugin_option" |
| 508 | fi |
| 509 | -fi |
| 510 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 511 | + rm -f conftest.* |
| 512 | +: ${AR=ar} |
| 513 | +: ${AR_FLAGS=cru} |
| 514 | + |
| 515 | |
| 516 | |
| 517 | |
| 518 | @@ -6291,6 +6548,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 519 | |
| 520 | |
| 521 | |
| 522 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 523 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 524 | +if ${lt_cv_ar_at_file+:} false; then : |
| 525 | + $as_echo_n "(cached) " >&6 |
| 526 | +else |
| 527 | + lt_cv_ar_at_file=no |
| 528 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 529 | +/* end confdefs.h. */ |
| 530 | + |
| 531 | +int |
| 532 | +main () |
| 533 | +{ |
| 534 | + |
| 535 | + ; |
| 536 | + return 0; |
| 537 | +} |
| 538 | +_ACEOF |
| 539 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 540 | + echo conftest.$ac_objext > conftest.lst |
| 541 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 542 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 543 | + (eval $lt_ar_try) 2>&5 |
| 544 | + ac_status=$? |
| 545 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 546 | + test $ac_status = 0; } |
| 547 | + if test "$ac_status" -eq 0; then |
| 548 | + # Ensure the archiver fails upon bogus file names. |
| 549 | + rm -f conftest.$ac_objext libconftest.a |
| 550 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 551 | + (eval $lt_ar_try) 2>&5 |
| 552 | + ac_status=$? |
| 553 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 554 | + test $ac_status = 0; } |
| 555 | + if test "$ac_status" -ne 0; then |
| 556 | + lt_cv_ar_at_file=@ |
| 557 | + fi |
| 558 | + fi |
| 559 | + rm -f conftest.* libconftest.a |
| 560 | + |
| 561 | +fi |
| 562 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 563 | + |
| 564 | +fi |
| 565 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 566 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 567 | + |
| 568 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 569 | + archiver_list_spec= |
| 570 | +else |
| 571 | + archiver_list_spec=$lt_cv_ar_at_file |
| 572 | +fi |
| 573 | + |
| 574 | + |
| 575 | + |
| 576 | + |
| 577 | + |
| 578 | + |
| 579 | |
| 580 | if test -n "$ac_tool_prefix"; then |
| 581 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 582 | @@ -6631,8 +6945,8 @@ esac |
| 583 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 584 | |
| 585 | # Transform an extracted symbol line into symbol name and symbol address |
| 586 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 587 | -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'" |
| 588 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 589 | +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'" |
| 590 | |
| 591 | # Handle CRLF in mingw tool chain |
| 592 | opt_cr= |
| 593 | @@ -6668,6 +6982,7 @@ for ac_symprfx in "" "_"; do |
| 594 | else |
| 595 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 596 | fi |
| 597 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 598 | |
| 599 | # Check to see that the pipe works correctly. |
| 600 | pipe_works=no |
| 601 | @@ -6709,6 +7024,18 @@ _LT_EOF |
| 602 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 603 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 604 | cat <<_LT_EOF > conftest.$ac_ext |
| 605 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 606 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 607 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 608 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 609 | +# define LT_DLSYM_CONST |
| 610 | +#elif defined(__osf__) |
| 611 | +/* This system does not cope well with relocations in const data. */ |
| 612 | +# define LT_DLSYM_CONST |
| 613 | +#else |
| 614 | +# define LT_DLSYM_CONST const |
| 615 | +#endif |
| 616 | + |
| 617 | #ifdef __cplusplus |
| 618 | extern "C" { |
| 619 | #endif |
| 620 | @@ -6720,7 +7047,7 @@ _LT_EOF |
| 621 | cat <<_LT_EOF >> conftest.$ac_ext |
| 622 | |
| 623 | /* The mapping between symbol names and symbols. */ |
| 624 | -const struct { |
| 625 | +LT_DLSYM_CONST struct { |
| 626 | const char *name; |
| 627 | void *address; |
| 628 | } |
| 629 | @@ -6746,8 +7073,8 @@ static const void *lt_preloaded_setup() { |
| 630 | _LT_EOF |
| 631 | # Now try linking the two files. |
| 632 | mv conftest.$ac_objext conftstm.$ac_objext |
| 633 | - lt_save_LIBS="$LIBS" |
| 634 | - lt_save_CFLAGS="$CFLAGS" |
| 635 | + lt_globsym_save_LIBS=$LIBS |
| 636 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 637 | LIBS="conftstm.$ac_objext" |
| 638 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 639 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 640 | @@ -6757,8 +7084,8 @@ _LT_EOF |
| 641 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 642 | pipe_works=yes |
| 643 | fi |
| 644 | - LIBS="$lt_save_LIBS" |
| 645 | - CFLAGS="$lt_save_CFLAGS" |
| 646 | + LIBS=$lt_globsym_save_LIBS |
| 647 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 648 | else |
| 649 | echo "cannot find nm_test_func in $nlist" >&5 |
| 650 | fi |
| 651 | @@ -6795,6 +7122,14 @@ else |
| 652 | $as_echo "ok" >&6; } |
| 653 | fi |
| 654 | |
| 655 | +# Response file support. |
| 656 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 657 | + nm_file_list_spec='@' |
| 658 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 659 | + nm_file_list_spec='@' |
| 660 | +fi |
| 661 | + |
| 662 | + |
| 663 | |
| 664 | |
| 665 | |
| 666 | @@ -6813,6 +7148,47 @@ fi |
| 667 | |
| 668 | |
| 669 | |
| 670 | + |
| 671 | + |
| 672 | + |
| 673 | + |
| 674 | + |
| 675 | + |
| 676 | + |
| 677 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 678 | +$as_echo_n "checking for sysroot... " >&6; } |
| 679 | + |
| 680 | +# Check whether --with-libtool-sysroot was given. |
| 681 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 682 | + withval=$with_libtool_sysroot; |
| 683 | +else |
| 684 | + with_libtool_sysroot=no |
| 685 | +fi |
| 686 | + |
| 687 | + |
| 688 | +lt_sysroot= |
| 689 | +case ${with_libtool_sysroot} in #( |
| 690 | + yes) |
| 691 | + if test "$GCC" = yes; then |
| 692 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 693 | + fi |
| 694 | + ;; #( |
| 695 | + /*) |
| 696 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 697 | + ;; #( |
| 698 | + no|'') |
| 699 | + ;; #( |
| 700 | + *) |
| 701 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 702 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 703 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 704 | + ;; |
| 705 | +esac |
| 706 | + |
| 707 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 708 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 709 | + |
| 710 | + |
| 711 | |
| 712 | |
| 713 | |
| 714 | @@ -7022,6 +7398,123 @@ esac |
| 715 | |
| 716 | need_locks="$enable_libtool_lock" |
| 717 | |
| 718 | +if test -n "$ac_tool_prefix"; then |
| 719 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 720 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 721 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 722 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 723 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 724 | + $as_echo_n "(cached) " >&6 |
| 725 | +else |
| 726 | + if test -n "$MANIFEST_TOOL"; then |
| 727 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 728 | +else |
| 729 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 730 | +for as_dir in $PATH |
| 731 | +do |
| 732 | + IFS=$as_save_IFS |
| 733 | + test -z "$as_dir" && as_dir=. |
| 734 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 735 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 736 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 737 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 738 | + break 2 |
| 739 | + fi |
| 740 | +done |
| 741 | + done |
| 742 | +IFS=$as_save_IFS |
| 743 | + |
| 744 | +fi |
| 745 | +fi |
| 746 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 747 | +if test -n "$MANIFEST_TOOL"; then |
| 748 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 749 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 750 | +else |
| 751 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 752 | +$as_echo "no" >&6; } |
| 753 | +fi |
| 754 | + |
| 755 | + |
| 756 | +fi |
| 757 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 758 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 759 | + # Extract the first word of "mt", so it can be a program name with args. |
| 760 | +set dummy mt; ac_word=$2 |
| 761 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 762 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 763 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 764 | + $as_echo_n "(cached) " >&6 |
| 765 | +else |
| 766 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 767 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 768 | +else |
| 769 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 770 | +for as_dir in $PATH |
| 771 | +do |
| 772 | + IFS=$as_save_IFS |
| 773 | + test -z "$as_dir" && as_dir=. |
| 774 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 775 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 776 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 777 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 778 | + break 2 |
| 779 | + fi |
| 780 | +done |
| 781 | + done |
| 782 | +IFS=$as_save_IFS |
| 783 | + |
| 784 | +fi |
| 785 | +fi |
| 786 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 787 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 788 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 789 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 790 | +else |
| 791 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 792 | +$as_echo "no" >&6; } |
| 793 | +fi |
| 794 | + |
| 795 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 796 | + MANIFEST_TOOL=":" |
| 797 | + else |
| 798 | + case $cross_compiling:$ac_tool_warned in |
| 799 | +yes:) |
| 800 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 801 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 802 | +ac_tool_warned=yes ;; |
| 803 | +esac |
| 804 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 805 | + fi |
| 806 | +else |
| 807 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 808 | +fi |
| 809 | + |
| 810 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 811 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 812 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 813 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 814 | + $as_echo_n "(cached) " >&6 |
| 815 | +else |
| 816 | + lt_cv_path_mainfest_tool=no |
| 817 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 818 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 819 | + cat conftest.err >&5 |
| 820 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 821 | + lt_cv_path_mainfest_tool=yes |
| 822 | + fi |
| 823 | + rm -f conftest* |
| 824 | +fi |
| 825 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 826 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 827 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 828 | + MANIFEST_TOOL=: |
| 829 | +fi |
| 830 | + |
| 831 | + |
| 832 | + |
| 833 | + |
| 834 | + |
| 835 | |
| 836 | case $host_os in |
| 837 | rhapsody* | darwin*) |
| 838 | @@ -7585,6 +8078,8 @@ _LT_EOF |
| 839 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 840 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 841 | $AR cru libconftest.a conftest.o 2>&5 |
| 842 | + echo "$RANLIB libconftest.a" >&5 |
| 843 | + $RANLIB libconftest.a 2>&5 |
| 844 | cat > conftest.c << _LT_EOF |
| 845 | int main() { return 0;} |
| 846 | _LT_EOF |
| 847 | @@ -8136,8 +8631,6 @@ fi |
| 848 | lt_prog_compiler_pic= |
| 849 | lt_prog_compiler_static= |
| 850 | |
| 851 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 852 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 853 | |
| 854 | if test "$GCC" = yes; then |
| 855 | lt_prog_compiler_wl='-Wl,' |
| 856 | @@ -8303,6 +8796,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 857 | lt_prog_compiler_pic='--shared' |
| 858 | lt_prog_compiler_static='--static' |
| 859 | ;; |
| 860 | + nagfor*) |
| 861 | + # NAG Fortran compiler |
| 862 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 863 | + lt_prog_compiler_pic='-PIC' |
| 864 | + lt_prog_compiler_static='-Bstatic' |
| 865 | + ;; |
| 866 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 867 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 868 | # which looks to be a dead project) |
| 869 | @@ -8365,7 +8864,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 870 | lt_prog_compiler_pic='-KPIC' |
| 871 | lt_prog_compiler_static='-Bstatic' |
| 872 | case $cc_basename in |
| 873 | - f77* | f90* | f95*) |
| 874 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 875 | lt_prog_compiler_wl='-Qoption ld ';; |
| 876 | *) |
| 877 | lt_prog_compiler_wl='-Wl,';; |
| 878 | @@ -8422,13 +8921,17 @@ case $host_os in |
| 879 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 880 | ;; |
| 881 | esac |
| 882 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 883 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 884 | - |
| 885 | - |
| 886 | - |
| 887 | - |
| 888 | |
| 889 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 890 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 891 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 892 | + $as_echo_n "(cached) " >&6 |
| 893 | +else |
| 894 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 895 | +fi |
| 896 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 897 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 898 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 899 | |
| 900 | # |
| 901 | # Check to make sure the PIC flag actually works. |
| 902 | @@ -8489,6 +8992,11 @@ fi |
| 903 | |
| 904 | |
| 905 | |
| 906 | + |
| 907 | + |
| 908 | + |
| 909 | + |
| 910 | + |
| 911 | # |
| 912 | # Check to make sure the static flag actually works. |
| 913 | # |
| 914 | @@ -8839,7 +9347,8 @@ _LT_EOF |
| 915 | allow_undefined_flag=unsupported |
| 916 | always_export_symbols=no |
| 917 | enable_shared_with_static_runtimes=yes |
| 918 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 919 | + 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' |
| 920 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 921 | |
| 922 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 923 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 924 | @@ -8938,12 +9447,12 @@ _LT_EOF |
| 925 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 926 | hardcode_libdir_flag_spec= |
| 927 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 928 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 929 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 930 | if test "x$supports_anon_versioning" = xyes; then |
| 931 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 932 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 933 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 934 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 935 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 936 | fi |
| 937 | ;; |
| 938 | esac |
| 939 | @@ -8957,8 +9466,8 @@ _LT_EOF |
| 940 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 941 | wlarc= |
| 942 | else |
| 943 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 944 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 945 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 946 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 947 | fi |
| 948 | ;; |
| 949 | |
| 950 | @@ -8976,8 +9485,8 @@ _LT_EOF |
| 951 | |
| 952 | _LT_EOF |
| 953 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 954 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 955 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 956 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 957 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 958 | else |
| 959 | ld_shlibs=no |
| 960 | fi |
| 961 | @@ -9023,8 +9532,8 @@ _LT_EOF |
| 962 | |
| 963 | *) |
| 964 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 965 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 966 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 967 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 968 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 969 | else |
| 970 | ld_shlibs=no |
| 971 | fi |
| 972 | @@ -9154,7 +9663,13 @@ _LT_EOF |
| 973 | allow_undefined_flag='-berok' |
| 974 | # Determine the default libpath from the value encoded in an |
| 975 | # empty executable. |
| 976 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 977 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 978 | + aix_libpath=$lt_cv_aix_libpath |
| 979 | +else |
| 980 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 981 | + $as_echo_n "(cached) " >&6 |
| 982 | +else |
| 983 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 984 | /* end confdefs.h. */ |
| 985 | |
| 986 | int |
| 987 | @@ -9167,22 +9682,29 @@ main () |
| 988 | _ACEOF |
| 989 | if ac_fn_c_try_link "$LINENO"; then : |
| 990 | |
| 991 | -lt_aix_libpath_sed=' |
| 992 | - /Import File Strings/,/^$/ { |
| 993 | - /^0/ { |
| 994 | - s/^0 *\(.*\)$/\1/ |
| 995 | - p |
| 996 | - } |
| 997 | - }' |
| 998 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 999 | -# Check for a 64-bit object if we didn't find anything. |
| 1000 | -if test -z "$aix_libpath"; then |
| 1001 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1002 | -fi |
| 1003 | + lt_aix_libpath_sed=' |
| 1004 | + /Import File Strings/,/^$/ { |
| 1005 | + /^0/ { |
| 1006 | + s/^0 *\([^ ]*\) *$/\1/ |
| 1007 | + p |
| 1008 | + } |
| 1009 | + }' |
| 1010 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1011 | + # Check for a 64-bit object if we didn't find anything. |
| 1012 | + if test -z "$lt_cv_aix_libpath_"; then |
| 1013 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1014 | + fi |
| 1015 | fi |
| 1016 | rm -f core conftest.err conftest.$ac_objext \ |
| 1017 | conftest$ac_exeext conftest.$ac_ext |
| 1018 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1019 | + if test -z "$lt_cv_aix_libpath_"; then |
| 1020 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 1021 | + fi |
| 1022 | + |
| 1023 | +fi |
| 1024 | + |
| 1025 | + aix_libpath=$lt_cv_aix_libpath_ |
| 1026 | +fi |
| 1027 | |
| 1028 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 1029 | 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" |
| 1030 | @@ -9194,7 +9716,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1031 | else |
| 1032 | # Determine the default libpath from the value encoded in an |
| 1033 | # empty executable. |
| 1034 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 1035 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 1036 | + aix_libpath=$lt_cv_aix_libpath |
| 1037 | +else |
| 1038 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 1039 | + $as_echo_n "(cached) " >&6 |
| 1040 | +else |
| 1041 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 1042 | /* end confdefs.h. */ |
| 1043 | |
| 1044 | int |
| 1045 | @@ -9207,22 +9735,29 @@ main () |
| 1046 | _ACEOF |
| 1047 | if ac_fn_c_try_link "$LINENO"; then : |
| 1048 | |
| 1049 | -lt_aix_libpath_sed=' |
| 1050 | - /Import File Strings/,/^$/ { |
| 1051 | - /^0/ { |
| 1052 | - s/^0 *\(.*\)$/\1/ |
| 1053 | - p |
| 1054 | - } |
| 1055 | - }' |
| 1056 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1057 | -# Check for a 64-bit object if we didn't find anything. |
| 1058 | -if test -z "$aix_libpath"; then |
| 1059 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1060 | -fi |
| 1061 | + lt_aix_libpath_sed=' |
| 1062 | + /Import File Strings/,/^$/ { |
| 1063 | + /^0/ { |
| 1064 | + s/^0 *\([^ ]*\) *$/\1/ |
| 1065 | + p |
| 1066 | + } |
| 1067 | + }' |
| 1068 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1069 | + # Check for a 64-bit object if we didn't find anything. |
| 1070 | + if test -z "$lt_cv_aix_libpath_"; then |
| 1071 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1072 | + fi |
| 1073 | fi |
| 1074 | rm -f core conftest.err conftest.$ac_objext \ |
| 1075 | conftest$ac_exeext conftest.$ac_ext |
| 1076 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1077 | + if test -z "$lt_cv_aix_libpath_"; then |
| 1078 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 1079 | + fi |
| 1080 | + |
| 1081 | +fi |
| 1082 | + |
| 1083 | + aix_libpath=$lt_cv_aix_libpath_ |
| 1084 | +fi |
| 1085 | |
| 1086 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 1087 | # Warning - without using the other run time loading flags, |
| 1088 | @@ -9267,20 +9802,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1089 | # Microsoft Visual C++. |
| 1090 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 1091 | # no search path for DLLs. |
| 1092 | - hardcode_libdir_flag_spec=' ' |
| 1093 | - allow_undefined_flag=unsupported |
| 1094 | - # Tell ltmain to make .lib files, not .a files. |
| 1095 | - libext=lib |
| 1096 | - # Tell ltmain to make .dll files, not .so files. |
| 1097 | - shrext_cmds=".dll" |
| 1098 | - # FIXME: Setting linknames here is a bad hack. |
| 1099 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 1100 | - # The linker will automatically build a .lib file if we build a DLL. |
| 1101 | - old_archive_from_new_cmds='true' |
| 1102 | - # FIXME: Should let the user specify the lib program. |
| 1103 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 1104 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 1105 | - enable_shared_with_static_runtimes=yes |
| 1106 | + case $cc_basename in |
| 1107 | + cl*) |
| 1108 | + # Native MSVC |
| 1109 | + hardcode_libdir_flag_spec=' ' |
| 1110 | + allow_undefined_flag=unsupported |
| 1111 | + always_export_symbols=yes |
| 1112 | + file_list_spec='@' |
| 1113 | + # Tell ltmain to make .lib files, not .a files. |
| 1114 | + libext=lib |
| 1115 | + # Tell ltmain to make .dll files, not .so files. |
| 1116 | + shrext_cmds=".dll" |
| 1117 | + # FIXME: Setting linknames here is a bad hack. |
| 1118 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 1119 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 1120 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 1121 | + else |
| 1122 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 1123 | + fi~ |
| 1124 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 1125 | + linknames=' |
| 1126 | + # The linker will not automatically build a static lib if we build a DLL. |
| 1127 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 1128 | + enable_shared_with_static_runtimes=yes |
| 1129 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 1130 | + # Don't use ranlib |
| 1131 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 1132 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 1133 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 1134 | + case $lt_outputfile in |
| 1135 | + *.exe|*.EXE) ;; |
| 1136 | + *) |
| 1137 | + lt_outputfile="$lt_outputfile.exe" |
| 1138 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 1139 | + ;; |
| 1140 | + esac~ |
| 1141 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 1142 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 1143 | + $RM "$lt_outputfile.manifest"; |
| 1144 | + fi' |
| 1145 | + ;; |
| 1146 | + *) |
| 1147 | + # Assume MSVC wrapper |
| 1148 | + hardcode_libdir_flag_spec=' ' |
| 1149 | + allow_undefined_flag=unsupported |
| 1150 | + # Tell ltmain to make .lib files, not .a files. |
| 1151 | + libext=lib |
| 1152 | + # Tell ltmain to make .dll files, not .so files. |
| 1153 | + shrext_cmds=".dll" |
| 1154 | + # FIXME: Setting linknames here is a bad hack. |
| 1155 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 1156 | + # The linker will automatically build a .lib file if we build a DLL. |
| 1157 | + old_archive_from_new_cmds='true' |
| 1158 | + # FIXME: Should let the user specify the lib program. |
| 1159 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 1160 | + enable_shared_with_static_runtimes=yes |
| 1161 | + ;; |
| 1162 | + esac |
| 1163 | ;; |
| 1164 | |
| 1165 | darwin* | rhapsody*) |
| 1166 | @@ -9341,7 +9919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1167 | |
| 1168 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 1169 | freebsd* | dragonfly*) |
| 1170 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 1171 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 1172 | hardcode_libdir_flag_spec='-R$libdir' |
| 1173 | hardcode_direct=yes |
| 1174 | hardcode_shlibpath_var=no |
| 1175 | @@ -9349,7 +9927,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1176 | |
| 1177 | hpux9*) |
| 1178 | if test "$GCC" = yes; then |
| 1179 | - 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' |
| 1180 | + 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' |
| 1181 | else |
| 1182 | 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' |
| 1183 | fi |
| 1184 | @@ -9365,7 +9943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1185 | |
| 1186 | hpux10*) |
| 1187 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 1188 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1189 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1190 | else |
| 1191 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 1192 | fi |
| 1193 | @@ -9389,10 +9967,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1194 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1195 | ;; |
| 1196 | ia64*) |
| 1197 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 1198 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 1199 | ;; |
| 1200 | *) |
| 1201 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1202 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1203 | ;; |
| 1204 | esac |
| 1205 | else |
| 1206 | @@ -9471,23 +10049,36 @@ fi |
| 1207 | |
| 1208 | irix5* | irix6* | nonstopux*) |
| 1209 | if test "$GCC" = yes; then |
| 1210 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 1211 | + 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' |
| 1212 | # Try to use the -exported_symbol ld option, if it does not |
| 1213 | # work, assume that -exports_file does not work either and |
| 1214 | # implicitly export all symbols. |
| 1215 | - save_LDFLAGS="$LDFLAGS" |
| 1216 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 1217 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 1218 | + # This should be the same for all languages, so no per-tag cache variable. |
| 1219 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 1220 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 1221 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 1222 | + $as_echo_n "(cached) " >&6 |
| 1223 | +else |
| 1224 | + save_LDFLAGS="$LDFLAGS" |
| 1225 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 1226 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 1227 | /* end confdefs.h. */ |
| 1228 | -int foo(void) {} |
| 1229 | +int foo (void) { return 0; } |
| 1230 | _ACEOF |
| 1231 | if ac_fn_c_try_link "$LINENO"; then : |
| 1232 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 1233 | - |
| 1234 | + lt_cv_irix_exported_symbol=yes |
| 1235 | +else |
| 1236 | + lt_cv_irix_exported_symbol=no |
| 1237 | fi |
| 1238 | rm -f core conftest.err conftest.$ac_objext \ |
| 1239 | conftest$ac_exeext conftest.$ac_ext |
| 1240 | - LDFLAGS="$save_LDFLAGS" |
| 1241 | + LDFLAGS="$save_LDFLAGS" |
| 1242 | +fi |
| 1243 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 1244 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 1245 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 1246 | + 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' |
| 1247 | + fi |
| 1248 | else |
| 1249 | 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' |
| 1250 | 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' |
| 1251 | @@ -9572,7 +10163,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 1252 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 1253 | if test "$GCC" = yes; then |
| 1254 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 1255 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 1256 | + 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' |
| 1257 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 1258 | else |
| 1259 | allow_undefined_flag=' -expect_unresolved \*' |
| 1260 | @@ -9591,9 +10182,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 1261 | no_undefined_flag=' -z defs' |
| 1262 | if test "$GCC" = yes; then |
| 1263 | wlarc='${wl}' |
| 1264 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1265 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1266 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 1267 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 1268 | + $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' |
| 1269 | else |
| 1270 | case `$CC -V 2>&1` in |
| 1271 | *"Compilers 5.0"*) |
| 1272 | @@ -10169,8 +10760,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 1273 | need_version=no |
| 1274 | need_lib_prefix=no |
| 1275 | |
| 1276 | - case $GCC,$host_os in |
| 1277 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 1278 | + case $GCC,$cc_basename in |
| 1279 | + yes,*) |
| 1280 | + # gcc |
| 1281 | library_names_spec='$libname.dll.a' |
| 1282 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 1283 | postinstall_cmds='base_file=`basename \${file}`~ |
| 1284 | @@ -10203,13 +10795,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 1285 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 1286 | ;; |
| 1287 | esac |
| 1288 | + dynamic_linker='Win32 ld.exe' |
| 1289 | + ;; |
| 1290 | + |
| 1291 | + *,cl*) |
| 1292 | + # Native MSVC |
| 1293 | + libname_spec='$name' |
| 1294 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 1295 | + library_names_spec='${libname}.dll.lib' |
| 1296 | + |
| 1297 | + case $build_os in |
| 1298 | + mingw*) |
| 1299 | + sys_lib_search_path_spec= |
| 1300 | + lt_save_ifs=$IFS |
| 1301 | + IFS=';' |
| 1302 | + for lt_path in $LIB |
| 1303 | + do |
| 1304 | + IFS=$lt_save_ifs |
| 1305 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 1306 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 1307 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 1308 | + done |
| 1309 | + IFS=$lt_save_ifs |
| 1310 | + # Convert to MSYS style. |
| 1311 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 1312 | + ;; |
| 1313 | + cygwin*) |
| 1314 | + # Convert to unix form, then to dos form, then back to unix form |
| 1315 | + # but this time dos style (no spaces!) so that the unix form looks |
| 1316 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 1317 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 1318 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 1319 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 1320 | + ;; |
| 1321 | + *) |
| 1322 | + sys_lib_search_path_spec="$LIB" |
| 1323 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 1324 | + # It is most probably a Windows format PATH. |
| 1325 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 1326 | + else |
| 1327 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 1328 | + fi |
| 1329 | + # FIXME: find the short name or the path components, as spaces are |
| 1330 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 1331 | + ;; |
| 1332 | + esac |
| 1333 | + |
| 1334 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 1335 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 1336 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 1337 | + dldir=$destdir/`dirname \$dlpath`~ |
| 1338 | + test -d \$dldir || mkdir -p \$dldir~ |
| 1339 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 1340 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 1341 | + dlpath=$dir/\$dldll~ |
| 1342 | + $RM \$dlpath' |
| 1343 | + shlibpath_overrides_runpath=yes |
| 1344 | + dynamic_linker='Win32 link.exe' |
| 1345 | ;; |
| 1346 | |
| 1347 | *) |
| 1348 | + # Assume MSVC wrapper |
| 1349 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 1350 | + dynamic_linker='Win32 ld.exe' |
| 1351 | ;; |
| 1352 | esac |
| 1353 | - dynamic_linker='Win32 ld.exe' |
| 1354 | # FIXME: first we should search . and the directory the executable is in |
| 1355 | shlibpath_var=PATH |
| 1356 | ;; |
| 1357 | @@ -11087,7 +11737,7 @@ else |
| 1358 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 1359 | lt_status=$lt_dlunknown |
| 1360 | cat > conftest.$ac_ext <<_LT_EOF |
| 1361 | -#line 11090 "configure" |
| 1362 | +#line $LINENO "configure" |
| 1363 | #include "confdefs.h" |
| 1364 | |
| 1365 | #if HAVE_DLFCN_H |
| 1366 | @@ -11131,10 +11781,10 @@ else |
| 1367 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 1368 | correspondingly for the symbols needed. */ |
| 1369 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 1370 | -void fnord () __attribute__((visibility("default"))); |
| 1371 | +int fnord () __attribute__((visibility("default"))); |
| 1372 | #endif |
| 1373 | |
| 1374 | -void fnord () { int i=42; } |
| 1375 | +int fnord () { return 42; } |
| 1376 | int main () |
| 1377 | { |
| 1378 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 1379 | @@ -11193,7 +11843,7 @@ else |
| 1380 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 1381 | lt_status=$lt_dlunknown |
| 1382 | cat > conftest.$ac_ext <<_LT_EOF |
| 1383 | -#line 11196 "configure" |
| 1384 | +#line $LINENO "configure" |
| 1385 | #include "confdefs.h" |
| 1386 | |
| 1387 | #if HAVE_DLFCN_H |
| 1388 | @@ -11237,10 +11887,10 @@ else |
| 1389 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 1390 | correspondingly for the symbols needed. */ |
| 1391 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 1392 | -void fnord () __attribute__((visibility("default"))); |
| 1393 | +int fnord () __attribute__((visibility("default"))); |
| 1394 | #endif |
| 1395 | |
| 1396 | -void fnord () { int i=42; } |
| 1397 | +int fnord () { return 42; } |
| 1398 | int main () |
| 1399 | { |
| 1400 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 1401 | @@ -13225,7 +13875,7 @@ SHARED_LDFLAGS= |
| 1402 | if test "$enable_shared" = "yes"; then |
| 1403 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 1404 | if test -n "$x"; then |
| 1405 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 1406 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 1407 | fi |
| 1408 | fi |
| 1409 | |
| 1410 | @@ -15869,13 +16519,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 1411 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 1412 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 1413 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 1414 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 1415 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 1416 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 1417 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 1418 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 1419 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 1420 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 1421 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 1422 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 1423 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 1424 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 1425 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 1426 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 1427 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1428 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 1429 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 1430 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 1431 | @@ -15890,14 +16547,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 1432 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 1433 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 1434 | 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"`' |
| 1435 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1436 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 1437 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 1438 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 1439 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 1440 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 1441 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 1442 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 1443 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 1444 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 1445 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 1446 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 1447 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 1448 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 1449 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 1450 | @@ -15930,12 +16590,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 1451 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 1452 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 1453 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 1454 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 1455 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 1456 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 1457 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 1458 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 1459 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 1460 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 1461 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1462 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 1463 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 1464 | @@ -15990,8 +16650,13 @@ reload_flag \ |
| 1465 | OBJDUMP \ |
| 1466 | deplibs_check_method \ |
| 1467 | file_magic_cmd \ |
| 1468 | +file_magic_glob \ |
| 1469 | +want_nocaseglob \ |
| 1470 | +DLLTOOL \ |
| 1471 | +sharedlib_from_linklib_cmd \ |
| 1472 | AR \ |
| 1473 | AR_FLAGS \ |
| 1474 | +archiver_list_spec \ |
| 1475 | STRIP \ |
| 1476 | RANLIB \ |
| 1477 | CC \ |
| 1478 | @@ -16001,12 +16666,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 1479 | lt_cv_sys_global_symbol_to_cdecl \ |
| 1480 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 1481 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 1482 | +nm_file_list_spec \ |
| 1483 | lt_prog_compiler_no_builtin_flag \ |
| 1484 | -lt_prog_compiler_wl \ |
| 1485 | lt_prog_compiler_pic \ |
| 1486 | +lt_prog_compiler_wl \ |
| 1487 | lt_prog_compiler_static \ |
| 1488 | lt_cv_prog_compiler_c_o \ |
| 1489 | need_locks \ |
| 1490 | +MANIFEST_TOOL \ |
| 1491 | DSYMUTIL \ |
| 1492 | NMEDIT \ |
| 1493 | LIPO \ |
| 1494 | @@ -16022,7 +16689,6 @@ no_undefined_flag \ |
| 1495 | hardcode_libdir_flag_spec \ |
| 1496 | hardcode_libdir_flag_spec_ld \ |
| 1497 | hardcode_libdir_separator \ |
| 1498 | -fix_srcfile_path \ |
| 1499 | exclude_expsyms \ |
| 1500 | include_expsyms \ |
| 1501 | file_list_spec \ |
| 1502 | @@ -16058,6 +16724,7 @@ module_cmds \ |
| 1503 | module_expsym_cmds \ |
| 1504 | export_symbols_cmds \ |
| 1505 | prelink_cmds \ |
| 1506 | +postlink_cmds \ |
| 1507 | postinstall_cmds \ |
| 1508 | postuninstall_cmds \ |
| 1509 | finish_cmds \ |
| 1510 | @@ -16826,7 +17493,8 @@ $as_echo X"$file" | |
| 1511 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 1512 | # |
| 1513 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 1514 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 1515 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 1516 | +# Inc. |
| 1517 | # Written by Gordon Matzigkeit, 1996 |
| 1518 | # |
| 1519 | # This file is part of GNU Libtool. |
| 1520 | @@ -16929,19 +17597,42 @@ SP2NL=$lt_lt_SP2NL |
| 1521 | # turn newlines into spaces. |
| 1522 | NL2SP=$lt_lt_NL2SP |
| 1523 | |
| 1524 | +# convert \$build file names to \$host format. |
| 1525 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 1526 | + |
| 1527 | +# convert \$build files to toolchain format. |
| 1528 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 1529 | + |
| 1530 | # An object symbol dumper. |
| 1531 | OBJDUMP=$lt_OBJDUMP |
| 1532 | |
| 1533 | # Method to check whether dependent libraries are shared objects. |
| 1534 | deplibs_check_method=$lt_deplibs_check_method |
| 1535 | |
| 1536 | -# Command to use when deplibs_check_method == "file_magic". |
| 1537 | +# Command to use when deplibs_check_method = "file_magic". |
| 1538 | file_magic_cmd=$lt_file_magic_cmd |
| 1539 | |
| 1540 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 1541 | +file_magic_glob=$lt_file_magic_glob |
| 1542 | + |
| 1543 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 1544 | +want_nocaseglob=$lt_want_nocaseglob |
| 1545 | + |
| 1546 | +# DLL creation program. |
| 1547 | +DLLTOOL=$lt_DLLTOOL |
| 1548 | + |
| 1549 | +# Command to associate shared and link libraries. |
| 1550 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 1551 | + |
| 1552 | # The archiver. |
| 1553 | AR=$lt_AR |
| 1554 | + |
| 1555 | +# Flags to create an archive. |
| 1556 | AR_FLAGS=$lt_AR_FLAGS |
| 1557 | |
| 1558 | +# How to feed a file listing to the archiver. |
| 1559 | +archiver_list_spec=$lt_archiver_list_spec |
| 1560 | + |
| 1561 | # A symbol stripping program. |
| 1562 | STRIP=$lt_STRIP |
| 1563 | |
| 1564 | @@ -16971,6 +17662,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 1565 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 1566 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 1567 | |
| 1568 | +# Specify filename containing input files for \$NM. |
| 1569 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 1570 | + |
| 1571 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 1572 | +lt_sysroot=$lt_sysroot |
| 1573 | + |
| 1574 | # The name of the directory that contains temporary libtool files. |
| 1575 | objdir=$objdir |
| 1576 | |
| 1577 | @@ -16980,6 +17677,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 1578 | # Must we lock files when doing compilation? |
| 1579 | need_locks=$lt_need_locks |
| 1580 | |
| 1581 | +# Manifest tool. |
| 1582 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 1583 | + |
| 1584 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 1585 | DSYMUTIL=$lt_DSYMUTIL |
| 1586 | |
| 1587 | @@ -17094,12 +17794,12 @@ with_gcc=$GCC |
| 1588 | # Compiler flag to turn off builtin functions. |
| 1589 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 1590 | |
| 1591 | -# How to pass a linker flag through the compiler. |
| 1592 | -wl=$lt_lt_prog_compiler_wl |
| 1593 | - |
| 1594 | # Additional compiler flags for building library objects. |
| 1595 | pic_flag=$lt_lt_prog_compiler_pic |
| 1596 | |
| 1597 | +# How to pass a linker flag through the compiler. |
| 1598 | +wl=$lt_lt_prog_compiler_wl |
| 1599 | + |
| 1600 | # Compiler flag to prevent dynamic linking. |
| 1601 | link_static_flag=$lt_lt_prog_compiler_static |
| 1602 | |
| 1603 | @@ -17186,9 +17886,6 @@ inherit_rpath=$inherit_rpath |
| 1604 | # Whether libtool must link a program against all its dependency libraries. |
| 1605 | link_all_deplibs=$link_all_deplibs |
| 1606 | |
| 1607 | -# Fix the shell variable \$srcfile for the compiler. |
| 1608 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 1609 | - |
| 1610 | # Set to "yes" if exported symbols are required. |
| 1611 | always_export_symbols=$always_export_symbols |
| 1612 | |
| 1613 | @@ -17204,6 +17901,9 @@ include_expsyms=$lt_include_expsyms |
| 1614 | # Commands necessary for linking programs (against libraries) with templates. |
| 1615 | prelink_cmds=$lt_prelink_cmds |
| 1616 | |
| 1617 | +# Commands necessary for finishing linking programs. |
| 1618 | +postlink_cmds=$lt_postlink_cmds |
| 1619 | + |
| 1620 | # Specify filename containing input files. |
| 1621 | file_list_spec=$lt_file_list_spec |
| 1622 | |
| 1623 | @@ -17236,210 +17936,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 1624 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 1625 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 1626 | # is reportedly fixed, but why not run on old versions too? |
| 1627 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 1628 | - || (rm -f "$cfgfile"; exit 1) |
| 1629 | - |
| 1630 | - case $xsi_shell in |
| 1631 | - yes) |
| 1632 | - cat << \_LT_EOF >> "$cfgfile" |
| 1633 | - |
| 1634 | -# func_dirname file append nondir_replacement |
| 1635 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 1636 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 1637 | -func_dirname () |
| 1638 | -{ |
| 1639 | - case ${1} in |
| 1640 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 1641 | - * ) func_dirname_result="${3}" ;; |
| 1642 | - esac |
| 1643 | -} |
| 1644 | - |
| 1645 | -# func_basename file |
| 1646 | -func_basename () |
| 1647 | -{ |
| 1648 | - func_basename_result="${1##*/}" |
| 1649 | -} |
| 1650 | - |
| 1651 | -# func_dirname_and_basename file append nondir_replacement |
| 1652 | -# perform func_basename and func_dirname in a single function |
| 1653 | -# call: |
| 1654 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 1655 | -# add APPEND to the result, otherwise set result |
| 1656 | -# to NONDIR_REPLACEMENT. |
| 1657 | -# value returned in "$func_dirname_result" |
| 1658 | -# basename: Compute filename of FILE. |
| 1659 | -# value retuned in "$func_basename_result" |
| 1660 | -# Implementation must be kept synchronized with func_dirname |
| 1661 | -# and func_basename. For efficiency, we do not delegate to |
| 1662 | -# those functions but instead duplicate the functionality here. |
| 1663 | -func_dirname_and_basename () |
| 1664 | -{ |
| 1665 | - case ${1} in |
| 1666 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 1667 | - * ) func_dirname_result="${3}" ;; |
| 1668 | - esac |
| 1669 | - func_basename_result="${1##*/}" |
| 1670 | -} |
| 1671 | - |
| 1672 | -# func_stripname prefix suffix name |
| 1673 | -# strip PREFIX and SUFFIX off of NAME. |
| 1674 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 1675 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 1676 | -# dot (in which case that matches only a dot). |
| 1677 | -func_stripname () |
| 1678 | -{ |
| 1679 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 1680 | - # positional parameters, so assign one to ordinary parameter first. |
| 1681 | - func_stripname_result=${3} |
| 1682 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 1683 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 1684 | -} |
| 1685 | - |
| 1686 | -# func_opt_split |
| 1687 | -func_opt_split () |
| 1688 | -{ |
| 1689 | - func_opt_split_opt=${1%%=*} |
| 1690 | - func_opt_split_arg=${1#*=} |
| 1691 | -} |
| 1692 | - |
| 1693 | -# func_lo2o object |
| 1694 | -func_lo2o () |
| 1695 | -{ |
| 1696 | - case ${1} in |
| 1697 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 1698 | - *) func_lo2o_result=${1} ;; |
| 1699 | - esac |
| 1700 | -} |
| 1701 | - |
| 1702 | -# func_xform libobj-or-source |
| 1703 | -func_xform () |
| 1704 | -{ |
| 1705 | - func_xform_result=${1%.*}.lo |
| 1706 | -} |
| 1707 | - |
| 1708 | -# func_arith arithmetic-term... |
| 1709 | -func_arith () |
| 1710 | -{ |
| 1711 | - func_arith_result=$(( $* )) |
| 1712 | -} |
| 1713 | - |
| 1714 | -# func_len string |
| 1715 | -# STRING may not start with a hyphen. |
| 1716 | -func_len () |
| 1717 | -{ |
| 1718 | - func_len_result=${#1} |
| 1719 | -} |
| 1720 | - |
| 1721 | -_LT_EOF |
| 1722 | - ;; |
| 1723 | - *) # Bourne compatible functions. |
| 1724 | - cat << \_LT_EOF >> "$cfgfile" |
| 1725 | - |
| 1726 | -# func_dirname file append nondir_replacement |
| 1727 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 1728 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 1729 | -func_dirname () |
| 1730 | -{ |
| 1731 | - # Extract subdirectory from the argument. |
| 1732 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 1733 | - if test "X$func_dirname_result" = "X${1}"; then |
| 1734 | - func_dirname_result="${3}" |
| 1735 | - else |
| 1736 | - func_dirname_result="$func_dirname_result${2}" |
| 1737 | - fi |
| 1738 | -} |
| 1739 | - |
| 1740 | -# func_basename file |
| 1741 | -func_basename () |
| 1742 | -{ |
| 1743 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 1744 | -} |
| 1745 | - |
| 1746 | - |
| 1747 | -# func_stripname prefix suffix name |
| 1748 | -# strip PREFIX and SUFFIX off of NAME. |
| 1749 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 1750 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 1751 | -# dot (in which case that matches only a dot). |
| 1752 | -# func_strip_suffix prefix name |
| 1753 | -func_stripname () |
| 1754 | -{ |
| 1755 | - case ${2} in |
| 1756 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 1757 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 1758 | - esac |
| 1759 | -} |
| 1760 | - |
| 1761 | -# sed scripts: |
| 1762 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 1763 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 1764 | - |
| 1765 | -# func_opt_split |
| 1766 | -func_opt_split () |
| 1767 | -{ |
| 1768 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 1769 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 1770 | -} |
| 1771 | - |
| 1772 | -# func_lo2o object |
| 1773 | -func_lo2o () |
| 1774 | -{ |
| 1775 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 1776 | -} |
| 1777 | - |
| 1778 | -# func_xform libobj-or-source |
| 1779 | -func_xform () |
| 1780 | -{ |
| 1781 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 1782 | -} |
| 1783 | - |
| 1784 | -# func_arith arithmetic-term... |
| 1785 | -func_arith () |
| 1786 | -{ |
| 1787 | - func_arith_result=`expr "$@"` |
| 1788 | -} |
| 1789 | - |
| 1790 | -# func_len string |
| 1791 | -# STRING may not start with a hyphen. |
| 1792 | -func_len () |
| 1793 | -{ |
| 1794 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 1795 | -} |
| 1796 | - |
| 1797 | -_LT_EOF |
| 1798 | -esac |
| 1799 | - |
| 1800 | -case $lt_shell_append in |
| 1801 | - yes) |
| 1802 | - cat << \_LT_EOF >> "$cfgfile" |
| 1803 | - |
| 1804 | -# func_append var value |
| 1805 | -# Append VALUE to the end of shell variable VAR. |
| 1806 | -func_append () |
| 1807 | -{ |
| 1808 | - eval "$1+=\$2" |
| 1809 | -} |
| 1810 | -_LT_EOF |
| 1811 | - ;; |
| 1812 | - *) |
| 1813 | - cat << \_LT_EOF >> "$cfgfile" |
| 1814 | - |
| 1815 | -# func_append var value |
| 1816 | -# Append VALUE to the end of shell variable VAR. |
| 1817 | -func_append () |
| 1818 | -{ |
| 1819 | - eval "$1=\$$1\$2" |
| 1820 | -} |
| 1821 | - |
| 1822 | -_LT_EOF |
| 1823 | - ;; |
| 1824 | - esac |
| 1825 | - |
| 1826 | - |
| 1827 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 1828 | - || (rm -f "$cfgfile"; exit 1) |
| 1829 | - |
| 1830 | - mv -f "$cfgfile" "$ofile" || |
| 1831 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 1832 | + || (rm -f "$cfgfile"; exit 1) |
| 1833 | + |
| 1834 | + if test x"$xsi_shell" = xyes; then |
| 1835 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 1836 | +func_dirname ()\ |
| 1837 | +{\ |
| 1838 | +\ case ${1} in\ |
| 1839 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 1840 | +\ * ) func_dirname_result="${3}" ;;\ |
| 1841 | +\ esac\ |
| 1842 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1843 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1844 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1845 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1846 | + |
| 1847 | + |
| 1848 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 1849 | +func_basename ()\ |
| 1850 | +{\ |
| 1851 | +\ func_basename_result="${1##*/}"\ |
| 1852 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1853 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1854 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1855 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1856 | + |
| 1857 | + |
| 1858 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 1859 | +func_dirname_and_basename ()\ |
| 1860 | +{\ |
| 1861 | +\ case ${1} in\ |
| 1862 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 1863 | +\ * ) func_dirname_result="${3}" ;;\ |
| 1864 | +\ esac\ |
| 1865 | +\ func_basename_result="${1##*/}"\ |
| 1866 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1867 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1868 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1869 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1870 | + |
| 1871 | + |
| 1872 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 1873 | +func_stripname ()\ |
| 1874 | +{\ |
| 1875 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 1876 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 1877 | +\ func_stripname_result=${3}\ |
| 1878 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 1879 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 1880 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1881 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1882 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1883 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1884 | + |
| 1885 | + |
| 1886 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 1887 | +func_split_long_opt ()\ |
| 1888 | +{\ |
| 1889 | +\ func_split_long_opt_name=${1%%=*}\ |
| 1890 | +\ func_split_long_opt_arg=${1#*=}\ |
| 1891 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1892 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1893 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1894 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1895 | + |
| 1896 | + |
| 1897 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 1898 | +func_split_short_opt ()\ |
| 1899 | +{\ |
| 1900 | +\ func_split_short_opt_arg=${1#??}\ |
| 1901 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 1902 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1903 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1904 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1905 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1906 | + |
| 1907 | + |
| 1908 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 1909 | +func_lo2o ()\ |
| 1910 | +{\ |
| 1911 | +\ case ${1} in\ |
| 1912 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 1913 | +\ *) func_lo2o_result=${1} ;;\ |
| 1914 | +\ esac\ |
| 1915 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1916 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1917 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1918 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1919 | + |
| 1920 | + |
| 1921 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 1922 | +func_xform ()\ |
| 1923 | +{\ |
| 1924 | + func_xform_result=${1%.*}.lo\ |
| 1925 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1926 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1927 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1928 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1929 | + |
| 1930 | + |
| 1931 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 1932 | +func_arith ()\ |
| 1933 | +{\ |
| 1934 | + func_arith_result=$(( $* ))\ |
| 1935 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1936 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1937 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1938 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1939 | + |
| 1940 | + |
| 1941 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 1942 | +func_len ()\ |
| 1943 | +{\ |
| 1944 | + func_len_result=${#1}\ |
| 1945 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1946 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1947 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1948 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1949 | + |
| 1950 | +fi |
| 1951 | + |
| 1952 | +if test x"$lt_shell_append" = xyes; then |
| 1953 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 1954 | +func_append ()\ |
| 1955 | +{\ |
| 1956 | + eval "${1}+=\\${2}"\ |
| 1957 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1958 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1959 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1960 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1961 | + |
| 1962 | + |
| 1963 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 1964 | +func_append_quoted ()\ |
| 1965 | +{\ |
| 1966 | +\ func_quote_for_eval "${2}"\ |
| 1967 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 1968 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1969 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1970 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1971 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1972 | + |
| 1973 | + |
| 1974 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 1975 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 1976 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1977 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1978 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 1979 | +else |
| 1980 | + # Save a `func_append' function call even when '+=' is not available |
| 1981 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 1982 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1983 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1984 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 1985 | +fi |
| 1986 | + |
| 1987 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 1988 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 1989 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 1990 | +fi |
| 1991 | + |
| 1992 | + |
| 1993 | + mv -f "$cfgfile" "$ofile" || |
| 1994 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 1995 | chmod +x "$ofile" |
| 1996 | |
| 1997 | diff --git a/bfd/configure.ac b/bfd/configure.ac |
| 1998 | index 6146efb5ae3..73e5e03d016 100644 |
| 1999 | --- a/bfd/configure.ac |
| 2000 | +++ b/bfd/configure.ac |
| 2001 | @@ -282,7 +282,7 @@ changequote(,)dnl |
| 2002 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 2003 | changequote([,])dnl |
| 2004 | if test -n "$x"; then |
| 2005 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 2006 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 2007 | fi |
| 2008 | fi |
| 2009 | |
| 2010 | diff --git a/binutils/Makefile.in b/binutils/Makefile.in |
| 2011 | index 78d32b350e3..ad4f2de7358 100644 |
| 2012 | --- a/binutils/Makefile.in |
| 2013 | +++ b/binutils/Makefile.in |
| 2014 | @@ -492,6 +492,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@ |
| 2015 | DEFS = @DEFS@ |
| 2016 | DEMANGLER_NAME = @DEMANGLER_NAME@ |
| 2017 | DEPDIR = @DEPDIR@ |
| 2018 | +DLLTOOL = @DLLTOOL@ |
| 2019 | DLLTOOL_DEFS = @DLLTOOL_DEFS@ |
| 2020 | DSYMUTIL = @DSYMUTIL@ |
| 2021 | DUMPBIN = @DUMPBIN@ |
| 2022 | @@ -533,6 +534,7 @@ LTLIBICONV = @LTLIBICONV@ |
| 2023 | LTLIBOBJS = @LTLIBOBJS@ |
| 2024 | MAINT = @MAINT@ |
| 2025 | MAKEINFO = @MAKEINFO@ |
| 2026 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 2027 | MKDIR_P = @MKDIR_P@ |
| 2028 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
| 2029 | MSGFMT = @MSGFMT@ |
| 2030 | @@ -579,6 +581,7 @@ abs_builddir = @abs_builddir@ |
| 2031 | abs_srcdir = @abs_srcdir@ |
| 2032 | abs_top_builddir = @abs_top_builddir@ |
| 2033 | abs_top_srcdir = @abs_top_srcdir@ |
| 2034 | +ac_ct_AR = @ac_ct_AR@ |
| 2035 | ac_ct_CC = @ac_ct_CC@ |
| 2036 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 2037 | am__include = @am__include@ |
| 2038 | diff --git a/binutils/configure b/binutils/configure |
| 2039 | index 149815542f9..43952bde405 100755 |
| 2040 | --- a/binutils/configure |
| 2041 | +++ b/binutils/configure |
| 2042 | @@ -698,8 +698,11 @@ OTOOL |
| 2043 | LIPO |
| 2044 | NMEDIT |
| 2045 | DSYMUTIL |
| 2046 | +MANIFEST_TOOL |
| 2047 | RANLIB |
| 2048 | +ac_ct_AR |
| 2049 | AR |
| 2050 | +DLLTOOL |
| 2051 | OBJDUMP |
| 2052 | LN_S |
| 2053 | NM |
| 2054 | @@ -816,6 +819,7 @@ enable_static |
| 2055 | with_pic |
| 2056 | enable_fast_install |
| 2057 | with_gnu_ld |
| 2058 | +with_libtool_sysroot |
| 2059 | enable_libtool_lock |
| 2060 | enable_plugins |
| 2061 | enable_largefile |
| 2062 | @@ -1514,6 +1518,8 @@ Optional Packages: |
| 2063 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 2064 | both] |
| 2065 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 2066 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 2067 | + (or the compiler's sysroot if not specified). |
| 2068 | --with-debuginfod Enable debuginfo lookups with debuginfod |
| 2069 | (auto/yes/no) |
| 2070 | --with-system-zlib use installed libz |
| 2071 | @@ -4893,8 +4899,8 @@ esac |
| 2072 | |
| 2073 | |
| 2074 | |
| 2075 | -macro_version='2.2.7a' |
| 2076 | -macro_revision='1.3134' |
| 2077 | +macro_version='2.4' |
| 2078 | +macro_revision='1.3293' |
| 2079 | |
| 2080 | |
| 2081 | |
| 2082 | @@ -4934,7 +4940,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 2083 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 2084 | $as_echo_n "checking how to print strings... " >&6; } |
| 2085 | # Test print first, because it will be a builtin if present. |
| 2086 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 2087 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 2088 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 2089 | ECHO='print -r --' |
| 2090 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 2091 | @@ -5627,8 +5633,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 2092 | # Try some XSI features |
| 2093 | xsi_shell=no |
| 2094 | ( _lt_dummy="a/b/c" |
| 2095 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 2096 | - = c,a/b,, \ |
| 2097 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 2098 | + = c,a/b,b/c, \ |
| 2099 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 2100 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 2101 | && xsi_shell=yes |
| 2102 | @@ -5677,6 +5683,80 @@ esac |
| 2103 | |
| 2104 | |
| 2105 | |
| 2106 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 2107 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 2108 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 2109 | + $as_echo_n "(cached) " >&6 |
| 2110 | +else |
| 2111 | + case $host in |
| 2112 | + *-*-mingw* ) |
| 2113 | + case $build in |
| 2114 | + *-*-mingw* ) # actually msys |
| 2115 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 2116 | + ;; |
| 2117 | + *-*-cygwin* ) |
| 2118 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 2119 | + ;; |
| 2120 | + * ) # otherwise, assume *nix |
| 2121 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 2122 | + ;; |
| 2123 | + esac |
| 2124 | + ;; |
| 2125 | + *-*-cygwin* ) |
| 2126 | + case $build in |
| 2127 | + *-*-mingw* ) # actually msys |
| 2128 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 2129 | + ;; |
| 2130 | + *-*-cygwin* ) |
| 2131 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 2132 | + ;; |
| 2133 | + * ) # otherwise, assume *nix |
| 2134 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 2135 | + ;; |
| 2136 | + esac |
| 2137 | + ;; |
| 2138 | + * ) # unhandled hosts (and "normal" native builds) |
| 2139 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 2140 | + ;; |
| 2141 | +esac |
| 2142 | + |
| 2143 | +fi |
| 2144 | + |
| 2145 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 2146 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 2147 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 2148 | + |
| 2149 | + |
| 2150 | + |
| 2151 | + |
| 2152 | + |
| 2153 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 2154 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 2155 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 2156 | + $as_echo_n "(cached) " >&6 |
| 2157 | +else |
| 2158 | + #assume ordinary cross tools, or native build. |
| 2159 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 2160 | +case $host in |
| 2161 | + *-*-mingw* ) |
| 2162 | + case $build in |
| 2163 | + *-*-mingw* ) # actually msys |
| 2164 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 2165 | + ;; |
| 2166 | + esac |
| 2167 | + ;; |
| 2168 | +esac |
| 2169 | + |
| 2170 | +fi |
| 2171 | + |
| 2172 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 2173 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 2174 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 2175 | + |
| 2176 | + |
| 2177 | + |
| 2178 | + |
| 2179 | + |
| 2180 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 2181 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 2182 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 2183 | @@ -5693,6 +5773,11 @@ case $reload_flag in |
| 2184 | esac |
| 2185 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 2186 | case $host_os in |
| 2187 | + cygwin* | mingw* | pw32* | cegcc*) |
| 2188 | + if test "$GCC" != yes; then |
| 2189 | + reload_cmds=false |
| 2190 | + fi |
| 2191 | + ;; |
| 2192 | darwin*) |
| 2193 | if test "$GCC" = yes; then |
| 2194 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 2195 | @@ -5861,7 +5946,8 @@ mingw* | pw32*) |
| 2196 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 2197 | lt_cv_file_magic_cmd='func_win32_libid' |
| 2198 | else |
| 2199 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 2200 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 2201 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 2202 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 2203 | fi |
| 2204 | ;; |
| 2205 | @@ -6015,6 +6101,21 @@ esac |
| 2206 | fi |
| 2207 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 2208 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 2209 | + |
| 2210 | +file_magic_glob= |
| 2211 | +want_nocaseglob=no |
| 2212 | +if test "$build" = "$host"; then |
| 2213 | + case $host_os in |
| 2214 | + mingw* | pw32*) |
| 2215 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 2216 | + want_nocaseglob=yes |
| 2217 | + else |
| 2218 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 2219 | + fi |
| 2220 | + ;; |
| 2221 | + esac |
| 2222 | +fi |
| 2223 | + |
| 2224 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 2225 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 2226 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 2227 | @@ -6030,6 +6131,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 2228 | |
| 2229 | |
| 2230 | |
| 2231 | + |
| 2232 | + |
| 2233 | + |
| 2234 | + |
| 2235 | + |
| 2236 | + |
| 2237 | + |
| 2238 | + |
| 2239 | + |
| 2240 | + |
| 2241 | +if test -n "$ac_tool_prefix"; then |
| 2242 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 2243 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 2244 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2245 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2246 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 2247 | + $as_echo_n "(cached) " >&6 |
| 2248 | +else |
| 2249 | + if test -n "$DLLTOOL"; then |
| 2250 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 2251 | +else |
| 2252 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2253 | +for as_dir in $PATH |
| 2254 | +do |
| 2255 | + IFS=$as_save_IFS |
| 2256 | + test -z "$as_dir" && as_dir=. |
| 2257 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2258 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 2259 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 2260 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2261 | + break 2 |
| 2262 | + fi |
| 2263 | +done |
| 2264 | + done |
| 2265 | +IFS=$as_save_IFS |
| 2266 | + |
| 2267 | +fi |
| 2268 | +fi |
| 2269 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 2270 | +if test -n "$DLLTOOL"; then |
| 2271 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 2272 | +$as_echo "$DLLTOOL" >&6; } |
| 2273 | +else |
| 2274 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2275 | +$as_echo "no" >&6; } |
| 2276 | +fi |
| 2277 | + |
| 2278 | + |
| 2279 | +fi |
| 2280 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 2281 | + ac_ct_DLLTOOL=$DLLTOOL |
| 2282 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 2283 | +set dummy dlltool; ac_word=$2 |
| 2284 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2285 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2286 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 2287 | + $as_echo_n "(cached) " >&6 |
| 2288 | +else |
| 2289 | + if test -n "$ac_ct_DLLTOOL"; then |
| 2290 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 2291 | +else |
| 2292 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2293 | +for as_dir in $PATH |
| 2294 | +do |
| 2295 | + IFS=$as_save_IFS |
| 2296 | + test -z "$as_dir" && as_dir=. |
| 2297 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2298 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 2299 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 2300 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2301 | + break 2 |
| 2302 | + fi |
| 2303 | +done |
| 2304 | + done |
| 2305 | +IFS=$as_save_IFS |
| 2306 | + |
| 2307 | +fi |
| 2308 | +fi |
| 2309 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 2310 | +if test -n "$ac_ct_DLLTOOL"; then |
| 2311 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 2312 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 2313 | +else |
| 2314 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2315 | +$as_echo "no" >&6; } |
| 2316 | +fi |
| 2317 | + |
| 2318 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 2319 | + DLLTOOL="false" |
| 2320 | + else |
| 2321 | + case $cross_compiling:$ac_tool_warned in |
| 2322 | +yes:) |
| 2323 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2324 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2325 | +ac_tool_warned=yes ;; |
| 2326 | +esac |
| 2327 | + DLLTOOL=$ac_ct_DLLTOOL |
| 2328 | + fi |
| 2329 | +else |
| 2330 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 2331 | +fi |
| 2332 | + |
| 2333 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 2334 | + |
| 2335 | + |
| 2336 | + |
| 2337 | + |
| 2338 | + |
| 2339 | + |
| 2340 | + |
| 2341 | + |
| 2342 | + |
| 2343 | + |
| 2344 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 2345 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 2346 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 2347 | + $as_echo_n "(cached) " >&6 |
| 2348 | +else |
| 2349 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 2350 | + |
| 2351 | +case $host_os in |
| 2352 | +cygwin* | mingw* | pw32* | cegcc*) |
| 2353 | + # two different shell functions defined in ltmain.sh |
| 2354 | + # decide which to use based on capabilities of $DLLTOOL |
| 2355 | + case `$DLLTOOL --help 2>&1` in |
| 2356 | + *--identify-strict*) |
| 2357 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 2358 | + ;; |
| 2359 | + *) |
| 2360 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 2361 | + ;; |
| 2362 | + esac |
| 2363 | + ;; |
| 2364 | +*) |
| 2365 | + # fallback: assume linklib IS sharedlib |
| 2366 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 2367 | + ;; |
| 2368 | +esac |
| 2369 | + |
| 2370 | +fi |
| 2371 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 2372 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 2373 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 2374 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 2375 | + |
| 2376 | + |
| 2377 | + |
| 2378 | + |
| 2379 | + |
| 2380 | + |
| 2381 | + |
| 2382 | plugin_option= |
| 2383 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 2384 | for plugin in $plugin_names; do |
| 2385 | @@ -6044,8 +6296,10 @@ for plugin in $plugin_names; do |
| 2386 | done |
| 2387 | |
| 2388 | if test -n "$ac_tool_prefix"; then |
| 2389 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 2390 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 2391 | + for ac_prog in ar |
| 2392 | + do |
| 2393 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 2394 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 2395 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2396 | $as_echo_n "checking for $ac_word... " >&6; } |
| 2397 | if ${ac_cv_prog_AR+:} false; then : |
| 2398 | @@ -6061,7 +6315,7 @@ do |
| 2399 | test -z "$as_dir" && as_dir=. |
| 2400 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2401 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 2402 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 2403 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 2404 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2405 | break 2 |
| 2406 | fi |
| 2407 | @@ -6081,11 +6335,15 @@ $as_echo "no" >&6; } |
| 2408 | fi |
| 2409 | |
| 2410 | |
| 2411 | + test -n "$AR" && break |
| 2412 | + done |
| 2413 | fi |
| 2414 | -if test -z "$ac_cv_prog_AR"; then |
| 2415 | +if test -z "$AR"; then |
| 2416 | ac_ct_AR=$AR |
| 2417 | - # Extract the first word of "ar", so it can be a program name with args. |
| 2418 | -set dummy ar; ac_word=$2 |
| 2419 | + for ac_prog in ar |
| 2420 | +do |
| 2421 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 2422 | +set dummy $ac_prog; ac_word=$2 |
| 2423 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2424 | $as_echo_n "checking for $ac_word... " >&6; } |
| 2425 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 2426 | @@ -6101,7 +6359,7 @@ do |
| 2427 | test -z "$as_dir" && as_dir=. |
| 2428 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2429 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 2430 | - ac_cv_prog_ac_ct_AR="ar" |
| 2431 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 2432 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2433 | break 2 |
| 2434 | fi |
| 2435 | @@ -6120,6 +6378,10 @@ else |
| 2436 | $as_echo "no" >&6; } |
| 2437 | fi |
| 2438 | |
| 2439 | + |
| 2440 | + test -n "$ac_ct_AR" && break |
| 2441 | +done |
| 2442 | + |
| 2443 | if test "x$ac_ct_AR" = x; then |
| 2444 | AR="false" |
| 2445 | else |
| 2446 | @@ -6131,29 +6393,81 @@ ac_tool_warned=yes ;; |
| 2447 | esac |
| 2448 | AR=$ac_ct_AR |
| 2449 | fi |
| 2450 | -else |
| 2451 | - AR="$ac_cv_prog_AR" |
| 2452 | fi |
| 2453 | |
| 2454 | -test -z "$AR" && AR=ar |
| 2455 | -if test -n "$plugin_option"; then |
| 2456 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 2457 | - touch conftest.c |
| 2458 | - $AR $plugin_option rc conftest.a conftest.c |
| 2459 | - if test "$?" != 0; then |
| 2460 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 2461 | + touch conftest.c |
| 2462 | + $AR $plugin_option rc conftest.a conftest.c |
| 2463 | + if test "$?" != 0; then |
| 2464 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 2465 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 2466 | - else |
| 2467 | - AR="$AR $plugin_option" |
| 2468 | - fi |
| 2469 | - rm -f conftest.* |
| 2470 | + else |
| 2471 | + AR="$AR $plugin_option" |
| 2472 | fi |
| 2473 | -fi |
| 2474 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 2475 | + rm -f conftest.* |
| 2476 | +: ${AR=ar} |
| 2477 | +: ${AR_FLAGS=cru} |
| 2478 | + |
| 2479 | + |
| 2480 | + |
| 2481 | + |
| 2482 | + |
| 2483 | + |
| 2484 | + |
| 2485 | + |
| 2486 | + |
| 2487 | + |
| 2488 | + |
| 2489 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 2490 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 2491 | +if ${lt_cv_ar_at_file+:} false; then : |
| 2492 | + $as_echo_n "(cached) " >&6 |
| 2493 | +else |
| 2494 | + lt_cv_ar_at_file=no |
| 2495 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2496 | +/* end confdefs.h. */ |
| 2497 | + |
| 2498 | +int |
| 2499 | +main () |
| 2500 | +{ |
| 2501 | |
| 2502 | + ; |
| 2503 | + return 0; |
| 2504 | +} |
| 2505 | +_ACEOF |
| 2506 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 2507 | + echo conftest.$ac_objext > conftest.lst |
| 2508 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 2509 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 2510 | + (eval $lt_ar_try) 2>&5 |
| 2511 | + ac_status=$? |
| 2512 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 2513 | + test $ac_status = 0; } |
| 2514 | + if test "$ac_status" -eq 0; then |
| 2515 | + # Ensure the archiver fails upon bogus file names. |
| 2516 | + rm -f conftest.$ac_objext libconftest.a |
| 2517 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 2518 | + (eval $lt_ar_try) 2>&5 |
| 2519 | + ac_status=$? |
| 2520 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 2521 | + test $ac_status = 0; } |
| 2522 | + if test "$ac_status" -ne 0; then |
| 2523 | + lt_cv_ar_at_file=@ |
| 2524 | + fi |
| 2525 | + fi |
| 2526 | + rm -f conftest.* libconftest.a |
| 2527 | |
| 2528 | +fi |
| 2529 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 2530 | |
| 2531 | +fi |
| 2532 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 2533 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 2534 | |
| 2535 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 2536 | + archiver_list_spec= |
| 2537 | +else |
| 2538 | + archiver_list_spec=$lt_cv_ar_at_file |
| 2539 | +fi |
| 2540 | |
| 2541 | |
| 2542 | |
| 2543 | @@ -6500,8 +6814,8 @@ esac |
| 2544 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 2545 | |
| 2546 | # Transform an extracted symbol line into symbol name and symbol address |
| 2547 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 2548 | -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'" |
| 2549 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 2550 | +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'" |
| 2551 | |
| 2552 | # Handle CRLF in mingw tool chain |
| 2553 | opt_cr= |
| 2554 | @@ -6537,6 +6851,7 @@ for ac_symprfx in "" "_"; do |
| 2555 | else |
| 2556 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 2557 | fi |
| 2558 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 2559 | |
| 2560 | # Check to see that the pipe works correctly. |
| 2561 | pipe_works=no |
| 2562 | @@ -6578,6 +6893,18 @@ _LT_EOF |
| 2563 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 2564 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 2565 | cat <<_LT_EOF > conftest.$ac_ext |
| 2566 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 2567 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 2568 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 2569 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 2570 | +# define LT_DLSYM_CONST |
| 2571 | +#elif defined(__osf__) |
| 2572 | +/* This system does not cope well with relocations in const data. */ |
| 2573 | +# define LT_DLSYM_CONST |
| 2574 | +#else |
| 2575 | +# define LT_DLSYM_CONST const |
| 2576 | +#endif |
| 2577 | + |
| 2578 | #ifdef __cplusplus |
| 2579 | extern "C" { |
| 2580 | #endif |
| 2581 | @@ -6589,7 +6916,7 @@ _LT_EOF |
| 2582 | cat <<_LT_EOF >> conftest.$ac_ext |
| 2583 | |
| 2584 | /* The mapping between symbol names and symbols. */ |
| 2585 | -const struct { |
| 2586 | +LT_DLSYM_CONST struct { |
| 2587 | const char *name; |
| 2588 | void *address; |
| 2589 | } |
| 2590 | @@ -6615,8 +6942,8 @@ static const void *lt_preloaded_setup() { |
| 2591 | _LT_EOF |
| 2592 | # Now try linking the two files. |
| 2593 | mv conftest.$ac_objext conftstm.$ac_objext |
| 2594 | - lt_save_LIBS="$LIBS" |
| 2595 | - lt_save_CFLAGS="$CFLAGS" |
| 2596 | + lt_globsym_save_LIBS=$LIBS |
| 2597 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 2598 | LIBS="conftstm.$ac_objext" |
| 2599 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 2600 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 2601 | @@ -6626,8 +6953,8 @@ _LT_EOF |
| 2602 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 2603 | pipe_works=yes |
| 2604 | fi |
| 2605 | - LIBS="$lt_save_LIBS" |
| 2606 | - CFLAGS="$lt_save_CFLAGS" |
| 2607 | + LIBS=$lt_globsym_save_LIBS |
| 2608 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 2609 | else |
| 2610 | echo "cannot find nm_test_func in $nlist" >&5 |
| 2611 | fi |
| 2612 | @@ -6664,6 +6991,19 @@ else |
| 2613 | $as_echo "ok" >&6; } |
| 2614 | fi |
| 2615 | |
| 2616 | +# Response file support. |
| 2617 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 2618 | + nm_file_list_spec='@' |
| 2619 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 2620 | + nm_file_list_spec='@' |
| 2621 | +fi |
| 2622 | + |
| 2623 | + |
| 2624 | + |
| 2625 | + |
| 2626 | + |
| 2627 | + |
| 2628 | + |
| 2629 | |
| 2630 | |
| 2631 | |
| 2632 | @@ -6680,6 +7020,42 @@ fi |
| 2633 | |
| 2634 | |
| 2635 | |
| 2636 | + |
| 2637 | + |
| 2638 | + |
| 2639 | + |
| 2640 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 2641 | +$as_echo_n "checking for sysroot... " >&6; } |
| 2642 | + |
| 2643 | +# Check whether --with-libtool-sysroot was given. |
| 2644 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 2645 | + withval=$with_libtool_sysroot; |
| 2646 | +else |
| 2647 | + with_libtool_sysroot=no |
| 2648 | +fi |
| 2649 | + |
| 2650 | + |
| 2651 | +lt_sysroot= |
| 2652 | +case ${with_libtool_sysroot} in #( |
| 2653 | + yes) |
| 2654 | + if test "$GCC" = yes; then |
| 2655 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 2656 | + fi |
| 2657 | + ;; #( |
| 2658 | + /*) |
| 2659 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 2660 | + ;; #( |
| 2661 | + no|'') |
| 2662 | + ;; #( |
| 2663 | + *) |
| 2664 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 2665 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 2666 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 2667 | + ;; |
| 2668 | +esac |
| 2669 | + |
| 2670 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 2671 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 2672 | |
| 2673 | |
| 2674 | |
| 2675 | @@ -6891,6 +7267,123 @@ esac |
| 2676 | |
| 2677 | need_locks="$enable_libtool_lock" |
| 2678 | |
| 2679 | +if test -n "$ac_tool_prefix"; then |
| 2680 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 2681 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 2682 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2683 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2684 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 2685 | + $as_echo_n "(cached) " >&6 |
| 2686 | +else |
| 2687 | + if test -n "$MANIFEST_TOOL"; then |
| 2688 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 2689 | +else |
| 2690 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2691 | +for as_dir in $PATH |
| 2692 | +do |
| 2693 | + IFS=$as_save_IFS |
| 2694 | + test -z "$as_dir" && as_dir=. |
| 2695 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2696 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 2697 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 2698 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2699 | + break 2 |
| 2700 | + fi |
| 2701 | +done |
| 2702 | + done |
| 2703 | +IFS=$as_save_IFS |
| 2704 | + |
| 2705 | +fi |
| 2706 | +fi |
| 2707 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 2708 | +if test -n "$MANIFEST_TOOL"; then |
| 2709 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 2710 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 2711 | +else |
| 2712 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2713 | +$as_echo "no" >&6; } |
| 2714 | +fi |
| 2715 | + |
| 2716 | + |
| 2717 | +fi |
| 2718 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 2719 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 2720 | + # Extract the first word of "mt", so it can be a program name with args. |
| 2721 | +set dummy mt; ac_word=$2 |
| 2722 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2723 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2724 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 2725 | + $as_echo_n "(cached) " >&6 |
| 2726 | +else |
| 2727 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 2728 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 2729 | +else |
| 2730 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2731 | +for as_dir in $PATH |
| 2732 | +do |
| 2733 | + IFS=$as_save_IFS |
| 2734 | + test -z "$as_dir" && as_dir=. |
| 2735 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2736 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 2737 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 2738 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2739 | + break 2 |
| 2740 | + fi |
| 2741 | +done |
| 2742 | + done |
| 2743 | +IFS=$as_save_IFS |
| 2744 | + |
| 2745 | +fi |
| 2746 | +fi |
| 2747 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 2748 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 2749 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 2750 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 2751 | +else |
| 2752 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2753 | +$as_echo "no" >&6; } |
| 2754 | +fi |
| 2755 | + |
| 2756 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 2757 | + MANIFEST_TOOL=":" |
| 2758 | + else |
| 2759 | + case $cross_compiling:$ac_tool_warned in |
| 2760 | +yes:) |
| 2761 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2762 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2763 | +ac_tool_warned=yes ;; |
| 2764 | +esac |
| 2765 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 2766 | + fi |
| 2767 | +else |
| 2768 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 2769 | +fi |
| 2770 | + |
| 2771 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 2772 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 2773 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 2774 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 2775 | + $as_echo_n "(cached) " >&6 |
| 2776 | +else |
| 2777 | + lt_cv_path_mainfest_tool=no |
| 2778 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 2779 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 2780 | + cat conftest.err >&5 |
| 2781 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 2782 | + lt_cv_path_mainfest_tool=yes |
| 2783 | + fi |
| 2784 | + rm -f conftest* |
| 2785 | +fi |
| 2786 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 2787 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 2788 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 2789 | + MANIFEST_TOOL=: |
| 2790 | +fi |
| 2791 | + |
| 2792 | + |
| 2793 | + |
| 2794 | + |
| 2795 | + |
| 2796 | |
| 2797 | case $host_os in |
| 2798 | rhapsody* | darwin*) |
| 2799 | @@ -7454,6 +7947,8 @@ _LT_EOF |
| 2800 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 2801 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 2802 | $AR cru libconftest.a conftest.o 2>&5 |
| 2803 | + echo "$RANLIB libconftest.a" >&5 |
| 2804 | + $RANLIB libconftest.a 2>&5 |
| 2805 | cat > conftest.c << _LT_EOF |
| 2806 | int main() { return 0;} |
| 2807 | _LT_EOF |
| 2808 | @@ -8036,8 +8531,6 @@ fi |
| 2809 | lt_prog_compiler_pic= |
| 2810 | lt_prog_compiler_static= |
| 2811 | |
| 2812 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 2813 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2814 | |
| 2815 | if test "$GCC" = yes; then |
| 2816 | lt_prog_compiler_wl='-Wl,' |
| 2817 | @@ -8203,6 +8696,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2818 | lt_prog_compiler_pic='--shared' |
| 2819 | lt_prog_compiler_static='--static' |
| 2820 | ;; |
| 2821 | + nagfor*) |
| 2822 | + # NAG Fortran compiler |
| 2823 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 2824 | + lt_prog_compiler_pic='-PIC' |
| 2825 | + lt_prog_compiler_static='-Bstatic' |
| 2826 | + ;; |
| 2827 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 2828 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 2829 | # which looks to be a dead project) |
| 2830 | @@ -8265,7 +8764,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2831 | lt_prog_compiler_pic='-KPIC' |
| 2832 | lt_prog_compiler_static='-Bstatic' |
| 2833 | case $cc_basename in |
| 2834 | - f77* | f90* | f95*) |
| 2835 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 2836 | lt_prog_compiler_wl='-Qoption ld ';; |
| 2837 | *) |
| 2838 | lt_prog_compiler_wl='-Wl,';; |
| 2839 | @@ -8322,13 +8821,17 @@ case $host_os in |
| 2840 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 2841 | ;; |
| 2842 | esac |
| 2843 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 2844 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 2845 | - |
| 2846 | - |
| 2847 | - |
| 2848 | - |
| 2849 | |
| 2850 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 2851 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2852 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 2853 | + $as_echo_n "(cached) " >&6 |
| 2854 | +else |
| 2855 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 2856 | +fi |
| 2857 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 2858 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 2859 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 2860 | |
| 2861 | # |
| 2862 | # Check to make sure the PIC flag actually works. |
| 2863 | @@ -8389,6 +8892,11 @@ fi |
| 2864 | |
| 2865 | |
| 2866 | |
| 2867 | + |
| 2868 | + |
| 2869 | + |
| 2870 | + |
| 2871 | + |
| 2872 | # |
| 2873 | # Check to make sure the static flag actually works. |
| 2874 | # |
| 2875 | @@ -8739,7 +9247,8 @@ _LT_EOF |
| 2876 | allow_undefined_flag=unsupported |
| 2877 | always_export_symbols=no |
| 2878 | enable_shared_with_static_runtimes=yes |
| 2879 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 2880 | + 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' |
| 2881 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 2882 | |
| 2883 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 2884 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 2885 | @@ -8838,12 +9347,12 @@ _LT_EOF |
| 2886 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 2887 | hardcode_libdir_flag_spec= |
| 2888 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 2889 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 2890 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 2891 | if test "x$supports_anon_versioning" = xyes; then |
| 2892 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 2893 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 2894 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 2895 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 2896 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 2897 | fi |
| 2898 | ;; |
| 2899 | esac |
| 2900 | @@ -8857,8 +9366,8 @@ _LT_EOF |
| 2901 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 2902 | wlarc= |
| 2903 | else |
| 2904 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2905 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2906 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2907 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2908 | fi |
| 2909 | ;; |
| 2910 | |
| 2911 | @@ -8876,8 +9385,8 @@ _LT_EOF |
| 2912 | |
| 2913 | _LT_EOF |
| 2914 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 2915 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2916 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2917 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2918 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2919 | else |
| 2920 | ld_shlibs=no |
| 2921 | fi |
| 2922 | @@ -8923,8 +9432,8 @@ _LT_EOF |
| 2923 | |
| 2924 | *) |
| 2925 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 2926 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2927 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2928 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2929 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2930 | else |
| 2931 | ld_shlibs=no |
| 2932 | fi |
| 2933 | @@ -9054,7 +9563,13 @@ _LT_EOF |
| 2934 | allow_undefined_flag='-berok' |
| 2935 | # Determine the default libpath from the value encoded in an |
| 2936 | # empty executable. |
| 2937 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2938 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 2939 | + aix_libpath=$lt_cv_aix_libpath |
| 2940 | +else |
| 2941 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 2942 | + $as_echo_n "(cached) " >&6 |
| 2943 | +else |
| 2944 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2945 | /* end confdefs.h. */ |
| 2946 | |
| 2947 | int |
| 2948 | @@ -9067,22 +9582,29 @@ main () |
| 2949 | _ACEOF |
| 2950 | if ac_fn_c_try_link "$LINENO"; then : |
| 2951 | |
| 2952 | -lt_aix_libpath_sed=' |
| 2953 | - /Import File Strings/,/^$/ { |
| 2954 | - /^0/ { |
| 2955 | - s/^0 *\(.*\)$/\1/ |
| 2956 | - p |
| 2957 | - } |
| 2958 | - }' |
| 2959 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2960 | -# Check for a 64-bit object if we didn't find anything. |
| 2961 | -if test -z "$aix_libpath"; then |
| 2962 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2963 | -fi |
| 2964 | + lt_aix_libpath_sed=' |
| 2965 | + /Import File Strings/,/^$/ { |
| 2966 | + /^0/ { |
| 2967 | + s/^0 *\([^ ]*\) *$/\1/ |
| 2968 | + p |
| 2969 | + } |
| 2970 | + }' |
| 2971 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2972 | + # Check for a 64-bit object if we didn't find anything. |
| 2973 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2974 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2975 | + fi |
| 2976 | fi |
| 2977 | rm -f core conftest.err conftest.$ac_objext \ |
| 2978 | conftest$ac_exeext conftest.$ac_ext |
| 2979 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 2980 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2981 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 2982 | + fi |
| 2983 | + |
| 2984 | +fi |
| 2985 | + |
| 2986 | + aix_libpath=$lt_cv_aix_libpath_ |
| 2987 | +fi |
| 2988 | |
| 2989 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 2990 | 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" |
| 2991 | @@ -9094,7 +9616,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 2992 | else |
| 2993 | # Determine the default libpath from the value encoded in an |
| 2994 | # empty executable. |
| 2995 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2996 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 2997 | + aix_libpath=$lt_cv_aix_libpath |
| 2998 | +else |
| 2999 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 3000 | + $as_echo_n "(cached) " >&6 |
| 3001 | +else |
| 3002 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 3003 | /* end confdefs.h. */ |
| 3004 | |
| 3005 | int |
| 3006 | @@ -9107,22 +9635,29 @@ main () |
| 3007 | _ACEOF |
| 3008 | if ac_fn_c_try_link "$LINENO"; then : |
| 3009 | |
| 3010 | -lt_aix_libpath_sed=' |
| 3011 | - /Import File Strings/,/^$/ { |
| 3012 | - /^0/ { |
| 3013 | - s/^0 *\(.*\)$/\1/ |
| 3014 | - p |
| 3015 | - } |
| 3016 | - }' |
| 3017 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 3018 | -# Check for a 64-bit object if we didn't find anything. |
| 3019 | -if test -z "$aix_libpath"; then |
| 3020 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 3021 | -fi |
| 3022 | + lt_aix_libpath_sed=' |
| 3023 | + /Import File Strings/,/^$/ { |
| 3024 | + /^0/ { |
| 3025 | + s/^0 *\([^ ]*\) *$/\1/ |
| 3026 | + p |
| 3027 | + } |
| 3028 | + }' |
| 3029 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 3030 | + # Check for a 64-bit object if we didn't find anything. |
| 3031 | + if test -z "$lt_cv_aix_libpath_"; then |
| 3032 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 3033 | + fi |
| 3034 | fi |
| 3035 | rm -f core conftest.err conftest.$ac_objext \ |
| 3036 | conftest$ac_exeext conftest.$ac_ext |
| 3037 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3038 | + if test -z "$lt_cv_aix_libpath_"; then |
| 3039 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 3040 | + fi |
| 3041 | + |
| 3042 | +fi |
| 3043 | + |
| 3044 | + aix_libpath=$lt_cv_aix_libpath_ |
| 3045 | +fi |
| 3046 | |
| 3047 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 3048 | # Warning - without using the other run time loading flags, |
| 3049 | @@ -9167,20 +9702,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3050 | # Microsoft Visual C++. |
| 3051 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 3052 | # no search path for DLLs. |
| 3053 | - hardcode_libdir_flag_spec=' ' |
| 3054 | - allow_undefined_flag=unsupported |
| 3055 | - # Tell ltmain to make .lib files, not .a files. |
| 3056 | - libext=lib |
| 3057 | - # Tell ltmain to make .dll files, not .so files. |
| 3058 | - shrext_cmds=".dll" |
| 3059 | - # FIXME: Setting linknames here is a bad hack. |
| 3060 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 3061 | - # The linker will automatically build a .lib file if we build a DLL. |
| 3062 | - old_archive_from_new_cmds='true' |
| 3063 | - # FIXME: Should let the user specify the lib program. |
| 3064 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 3065 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 3066 | - enable_shared_with_static_runtimes=yes |
| 3067 | + case $cc_basename in |
| 3068 | + cl*) |
| 3069 | + # Native MSVC |
| 3070 | + hardcode_libdir_flag_spec=' ' |
| 3071 | + allow_undefined_flag=unsupported |
| 3072 | + always_export_symbols=yes |
| 3073 | + file_list_spec='@' |
| 3074 | + # Tell ltmain to make .lib files, not .a files. |
| 3075 | + libext=lib |
| 3076 | + # Tell ltmain to make .dll files, not .so files. |
| 3077 | + shrext_cmds=".dll" |
| 3078 | + # FIXME: Setting linknames here is a bad hack. |
| 3079 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 3080 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 3081 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 3082 | + else |
| 3083 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 3084 | + fi~ |
| 3085 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 3086 | + linknames=' |
| 3087 | + # The linker will not automatically build a static lib if we build a DLL. |
| 3088 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 3089 | + enable_shared_with_static_runtimes=yes |
| 3090 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 3091 | + # Don't use ranlib |
| 3092 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 3093 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 3094 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 3095 | + case $lt_outputfile in |
| 3096 | + *.exe|*.EXE) ;; |
| 3097 | + *) |
| 3098 | + lt_outputfile="$lt_outputfile.exe" |
| 3099 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 3100 | + ;; |
| 3101 | + esac~ |
| 3102 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 3103 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 3104 | + $RM "$lt_outputfile.manifest"; |
| 3105 | + fi' |
| 3106 | + ;; |
| 3107 | + *) |
| 3108 | + # Assume MSVC wrapper |
| 3109 | + hardcode_libdir_flag_spec=' ' |
| 3110 | + allow_undefined_flag=unsupported |
| 3111 | + # Tell ltmain to make .lib files, not .a files. |
| 3112 | + libext=lib |
| 3113 | + # Tell ltmain to make .dll files, not .so files. |
| 3114 | + shrext_cmds=".dll" |
| 3115 | + # FIXME: Setting linknames here is a bad hack. |
| 3116 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 3117 | + # The linker will automatically build a .lib file if we build a DLL. |
| 3118 | + old_archive_from_new_cmds='true' |
| 3119 | + # FIXME: Should let the user specify the lib program. |
| 3120 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 3121 | + enable_shared_with_static_runtimes=yes |
| 3122 | + ;; |
| 3123 | + esac |
| 3124 | ;; |
| 3125 | |
| 3126 | darwin* | rhapsody*) |
| 3127 | @@ -9241,7 +9819,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3128 | |
| 3129 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 3130 | freebsd* | dragonfly*) |
| 3131 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 3132 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 3133 | hardcode_libdir_flag_spec='-R$libdir' |
| 3134 | hardcode_direct=yes |
| 3135 | hardcode_shlibpath_var=no |
| 3136 | @@ -9249,7 +9827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3137 | |
| 3138 | hpux9*) |
| 3139 | if test "$GCC" = yes; then |
| 3140 | - 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' |
| 3141 | + 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' |
| 3142 | else |
| 3143 | 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' |
| 3144 | fi |
| 3145 | @@ -9265,7 +9843,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3146 | |
| 3147 | hpux10*) |
| 3148 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 3149 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3150 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3151 | else |
| 3152 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 3153 | fi |
| 3154 | @@ -9289,10 +9867,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3155 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3156 | ;; |
| 3157 | ia64*) |
| 3158 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 3159 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 3160 | ;; |
| 3161 | *) |
| 3162 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3163 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3164 | ;; |
| 3165 | esac |
| 3166 | else |
| 3167 | @@ -9371,23 +9949,36 @@ fi |
| 3168 | |
| 3169 | irix5* | irix6* | nonstopux*) |
| 3170 | if test "$GCC" = yes; then |
| 3171 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 3172 | + 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' |
| 3173 | # Try to use the -exported_symbol ld option, if it does not |
| 3174 | # work, assume that -exports_file does not work either and |
| 3175 | # implicitly export all symbols. |
| 3176 | - save_LDFLAGS="$LDFLAGS" |
| 3177 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 3178 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 3179 | + # This should be the same for all languages, so no per-tag cache variable. |
| 3180 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 3181 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 3182 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 3183 | + $as_echo_n "(cached) " >&6 |
| 3184 | +else |
| 3185 | + save_LDFLAGS="$LDFLAGS" |
| 3186 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 3187 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 3188 | /* end confdefs.h. */ |
| 3189 | -int foo(void) {} |
| 3190 | +int foo (void) { return 0; } |
| 3191 | _ACEOF |
| 3192 | if ac_fn_c_try_link "$LINENO"; then : |
| 3193 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 3194 | - |
| 3195 | + lt_cv_irix_exported_symbol=yes |
| 3196 | +else |
| 3197 | + lt_cv_irix_exported_symbol=no |
| 3198 | fi |
| 3199 | rm -f core conftest.err conftest.$ac_objext \ |
| 3200 | conftest$ac_exeext conftest.$ac_ext |
| 3201 | - LDFLAGS="$save_LDFLAGS" |
| 3202 | + LDFLAGS="$save_LDFLAGS" |
| 3203 | +fi |
| 3204 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 3205 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 3206 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 3207 | + 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' |
| 3208 | + fi |
| 3209 | else |
| 3210 | 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' |
| 3211 | 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' |
| 3212 | @@ -9472,7 +10063,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 3213 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 3214 | if test "$GCC" = yes; then |
| 3215 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 3216 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 3217 | + 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' |
| 3218 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 3219 | else |
| 3220 | allow_undefined_flag=' -expect_unresolved \*' |
| 3221 | @@ -9491,9 +10082,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 3222 | no_undefined_flag=' -z defs' |
| 3223 | if test "$GCC" = yes; then |
| 3224 | wlarc='${wl}' |
| 3225 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3226 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3227 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 3228 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 3229 | + $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' |
| 3230 | else |
| 3231 | case `$CC -V 2>&1` in |
| 3232 | *"Compilers 5.0"*) |
| 3233 | @@ -10069,8 +10660,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 3234 | need_version=no |
| 3235 | need_lib_prefix=no |
| 3236 | |
| 3237 | - case $GCC,$host_os in |
| 3238 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 3239 | + case $GCC,$cc_basename in |
| 3240 | + yes,*) |
| 3241 | + # gcc |
| 3242 | library_names_spec='$libname.dll.a' |
| 3243 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 3244 | postinstall_cmds='base_file=`basename \${file}`~ |
| 3245 | @@ -10103,13 +10695,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 3246 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 3247 | ;; |
| 3248 | esac |
| 3249 | + dynamic_linker='Win32 ld.exe' |
| 3250 | + ;; |
| 3251 | + |
| 3252 | + *,cl*) |
| 3253 | + # Native MSVC |
| 3254 | + libname_spec='$name' |
| 3255 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 3256 | + library_names_spec='${libname}.dll.lib' |
| 3257 | + |
| 3258 | + case $build_os in |
| 3259 | + mingw*) |
| 3260 | + sys_lib_search_path_spec= |
| 3261 | + lt_save_ifs=$IFS |
| 3262 | + IFS=';' |
| 3263 | + for lt_path in $LIB |
| 3264 | + do |
| 3265 | + IFS=$lt_save_ifs |
| 3266 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 3267 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 3268 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 3269 | + done |
| 3270 | + IFS=$lt_save_ifs |
| 3271 | + # Convert to MSYS style. |
| 3272 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 3273 | + ;; |
| 3274 | + cygwin*) |
| 3275 | + # Convert to unix form, then to dos form, then back to unix form |
| 3276 | + # but this time dos style (no spaces!) so that the unix form looks |
| 3277 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 3278 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 3279 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 3280 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 3281 | + ;; |
| 3282 | + *) |
| 3283 | + sys_lib_search_path_spec="$LIB" |
| 3284 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 3285 | + # It is most probably a Windows format PATH. |
| 3286 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 3287 | + else |
| 3288 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 3289 | + fi |
| 3290 | + # FIXME: find the short name or the path components, as spaces are |
| 3291 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 3292 | + ;; |
| 3293 | + esac |
| 3294 | + |
| 3295 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 3296 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 3297 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 3298 | + dldir=$destdir/`dirname \$dlpath`~ |
| 3299 | + test -d \$dldir || mkdir -p \$dldir~ |
| 3300 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 3301 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 3302 | + dlpath=$dir/\$dldll~ |
| 3303 | + $RM \$dlpath' |
| 3304 | + shlibpath_overrides_runpath=yes |
| 3305 | + dynamic_linker='Win32 link.exe' |
| 3306 | ;; |
| 3307 | |
| 3308 | *) |
| 3309 | + # Assume MSVC wrapper |
| 3310 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 3311 | + dynamic_linker='Win32 ld.exe' |
| 3312 | ;; |
| 3313 | esac |
| 3314 | - dynamic_linker='Win32 ld.exe' |
| 3315 | # FIXME: first we should search . and the directory the executable is in |
| 3316 | shlibpath_var=PATH |
| 3317 | ;; |
| 3318 | @@ -10987,7 +11637,7 @@ else |
| 3319 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 3320 | lt_status=$lt_dlunknown |
| 3321 | cat > conftest.$ac_ext <<_LT_EOF |
| 3322 | -#line 10990 "configure" |
| 3323 | +#line $LINENO "configure" |
| 3324 | #include "confdefs.h" |
| 3325 | |
| 3326 | #if HAVE_DLFCN_H |
| 3327 | @@ -11031,10 +11681,10 @@ else |
| 3328 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 3329 | correspondingly for the symbols needed. */ |
| 3330 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 3331 | -void fnord () __attribute__((visibility("default"))); |
| 3332 | +int fnord () __attribute__((visibility("default"))); |
| 3333 | #endif |
| 3334 | |
| 3335 | -void fnord () { int i=42; } |
| 3336 | +int fnord () { return 42; } |
| 3337 | int main () |
| 3338 | { |
| 3339 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 3340 | @@ -11093,7 +11743,7 @@ else |
| 3341 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 3342 | lt_status=$lt_dlunknown |
| 3343 | cat > conftest.$ac_ext <<_LT_EOF |
| 3344 | -#line 11096 "configure" |
| 3345 | +#line $LINENO "configure" |
| 3346 | #include "confdefs.h" |
| 3347 | |
| 3348 | #if HAVE_DLFCN_H |
| 3349 | @@ -11137,10 +11787,10 @@ else |
| 3350 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 3351 | correspondingly for the symbols needed. */ |
| 3352 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 3353 | -void fnord () __attribute__((visibility("default"))); |
| 3354 | +int fnord () __attribute__((visibility("default"))); |
| 3355 | #endif |
| 3356 | |
| 3357 | -void fnord () { int i=42; } |
| 3358 | +int fnord () { return 42; } |
| 3359 | int main () |
| 3360 | { |
| 3361 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 3362 | @@ -15642,13 +16292,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 3363 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 3364 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 3365 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 3366 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 3367 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 3368 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 3369 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 3370 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 3371 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 3372 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 3373 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 3374 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 3375 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 3376 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 3377 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 3378 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 3379 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3380 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 3381 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 3382 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 3383 | @@ -15663,14 +16320,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 3384 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 3385 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 3386 | 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"`' |
| 3387 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3388 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 3389 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 3390 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 3391 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 3392 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 3393 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 3394 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 3395 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 3396 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 3397 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 3398 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 3399 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 3400 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 3401 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 3402 | @@ -15703,12 +16363,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 3403 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 3404 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 3405 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 3406 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 3407 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 3408 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 3409 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 3410 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 3411 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 3412 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 3413 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3414 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 3415 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 3416 | @@ -15763,8 +16423,13 @@ reload_flag \ |
| 3417 | OBJDUMP \ |
| 3418 | deplibs_check_method \ |
| 3419 | file_magic_cmd \ |
| 3420 | +file_magic_glob \ |
| 3421 | +want_nocaseglob \ |
| 3422 | +DLLTOOL \ |
| 3423 | +sharedlib_from_linklib_cmd \ |
| 3424 | AR \ |
| 3425 | AR_FLAGS \ |
| 3426 | +archiver_list_spec \ |
| 3427 | STRIP \ |
| 3428 | RANLIB \ |
| 3429 | CC \ |
| 3430 | @@ -15774,12 +16439,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 3431 | lt_cv_sys_global_symbol_to_cdecl \ |
| 3432 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 3433 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 3434 | +nm_file_list_spec \ |
| 3435 | lt_prog_compiler_no_builtin_flag \ |
| 3436 | -lt_prog_compiler_wl \ |
| 3437 | lt_prog_compiler_pic \ |
| 3438 | +lt_prog_compiler_wl \ |
| 3439 | lt_prog_compiler_static \ |
| 3440 | lt_cv_prog_compiler_c_o \ |
| 3441 | need_locks \ |
| 3442 | +MANIFEST_TOOL \ |
| 3443 | DSYMUTIL \ |
| 3444 | NMEDIT \ |
| 3445 | LIPO \ |
| 3446 | @@ -15795,7 +16462,6 @@ no_undefined_flag \ |
| 3447 | hardcode_libdir_flag_spec \ |
| 3448 | hardcode_libdir_flag_spec_ld \ |
| 3449 | hardcode_libdir_separator \ |
| 3450 | -fix_srcfile_path \ |
| 3451 | exclude_expsyms \ |
| 3452 | include_expsyms \ |
| 3453 | file_list_spec \ |
| 3454 | @@ -15831,6 +16497,7 @@ module_cmds \ |
| 3455 | module_expsym_cmds \ |
| 3456 | export_symbols_cmds \ |
| 3457 | prelink_cmds \ |
| 3458 | +postlink_cmds \ |
| 3459 | postinstall_cmds \ |
| 3460 | postuninstall_cmds \ |
| 3461 | finish_cmds \ |
| 3462 | @@ -16596,7 +17263,8 @@ $as_echo X"$file" | |
| 3463 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 3464 | # |
| 3465 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 3466 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 3467 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 3468 | +# Inc. |
| 3469 | # Written by Gordon Matzigkeit, 1996 |
| 3470 | # |
| 3471 | # This file is part of GNU Libtool. |
| 3472 | @@ -16699,19 +17367,42 @@ SP2NL=$lt_lt_SP2NL |
| 3473 | # turn newlines into spaces. |
| 3474 | NL2SP=$lt_lt_NL2SP |
| 3475 | |
| 3476 | +# convert \$build file names to \$host format. |
| 3477 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 3478 | + |
| 3479 | +# convert \$build files to toolchain format. |
| 3480 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 3481 | + |
| 3482 | # An object symbol dumper. |
| 3483 | OBJDUMP=$lt_OBJDUMP |
| 3484 | |
| 3485 | # Method to check whether dependent libraries are shared objects. |
| 3486 | deplibs_check_method=$lt_deplibs_check_method |
| 3487 | |
| 3488 | -# Command to use when deplibs_check_method == "file_magic". |
| 3489 | +# Command to use when deplibs_check_method = "file_magic". |
| 3490 | file_magic_cmd=$lt_file_magic_cmd |
| 3491 | |
| 3492 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 3493 | +file_magic_glob=$lt_file_magic_glob |
| 3494 | + |
| 3495 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 3496 | +want_nocaseglob=$lt_want_nocaseglob |
| 3497 | + |
| 3498 | +# DLL creation program. |
| 3499 | +DLLTOOL=$lt_DLLTOOL |
| 3500 | + |
| 3501 | +# Command to associate shared and link libraries. |
| 3502 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 3503 | + |
| 3504 | # The archiver. |
| 3505 | AR=$lt_AR |
| 3506 | + |
| 3507 | +# Flags to create an archive. |
| 3508 | AR_FLAGS=$lt_AR_FLAGS |
| 3509 | |
| 3510 | +# How to feed a file listing to the archiver. |
| 3511 | +archiver_list_spec=$lt_archiver_list_spec |
| 3512 | + |
| 3513 | # A symbol stripping program. |
| 3514 | STRIP=$lt_STRIP |
| 3515 | |
| 3516 | @@ -16741,6 +17432,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 3517 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 3518 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 3519 | |
| 3520 | +# Specify filename containing input files for \$NM. |
| 3521 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 3522 | + |
| 3523 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 3524 | +lt_sysroot=$lt_sysroot |
| 3525 | + |
| 3526 | # The name of the directory that contains temporary libtool files. |
| 3527 | objdir=$objdir |
| 3528 | |
| 3529 | @@ -16750,6 +17447,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 3530 | # Must we lock files when doing compilation? |
| 3531 | need_locks=$lt_need_locks |
| 3532 | |
| 3533 | +# Manifest tool. |
| 3534 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 3535 | + |
| 3536 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 3537 | DSYMUTIL=$lt_DSYMUTIL |
| 3538 | |
| 3539 | @@ -16864,12 +17564,12 @@ with_gcc=$GCC |
| 3540 | # Compiler flag to turn off builtin functions. |
| 3541 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 3542 | |
| 3543 | -# How to pass a linker flag through the compiler. |
| 3544 | -wl=$lt_lt_prog_compiler_wl |
| 3545 | - |
| 3546 | # Additional compiler flags for building library objects. |
| 3547 | pic_flag=$lt_lt_prog_compiler_pic |
| 3548 | |
| 3549 | +# How to pass a linker flag through the compiler. |
| 3550 | +wl=$lt_lt_prog_compiler_wl |
| 3551 | + |
| 3552 | # Compiler flag to prevent dynamic linking. |
| 3553 | link_static_flag=$lt_lt_prog_compiler_static |
| 3554 | |
| 3555 | @@ -16956,9 +17656,6 @@ inherit_rpath=$inherit_rpath |
| 3556 | # Whether libtool must link a program against all its dependency libraries. |
| 3557 | link_all_deplibs=$link_all_deplibs |
| 3558 | |
| 3559 | -# Fix the shell variable \$srcfile for the compiler. |
| 3560 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 3561 | - |
| 3562 | # Set to "yes" if exported symbols are required. |
| 3563 | always_export_symbols=$always_export_symbols |
| 3564 | |
| 3565 | @@ -16974,6 +17671,9 @@ include_expsyms=$lt_include_expsyms |
| 3566 | # Commands necessary for linking programs (against libraries) with templates. |
| 3567 | prelink_cmds=$lt_prelink_cmds |
| 3568 | |
| 3569 | +# Commands necessary for finishing linking programs. |
| 3570 | +postlink_cmds=$lt_postlink_cmds |
| 3571 | + |
| 3572 | # Specify filename containing input files. |
| 3573 | file_list_spec=$lt_file_list_spec |
| 3574 | |
| 3575 | @@ -17006,210 +17706,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 3576 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 3577 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 3578 | # is reportedly fixed, but why not run on old versions too? |
| 3579 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 3580 | - || (rm -f "$cfgfile"; exit 1) |
| 3581 | - |
| 3582 | - case $xsi_shell in |
| 3583 | - yes) |
| 3584 | - cat << \_LT_EOF >> "$cfgfile" |
| 3585 | - |
| 3586 | -# func_dirname file append nondir_replacement |
| 3587 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 3588 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 3589 | -func_dirname () |
| 3590 | -{ |
| 3591 | - case ${1} in |
| 3592 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 3593 | - * ) func_dirname_result="${3}" ;; |
| 3594 | - esac |
| 3595 | -} |
| 3596 | - |
| 3597 | -# func_basename file |
| 3598 | -func_basename () |
| 3599 | -{ |
| 3600 | - func_basename_result="${1##*/}" |
| 3601 | -} |
| 3602 | - |
| 3603 | -# func_dirname_and_basename file append nondir_replacement |
| 3604 | -# perform func_basename and func_dirname in a single function |
| 3605 | -# call: |
| 3606 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 3607 | -# add APPEND to the result, otherwise set result |
| 3608 | -# to NONDIR_REPLACEMENT. |
| 3609 | -# value returned in "$func_dirname_result" |
| 3610 | -# basename: Compute filename of FILE. |
| 3611 | -# value retuned in "$func_basename_result" |
| 3612 | -# Implementation must be kept synchronized with func_dirname |
| 3613 | -# and func_basename. For efficiency, we do not delegate to |
| 3614 | -# those functions but instead duplicate the functionality here. |
| 3615 | -func_dirname_and_basename () |
| 3616 | -{ |
| 3617 | - case ${1} in |
| 3618 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 3619 | - * ) func_dirname_result="${3}" ;; |
| 3620 | - esac |
| 3621 | - func_basename_result="${1##*/}" |
| 3622 | -} |
| 3623 | - |
| 3624 | -# func_stripname prefix suffix name |
| 3625 | -# strip PREFIX and SUFFIX off of NAME. |
| 3626 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 3627 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 3628 | -# dot (in which case that matches only a dot). |
| 3629 | -func_stripname () |
| 3630 | -{ |
| 3631 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 3632 | - # positional parameters, so assign one to ordinary parameter first. |
| 3633 | - func_stripname_result=${3} |
| 3634 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 3635 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 3636 | -} |
| 3637 | - |
| 3638 | -# func_opt_split |
| 3639 | -func_opt_split () |
| 3640 | -{ |
| 3641 | - func_opt_split_opt=${1%%=*} |
| 3642 | - func_opt_split_arg=${1#*=} |
| 3643 | -} |
| 3644 | - |
| 3645 | -# func_lo2o object |
| 3646 | -func_lo2o () |
| 3647 | -{ |
| 3648 | - case ${1} in |
| 3649 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 3650 | - *) func_lo2o_result=${1} ;; |
| 3651 | - esac |
| 3652 | -} |
| 3653 | - |
| 3654 | -# func_xform libobj-or-source |
| 3655 | -func_xform () |
| 3656 | -{ |
| 3657 | - func_xform_result=${1%.*}.lo |
| 3658 | -} |
| 3659 | - |
| 3660 | -# func_arith arithmetic-term... |
| 3661 | -func_arith () |
| 3662 | -{ |
| 3663 | - func_arith_result=$(( $* )) |
| 3664 | -} |
| 3665 | - |
| 3666 | -# func_len string |
| 3667 | -# STRING may not start with a hyphen. |
| 3668 | -func_len () |
| 3669 | -{ |
| 3670 | - func_len_result=${#1} |
| 3671 | -} |
| 3672 | - |
| 3673 | -_LT_EOF |
| 3674 | - ;; |
| 3675 | - *) # Bourne compatible functions. |
| 3676 | - cat << \_LT_EOF >> "$cfgfile" |
| 3677 | - |
| 3678 | -# func_dirname file append nondir_replacement |
| 3679 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 3680 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 3681 | -func_dirname () |
| 3682 | -{ |
| 3683 | - # Extract subdirectory from the argument. |
| 3684 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 3685 | - if test "X$func_dirname_result" = "X${1}"; then |
| 3686 | - func_dirname_result="${3}" |
| 3687 | - else |
| 3688 | - func_dirname_result="$func_dirname_result${2}" |
| 3689 | - fi |
| 3690 | -} |
| 3691 | - |
| 3692 | -# func_basename file |
| 3693 | -func_basename () |
| 3694 | -{ |
| 3695 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 3696 | -} |
| 3697 | - |
| 3698 | - |
| 3699 | -# func_stripname prefix suffix name |
| 3700 | -# strip PREFIX and SUFFIX off of NAME. |
| 3701 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 3702 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 3703 | -# dot (in which case that matches only a dot). |
| 3704 | -# func_strip_suffix prefix name |
| 3705 | -func_stripname () |
| 3706 | -{ |
| 3707 | - case ${2} in |
| 3708 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 3709 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 3710 | - esac |
| 3711 | -} |
| 3712 | - |
| 3713 | -# sed scripts: |
| 3714 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 3715 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 3716 | - |
| 3717 | -# func_opt_split |
| 3718 | -func_opt_split () |
| 3719 | -{ |
| 3720 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 3721 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 3722 | -} |
| 3723 | - |
| 3724 | -# func_lo2o object |
| 3725 | -func_lo2o () |
| 3726 | -{ |
| 3727 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 3728 | -} |
| 3729 | - |
| 3730 | -# func_xform libobj-or-source |
| 3731 | -func_xform () |
| 3732 | -{ |
| 3733 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 3734 | -} |
| 3735 | - |
| 3736 | -# func_arith arithmetic-term... |
| 3737 | -func_arith () |
| 3738 | -{ |
| 3739 | - func_arith_result=`expr "$@"` |
| 3740 | -} |
| 3741 | - |
| 3742 | -# func_len string |
| 3743 | -# STRING may not start with a hyphen. |
| 3744 | -func_len () |
| 3745 | -{ |
| 3746 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 3747 | -} |
| 3748 | - |
| 3749 | -_LT_EOF |
| 3750 | -esac |
| 3751 | - |
| 3752 | -case $lt_shell_append in |
| 3753 | - yes) |
| 3754 | - cat << \_LT_EOF >> "$cfgfile" |
| 3755 | - |
| 3756 | -# func_append var value |
| 3757 | -# Append VALUE to the end of shell variable VAR. |
| 3758 | -func_append () |
| 3759 | -{ |
| 3760 | - eval "$1+=\$2" |
| 3761 | -} |
| 3762 | -_LT_EOF |
| 3763 | - ;; |
| 3764 | - *) |
| 3765 | - cat << \_LT_EOF >> "$cfgfile" |
| 3766 | - |
| 3767 | -# func_append var value |
| 3768 | -# Append VALUE to the end of shell variable VAR. |
| 3769 | -func_append () |
| 3770 | -{ |
| 3771 | - eval "$1=\$$1\$2" |
| 3772 | -} |
| 3773 | - |
| 3774 | -_LT_EOF |
| 3775 | - ;; |
| 3776 | - esac |
| 3777 | - |
| 3778 | - |
| 3779 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 3780 | - || (rm -f "$cfgfile"; exit 1) |
| 3781 | - |
| 3782 | - mv -f "$cfgfile" "$ofile" || |
| 3783 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 3784 | + || (rm -f "$cfgfile"; exit 1) |
| 3785 | + |
| 3786 | + if test x"$xsi_shell" = xyes; then |
| 3787 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 3788 | +func_dirname ()\ |
| 3789 | +{\ |
| 3790 | +\ case ${1} in\ |
| 3791 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 3792 | +\ * ) func_dirname_result="${3}" ;;\ |
| 3793 | +\ esac\ |
| 3794 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3795 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3796 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3797 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3798 | + |
| 3799 | + |
| 3800 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 3801 | +func_basename ()\ |
| 3802 | +{\ |
| 3803 | +\ func_basename_result="${1##*/}"\ |
| 3804 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3805 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3806 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3807 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3808 | + |
| 3809 | + |
| 3810 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 3811 | +func_dirname_and_basename ()\ |
| 3812 | +{\ |
| 3813 | +\ case ${1} in\ |
| 3814 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 3815 | +\ * ) func_dirname_result="${3}" ;;\ |
| 3816 | +\ esac\ |
| 3817 | +\ func_basename_result="${1##*/}"\ |
| 3818 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3819 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3820 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3821 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3822 | + |
| 3823 | + |
| 3824 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 3825 | +func_stripname ()\ |
| 3826 | +{\ |
| 3827 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 3828 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 3829 | +\ func_stripname_result=${3}\ |
| 3830 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 3831 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 3832 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3833 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3834 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3835 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3836 | + |
| 3837 | + |
| 3838 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 3839 | +func_split_long_opt ()\ |
| 3840 | +{\ |
| 3841 | +\ func_split_long_opt_name=${1%%=*}\ |
| 3842 | +\ func_split_long_opt_arg=${1#*=}\ |
| 3843 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3844 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3845 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3846 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3847 | + |
| 3848 | + |
| 3849 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 3850 | +func_split_short_opt ()\ |
| 3851 | +{\ |
| 3852 | +\ func_split_short_opt_arg=${1#??}\ |
| 3853 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 3854 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3855 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3856 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3857 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3858 | + |
| 3859 | + |
| 3860 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 3861 | +func_lo2o ()\ |
| 3862 | +{\ |
| 3863 | +\ case ${1} in\ |
| 3864 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 3865 | +\ *) func_lo2o_result=${1} ;;\ |
| 3866 | +\ esac\ |
| 3867 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3868 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3869 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3870 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3871 | + |
| 3872 | + |
| 3873 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 3874 | +func_xform ()\ |
| 3875 | +{\ |
| 3876 | + func_xform_result=${1%.*}.lo\ |
| 3877 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3878 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3879 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3880 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3881 | + |
| 3882 | + |
| 3883 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 3884 | +func_arith ()\ |
| 3885 | +{\ |
| 3886 | + func_arith_result=$(( $* ))\ |
| 3887 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3888 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3889 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3890 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3891 | + |
| 3892 | + |
| 3893 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 3894 | +func_len ()\ |
| 3895 | +{\ |
| 3896 | + func_len_result=${#1}\ |
| 3897 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3898 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3899 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3900 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3901 | + |
| 3902 | +fi |
| 3903 | + |
| 3904 | +if test x"$lt_shell_append" = xyes; then |
| 3905 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 3906 | +func_append ()\ |
| 3907 | +{\ |
| 3908 | + eval "${1}+=\\${2}"\ |
| 3909 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3910 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3911 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3912 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3913 | + |
| 3914 | + |
| 3915 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 3916 | +func_append_quoted ()\ |
| 3917 | +{\ |
| 3918 | +\ func_quote_for_eval "${2}"\ |
| 3919 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 3920 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3921 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3922 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3923 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3924 | + |
| 3925 | + |
| 3926 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 3927 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 3928 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3929 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3930 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 3931 | +else |
| 3932 | + # Save a `func_append' function call even when '+=' is not available |
| 3933 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 3934 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3935 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3936 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 3937 | +fi |
| 3938 | + |
| 3939 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 3940 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 3941 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 3942 | +fi |
| 3943 | + |
| 3944 | + |
| 3945 | + mv -f "$cfgfile" "$ofile" || |
| 3946 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 3947 | chmod +x "$ofile" |
| 3948 | |
| 3949 | diff --git a/gas/Makefile.in b/gas/Makefile.in |
| 3950 | index c57d78f82c4..da370b21855 100644 |
| 3951 | --- a/gas/Makefile.in |
| 3952 | +++ b/gas/Makefile.in |
| 3953 | @@ -373,6 +373,7 @@ CYGPATH_W = @CYGPATH_W@ |
| 3954 | DATADIRNAME = @DATADIRNAME@ |
| 3955 | DEFS = @DEFS@ |
| 3956 | DEPDIR = @DEPDIR@ |
| 3957 | +DLLTOOL = @DLLTOOL@ |
| 3958 | DSYMUTIL = @DSYMUTIL@ |
| 3959 | DUMPBIN = @DUMPBIN@ |
| 3960 | ECHO_C = @ECHO_C@ |
| 3961 | @@ -409,6 +410,7 @@ LN_S = @LN_S@ |
| 3962 | LTLIBOBJS = @LTLIBOBJS@ |
| 3963 | MAINT = @MAINT@ |
| 3964 | MAKEINFO = @MAKEINFO@ |
| 3965 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 3966 | MKDIR_P = @MKDIR_P@ |
| 3967 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
| 3968 | MSGFMT = @MSGFMT@ |
| 3969 | @@ -447,6 +449,7 @@ abs_builddir = @abs_builddir@ |
| 3970 | abs_srcdir = @abs_srcdir@ |
| 3971 | abs_top_builddir = @abs_top_builddir@ |
| 3972 | abs_top_srcdir = @abs_top_srcdir@ |
| 3973 | +ac_ct_AR = @ac_ct_AR@ |
| 3974 | ac_ct_CC = @ac_ct_CC@ |
| 3975 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 3976 | am__include = @am__include@ |
| 3977 | diff --git a/gas/configure b/gas/configure |
| 3978 | index 12c16faefd9..11b5127bf3a 100755 |
| 3979 | --- a/gas/configure |
| 3980 | +++ b/gas/configure |
| 3981 | @@ -681,8 +681,11 @@ OTOOL |
| 3982 | LIPO |
| 3983 | NMEDIT |
| 3984 | DSYMUTIL |
| 3985 | +MANIFEST_TOOL |
| 3986 | RANLIB |
| 3987 | +ac_ct_AR |
| 3988 | AR |
| 3989 | +DLLTOOL |
| 3990 | OBJDUMP |
| 3991 | LN_S |
| 3992 | NM |
| 3993 | @@ -799,6 +802,7 @@ enable_static |
| 3994 | with_pic |
| 3995 | enable_fast_install |
| 3996 | with_gnu_ld |
| 3997 | +with_libtool_sysroot |
| 3998 | enable_libtool_lock |
| 3999 | enable_plugins |
| 4000 | enable_largefile |
| 4001 | @@ -1490,6 +1494,8 @@ Optional Packages: |
| 4002 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 4003 | both] |
| 4004 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 4005 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 4006 | + (or the compiler's sysroot if not specified). |
| 4007 | --with-cpu=CPU default cpu variant is CPU (currently only supported |
| 4008 | on ARC) |
| 4009 | --with-system-zlib use installed libz |
| 4010 | @@ -4608,8 +4614,8 @@ esac |
| 4011 | |
| 4012 | |
| 4013 | |
| 4014 | -macro_version='2.2.7a' |
| 4015 | -macro_revision='1.3134' |
| 4016 | +macro_version='2.4' |
| 4017 | +macro_revision='1.3293' |
| 4018 | |
| 4019 | |
| 4020 | |
| 4021 | @@ -4649,7 +4655,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 4022 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 4023 | $as_echo_n "checking how to print strings... " >&6; } |
| 4024 | # Test print first, because it will be a builtin if present. |
| 4025 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 4026 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 4027 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 4028 | ECHO='print -r --' |
| 4029 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 4030 | @@ -5342,8 +5348,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 4031 | # Try some XSI features |
| 4032 | xsi_shell=no |
| 4033 | ( _lt_dummy="a/b/c" |
| 4034 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 4035 | - = c,a/b,, \ |
| 4036 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 4037 | + = c,a/b,b/c, \ |
| 4038 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 4039 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 4040 | && xsi_shell=yes |
| 4041 | @@ -5392,6 +5398,80 @@ esac |
| 4042 | |
| 4043 | |
| 4044 | |
| 4045 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 4046 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 4047 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 4048 | + $as_echo_n "(cached) " >&6 |
| 4049 | +else |
| 4050 | + case $host in |
| 4051 | + *-*-mingw* ) |
| 4052 | + case $build in |
| 4053 | + *-*-mingw* ) # actually msys |
| 4054 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 4055 | + ;; |
| 4056 | + *-*-cygwin* ) |
| 4057 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 4058 | + ;; |
| 4059 | + * ) # otherwise, assume *nix |
| 4060 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 4061 | + ;; |
| 4062 | + esac |
| 4063 | + ;; |
| 4064 | + *-*-cygwin* ) |
| 4065 | + case $build in |
| 4066 | + *-*-mingw* ) # actually msys |
| 4067 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 4068 | + ;; |
| 4069 | + *-*-cygwin* ) |
| 4070 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 4071 | + ;; |
| 4072 | + * ) # otherwise, assume *nix |
| 4073 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 4074 | + ;; |
| 4075 | + esac |
| 4076 | + ;; |
| 4077 | + * ) # unhandled hosts (and "normal" native builds) |
| 4078 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 4079 | + ;; |
| 4080 | +esac |
| 4081 | + |
| 4082 | +fi |
| 4083 | + |
| 4084 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 4085 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 4086 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 4087 | + |
| 4088 | + |
| 4089 | + |
| 4090 | + |
| 4091 | + |
| 4092 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 4093 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 4094 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 4095 | + $as_echo_n "(cached) " >&6 |
| 4096 | +else |
| 4097 | + #assume ordinary cross tools, or native build. |
| 4098 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 4099 | +case $host in |
| 4100 | + *-*-mingw* ) |
| 4101 | + case $build in |
| 4102 | + *-*-mingw* ) # actually msys |
| 4103 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 4104 | + ;; |
| 4105 | + esac |
| 4106 | + ;; |
| 4107 | +esac |
| 4108 | + |
| 4109 | +fi |
| 4110 | + |
| 4111 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 4112 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 4113 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 4114 | + |
| 4115 | + |
| 4116 | + |
| 4117 | + |
| 4118 | + |
| 4119 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 4120 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 4121 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 4122 | @@ -5408,6 +5488,11 @@ case $reload_flag in |
| 4123 | esac |
| 4124 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 4125 | case $host_os in |
| 4126 | + cygwin* | mingw* | pw32* | cegcc*) |
| 4127 | + if test "$GCC" != yes; then |
| 4128 | + reload_cmds=false |
| 4129 | + fi |
| 4130 | + ;; |
| 4131 | darwin*) |
| 4132 | if test "$GCC" = yes; then |
| 4133 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 4134 | @@ -5576,7 +5661,8 @@ mingw* | pw32*) |
| 4135 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 4136 | lt_cv_file_magic_cmd='func_win32_libid' |
| 4137 | else |
| 4138 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 4139 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 4140 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 4141 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 4142 | fi |
| 4143 | ;; |
| 4144 | @@ -5730,6 +5816,21 @@ esac |
| 4145 | fi |
| 4146 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 4147 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 4148 | + |
| 4149 | +file_magic_glob= |
| 4150 | +want_nocaseglob=no |
| 4151 | +if test "$build" = "$host"; then |
| 4152 | + case $host_os in |
| 4153 | + mingw* | pw32*) |
| 4154 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 4155 | + want_nocaseglob=yes |
| 4156 | + else |
| 4157 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 4158 | + fi |
| 4159 | + ;; |
| 4160 | + esac |
| 4161 | +fi |
| 4162 | + |
| 4163 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 4164 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 4165 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 4166 | @@ -5745,6 +5846,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 4167 | |
| 4168 | |
| 4169 | |
| 4170 | + |
| 4171 | + |
| 4172 | + |
| 4173 | + |
| 4174 | + |
| 4175 | + |
| 4176 | + |
| 4177 | + |
| 4178 | + |
| 4179 | + |
| 4180 | +if test -n "$ac_tool_prefix"; then |
| 4181 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 4182 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 4183 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4184 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4185 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 4186 | + $as_echo_n "(cached) " >&6 |
| 4187 | +else |
| 4188 | + if test -n "$DLLTOOL"; then |
| 4189 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 4190 | +else |
| 4191 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4192 | +for as_dir in $PATH |
| 4193 | +do |
| 4194 | + IFS=$as_save_IFS |
| 4195 | + test -z "$as_dir" && as_dir=. |
| 4196 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4197 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 4198 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 4199 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4200 | + break 2 |
| 4201 | + fi |
| 4202 | +done |
| 4203 | + done |
| 4204 | +IFS=$as_save_IFS |
| 4205 | + |
| 4206 | +fi |
| 4207 | +fi |
| 4208 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 4209 | +if test -n "$DLLTOOL"; then |
| 4210 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 4211 | +$as_echo "$DLLTOOL" >&6; } |
| 4212 | +else |
| 4213 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4214 | +$as_echo "no" >&6; } |
| 4215 | +fi |
| 4216 | + |
| 4217 | + |
| 4218 | +fi |
| 4219 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 4220 | + ac_ct_DLLTOOL=$DLLTOOL |
| 4221 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 4222 | +set dummy dlltool; ac_word=$2 |
| 4223 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4224 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4225 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 4226 | + $as_echo_n "(cached) " >&6 |
| 4227 | +else |
| 4228 | + if test -n "$ac_ct_DLLTOOL"; then |
| 4229 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 4230 | +else |
| 4231 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4232 | +for as_dir in $PATH |
| 4233 | +do |
| 4234 | + IFS=$as_save_IFS |
| 4235 | + test -z "$as_dir" && as_dir=. |
| 4236 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4237 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 4238 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 4239 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4240 | + break 2 |
| 4241 | + fi |
| 4242 | +done |
| 4243 | + done |
| 4244 | +IFS=$as_save_IFS |
| 4245 | + |
| 4246 | +fi |
| 4247 | +fi |
| 4248 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 4249 | +if test -n "$ac_ct_DLLTOOL"; then |
| 4250 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 4251 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 4252 | +else |
| 4253 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4254 | +$as_echo "no" >&6; } |
| 4255 | +fi |
| 4256 | + |
| 4257 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 4258 | + DLLTOOL="false" |
| 4259 | + else |
| 4260 | + case $cross_compiling:$ac_tool_warned in |
| 4261 | +yes:) |
| 4262 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 4263 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 4264 | +ac_tool_warned=yes ;; |
| 4265 | +esac |
| 4266 | + DLLTOOL=$ac_ct_DLLTOOL |
| 4267 | + fi |
| 4268 | +else |
| 4269 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 4270 | +fi |
| 4271 | + |
| 4272 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 4273 | + |
| 4274 | + |
| 4275 | + |
| 4276 | + |
| 4277 | + |
| 4278 | + |
| 4279 | + |
| 4280 | + |
| 4281 | + |
| 4282 | + |
| 4283 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 4284 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 4285 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 4286 | + $as_echo_n "(cached) " >&6 |
| 4287 | +else |
| 4288 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 4289 | + |
| 4290 | +case $host_os in |
| 4291 | +cygwin* | mingw* | pw32* | cegcc*) |
| 4292 | + # two different shell functions defined in ltmain.sh |
| 4293 | + # decide which to use based on capabilities of $DLLTOOL |
| 4294 | + case `$DLLTOOL --help 2>&1` in |
| 4295 | + *--identify-strict*) |
| 4296 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 4297 | + ;; |
| 4298 | + *) |
| 4299 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 4300 | + ;; |
| 4301 | + esac |
| 4302 | + ;; |
| 4303 | +*) |
| 4304 | + # fallback: assume linklib IS sharedlib |
| 4305 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 4306 | + ;; |
| 4307 | +esac |
| 4308 | + |
| 4309 | +fi |
| 4310 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 4311 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 4312 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 4313 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 4314 | + |
| 4315 | + |
| 4316 | + |
| 4317 | + |
| 4318 | + |
| 4319 | + |
| 4320 | + |
| 4321 | plugin_option= |
| 4322 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 4323 | for plugin in $plugin_names; do |
| 4324 | @@ -5759,8 +6011,10 @@ for plugin in $plugin_names; do |
| 4325 | done |
| 4326 | |
| 4327 | if test -n "$ac_tool_prefix"; then |
| 4328 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 4329 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 4330 | + for ac_prog in ar |
| 4331 | + do |
| 4332 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 4333 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 4334 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4335 | $as_echo_n "checking for $ac_word... " >&6; } |
| 4336 | if ${ac_cv_prog_AR+:} false; then : |
| 4337 | @@ -5776,7 +6030,7 @@ do |
| 4338 | test -z "$as_dir" && as_dir=. |
| 4339 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4340 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 4341 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 4342 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 4343 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4344 | break 2 |
| 4345 | fi |
| 4346 | @@ -5796,11 +6050,15 @@ $as_echo "no" >&6; } |
| 4347 | fi |
| 4348 | |
| 4349 | |
| 4350 | + test -n "$AR" && break |
| 4351 | + done |
| 4352 | fi |
| 4353 | -if test -z "$ac_cv_prog_AR"; then |
| 4354 | +if test -z "$AR"; then |
| 4355 | ac_ct_AR=$AR |
| 4356 | - # Extract the first word of "ar", so it can be a program name with args. |
| 4357 | -set dummy ar; ac_word=$2 |
| 4358 | + for ac_prog in ar |
| 4359 | +do |
| 4360 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 4361 | +set dummy $ac_prog; ac_word=$2 |
| 4362 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4363 | $as_echo_n "checking for $ac_word... " >&6; } |
| 4364 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 4365 | @@ -5816,7 +6074,7 @@ do |
| 4366 | test -z "$as_dir" && as_dir=. |
| 4367 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4368 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 4369 | - ac_cv_prog_ac_ct_AR="ar" |
| 4370 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 4371 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4372 | break 2 |
| 4373 | fi |
| 4374 | @@ -5835,6 +6093,10 @@ else |
| 4375 | $as_echo "no" >&6; } |
| 4376 | fi |
| 4377 | |
| 4378 | + |
| 4379 | + test -n "$ac_ct_AR" && break |
| 4380 | +done |
| 4381 | + |
| 4382 | if test "x$ac_ct_AR" = x; then |
| 4383 | AR="false" |
| 4384 | else |
| 4385 | @@ -5846,29 +6108,81 @@ ac_tool_warned=yes ;; |
| 4386 | esac |
| 4387 | AR=$ac_ct_AR |
| 4388 | fi |
| 4389 | -else |
| 4390 | - AR="$ac_cv_prog_AR" |
| 4391 | fi |
| 4392 | |
| 4393 | -test -z "$AR" && AR=ar |
| 4394 | -if test -n "$plugin_option"; then |
| 4395 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 4396 | - touch conftest.c |
| 4397 | - $AR $plugin_option rc conftest.a conftest.c |
| 4398 | - if test "$?" != 0; then |
| 4399 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 4400 | + touch conftest.c |
| 4401 | + $AR $plugin_option rc conftest.a conftest.c |
| 4402 | + if test "$?" != 0; then |
| 4403 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 4404 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 4405 | - else |
| 4406 | - AR="$AR $plugin_option" |
| 4407 | - fi |
| 4408 | - rm -f conftest.* |
| 4409 | + else |
| 4410 | + AR="$AR $plugin_option" |
| 4411 | fi |
| 4412 | -fi |
| 4413 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 4414 | + rm -f conftest.* |
| 4415 | +: ${AR=ar} |
| 4416 | +: ${AR_FLAGS=cru} |
| 4417 | + |
| 4418 | + |
| 4419 | + |
| 4420 | + |
| 4421 | + |
| 4422 | + |
| 4423 | + |
| 4424 | + |
| 4425 | + |
| 4426 | + |
| 4427 | + |
| 4428 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 4429 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 4430 | +if ${lt_cv_ar_at_file+:} false; then : |
| 4431 | + $as_echo_n "(cached) " >&6 |
| 4432 | +else |
| 4433 | + lt_cv_ar_at_file=no |
| 4434 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4435 | +/* end confdefs.h. */ |
| 4436 | + |
| 4437 | +int |
| 4438 | +main () |
| 4439 | +{ |
| 4440 | |
| 4441 | + ; |
| 4442 | + return 0; |
| 4443 | +} |
| 4444 | +_ACEOF |
| 4445 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 4446 | + echo conftest.$ac_objext > conftest.lst |
| 4447 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 4448 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 4449 | + (eval $lt_ar_try) 2>&5 |
| 4450 | + ac_status=$? |
| 4451 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 4452 | + test $ac_status = 0; } |
| 4453 | + if test "$ac_status" -eq 0; then |
| 4454 | + # Ensure the archiver fails upon bogus file names. |
| 4455 | + rm -f conftest.$ac_objext libconftest.a |
| 4456 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 4457 | + (eval $lt_ar_try) 2>&5 |
| 4458 | + ac_status=$? |
| 4459 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 4460 | + test $ac_status = 0; } |
| 4461 | + if test "$ac_status" -ne 0; then |
| 4462 | + lt_cv_ar_at_file=@ |
| 4463 | + fi |
| 4464 | + fi |
| 4465 | + rm -f conftest.* libconftest.a |
| 4466 | |
| 4467 | +fi |
| 4468 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 4469 | |
| 4470 | +fi |
| 4471 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 4472 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 4473 | |
| 4474 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 4475 | + archiver_list_spec= |
| 4476 | +else |
| 4477 | + archiver_list_spec=$lt_cv_ar_at_file |
| 4478 | +fi |
| 4479 | |
| 4480 | |
| 4481 | |
| 4482 | @@ -6215,8 +6529,8 @@ esac |
| 4483 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 4484 | |
| 4485 | # Transform an extracted symbol line into symbol name and symbol address |
| 4486 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 4487 | -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'" |
| 4488 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 4489 | +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'" |
| 4490 | |
| 4491 | # Handle CRLF in mingw tool chain |
| 4492 | opt_cr= |
| 4493 | @@ -6252,6 +6566,7 @@ for ac_symprfx in "" "_"; do |
| 4494 | else |
| 4495 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 4496 | fi |
| 4497 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 4498 | |
| 4499 | # Check to see that the pipe works correctly. |
| 4500 | pipe_works=no |
| 4501 | @@ -6293,6 +6608,18 @@ _LT_EOF |
| 4502 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 4503 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 4504 | cat <<_LT_EOF > conftest.$ac_ext |
| 4505 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 4506 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 4507 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 4508 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 4509 | +# define LT_DLSYM_CONST |
| 4510 | +#elif defined(__osf__) |
| 4511 | +/* This system does not cope well with relocations in const data. */ |
| 4512 | +# define LT_DLSYM_CONST |
| 4513 | +#else |
| 4514 | +# define LT_DLSYM_CONST const |
| 4515 | +#endif |
| 4516 | + |
| 4517 | #ifdef __cplusplus |
| 4518 | extern "C" { |
| 4519 | #endif |
| 4520 | @@ -6304,7 +6631,7 @@ _LT_EOF |
| 4521 | cat <<_LT_EOF >> conftest.$ac_ext |
| 4522 | |
| 4523 | /* The mapping between symbol names and symbols. */ |
| 4524 | -const struct { |
| 4525 | +LT_DLSYM_CONST struct { |
| 4526 | const char *name; |
| 4527 | void *address; |
| 4528 | } |
| 4529 | @@ -6330,8 +6657,8 @@ static const void *lt_preloaded_setup() { |
| 4530 | _LT_EOF |
| 4531 | # Now try linking the two files. |
| 4532 | mv conftest.$ac_objext conftstm.$ac_objext |
| 4533 | - lt_save_LIBS="$LIBS" |
| 4534 | - lt_save_CFLAGS="$CFLAGS" |
| 4535 | + lt_globsym_save_LIBS=$LIBS |
| 4536 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 4537 | LIBS="conftstm.$ac_objext" |
| 4538 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 4539 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 4540 | @@ -6341,8 +6668,8 @@ _LT_EOF |
| 4541 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 4542 | pipe_works=yes |
| 4543 | fi |
| 4544 | - LIBS="$lt_save_LIBS" |
| 4545 | - CFLAGS="$lt_save_CFLAGS" |
| 4546 | + LIBS=$lt_globsym_save_LIBS |
| 4547 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 4548 | else |
| 4549 | echo "cannot find nm_test_func in $nlist" >&5 |
| 4550 | fi |
| 4551 | @@ -6379,6 +6706,19 @@ else |
| 4552 | $as_echo "ok" >&6; } |
| 4553 | fi |
| 4554 | |
| 4555 | +# Response file support. |
| 4556 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 4557 | + nm_file_list_spec='@' |
| 4558 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 4559 | + nm_file_list_spec='@' |
| 4560 | +fi |
| 4561 | + |
| 4562 | + |
| 4563 | + |
| 4564 | + |
| 4565 | + |
| 4566 | + |
| 4567 | + |
| 4568 | |
| 4569 | |
| 4570 | |
| 4571 | @@ -6395,6 +6735,42 @@ fi |
| 4572 | |
| 4573 | |
| 4574 | |
| 4575 | + |
| 4576 | + |
| 4577 | + |
| 4578 | + |
| 4579 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 4580 | +$as_echo_n "checking for sysroot... " >&6; } |
| 4581 | + |
| 4582 | +# Check whether --with-libtool-sysroot was given. |
| 4583 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 4584 | + withval=$with_libtool_sysroot; |
| 4585 | +else |
| 4586 | + with_libtool_sysroot=no |
| 4587 | +fi |
| 4588 | + |
| 4589 | + |
| 4590 | +lt_sysroot= |
| 4591 | +case ${with_libtool_sysroot} in #( |
| 4592 | + yes) |
| 4593 | + if test "$GCC" = yes; then |
| 4594 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 4595 | + fi |
| 4596 | + ;; #( |
| 4597 | + /*) |
| 4598 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 4599 | + ;; #( |
| 4600 | + no|'') |
| 4601 | + ;; #( |
| 4602 | + *) |
| 4603 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 4604 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 4605 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 4606 | + ;; |
| 4607 | +esac |
| 4608 | + |
| 4609 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 4610 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 4611 | |
| 4612 | |
| 4613 | |
| 4614 | @@ -6606,6 +6982,123 @@ esac |
| 4615 | |
| 4616 | need_locks="$enable_libtool_lock" |
| 4617 | |
| 4618 | +if test -n "$ac_tool_prefix"; then |
| 4619 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 4620 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 4621 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4622 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4623 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 4624 | + $as_echo_n "(cached) " >&6 |
| 4625 | +else |
| 4626 | + if test -n "$MANIFEST_TOOL"; then |
| 4627 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 4628 | +else |
| 4629 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4630 | +for as_dir in $PATH |
| 4631 | +do |
| 4632 | + IFS=$as_save_IFS |
| 4633 | + test -z "$as_dir" && as_dir=. |
| 4634 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4635 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 4636 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 4637 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4638 | + break 2 |
| 4639 | + fi |
| 4640 | +done |
| 4641 | + done |
| 4642 | +IFS=$as_save_IFS |
| 4643 | + |
| 4644 | +fi |
| 4645 | +fi |
| 4646 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 4647 | +if test -n "$MANIFEST_TOOL"; then |
| 4648 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 4649 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 4650 | +else |
| 4651 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4652 | +$as_echo "no" >&6; } |
| 4653 | +fi |
| 4654 | + |
| 4655 | + |
| 4656 | +fi |
| 4657 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 4658 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 4659 | + # Extract the first word of "mt", so it can be a program name with args. |
| 4660 | +set dummy mt; ac_word=$2 |
| 4661 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4662 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4663 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 4664 | + $as_echo_n "(cached) " >&6 |
| 4665 | +else |
| 4666 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 4667 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 4668 | +else |
| 4669 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4670 | +for as_dir in $PATH |
| 4671 | +do |
| 4672 | + IFS=$as_save_IFS |
| 4673 | + test -z "$as_dir" && as_dir=. |
| 4674 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4675 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 4676 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 4677 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4678 | + break 2 |
| 4679 | + fi |
| 4680 | +done |
| 4681 | + done |
| 4682 | +IFS=$as_save_IFS |
| 4683 | + |
| 4684 | +fi |
| 4685 | +fi |
| 4686 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 4687 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 4688 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 4689 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 4690 | +else |
| 4691 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4692 | +$as_echo "no" >&6; } |
| 4693 | +fi |
| 4694 | + |
| 4695 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 4696 | + MANIFEST_TOOL=":" |
| 4697 | + else |
| 4698 | + case $cross_compiling:$ac_tool_warned in |
| 4699 | +yes:) |
| 4700 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 4701 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 4702 | +ac_tool_warned=yes ;; |
| 4703 | +esac |
| 4704 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 4705 | + fi |
| 4706 | +else |
| 4707 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 4708 | +fi |
| 4709 | + |
| 4710 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 4711 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 4712 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 4713 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 4714 | + $as_echo_n "(cached) " >&6 |
| 4715 | +else |
| 4716 | + lt_cv_path_mainfest_tool=no |
| 4717 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 4718 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 4719 | + cat conftest.err >&5 |
| 4720 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 4721 | + lt_cv_path_mainfest_tool=yes |
| 4722 | + fi |
| 4723 | + rm -f conftest* |
| 4724 | +fi |
| 4725 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 4726 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 4727 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 4728 | + MANIFEST_TOOL=: |
| 4729 | +fi |
| 4730 | + |
| 4731 | + |
| 4732 | + |
| 4733 | + |
| 4734 | + |
| 4735 | |
| 4736 | case $host_os in |
| 4737 | rhapsody* | darwin*) |
| 4738 | @@ -7169,6 +7662,8 @@ _LT_EOF |
| 4739 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 4740 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 4741 | $AR cru libconftest.a conftest.o 2>&5 |
| 4742 | + echo "$RANLIB libconftest.a" >&5 |
| 4743 | + $RANLIB libconftest.a 2>&5 |
| 4744 | cat > conftest.c << _LT_EOF |
| 4745 | int main() { return 0;} |
| 4746 | _LT_EOF |
| 4747 | @@ -7751,8 +8246,6 @@ fi |
| 4748 | lt_prog_compiler_pic= |
| 4749 | lt_prog_compiler_static= |
| 4750 | |
| 4751 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 4752 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4753 | |
| 4754 | if test "$GCC" = yes; then |
| 4755 | lt_prog_compiler_wl='-Wl,' |
| 4756 | @@ -7918,6 +8411,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4757 | lt_prog_compiler_pic='--shared' |
| 4758 | lt_prog_compiler_static='--static' |
| 4759 | ;; |
| 4760 | + nagfor*) |
| 4761 | + # NAG Fortran compiler |
| 4762 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 4763 | + lt_prog_compiler_pic='-PIC' |
| 4764 | + lt_prog_compiler_static='-Bstatic' |
| 4765 | + ;; |
| 4766 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 4767 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 4768 | # which looks to be a dead project) |
| 4769 | @@ -7980,7 +8479,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4770 | lt_prog_compiler_pic='-KPIC' |
| 4771 | lt_prog_compiler_static='-Bstatic' |
| 4772 | case $cc_basename in |
| 4773 | - f77* | f90* | f95*) |
| 4774 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 4775 | lt_prog_compiler_wl='-Qoption ld ';; |
| 4776 | *) |
| 4777 | lt_prog_compiler_wl='-Wl,';; |
| 4778 | @@ -8037,13 +8536,17 @@ case $host_os in |
| 4779 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 4780 | ;; |
| 4781 | esac |
| 4782 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 4783 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 4784 | - |
| 4785 | - |
| 4786 | - |
| 4787 | - |
| 4788 | |
| 4789 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 4790 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4791 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 4792 | + $as_echo_n "(cached) " >&6 |
| 4793 | +else |
| 4794 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 4795 | +fi |
| 4796 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 4797 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 4798 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 4799 | |
| 4800 | # |
| 4801 | # Check to make sure the PIC flag actually works. |
| 4802 | @@ -8104,6 +8607,11 @@ fi |
| 4803 | |
| 4804 | |
| 4805 | |
| 4806 | + |
| 4807 | + |
| 4808 | + |
| 4809 | + |
| 4810 | + |
| 4811 | # |
| 4812 | # Check to make sure the static flag actually works. |
| 4813 | # |
| 4814 | @@ -8454,7 +8962,8 @@ _LT_EOF |
| 4815 | allow_undefined_flag=unsupported |
| 4816 | always_export_symbols=no |
| 4817 | enable_shared_with_static_runtimes=yes |
| 4818 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 4819 | + 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' |
| 4820 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 4821 | |
| 4822 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 4823 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 4824 | @@ -8553,12 +9062,12 @@ _LT_EOF |
| 4825 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 4826 | hardcode_libdir_flag_spec= |
| 4827 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 4828 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 4829 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 4830 | if test "x$supports_anon_versioning" = xyes; then |
| 4831 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 4832 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 4833 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 4834 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 4835 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 4836 | fi |
| 4837 | ;; |
| 4838 | esac |
| 4839 | @@ -8572,8 +9081,8 @@ _LT_EOF |
| 4840 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 4841 | wlarc= |
| 4842 | else |
| 4843 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4844 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4845 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4846 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4847 | fi |
| 4848 | ;; |
| 4849 | |
| 4850 | @@ -8591,8 +9100,8 @@ _LT_EOF |
| 4851 | |
| 4852 | _LT_EOF |
| 4853 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 4854 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4855 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4856 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4857 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4858 | else |
| 4859 | ld_shlibs=no |
| 4860 | fi |
| 4861 | @@ -8638,8 +9147,8 @@ _LT_EOF |
| 4862 | |
| 4863 | *) |
| 4864 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 4865 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4866 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4867 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4868 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4869 | else |
| 4870 | ld_shlibs=no |
| 4871 | fi |
| 4872 | @@ -8769,7 +9278,13 @@ _LT_EOF |
| 4873 | allow_undefined_flag='-berok' |
| 4874 | # Determine the default libpath from the value encoded in an |
| 4875 | # empty executable. |
| 4876 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4877 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 4878 | + aix_libpath=$lt_cv_aix_libpath |
| 4879 | +else |
| 4880 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 4881 | + $as_echo_n "(cached) " >&6 |
| 4882 | +else |
| 4883 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4884 | /* end confdefs.h. */ |
| 4885 | |
| 4886 | int |
| 4887 | @@ -8782,22 +9297,29 @@ main () |
| 4888 | _ACEOF |
| 4889 | if ac_fn_c_try_link "$LINENO"; then : |
| 4890 | |
| 4891 | -lt_aix_libpath_sed=' |
| 4892 | - /Import File Strings/,/^$/ { |
| 4893 | - /^0/ { |
| 4894 | - s/^0 *\(.*\)$/\1/ |
| 4895 | - p |
| 4896 | - } |
| 4897 | - }' |
| 4898 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4899 | -# Check for a 64-bit object if we didn't find anything. |
| 4900 | -if test -z "$aix_libpath"; then |
| 4901 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4902 | -fi |
| 4903 | + lt_aix_libpath_sed=' |
| 4904 | + /Import File Strings/,/^$/ { |
| 4905 | + /^0/ { |
| 4906 | + s/^0 *\([^ ]*\) *$/\1/ |
| 4907 | + p |
| 4908 | + } |
| 4909 | + }' |
| 4910 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4911 | + # Check for a 64-bit object if we didn't find anything. |
| 4912 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4913 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4914 | + fi |
| 4915 | fi |
| 4916 | rm -f core conftest.err conftest.$ac_objext \ |
| 4917 | conftest$ac_exeext conftest.$ac_ext |
| 4918 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4919 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4920 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 4921 | + fi |
| 4922 | + |
| 4923 | +fi |
| 4924 | + |
| 4925 | + aix_libpath=$lt_cv_aix_libpath_ |
| 4926 | +fi |
| 4927 | |
| 4928 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 4929 | 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" |
| 4930 | @@ -8809,7 +9331,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4931 | else |
| 4932 | # Determine the default libpath from the value encoded in an |
| 4933 | # empty executable. |
| 4934 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4935 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 4936 | + aix_libpath=$lt_cv_aix_libpath |
| 4937 | +else |
| 4938 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 4939 | + $as_echo_n "(cached) " >&6 |
| 4940 | +else |
| 4941 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4942 | /* end confdefs.h. */ |
| 4943 | |
| 4944 | int |
| 4945 | @@ -8822,22 +9350,29 @@ main () |
| 4946 | _ACEOF |
| 4947 | if ac_fn_c_try_link "$LINENO"; then : |
| 4948 | |
| 4949 | -lt_aix_libpath_sed=' |
| 4950 | - /Import File Strings/,/^$/ { |
| 4951 | - /^0/ { |
| 4952 | - s/^0 *\(.*\)$/\1/ |
| 4953 | - p |
| 4954 | - } |
| 4955 | - }' |
| 4956 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4957 | -# Check for a 64-bit object if we didn't find anything. |
| 4958 | -if test -z "$aix_libpath"; then |
| 4959 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4960 | -fi |
| 4961 | + lt_aix_libpath_sed=' |
| 4962 | + /Import File Strings/,/^$/ { |
| 4963 | + /^0/ { |
| 4964 | + s/^0 *\([^ ]*\) *$/\1/ |
| 4965 | + p |
| 4966 | + } |
| 4967 | + }' |
| 4968 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4969 | + # Check for a 64-bit object if we didn't find anything. |
| 4970 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4971 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4972 | + fi |
| 4973 | fi |
| 4974 | rm -f core conftest.err conftest.$ac_objext \ |
| 4975 | conftest$ac_exeext conftest.$ac_ext |
| 4976 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4977 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4978 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 4979 | + fi |
| 4980 | + |
| 4981 | +fi |
| 4982 | + |
| 4983 | + aix_libpath=$lt_cv_aix_libpath_ |
| 4984 | +fi |
| 4985 | |
| 4986 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 4987 | # Warning - without using the other run time loading flags, |
| 4988 | @@ -8882,20 +9417,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4989 | # Microsoft Visual C++. |
| 4990 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 4991 | # no search path for DLLs. |
| 4992 | - hardcode_libdir_flag_spec=' ' |
| 4993 | - allow_undefined_flag=unsupported |
| 4994 | - # Tell ltmain to make .lib files, not .a files. |
| 4995 | - libext=lib |
| 4996 | - # Tell ltmain to make .dll files, not .so files. |
| 4997 | - shrext_cmds=".dll" |
| 4998 | - # FIXME: Setting linknames here is a bad hack. |
| 4999 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 5000 | - # The linker will automatically build a .lib file if we build a DLL. |
| 5001 | - old_archive_from_new_cmds='true' |
| 5002 | - # FIXME: Should let the user specify the lib program. |
| 5003 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 5004 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 5005 | - enable_shared_with_static_runtimes=yes |
| 5006 | + case $cc_basename in |
| 5007 | + cl*) |
| 5008 | + # Native MSVC |
| 5009 | + hardcode_libdir_flag_spec=' ' |
| 5010 | + allow_undefined_flag=unsupported |
| 5011 | + always_export_symbols=yes |
| 5012 | + file_list_spec='@' |
| 5013 | + # Tell ltmain to make .lib files, not .a files. |
| 5014 | + libext=lib |
| 5015 | + # Tell ltmain to make .dll files, not .so files. |
| 5016 | + shrext_cmds=".dll" |
| 5017 | + # FIXME: Setting linknames here is a bad hack. |
| 5018 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 5019 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 5020 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 5021 | + else |
| 5022 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 5023 | + fi~ |
| 5024 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 5025 | + linknames=' |
| 5026 | + # The linker will not automatically build a static lib if we build a DLL. |
| 5027 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 5028 | + enable_shared_with_static_runtimes=yes |
| 5029 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 5030 | + # Don't use ranlib |
| 5031 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 5032 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 5033 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 5034 | + case $lt_outputfile in |
| 5035 | + *.exe|*.EXE) ;; |
| 5036 | + *) |
| 5037 | + lt_outputfile="$lt_outputfile.exe" |
| 5038 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 5039 | + ;; |
| 5040 | + esac~ |
| 5041 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 5042 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 5043 | + $RM "$lt_outputfile.manifest"; |
| 5044 | + fi' |
| 5045 | + ;; |
| 5046 | + *) |
| 5047 | + # Assume MSVC wrapper |
| 5048 | + hardcode_libdir_flag_spec=' ' |
| 5049 | + allow_undefined_flag=unsupported |
| 5050 | + # Tell ltmain to make .lib files, not .a files. |
| 5051 | + libext=lib |
| 5052 | + # Tell ltmain to make .dll files, not .so files. |
| 5053 | + shrext_cmds=".dll" |
| 5054 | + # FIXME: Setting linknames here is a bad hack. |
| 5055 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 5056 | + # The linker will automatically build a .lib file if we build a DLL. |
| 5057 | + old_archive_from_new_cmds='true' |
| 5058 | + # FIXME: Should let the user specify the lib program. |
| 5059 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 5060 | + enable_shared_with_static_runtimes=yes |
| 5061 | + ;; |
| 5062 | + esac |
| 5063 | ;; |
| 5064 | |
| 5065 | darwin* | rhapsody*) |
| 5066 | @@ -8956,7 +9534,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 5067 | |
| 5068 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 5069 | freebsd* | dragonfly*) |
| 5070 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 5071 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 5072 | hardcode_libdir_flag_spec='-R$libdir' |
| 5073 | hardcode_direct=yes |
| 5074 | hardcode_shlibpath_var=no |
| 5075 | @@ -8964,7 +9542,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 5076 | |
| 5077 | hpux9*) |
| 5078 | if test "$GCC" = yes; then |
| 5079 | - 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' |
| 5080 | + 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' |
| 5081 | else |
| 5082 | 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' |
| 5083 | fi |
| 5084 | @@ -8980,7 +9558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 5085 | |
| 5086 | hpux10*) |
| 5087 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 5088 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 5089 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 5090 | else |
| 5091 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 5092 | fi |
| 5093 | @@ -9004,10 +9582,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 5094 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 5095 | ;; |
| 5096 | ia64*) |
| 5097 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 5098 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 5099 | ;; |
| 5100 | *) |
| 5101 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 5102 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 5103 | ;; |
| 5104 | esac |
| 5105 | else |
| 5106 | @@ -9086,23 +9664,36 @@ fi |
| 5107 | |
| 5108 | irix5* | irix6* | nonstopux*) |
| 5109 | if test "$GCC" = yes; then |
| 5110 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 5111 | + 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' |
| 5112 | # Try to use the -exported_symbol ld option, if it does not |
| 5113 | # work, assume that -exports_file does not work either and |
| 5114 | # implicitly export all symbols. |
| 5115 | - save_LDFLAGS="$LDFLAGS" |
| 5116 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 5117 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 5118 | + # This should be the same for all languages, so no per-tag cache variable. |
| 5119 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 5120 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 5121 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 5122 | + $as_echo_n "(cached) " >&6 |
| 5123 | +else |
| 5124 | + save_LDFLAGS="$LDFLAGS" |
| 5125 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 5126 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 5127 | /* end confdefs.h. */ |
| 5128 | -int foo(void) {} |
| 5129 | +int foo (void) { return 0; } |
| 5130 | _ACEOF |
| 5131 | if ac_fn_c_try_link "$LINENO"; then : |
| 5132 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 5133 | - |
| 5134 | + lt_cv_irix_exported_symbol=yes |
| 5135 | +else |
| 5136 | + lt_cv_irix_exported_symbol=no |
| 5137 | fi |
| 5138 | rm -f core conftest.err conftest.$ac_objext \ |
| 5139 | conftest$ac_exeext conftest.$ac_ext |
| 5140 | - LDFLAGS="$save_LDFLAGS" |
| 5141 | + LDFLAGS="$save_LDFLAGS" |
| 5142 | +fi |
| 5143 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 5144 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 5145 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 5146 | + 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' |
| 5147 | + fi |
| 5148 | else |
| 5149 | 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' |
| 5150 | 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' |
| 5151 | @@ -9187,7 +9778,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 5152 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 5153 | if test "$GCC" = yes; then |
| 5154 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 5155 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 5156 | + 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' |
| 5157 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 5158 | else |
| 5159 | allow_undefined_flag=' -expect_unresolved \*' |
| 5160 | @@ -9206,9 +9797,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 5161 | no_undefined_flag=' -z defs' |
| 5162 | if test "$GCC" = yes; then |
| 5163 | wlarc='${wl}' |
| 5164 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 5165 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 5166 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 5167 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 5168 | + $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' |
| 5169 | else |
| 5170 | case `$CC -V 2>&1` in |
| 5171 | *"Compilers 5.0"*) |
| 5172 | @@ -9784,8 +10375,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 5173 | need_version=no |
| 5174 | need_lib_prefix=no |
| 5175 | |
| 5176 | - case $GCC,$host_os in |
| 5177 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 5178 | + case $GCC,$cc_basename in |
| 5179 | + yes,*) |
| 5180 | + # gcc |
| 5181 | library_names_spec='$libname.dll.a' |
| 5182 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 5183 | postinstall_cmds='base_file=`basename \${file}`~ |
| 5184 | @@ -9818,13 +10410,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 5185 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 5186 | ;; |
| 5187 | esac |
| 5188 | + dynamic_linker='Win32 ld.exe' |
| 5189 | + ;; |
| 5190 | + |
| 5191 | + *,cl*) |
| 5192 | + # Native MSVC |
| 5193 | + libname_spec='$name' |
| 5194 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 5195 | + library_names_spec='${libname}.dll.lib' |
| 5196 | + |
| 5197 | + case $build_os in |
| 5198 | + mingw*) |
| 5199 | + sys_lib_search_path_spec= |
| 5200 | + lt_save_ifs=$IFS |
| 5201 | + IFS=';' |
| 5202 | + for lt_path in $LIB |
| 5203 | + do |
| 5204 | + IFS=$lt_save_ifs |
| 5205 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 5206 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 5207 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 5208 | + done |
| 5209 | + IFS=$lt_save_ifs |
| 5210 | + # Convert to MSYS style. |
| 5211 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 5212 | + ;; |
| 5213 | + cygwin*) |
| 5214 | + # Convert to unix form, then to dos form, then back to unix form |
| 5215 | + # but this time dos style (no spaces!) so that the unix form looks |
| 5216 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 5217 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 5218 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 5219 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 5220 | + ;; |
| 5221 | + *) |
| 5222 | + sys_lib_search_path_spec="$LIB" |
| 5223 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 5224 | + # It is most probably a Windows format PATH. |
| 5225 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 5226 | + else |
| 5227 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 5228 | + fi |
| 5229 | + # FIXME: find the short name or the path components, as spaces are |
| 5230 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 5231 | + ;; |
| 5232 | + esac |
| 5233 | + |
| 5234 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 5235 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 5236 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 5237 | + dldir=$destdir/`dirname \$dlpath`~ |
| 5238 | + test -d \$dldir || mkdir -p \$dldir~ |
| 5239 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 5240 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 5241 | + dlpath=$dir/\$dldll~ |
| 5242 | + $RM \$dlpath' |
| 5243 | + shlibpath_overrides_runpath=yes |
| 5244 | + dynamic_linker='Win32 link.exe' |
| 5245 | ;; |
| 5246 | |
| 5247 | *) |
| 5248 | + # Assume MSVC wrapper |
| 5249 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 5250 | + dynamic_linker='Win32 ld.exe' |
| 5251 | ;; |
| 5252 | esac |
| 5253 | - dynamic_linker='Win32 ld.exe' |
| 5254 | # FIXME: first we should search . and the directory the executable is in |
| 5255 | shlibpath_var=PATH |
| 5256 | ;; |
| 5257 | @@ -10702,7 +11352,7 @@ else |
| 5258 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 5259 | lt_status=$lt_dlunknown |
| 5260 | cat > conftest.$ac_ext <<_LT_EOF |
| 5261 | -#line 10705 "configure" |
| 5262 | +#line $LINENO "configure" |
| 5263 | #include "confdefs.h" |
| 5264 | |
| 5265 | #if HAVE_DLFCN_H |
| 5266 | @@ -10746,10 +11396,10 @@ else |
| 5267 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 5268 | correspondingly for the symbols needed. */ |
| 5269 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 5270 | -void fnord () __attribute__((visibility("default"))); |
| 5271 | +int fnord () __attribute__((visibility("default"))); |
| 5272 | #endif |
| 5273 | |
| 5274 | -void fnord () { int i=42; } |
| 5275 | +int fnord () { return 42; } |
| 5276 | int main () |
| 5277 | { |
| 5278 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 5279 | @@ -10808,7 +11458,7 @@ else |
| 5280 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 5281 | lt_status=$lt_dlunknown |
| 5282 | cat > conftest.$ac_ext <<_LT_EOF |
| 5283 | -#line 10811 "configure" |
| 5284 | +#line $LINENO "configure" |
| 5285 | #include "confdefs.h" |
| 5286 | |
| 5287 | #if HAVE_DLFCN_H |
| 5288 | @@ -10852,10 +11502,10 @@ else |
| 5289 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 5290 | correspondingly for the symbols needed. */ |
| 5291 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 5292 | -void fnord () __attribute__((visibility("default"))); |
| 5293 | +int fnord () __attribute__((visibility("default"))); |
| 5294 | #endif |
| 5295 | |
| 5296 | -void fnord () { int i=42; } |
| 5297 | +int fnord () { return 42; } |
| 5298 | int main () |
| 5299 | { |
| 5300 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 5301 | @@ -14834,13 +15484,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 5302 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 5303 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 5304 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 5305 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 5306 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 5307 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 5308 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 5309 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 5310 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 5311 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 5312 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 5313 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 5314 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 5315 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 5316 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 5317 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 5318 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5319 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 5320 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 5321 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 5322 | @@ -14855,14 +15512,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 5323 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 5324 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 5325 | 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"`' |
| 5326 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5327 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 5328 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 5329 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 5330 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 5331 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 5332 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 5333 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 5334 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 5335 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 5336 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 5337 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 5338 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 5339 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 5340 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 5341 | @@ -14895,12 +15555,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 5342 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 5343 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 5344 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 5345 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 5346 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 5347 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 5348 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 5349 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 5350 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 5351 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 5352 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5353 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 5354 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 5355 | @@ -14955,8 +15615,13 @@ reload_flag \ |
| 5356 | OBJDUMP \ |
| 5357 | deplibs_check_method \ |
| 5358 | file_magic_cmd \ |
| 5359 | +file_magic_glob \ |
| 5360 | +want_nocaseglob \ |
| 5361 | +DLLTOOL \ |
| 5362 | +sharedlib_from_linklib_cmd \ |
| 5363 | AR \ |
| 5364 | AR_FLAGS \ |
| 5365 | +archiver_list_spec \ |
| 5366 | STRIP \ |
| 5367 | RANLIB \ |
| 5368 | CC \ |
| 5369 | @@ -14966,12 +15631,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 5370 | lt_cv_sys_global_symbol_to_cdecl \ |
| 5371 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 5372 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 5373 | +nm_file_list_spec \ |
| 5374 | lt_prog_compiler_no_builtin_flag \ |
| 5375 | -lt_prog_compiler_wl \ |
| 5376 | lt_prog_compiler_pic \ |
| 5377 | +lt_prog_compiler_wl \ |
| 5378 | lt_prog_compiler_static \ |
| 5379 | lt_cv_prog_compiler_c_o \ |
| 5380 | need_locks \ |
| 5381 | +MANIFEST_TOOL \ |
| 5382 | DSYMUTIL \ |
| 5383 | NMEDIT \ |
| 5384 | LIPO \ |
| 5385 | @@ -14987,7 +15654,6 @@ no_undefined_flag \ |
| 5386 | hardcode_libdir_flag_spec \ |
| 5387 | hardcode_libdir_flag_spec_ld \ |
| 5388 | hardcode_libdir_separator \ |
| 5389 | -fix_srcfile_path \ |
| 5390 | exclude_expsyms \ |
| 5391 | include_expsyms \ |
| 5392 | file_list_spec \ |
| 5393 | @@ -15023,6 +15689,7 @@ module_cmds \ |
| 5394 | module_expsym_cmds \ |
| 5395 | export_symbols_cmds \ |
| 5396 | prelink_cmds \ |
| 5397 | +postlink_cmds \ |
| 5398 | postinstall_cmds \ |
| 5399 | postuninstall_cmds \ |
| 5400 | finish_cmds \ |
| 5401 | @@ -15795,7 +16462,8 @@ $as_echo X"$file" | |
| 5402 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 5403 | # |
| 5404 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 5405 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 5406 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 5407 | +# Inc. |
| 5408 | # Written by Gordon Matzigkeit, 1996 |
| 5409 | # |
| 5410 | # This file is part of GNU Libtool. |
| 5411 | @@ -15898,19 +16566,42 @@ SP2NL=$lt_lt_SP2NL |
| 5412 | # turn newlines into spaces. |
| 5413 | NL2SP=$lt_lt_NL2SP |
| 5414 | |
| 5415 | +# convert \$build file names to \$host format. |
| 5416 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 5417 | + |
| 5418 | +# convert \$build files to toolchain format. |
| 5419 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 5420 | + |
| 5421 | # An object symbol dumper. |
| 5422 | OBJDUMP=$lt_OBJDUMP |
| 5423 | |
| 5424 | # Method to check whether dependent libraries are shared objects. |
| 5425 | deplibs_check_method=$lt_deplibs_check_method |
| 5426 | |
| 5427 | -# Command to use when deplibs_check_method == "file_magic". |
| 5428 | +# Command to use when deplibs_check_method = "file_magic". |
| 5429 | file_magic_cmd=$lt_file_magic_cmd |
| 5430 | |
| 5431 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 5432 | +file_magic_glob=$lt_file_magic_glob |
| 5433 | + |
| 5434 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 5435 | +want_nocaseglob=$lt_want_nocaseglob |
| 5436 | + |
| 5437 | +# DLL creation program. |
| 5438 | +DLLTOOL=$lt_DLLTOOL |
| 5439 | + |
| 5440 | +# Command to associate shared and link libraries. |
| 5441 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 5442 | + |
| 5443 | # The archiver. |
| 5444 | AR=$lt_AR |
| 5445 | + |
| 5446 | +# Flags to create an archive. |
| 5447 | AR_FLAGS=$lt_AR_FLAGS |
| 5448 | |
| 5449 | +# How to feed a file listing to the archiver. |
| 5450 | +archiver_list_spec=$lt_archiver_list_spec |
| 5451 | + |
| 5452 | # A symbol stripping program. |
| 5453 | STRIP=$lt_STRIP |
| 5454 | |
| 5455 | @@ -15940,6 +16631,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 5456 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 5457 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 5458 | |
| 5459 | +# Specify filename containing input files for \$NM. |
| 5460 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 5461 | + |
| 5462 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 5463 | +lt_sysroot=$lt_sysroot |
| 5464 | + |
| 5465 | # The name of the directory that contains temporary libtool files. |
| 5466 | objdir=$objdir |
| 5467 | |
| 5468 | @@ -15949,6 +16646,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 5469 | # Must we lock files when doing compilation? |
| 5470 | need_locks=$lt_need_locks |
| 5471 | |
| 5472 | +# Manifest tool. |
| 5473 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 5474 | + |
| 5475 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 5476 | DSYMUTIL=$lt_DSYMUTIL |
| 5477 | |
| 5478 | @@ -16063,12 +16763,12 @@ with_gcc=$GCC |
| 5479 | # Compiler flag to turn off builtin functions. |
| 5480 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 5481 | |
| 5482 | -# How to pass a linker flag through the compiler. |
| 5483 | -wl=$lt_lt_prog_compiler_wl |
| 5484 | - |
| 5485 | # Additional compiler flags for building library objects. |
| 5486 | pic_flag=$lt_lt_prog_compiler_pic |
| 5487 | |
| 5488 | +# How to pass a linker flag through the compiler. |
| 5489 | +wl=$lt_lt_prog_compiler_wl |
| 5490 | + |
| 5491 | # Compiler flag to prevent dynamic linking. |
| 5492 | link_static_flag=$lt_lt_prog_compiler_static |
| 5493 | |
| 5494 | @@ -16155,9 +16855,6 @@ inherit_rpath=$inherit_rpath |
| 5495 | # Whether libtool must link a program against all its dependency libraries. |
| 5496 | link_all_deplibs=$link_all_deplibs |
| 5497 | |
| 5498 | -# Fix the shell variable \$srcfile for the compiler. |
| 5499 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 5500 | - |
| 5501 | # Set to "yes" if exported symbols are required. |
| 5502 | always_export_symbols=$always_export_symbols |
| 5503 | |
| 5504 | @@ -16173,6 +16870,9 @@ include_expsyms=$lt_include_expsyms |
| 5505 | # Commands necessary for linking programs (against libraries) with templates. |
| 5506 | prelink_cmds=$lt_prelink_cmds |
| 5507 | |
| 5508 | +# Commands necessary for finishing linking programs. |
| 5509 | +postlink_cmds=$lt_postlink_cmds |
| 5510 | + |
| 5511 | # Specify filename containing input files. |
| 5512 | file_list_spec=$lt_file_list_spec |
| 5513 | |
| 5514 | @@ -16205,210 +16905,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 5515 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 5516 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 5517 | # is reportedly fixed, but why not run on old versions too? |
| 5518 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 5519 | - || (rm -f "$cfgfile"; exit 1) |
| 5520 | - |
| 5521 | - case $xsi_shell in |
| 5522 | - yes) |
| 5523 | - cat << \_LT_EOF >> "$cfgfile" |
| 5524 | - |
| 5525 | -# func_dirname file append nondir_replacement |
| 5526 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 5527 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 5528 | -func_dirname () |
| 5529 | -{ |
| 5530 | - case ${1} in |
| 5531 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 5532 | - * ) func_dirname_result="${3}" ;; |
| 5533 | - esac |
| 5534 | -} |
| 5535 | - |
| 5536 | -# func_basename file |
| 5537 | -func_basename () |
| 5538 | -{ |
| 5539 | - func_basename_result="${1##*/}" |
| 5540 | -} |
| 5541 | - |
| 5542 | -# func_dirname_and_basename file append nondir_replacement |
| 5543 | -# perform func_basename and func_dirname in a single function |
| 5544 | -# call: |
| 5545 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 5546 | -# add APPEND to the result, otherwise set result |
| 5547 | -# to NONDIR_REPLACEMENT. |
| 5548 | -# value returned in "$func_dirname_result" |
| 5549 | -# basename: Compute filename of FILE. |
| 5550 | -# value retuned in "$func_basename_result" |
| 5551 | -# Implementation must be kept synchronized with func_dirname |
| 5552 | -# and func_basename. For efficiency, we do not delegate to |
| 5553 | -# those functions but instead duplicate the functionality here. |
| 5554 | -func_dirname_and_basename () |
| 5555 | -{ |
| 5556 | - case ${1} in |
| 5557 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 5558 | - * ) func_dirname_result="${3}" ;; |
| 5559 | - esac |
| 5560 | - func_basename_result="${1##*/}" |
| 5561 | -} |
| 5562 | - |
| 5563 | -# func_stripname prefix suffix name |
| 5564 | -# strip PREFIX and SUFFIX off of NAME. |
| 5565 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 5566 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 5567 | -# dot (in which case that matches only a dot). |
| 5568 | -func_stripname () |
| 5569 | -{ |
| 5570 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 5571 | - # positional parameters, so assign one to ordinary parameter first. |
| 5572 | - func_stripname_result=${3} |
| 5573 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 5574 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 5575 | -} |
| 5576 | - |
| 5577 | -# func_opt_split |
| 5578 | -func_opt_split () |
| 5579 | -{ |
| 5580 | - func_opt_split_opt=${1%%=*} |
| 5581 | - func_opt_split_arg=${1#*=} |
| 5582 | -} |
| 5583 | - |
| 5584 | -# func_lo2o object |
| 5585 | -func_lo2o () |
| 5586 | -{ |
| 5587 | - case ${1} in |
| 5588 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 5589 | - *) func_lo2o_result=${1} ;; |
| 5590 | - esac |
| 5591 | -} |
| 5592 | - |
| 5593 | -# func_xform libobj-or-source |
| 5594 | -func_xform () |
| 5595 | -{ |
| 5596 | - func_xform_result=${1%.*}.lo |
| 5597 | -} |
| 5598 | - |
| 5599 | -# func_arith arithmetic-term... |
| 5600 | -func_arith () |
| 5601 | -{ |
| 5602 | - func_arith_result=$(( $* )) |
| 5603 | -} |
| 5604 | - |
| 5605 | -# func_len string |
| 5606 | -# STRING may not start with a hyphen. |
| 5607 | -func_len () |
| 5608 | -{ |
| 5609 | - func_len_result=${#1} |
| 5610 | -} |
| 5611 | - |
| 5612 | -_LT_EOF |
| 5613 | - ;; |
| 5614 | - *) # Bourne compatible functions. |
| 5615 | - cat << \_LT_EOF >> "$cfgfile" |
| 5616 | - |
| 5617 | -# func_dirname file append nondir_replacement |
| 5618 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 5619 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 5620 | -func_dirname () |
| 5621 | -{ |
| 5622 | - # Extract subdirectory from the argument. |
| 5623 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 5624 | - if test "X$func_dirname_result" = "X${1}"; then |
| 5625 | - func_dirname_result="${3}" |
| 5626 | - else |
| 5627 | - func_dirname_result="$func_dirname_result${2}" |
| 5628 | - fi |
| 5629 | -} |
| 5630 | - |
| 5631 | -# func_basename file |
| 5632 | -func_basename () |
| 5633 | -{ |
| 5634 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 5635 | -} |
| 5636 | - |
| 5637 | - |
| 5638 | -# func_stripname prefix suffix name |
| 5639 | -# strip PREFIX and SUFFIX off of NAME. |
| 5640 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 5641 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 5642 | -# dot (in which case that matches only a dot). |
| 5643 | -# func_strip_suffix prefix name |
| 5644 | -func_stripname () |
| 5645 | -{ |
| 5646 | - case ${2} in |
| 5647 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 5648 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 5649 | - esac |
| 5650 | -} |
| 5651 | - |
| 5652 | -# sed scripts: |
| 5653 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 5654 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 5655 | - |
| 5656 | -# func_opt_split |
| 5657 | -func_opt_split () |
| 5658 | -{ |
| 5659 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 5660 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 5661 | -} |
| 5662 | - |
| 5663 | -# func_lo2o object |
| 5664 | -func_lo2o () |
| 5665 | -{ |
| 5666 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 5667 | -} |
| 5668 | - |
| 5669 | -# func_xform libobj-or-source |
| 5670 | -func_xform () |
| 5671 | -{ |
| 5672 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 5673 | -} |
| 5674 | - |
| 5675 | -# func_arith arithmetic-term... |
| 5676 | -func_arith () |
| 5677 | -{ |
| 5678 | - func_arith_result=`expr "$@"` |
| 5679 | -} |
| 5680 | - |
| 5681 | -# func_len string |
| 5682 | -# STRING may not start with a hyphen. |
| 5683 | -func_len () |
| 5684 | -{ |
| 5685 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 5686 | -} |
| 5687 | - |
| 5688 | -_LT_EOF |
| 5689 | -esac |
| 5690 | - |
| 5691 | -case $lt_shell_append in |
| 5692 | - yes) |
| 5693 | - cat << \_LT_EOF >> "$cfgfile" |
| 5694 | - |
| 5695 | -# func_append var value |
| 5696 | -# Append VALUE to the end of shell variable VAR. |
| 5697 | -func_append () |
| 5698 | -{ |
| 5699 | - eval "$1+=\$2" |
| 5700 | -} |
| 5701 | -_LT_EOF |
| 5702 | - ;; |
| 5703 | - *) |
| 5704 | - cat << \_LT_EOF >> "$cfgfile" |
| 5705 | - |
| 5706 | -# func_append var value |
| 5707 | -# Append VALUE to the end of shell variable VAR. |
| 5708 | -func_append () |
| 5709 | -{ |
| 5710 | - eval "$1=\$$1\$2" |
| 5711 | -} |
| 5712 | - |
| 5713 | -_LT_EOF |
| 5714 | - ;; |
| 5715 | - esac |
| 5716 | - |
| 5717 | - |
| 5718 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 5719 | - || (rm -f "$cfgfile"; exit 1) |
| 5720 | - |
| 5721 | - mv -f "$cfgfile" "$ofile" || |
| 5722 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 5723 | + || (rm -f "$cfgfile"; exit 1) |
| 5724 | + |
| 5725 | + if test x"$xsi_shell" = xyes; then |
| 5726 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 5727 | +func_dirname ()\ |
| 5728 | +{\ |
| 5729 | +\ case ${1} in\ |
| 5730 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 5731 | +\ * ) func_dirname_result="${3}" ;;\ |
| 5732 | +\ esac\ |
| 5733 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5734 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5735 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5736 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5737 | + |
| 5738 | + |
| 5739 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 5740 | +func_basename ()\ |
| 5741 | +{\ |
| 5742 | +\ func_basename_result="${1##*/}"\ |
| 5743 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5744 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5745 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5746 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5747 | + |
| 5748 | + |
| 5749 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 5750 | +func_dirname_and_basename ()\ |
| 5751 | +{\ |
| 5752 | +\ case ${1} in\ |
| 5753 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 5754 | +\ * ) func_dirname_result="${3}" ;;\ |
| 5755 | +\ esac\ |
| 5756 | +\ func_basename_result="${1##*/}"\ |
| 5757 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5758 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5759 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5760 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5761 | + |
| 5762 | + |
| 5763 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 5764 | +func_stripname ()\ |
| 5765 | +{\ |
| 5766 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 5767 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 5768 | +\ func_stripname_result=${3}\ |
| 5769 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 5770 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 5771 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5772 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5773 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5774 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5775 | + |
| 5776 | + |
| 5777 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 5778 | +func_split_long_opt ()\ |
| 5779 | +{\ |
| 5780 | +\ func_split_long_opt_name=${1%%=*}\ |
| 5781 | +\ func_split_long_opt_arg=${1#*=}\ |
| 5782 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5783 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5784 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5785 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5786 | + |
| 5787 | + |
| 5788 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 5789 | +func_split_short_opt ()\ |
| 5790 | +{\ |
| 5791 | +\ func_split_short_opt_arg=${1#??}\ |
| 5792 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 5793 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5794 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5795 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5796 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5797 | + |
| 5798 | + |
| 5799 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 5800 | +func_lo2o ()\ |
| 5801 | +{\ |
| 5802 | +\ case ${1} in\ |
| 5803 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 5804 | +\ *) func_lo2o_result=${1} ;;\ |
| 5805 | +\ esac\ |
| 5806 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5807 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5808 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5809 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5810 | + |
| 5811 | + |
| 5812 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 5813 | +func_xform ()\ |
| 5814 | +{\ |
| 5815 | + func_xform_result=${1%.*}.lo\ |
| 5816 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5817 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5818 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5819 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5820 | + |
| 5821 | + |
| 5822 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 5823 | +func_arith ()\ |
| 5824 | +{\ |
| 5825 | + func_arith_result=$(( $* ))\ |
| 5826 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5827 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5828 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5829 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5830 | + |
| 5831 | + |
| 5832 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 5833 | +func_len ()\ |
| 5834 | +{\ |
| 5835 | + func_len_result=${#1}\ |
| 5836 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5837 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5838 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5839 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5840 | + |
| 5841 | +fi |
| 5842 | + |
| 5843 | +if test x"$lt_shell_append" = xyes; then |
| 5844 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 5845 | +func_append ()\ |
| 5846 | +{\ |
| 5847 | + eval "${1}+=\\${2}"\ |
| 5848 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5849 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5850 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5851 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5852 | + |
| 5853 | + |
| 5854 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 5855 | +func_append_quoted ()\ |
| 5856 | +{\ |
| 5857 | +\ func_quote_for_eval "${2}"\ |
| 5858 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 5859 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5860 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5861 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5862 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5863 | + |
| 5864 | + |
| 5865 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 5866 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 5867 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5868 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5869 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 5870 | +else |
| 5871 | + # Save a `func_append' function call even when '+=' is not available |
| 5872 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 5873 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5874 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5875 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 5876 | +fi |
| 5877 | + |
| 5878 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 5879 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 5880 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 5881 | +fi |
| 5882 | + |
| 5883 | + |
| 5884 | + mv -f "$cfgfile" "$ofile" || |
| 5885 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 5886 | chmod +x "$ofile" |
| 5887 | |
| 5888 | diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in |
| 5889 | index bdceff3b56a..6aadae41031 100644 |
| 5890 | --- a/gdbsupport/Makefile.in |
| 5891 | +++ b/gdbsupport/Makefile.in |
| 5892 | @@ -233,6 +233,7 @@ CATOBJEXT = @CATOBJEXT@ |
| 5893 | CC = @CC@ |
| 5894 | CCDEPMODE = @CCDEPMODE@ |
| 5895 | CFLAGS = @CFLAGS@ |
| 5896 | +CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ |
| 5897 | CPP = @CPP@ |
| 5898 | CPPFLAGS = @CPPFLAGS@ |
| 5899 | CXX = @CXX@ |
| 5900 | diff --git a/gprof/Makefile.in b/gprof/Makefile.in |
| 5901 | index 5ef5ece74a9..9d7ce8b62b2 100644 |
| 5902 | --- a/gprof/Makefile.in |
| 5903 | +++ b/gprof/Makefile.in |
| 5904 | @@ -321,6 +321,7 @@ CYGPATH_W = @CYGPATH_W@ |
| 5905 | DATADIRNAME = @DATADIRNAME@ |
| 5906 | DEFS = @DEFS@ |
| 5907 | DEPDIR = @DEPDIR@ |
| 5908 | +DLLTOOL = @DLLTOOL@ |
| 5909 | DSYMUTIL = @DSYMUTIL@ |
| 5910 | DUMPBIN = @DUMPBIN@ |
| 5911 | ECHO_C = @ECHO_C@ |
| 5912 | @@ -352,6 +353,7 @@ LN_S = @LN_S@ |
| 5913 | LTLIBOBJS = @LTLIBOBJS@ |
| 5914 | MAINT = @MAINT@ |
| 5915 | MAKEINFO = @MAKEINFO@ |
| 5916 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 5917 | MKDIR_P = @MKDIR_P@ |
| 5918 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
| 5919 | MSGFMT = @MSGFMT@ |
| 5920 | @@ -387,6 +389,7 @@ abs_builddir = @abs_builddir@ |
| 5921 | abs_srcdir = @abs_srcdir@ |
| 5922 | abs_top_builddir = @abs_top_builddir@ |
| 5923 | abs_top_srcdir = @abs_top_srcdir@ |
| 5924 | +ac_ct_AR = @ac_ct_AR@ |
| 5925 | ac_ct_CC = @ac_ct_CC@ |
| 5926 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 5927 | am__include = @am__include@ |
| 5928 | diff --git a/gprof/configure b/gprof/configure |
| 5929 | index 5a59f1c1d0e..2506887d3b0 100755 |
| 5930 | --- a/gprof/configure |
| 5931 | +++ b/gprof/configure |
| 5932 | @@ -663,8 +663,11 @@ OTOOL |
| 5933 | LIPO |
| 5934 | NMEDIT |
| 5935 | DSYMUTIL |
| 5936 | +MANIFEST_TOOL |
| 5937 | RANLIB |
| 5938 | +ac_ct_AR |
| 5939 | AR |
| 5940 | +DLLTOOL |
| 5941 | OBJDUMP |
| 5942 | LN_S |
| 5943 | NM |
| 5944 | @@ -781,6 +784,7 @@ enable_static |
| 5945 | with_pic |
| 5946 | enable_fast_install |
| 5947 | with_gnu_ld |
| 5948 | +with_libtool_sysroot |
| 5949 | enable_libtool_lock |
| 5950 | enable_plugins |
| 5951 | enable_largefile |
| 5952 | @@ -1443,6 +1447,8 @@ Optional Packages: |
| 5953 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 5954 | both] |
| 5955 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 5956 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 5957 | + (or the compiler's sysroot if not specified). |
| 5958 | |
| 5959 | Some influential environment variables: |
| 5960 | CC C compiler command |
| 5961 | @@ -4510,8 +4516,8 @@ esac |
| 5962 | |
| 5963 | |
| 5964 | |
| 5965 | -macro_version='2.2.7a' |
| 5966 | -macro_revision='1.3134' |
| 5967 | +macro_version='2.4' |
| 5968 | +macro_revision='1.3293' |
| 5969 | |
| 5970 | |
| 5971 | |
| 5972 | @@ -4551,7 +4557,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 5973 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 5974 | $as_echo_n "checking how to print strings... " >&6; } |
| 5975 | # Test print first, because it will be a builtin if present. |
| 5976 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 5977 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 5978 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 5979 | ECHO='print -r --' |
| 5980 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 5981 | @@ -5244,8 +5250,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 5982 | # Try some XSI features |
| 5983 | xsi_shell=no |
| 5984 | ( _lt_dummy="a/b/c" |
| 5985 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 5986 | - = c,a/b,, \ |
| 5987 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 5988 | + = c,a/b,b/c, \ |
| 5989 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 5990 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 5991 | && xsi_shell=yes |
| 5992 | @@ -5294,6 +5300,80 @@ esac |
| 5993 | |
| 5994 | |
| 5995 | |
| 5996 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 5997 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 5998 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 5999 | + $as_echo_n "(cached) " >&6 |
| 6000 | +else |
| 6001 | + case $host in |
| 6002 | + *-*-mingw* ) |
| 6003 | + case $build in |
| 6004 | + *-*-mingw* ) # actually msys |
| 6005 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 6006 | + ;; |
| 6007 | + *-*-cygwin* ) |
| 6008 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 6009 | + ;; |
| 6010 | + * ) # otherwise, assume *nix |
| 6011 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 6012 | + ;; |
| 6013 | + esac |
| 6014 | + ;; |
| 6015 | + *-*-cygwin* ) |
| 6016 | + case $build in |
| 6017 | + *-*-mingw* ) # actually msys |
| 6018 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 6019 | + ;; |
| 6020 | + *-*-cygwin* ) |
| 6021 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 6022 | + ;; |
| 6023 | + * ) # otherwise, assume *nix |
| 6024 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 6025 | + ;; |
| 6026 | + esac |
| 6027 | + ;; |
| 6028 | + * ) # unhandled hosts (and "normal" native builds) |
| 6029 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 6030 | + ;; |
| 6031 | +esac |
| 6032 | + |
| 6033 | +fi |
| 6034 | + |
| 6035 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 6036 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 6037 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 6038 | + |
| 6039 | + |
| 6040 | + |
| 6041 | + |
| 6042 | + |
| 6043 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 6044 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 6045 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 6046 | + $as_echo_n "(cached) " >&6 |
| 6047 | +else |
| 6048 | + #assume ordinary cross tools, or native build. |
| 6049 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 6050 | +case $host in |
| 6051 | + *-*-mingw* ) |
| 6052 | + case $build in |
| 6053 | + *-*-mingw* ) # actually msys |
| 6054 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 6055 | + ;; |
| 6056 | + esac |
| 6057 | + ;; |
| 6058 | +esac |
| 6059 | + |
| 6060 | +fi |
| 6061 | + |
| 6062 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 6063 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 6064 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 6065 | + |
| 6066 | + |
| 6067 | + |
| 6068 | + |
| 6069 | + |
| 6070 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 6071 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 6072 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 6073 | @@ -5310,6 +5390,11 @@ case $reload_flag in |
| 6074 | esac |
| 6075 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 6076 | case $host_os in |
| 6077 | + cygwin* | mingw* | pw32* | cegcc*) |
| 6078 | + if test "$GCC" != yes; then |
| 6079 | + reload_cmds=false |
| 6080 | + fi |
| 6081 | + ;; |
| 6082 | darwin*) |
| 6083 | if test "$GCC" = yes; then |
| 6084 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 6085 | @@ -5478,7 +5563,8 @@ mingw* | pw32*) |
| 6086 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 6087 | lt_cv_file_magic_cmd='func_win32_libid' |
| 6088 | else |
| 6089 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 6090 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 6091 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 6092 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 6093 | fi |
| 6094 | ;; |
| 6095 | @@ -5632,6 +5718,21 @@ esac |
| 6096 | fi |
| 6097 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 6098 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 6099 | + |
| 6100 | +file_magic_glob= |
| 6101 | +want_nocaseglob=no |
| 6102 | +if test "$build" = "$host"; then |
| 6103 | + case $host_os in |
| 6104 | + mingw* | pw32*) |
| 6105 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 6106 | + want_nocaseglob=yes |
| 6107 | + else |
| 6108 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 6109 | + fi |
| 6110 | + ;; |
| 6111 | + esac |
| 6112 | +fi |
| 6113 | + |
| 6114 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 6115 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 6116 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 6117 | @@ -5647,6 +5748,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 6118 | |
| 6119 | |
| 6120 | |
| 6121 | + |
| 6122 | + |
| 6123 | + |
| 6124 | + |
| 6125 | + |
| 6126 | + |
| 6127 | + |
| 6128 | + |
| 6129 | + |
| 6130 | + |
| 6131 | +if test -n "$ac_tool_prefix"; then |
| 6132 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 6133 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 6134 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6135 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6136 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 6137 | + $as_echo_n "(cached) " >&6 |
| 6138 | +else |
| 6139 | + if test -n "$DLLTOOL"; then |
| 6140 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 6141 | +else |
| 6142 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6143 | +for as_dir in $PATH |
| 6144 | +do |
| 6145 | + IFS=$as_save_IFS |
| 6146 | + test -z "$as_dir" && as_dir=. |
| 6147 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6148 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 6149 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 6150 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6151 | + break 2 |
| 6152 | + fi |
| 6153 | +done |
| 6154 | + done |
| 6155 | +IFS=$as_save_IFS |
| 6156 | + |
| 6157 | +fi |
| 6158 | +fi |
| 6159 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 6160 | +if test -n "$DLLTOOL"; then |
| 6161 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 6162 | +$as_echo "$DLLTOOL" >&6; } |
| 6163 | +else |
| 6164 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6165 | +$as_echo "no" >&6; } |
| 6166 | +fi |
| 6167 | + |
| 6168 | + |
| 6169 | +fi |
| 6170 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 6171 | + ac_ct_DLLTOOL=$DLLTOOL |
| 6172 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 6173 | +set dummy dlltool; ac_word=$2 |
| 6174 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6175 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6176 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 6177 | + $as_echo_n "(cached) " >&6 |
| 6178 | +else |
| 6179 | + if test -n "$ac_ct_DLLTOOL"; then |
| 6180 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 6181 | +else |
| 6182 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6183 | +for as_dir in $PATH |
| 6184 | +do |
| 6185 | + IFS=$as_save_IFS |
| 6186 | + test -z "$as_dir" && as_dir=. |
| 6187 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6188 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 6189 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 6190 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6191 | + break 2 |
| 6192 | + fi |
| 6193 | +done |
| 6194 | + done |
| 6195 | +IFS=$as_save_IFS |
| 6196 | + |
| 6197 | +fi |
| 6198 | +fi |
| 6199 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 6200 | +if test -n "$ac_ct_DLLTOOL"; then |
| 6201 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 6202 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 6203 | +else |
| 6204 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6205 | +$as_echo "no" >&6; } |
| 6206 | +fi |
| 6207 | + |
| 6208 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 6209 | + DLLTOOL="false" |
| 6210 | + else |
| 6211 | + case $cross_compiling:$ac_tool_warned in |
| 6212 | +yes:) |
| 6213 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 6214 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 6215 | +ac_tool_warned=yes ;; |
| 6216 | +esac |
| 6217 | + DLLTOOL=$ac_ct_DLLTOOL |
| 6218 | + fi |
| 6219 | +else |
| 6220 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 6221 | +fi |
| 6222 | + |
| 6223 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 6224 | + |
| 6225 | + |
| 6226 | + |
| 6227 | + |
| 6228 | + |
| 6229 | + |
| 6230 | + |
| 6231 | + |
| 6232 | + |
| 6233 | + |
| 6234 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 6235 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 6236 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 6237 | + $as_echo_n "(cached) " >&6 |
| 6238 | +else |
| 6239 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 6240 | + |
| 6241 | +case $host_os in |
| 6242 | +cygwin* | mingw* | pw32* | cegcc*) |
| 6243 | + # two different shell functions defined in ltmain.sh |
| 6244 | + # decide which to use based on capabilities of $DLLTOOL |
| 6245 | + case `$DLLTOOL --help 2>&1` in |
| 6246 | + *--identify-strict*) |
| 6247 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 6248 | + ;; |
| 6249 | + *) |
| 6250 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 6251 | + ;; |
| 6252 | + esac |
| 6253 | + ;; |
| 6254 | +*) |
| 6255 | + # fallback: assume linklib IS sharedlib |
| 6256 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 6257 | + ;; |
| 6258 | +esac |
| 6259 | + |
| 6260 | +fi |
| 6261 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 6262 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 6263 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 6264 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 6265 | + |
| 6266 | + |
| 6267 | + |
| 6268 | + |
| 6269 | + |
| 6270 | + |
| 6271 | + |
| 6272 | plugin_option= |
| 6273 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 6274 | for plugin in $plugin_names; do |
| 6275 | @@ -5661,8 +5913,10 @@ for plugin in $plugin_names; do |
| 6276 | done |
| 6277 | |
| 6278 | if test -n "$ac_tool_prefix"; then |
| 6279 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 6280 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 6281 | + for ac_prog in ar |
| 6282 | + do |
| 6283 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 6284 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 6285 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6286 | $as_echo_n "checking for $ac_word... " >&6; } |
| 6287 | if ${ac_cv_prog_AR+:} false; then : |
| 6288 | @@ -5678,7 +5932,7 @@ do |
| 6289 | test -z "$as_dir" && as_dir=. |
| 6290 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 6291 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 6292 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 6293 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 6294 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6295 | break 2 |
| 6296 | fi |
| 6297 | @@ -5698,11 +5952,15 @@ $as_echo "no" >&6; } |
| 6298 | fi |
| 6299 | |
| 6300 | |
| 6301 | + test -n "$AR" && break |
| 6302 | + done |
| 6303 | fi |
| 6304 | -if test -z "$ac_cv_prog_AR"; then |
| 6305 | +if test -z "$AR"; then |
| 6306 | ac_ct_AR=$AR |
| 6307 | - # Extract the first word of "ar", so it can be a program name with args. |
| 6308 | -set dummy ar; ac_word=$2 |
| 6309 | + for ac_prog in ar |
| 6310 | +do |
| 6311 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 6312 | +set dummy $ac_prog; ac_word=$2 |
| 6313 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6314 | $as_echo_n "checking for $ac_word... " >&6; } |
| 6315 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 6316 | @@ -5718,7 +5976,7 @@ do |
| 6317 | test -z "$as_dir" && as_dir=. |
| 6318 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 6319 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 6320 | - ac_cv_prog_ac_ct_AR="ar" |
| 6321 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 6322 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6323 | break 2 |
| 6324 | fi |
| 6325 | @@ -5737,6 +5995,10 @@ else |
| 6326 | $as_echo "no" >&6; } |
| 6327 | fi |
| 6328 | |
| 6329 | + |
| 6330 | + test -n "$ac_ct_AR" && break |
| 6331 | +done |
| 6332 | + |
| 6333 | if test "x$ac_ct_AR" = x; then |
| 6334 | AR="false" |
| 6335 | else |
| 6336 | @@ -5748,25 +6010,19 @@ ac_tool_warned=yes ;; |
| 6337 | esac |
| 6338 | AR=$ac_ct_AR |
| 6339 | fi |
| 6340 | -else |
| 6341 | - AR="$ac_cv_prog_AR" |
| 6342 | fi |
| 6343 | |
| 6344 | -test -z "$AR" && AR=ar |
| 6345 | -if test -n "$plugin_option"; then |
| 6346 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 6347 | - touch conftest.c |
| 6348 | - $AR $plugin_option rc conftest.a conftest.c |
| 6349 | - if test "$?" != 0; then |
| 6350 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 6351 | + touch conftest.c |
| 6352 | + $AR $plugin_option rc conftest.a conftest.c |
| 6353 | + if test "$?" != 0; then |
| 6354 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 6355 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 6356 | - else |
| 6357 | - AR="$AR $plugin_option" |
| 6358 | - fi |
| 6359 | - rm -f conftest.* |
| 6360 | + else |
| 6361 | + AR="$AR $plugin_option" |
| 6362 | fi |
| 6363 | -fi |
| 6364 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 6365 | + rm -f conftest.* |
| 6366 | +: ${AR=ar} |
| 6367 | +: ${AR_FLAGS=cru} |
| 6368 | |
| 6369 | |
| 6370 | |
| 6371 | @@ -5778,6 +6034,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 6372 | |
| 6373 | |
| 6374 | |
| 6375 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 6376 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 6377 | +if ${lt_cv_ar_at_file+:} false; then : |
| 6378 | + $as_echo_n "(cached) " >&6 |
| 6379 | +else |
| 6380 | + lt_cv_ar_at_file=no |
| 6381 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6382 | +/* end confdefs.h. */ |
| 6383 | + |
| 6384 | +int |
| 6385 | +main () |
| 6386 | +{ |
| 6387 | + |
| 6388 | + ; |
| 6389 | + return 0; |
| 6390 | +} |
| 6391 | +_ACEOF |
| 6392 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 6393 | + echo conftest.$ac_objext > conftest.lst |
| 6394 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 6395 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 6396 | + (eval $lt_ar_try) 2>&5 |
| 6397 | + ac_status=$? |
| 6398 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 6399 | + test $ac_status = 0; } |
| 6400 | + if test "$ac_status" -eq 0; then |
| 6401 | + # Ensure the archiver fails upon bogus file names. |
| 6402 | + rm -f conftest.$ac_objext libconftest.a |
| 6403 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 6404 | + (eval $lt_ar_try) 2>&5 |
| 6405 | + ac_status=$? |
| 6406 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 6407 | + test $ac_status = 0; } |
| 6408 | + if test "$ac_status" -ne 0; then |
| 6409 | + lt_cv_ar_at_file=@ |
| 6410 | + fi |
| 6411 | + fi |
| 6412 | + rm -f conftest.* libconftest.a |
| 6413 | + |
| 6414 | +fi |
| 6415 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 6416 | + |
| 6417 | +fi |
| 6418 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 6419 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 6420 | + |
| 6421 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 6422 | + archiver_list_spec= |
| 6423 | +else |
| 6424 | + archiver_list_spec=$lt_cv_ar_at_file |
| 6425 | +fi |
| 6426 | + |
| 6427 | + |
| 6428 | + |
| 6429 | + |
| 6430 | + |
| 6431 | + |
| 6432 | + |
| 6433 | if test -n "$ac_tool_prefix"; then |
| 6434 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 6435 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 6436 | @@ -6117,8 +6431,8 @@ esac |
| 6437 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 6438 | |
| 6439 | # Transform an extracted symbol line into symbol name and symbol address |
| 6440 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 6441 | -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'" |
| 6442 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 6443 | +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'" |
| 6444 | |
| 6445 | # Handle CRLF in mingw tool chain |
| 6446 | opt_cr= |
| 6447 | @@ -6154,6 +6468,7 @@ for ac_symprfx in "" "_"; do |
| 6448 | else |
| 6449 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 6450 | fi |
| 6451 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 6452 | |
| 6453 | # Check to see that the pipe works correctly. |
| 6454 | pipe_works=no |
| 6455 | @@ -6195,6 +6510,18 @@ _LT_EOF |
| 6456 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 6457 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 6458 | cat <<_LT_EOF > conftest.$ac_ext |
| 6459 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 6460 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 6461 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 6462 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 6463 | +# define LT_DLSYM_CONST |
| 6464 | +#elif defined(__osf__) |
| 6465 | +/* This system does not cope well with relocations in const data. */ |
| 6466 | +# define LT_DLSYM_CONST |
| 6467 | +#else |
| 6468 | +# define LT_DLSYM_CONST const |
| 6469 | +#endif |
| 6470 | + |
| 6471 | #ifdef __cplusplus |
| 6472 | extern "C" { |
| 6473 | #endif |
| 6474 | @@ -6206,7 +6533,7 @@ _LT_EOF |
| 6475 | cat <<_LT_EOF >> conftest.$ac_ext |
| 6476 | |
| 6477 | /* The mapping between symbol names and symbols. */ |
| 6478 | -const struct { |
| 6479 | +LT_DLSYM_CONST struct { |
| 6480 | const char *name; |
| 6481 | void *address; |
| 6482 | } |
| 6483 | @@ -6232,8 +6559,8 @@ static const void *lt_preloaded_setup() { |
| 6484 | _LT_EOF |
| 6485 | # Now try linking the two files. |
| 6486 | mv conftest.$ac_objext conftstm.$ac_objext |
| 6487 | - lt_save_LIBS="$LIBS" |
| 6488 | - lt_save_CFLAGS="$CFLAGS" |
| 6489 | + lt_globsym_save_LIBS=$LIBS |
| 6490 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 6491 | LIBS="conftstm.$ac_objext" |
| 6492 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 6493 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 6494 | @@ -6243,8 +6570,8 @@ _LT_EOF |
| 6495 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 6496 | pipe_works=yes |
| 6497 | fi |
| 6498 | - LIBS="$lt_save_LIBS" |
| 6499 | - CFLAGS="$lt_save_CFLAGS" |
| 6500 | + LIBS=$lt_globsym_save_LIBS |
| 6501 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 6502 | else |
| 6503 | echo "cannot find nm_test_func in $nlist" >&5 |
| 6504 | fi |
| 6505 | @@ -6281,6 +6608,18 @@ else |
| 6506 | $as_echo "ok" >&6; } |
| 6507 | fi |
| 6508 | |
| 6509 | +# Response file support. |
| 6510 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 6511 | + nm_file_list_spec='@' |
| 6512 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 6513 | + nm_file_list_spec='@' |
| 6514 | +fi |
| 6515 | + |
| 6516 | + |
| 6517 | + |
| 6518 | + |
| 6519 | + |
| 6520 | + |
| 6521 | |
| 6522 | |
| 6523 | |
| 6524 | @@ -6297,6 +6636,43 @@ fi |
| 6525 | |
| 6526 | |
| 6527 | |
| 6528 | + |
| 6529 | + |
| 6530 | + |
| 6531 | + |
| 6532 | + |
| 6533 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 6534 | +$as_echo_n "checking for sysroot... " >&6; } |
| 6535 | + |
| 6536 | +# Check whether --with-libtool-sysroot was given. |
| 6537 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 6538 | + withval=$with_libtool_sysroot; |
| 6539 | +else |
| 6540 | + with_libtool_sysroot=no |
| 6541 | +fi |
| 6542 | + |
| 6543 | + |
| 6544 | +lt_sysroot= |
| 6545 | +case ${with_libtool_sysroot} in #( |
| 6546 | + yes) |
| 6547 | + if test "$GCC" = yes; then |
| 6548 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 6549 | + fi |
| 6550 | + ;; #( |
| 6551 | + /*) |
| 6552 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 6553 | + ;; #( |
| 6554 | + no|'') |
| 6555 | + ;; #( |
| 6556 | + *) |
| 6557 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 6558 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 6559 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 6560 | + ;; |
| 6561 | +esac |
| 6562 | + |
| 6563 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 6564 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 6565 | |
| 6566 | |
| 6567 | |
| 6568 | @@ -6508,6 +6884,123 @@ esac |
| 6569 | |
| 6570 | need_locks="$enable_libtool_lock" |
| 6571 | |
| 6572 | +if test -n "$ac_tool_prefix"; then |
| 6573 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 6574 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 6575 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6576 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6577 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 6578 | + $as_echo_n "(cached) " >&6 |
| 6579 | +else |
| 6580 | + if test -n "$MANIFEST_TOOL"; then |
| 6581 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 6582 | +else |
| 6583 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6584 | +for as_dir in $PATH |
| 6585 | +do |
| 6586 | + IFS=$as_save_IFS |
| 6587 | + test -z "$as_dir" && as_dir=. |
| 6588 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6589 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 6590 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 6591 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6592 | + break 2 |
| 6593 | + fi |
| 6594 | +done |
| 6595 | + done |
| 6596 | +IFS=$as_save_IFS |
| 6597 | + |
| 6598 | +fi |
| 6599 | +fi |
| 6600 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 6601 | +if test -n "$MANIFEST_TOOL"; then |
| 6602 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 6603 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 6604 | +else |
| 6605 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6606 | +$as_echo "no" >&6; } |
| 6607 | +fi |
| 6608 | + |
| 6609 | + |
| 6610 | +fi |
| 6611 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 6612 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 6613 | + # Extract the first word of "mt", so it can be a program name with args. |
| 6614 | +set dummy mt; ac_word=$2 |
| 6615 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6616 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6617 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 6618 | + $as_echo_n "(cached) " >&6 |
| 6619 | +else |
| 6620 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 6621 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 6622 | +else |
| 6623 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6624 | +for as_dir in $PATH |
| 6625 | +do |
| 6626 | + IFS=$as_save_IFS |
| 6627 | + test -z "$as_dir" && as_dir=. |
| 6628 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6629 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 6630 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 6631 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6632 | + break 2 |
| 6633 | + fi |
| 6634 | +done |
| 6635 | + done |
| 6636 | +IFS=$as_save_IFS |
| 6637 | + |
| 6638 | +fi |
| 6639 | +fi |
| 6640 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 6641 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 6642 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 6643 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 6644 | +else |
| 6645 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6646 | +$as_echo "no" >&6; } |
| 6647 | +fi |
| 6648 | + |
| 6649 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 6650 | + MANIFEST_TOOL=":" |
| 6651 | + else |
| 6652 | + case $cross_compiling:$ac_tool_warned in |
| 6653 | +yes:) |
| 6654 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 6655 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 6656 | +ac_tool_warned=yes ;; |
| 6657 | +esac |
| 6658 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 6659 | + fi |
| 6660 | +else |
| 6661 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 6662 | +fi |
| 6663 | + |
| 6664 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 6665 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 6666 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 6667 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 6668 | + $as_echo_n "(cached) " >&6 |
| 6669 | +else |
| 6670 | + lt_cv_path_mainfest_tool=no |
| 6671 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 6672 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 6673 | + cat conftest.err >&5 |
| 6674 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 6675 | + lt_cv_path_mainfest_tool=yes |
| 6676 | + fi |
| 6677 | + rm -f conftest* |
| 6678 | +fi |
| 6679 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 6680 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 6681 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 6682 | + MANIFEST_TOOL=: |
| 6683 | +fi |
| 6684 | + |
| 6685 | + |
| 6686 | + |
| 6687 | + |
| 6688 | + |
| 6689 | |
| 6690 | case $host_os in |
| 6691 | rhapsody* | darwin*) |
| 6692 | @@ -7071,6 +7564,8 @@ _LT_EOF |
| 6693 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 6694 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 6695 | $AR cru libconftest.a conftest.o 2>&5 |
| 6696 | + echo "$RANLIB libconftest.a" >&5 |
| 6697 | + $RANLIB libconftest.a 2>&5 |
| 6698 | cat > conftest.c << _LT_EOF |
| 6699 | int main() { return 0;} |
| 6700 | _LT_EOF |
| 6701 | @@ -7653,8 +8148,6 @@ fi |
| 6702 | lt_prog_compiler_pic= |
| 6703 | lt_prog_compiler_static= |
| 6704 | |
| 6705 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 6706 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6707 | |
| 6708 | if test "$GCC" = yes; then |
| 6709 | lt_prog_compiler_wl='-Wl,' |
| 6710 | @@ -7820,6 +8313,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6711 | lt_prog_compiler_pic='--shared' |
| 6712 | lt_prog_compiler_static='--static' |
| 6713 | ;; |
| 6714 | + nagfor*) |
| 6715 | + # NAG Fortran compiler |
| 6716 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 6717 | + lt_prog_compiler_pic='-PIC' |
| 6718 | + lt_prog_compiler_static='-Bstatic' |
| 6719 | + ;; |
| 6720 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 6721 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 6722 | # which looks to be a dead project) |
| 6723 | @@ -7882,7 +8381,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6724 | lt_prog_compiler_pic='-KPIC' |
| 6725 | lt_prog_compiler_static='-Bstatic' |
| 6726 | case $cc_basename in |
| 6727 | - f77* | f90* | f95*) |
| 6728 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 6729 | lt_prog_compiler_wl='-Qoption ld ';; |
| 6730 | *) |
| 6731 | lt_prog_compiler_wl='-Wl,';; |
| 6732 | @@ -7939,13 +8438,17 @@ case $host_os in |
| 6733 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 6734 | ;; |
| 6735 | esac |
| 6736 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 6737 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 6738 | - |
| 6739 | - |
| 6740 | - |
| 6741 | - |
| 6742 | |
| 6743 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 6744 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6745 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 6746 | + $as_echo_n "(cached) " >&6 |
| 6747 | +else |
| 6748 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 6749 | +fi |
| 6750 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 6751 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 6752 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 6753 | |
| 6754 | # |
| 6755 | # Check to make sure the PIC flag actually works. |
| 6756 | @@ -8006,6 +8509,11 @@ fi |
| 6757 | |
| 6758 | |
| 6759 | |
| 6760 | + |
| 6761 | + |
| 6762 | + |
| 6763 | + |
| 6764 | + |
| 6765 | # |
| 6766 | # Check to make sure the static flag actually works. |
| 6767 | # |
| 6768 | @@ -8356,7 +8864,8 @@ _LT_EOF |
| 6769 | allow_undefined_flag=unsupported |
| 6770 | always_export_symbols=no |
| 6771 | enable_shared_with_static_runtimes=yes |
| 6772 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 6773 | + 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' |
| 6774 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 6775 | |
| 6776 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 6777 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 6778 | @@ -8455,12 +8964,12 @@ _LT_EOF |
| 6779 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 6780 | hardcode_libdir_flag_spec= |
| 6781 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 6782 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 6783 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 6784 | if test "x$supports_anon_versioning" = xyes; then |
| 6785 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 6786 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 6787 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 6788 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 6789 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 6790 | fi |
| 6791 | ;; |
| 6792 | esac |
| 6793 | @@ -8474,8 +8983,8 @@ _LT_EOF |
| 6794 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 6795 | wlarc= |
| 6796 | else |
| 6797 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6798 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6799 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6800 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6801 | fi |
| 6802 | ;; |
| 6803 | |
| 6804 | @@ -8493,8 +9002,8 @@ _LT_EOF |
| 6805 | |
| 6806 | _LT_EOF |
| 6807 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 6808 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6809 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6810 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6811 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6812 | else |
| 6813 | ld_shlibs=no |
| 6814 | fi |
| 6815 | @@ -8540,8 +9049,8 @@ _LT_EOF |
| 6816 | |
| 6817 | *) |
| 6818 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 6819 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6820 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6821 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6822 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6823 | else |
| 6824 | ld_shlibs=no |
| 6825 | fi |
| 6826 | @@ -8671,7 +9180,13 @@ _LT_EOF |
| 6827 | allow_undefined_flag='-berok' |
| 6828 | # Determine the default libpath from the value encoded in an |
| 6829 | # empty executable. |
| 6830 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6831 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 6832 | + aix_libpath=$lt_cv_aix_libpath |
| 6833 | +else |
| 6834 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 6835 | + $as_echo_n "(cached) " >&6 |
| 6836 | +else |
| 6837 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6838 | /* end confdefs.h. */ |
| 6839 | |
| 6840 | int |
| 6841 | @@ -8684,22 +9199,29 @@ main () |
| 6842 | _ACEOF |
| 6843 | if ac_fn_c_try_link "$LINENO"; then : |
| 6844 | |
| 6845 | -lt_aix_libpath_sed=' |
| 6846 | - /Import File Strings/,/^$/ { |
| 6847 | - /^0/ { |
| 6848 | - s/^0 *\(.*\)$/\1/ |
| 6849 | - p |
| 6850 | - } |
| 6851 | - }' |
| 6852 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6853 | -# Check for a 64-bit object if we didn't find anything. |
| 6854 | -if test -z "$aix_libpath"; then |
| 6855 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6856 | -fi |
| 6857 | + lt_aix_libpath_sed=' |
| 6858 | + /Import File Strings/,/^$/ { |
| 6859 | + /^0/ { |
| 6860 | + s/^0 *\([^ ]*\) *$/\1/ |
| 6861 | + p |
| 6862 | + } |
| 6863 | + }' |
| 6864 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6865 | + # Check for a 64-bit object if we didn't find anything. |
| 6866 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6867 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6868 | + fi |
| 6869 | fi |
| 6870 | rm -f core conftest.err conftest.$ac_objext \ |
| 6871 | conftest$ac_exeext conftest.$ac_ext |
| 6872 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6873 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6874 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 6875 | + fi |
| 6876 | + |
| 6877 | +fi |
| 6878 | + |
| 6879 | + aix_libpath=$lt_cv_aix_libpath_ |
| 6880 | +fi |
| 6881 | |
| 6882 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 6883 | 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" |
| 6884 | @@ -8711,7 +9233,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6885 | else |
| 6886 | # Determine the default libpath from the value encoded in an |
| 6887 | # empty executable. |
| 6888 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6889 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 6890 | + aix_libpath=$lt_cv_aix_libpath |
| 6891 | +else |
| 6892 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 6893 | + $as_echo_n "(cached) " >&6 |
| 6894 | +else |
| 6895 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6896 | /* end confdefs.h. */ |
| 6897 | |
| 6898 | int |
| 6899 | @@ -8724,22 +9252,29 @@ main () |
| 6900 | _ACEOF |
| 6901 | if ac_fn_c_try_link "$LINENO"; then : |
| 6902 | |
| 6903 | -lt_aix_libpath_sed=' |
| 6904 | - /Import File Strings/,/^$/ { |
| 6905 | - /^0/ { |
| 6906 | - s/^0 *\(.*\)$/\1/ |
| 6907 | - p |
| 6908 | - } |
| 6909 | - }' |
| 6910 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6911 | -# Check for a 64-bit object if we didn't find anything. |
| 6912 | -if test -z "$aix_libpath"; then |
| 6913 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6914 | -fi |
| 6915 | + lt_aix_libpath_sed=' |
| 6916 | + /Import File Strings/,/^$/ { |
| 6917 | + /^0/ { |
| 6918 | + s/^0 *\([^ ]*\) *$/\1/ |
| 6919 | + p |
| 6920 | + } |
| 6921 | + }' |
| 6922 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6923 | + # Check for a 64-bit object if we didn't find anything. |
| 6924 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6925 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6926 | + fi |
| 6927 | fi |
| 6928 | rm -f core conftest.err conftest.$ac_objext \ |
| 6929 | conftest$ac_exeext conftest.$ac_ext |
| 6930 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6931 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6932 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 6933 | + fi |
| 6934 | + |
| 6935 | +fi |
| 6936 | + |
| 6937 | + aix_libpath=$lt_cv_aix_libpath_ |
| 6938 | +fi |
| 6939 | |
| 6940 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 6941 | # Warning - without using the other run time loading flags, |
| 6942 | @@ -8784,20 +9319,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6943 | # Microsoft Visual C++. |
| 6944 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 6945 | # no search path for DLLs. |
| 6946 | - hardcode_libdir_flag_spec=' ' |
| 6947 | - allow_undefined_flag=unsupported |
| 6948 | - # Tell ltmain to make .lib files, not .a files. |
| 6949 | - libext=lib |
| 6950 | - # Tell ltmain to make .dll files, not .so files. |
| 6951 | - shrext_cmds=".dll" |
| 6952 | - # FIXME: Setting linknames here is a bad hack. |
| 6953 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 6954 | - # The linker will automatically build a .lib file if we build a DLL. |
| 6955 | - old_archive_from_new_cmds='true' |
| 6956 | - # FIXME: Should let the user specify the lib program. |
| 6957 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 6958 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 6959 | - enable_shared_with_static_runtimes=yes |
| 6960 | + case $cc_basename in |
| 6961 | + cl*) |
| 6962 | + # Native MSVC |
| 6963 | + hardcode_libdir_flag_spec=' ' |
| 6964 | + allow_undefined_flag=unsupported |
| 6965 | + always_export_symbols=yes |
| 6966 | + file_list_spec='@' |
| 6967 | + # Tell ltmain to make .lib files, not .a files. |
| 6968 | + libext=lib |
| 6969 | + # Tell ltmain to make .dll files, not .so files. |
| 6970 | + shrext_cmds=".dll" |
| 6971 | + # FIXME: Setting linknames here is a bad hack. |
| 6972 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 6973 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 6974 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 6975 | + else |
| 6976 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 6977 | + fi~ |
| 6978 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 6979 | + linknames=' |
| 6980 | + # The linker will not automatically build a static lib if we build a DLL. |
| 6981 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 6982 | + enable_shared_with_static_runtimes=yes |
| 6983 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 6984 | + # Don't use ranlib |
| 6985 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 6986 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 6987 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 6988 | + case $lt_outputfile in |
| 6989 | + *.exe|*.EXE) ;; |
| 6990 | + *) |
| 6991 | + lt_outputfile="$lt_outputfile.exe" |
| 6992 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 6993 | + ;; |
| 6994 | + esac~ |
| 6995 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 6996 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 6997 | + $RM "$lt_outputfile.manifest"; |
| 6998 | + fi' |
| 6999 | + ;; |
| 7000 | + *) |
| 7001 | + # Assume MSVC wrapper |
| 7002 | + hardcode_libdir_flag_spec=' ' |
| 7003 | + allow_undefined_flag=unsupported |
| 7004 | + # Tell ltmain to make .lib files, not .a files. |
| 7005 | + libext=lib |
| 7006 | + # Tell ltmain to make .dll files, not .so files. |
| 7007 | + shrext_cmds=".dll" |
| 7008 | + # FIXME: Setting linknames here is a bad hack. |
| 7009 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 7010 | + # The linker will automatically build a .lib file if we build a DLL. |
| 7011 | + old_archive_from_new_cmds='true' |
| 7012 | + # FIXME: Should let the user specify the lib program. |
| 7013 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 7014 | + enable_shared_with_static_runtimes=yes |
| 7015 | + ;; |
| 7016 | + esac |
| 7017 | ;; |
| 7018 | |
| 7019 | darwin* | rhapsody*) |
| 7020 | @@ -8858,7 +9436,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7021 | |
| 7022 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 7023 | freebsd* | dragonfly*) |
| 7024 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 7025 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 7026 | hardcode_libdir_flag_spec='-R$libdir' |
| 7027 | hardcode_direct=yes |
| 7028 | hardcode_shlibpath_var=no |
| 7029 | @@ -8866,7 +9444,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7030 | |
| 7031 | hpux9*) |
| 7032 | if test "$GCC" = yes; then |
| 7033 | - 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' |
| 7034 | + 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' |
| 7035 | else |
| 7036 | 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' |
| 7037 | fi |
| 7038 | @@ -8882,7 +9460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7039 | |
| 7040 | hpux10*) |
| 7041 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 7042 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 7043 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 7044 | else |
| 7045 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 7046 | fi |
| 7047 | @@ -8906,10 +9484,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7048 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 7049 | ;; |
| 7050 | ia64*) |
| 7051 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 7052 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 7053 | ;; |
| 7054 | *) |
| 7055 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 7056 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 7057 | ;; |
| 7058 | esac |
| 7059 | else |
| 7060 | @@ -8988,23 +9566,36 @@ fi |
| 7061 | |
| 7062 | irix5* | irix6* | nonstopux*) |
| 7063 | if test "$GCC" = yes; then |
| 7064 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 7065 | + 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' |
| 7066 | # Try to use the -exported_symbol ld option, if it does not |
| 7067 | # work, assume that -exports_file does not work either and |
| 7068 | # implicitly export all symbols. |
| 7069 | - save_LDFLAGS="$LDFLAGS" |
| 7070 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 7071 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 7072 | + # This should be the same for all languages, so no per-tag cache variable. |
| 7073 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 7074 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 7075 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 7076 | + $as_echo_n "(cached) " >&6 |
| 7077 | +else |
| 7078 | + save_LDFLAGS="$LDFLAGS" |
| 7079 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 7080 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 7081 | /* end confdefs.h. */ |
| 7082 | -int foo(void) {} |
| 7083 | +int foo (void) { return 0; } |
| 7084 | _ACEOF |
| 7085 | if ac_fn_c_try_link "$LINENO"; then : |
| 7086 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 7087 | - |
| 7088 | + lt_cv_irix_exported_symbol=yes |
| 7089 | +else |
| 7090 | + lt_cv_irix_exported_symbol=no |
| 7091 | fi |
| 7092 | rm -f core conftest.err conftest.$ac_objext \ |
| 7093 | conftest$ac_exeext conftest.$ac_ext |
| 7094 | - LDFLAGS="$save_LDFLAGS" |
| 7095 | + LDFLAGS="$save_LDFLAGS" |
| 7096 | +fi |
| 7097 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 7098 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 7099 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 7100 | + 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' |
| 7101 | + fi |
| 7102 | else |
| 7103 | 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' |
| 7104 | 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' |
| 7105 | @@ -9089,7 +9680,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 7106 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 7107 | if test "$GCC" = yes; then |
| 7108 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 7109 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 7110 | + 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' |
| 7111 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 7112 | else |
| 7113 | allow_undefined_flag=' -expect_unresolved \*' |
| 7114 | @@ -9108,9 +9699,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 7115 | no_undefined_flag=' -z defs' |
| 7116 | if test "$GCC" = yes; then |
| 7117 | wlarc='${wl}' |
| 7118 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 7119 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 7120 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 7121 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 7122 | + $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' |
| 7123 | else |
| 7124 | case `$CC -V 2>&1` in |
| 7125 | *"Compilers 5.0"*) |
| 7126 | @@ -9686,8 +10277,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 7127 | need_version=no |
| 7128 | need_lib_prefix=no |
| 7129 | |
| 7130 | - case $GCC,$host_os in |
| 7131 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 7132 | + case $GCC,$cc_basename in |
| 7133 | + yes,*) |
| 7134 | + # gcc |
| 7135 | library_names_spec='$libname.dll.a' |
| 7136 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 7137 | postinstall_cmds='base_file=`basename \${file}`~ |
| 7138 | @@ -9720,13 +10312,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 7139 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 7140 | ;; |
| 7141 | esac |
| 7142 | + dynamic_linker='Win32 ld.exe' |
| 7143 | + ;; |
| 7144 | + |
| 7145 | + *,cl*) |
| 7146 | + # Native MSVC |
| 7147 | + libname_spec='$name' |
| 7148 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 7149 | + library_names_spec='${libname}.dll.lib' |
| 7150 | + |
| 7151 | + case $build_os in |
| 7152 | + mingw*) |
| 7153 | + sys_lib_search_path_spec= |
| 7154 | + lt_save_ifs=$IFS |
| 7155 | + IFS=';' |
| 7156 | + for lt_path in $LIB |
| 7157 | + do |
| 7158 | + IFS=$lt_save_ifs |
| 7159 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 7160 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 7161 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 7162 | + done |
| 7163 | + IFS=$lt_save_ifs |
| 7164 | + # Convert to MSYS style. |
| 7165 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 7166 | + ;; |
| 7167 | + cygwin*) |
| 7168 | + # Convert to unix form, then to dos form, then back to unix form |
| 7169 | + # but this time dos style (no spaces!) so that the unix form looks |
| 7170 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 7171 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 7172 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 7173 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 7174 | + ;; |
| 7175 | + *) |
| 7176 | + sys_lib_search_path_spec="$LIB" |
| 7177 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 7178 | + # It is most probably a Windows format PATH. |
| 7179 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 7180 | + else |
| 7181 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 7182 | + fi |
| 7183 | + # FIXME: find the short name or the path components, as spaces are |
| 7184 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 7185 | + ;; |
| 7186 | + esac |
| 7187 | + |
| 7188 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 7189 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 7190 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 7191 | + dldir=$destdir/`dirname \$dlpath`~ |
| 7192 | + test -d \$dldir || mkdir -p \$dldir~ |
| 7193 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 7194 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 7195 | + dlpath=$dir/\$dldll~ |
| 7196 | + $RM \$dlpath' |
| 7197 | + shlibpath_overrides_runpath=yes |
| 7198 | + dynamic_linker='Win32 link.exe' |
| 7199 | ;; |
| 7200 | |
| 7201 | *) |
| 7202 | + # Assume MSVC wrapper |
| 7203 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 7204 | + dynamic_linker='Win32 ld.exe' |
| 7205 | ;; |
| 7206 | esac |
| 7207 | - dynamic_linker='Win32 ld.exe' |
| 7208 | # FIXME: first we should search . and the directory the executable is in |
| 7209 | shlibpath_var=PATH |
| 7210 | ;; |
| 7211 | @@ -10604,7 +11254,7 @@ else |
| 7212 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 7213 | lt_status=$lt_dlunknown |
| 7214 | cat > conftest.$ac_ext <<_LT_EOF |
| 7215 | -#line 10607 "configure" |
| 7216 | +#line $LINENO "configure" |
| 7217 | #include "confdefs.h" |
| 7218 | |
| 7219 | #if HAVE_DLFCN_H |
| 7220 | @@ -10648,10 +11298,10 @@ else |
| 7221 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 7222 | correspondingly for the symbols needed. */ |
| 7223 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 7224 | -void fnord () __attribute__((visibility("default"))); |
| 7225 | +int fnord () __attribute__((visibility("default"))); |
| 7226 | #endif |
| 7227 | |
| 7228 | -void fnord () { int i=42; } |
| 7229 | +int fnord () { return 42; } |
| 7230 | int main () |
| 7231 | { |
| 7232 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 7233 | @@ -10710,7 +11360,7 @@ else |
| 7234 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 7235 | lt_status=$lt_dlunknown |
| 7236 | cat > conftest.$ac_ext <<_LT_EOF |
| 7237 | -#line 10713 "configure" |
| 7238 | +#line $LINENO "configure" |
| 7239 | #include "confdefs.h" |
| 7240 | |
| 7241 | #if HAVE_DLFCN_H |
| 7242 | @@ -10754,10 +11404,10 @@ else |
| 7243 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 7244 | correspondingly for the symbols needed. */ |
| 7245 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 7246 | -void fnord () __attribute__((visibility("default"))); |
| 7247 | +int fnord () __attribute__((visibility("default"))); |
| 7248 | #endif |
| 7249 | |
| 7250 | -void fnord () { int i=42; } |
| 7251 | +int fnord () { return 42; } |
| 7252 | int main () |
| 7253 | { |
| 7254 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 7255 | @@ -12777,13 +13427,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 7256 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 7257 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 7258 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 7259 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 7260 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 7261 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 7262 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 7263 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 7264 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 7265 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 7266 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 7267 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 7268 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 7269 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 7270 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 7271 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 7272 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7273 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 7274 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 7275 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 7276 | @@ -12798,14 +13455,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 7277 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 7278 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 7279 | 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"`' |
| 7280 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7281 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 7282 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 7283 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 7284 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 7285 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 7286 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 7287 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 7288 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 7289 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 7290 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 7291 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 7292 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 7293 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 7294 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 7295 | @@ -12838,12 +13498,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 7296 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 7297 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 7298 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 7299 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 7300 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 7301 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 7302 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 7303 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 7304 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 7305 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 7306 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7307 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 7308 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 7309 | @@ -12898,8 +13558,13 @@ reload_flag \ |
| 7310 | OBJDUMP \ |
| 7311 | deplibs_check_method \ |
| 7312 | file_magic_cmd \ |
| 7313 | +file_magic_glob \ |
| 7314 | +want_nocaseglob \ |
| 7315 | +DLLTOOL \ |
| 7316 | +sharedlib_from_linklib_cmd \ |
| 7317 | AR \ |
| 7318 | AR_FLAGS \ |
| 7319 | +archiver_list_spec \ |
| 7320 | STRIP \ |
| 7321 | RANLIB \ |
| 7322 | CC \ |
| 7323 | @@ -12909,12 +13574,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 7324 | lt_cv_sys_global_symbol_to_cdecl \ |
| 7325 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 7326 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 7327 | +nm_file_list_spec \ |
| 7328 | lt_prog_compiler_no_builtin_flag \ |
| 7329 | -lt_prog_compiler_wl \ |
| 7330 | lt_prog_compiler_pic \ |
| 7331 | +lt_prog_compiler_wl \ |
| 7332 | lt_prog_compiler_static \ |
| 7333 | lt_cv_prog_compiler_c_o \ |
| 7334 | need_locks \ |
| 7335 | +MANIFEST_TOOL \ |
| 7336 | DSYMUTIL \ |
| 7337 | NMEDIT \ |
| 7338 | LIPO \ |
| 7339 | @@ -12930,7 +13597,6 @@ no_undefined_flag \ |
| 7340 | hardcode_libdir_flag_spec \ |
| 7341 | hardcode_libdir_flag_spec_ld \ |
| 7342 | hardcode_libdir_separator \ |
| 7343 | -fix_srcfile_path \ |
| 7344 | exclude_expsyms \ |
| 7345 | include_expsyms \ |
| 7346 | file_list_spec \ |
| 7347 | @@ -12966,6 +13632,7 @@ module_cmds \ |
| 7348 | module_expsym_cmds \ |
| 7349 | export_symbols_cmds \ |
| 7350 | prelink_cmds \ |
| 7351 | +postlink_cmds \ |
| 7352 | postinstall_cmds \ |
| 7353 | postuninstall_cmds \ |
| 7354 | finish_cmds \ |
| 7355 | @@ -13731,7 +14398,8 @@ $as_echo X"$file" | |
| 7356 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 7357 | # |
| 7358 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 7359 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 7360 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 7361 | +# Inc. |
| 7362 | # Written by Gordon Matzigkeit, 1996 |
| 7363 | # |
| 7364 | # This file is part of GNU Libtool. |
| 7365 | @@ -13834,19 +14502,42 @@ SP2NL=$lt_lt_SP2NL |
| 7366 | # turn newlines into spaces. |
| 7367 | NL2SP=$lt_lt_NL2SP |
| 7368 | |
| 7369 | +# convert \$build file names to \$host format. |
| 7370 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 7371 | + |
| 7372 | +# convert \$build files to toolchain format. |
| 7373 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 7374 | + |
| 7375 | # An object symbol dumper. |
| 7376 | OBJDUMP=$lt_OBJDUMP |
| 7377 | |
| 7378 | # Method to check whether dependent libraries are shared objects. |
| 7379 | deplibs_check_method=$lt_deplibs_check_method |
| 7380 | |
| 7381 | -# Command to use when deplibs_check_method == "file_magic". |
| 7382 | +# Command to use when deplibs_check_method = "file_magic". |
| 7383 | file_magic_cmd=$lt_file_magic_cmd |
| 7384 | |
| 7385 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 7386 | +file_magic_glob=$lt_file_magic_glob |
| 7387 | + |
| 7388 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 7389 | +want_nocaseglob=$lt_want_nocaseglob |
| 7390 | + |
| 7391 | +# DLL creation program. |
| 7392 | +DLLTOOL=$lt_DLLTOOL |
| 7393 | + |
| 7394 | +# Command to associate shared and link libraries. |
| 7395 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 7396 | + |
| 7397 | # The archiver. |
| 7398 | AR=$lt_AR |
| 7399 | + |
| 7400 | +# Flags to create an archive. |
| 7401 | AR_FLAGS=$lt_AR_FLAGS |
| 7402 | |
| 7403 | +# How to feed a file listing to the archiver. |
| 7404 | +archiver_list_spec=$lt_archiver_list_spec |
| 7405 | + |
| 7406 | # A symbol stripping program. |
| 7407 | STRIP=$lt_STRIP |
| 7408 | |
| 7409 | @@ -13876,6 +14567,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 7410 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 7411 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 7412 | |
| 7413 | +# Specify filename containing input files for \$NM. |
| 7414 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 7415 | + |
| 7416 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 7417 | +lt_sysroot=$lt_sysroot |
| 7418 | + |
| 7419 | # The name of the directory that contains temporary libtool files. |
| 7420 | objdir=$objdir |
| 7421 | |
| 7422 | @@ -13885,6 +14582,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 7423 | # Must we lock files when doing compilation? |
| 7424 | need_locks=$lt_need_locks |
| 7425 | |
| 7426 | +# Manifest tool. |
| 7427 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 7428 | + |
| 7429 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 7430 | DSYMUTIL=$lt_DSYMUTIL |
| 7431 | |
| 7432 | @@ -13999,12 +14699,12 @@ with_gcc=$GCC |
| 7433 | # Compiler flag to turn off builtin functions. |
| 7434 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 7435 | |
| 7436 | -# How to pass a linker flag through the compiler. |
| 7437 | -wl=$lt_lt_prog_compiler_wl |
| 7438 | - |
| 7439 | # Additional compiler flags for building library objects. |
| 7440 | pic_flag=$lt_lt_prog_compiler_pic |
| 7441 | |
| 7442 | +# How to pass a linker flag through the compiler. |
| 7443 | +wl=$lt_lt_prog_compiler_wl |
| 7444 | + |
| 7445 | # Compiler flag to prevent dynamic linking. |
| 7446 | link_static_flag=$lt_lt_prog_compiler_static |
| 7447 | |
| 7448 | @@ -14091,9 +14791,6 @@ inherit_rpath=$inherit_rpath |
| 7449 | # Whether libtool must link a program against all its dependency libraries. |
| 7450 | link_all_deplibs=$link_all_deplibs |
| 7451 | |
| 7452 | -# Fix the shell variable \$srcfile for the compiler. |
| 7453 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 7454 | - |
| 7455 | # Set to "yes" if exported symbols are required. |
| 7456 | always_export_symbols=$always_export_symbols |
| 7457 | |
| 7458 | @@ -14109,6 +14806,9 @@ include_expsyms=$lt_include_expsyms |
| 7459 | # Commands necessary for linking programs (against libraries) with templates. |
| 7460 | prelink_cmds=$lt_prelink_cmds |
| 7461 | |
| 7462 | +# Commands necessary for finishing linking programs. |
| 7463 | +postlink_cmds=$lt_postlink_cmds |
| 7464 | + |
| 7465 | # Specify filename containing input files. |
| 7466 | file_list_spec=$lt_file_list_spec |
| 7467 | |
| 7468 | @@ -14141,210 +14841,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 7469 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 7470 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 7471 | # is reportedly fixed, but why not run on old versions too? |
| 7472 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 7473 | - || (rm -f "$cfgfile"; exit 1) |
| 7474 | - |
| 7475 | - case $xsi_shell in |
| 7476 | - yes) |
| 7477 | - cat << \_LT_EOF >> "$cfgfile" |
| 7478 | - |
| 7479 | -# func_dirname file append nondir_replacement |
| 7480 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 7481 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 7482 | -func_dirname () |
| 7483 | -{ |
| 7484 | - case ${1} in |
| 7485 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 7486 | - * ) func_dirname_result="${3}" ;; |
| 7487 | - esac |
| 7488 | -} |
| 7489 | - |
| 7490 | -# func_basename file |
| 7491 | -func_basename () |
| 7492 | -{ |
| 7493 | - func_basename_result="${1##*/}" |
| 7494 | -} |
| 7495 | - |
| 7496 | -# func_dirname_and_basename file append nondir_replacement |
| 7497 | -# perform func_basename and func_dirname in a single function |
| 7498 | -# call: |
| 7499 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 7500 | -# add APPEND to the result, otherwise set result |
| 7501 | -# to NONDIR_REPLACEMENT. |
| 7502 | -# value returned in "$func_dirname_result" |
| 7503 | -# basename: Compute filename of FILE. |
| 7504 | -# value retuned in "$func_basename_result" |
| 7505 | -# Implementation must be kept synchronized with func_dirname |
| 7506 | -# and func_basename. For efficiency, we do not delegate to |
| 7507 | -# those functions but instead duplicate the functionality here. |
| 7508 | -func_dirname_and_basename () |
| 7509 | -{ |
| 7510 | - case ${1} in |
| 7511 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 7512 | - * ) func_dirname_result="${3}" ;; |
| 7513 | - esac |
| 7514 | - func_basename_result="${1##*/}" |
| 7515 | -} |
| 7516 | - |
| 7517 | -# func_stripname prefix suffix name |
| 7518 | -# strip PREFIX and SUFFIX off of NAME. |
| 7519 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 7520 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 7521 | -# dot (in which case that matches only a dot). |
| 7522 | -func_stripname () |
| 7523 | -{ |
| 7524 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 7525 | - # positional parameters, so assign one to ordinary parameter first. |
| 7526 | - func_stripname_result=${3} |
| 7527 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 7528 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 7529 | -} |
| 7530 | - |
| 7531 | -# func_opt_split |
| 7532 | -func_opt_split () |
| 7533 | -{ |
| 7534 | - func_opt_split_opt=${1%%=*} |
| 7535 | - func_opt_split_arg=${1#*=} |
| 7536 | -} |
| 7537 | - |
| 7538 | -# func_lo2o object |
| 7539 | -func_lo2o () |
| 7540 | -{ |
| 7541 | - case ${1} in |
| 7542 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 7543 | - *) func_lo2o_result=${1} ;; |
| 7544 | - esac |
| 7545 | -} |
| 7546 | - |
| 7547 | -# func_xform libobj-or-source |
| 7548 | -func_xform () |
| 7549 | -{ |
| 7550 | - func_xform_result=${1%.*}.lo |
| 7551 | -} |
| 7552 | - |
| 7553 | -# func_arith arithmetic-term... |
| 7554 | -func_arith () |
| 7555 | -{ |
| 7556 | - func_arith_result=$(( $* )) |
| 7557 | -} |
| 7558 | - |
| 7559 | -# func_len string |
| 7560 | -# STRING may not start with a hyphen. |
| 7561 | -func_len () |
| 7562 | -{ |
| 7563 | - func_len_result=${#1} |
| 7564 | -} |
| 7565 | - |
| 7566 | -_LT_EOF |
| 7567 | - ;; |
| 7568 | - *) # Bourne compatible functions. |
| 7569 | - cat << \_LT_EOF >> "$cfgfile" |
| 7570 | - |
| 7571 | -# func_dirname file append nondir_replacement |
| 7572 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 7573 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 7574 | -func_dirname () |
| 7575 | -{ |
| 7576 | - # Extract subdirectory from the argument. |
| 7577 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 7578 | - if test "X$func_dirname_result" = "X${1}"; then |
| 7579 | - func_dirname_result="${3}" |
| 7580 | - else |
| 7581 | - func_dirname_result="$func_dirname_result${2}" |
| 7582 | - fi |
| 7583 | -} |
| 7584 | - |
| 7585 | -# func_basename file |
| 7586 | -func_basename () |
| 7587 | -{ |
| 7588 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 7589 | -} |
| 7590 | - |
| 7591 | - |
| 7592 | -# func_stripname prefix suffix name |
| 7593 | -# strip PREFIX and SUFFIX off of NAME. |
| 7594 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 7595 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 7596 | -# dot (in which case that matches only a dot). |
| 7597 | -# func_strip_suffix prefix name |
| 7598 | -func_stripname () |
| 7599 | -{ |
| 7600 | - case ${2} in |
| 7601 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 7602 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 7603 | - esac |
| 7604 | -} |
| 7605 | - |
| 7606 | -# sed scripts: |
| 7607 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 7608 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 7609 | - |
| 7610 | -# func_opt_split |
| 7611 | -func_opt_split () |
| 7612 | -{ |
| 7613 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 7614 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 7615 | -} |
| 7616 | - |
| 7617 | -# func_lo2o object |
| 7618 | -func_lo2o () |
| 7619 | -{ |
| 7620 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 7621 | -} |
| 7622 | - |
| 7623 | -# func_xform libobj-or-source |
| 7624 | -func_xform () |
| 7625 | -{ |
| 7626 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 7627 | -} |
| 7628 | - |
| 7629 | -# func_arith arithmetic-term... |
| 7630 | -func_arith () |
| 7631 | -{ |
| 7632 | - func_arith_result=`expr "$@"` |
| 7633 | -} |
| 7634 | - |
| 7635 | -# func_len string |
| 7636 | -# STRING may not start with a hyphen. |
| 7637 | -func_len () |
| 7638 | -{ |
| 7639 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 7640 | -} |
| 7641 | - |
| 7642 | -_LT_EOF |
| 7643 | -esac |
| 7644 | - |
| 7645 | -case $lt_shell_append in |
| 7646 | - yes) |
| 7647 | - cat << \_LT_EOF >> "$cfgfile" |
| 7648 | - |
| 7649 | -# func_append var value |
| 7650 | -# Append VALUE to the end of shell variable VAR. |
| 7651 | -func_append () |
| 7652 | -{ |
| 7653 | - eval "$1+=\$2" |
| 7654 | -} |
| 7655 | -_LT_EOF |
| 7656 | - ;; |
| 7657 | - *) |
| 7658 | - cat << \_LT_EOF >> "$cfgfile" |
| 7659 | - |
| 7660 | -# func_append var value |
| 7661 | -# Append VALUE to the end of shell variable VAR. |
| 7662 | -func_append () |
| 7663 | -{ |
| 7664 | - eval "$1=\$$1\$2" |
| 7665 | -} |
| 7666 | - |
| 7667 | -_LT_EOF |
| 7668 | - ;; |
| 7669 | - esac |
| 7670 | - |
| 7671 | - |
| 7672 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 7673 | - || (rm -f "$cfgfile"; exit 1) |
| 7674 | - |
| 7675 | - mv -f "$cfgfile" "$ofile" || |
| 7676 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 7677 | + || (rm -f "$cfgfile"; exit 1) |
| 7678 | + |
| 7679 | + if test x"$xsi_shell" = xyes; then |
| 7680 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 7681 | +func_dirname ()\ |
| 7682 | +{\ |
| 7683 | +\ case ${1} in\ |
| 7684 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 7685 | +\ * ) func_dirname_result="${3}" ;;\ |
| 7686 | +\ esac\ |
| 7687 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7688 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7689 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7690 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7691 | + |
| 7692 | + |
| 7693 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 7694 | +func_basename ()\ |
| 7695 | +{\ |
| 7696 | +\ func_basename_result="${1##*/}"\ |
| 7697 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7698 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7699 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7700 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7701 | + |
| 7702 | + |
| 7703 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 7704 | +func_dirname_and_basename ()\ |
| 7705 | +{\ |
| 7706 | +\ case ${1} in\ |
| 7707 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 7708 | +\ * ) func_dirname_result="${3}" ;;\ |
| 7709 | +\ esac\ |
| 7710 | +\ func_basename_result="${1##*/}"\ |
| 7711 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7712 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7713 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7714 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7715 | + |
| 7716 | + |
| 7717 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 7718 | +func_stripname ()\ |
| 7719 | +{\ |
| 7720 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 7721 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 7722 | +\ func_stripname_result=${3}\ |
| 7723 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 7724 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 7725 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7726 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7727 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7728 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7729 | + |
| 7730 | + |
| 7731 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 7732 | +func_split_long_opt ()\ |
| 7733 | +{\ |
| 7734 | +\ func_split_long_opt_name=${1%%=*}\ |
| 7735 | +\ func_split_long_opt_arg=${1#*=}\ |
| 7736 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7737 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7738 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7739 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7740 | + |
| 7741 | + |
| 7742 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 7743 | +func_split_short_opt ()\ |
| 7744 | +{\ |
| 7745 | +\ func_split_short_opt_arg=${1#??}\ |
| 7746 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 7747 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7748 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7749 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7750 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7751 | + |
| 7752 | + |
| 7753 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 7754 | +func_lo2o ()\ |
| 7755 | +{\ |
| 7756 | +\ case ${1} in\ |
| 7757 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 7758 | +\ *) func_lo2o_result=${1} ;;\ |
| 7759 | +\ esac\ |
| 7760 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7761 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7762 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7763 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7764 | + |
| 7765 | + |
| 7766 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 7767 | +func_xform ()\ |
| 7768 | +{\ |
| 7769 | + func_xform_result=${1%.*}.lo\ |
| 7770 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7771 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7772 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7773 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7774 | + |
| 7775 | + |
| 7776 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 7777 | +func_arith ()\ |
| 7778 | +{\ |
| 7779 | + func_arith_result=$(( $* ))\ |
| 7780 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7781 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7782 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7783 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7784 | + |
| 7785 | + |
| 7786 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 7787 | +func_len ()\ |
| 7788 | +{\ |
| 7789 | + func_len_result=${#1}\ |
| 7790 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7791 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7792 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7793 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7794 | + |
| 7795 | +fi |
| 7796 | + |
| 7797 | +if test x"$lt_shell_append" = xyes; then |
| 7798 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 7799 | +func_append ()\ |
| 7800 | +{\ |
| 7801 | + eval "${1}+=\\${2}"\ |
| 7802 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7803 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7804 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7805 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7806 | + |
| 7807 | + |
| 7808 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 7809 | +func_append_quoted ()\ |
| 7810 | +{\ |
| 7811 | +\ func_quote_for_eval "${2}"\ |
| 7812 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 7813 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7814 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7815 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7816 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7817 | + |
| 7818 | + |
| 7819 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 7820 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 7821 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7822 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7823 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 7824 | +else |
| 7825 | + # Save a `func_append' function call even when '+=' is not available |
| 7826 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 7827 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7828 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7829 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 7830 | +fi |
| 7831 | + |
| 7832 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 7833 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 7834 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 7835 | +fi |
| 7836 | + |
| 7837 | + |
| 7838 | + mv -f "$cfgfile" "$ofile" || |
| 7839 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 7840 | chmod +x "$ofile" |
| 7841 | |
| 7842 | diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in |
| 7843 | index fd5279b4df1..6e74c7b302a 100644 |
| 7844 | --- a/gprofng/Makefile.in |
| 7845 | +++ b/gprofng/Makefile.in |
| 7846 | @@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@ |
| 7847 | CYGPATH_W = @CYGPATH_W@ |
| 7848 | DEFS = @DEFS@ |
| 7849 | DEPDIR = @DEPDIR@ |
| 7850 | +DLLTOOL = @DLLTOOL@ |
| 7851 | DSYMUTIL = @DSYMUTIL@ |
| 7852 | DUMPBIN = @DUMPBIN@ |
| 7853 | ECHO_C = @ECHO_C@ |
| 7854 | @@ -290,6 +291,7 @@ LN_S = @LN_S@ |
| 7855 | LTLIBOBJS = @LTLIBOBJS@ |
| 7856 | MAINT = @MAINT@ |
| 7857 | MAKEINFO = @MAKEINFO@ |
| 7858 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 7859 | MKDIR_P = @MKDIR_P@ |
| 7860 | NM = @NM@ |
| 7861 | NMEDIT = @NMEDIT@ |
| 7862 | diff --git a/gprofng/configure b/gprofng/configure |
| 7863 | index ac14d126ac0..f8d7685a72e 100755 |
| 7864 | --- a/gprofng/configure |
| 7865 | +++ b/gprofng/configure |
| 7866 | @@ -672,6 +672,8 @@ OTOOL |
| 7867 | LIPO |
| 7868 | NMEDIT |
| 7869 | DSYMUTIL |
| 7870 | +MANIFEST_TOOL |
| 7871 | +DLLTOOL |
| 7872 | OBJDUMP |
| 7873 | LN_S |
| 7874 | NM |
| 7875 | @@ -802,6 +804,7 @@ enable_static |
| 7876 | with_pic |
| 7877 | enable_fast_install |
| 7878 | with_gnu_ld |
| 7879 | +with_libtool_sysroot |
| 7880 | enable_libtool_lock |
| 7881 | enable_werror_always |
| 7882 | enable_gprofng_tools |
| 7883 | @@ -1465,6 +1468,8 @@ Optional Packages: |
| 7884 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 7885 | both] |
| 7886 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 7887 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 7888 | + (or the compiler's sysroot if not specified). |
| 7889 | --with-jdk=PATH specify prefix directory for installed JDK. |
| 7890 | --with-system-zlib use installed libz |
| 7891 | |
| 7892 | @@ -6156,8 +6161,8 @@ esac |
| 7893 | |
| 7894 | |
| 7895 | |
| 7896 | -macro_version='2.2.7a' |
| 7897 | -macro_revision='1.3134' |
| 7898 | +macro_version='2.4' |
| 7899 | +macro_revision='1.3293' |
| 7900 | |
| 7901 | |
| 7902 | |
| 7903 | @@ -6197,7 +6202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 7904 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 7905 | $as_echo_n "checking how to print strings... " >&6; } |
| 7906 | # Test print first, because it will be a builtin if present. |
| 7907 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 7908 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 7909 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 7910 | ECHO='print -r --' |
| 7911 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 7912 | @@ -6890,8 +6895,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 7913 | # Try some XSI features |
| 7914 | xsi_shell=no |
| 7915 | ( _lt_dummy="a/b/c" |
| 7916 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 7917 | - = c,a/b,, \ |
| 7918 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 7919 | + = c,a/b,b/c, \ |
| 7920 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 7921 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 7922 | && xsi_shell=yes |
| 7923 | @@ -6940,6 +6945,80 @@ esac |
| 7924 | |
| 7925 | |
| 7926 | |
| 7927 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 7928 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 7929 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 7930 | + $as_echo_n "(cached) " >&6 |
| 7931 | +else |
| 7932 | + case $host in |
| 7933 | + *-*-mingw* ) |
| 7934 | + case $build in |
| 7935 | + *-*-mingw* ) # actually msys |
| 7936 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 7937 | + ;; |
| 7938 | + *-*-cygwin* ) |
| 7939 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 7940 | + ;; |
| 7941 | + * ) # otherwise, assume *nix |
| 7942 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 7943 | + ;; |
| 7944 | + esac |
| 7945 | + ;; |
| 7946 | + *-*-cygwin* ) |
| 7947 | + case $build in |
| 7948 | + *-*-mingw* ) # actually msys |
| 7949 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 7950 | + ;; |
| 7951 | + *-*-cygwin* ) |
| 7952 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 7953 | + ;; |
| 7954 | + * ) # otherwise, assume *nix |
| 7955 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 7956 | + ;; |
| 7957 | + esac |
| 7958 | + ;; |
| 7959 | + * ) # unhandled hosts (and "normal" native builds) |
| 7960 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 7961 | + ;; |
| 7962 | +esac |
| 7963 | + |
| 7964 | +fi |
| 7965 | + |
| 7966 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 7967 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 7968 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 7969 | + |
| 7970 | + |
| 7971 | + |
| 7972 | + |
| 7973 | + |
| 7974 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 7975 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 7976 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 7977 | + $as_echo_n "(cached) " >&6 |
| 7978 | +else |
| 7979 | + #assume ordinary cross tools, or native build. |
| 7980 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 7981 | +case $host in |
| 7982 | + *-*-mingw* ) |
| 7983 | + case $build in |
| 7984 | + *-*-mingw* ) # actually msys |
| 7985 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 7986 | + ;; |
| 7987 | + esac |
| 7988 | + ;; |
| 7989 | +esac |
| 7990 | + |
| 7991 | +fi |
| 7992 | + |
| 7993 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 7994 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 7995 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 7996 | + |
| 7997 | + |
| 7998 | + |
| 7999 | + |
| 8000 | + |
| 8001 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 8002 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 8003 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 8004 | @@ -6956,6 +7035,11 @@ case $reload_flag in |
| 8005 | esac |
| 8006 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 8007 | case $host_os in |
| 8008 | + cygwin* | mingw* | pw32* | cegcc*) |
| 8009 | + if test "$GCC" != yes; then |
| 8010 | + reload_cmds=false |
| 8011 | + fi |
| 8012 | + ;; |
| 8013 | darwin*) |
| 8014 | if test "$GCC" = yes; then |
| 8015 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 8016 | @@ -7124,7 +7208,8 @@ mingw* | pw32*) |
| 8017 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 8018 | lt_cv_file_magic_cmd='func_win32_libid' |
| 8019 | else |
| 8020 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 8021 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 8022 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 8023 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 8024 | fi |
| 8025 | ;; |
| 8026 | @@ -7278,6 +7363,21 @@ esac |
| 8027 | fi |
| 8028 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 8029 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 8030 | + |
| 8031 | +file_magic_glob= |
| 8032 | +want_nocaseglob=no |
| 8033 | +if test "$build" = "$host"; then |
| 8034 | + case $host_os in |
| 8035 | + mingw* | pw32*) |
| 8036 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 8037 | + want_nocaseglob=yes |
| 8038 | + else |
| 8039 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 8040 | + fi |
| 8041 | + ;; |
| 8042 | + esac |
| 8043 | +fi |
| 8044 | + |
| 8045 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 8046 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 8047 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 8048 | @@ -7293,6 +7393,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 8049 | |
| 8050 | |
| 8051 | |
| 8052 | + |
| 8053 | + |
| 8054 | + |
| 8055 | + |
| 8056 | + |
| 8057 | + |
| 8058 | + |
| 8059 | + |
| 8060 | + |
| 8061 | + |
| 8062 | +if test -n "$ac_tool_prefix"; then |
| 8063 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 8064 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 8065 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8066 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 8067 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 8068 | + $as_echo_n "(cached) " >&6 |
| 8069 | +else |
| 8070 | + if test -n "$DLLTOOL"; then |
| 8071 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 8072 | +else |
| 8073 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 8074 | +for as_dir in $PATH |
| 8075 | +do |
| 8076 | + IFS=$as_save_IFS |
| 8077 | + test -z "$as_dir" && as_dir=. |
| 8078 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8079 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 8080 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 8081 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8082 | + break 2 |
| 8083 | + fi |
| 8084 | +done |
| 8085 | + done |
| 8086 | +IFS=$as_save_IFS |
| 8087 | + |
| 8088 | +fi |
| 8089 | +fi |
| 8090 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 8091 | +if test -n "$DLLTOOL"; then |
| 8092 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 8093 | +$as_echo "$DLLTOOL" >&6; } |
| 8094 | +else |
| 8095 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8096 | +$as_echo "no" >&6; } |
| 8097 | +fi |
| 8098 | + |
| 8099 | + |
| 8100 | +fi |
| 8101 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 8102 | + ac_ct_DLLTOOL=$DLLTOOL |
| 8103 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 8104 | +set dummy dlltool; ac_word=$2 |
| 8105 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8106 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 8107 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 8108 | + $as_echo_n "(cached) " >&6 |
| 8109 | +else |
| 8110 | + if test -n "$ac_ct_DLLTOOL"; then |
| 8111 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 8112 | +else |
| 8113 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 8114 | +for as_dir in $PATH |
| 8115 | +do |
| 8116 | + IFS=$as_save_IFS |
| 8117 | + test -z "$as_dir" && as_dir=. |
| 8118 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8119 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 8120 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 8121 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8122 | + break 2 |
| 8123 | + fi |
| 8124 | +done |
| 8125 | + done |
| 8126 | +IFS=$as_save_IFS |
| 8127 | + |
| 8128 | +fi |
| 8129 | +fi |
| 8130 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 8131 | +if test -n "$ac_ct_DLLTOOL"; then |
| 8132 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 8133 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 8134 | +else |
| 8135 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8136 | +$as_echo "no" >&6; } |
| 8137 | +fi |
| 8138 | + |
| 8139 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 8140 | + DLLTOOL="false" |
| 8141 | + else |
| 8142 | + case $cross_compiling:$ac_tool_warned in |
| 8143 | +yes:) |
| 8144 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 8145 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 8146 | +ac_tool_warned=yes ;; |
| 8147 | +esac |
| 8148 | + DLLTOOL=$ac_ct_DLLTOOL |
| 8149 | + fi |
| 8150 | +else |
| 8151 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 8152 | +fi |
| 8153 | + |
| 8154 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 8155 | + |
| 8156 | + |
| 8157 | + |
| 8158 | + |
| 8159 | + |
| 8160 | + |
| 8161 | + |
| 8162 | + |
| 8163 | + |
| 8164 | + |
| 8165 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 8166 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 8167 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 8168 | + $as_echo_n "(cached) " >&6 |
| 8169 | +else |
| 8170 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 8171 | + |
| 8172 | +case $host_os in |
| 8173 | +cygwin* | mingw* | pw32* | cegcc*) |
| 8174 | + # two different shell functions defined in ltmain.sh |
| 8175 | + # decide which to use based on capabilities of $DLLTOOL |
| 8176 | + case `$DLLTOOL --help 2>&1` in |
| 8177 | + *--identify-strict*) |
| 8178 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 8179 | + ;; |
| 8180 | + *) |
| 8181 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 8182 | + ;; |
| 8183 | + esac |
| 8184 | + ;; |
| 8185 | +*) |
| 8186 | + # fallback: assume linklib IS sharedlib |
| 8187 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 8188 | + ;; |
| 8189 | +esac |
| 8190 | + |
| 8191 | +fi |
| 8192 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 8193 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 8194 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 8195 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 8196 | + |
| 8197 | + |
| 8198 | + |
| 8199 | + |
| 8200 | + |
| 8201 | + |
| 8202 | + |
| 8203 | plugin_option= |
| 8204 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 8205 | for plugin in $plugin_names; do |
| 8206 | @@ -7307,8 +7558,10 @@ for plugin in $plugin_names; do |
| 8207 | done |
| 8208 | |
| 8209 | if test -n "$ac_tool_prefix"; then |
| 8210 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 8211 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 8212 | + for ac_prog in ar |
| 8213 | + do |
| 8214 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 8215 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 8216 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8217 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8218 | if ${ac_cv_prog_AR+:} false; then : |
| 8219 | @@ -7324,7 +7577,7 @@ do |
| 8220 | test -z "$as_dir" && as_dir=. |
| 8221 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 8222 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 8223 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 8224 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 8225 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8226 | break 2 |
| 8227 | fi |
| 8228 | @@ -7344,11 +7597,15 @@ $as_echo "no" >&6; } |
| 8229 | fi |
| 8230 | |
| 8231 | |
| 8232 | + test -n "$AR" && break |
| 8233 | + done |
| 8234 | fi |
| 8235 | -if test -z "$ac_cv_prog_AR"; then |
| 8236 | +if test -z "$AR"; then |
| 8237 | ac_ct_AR=$AR |
| 8238 | - # Extract the first word of "ar", so it can be a program name with args. |
| 8239 | -set dummy ar; ac_word=$2 |
| 8240 | + for ac_prog in ar |
| 8241 | +do |
| 8242 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 8243 | +set dummy $ac_prog; ac_word=$2 |
| 8244 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8245 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8246 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 8247 | @@ -7364,7 +7621,7 @@ do |
| 8248 | test -z "$as_dir" && as_dir=. |
| 8249 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 8250 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 8251 | - ac_cv_prog_ac_ct_AR="ar" |
| 8252 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 8253 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8254 | break 2 |
| 8255 | fi |
| 8256 | @@ -7383,6 +7640,10 @@ else |
| 8257 | $as_echo "no" >&6; } |
| 8258 | fi |
| 8259 | |
| 8260 | + |
| 8261 | + test -n "$ac_ct_AR" && break |
| 8262 | +done |
| 8263 | + |
| 8264 | if test "x$ac_ct_AR" = x; then |
| 8265 | AR="false" |
| 8266 | else |
| 8267 | @@ -7394,29 +7655,81 @@ ac_tool_warned=yes ;; |
| 8268 | esac |
| 8269 | AR=$ac_ct_AR |
| 8270 | fi |
| 8271 | -else |
| 8272 | - AR="$ac_cv_prog_AR" |
| 8273 | fi |
| 8274 | |
| 8275 | -test -z "$AR" && AR=ar |
| 8276 | -if test -n "$plugin_option"; then |
| 8277 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 8278 | - touch conftest.c |
| 8279 | - $AR $plugin_option rc conftest.a conftest.c |
| 8280 | - if test "$?" != 0; then |
| 8281 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 8282 | + touch conftest.c |
| 8283 | + $AR $plugin_option rc conftest.a conftest.c |
| 8284 | + if test "$?" != 0; then |
| 8285 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 8286 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 8287 | - else |
| 8288 | - AR="$AR $plugin_option" |
| 8289 | - fi |
| 8290 | - rm -f conftest.* |
| 8291 | + else |
| 8292 | + AR="$AR $plugin_option" |
| 8293 | fi |
| 8294 | -fi |
| 8295 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 8296 | + rm -f conftest.* |
| 8297 | +: ${AR=ar} |
| 8298 | +: ${AR_FLAGS=cru} |
| 8299 | + |
| 8300 | + |
| 8301 | + |
| 8302 | + |
| 8303 | + |
| 8304 | + |
| 8305 | + |
| 8306 | |
| 8307 | |
| 8308 | |
| 8309 | |
| 8310 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 8311 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 8312 | +if ${lt_cv_ar_at_file+:} false; then : |
| 8313 | + $as_echo_n "(cached) " >&6 |
| 8314 | +else |
| 8315 | + lt_cv_ar_at_file=no |
| 8316 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8317 | +/* end confdefs.h. */ |
| 8318 | + |
| 8319 | +int |
| 8320 | +main () |
| 8321 | +{ |
| 8322 | + |
| 8323 | + ; |
| 8324 | + return 0; |
| 8325 | +} |
| 8326 | +_ACEOF |
| 8327 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 8328 | + echo conftest.$ac_objext > conftest.lst |
| 8329 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 8330 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 8331 | + (eval $lt_ar_try) 2>&5 |
| 8332 | + ac_status=$? |
| 8333 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 8334 | + test $ac_status = 0; } |
| 8335 | + if test "$ac_status" -eq 0; then |
| 8336 | + # Ensure the archiver fails upon bogus file names. |
| 8337 | + rm -f conftest.$ac_objext libconftest.a |
| 8338 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 8339 | + (eval $lt_ar_try) 2>&5 |
| 8340 | + ac_status=$? |
| 8341 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 8342 | + test $ac_status = 0; } |
| 8343 | + if test "$ac_status" -ne 0; then |
| 8344 | + lt_cv_ar_at_file=@ |
| 8345 | + fi |
| 8346 | + fi |
| 8347 | + rm -f conftest.* libconftest.a |
| 8348 | + |
| 8349 | +fi |
| 8350 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 8351 | + |
| 8352 | +fi |
| 8353 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 8354 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 8355 | + |
| 8356 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 8357 | + archiver_list_spec= |
| 8358 | +else |
| 8359 | + archiver_list_spec=$lt_cv_ar_at_file |
| 8360 | +fi |
| 8361 | |
| 8362 | |
| 8363 | |
| 8364 | @@ -7763,8 +8076,8 @@ esac |
| 8365 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 8366 | |
| 8367 | # Transform an extracted symbol line into symbol name and symbol address |
| 8368 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 8369 | -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'" |
| 8370 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 8371 | +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'" |
| 8372 | |
| 8373 | # Handle CRLF in mingw tool chain |
| 8374 | opt_cr= |
| 8375 | @@ -7800,6 +8113,7 @@ for ac_symprfx in "" "_"; do |
| 8376 | else |
| 8377 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 8378 | fi |
| 8379 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 8380 | |
| 8381 | # Check to see that the pipe works correctly. |
| 8382 | pipe_works=no |
| 8383 | @@ -7841,6 +8155,18 @@ _LT_EOF |
| 8384 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 8385 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 8386 | cat <<_LT_EOF > conftest.$ac_ext |
| 8387 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 8388 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 8389 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 8390 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 8391 | +# define LT_DLSYM_CONST |
| 8392 | +#elif defined(__osf__) |
| 8393 | +/* This system does not cope well with relocations in const data. */ |
| 8394 | +# define LT_DLSYM_CONST |
| 8395 | +#else |
| 8396 | +# define LT_DLSYM_CONST const |
| 8397 | +#endif |
| 8398 | + |
| 8399 | #ifdef __cplusplus |
| 8400 | extern "C" { |
| 8401 | #endif |
| 8402 | @@ -7852,7 +8178,7 @@ _LT_EOF |
| 8403 | cat <<_LT_EOF >> conftest.$ac_ext |
| 8404 | |
| 8405 | /* The mapping between symbol names and symbols. */ |
| 8406 | -const struct { |
| 8407 | +LT_DLSYM_CONST struct { |
| 8408 | const char *name; |
| 8409 | void *address; |
| 8410 | } |
| 8411 | @@ -7878,8 +8204,8 @@ static const void *lt_preloaded_setup() { |
| 8412 | _LT_EOF |
| 8413 | # Now try linking the two files. |
| 8414 | mv conftest.$ac_objext conftstm.$ac_objext |
| 8415 | - lt_save_LIBS="$LIBS" |
| 8416 | - lt_save_CFLAGS="$CFLAGS" |
| 8417 | + lt_globsym_save_LIBS=$LIBS |
| 8418 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 8419 | LIBS="conftstm.$ac_objext" |
| 8420 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 8421 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 8422 | @@ -7889,8 +8215,8 @@ _LT_EOF |
| 8423 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 8424 | pipe_works=yes |
| 8425 | fi |
| 8426 | - LIBS="$lt_save_LIBS" |
| 8427 | - CFLAGS="$lt_save_CFLAGS" |
| 8428 | + LIBS=$lt_globsym_save_LIBS |
| 8429 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 8430 | else |
| 8431 | echo "cannot find nm_test_func in $nlist" >&5 |
| 8432 | fi |
| 8433 | @@ -7927,6 +8253,13 @@ else |
| 8434 | $as_echo "ok" >&6; } |
| 8435 | fi |
| 8436 | |
| 8437 | +# Response file support. |
| 8438 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 8439 | + nm_file_list_spec='@' |
| 8440 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 8441 | + nm_file_list_spec='@' |
| 8442 | +fi |
| 8443 | + |
| 8444 | |
| 8445 | |
| 8446 | |
| 8447 | @@ -7946,6 +8279,48 @@ fi |
| 8448 | |
| 8449 | |
| 8450 | |
| 8451 | + |
| 8452 | + |
| 8453 | + |
| 8454 | + |
| 8455 | + |
| 8456 | + |
| 8457 | + |
| 8458 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 8459 | +$as_echo_n "checking for sysroot... " >&6; } |
| 8460 | + |
| 8461 | +# Check whether --with-libtool-sysroot was given. |
| 8462 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 8463 | + withval=$with_libtool_sysroot; |
| 8464 | +else |
| 8465 | + with_libtool_sysroot=no |
| 8466 | +fi |
| 8467 | + |
| 8468 | + |
| 8469 | +lt_sysroot= |
| 8470 | +case ${with_libtool_sysroot} in #( |
| 8471 | + yes) |
| 8472 | + if test "$GCC" = yes; then |
| 8473 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 8474 | + fi |
| 8475 | + ;; #( |
| 8476 | + /*) |
| 8477 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 8478 | + ;; #( |
| 8479 | + no|'') |
| 8480 | + ;; #( |
| 8481 | + *) |
| 8482 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 8483 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 8484 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 8485 | + ;; |
| 8486 | +esac |
| 8487 | + |
| 8488 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 8489 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 8490 | + |
| 8491 | + |
| 8492 | + |
| 8493 | |
| 8494 | |
| 8495 | # Check whether --enable-libtool-lock was given. |
| 8496 | @@ -8154,6 +8529,123 @@ esac |
| 8497 | |
| 8498 | need_locks="$enable_libtool_lock" |
| 8499 | |
| 8500 | +if test -n "$ac_tool_prefix"; then |
| 8501 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 8502 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 8503 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8504 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 8505 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 8506 | + $as_echo_n "(cached) " >&6 |
| 8507 | +else |
| 8508 | + if test -n "$MANIFEST_TOOL"; then |
| 8509 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 8510 | +else |
| 8511 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 8512 | +for as_dir in $PATH |
| 8513 | +do |
| 8514 | + IFS=$as_save_IFS |
| 8515 | + test -z "$as_dir" && as_dir=. |
| 8516 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8517 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 8518 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 8519 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8520 | + break 2 |
| 8521 | + fi |
| 8522 | +done |
| 8523 | + done |
| 8524 | +IFS=$as_save_IFS |
| 8525 | + |
| 8526 | +fi |
| 8527 | +fi |
| 8528 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 8529 | +if test -n "$MANIFEST_TOOL"; then |
| 8530 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 8531 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 8532 | +else |
| 8533 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8534 | +$as_echo "no" >&6; } |
| 8535 | +fi |
| 8536 | + |
| 8537 | + |
| 8538 | +fi |
| 8539 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 8540 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 8541 | + # Extract the first word of "mt", so it can be a program name with args. |
| 8542 | +set dummy mt; ac_word=$2 |
| 8543 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8544 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 8545 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 8546 | + $as_echo_n "(cached) " >&6 |
| 8547 | +else |
| 8548 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 8549 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 8550 | +else |
| 8551 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 8552 | +for as_dir in $PATH |
| 8553 | +do |
| 8554 | + IFS=$as_save_IFS |
| 8555 | + test -z "$as_dir" && as_dir=. |
| 8556 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8557 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 8558 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 8559 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8560 | + break 2 |
| 8561 | + fi |
| 8562 | +done |
| 8563 | + done |
| 8564 | +IFS=$as_save_IFS |
| 8565 | + |
| 8566 | +fi |
| 8567 | +fi |
| 8568 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 8569 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 8570 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 8571 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 8572 | +else |
| 8573 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8574 | +$as_echo "no" >&6; } |
| 8575 | +fi |
| 8576 | + |
| 8577 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 8578 | + MANIFEST_TOOL=":" |
| 8579 | + else |
| 8580 | + case $cross_compiling:$ac_tool_warned in |
| 8581 | +yes:) |
| 8582 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 8583 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 8584 | +ac_tool_warned=yes ;; |
| 8585 | +esac |
| 8586 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 8587 | + fi |
| 8588 | +else |
| 8589 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 8590 | +fi |
| 8591 | + |
| 8592 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 8593 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 8594 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 8595 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 8596 | + $as_echo_n "(cached) " >&6 |
| 8597 | +else |
| 8598 | + lt_cv_path_mainfest_tool=no |
| 8599 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 8600 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 8601 | + cat conftest.err >&5 |
| 8602 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 8603 | + lt_cv_path_mainfest_tool=yes |
| 8604 | + fi |
| 8605 | + rm -f conftest* |
| 8606 | +fi |
| 8607 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 8608 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 8609 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 8610 | + MANIFEST_TOOL=: |
| 8611 | +fi |
| 8612 | + |
| 8613 | + |
| 8614 | + |
| 8615 | + |
| 8616 | + |
| 8617 | |
| 8618 | case $host_os in |
| 8619 | rhapsody* | darwin*) |
| 8620 | @@ -8717,6 +9209,8 @@ _LT_EOF |
| 8621 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 8622 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 8623 | $AR cru libconftest.a conftest.o 2>&5 |
| 8624 | + echo "$RANLIB libconftest.a" >&5 |
| 8625 | + $RANLIB libconftest.a 2>&5 |
| 8626 | cat > conftest.c << _LT_EOF |
| 8627 | int main() { return 0;} |
| 8628 | _LT_EOF |
| 8629 | @@ -8785,6 +9279,16 @@ done |
| 8630 | |
| 8631 | |
| 8632 | |
| 8633 | +func_stripname_cnf () |
| 8634 | +{ |
| 8635 | + case ${2} in |
| 8636 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 8637 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 8638 | + esac |
| 8639 | +} # func_stripname_cnf |
| 8640 | + |
| 8641 | + |
| 8642 | + |
| 8643 | |
| 8644 | |
| 8645 | # Set options |
| 8646 | @@ -9270,8 +9774,6 @@ fi |
| 8647 | lt_prog_compiler_pic= |
| 8648 | lt_prog_compiler_static= |
| 8649 | |
| 8650 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 8651 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8652 | |
| 8653 | if test "$GCC" = yes; then |
| 8654 | lt_prog_compiler_wl='-Wl,' |
| 8655 | @@ -9437,6 +9939,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8656 | lt_prog_compiler_pic='--shared' |
| 8657 | lt_prog_compiler_static='--static' |
| 8658 | ;; |
| 8659 | + nagfor*) |
| 8660 | + # NAG Fortran compiler |
| 8661 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 8662 | + lt_prog_compiler_pic='-PIC' |
| 8663 | + lt_prog_compiler_static='-Bstatic' |
| 8664 | + ;; |
| 8665 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 8666 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 8667 | # which looks to be a dead project) |
| 8668 | @@ -9499,7 +10007,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8669 | lt_prog_compiler_pic='-KPIC' |
| 8670 | lt_prog_compiler_static='-Bstatic' |
| 8671 | case $cc_basename in |
| 8672 | - f77* | f90* | f95*) |
| 8673 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 8674 | lt_prog_compiler_wl='-Qoption ld ';; |
| 8675 | *) |
| 8676 | lt_prog_compiler_wl='-Wl,';; |
| 8677 | @@ -9556,13 +10064,17 @@ case $host_os in |
| 8678 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 8679 | ;; |
| 8680 | esac |
| 8681 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 8682 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 8683 | - |
| 8684 | - |
| 8685 | - |
| 8686 | - |
| 8687 | |
| 8688 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 8689 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8690 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 8691 | + $as_echo_n "(cached) " >&6 |
| 8692 | +else |
| 8693 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 8694 | +fi |
| 8695 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 8696 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 8697 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 8698 | |
| 8699 | # |
| 8700 | # Check to make sure the PIC flag actually works. |
| 8701 | @@ -9623,6 +10135,11 @@ fi |
| 8702 | |
| 8703 | |
| 8704 | |
| 8705 | + |
| 8706 | + |
| 8707 | + |
| 8708 | + |
| 8709 | + |
| 8710 | # |
| 8711 | # Check to make sure the static flag actually works. |
| 8712 | # |
| 8713 | @@ -9973,7 +10490,8 @@ _LT_EOF |
| 8714 | allow_undefined_flag=unsupported |
| 8715 | always_export_symbols=no |
| 8716 | enable_shared_with_static_runtimes=yes |
| 8717 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 8718 | + 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' |
| 8719 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 8720 | |
| 8721 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 8722 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 8723 | @@ -10072,12 +10590,12 @@ _LT_EOF |
| 8724 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 8725 | hardcode_libdir_flag_spec= |
| 8726 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 8727 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 8728 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 8729 | if test "x$supports_anon_versioning" = xyes; then |
| 8730 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 8731 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 8732 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 8733 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 8734 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 8735 | fi |
| 8736 | ;; |
| 8737 | esac |
| 8738 | @@ -10091,8 +10609,8 @@ _LT_EOF |
| 8739 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 8740 | wlarc= |
| 8741 | else |
| 8742 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8743 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8744 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8745 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8746 | fi |
| 8747 | ;; |
| 8748 | |
| 8749 | @@ -10110,8 +10628,8 @@ _LT_EOF |
| 8750 | |
| 8751 | _LT_EOF |
| 8752 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 8753 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8754 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8755 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8756 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8757 | else |
| 8758 | ld_shlibs=no |
| 8759 | fi |
| 8760 | @@ -10157,8 +10675,8 @@ _LT_EOF |
| 8761 | |
| 8762 | *) |
| 8763 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 8764 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8765 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8766 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8767 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8768 | else |
| 8769 | ld_shlibs=no |
| 8770 | fi |
| 8771 | @@ -10288,7 +10806,13 @@ _LT_EOF |
| 8772 | allow_undefined_flag='-berok' |
| 8773 | # Determine the default libpath from the value encoded in an |
| 8774 | # empty executable. |
| 8775 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8776 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 8777 | + aix_libpath=$lt_cv_aix_libpath |
| 8778 | +else |
| 8779 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 8780 | + $as_echo_n "(cached) " >&6 |
| 8781 | +else |
| 8782 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8783 | /* end confdefs.h. */ |
| 8784 | |
| 8785 | int |
| 8786 | @@ -10301,22 +10825,29 @@ main () |
| 8787 | _ACEOF |
| 8788 | if ac_fn_c_try_link "$LINENO"; then : |
| 8789 | |
| 8790 | -lt_aix_libpath_sed=' |
| 8791 | - /Import File Strings/,/^$/ { |
| 8792 | - /^0/ { |
| 8793 | - s/^0 *\(.*\)$/\1/ |
| 8794 | - p |
| 8795 | - } |
| 8796 | - }' |
| 8797 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8798 | -# Check for a 64-bit object if we didn't find anything. |
| 8799 | -if test -z "$aix_libpath"; then |
| 8800 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8801 | -fi |
| 8802 | + lt_aix_libpath_sed=' |
| 8803 | + /Import File Strings/,/^$/ { |
| 8804 | + /^0/ { |
| 8805 | + s/^0 *\([^ ]*\) *$/\1/ |
| 8806 | + p |
| 8807 | + } |
| 8808 | + }' |
| 8809 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8810 | + # Check for a 64-bit object if we didn't find anything. |
| 8811 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8812 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8813 | + fi |
| 8814 | fi |
| 8815 | rm -f core conftest.err conftest.$ac_objext \ |
| 8816 | conftest$ac_exeext conftest.$ac_ext |
| 8817 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8818 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8819 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 8820 | + fi |
| 8821 | + |
| 8822 | +fi |
| 8823 | + |
| 8824 | + aix_libpath=$lt_cv_aix_libpath_ |
| 8825 | +fi |
| 8826 | |
| 8827 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 8828 | 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" |
| 8829 | @@ -10328,7 +10859,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8830 | else |
| 8831 | # Determine the default libpath from the value encoded in an |
| 8832 | # empty executable. |
| 8833 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8834 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 8835 | + aix_libpath=$lt_cv_aix_libpath |
| 8836 | +else |
| 8837 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 8838 | + $as_echo_n "(cached) " >&6 |
| 8839 | +else |
| 8840 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8841 | /* end confdefs.h. */ |
| 8842 | |
| 8843 | int |
| 8844 | @@ -10341,22 +10878,29 @@ main () |
| 8845 | _ACEOF |
| 8846 | if ac_fn_c_try_link "$LINENO"; then : |
| 8847 | |
| 8848 | -lt_aix_libpath_sed=' |
| 8849 | - /Import File Strings/,/^$/ { |
| 8850 | - /^0/ { |
| 8851 | - s/^0 *\(.*\)$/\1/ |
| 8852 | - p |
| 8853 | - } |
| 8854 | - }' |
| 8855 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8856 | -# Check for a 64-bit object if we didn't find anything. |
| 8857 | -if test -z "$aix_libpath"; then |
| 8858 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8859 | -fi |
| 8860 | + lt_aix_libpath_sed=' |
| 8861 | + /Import File Strings/,/^$/ { |
| 8862 | + /^0/ { |
| 8863 | + s/^0 *\([^ ]*\) *$/\1/ |
| 8864 | + p |
| 8865 | + } |
| 8866 | + }' |
| 8867 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8868 | + # Check for a 64-bit object if we didn't find anything. |
| 8869 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8870 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8871 | + fi |
| 8872 | fi |
| 8873 | rm -f core conftest.err conftest.$ac_objext \ |
| 8874 | conftest$ac_exeext conftest.$ac_ext |
| 8875 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8876 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8877 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 8878 | + fi |
| 8879 | + |
| 8880 | +fi |
| 8881 | + |
| 8882 | + aix_libpath=$lt_cv_aix_libpath_ |
| 8883 | +fi |
| 8884 | |
| 8885 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 8886 | # Warning - without using the other run time loading flags, |
| 8887 | @@ -10401,20 +10945,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8888 | # Microsoft Visual C++. |
| 8889 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 8890 | # no search path for DLLs. |
| 8891 | - hardcode_libdir_flag_spec=' ' |
| 8892 | - allow_undefined_flag=unsupported |
| 8893 | - # Tell ltmain to make .lib files, not .a files. |
| 8894 | - libext=lib |
| 8895 | - # Tell ltmain to make .dll files, not .so files. |
| 8896 | - shrext_cmds=".dll" |
| 8897 | - # FIXME: Setting linknames here is a bad hack. |
| 8898 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 8899 | - # The linker will automatically build a .lib file if we build a DLL. |
| 8900 | - old_archive_from_new_cmds='true' |
| 8901 | - # FIXME: Should let the user specify the lib program. |
| 8902 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 8903 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 8904 | - enable_shared_with_static_runtimes=yes |
| 8905 | + case $cc_basename in |
| 8906 | + cl*) |
| 8907 | + # Native MSVC |
| 8908 | + hardcode_libdir_flag_spec=' ' |
| 8909 | + allow_undefined_flag=unsupported |
| 8910 | + always_export_symbols=yes |
| 8911 | + file_list_spec='@' |
| 8912 | + # Tell ltmain to make .lib files, not .a files. |
| 8913 | + libext=lib |
| 8914 | + # Tell ltmain to make .dll files, not .so files. |
| 8915 | + shrext_cmds=".dll" |
| 8916 | + # FIXME: Setting linknames here is a bad hack. |
| 8917 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 8918 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 8919 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 8920 | + else |
| 8921 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 8922 | + fi~ |
| 8923 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 8924 | + linknames=' |
| 8925 | + # The linker will not automatically build a static lib if we build a DLL. |
| 8926 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 8927 | + enable_shared_with_static_runtimes=yes |
| 8928 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 8929 | + # Don't use ranlib |
| 8930 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 8931 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 8932 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 8933 | + case $lt_outputfile in |
| 8934 | + *.exe|*.EXE) ;; |
| 8935 | + *) |
| 8936 | + lt_outputfile="$lt_outputfile.exe" |
| 8937 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 8938 | + ;; |
| 8939 | + esac~ |
| 8940 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 8941 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 8942 | + $RM "$lt_outputfile.manifest"; |
| 8943 | + fi' |
| 8944 | + ;; |
| 8945 | + *) |
| 8946 | + # Assume MSVC wrapper |
| 8947 | + hardcode_libdir_flag_spec=' ' |
| 8948 | + allow_undefined_flag=unsupported |
| 8949 | + # Tell ltmain to make .lib files, not .a files. |
| 8950 | + libext=lib |
| 8951 | + # Tell ltmain to make .dll files, not .so files. |
| 8952 | + shrext_cmds=".dll" |
| 8953 | + # FIXME: Setting linknames here is a bad hack. |
| 8954 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 8955 | + # The linker will automatically build a .lib file if we build a DLL. |
| 8956 | + old_archive_from_new_cmds='true' |
| 8957 | + # FIXME: Should let the user specify the lib program. |
| 8958 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 8959 | + enable_shared_with_static_runtimes=yes |
| 8960 | + ;; |
| 8961 | + esac |
| 8962 | ;; |
| 8963 | |
| 8964 | darwin* | rhapsody*) |
| 8965 | @@ -10475,7 +11062,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8966 | |
| 8967 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 8968 | freebsd* | dragonfly*) |
| 8969 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 8970 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 8971 | hardcode_libdir_flag_spec='-R$libdir' |
| 8972 | hardcode_direct=yes |
| 8973 | hardcode_shlibpath_var=no |
| 8974 | @@ -10483,7 +11070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8975 | |
| 8976 | hpux9*) |
| 8977 | if test "$GCC" = yes; then |
| 8978 | - 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' |
| 8979 | + 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' |
| 8980 | else |
| 8981 | 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' |
| 8982 | fi |
| 8983 | @@ -10499,7 +11086,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8984 | |
| 8985 | hpux10*) |
| 8986 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 8987 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8988 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8989 | else |
| 8990 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 8991 | fi |
| 8992 | @@ -10523,10 +11110,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8993 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 8994 | ;; |
| 8995 | ia64*) |
| 8996 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 8997 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 8998 | ;; |
| 8999 | *) |
| 9000 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 9001 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 9002 | ;; |
| 9003 | esac |
| 9004 | else |
| 9005 | @@ -10605,23 +11192,36 @@ fi |
| 9006 | |
| 9007 | irix5* | irix6* | nonstopux*) |
| 9008 | if test "$GCC" = yes; then |
| 9009 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9010 | + 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' |
| 9011 | # Try to use the -exported_symbol ld option, if it does not |
| 9012 | # work, assume that -exports_file does not work either and |
| 9013 | # implicitly export all symbols. |
| 9014 | - save_LDFLAGS="$LDFLAGS" |
| 9015 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 9016 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9017 | + # This should be the same for all languages, so no per-tag cache variable. |
| 9018 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 9019 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 9020 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 9021 | + $as_echo_n "(cached) " >&6 |
| 9022 | +else |
| 9023 | + save_LDFLAGS="$LDFLAGS" |
| 9024 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 9025 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9026 | /* end confdefs.h. */ |
| 9027 | -int foo(void) {} |
| 9028 | +int foo (void) { return 0; } |
| 9029 | _ACEOF |
| 9030 | if ac_fn_c_try_link "$LINENO"; then : |
| 9031 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 9032 | - |
| 9033 | + lt_cv_irix_exported_symbol=yes |
| 9034 | +else |
| 9035 | + lt_cv_irix_exported_symbol=no |
| 9036 | fi |
| 9037 | rm -f core conftest.err conftest.$ac_objext \ |
| 9038 | conftest$ac_exeext conftest.$ac_ext |
| 9039 | - LDFLAGS="$save_LDFLAGS" |
| 9040 | + LDFLAGS="$save_LDFLAGS" |
| 9041 | +fi |
| 9042 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 9043 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 9044 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 9045 | + 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' |
| 9046 | + fi |
| 9047 | else |
| 9048 | 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' |
| 9049 | 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' |
| 9050 | @@ -10706,7 +11306,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 9051 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 9052 | if test "$GCC" = yes; then |
| 9053 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 9054 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9055 | + 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' |
| 9056 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 9057 | else |
| 9058 | allow_undefined_flag=' -expect_unresolved \*' |
| 9059 | @@ -10725,9 +11325,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 9060 | no_undefined_flag=' -z defs' |
| 9061 | if test "$GCC" = yes; then |
| 9062 | wlarc='${wl}' |
| 9063 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 9064 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 9065 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 9066 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 9067 | + $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' |
| 9068 | else |
| 9069 | case `$CC -V 2>&1` in |
| 9070 | *"Compilers 5.0"*) |
| 9071 | @@ -11303,8 +11903,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 9072 | need_version=no |
| 9073 | need_lib_prefix=no |
| 9074 | |
| 9075 | - case $GCC,$host_os in |
| 9076 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 9077 | + case $GCC,$cc_basename in |
| 9078 | + yes,*) |
| 9079 | + # gcc |
| 9080 | library_names_spec='$libname.dll.a' |
| 9081 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9082 | postinstall_cmds='base_file=`basename \${file}`~ |
| 9083 | @@ -11337,13 +11938,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 9084 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 9085 | ;; |
| 9086 | esac |
| 9087 | + dynamic_linker='Win32 ld.exe' |
| 9088 | + ;; |
| 9089 | + |
| 9090 | + *,cl*) |
| 9091 | + # Native MSVC |
| 9092 | + libname_spec='$name' |
| 9093 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 9094 | + library_names_spec='${libname}.dll.lib' |
| 9095 | + |
| 9096 | + case $build_os in |
| 9097 | + mingw*) |
| 9098 | + sys_lib_search_path_spec= |
| 9099 | + lt_save_ifs=$IFS |
| 9100 | + IFS=';' |
| 9101 | + for lt_path in $LIB |
| 9102 | + do |
| 9103 | + IFS=$lt_save_ifs |
| 9104 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 9105 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 9106 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 9107 | + done |
| 9108 | + IFS=$lt_save_ifs |
| 9109 | + # Convert to MSYS style. |
| 9110 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 9111 | + ;; |
| 9112 | + cygwin*) |
| 9113 | + # Convert to unix form, then to dos form, then back to unix form |
| 9114 | + # but this time dos style (no spaces!) so that the unix form looks |
| 9115 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 9116 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 9117 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 9118 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9119 | + ;; |
| 9120 | + *) |
| 9121 | + sys_lib_search_path_spec="$LIB" |
| 9122 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 9123 | + # It is most probably a Windows format PATH. |
| 9124 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 9125 | + else |
| 9126 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9127 | + fi |
| 9128 | + # FIXME: find the short name or the path components, as spaces are |
| 9129 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 9130 | + ;; |
| 9131 | + esac |
| 9132 | + |
| 9133 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9134 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 9135 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 9136 | + dldir=$destdir/`dirname \$dlpath`~ |
| 9137 | + test -d \$dldir || mkdir -p \$dldir~ |
| 9138 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 9139 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 9140 | + dlpath=$dir/\$dldll~ |
| 9141 | + $RM \$dlpath' |
| 9142 | + shlibpath_overrides_runpath=yes |
| 9143 | + dynamic_linker='Win32 link.exe' |
| 9144 | ;; |
| 9145 | |
| 9146 | *) |
| 9147 | + # Assume MSVC wrapper |
| 9148 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 9149 | + dynamic_linker='Win32 ld.exe' |
| 9150 | ;; |
| 9151 | esac |
| 9152 | - dynamic_linker='Win32 ld.exe' |
| 9153 | # FIXME: first we should search . and the directory the executable is in |
| 9154 | shlibpath_var=PATH |
| 9155 | ;; |
| 9156 | @@ -12221,7 +12880,7 @@ else |
| 9157 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 9158 | lt_status=$lt_dlunknown |
| 9159 | cat > conftest.$ac_ext <<_LT_EOF |
| 9160 | -#line 12224 "configure" |
| 9161 | +#line $LINENO "configure" |
| 9162 | #include "confdefs.h" |
| 9163 | |
| 9164 | #if HAVE_DLFCN_H |
| 9165 | @@ -12265,10 +12924,10 @@ else |
| 9166 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 9167 | correspondingly for the symbols needed. */ |
| 9168 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 9169 | -void fnord () __attribute__((visibility("default"))); |
| 9170 | +int fnord () __attribute__((visibility("default"))); |
| 9171 | #endif |
| 9172 | |
| 9173 | -void fnord () { int i=42; } |
| 9174 | +int fnord () { return 42; } |
| 9175 | int main () |
| 9176 | { |
| 9177 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 9178 | @@ -12327,7 +12986,7 @@ else |
| 9179 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 9180 | lt_status=$lt_dlunknown |
| 9181 | cat > conftest.$ac_ext <<_LT_EOF |
| 9182 | -#line 12330 "configure" |
| 9183 | +#line $LINENO "configure" |
| 9184 | #include "confdefs.h" |
| 9185 | |
| 9186 | #if HAVE_DLFCN_H |
| 9187 | @@ -12371,10 +13030,10 @@ else |
| 9188 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 9189 | correspondingly for the symbols needed. */ |
| 9190 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 9191 | -void fnord () __attribute__((visibility("default"))); |
| 9192 | +int fnord () __attribute__((visibility("default"))); |
| 9193 | #endif |
| 9194 | |
| 9195 | -void fnord () { int i=42; } |
| 9196 | +int fnord () { return 42; } |
| 9197 | int main () |
| 9198 | { |
| 9199 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 9200 | @@ -12766,6 +13425,7 @@ $RM -r conftest* |
| 9201 | |
| 9202 | # Allow CC to be a program name with arguments. |
| 9203 | lt_save_CC=$CC |
| 9204 | + lt_save_CFLAGS=$CFLAGS |
| 9205 | lt_save_LD=$LD |
| 9206 | lt_save_GCC=$GCC |
| 9207 | GCC=$GXX |
| 9208 | @@ -12783,6 +13443,7 @@ $RM -r conftest* |
| 9209 | fi |
| 9210 | test -z "${LDCXX+set}" || LD=$LDCXX |
| 9211 | CC=${CXX-"c++"} |
| 9212 | + CFLAGS=$CXXFLAGS |
| 9213 | compiler=$CC |
| 9214 | compiler_CXX=$CC |
| 9215 | for cc_temp in $compiler""; do |
| 9216 | @@ -13065,7 +13726,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 9217 | allow_undefined_flag_CXX='-berok' |
| 9218 | # Determine the default libpath from the value encoded in an empty |
| 9219 | # executable. |
| 9220 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9221 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 9222 | + aix_libpath=$lt_cv_aix_libpath |
| 9223 | +else |
| 9224 | + if ${lt_cv_aix_libpath__CXX+:} false; then : |
| 9225 | + $as_echo_n "(cached) " >&6 |
| 9226 | +else |
| 9227 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9228 | /* end confdefs.h. */ |
| 9229 | |
| 9230 | int |
| 9231 | @@ -13078,22 +13745,29 @@ main () |
| 9232 | _ACEOF |
| 9233 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 9234 | |
| 9235 | -lt_aix_libpath_sed=' |
| 9236 | - /Import File Strings/,/^$/ { |
| 9237 | - /^0/ { |
| 9238 | - s/^0 *\(.*\)$/\1/ |
| 9239 | - p |
| 9240 | - } |
| 9241 | - }' |
| 9242 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9243 | -# Check for a 64-bit object if we didn't find anything. |
| 9244 | -if test -z "$aix_libpath"; then |
| 9245 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9246 | -fi |
| 9247 | + lt_aix_libpath_sed=' |
| 9248 | + /Import File Strings/,/^$/ { |
| 9249 | + /^0/ { |
| 9250 | + s/^0 *\([^ ]*\) *$/\1/ |
| 9251 | + p |
| 9252 | + } |
| 9253 | + }' |
| 9254 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9255 | + # Check for a 64-bit object if we didn't find anything. |
| 9256 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9257 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9258 | + fi |
| 9259 | fi |
| 9260 | rm -f core conftest.err conftest.$ac_objext \ |
| 9261 | conftest$ac_exeext conftest.$ac_ext |
| 9262 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9263 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9264 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 9265 | + fi |
| 9266 | + |
| 9267 | +fi |
| 9268 | + |
| 9269 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 9270 | +fi |
| 9271 | |
| 9272 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 9273 | |
| 9274 | @@ -13106,7 +13780,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9275 | else |
| 9276 | # Determine the default libpath from the value encoded in an |
| 9277 | # empty executable. |
| 9278 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9279 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 9280 | + aix_libpath=$lt_cv_aix_libpath |
| 9281 | +else |
| 9282 | + if ${lt_cv_aix_libpath__CXX+:} false; then : |
| 9283 | + $as_echo_n "(cached) " >&6 |
| 9284 | +else |
| 9285 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9286 | /* end confdefs.h. */ |
| 9287 | |
| 9288 | int |
| 9289 | @@ -13119,22 +13799,29 @@ main () |
| 9290 | _ACEOF |
| 9291 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 9292 | |
| 9293 | -lt_aix_libpath_sed=' |
| 9294 | - /Import File Strings/,/^$/ { |
| 9295 | - /^0/ { |
| 9296 | - s/^0 *\(.*\)$/\1/ |
| 9297 | - p |
| 9298 | - } |
| 9299 | - }' |
| 9300 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9301 | -# Check for a 64-bit object if we didn't find anything. |
| 9302 | -if test -z "$aix_libpath"; then |
| 9303 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9304 | -fi |
| 9305 | + lt_aix_libpath_sed=' |
| 9306 | + /Import File Strings/,/^$/ { |
| 9307 | + /^0/ { |
| 9308 | + s/^0 *\([^ ]*\) *$/\1/ |
| 9309 | + p |
| 9310 | + } |
| 9311 | + }' |
| 9312 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9313 | + # Check for a 64-bit object if we didn't find anything. |
| 9314 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9315 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9316 | + fi |
| 9317 | fi |
| 9318 | rm -f core conftest.err conftest.$ac_objext \ |
| 9319 | conftest$ac_exeext conftest.$ac_ext |
| 9320 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9321 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9322 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 9323 | + fi |
| 9324 | + |
| 9325 | +fi |
| 9326 | + |
| 9327 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 9328 | +fi |
| 9329 | |
| 9330 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 9331 | # Warning - without using the other run time loading flags, |
| 9332 | @@ -13177,29 +13864,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9333 | ;; |
| 9334 | |
| 9335 | cygwin* | mingw* | pw32* | cegcc*) |
| 9336 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 9337 | - # as there is no search path for DLLs. |
| 9338 | - hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 9339 | - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 9340 | - allow_undefined_flag_CXX=unsupported |
| 9341 | - always_export_symbols_CXX=no |
| 9342 | - enable_shared_with_static_runtimes_CXX=yes |
| 9343 | - |
| 9344 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 9345 | - archive_cmds_CXX='$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' |
| 9346 | - # If the export-symbols file already is a .def file (1st line |
| 9347 | - # is EXPORTS), use it as is; otherwise, prepend... |
| 9348 | - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9349 | - cp $export_symbols $output_objdir/$soname.def; |
| 9350 | - else |
| 9351 | - echo EXPORTS > $output_objdir/$soname.def; |
| 9352 | - cat $export_symbols >> $output_objdir/$soname.def; |
| 9353 | - fi~ |
| 9354 | - $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' |
| 9355 | - else |
| 9356 | - ld_shlibs_CXX=no |
| 9357 | - fi |
| 9358 | - ;; |
| 9359 | + case $GXX,$cc_basename in |
| 9360 | + ,cl* | no,cl*) |
| 9361 | + # Native MSVC |
| 9362 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 9363 | + # no search path for DLLs. |
| 9364 | + hardcode_libdir_flag_spec_CXX=' ' |
| 9365 | + allow_undefined_flag_CXX=unsupported |
| 9366 | + always_export_symbols_CXX=yes |
| 9367 | + file_list_spec_CXX='@' |
| 9368 | + # Tell ltmain to make .lib files, not .a files. |
| 9369 | + libext=lib |
| 9370 | + # Tell ltmain to make .dll files, not .so files. |
| 9371 | + shrext_cmds=".dll" |
| 9372 | + # FIXME: Setting linknames here is a bad hack. |
| 9373 | + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 9374 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9375 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 9376 | + else |
| 9377 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 9378 | + fi~ |
| 9379 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 9380 | + linknames=' |
| 9381 | + # The linker will not automatically build a static lib if we build a DLL. |
| 9382 | + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' |
| 9383 | + enable_shared_with_static_runtimes_CXX=yes |
| 9384 | + # Don't use ranlib |
| 9385 | + old_postinstall_cmds_CXX='chmod 644 $oldlib' |
| 9386 | + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ |
| 9387 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 9388 | + case $lt_outputfile in |
| 9389 | + *.exe|*.EXE) ;; |
| 9390 | + *) |
| 9391 | + lt_outputfile="$lt_outputfile.exe" |
| 9392 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 9393 | + ;; |
| 9394 | + esac~ |
| 9395 | + func_to_tool_file "$lt_outputfile"~ |
| 9396 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 9397 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 9398 | + $RM "$lt_outputfile.manifest"; |
| 9399 | + fi' |
| 9400 | + ;; |
| 9401 | + *) |
| 9402 | + # g++ |
| 9403 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 9404 | + # as there is no search path for DLLs. |
| 9405 | + hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 9406 | + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 9407 | + allow_undefined_flag_CXX=unsupported |
| 9408 | + always_export_symbols_CXX=no |
| 9409 | + enable_shared_with_static_runtimes_CXX=yes |
| 9410 | + |
| 9411 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 9412 | + archive_cmds_CXX='$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' |
| 9413 | + # If the export-symbols file already is a .def file (1st line |
| 9414 | + # is EXPORTS), use it as is; otherwise, prepend... |
| 9415 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9416 | + cp $export_symbols $output_objdir/$soname.def; |
| 9417 | + else |
| 9418 | + echo EXPORTS > $output_objdir/$soname.def; |
| 9419 | + cat $export_symbols >> $output_objdir/$soname.def; |
| 9420 | + fi~ |
| 9421 | + $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' |
| 9422 | + else |
| 9423 | + ld_shlibs_CXX=no |
| 9424 | + fi |
| 9425 | + ;; |
| 9426 | + esac |
| 9427 | + ;; |
| 9428 | darwin* | rhapsody*) |
| 9429 | |
| 9430 | |
| 9431 | @@ -13305,7 +14038,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9432 | ;; |
| 9433 | *) |
| 9434 | if test "$GXX" = yes; then |
| 9435 | - archive_cmds_CXX='$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' |
| 9436 | + archive_cmds_CXX='$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' |
| 9437 | else |
| 9438 | # FIXME: insert proper C++ library support |
| 9439 | ld_shlibs_CXX=no |
| 9440 | @@ -13376,10 +14109,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9441 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9442 | ;; |
| 9443 | ia64*) |
| 9444 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9445 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9446 | ;; |
| 9447 | *) |
| 9448 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9449 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9450 | ;; |
| 9451 | esac |
| 9452 | fi |
| 9453 | @@ -13420,9 +14153,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9454 | *) |
| 9455 | if test "$GXX" = yes; then |
| 9456 | if test "$with_gnu_ld" = no; then |
| 9457 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9458 | + archive_cmds_CXX='$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' |
| 9459 | else |
| 9460 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
| 9461 | + archive_cmds_CXX='$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' |
| 9462 | fi |
| 9463 | fi |
| 9464 | link_all_deplibs_CXX=yes |
| 9465 | @@ -13492,20 +14225,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9466 | prelink_cmds_CXX='tpldir=Template.dir~ |
| 9467 | rm -rf $tpldir~ |
| 9468 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
| 9469 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
| 9470 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
| 9471 | old_archive_cmds_CXX='tpldir=Template.dir~ |
| 9472 | rm -rf $tpldir~ |
| 9473 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
| 9474 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
| 9475 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
| 9476 | $RANLIB $oldlib' |
| 9477 | archive_cmds_CXX='tpldir=Template.dir~ |
| 9478 | rm -rf $tpldir~ |
| 9479 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 9480 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 9481 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 9482 | archive_expsym_cmds_CXX='tpldir=Template.dir~ |
| 9483 | rm -rf $tpldir~ |
| 9484 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 9485 | - $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' |
| 9486 | + $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' |
| 9487 | ;; |
| 9488 | *) # Version 6 and above use weak symbols |
| 9489 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 9490 | @@ -13700,7 +14433,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9491 | archive_cmds_CXX='$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' |
| 9492 | ;; |
| 9493 | *) |
| 9494 | - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9495 | + archive_cmds_CXX='$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' |
| 9496 | ;; |
| 9497 | esac |
| 9498 | |
| 9499 | @@ -13746,7 +14479,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9500 | |
| 9501 | solaris*) |
| 9502 | case $cc_basename in |
| 9503 | - CC*) |
| 9504 | + CC* | sunCC*) |
| 9505 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 9506 | archive_cmds_need_lc_CXX=yes |
| 9507 | no_undefined_flag_CXX=' -zdefs' |
| 9508 | @@ -13787,9 +14520,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9509 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
| 9510 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
| 9511 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
| 9512 | - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 9513 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 9514 | archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 9515 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 9516 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 9517 | |
| 9518 | # Commands to make compiler produce verbose output that lists |
| 9519 | # what "hidden" libraries, object files and flags are used when |
| 9520 | @@ -13924,6 +14657,13 @@ private: |
| 9521 | }; |
| 9522 | _LT_EOF |
| 9523 | |
| 9524 | + |
| 9525 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
| 9526 | +case "$CC $CFLAGS " in #( |
| 9527 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
| 9528 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
| 9529 | +esac |
| 9530 | + |
| 9531 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9532 | (eval $ac_compile) 2>&5 |
| 9533 | ac_status=$? |
| 9534 | @@ -13937,7 +14677,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9535 | pre_test_object_deps_done=no |
| 9536 | |
| 9537 | for p in `eval "$output_verbose_link_cmd"`; do |
| 9538 | - case $p in |
| 9539 | + case ${prev}${p} in |
| 9540 | |
| 9541 | -L* | -R* | -l*) |
| 9542 | # Some compilers place space between "-{L,R}" and the path. |
| 9543 | @@ -13946,13 +14686,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9544 | test $p = "-R"; then |
| 9545 | prev=$p |
| 9546 | continue |
| 9547 | - else |
| 9548 | - prev= |
| 9549 | fi |
| 9550 | |
| 9551 | + # Expand the sysroot to ease extracting the directories later. |
| 9552 | + if test -z "$prev"; then |
| 9553 | + case $p in |
| 9554 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
| 9555 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
| 9556 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
| 9557 | + esac |
| 9558 | + fi |
| 9559 | + case $p in |
| 9560 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
| 9561 | + esac |
| 9562 | if test "$pre_test_object_deps_done" = no; then |
| 9563 | - case $p in |
| 9564 | - -L* | -R*) |
| 9565 | + case ${prev} in |
| 9566 | + -L | -R) |
| 9567 | # Internal compiler library paths should come after those |
| 9568 | # provided the user. The postdeps already come after the |
| 9569 | # user supplied libs so there is no need to process them. |
| 9570 | @@ -13972,8 +14721,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9571 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
| 9572 | fi |
| 9573 | fi |
| 9574 | + prev= |
| 9575 | ;; |
| 9576 | |
| 9577 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
| 9578 | *.$objext) |
| 9579 | # This assumes that the test object file only shows up |
| 9580 | # once in the compiler output. |
| 9581 | @@ -14009,6 +14760,7 @@ else |
| 9582 | fi |
| 9583 | |
| 9584 | $RM -f confest.$objext |
| 9585 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
| 9586 | |
| 9587 | # PORTME: override above test on systems where it is broken |
| 9588 | case $host_os in |
| 9589 | @@ -14044,7 +14796,7 @@ linux*) |
| 9590 | |
| 9591 | solaris*) |
| 9592 | case $cc_basename in |
| 9593 | - CC*) |
| 9594 | + CC* | sunCC*) |
| 9595 | # The more standards-conforming stlport4 library is |
| 9596 | # incompatible with the Cstd library. Avoid specifying |
| 9597 | # it if it's in CXXFLAGS. Ignore libCrun as |
| 9598 | @@ -14109,8 +14861,6 @@ fi |
| 9599 | lt_prog_compiler_pic_CXX= |
| 9600 | lt_prog_compiler_static_CXX= |
| 9601 | |
| 9602 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 9603 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9604 | |
| 9605 | # C++ specific cases for pic, static, wl, etc. |
| 9606 | if test "$GXX" = yes; then |
| 9607 | @@ -14215,6 +14965,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9608 | ;; |
| 9609 | esac |
| 9610 | ;; |
| 9611 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
| 9612 | + # This hack is so that the source file can tell whether it is being |
| 9613 | + # built for inclusion in a dll (and should export symbols for example). |
| 9614 | + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' |
| 9615 | + ;; |
| 9616 | dgux*) |
| 9617 | case $cc_basename in |
| 9618 | ec++*) |
| 9619 | @@ -14367,7 +15122,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9620 | ;; |
| 9621 | solaris*) |
| 9622 | case $cc_basename in |
| 9623 | - CC*) |
| 9624 | + CC* | sunCC*) |
| 9625 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 9626 | lt_prog_compiler_pic_CXX='-KPIC' |
| 9627 | lt_prog_compiler_static_CXX='-Bstatic' |
| 9628 | @@ -14432,10 +15187,17 @@ case $host_os in |
| 9629 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" |
| 9630 | ;; |
| 9631 | esac |
| 9632 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 |
| 9633 | -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } |
| 9634 | - |
| 9635 | |
| 9636 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 9637 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9638 | +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : |
| 9639 | + $as_echo_n "(cached) " >&6 |
| 9640 | +else |
| 9641 | + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX |
| 9642 | +fi |
| 9643 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 |
| 9644 | +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } |
| 9645 | +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX |
| 9646 | |
| 9647 | # |
| 9648 | # Check to make sure the PIC flag actually works. |
| 9649 | @@ -14493,6 +15255,8 @@ fi |
| 9650 | |
| 9651 | |
| 9652 | |
| 9653 | + |
| 9654 | + |
| 9655 | # |
| 9656 | # Check to make sure the static flag actually works. |
| 9657 | # |
| 9658 | @@ -14670,6 +15434,7 @@ fi |
| 9659 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 9660 | |
| 9661 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 9662 | + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 9663 | case $host_os in |
| 9664 | aix[4-9]*) |
| 9665 | # If we're using GNU nm, then we don't want the "-C" option. |
| 9666 | @@ -14684,15 +15449,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 9667 | ;; |
| 9668 | pw32*) |
| 9669 | export_symbols_cmds_CXX="$ltdll_cmds" |
| 9670 | - ;; |
| 9671 | + ;; |
| 9672 | cygwin* | mingw* | cegcc*) |
| 9673 | - export_symbols_cmds_CXX='$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' |
| 9674 | - ;; |
| 9675 | + case $cc_basename in |
| 9676 | + cl*) ;; |
| 9677 | + *) |
| 9678 | + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 9679 | + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 9680 | + ;; |
| 9681 | + esac |
| 9682 | + ;; |
| 9683 | *) |
| 9684 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 9685 | - ;; |
| 9686 | + ;; |
| 9687 | esac |
| 9688 | - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 9689 | |
| 9690 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 |
| 9691 | $as_echo "$ld_shlibs_CXX" >&6; } |
| 9692 | @@ -14955,8 +15725,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 9693 | need_version=no |
| 9694 | need_lib_prefix=no |
| 9695 | |
| 9696 | - case $GCC,$host_os in |
| 9697 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 9698 | + case $GCC,$cc_basename in |
| 9699 | + yes,*) |
| 9700 | + # gcc |
| 9701 | library_names_spec='$libname.dll.a' |
| 9702 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9703 | postinstall_cmds='base_file=`basename \${file}`~ |
| 9704 | @@ -14988,13 +15759,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 9705 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 9706 | ;; |
| 9707 | esac |
| 9708 | + dynamic_linker='Win32 ld.exe' |
| 9709 | + ;; |
| 9710 | + |
| 9711 | + *,cl*) |
| 9712 | + # Native MSVC |
| 9713 | + libname_spec='$name' |
| 9714 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 9715 | + library_names_spec='${libname}.dll.lib' |
| 9716 | + |
| 9717 | + case $build_os in |
| 9718 | + mingw*) |
| 9719 | + sys_lib_search_path_spec= |
| 9720 | + lt_save_ifs=$IFS |
| 9721 | + IFS=';' |
| 9722 | + for lt_path in $LIB |
| 9723 | + do |
| 9724 | + IFS=$lt_save_ifs |
| 9725 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 9726 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 9727 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 9728 | + done |
| 9729 | + IFS=$lt_save_ifs |
| 9730 | + # Convert to MSYS style. |
| 9731 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 9732 | + ;; |
| 9733 | + cygwin*) |
| 9734 | + # Convert to unix form, then to dos form, then back to unix form |
| 9735 | + # but this time dos style (no spaces!) so that the unix form looks |
| 9736 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 9737 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 9738 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 9739 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9740 | + ;; |
| 9741 | + *) |
| 9742 | + sys_lib_search_path_spec="$LIB" |
| 9743 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 9744 | + # It is most probably a Windows format PATH. |
| 9745 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 9746 | + else |
| 9747 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9748 | + fi |
| 9749 | + # FIXME: find the short name or the path components, as spaces are |
| 9750 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 9751 | + ;; |
| 9752 | + esac |
| 9753 | + |
| 9754 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9755 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 9756 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 9757 | + dldir=$destdir/`dirname \$dlpath`~ |
| 9758 | + test -d \$dldir || mkdir -p \$dldir~ |
| 9759 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 9760 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 9761 | + dlpath=$dir/\$dldll~ |
| 9762 | + $RM \$dlpath' |
| 9763 | + shlibpath_overrides_runpath=yes |
| 9764 | + dynamic_linker='Win32 link.exe' |
| 9765 | ;; |
| 9766 | |
| 9767 | *) |
| 9768 | + # Assume MSVC wrapper |
| 9769 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 9770 | + dynamic_linker='Win32 ld.exe' |
| 9771 | ;; |
| 9772 | esac |
| 9773 | - dynamic_linker='Win32 ld.exe' |
| 9774 | # FIXME: first we should search . and the directory the executable is in |
| 9775 | shlibpath_var=PATH |
| 9776 | ;; |
| 9777 | @@ -15534,6 +16363,7 @@ fi |
| 9778 | fi # test -n "$compiler" |
| 9779 | |
| 9780 | CC=$lt_save_CC |
| 9781 | + CFLAGS=$lt_save_CFLAGS |
| 9782 | LDCXX=$LD |
| 9783 | LD=$lt_save_LD |
| 9784 | GCC=$lt_save_GCC |
| 9785 | @@ -17663,13 +18493,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 9786 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 9787 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 9788 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 9789 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 9790 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 9791 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 9792 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 9793 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 9794 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 9795 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 9796 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 9797 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 9798 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 9799 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 9800 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 9801 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 9802 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9803 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 9804 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 9805 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 9806 | @@ -17684,14 +18521,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 9807 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 9808 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 9809 | 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"`' |
| 9810 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9811 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 9812 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 9813 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 9814 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 9815 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 9816 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 9817 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 9818 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 9819 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 9820 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 9821 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 9822 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 9823 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 9824 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 9825 | @@ -17724,12 +18564,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 9826 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 9827 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 9828 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 9829 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 9830 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 9831 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 9832 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 9833 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 9834 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 9835 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 9836 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9837 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 9838 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 9839 | @@ -17768,8 +18608,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
| 9840 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
| 9841 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
| 9842 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
| 9843 | -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 9844 | lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' |
| 9845 | +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 9846 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
| 9847 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
| 9848 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
| 9849 | @@ -17796,12 +18636,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
| 9850 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
| 9851 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
| 9852 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
| 9853 | -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' |
| 9854 | always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' |
| 9855 | export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9856 | exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 9857 | include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 9858 | prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9859 | +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9860 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
| 9861 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
| 9862 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
| 9863 | @@ -17839,8 +18679,13 @@ reload_flag \ |
| 9864 | OBJDUMP \ |
| 9865 | deplibs_check_method \ |
| 9866 | file_magic_cmd \ |
| 9867 | +file_magic_glob \ |
| 9868 | +want_nocaseglob \ |
| 9869 | +DLLTOOL \ |
| 9870 | +sharedlib_from_linklib_cmd \ |
| 9871 | AR \ |
| 9872 | AR_FLAGS \ |
| 9873 | +archiver_list_spec \ |
| 9874 | STRIP \ |
| 9875 | RANLIB \ |
| 9876 | CC \ |
| 9877 | @@ -17850,12 +18695,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 9878 | lt_cv_sys_global_symbol_to_cdecl \ |
| 9879 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 9880 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 9881 | +nm_file_list_spec \ |
| 9882 | lt_prog_compiler_no_builtin_flag \ |
| 9883 | -lt_prog_compiler_wl \ |
| 9884 | lt_prog_compiler_pic \ |
| 9885 | +lt_prog_compiler_wl \ |
| 9886 | lt_prog_compiler_static \ |
| 9887 | lt_cv_prog_compiler_c_o \ |
| 9888 | need_locks \ |
| 9889 | +MANIFEST_TOOL \ |
| 9890 | DSYMUTIL \ |
| 9891 | NMEDIT \ |
| 9892 | LIPO \ |
| 9893 | @@ -17871,7 +18718,6 @@ no_undefined_flag \ |
| 9894 | hardcode_libdir_flag_spec \ |
| 9895 | hardcode_libdir_flag_spec_ld \ |
| 9896 | hardcode_libdir_separator \ |
| 9897 | -fix_srcfile_path \ |
| 9898 | exclude_expsyms \ |
| 9899 | include_expsyms \ |
| 9900 | file_list_spec \ |
| 9901 | @@ -17893,8 +18739,8 @@ LD_CXX \ |
| 9902 | reload_flag_CXX \ |
| 9903 | compiler_CXX \ |
| 9904 | lt_prog_compiler_no_builtin_flag_CXX \ |
| 9905 | -lt_prog_compiler_wl_CXX \ |
| 9906 | lt_prog_compiler_pic_CXX \ |
| 9907 | +lt_prog_compiler_wl_CXX \ |
| 9908 | lt_prog_compiler_static_CXX \ |
| 9909 | lt_cv_prog_compiler_c_o_CXX \ |
| 9910 | export_dynamic_flag_spec_CXX \ |
| 9911 | @@ -17906,7 +18752,6 @@ no_undefined_flag_CXX \ |
| 9912 | hardcode_libdir_flag_spec_CXX \ |
| 9913 | hardcode_libdir_flag_spec_ld_CXX \ |
| 9914 | hardcode_libdir_separator_CXX \ |
| 9915 | -fix_srcfile_path_CXX \ |
| 9916 | exclude_expsyms_CXX \ |
| 9917 | include_expsyms_CXX \ |
| 9918 | file_list_spec_CXX \ |
| 9919 | @@ -17940,6 +18785,7 @@ module_cmds \ |
| 9920 | module_expsym_cmds \ |
| 9921 | export_symbols_cmds \ |
| 9922 | prelink_cmds \ |
| 9923 | +postlink_cmds \ |
| 9924 | postinstall_cmds \ |
| 9925 | postuninstall_cmds \ |
| 9926 | finish_cmds \ |
| 9927 | @@ -17954,7 +18800,8 @@ archive_expsym_cmds_CXX \ |
| 9928 | module_cmds_CXX \ |
| 9929 | module_expsym_cmds_CXX \ |
| 9930 | export_symbols_cmds_CXX \ |
| 9931 | -prelink_cmds_CXX; do |
| 9932 | +prelink_cmds_CXX \ |
| 9933 | +postlink_cmds_CXX; do |
| 9934 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
| 9935 | *[\\\\\\\`\\"\\\$]*) |
| 9936 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
| 9937 | @@ -18711,7 +19558,8 @@ $as_echo X"$file" | |
| 9938 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 9939 | # |
| 9940 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 9941 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 9942 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 9943 | +# Inc. |
| 9944 | # Written by Gordon Matzigkeit, 1996 |
| 9945 | # |
| 9946 | # This file is part of GNU Libtool. |
| 9947 | @@ -18814,19 +19662,42 @@ SP2NL=$lt_lt_SP2NL |
| 9948 | # turn newlines into spaces. |
| 9949 | NL2SP=$lt_lt_NL2SP |
| 9950 | |
| 9951 | +# convert \$build file names to \$host format. |
| 9952 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 9953 | + |
| 9954 | +# convert \$build files to toolchain format. |
| 9955 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 9956 | + |
| 9957 | # An object symbol dumper. |
| 9958 | OBJDUMP=$lt_OBJDUMP |
| 9959 | |
| 9960 | # Method to check whether dependent libraries are shared objects. |
| 9961 | deplibs_check_method=$lt_deplibs_check_method |
| 9962 | |
| 9963 | -# Command to use when deplibs_check_method == "file_magic". |
| 9964 | +# Command to use when deplibs_check_method = "file_magic". |
| 9965 | file_magic_cmd=$lt_file_magic_cmd |
| 9966 | |
| 9967 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 9968 | +file_magic_glob=$lt_file_magic_glob |
| 9969 | + |
| 9970 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 9971 | +want_nocaseglob=$lt_want_nocaseglob |
| 9972 | + |
| 9973 | +# DLL creation program. |
| 9974 | +DLLTOOL=$lt_DLLTOOL |
| 9975 | + |
| 9976 | +# Command to associate shared and link libraries. |
| 9977 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 9978 | + |
| 9979 | # The archiver. |
| 9980 | AR=$lt_AR |
| 9981 | + |
| 9982 | +# Flags to create an archive. |
| 9983 | AR_FLAGS=$lt_AR_FLAGS |
| 9984 | |
| 9985 | +# How to feed a file listing to the archiver. |
| 9986 | +archiver_list_spec=$lt_archiver_list_spec |
| 9987 | + |
| 9988 | # A symbol stripping program. |
| 9989 | STRIP=$lt_STRIP |
| 9990 | |
| 9991 | @@ -18856,6 +19727,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 9992 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 9993 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 9994 | |
| 9995 | +# Specify filename containing input files for \$NM. |
| 9996 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 9997 | + |
| 9998 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 9999 | +lt_sysroot=$lt_sysroot |
| 10000 | + |
| 10001 | # The name of the directory that contains temporary libtool files. |
| 10002 | objdir=$objdir |
| 10003 | |
| 10004 | @@ -18865,6 +19742,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 10005 | # Must we lock files when doing compilation? |
| 10006 | need_locks=$lt_need_locks |
| 10007 | |
| 10008 | +# Manifest tool. |
| 10009 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 10010 | + |
| 10011 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 10012 | DSYMUTIL=$lt_DSYMUTIL |
| 10013 | |
| 10014 | @@ -18979,12 +19859,12 @@ with_gcc=$GCC |
| 10015 | # Compiler flag to turn off builtin functions. |
| 10016 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 10017 | |
| 10018 | -# How to pass a linker flag through the compiler. |
| 10019 | -wl=$lt_lt_prog_compiler_wl |
| 10020 | - |
| 10021 | # Additional compiler flags for building library objects. |
| 10022 | pic_flag=$lt_lt_prog_compiler_pic |
| 10023 | |
| 10024 | +# How to pass a linker flag through the compiler. |
| 10025 | +wl=$lt_lt_prog_compiler_wl |
| 10026 | + |
| 10027 | # Compiler flag to prevent dynamic linking. |
| 10028 | link_static_flag=$lt_lt_prog_compiler_static |
| 10029 | |
| 10030 | @@ -19071,9 +19951,6 @@ inherit_rpath=$inherit_rpath |
| 10031 | # Whether libtool must link a program against all its dependency libraries. |
| 10032 | link_all_deplibs=$link_all_deplibs |
| 10033 | |
| 10034 | -# Fix the shell variable \$srcfile for the compiler. |
| 10035 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 10036 | - |
| 10037 | # Set to "yes" if exported symbols are required. |
| 10038 | always_export_symbols=$always_export_symbols |
| 10039 | |
| 10040 | @@ -19089,6 +19966,9 @@ include_expsyms=$lt_include_expsyms |
| 10041 | # Commands necessary for linking programs (against libraries) with templates. |
| 10042 | prelink_cmds=$lt_prelink_cmds |
| 10043 | |
| 10044 | +# Commands necessary for finishing linking programs. |
| 10045 | +postlink_cmds=$lt_postlink_cmds |
| 10046 | + |
| 10047 | # Specify filename containing input files. |
| 10048 | file_list_spec=$lt_file_list_spec |
| 10049 | |
| 10050 | @@ -19135,210 +20015,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 10051 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 10052 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 10053 | # is reportedly fixed, but why not run on old versions too? |
| 10054 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 10055 | - || (rm -f "$cfgfile"; exit 1) |
| 10056 | - |
| 10057 | - case $xsi_shell in |
| 10058 | - yes) |
| 10059 | - cat << \_LT_EOF >> "$cfgfile" |
| 10060 | - |
| 10061 | -# func_dirname file append nondir_replacement |
| 10062 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 10063 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 10064 | -func_dirname () |
| 10065 | -{ |
| 10066 | - case ${1} in |
| 10067 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 10068 | - * ) func_dirname_result="${3}" ;; |
| 10069 | - esac |
| 10070 | -} |
| 10071 | - |
| 10072 | -# func_basename file |
| 10073 | -func_basename () |
| 10074 | -{ |
| 10075 | - func_basename_result="${1##*/}" |
| 10076 | -} |
| 10077 | - |
| 10078 | -# func_dirname_and_basename file append nondir_replacement |
| 10079 | -# perform func_basename and func_dirname in a single function |
| 10080 | -# call: |
| 10081 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 10082 | -# add APPEND to the result, otherwise set result |
| 10083 | -# to NONDIR_REPLACEMENT. |
| 10084 | -# value returned in "$func_dirname_result" |
| 10085 | -# basename: Compute filename of FILE. |
| 10086 | -# value retuned in "$func_basename_result" |
| 10087 | -# Implementation must be kept synchronized with func_dirname |
| 10088 | -# and func_basename. For efficiency, we do not delegate to |
| 10089 | -# those functions but instead duplicate the functionality here. |
| 10090 | -func_dirname_and_basename () |
| 10091 | -{ |
| 10092 | - case ${1} in |
| 10093 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 10094 | - * ) func_dirname_result="${3}" ;; |
| 10095 | - esac |
| 10096 | - func_basename_result="${1##*/}" |
| 10097 | -} |
| 10098 | - |
| 10099 | -# func_stripname prefix suffix name |
| 10100 | -# strip PREFIX and SUFFIX off of NAME. |
| 10101 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 10102 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 10103 | -# dot (in which case that matches only a dot). |
| 10104 | -func_stripname () |
| 10105 | -{ |
| 10106 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 10107 | - # positional parameters, so assign one to ordinary parameter first. |
| 10108 | - func_stripname_result=${3} |
| 10109 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 10110 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 10111 | -} |
| 10112 | - |
| 10113 | -# func_opt_split |
| 10114 | -func_opt_split () |
| 10115 | -{ |
| 10116 | - func_opt_split_opt=${1%%=*} |
| 10117 | - func_opt_split_arg=${1#*=} |
| 10118 | -} |
| 10119 | - |
| 10120 | -# func_lo2o object |
| 10121 | -func_lo2o () |
| 10122 | -{ |
| 10123 | - case ${1} in |
| 10124 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 10125 | - *) func_lo2o_result=${1} ;; |
| 10126 | - esac |
| 10127 | -} |
| 10128 | - |
| 10129 | -# func_xform libobj-or-source |
| 10130 | -func_xform () |
| 10131 | -{ |
| 10132 | - func_xform_result=${1%.*}.lo |
| 10133 | -} |
| 10134 | - |
| 10135 | -# func_arith arithmetic-term... |
| 10136 | -func_arith () |
| 10137 | -{ |
| 10138 | - func_arith_result=$(( $* )) |
| 10139 | -} |
| 10140 | - |
| 10141 | -# func_len string |
| 10142 | -# STRING may not start with a hyphen. |
| 10143 | -func_len () |
| 10144 | -{ |
| 10145 | - func_len_result=${#1} |
| 10146 | -} |
| 10147 | - |
| 10148 | -_LT_EOF |
| 10149 | - ;; |
| 10150 | - *) # Bourne compatible functions. |
| 10151 | - cat << \_LT_EOF >> "$cfgfile" |
| 10152 | - |
| 10153 | -# func_dirname file append nondir_replacement |
| 10154 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 10155 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 10156 | -func_dirname () |
| 10157 | -{ |
| 10158 | - # Extract subdirectory from the argument. |
| 10159 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 10160 | - if test "X$func_dirname_result" = "X${1}"; then |
| 10161 | - func_dirname_result="${3}" |
| 10162 | - else |
| 10163 | - func_dirname_result="$func_dirname_result${2}" |
| 10164 | - fi |
| 10165 | -} |
| 10166 | - |
| 10167 | -# func_basename file |
| 10168 | -func_basename () |
| 10169 | -{ |
| 10170 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 10171 | -} |
| 10172 | - |
| 10173 | - |
| 10174 | -# func_stripname prefix suffix name |
| 10175 | -# strip PREFIX and SUFFIX off of NAME. |
| 10176 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 10177 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 10178 | -# dot (in which case that matches only a dot). |
| 10179 | -# func_strip_suffix prefix name |
| 10180 | -func_stripname () |
| 10181 | -{ |
| 10182 | - case ${2} in |
| 10183 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 10184 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 10185 | - esac |
| 10186 | -} |
| 10187 | - |
| 10188 | -# sed scripts: |
| 10189 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 10190 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 10191 | - |
| 10192 | -# func_opt_split |
| 10193 | -func_opt_split () |
| 10194 | -{ |
| 10195 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 10196 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 10197 | -} |
| 10198 | - |
| 10199 | -# func_lo2o object |
| 10200 | -func_lo2o () |
| 10201 | -{ |
| 10202 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 10203 | -} |
| 10204 | - |
| 10205 | -# func_xform libobj-or-source |
| 10206 | -func_xform () |
| 10207 | -{ |
| 10208 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 10209 | -} |
| 10210 | - |
| 10211 | -# func_arith arithmetic-term... |
| 10212 | -func_arith () |
| 10213 | -{ |
| 10214 | - func_arith_result=`expr "$@"` |
| 10215 | -} |
| 10216 | - |
| 10217 | -# func_len string |
| 10218 | -# STRING may not start with a hyphen. |
| 10219 | -func_len () |
| 10220 | -{ |
| 10221 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 10222 | -} |
| 10223 | - |
| 10224 | -_LT_EOF |
| 10225 | -esac |
| 10226 | - |
| 10227 | -case $lt_shell_append in |
| 10228 | - yes) |
| 10229 | - cat << \_LT_EOF >> "$cfgfile" |
| 10230 | - |
| 10231 | -# func_append var value |
| 10232 | -# Append VALUE to the end of shell variable VAR. |
| 10233 | -func_append () |
| 10234 | -{ |
| 10235 | - eval "$1+=\$2" |
| 10236 | -} |
| 10237 | -_LT_EOF |
| 10238 | - ;; |
| 10239 | - *) |
| 10240 | - cat << \_LT_EOF >> "$cfgfile" |
| 10241 | - |
| 10242 | -# func_append var value |
| 10243 | -# Append VALUE to the end of shell variable VAR. |
| 10244 | -func_append () |
| 10245 | -{ |
| 10246 | - eval "$1=\$$1\$2" |
| 10247 | -} |
| 10248 | - |
| 10249 | -_LT_EOF |
| 10250 | - ;; |
| 10251 | - esac |
| 10252 | - |
| 10253 | - |
| 10254 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 10255 | - || (rm -f "$cfgfile"; exit 1) |
| 10256 | - |
| 10257 | - mv -f "$cfgfile" "$ofile" || |
| 10258 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 10259 | + || (rm -f "$cfgfile"; exit 1) |
| 10260 | + |
| 10261 | + if test x"$xsi_shell" = xyes; then |
| 10262 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 10263 | +func_dirname ()\ |
| 10264 | +{\ |
| 10265 | +\ case ${1} in\ |
| 10266 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 10267 | +\ * ) func_dirname_result="${3}" ;;\ |
| 10268 | +\ esac\ |
| 10269 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10270 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10271 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10272 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10273 | + |
| 10274 | + |
| 10275 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 10276 | +func_basename ()\ |
| 10277 | +{\ |
| 10278 | +\ func_basename_result="${1##*/}"\ |
| 10279 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10280 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10281 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10282 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10283 | + |
| 10284 | + |
| 10285 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 10286 | +func_dirname_and_basename ()\ |
| 10287 | +{\ |
| 10288 | +\ case ${1} in\ |
| 10289 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 10290 | +\ * ) func_dirname_result="${3}" ;;\ |
| 10291 | +\ esac\ |
| 10292 | +\ func_basename_result="${1##*/}"\ |
| 10293 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10294 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10295 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10296 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10297 | + |
| 10298 | + |
| 10299 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 10300 | +func_stripname ()\ |
| 10301 | +{\ |
| 10302 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 10303 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 10304 | +\ func_stripname_result=${3}\ |
| 10305 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 10306 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 10307 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10308 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10309 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10310 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10311 | + |
| 10312 | + |
| 10313 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 10314 | +func_split_long_opt ()\ |
| 10315 | +{\ |
| 10316 | +\ func_split_long_opt_name=${1%%=*}\ |
| 10317 | +\ func_split_long_opt_arg=${1#*=}\ |
| 10318 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10319 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10320 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10321 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10322 | + |
| 10323 | + |
| 10324 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 10325 | +func_split_short_opt ()\ |
| 10326 | +{\ |
| 10327 | +\ func_split_short_opt_arg=${1#??}\ |
| 10328 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 10329 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10330 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10331 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10332 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10333 | + |
| 10334 | + |
| 10335 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 10336 | +func_lo2o ()\ |
| 10337 | +{\ |
| 10338 | +\ case ${1} in\ |
| 10339 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 10340 | +\ *) func_lo2o_result=${1} ;;\ |
| 10341 | +\ esac\ |
| 10342 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10343 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10344 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10345 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10346 | + |
| 10347 | + |
| 10348 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 10349 | +func_xform ()\ |
| 10350 | +{\ |
| 10351 | + func_xform_result=${1%.*}.lo\ |
| 10352 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10353 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10354 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10355 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10356 | + |
| 10357 | + |
| 10358 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 10359 | +func_arith ()\ |
| 10360 | +{\ |
| 10361 | + func_arith_result=$(( $* ))\ |
| 10362 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10363 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10364 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10365 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10366 | + |
| 10367 | + |
| 10368 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 10369 | +func_len ()\ |
| 10370 | +{\ |
| 10371 | + func_len_result=${#1}\ |
| 10372 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10373 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10374 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10375 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10376 | + |
| 10377 | +fi |
| 10378 | + |
| 10379 | +if test x"$lt_shell_append" = xyes; then |
| 10380 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 10381 | +func_append ()\ |
| 10382 | +{\ |
| 10383 | + eval "${1}+=\\${2}"\ |
| 10384 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10385 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10386 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10387 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10388 | + |
| 10389 | + |
| 10390 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 10391 | +func_append_quoted ()\ |
| 10392 | +{\ |
| 10393 | +\ func_quote_for_eval "${2}"\ |
| 10394 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 10395 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10396 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10397 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10398 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10399 | + |
| 10400 | + |
| 10401 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 10402 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 10403 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10404 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10405 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 10406 | +else |
| 10407 | + # Save a `func_append' function call even when '+=' is not available |
| 10408 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 10409 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10410 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10411 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 10412 | +fi |
| 10413 | + |
| 10414 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 10415 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 10416 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 10417 | +fi |
| 10418 | + |
| 10419 | + |
| 10420 | + mv -f "$cfgfile" "$ofile" || |
| 10421 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 10422 | chmod +x "$ofile" |
| 10423 | |
| 10424 | @@ -19366,12 +20205,12 @@ with_gcc=$GCC_CXX |
| 10425 | # Compiler flag to turn off builtin functions. |
| 10426 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
| 10427 | |
| 10428 | -# How to pass a linker flag through the compiler. |
| 10429 | -wl=$lt_lt_prog_compiler_wl_CXX |
| 10430 | - |
| 10431 | # Additional compiler flags for building library objects. |
| 10432 | pic_flag=$lt_lt_prog_compiler_pic_CXX |
| 10433 | |
| 10434 | +# How to pass a linker flag through the compiler. |
| 10435 | +wl=$lt_lt_prog_compiler_wl_CXX |
| 10436 | + |
| 10437 | # Compiler flag to prevent dynamic linking. |
| 10438 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
| 10439 | |
| 10440 | @@ -19458,9 +20297,6 @@ inherit_rpath=$inherit_rpath_CXX |
| 10441 | # Whether libtool must link a program against all its dependency libraries. |
| 10442 | link_all_deplibs=$link_all_deplibs_CXX |
| 10443 | |
| 10444 | -# Fix the shell variable \$srcfile for the compiler. |
| 10445 | -fix_srcfile_path=$lt_fix_srcfile_path_CXX |
| 10446 | - |
| 10447 | # Set to "yes" if exported symbols are required. |
| 10448 | always_export_symbols=$always_export_symbols_CXX |
| 10449 | |
| 10450 | @@ -19476,6 +20312,9 @@ include_expsyms=$lt_include_expsyms_CXX |
| 10451 | # Commands necessary for linking programs (against libraries) with templates. |
| 10452 | prelink_cmds=$lt_prelink_cmds_CXX |
| 10453 | |
| 10454 | +# Commands necessary for finishing linking programs. |
| 10455 | +postlink_cmds=$lt_postlink_cmds_CXX |
| 10456 | + |
| 10457 | # Specify filename containing input files. |
| 10458 | file_list_spec=$lt_file_list_spec_CXX |
| 10459 | |
| 10460 | diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in |
| 10461 | index 4050586f6a8..394469e3768 100644 |
| 10462 | --- a/gprofng/doc/Makefile.in |
| 10463 | +++ b/gprofng/doc/Makefile.in |
| 10464 | @@ -237,6 +237,7 @@ CXXFLAGS = @CXXFLAGS@ |
| 10465 | CYGPATH_W = @CYGPATH_W@ |
| 10466 | DEFS = @DEFS@ |
| 10467 | DEPDIR = @DEPDIR@ |
| 10468 | +DLLTOOL = @DLLTOOL@ |
| 10469 | DSYMUTIL = @DSYMUTIL@ |
| 10470 | DUMPBIN = @DUMPBIN@ |
| 10471 | ECHO_C = @ECHO_C@ |
| 10472 | @@ -272,6 +273,7 @@ LN_S = @LN_S@ |
| 10473 | LTLIBOBJS = @LTLIBOBJS@ |
| 10474 | MAINT = @MAINT@ |
| 10475 | MAKEINFO = @MAKEINFO@ |
| 10476 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 10477 | MKDIR_P = @MKDIR_P@ |
| 10478 | NM = @NM@ |
| 10479 | NMEDIT = @NMEDIT@ |
| 10480 | diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in |
| 10481 | index 1206a79d3f0..2f763e5f760 100644 |
| 10482 | --- a/gprofng/gp-display-html/Makefile.in |
| 10483 | +++ b/gprofng/gp-display-html/Makefile.in |
| 10484 | @@ -200,6 +200,7 @@ CXXFLAGS = @CXXFLAGS@ |
| 10485 | CYGPATH_W = @CYGPATH_W@ |
| 10486 | DEFS = @DEFS@ |
| 10487 | DEPDIR = @DEPDIR@ |
| 10488 | +DLLTOOL = @DLLTOOL@ |
| 10489 | DSYMUTIL = @DSYMUTIL@ |
| 10490 | DUMPBIN = @DUMPBIN@ |
| 10491 | ECHO_C = @ECHO_C@ |
| 10492 | @@ -235,6 +236,7 @@ LN_S = @LN_S@ |
| 10493 | LTLIBOBJS = @LTLIBOBJS@ |
| 10494 | MAINT = @MAINT@ |
| 10495 | MAKEINFO = @MAKEINFO@ |
| 10496 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 10497 | MKDIR_P = @MKDIR_P@ |
| 10498 | NM = @NM@ |
| 10499 | NMEDIT = @NMEDIT@ |
| 10500 | diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in |
| 10501 | index 9372c6dea78..0cf4f58c0ec 100644 |
| 10502 | --- a/gprofng/libcollector/Makefile.in |
| 10503 | +++ b/gprofng/libcollector/Makefile.in |
| 10504 | @@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@ |
| 10505 | CYGPATH_W = @CYGPATH_W@ |
| 10506 | DEFS = @DEFS@ |
| 10507 | DEPDIR = @DEPDIR@ |
| 10508 | +DLLTOOL = @DLLTOOL@ |
| 10509 | DSYMUTIL = @DSYMUTIL@ |
| 10510 | DUMPBIN = @DUMPBIN@ |
| 10511 | ECHO_C = @ECHO_C@ |
| 10512 | @@ -342,6 +343,7 @@ LN_S = @LN_S@ |
| 10513 | LTLIBOBJS = @LTLIBOBJS@ |
| 10514 | MAINT = @MAINT@ |
| 10515 | MAKEINFO = @MAKEINFO@ |
| 10516 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 10517 | MKDIR_P = @MKDIR_P@ |
| 10518 | NM = @NM@ |
| 10519 | NMEDIT = @NMEDIT@ |
| 10520 | diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure |
| 10521 | index ec38721ced2..d9daed11e3f 100755 |
| 10522 | --- a/gprofng/libcollector/configure |
| 10523 | +++ b/gprofng/libcollector/configure |
| 10524 | @@ -641,6 +641,8 @@ OTOOL |
| 10525 | LIPO |
| 10526 | NMEDIT |
| 10527 | DSYMUTIL |
| 10528 | +MANIFEST_TOOL |
| 10529 | +DLLTOOL |
| 10530 | OBJDUMP |
| 10531 | LN_S |
| 10532 | NM |
| 10533 | @@ -770,6 +772,7 @@ enable_static |
| 10534 | with_pic |
| 10535 | enable_fast_install |
| 10536 | with_gnu_ld |
| 10537 | +with_libtool_sysroot |
| 10538 | enable_libtool_lock |
| 10539 | ' |
| 10540 | ac_precious_vars='build_alias |
| 10541 | @@ -1425,6 +1428,8 @@ Optional Packages: |
| 10542 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 10543 | both] |
| 10544 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 10545 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 10546 | + (or the compiler's sysroot if not specified). |
| 10547 | |
| 10548 | Some influential environment variables: |
| 10549 | CC C compiler command |
| 10550 | @@ -5969,8 +5974,8 @@ esac |
| 10551 | |
| 10552 | |
| 10553 | |
| 10554 | -macro_version='2.2.7a' |
| 10555 | -macro_revision='1.3134' |
| 10556 | +macro_version='2.4' |
| 10557 | +macro_revision='1.3293' |
| 10558 | |
| 10559 | |
| 10560 | |
| 10561 | @@ -6010,7 +6015,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 10562 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 10563 | $as_echo_n "checking how to print strings... " >&6; } |
| 10564 | # Test print first, because it will be a builtin if present. |
| 10565 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 10566 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 10567 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 10568 | ECHO='print -r --' |
| 10569 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 10570 | @@ -6703,8 +6708,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 10571 | # Try some XSI features |
| 10572 | xsi_shell=no |
| 10573 | ( _lt_dummy="a/b/c" |
| 10574 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 10575 | - = c,a/b,, \ |
| 10576 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 10577 | + = c,a/b,b/c, \ |
| 10578 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 10579 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 10580 | && xsi_shell=yes |
| 10581 | @@ -6753,6 +6758,80 @@ esac |
| 10582 | |
| 10583 | |
| 10584 | |
| 10585 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 10586 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 10587 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 10588 | + $as_echo_n "(cached) " >&6 |
| 10589 | +else |
| 10590 | + case $host in |
| 10591 | + *-*-mingw* ) |
| 10592 | + case $build in |
| 10593 | + *-*-mingw* ) # actually msys |
| 10594 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 10595 | + ;; |
| 10596 | + *-*-cygwin* ) |
| 10597 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 10598 | + ;; |
| 10599 | + * ) # otherwise, assume *nix |
| 10600 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 10601 | + ;; |
| 10602 | + esac |
| 10603 | + ;; |
| 10604 | + *-*-cygwin* ) |
| 10605 | + case $build in |
| 10606 | + *-*-mingw* ) # actually msys |
| 10607 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 10608 | + ;; |
| 10609 | + *-*-cygwin* ) |
| 10610 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 10611 | + ;; |
| 10612 | + * ) # otherwise, assume *nix |
| 10613 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 10614 | + ;; |
| 10615 | + esac |
| 10616 | + ;; |
| 10617 | + * ) # unhandled hosts (and "normal" native builds) |
| 10618 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 10619 | + ;; |
| 10620 | +esac |
| 10621 | + |
| 10622 | +fi |
| 10623 | + |
| 10624 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 10625 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 10626 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 10627 | + |
| 10628 | + |
| 10629 | + |
| 10630 | + |
| 10631 | + |
| 10632 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 10633 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 10634 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 10635 | + $as_echo_n "(cached) " >&6 |
| 10636 | +else |
| 10637 | + #assume ordinary cross tools, or native build. |
| 10638 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 10639 | +case $host in |
| 10640 | + *-*-mingw* ) |
| 10641 | + case $build in |
| 10642 | + *-*-mingw* ) # actually msys |
| 10643 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 10644 | + ;; |
| 10645 | + esac |
| 10646 | + ;; |
| 10647 | +esac |
| 10648 | + |
| 10649 | +fi |
| 10650 | + |
| 10651 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 10652 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 10653 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 10654 | + |
| 10655 | + |
| 10656 | + |
| 10657 | + |
| 10658 | + |
| 10659 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 10660 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 10661 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 10662 | @@ -6769,6 +6848,11 @@ case $reload_flag in |
| 10663 | esac |
| 10664 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 10665 | case $host_os in |
| 10666 | + cygwin* | mingw* | pw32* | cegcc*) |
| 10667 | + if test "$GCC" != yes; then |
| 10668 | + reload_cmds=false |
| 10669 | + fi |
| 10670 | + ;; |
| 10671 | darwin*) |
| 10672 | if test "$GCC" = yes; then |
| 10673 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 10674 | @@ -6937,7 +7021,8 @@ mingw* | pw32*) |
| 10675 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 10676 | lt_cv_file_magic_cmd='func_win32_libid' |
| 10677 | else |
| 10678 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 10679 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 10680 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 10681 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 10682 | fi |
| 10683 | ;; |
| 10684 | @@ -7091,6 +7176,21 @@ esac |
| 10685 | fi |
| 10686 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 10687 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 10688 | + |
| 10689 | +file_magic_glob= |
| 10690 | +want_nocaseglob=no |
| 10691 | +if test "$build" = "$host"; then |
| 10692 | + case $host_os in |
| 10693 | + mingw* | pw32*) |
| 10694 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 10695 | + want_nocaseglob=yes |
| 10696 | + else |
| 10697 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 10698 | + fi |
| 10699 | + ;; |
| 10700 | + esac |
| 10701 | +fi |
| 10702 | + |
| 10703 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 10704 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 10705 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 10706 | @@ -7106,6 +7206,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 10707 | |
| 10708 | |
| 10709 | |
| 10710 | + |
| 10711 | + |
| 10712 | + |
| 10713 | + |
| 10714 | + |
| 10715 | + |
| 10716 | + |
| 10717 | + |
| 10718 | + |
| 10719 | + |
| 10720 | +if test -n "$ac_tool_prefix"; then |
| 10721 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 10722 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 10723 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 10724 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 10725 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 10726 | + $as_echo_n "(cached) " >&6 |
| 10727 | +else |
| 10728 | + if test -n "$DLLTOOL"; then |
| 10729 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 10730 | +else |
| 10731 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 10732 | +for as_dir in $PATH |
| 10733 | +do |
| 10734 | + IFS=$as_save_IFS |
| 10735 | + test -z "$as_dir" && as_dir=. |
| 10736 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 10737 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 10738 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 10739 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 10740 | + break 2 |
| 10741 | + fi |
| 10742 | +done |
| 10743 | + done |
| 10744 | +IFS=$as_save_IFS |
| 10745 | + |
| 10746 | +fi |
| 10747 | +fi |
| 10748 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 10749 | +if test -n "$DLLTOOL"; then |
| 10750 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 10751 | +$as_echo "$DLLTOOL" >&6; } |
| 10752 | +else |
| 10753 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 10754 | +$as_echo "no" >&6; } |
| 10755 | +fi |
| 10756 | + |
| 10757 | + |
| 10758 | +fi |
| 10759 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 10760 | + ac_ct_DLLTOOL=$DLLTOOL |
| 10761 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 10762 | +set dummy dlltool; ac_word=$2 |
| 10763 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 10764 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 10765 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 10766 | + $as_echo_n "(cached) " >&6 |
| 10767 | +else |
| 10768 | + if test -n "$ac_ct_DLLTOOL"; then |
| 10769 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 10770 | +else |
| 10771 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 10772 | +for as_dir in $PATH |
| 10773 | +do |
| 10774 | + IFS=$as_save_IFS |
| 10775 | + test -z "$as_dir" && as_dir=. |
| 10776 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 10777 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 10778 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 10779 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 10780 | + break 2 |
| 10781 | + fi |
| 10782 | +done |
| 10783 | + done |
| 10784 | +IFS=$as_save_IFS |
| 10785 | + |
| 10786 | +fi |
| 10787 | +fi |
| 10788 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 10789 | +if test -n "$ac_ct_DLLTOOL"; then |
| 10790 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 10791 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 10792 | +else |
| 10793 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 10794 | +$as_echo "no" >&6; } |
| 10795 | +fi |
| 10796 | + |
| 10797 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 10798 | + DLLTOOL="false" |
| 10799 | + else |
| 10800 | + case $cross_compiling:$ac_tool_warned in |
| 10801 | +yes:) |
| 10802 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 10803 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 10804 | +ac_tool_warned=yes ;; |
| 10805 | +esac |
| 10806 | + DLLTOOL=$ac_ct_DLLTOOL |
| 10807 | + fi |
| 10808 | +else |
| 10809 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 10810 | +fi |
| 10811 | + |
| 10812 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 10813 | + |
| 10814 | + |
| 10815 | + |
| 10816 | + |
| 10817 | + |
| 10818 | + |
| 10819 | + |
| 10820 | + |
| 10821 | + |
| 10822 | + |
| 10823 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 10824 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 10825 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 10826 | + $as_echo_n "(cached) " >&6 |
| 10827 | +else |
| 10828 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 10829 | + |
| 10830 | +case $host_os in |
| 10831 | +cygwin* | mingw* | pw32* | cegcc*) |
| 10832 | + # two different shell functions defined in ltmain.sh |
| 10833 | + # decide which to use based on capabilities of $DLLTOOL |
| 10834 | + case `$DLLTOOL --help 2>&1` in |
| 10835 | + *--identify-strict*) |
| 10836 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 10837 | + ;; |
| 10838 | + *) |
| 10839 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 10840 | + ;; |
| 10841 | + esac |
| 10842 | + ;; |
| 10843 | +*) |
| 10844 | + # fallback: assume linklib IS sharedlib |
| 10845 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 10846 | + ;; |
| 10847 | +esac |
| 10848 | + |
| 10849 | +fi |
| 10850 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 10851 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 10852 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 10853 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 10854 | + |
| 10855 | + |
| 10856 | + |
| 10857 | + |
| 10858 | + |
| 10859 | + |
| 10860 | + |
| 10861 | plugin_option= |
| 10862 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 10863 | for plugin in $plugin_names; do |
| 10864 | @@ -7120,8 +7371,10 @@ for plugin in $plugin_names; do |
| 10865 | done |
| 10866 | |
| 10867 | if test -n "$ac_tool_prefix"; then |
| 10868 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 10869 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 10870 | + for ac_prog in ar |
| 10871 | + do |
| 10872 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 10873 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 10874 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 10875 | $as_echo_n "checking for $ac_word... " >&6; } |
| 10876 | if ${ac_cv_prog_AR+:} false; then : |
| 10877 | @@ -7137,7 +7390,7 @@ do |
| 10878 | test -z "$as_dir" && as_dir=. |
| 10879 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 10880 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 10881 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 10882 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 10883 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 10884 | break 2 |
| 10885 | fi |
| 10886 | @@ -7157,11 +7410,15 @@ $as_echo "no" >&6; } |
| 10887 | fi |
| 10888 | |
| 10889 | |
| 10890 | + test -n "$AR" && break |
| 10891 | + done |
| 10892 | fi |
| 10893 | -if test -z "$ac_cv_prog_AR"; then |
| 10894 | +if test -z "$AR"; then |
| 10895 | ac_ct_AR=$AR |
| 10896 | - # Extract the first word of "ar", so it can be a program name with args. |
| 10897 | -set dummy ar; ac_word=$2 |
| 10898 | + for ac_prog in ar |
| 10899 | +do |
| 10900 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 10901 | +set dummy $ac_prog; ac_word=$2 |
| 10902 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 10903 | $as_echo_n "checking for $ac_word... " >&6; } |
| 10904 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 10905 | @@ -7177,7 +7434,7 @@ do |
| 10906 | test -z "$as_dir" && as_dir=. |
| 10907 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 10908 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 10909 | - ac_cv_prog_ac_ct_AR="ar" |
| 10910 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 10911 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 10912 | break 2 |
| 10913 | fi |
| 10914 | @@ -7196,6 +7453,10 @@ else |
| 10915 | $as_echo "no" >&6; } |
| 10916 | fi |
| 10917 | |
| 10918 | + |
| 10919 | + test -n "$ac_ct_AR" && break |
| 10920 | +done |
| 10921 | + |
| 10922 | if test "x$ac_ct_AR" = x; then |
| 10923 | AR="false" |
| 10924 | else |
| 10925 | @@ -7207,29 +7468,81 @@ ac_tool_warned=yes ;; |
| 10926 | esac |
| 10927 | AR=$ac_ct_AR |
| 10928 | fi |
| 10929 | -else |
| 10930 | - AR="$ac_cv_prog_AR" |
| 10931 | fi |
| 10932 | |
| 10933 | -test -z "$AR" && AR=ar |
| 10934 | -if test -n "$plugin_option"; then |
| 10935 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 10936 | - touch conftest.c |
| 10937 | - $AR $plugin_option rc conftest.a conftest.c |
| 10938 | - if test "$?" != 0; then |
| 10939 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 10940 | + touch conftest.c |
| 10941 | + $AR $plugin_option rc conftest.a conftest.c |
| 10942 | + if test "$?" != 0; then |
| 10943 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 10944 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 10945 | - else |
| 10946 | - AR="$AR $plugin_option" |
| 10947 | - fi |
| 10948 | - rm -f conftest.* |
| 10949 | + else |
| 10950 | + AR="$AR $plugin_option" |
| 10951 | fi |
| 10952 | -fi |
| 10953 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 10954 | + rm -f conftest.* |
| 10955 | +: ${AR=ar} |
| 10956 | +: ${AR_FLAGS=cru} |
| 10957 | + |
| 10958 | + |
| 10959 | + |
| 10960 | + |
| 10961 | + |
| 10962 | + |
| 10963 | + |
| 10964 | |
| 10965 | |
| 10966 | |
| 10967 | |
| 10968 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 10969 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 10970 | +if ${lt_cv_ar_at_file+:} false; then : |
| 10971 | + $as_echo_n "(cached) " >&6 |
| 10972 | +else |
| 10973 | + lt_cv_ar_at_file=no |
| 10974 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 10975 | +/* end confdefs.h. */ |
| 10976 | + |
| 10977 | +int |
| 10978 | +main () |
| 10979 | +{ |
| 10980 | + |
| 10981 | + ; |
| 10982 | + return 0; |
| 10983 | +} |
| 10984 | +_ACEOF |
| 10985 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 10986 | + echo conftest.$ac_objext > conftest.lst |
| 10987 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 10988 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 10989 | + (eval $lt_ar_try) 2>&5 |
| 10990 | + ac_status=$? |
| 10991 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 10992 | + test $ac_status = 0; } |
| 10993 | + if test "$ac_status" -eq 0; then |
| 10994 | + # Ensure the archiver fails upon bogus file names. |
| 10995 | + rm -f conftest.$ac_objext libconftest.a |
| 10996 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 10997 | + (eval $lt_ar_try) 2>&5 |
| 10998 | + ac_status=$? |
| 10999 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 11000 | + test $ac_status = 0; } |
| 11001 | + if test "$ac_status" -ne 0; then |
| 11002 | + lt_cv_ar_at_file=@ |
| 11003 | + fi |
| 11004 | + fi |
| 11005 | + rm -f conftest.* libconftest.a |
| 11006 | + |
| 11007 | +fi |
| 11008 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 11009 | + |
| 11010 | +fi |
| 11011 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 11012 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 11013 | + |
| 11014 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 11015 | + archiver_list_spec= |
| 11016 | +else |
| 11017 | + archiver_list_spec=$lt_cv_ar_at_file |
| 11018 | +fi |
| 11019 | |
| 11020 | |
| 11021 | |
| 11022 | @@ -7576,8 +7889,8 @@ esac |
| 11023 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 11024 | |
| 11025 | # Transform an extracted symbol line into symbol name and symbol address |
| 11026 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 11027 | -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'" |
| 11028 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 11029 | +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'" |
| 11030 | |
| 11031 | # Handle CRLF in mingw tool chain |
| 11032 | opt_cr= |
| 11033 | @@ -7613,6 +7926,7 @@ for ac_symprfx in "" "_"; do |
| 11034 | else |
| 11035 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 11036 | fi |
| 11037 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 11038 | |
| 11039 | # Check to see that the pipe works correctly. |
| 11040 | pipe_works=no |
| 11041 | @@ -7654,6 +7968,18 @@ _LT_EOF |
| 11042 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 11043 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 11044 | cat <<_LT_EOF > conftest.$ac_ext |
| 11045 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 11046 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 11047 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 11048 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 11049 | +# define LT_DLSYM_CONST |
| 11050 | +#elif defined(__osf__) |
| 11051 | +/* This system does not cope well with relocations in const data. */ |
| 11052 | +# define LT_DLSYM_CONST |
| 11053 | +#else |
| 11054 | +# define LT_DLSYM_CONST const |
| 11055 | +#endif |
| 11056 | + |
| 11057 | #ifdef __cplusplus |
| 11058 | extern "C" { |
| 11059 | #endif |
| 11060 | @@ -7665,7 +7991,7 @@ _LT_EOF |
| 11061 | cat <<_LT_EOF >> conftest.$ac_ext |
| 11062 | |
| 11063 | /* The mapping between symbol names and symbols. */ |
| 11064 | -const struct { |
| 11065 | +LT_DLSYM_CONST struct { |
| 11066 | const char *name; |
| 11067 | void *address; |
| 11068 | } |
| 11069 | @@ -7691,8 +8017,8 @@ static const void *lt_preloaded_setup() { |
| 11070 | _LT_EOF |
| 11071 | # Now try linking the two files. |
| 11072 | mv conftest.$ac_objext conftstm.$ac_objext |
| 11073 | - lt_save_LIBS="$LIBS" |
| 11074 | - lt_save_CFLAGS="$CFLAGS" |
| 11075 | + lt_globsym_save_LIBS=$LIBS |
| 11076 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 11077 | LIBS="conftstm.$ac_objext" |
| 11078 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 11079 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 11080 | @@ -7702,8 +8028,8 @@ _LT_EOF |
| 11081 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 11082 | pipe_works=yes |
| 11083 | fi |
| 11084 | - LIBS="$lt_save_LIBS" |
| 11085 | - CFLAGS="$lt_save_CFLAGS" |
| 11086 | + LIBS=$lt_globsym_save_LIBS |
| 11087 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 11088 | else |
| 11089 | echo "cannot find nm_test_func in $nlist" >&5 |
| 11090 | fi |
| 11091 | @@ -7740,6 +8066,13 @@ else |
| 11092 | $as_echo "ok" >&6; } |
| 11093 | fi |
| 11094 | |
| 11095 | +# Response file support. |
| 11096 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 11097 | + nm_file_list_spec='@' |
| 11098 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 11099 | + nm_file_list_spec='@' |
| 11100 | +fi |
| 11101 | + |
| 11102 | |
| 11103 | |
| 11104 | |
| 11105 | @@ -7759,6 +8092,48 @@ fi |
| 11106 | |
| 11107 | |
| 11108 | |
| 11109 | + |
| 11110 | + |
| 11111 | + |
| 11112 | + |
| 11113 | + |
| 11114 | + |
| 11115 | + |
| 11116 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 11117 | +$as_echo_n "checking for sysroot... " >&6; } |
| 11118 | + |
| 11119 | +# Check whether --with-libtool-sysroot was given. |
| 11120 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 11121 | + withval=$with_libtool_sysroot; |
| 11122 | +else |
| 11123 | + with_libtool_sysroot=no |
| 11124 | +fi |
| 11125 | + |
| 11126 | + |
| 11127 | +lt_sysroot= |
| 11128 | +case ${with_libtool_sysroot} in #( |
| 11129 | + yes) |
| 11130 | + if test "$GCC" = yes; then |
| 11131 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 11132 | + fi |
| 11133 | + ;; #( |
| 11134 | + /*) |
| 11135 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 11136 | + ;; #( |
| 11137 | + no|'') |
| 11138 | + ;; #( |
| 11139 | + *) |
| 11140 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 11141 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 11142 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 11143 | + ;; |
| 11144 | +esac |
| 11145 | + |
| 11146 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 11147 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 11148 | + |
| 11149 | + |
| 11150 | + |
| 11151 | |
| 11152 | |
| 11153 | # Check whether --enable-libtool-lock was given. |
| 11154 | @@ -7967,6 +8342,123 @@ esac |
| 11155 | |
| 11156 | need_locks="$enable_libtool_lock" |
| 11157 | |
| 11158 | +if test -n "$ac_tool_prefix"; then |
| 11159 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 11160 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 11161 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 11162 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 11163 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 11164 | + $as_echo_n "(cached) " >&6 |
| 11165 | +else |
| 11166 | + if test -n "$MANIFEST_TOOL"; then |
| 11167 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 11168 | +else |
| 11169 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 11170 | +for as_dir in $PATH |
| 11171 | +do |
| 11172 | + IFS=$as_save_IFS |
| 11173 | + test -z "$as_dir" && as_dir=. |
| 11174 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 11175 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 11176 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 11177 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 11178 | + break 2 |
| 11179 | + fi |
| 11180 | +done |
| 11181 | + done |
| 11182 | +IFS=$as_save_IFS |
| 11183 | + |
| 11184 | +fi |
| 11185 | +fi |
| 11186 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 11187 | +if test -n "$MANIFEST_TOOL"; then |
| 11188 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 11189 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 11190 | +else |
| 11191 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 11192 | +$as_echo "no" >&6; } |
| 11193 | +fi |
| 11194 | + |
| 11195 | + |
| 11196 | +fi |
| 11197 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 11198 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 11199 | + # Extract the first word of "mt", so it can be a program name with args. |
| 11200 | +set dummy mt; ac_word=$2 |
| 11201 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 11202 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 11203 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 11204 | + $as_echo_n "(cached) " >&6 |
| 11205 | +else |
| 11206 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 11207 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 11208 | +else |
| 11209 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 11210 | +for as_dir in $PATH |
| 11211 | +do |
| 11212 | + IFS=$as_save_IFS |
| 11213 | + test -z "$as_dir" && as_dir=. |
| 11214 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 11215 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 11216 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 11217 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 11218 | + break 2 |
| 11219 | + fi |
| 11220 | +done |
| 11221 | + done |
| 11222 | +IFS=$as_save_IFS |
| 11223 | + |
| 11224 | +fi |
| 11225 | +fi |
| 11226 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 11227 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 11228 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 11229 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 11230 | +else |
| 11231 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 11232 | +$as_echo "no" >&6; } |
| 11233 | +fi |
| 11234 | + |
| 11235 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 11236 | + MANIFEST_TOOL=":" |
| 11237 | + else |
| 11238 | + case $cross_compiling:$ac_tool_warned in |
| 11239 | +yes:) |
| 11240 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 11241 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 11242 | +ac_tool_warned=yes ;; |
| 11243 | +esac |
| 11244 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 11245 | + fi |
| 11246 | +else |
| 11247 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 11248 | +fi |
| 11249 | + |
| 11250 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 11251 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 11252 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 11253 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 11254 | + $as_echo_n "(cached) " >&6 |
| 11255 | +else |
| 11256 | + lt_cv_path_mainfest_tool=no |
| 11257 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 11258 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 11259 | + cat conftest.err >&5 |
| 11260 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 11261 | + lt_cv_path_mainfest_tool=yes |
| 11262 | + fi |
| 11263 | + rm -f conftest* |
| 11264 | +fi |
| 11265 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 11266 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 11267 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 11268 | + MANIFEST_TOOL=: |
| 11269 | +fi |
| 11270 | + |
| 11271 | + |
| 11272 | + |
| 11273 | + |
| 11274 | + |
| 11275 | |
| 11276 | case $host_os in |
| 11277 | rhapsody* | darwin*) |
| 11278 | @@ -8530,6 +9022,8 @@ _LT_EOF |
| 11279 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 11280 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 11281 | $AR cru libconftest.a conftest.o 2>&5 |
| 11282 | + echo "$RANLIB libconftest.a" >&5 |
| 11283 | + $RANLIB libconftest.a 2>&5 |
| 11284 | cat > conftest.c << _LT_EOF |
| 11285 | int main() { return 0;} |
| 11286 | _LT_EOF |
| 11287 | @@ -8598,6 +9092,16 @@ done |
| 11288 | |
| 11289 | |
| 11290 | |
| 11291 | +func_stripname_cnf () |
| 11292 | +{ |
| 11293 | + case ${2} in |
| 11294 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 11295 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 11296 | + esac |
| 11297 | +} # func_stripname_cnf |
| 11298 | + |
| 11299 | + |
| 11300 | + |
| 11301 | |
| 11302 | |
| 11303 | # Set options |
| 11304 | @@ -9113,8 +9617,6 @@ fi |
| 11305 | lt_prog_compiler_pic= |
| 11306 | lt_prog_compiler_static= |
| 11307 | |
| 11308 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 11309 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 11310 | |
| 11311 | if test "$GCC" = yes; then |
| 11312 | lt_prog_compiler_wl='-Wl,' |
| 11313 | @@ -9280,6 +9782,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 11314 | lt_prog_compiler_pic='--shared' |
| 11315 | lt_prog_compiler_static='--static' |
| 11316 | ;; |
| 11317 | + nagfor*) |
| 11318 | + # NAG Fortran compiler |
| 11319 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 11320 | + lt_prog_compiler_pic='-PIC' |
| 11321 | + lt_prog_compiler_static='-Bstatic' |
| 11322 | + ;; |
| 11323 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 11324 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 11325 | # which looks to be a dead project) |
| 11326 | @@ -9342,7 +9850,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 11327 | lt_prog_compiler_pic='-KPIC' |
| 11328 | lt_prog_compiler_static='-Bstatic' |
| 11329 | case $cc_basename in |
| 11330 | - f77* | f90* | f95*) |
| 11331 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 11332 | lt_prog_compiler_wl='-Qoption ld ';; |
| 11333 | *) |
| 11334 | lt_prog_compiler_wl='-Wl,';; |
| 11335 | @@ -9399,13 +9907,17 @@ case $host_os in |
| 11336 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 11337 | ;; |
| 11338 | esac |
| 11339 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 11340 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 11341 | - |
| 11342 | - |
| 11343 | - |
| 11344 | - |
| 11345 | |
| 11346 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 11347 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 11348 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 11349 | + $as_echo_n "(cached) " >&6 |
| 11350 | +else |
| 11351 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 11352 | +fi |
| 11353 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 11354 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 11355 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 11356 | |
| 11357 | # |
| 11358 | # Check to make sure the PIC flag actually works. |
| 11359 | @@ -9466,6 +9978,11 @@ fi |
| 11360 | |
| 11361 | |
| 11362 | |
| 11363 | + |
| 11364 | + |
| 11365 | + |
| 11366 | + |
| 11367 | + |
| 11368 | # |
| 11369 | # Check to make sure the static flag actually works. |
| 11370 | # |
| 11371 | @@ -9816,7 +10333,8 @@ _LT_EOF |
| 11372 | allow_undefined_flag=unsupported |
| 11373 | always_export_symbols=no |
| 11374 | enable_shared_with_static_runtimes=yes |
| 11375 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 11376 | + 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' |
| 11377 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 11378 | |
| 11379 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 11380 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 11381 | @@ -9915,12 +10433,12 @@ _LT_EOF |
| 11382 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 11383 | hardcode_libdir_flag_spec= |
| 11384 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 11385 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 11386 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 11387 | if test "x$supports_anon_versioning" = xyes; then |
| 11388 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 11389 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 11390 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 11391 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 11392 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 11393 | fi |
| 11394 | ;; |
| 11395 | esac |
| 11396 | @@ -9934,8 +10452,8 @@ _LT_EOF |
| 11397 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 11398 | wlarc= |
| 11399 | else |
| 11400 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11401 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 11402 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11403 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 11404 | fi |
| 11405 | ;; |
| 11406 | |
| 11407 | @@ -9953,8 +10471,8 @@ _LT_EOF |
| 11408 | |
| 11409 | _LT_EOF |
| 11410 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 11411 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11412 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 11413 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11414 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 11415 | else |
| 11416 | ld_shlibs=no |
| 11417 | fi |
| 11418 | @@ -10000,8 +10518,8 @@ _LT_EOF |
| 11419 | |
| 11420 | *) |
| 11421 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 11422 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11423 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 11424 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11425 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 11426 | else |
| 11427 | ld_shlibs=no |
| 11428 | fi |
| 11429 | @@ -10131,7 +10649,13 @@ _LT_EOF |
| 11430 | allow_undefined_flag='-berok' |
| 11431 | # Determine the default libpath from the value encoded in an |
| 11432 | # empty executable. |
| 11433 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11434 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 11435 | + aix_libpath=$lt_cv_aix_libpath |
| 11436 | +else |
| 11437 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 11438 | + $as_echo_n "(cached) " >&6 |
| 11439 | +else |
| 11440 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11441 | /* end confdefs.h. */ |
| 11442 | |
| 11443 | int |
| 11444 | @@ -10144,22 +10668,29 @@ main () |
| 11445 | _ACEOF |
| 11446 | if ac_fn_c_try_link "$LINENO"; then : |
| 11447 | |
| 11448 | -lt_aix_libpath_sed=' |
| 11449 | - /Import File Strings/,/^$/ { |
| 11450 | - /^0/ { |
| 11451 | - s/^0 *\(.*\)$/\1/ |
| 11452 | - p |
| 11453 | - } |
| 11454 | - }' |
| 11455 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11456 | -# Check for a 64-bit object if we didn't find anything. |
| 11457 | -if test -z "$aix_libpath"; then |
| 11458 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11459 | -fi |
| 11460 | + lt_aix_libpath_sed=' |
| 11461 | + /Import File Strings/,/^$/ { |
| 11462 | + /^0/ { |
| 11463 | + s/^0 *\([^ ]*\) *$/\1/ |
| 11464 | + p |
| 11465 | + } |
| 11466 | + }' |
| 11467 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11468 | + # Check for a 64-bit object if we didn't find anything. |
| 11469 | + if test -z "$lt_cv_aix_libpath_"; then |
| 11470 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11471 | + fi |
| 11472 | fi |
| 11473 | rm -f core conftest.err conftest.$ac_objext \ |
| 11474 | conftest$ac_exeext conftest.$ac_ext |
| 11475 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11476 | + if test -z "$lt_cv_aix_libpath_"; then |
| 11477 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 11478 | + fi |
| 11479 | + |
| 11480 | +fi |
| 11481 | + |
| 11482 | + aix_libpath=$lt_cv_aix_libpath_ |
| 11483 | +fi |
| 11484 | |
| 11485 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11486 | 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" |
| 11487 | @@ -10171,7 +10702,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11488 | else |
| 11489 | # Determine the default libpath from the value encoded in an |
| 11490 | # empty executable. |
| 11491 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11492 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 11493 | + aix_libpath=$lt_cv_aix_libpath |
| 11494 | +else |
| 11495 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 11496 | + $as_echo_n "(cached) " >&6 |
| 11497 | +else |
| 11498 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11499 | /* end confdefs.h. */ |
| 11500 | |
| 11501 | int |
| 11502 | @@ -10184,22 +10721,29 @@ main () |
| 11503 | _ACEOF |
| 11504 | if ac_fn_c_try_link "$LINENO"; then : |
| 11505 | |
| 11506 | -lt_aix_libpath_sed=' |
| 11507 | - /Import File Strings/,/^$/ { |
| 11508 | - /^0/ { |
| 11509 | - s/^0 *\(.*\)$/\1/ |
| 11510 | - p |
| 11511 | - } |
| 11512 | - }' |
| 11513 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11514 | -# Check for a 64-bit object if we didn't find anything. |
| 11515 | -if test -z "$aix_libpath"; then |
| 11516 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11517 | -fi |
| 11518 | + lt_aix_libpath_sed=' |
| 11519 | + /Import File Strings/,/^$/ { |
| 11520 | + /^0/ { |
| 11521 | + s/^0 *\([^ ]*\) *$/\1/ |
| 11522 | + p |
| 11523 | + } |
| 11524 | + }' |
| 11525 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11526 | + # Check for a 64-bit object if we didn't find anything. |
| 11527 | + if test -z "$lt_cv_aix_libpath_"; then |
| 11528 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11529 | + fi |
| 11530 | fi |
| 11531 | rm -f core conftest.err conftest.$ac_objext \ |
| 11532 | conftest$ac_exeext conftest.$ac_ext |
| 11533 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11534 | + if test -z "$lt_cv_aix_libpath_"; then |
| 11535 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 11536 | + fi |
| 11537 | + |
| 11538 | +fi |
| 11539 | + |
| 11540 | + aix_libpath=$lt_cv_aix_libpath_ |
| 11541 | +fi |
| 11542 | |
| 11543 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11544 | # Warning - without using the other run time loading flags, |
| 11545 | @@ -10243,21 +10787,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11546 | # When not using gcc, we currently assume that we are using |
| 11547 | # Microsoft Visual C++. |
| 11548 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 11549 | - # no search path for DLLs. |
| 11550 | - hardcode_libdir_flag_spec=' ' |
| 11551 | - allow_undefined_flag=unsupported |
| 11552 | - # Tell ltmain to make .lib files, not .a files. |
| 11553 | - libext=lib |
| 11554 | - # Tell ltmain to make .dll files, not .so files. |
| 11555 | - shrext_cmds=".dll" |
| 11556 | - # FIXME: Setting linknames here is a bad hack. |
| 11557 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 11558 | - # The linker will automatically build a .lib file if we build a DLL. |
| 11559 | - old_archive_from_new_cmds='true' |
| 11560 | - # FIXME: Should let the user specify the lib program. |
| 11561 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 11562 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 11563 | - enable_shared_with_static_runtimes=yes |
| 11564 | + # no search path for DLLs. |
| 11565 | + case $cc_basename in |
| 11566 | + cl*) |
| 11567 | + # Native MSVC |
| 11568 | + hardcode_libdir_flag_spec=' ' |
| 11569 | + allow_undefined_flag=unsupported |
| 11570 | + always_export_symbols=yes |
| 11571 | + file_list_spec='@' |
| 11572 | + # Tell ltmain to make .lib files, not .a files. |
| 11573 | + libext=lib |
| 11574 | + # Tell ltmain to make .dll files, not .so files. |
| 11575 | + shrext_cmds=".dll" |
| 11576 | + # FIXME: Setting linknames here is a bad hack. |
| 11577 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 11578 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11579 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 11580 | + else |
| 11581 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 11582 | + fi~ |
| 11583 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 11584 | + linknames=' |
| 11585 | + # The linker will not automatically build a static lib if we build a DLL. |
| 11586 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 11587 | + enable_shared_with_static_runtimes=yes |
| 11588 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 11589 | + # Don't use ranlib |
| 11590 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 11591 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 11592 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 11593 | + case $lt_outputfile in |
| 11594 | + *.exe|*.EXE) ;; |
| 11595 | + *) |
| 11596 | + lt_outputfile="$lt_outputfile.exe" |
| 11597 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 11598 | + ;; |
| 11599 | + esac~ |
| 11600 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 11601 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 11602 | + $RM "$lt_outputfile.manifest"; |
| 11603 | + fi' |
| 11604 | + ;; |
| 11605 | + *) |
| 11606 | + # Assume MSVC wrapper |
| 11607 | + hardcode_libdir_flag_spec=' ' |
| 11608 | + allow_undefined_flag=unsupported |
| 11609 | + # Tell ltmain to make .lib files, not .a files. |
| 11610 | + libext=lib |
| 11611 | + # Tell ltmain to make .dll files, not .so files. |
| 11612 | + shrext_cmds=".dll" |
| 11613 | + # FIXME: Setting linknames here is a bad hack. |
| 11614 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 11615 | + # The linker will automatically build a .lib file if we build a DLL. |
| 11616 | + old_archive_from_new_cmds='true' |
| 11617 | + # FIXME: Should let the user specify the lib program. |
| 11618 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 11619 | + enable_shared_with_static_runtimes=yes |
| 11620 | + ;; |
| 11621 | + esac |
| 11622 | ;; |
| 11623 | |
| 11624 | darwin* | rhapsody*) |
| 11625 | @@ -10318,7 +10905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11626 | |
| 11627 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 11628 | freebsd* | dragonfly*) |
| 11629 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 11630 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 11631 | hardcode_libdir_flag_spec='-R$libdir' |
| 11632 | hardcode_direct=yes |
| 11633 | hardcode_shlibpath_var=no |
| 11634 | @@ -10326,7 +10913,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11635 | |
| 11636 | hpux9*) |
| 11637 | if test "$GCC" = yes; then |
| 11638 | - 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' |
| 11639 | + 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' |
| 11640 | else |
| 11641 | 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' |
| 11642 | fi |
| 11643 | @@ -10342,7 +10929,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11644 | |
| 11645 | hpux10*) |
| 11646 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 11647 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11648 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11649 | else |
| 11650 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 11651 | fi |
| 11652 | @@ -10366,10 +10953,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11653 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11654 | ;; |
| 11655 | ia64*) |
| 11656 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 11657 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 11658 | ;; |
| 11659 | *) |
| 11660 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11661 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11662 | ;; |
| 11663 | esac |
| 11664 | else |
| 11665 | @@ -10448,23 +11035,36 @@ fi |
| 11666 | |
| 11667 | irix5* | irix6* | nonstopux*) |
| 11668 | if test "$GCC" = yes; then |
| 11669 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11670 | + 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' |
| 11671 | # Try to use the -exported_symbol ld option, if it does not |
| 11672 | # work, assume that -exports_file does not work either and |
| 11673 | # implicitly export all symbols. |
| 11674 | - save_LDFLAGS="$LDFLAGS" |
| 11675 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 11676 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11677 | + # This should be the same for all languages, so no per-tag cache variable. |
| 11678 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 11679 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 11680 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 11681 | + $as_echo_n "(cached) " >&6 |
| 11682 | +else |
| 11683 | + save_LDFLAGS="$LDFLAGS" |
| 11684 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 11685 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11686 | /* end confdefs.h. */ |
| 11687 | -int foo(void) {} |
| 11688 | +int foo (void) { return 0; } |
| 11689 | _ACEOF |
| 11690 | if ac_fn_c_try_link "$LINENO"; then : |
| 11691 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 11692 | - |
| 11693 | + lt_cv_irix_exported_symbol=yes |
| 11694 | +else |
| 11695 | + lt_cv_irix_exported_symbol=no |
| 11696 | fi |
| 11697 | rm -f core conftest.err conftest.$ac_objext \ |
| 11698 | conftest$ac_exeext conftest.$ac_ext |
| 11699 | - LDFLAGS="$save_LDFLAGS" |
| 11700 | + LDFLAGS="$save_LDFLAGS" |
| 11701 | +fi |
| 11702 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 11703 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 11704 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 11705 | + 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' |
| 11706 | + fi |
| 11707 | else |
| 11708 | 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' |
| 11709 | 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' |
| 11710 | @@ -10549,7 +11149,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 11711 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 11712 | if test "$GCC" = yes; then |
| 11713 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 11714 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11715 | + 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' |
| 11716 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 11717 | else |
| 11718 | allow_undefined_flag=' -expect_unresolved \*' |
| 11719 | @@ -10568,9 +11168,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 11720 | no_undefined_flag=' -z defs' |
| 11721 | if test "$GCC" = yes; then |
| 11722 | wlarc='${wl}' |
| 11723 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11724 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11725 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 11726 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 11727 | + $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' |
| 11728 | else |
| 11729 | case `$CC -V 2>&1` in |
| 11730 | *"Compilers 5.0"*) |
| 11731 | @@ -11146,8 +11746,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 11732 | need_version=no |
| 11733 | need_lib_prefix=no |
| 11734 | |
| 11735 | - case $GCC,$host_os in |
| 11736 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 11737 | + case $GCC,$cc_basename in |
| 11738 | + yes,*) |
| 11739 | + # gcc |
| 11740 | library_names_spec='$libname.dll.a' |
| 11741 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 11742 | postinstall_cmds='base_file=`basename \${file}`~ |
| 11743 | @@ -11180,13 +11781,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 11744 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 11745 | ;; |
| 11746 | esac |
| 11747 | + dynamic_linker='Win32 ld.exe' |
| 11748 | + ;; |
| 11749 | + |
| 11750 | + *,cl*) |
| 11751 | + # Native MSVC |
| 11752 | + libname_spec='$name' |
| 11753 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 11754 | + library_names_spec='${libname}.dll.lib' |
| 11755 | + |
| 11756 | + case $build_os in |
| 11757 | + mingw*) |
| 11758 | + sys_lib_search_path_spec= |
| 11759 | + lt_save_ifs=$IFS |
| 11760 | + IFS=';' |
| 11761 | + for lt_path in $LIB |
| 11762 | + do |
| 11763 | + IFS=$lt_save_ifs |
| 11764 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 11765 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 11766 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 11767 | + done |
| 11768 | + IFS=$lt_save_ifs |
| 11769 | + # Convert to MSYS style. |
| 11770 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 11771 | + ;; |
| 11772 | + cygwin*) |
| 11773 | + # Convert to unix form, then to dos form, then back to unix form |
| 11774 | + # but this time dos style (no spaces!) so that the unix form looks |
| 11775 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 11776 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 11777 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 11778 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 11779 | + ;; |
| 11780 | + *) |
| 11781 | + sys_lib_search_path_spec="$LIB" |
| 11782 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 11783 | + # It is most probably a Windows format PATH. |
| 11784 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 11785 | + else |
| 11786 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 11787 | + fi |
| 11788 | + # FIXME: find the short name or the path components, as spaces are |
| 11789 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 11790 | + ;; |
| 11791 | + esac |
| 11792 | + |
| 11793 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 11794 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 11795 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 11796 | + dldir=$destdir/`dirname \$dlpath`~ |
| 11797 | + test -d \$dldir || mkdir -p \$dldir~ |
| 11798 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 11799 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 11800 | + dlpath=$dir/\$dldll~ |
| 11801 | + $RM \$dlpath' |
| 11802 | + shlibpath_overrides_runpath=yes |
| 11803 | + dynamic_linker='Win32 link.exe' |
| 11804 | ;; |
| 11805 | |
| 11806 | *) |
| 11807 | + # Assume MSVC wrapper |
| 11808 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 11809 | + dynamic_linker='Win32 ld.exe' |
| 11810 | ;; |
| 11811 | esac |
| 11812 | - dynamic_linker='Win32 ld.exe' |
| 11813 | # FIXME: first we should search . and the directory the executable is in |
| 11814 | shlibpath_var=PATH |
| 11815 | ;; |
| 11816 | @@ -12064,7 +12723,7 @@ else |
| 11817 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 11818 | lt_status=$lt_dlunknown |
| 11819 | cat > conftest.$ac_ext <<_LT_EOF |
| 11820 | -#line 12067 "configure" |
| 11821 | +#line $LINENO "configure" |
| 11822 | #include "confdefs.h" |
| 11823 | |
| 11824 | #if HAVE_DLFCN_H |
| 11825 | @@ -12108,10 +12767,10 @@ else |
| 11826 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 11827 | correspondingly for the symbols needed. */ |
| 11828 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 11829 | -void fnord () __attribute__((visibility("default"))); |
| 11830 | +int fnord () __attribute__((visibility("default"))); |
| 11831 | #endif |
| 11832 | |
| 11833 | -void fnord () { int i=42; } |
| 11834 | +int fnord () { return 42; } |
| 11835 | int main () |
| 11836 | { |
| 11837 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 11838 | @@ -12170,7 +12829,7 @@ else |
| 11839 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 11840 | lt_status=$lt_dlunknown |
| 11841 | cat > conftest.$ac_ext <<_LT_EOF |
| 11842 | -#line 12173 "configure" |
| 11843 | +#line $LINENO "configure" |
| 11844 | #include "confdefs.h" |
| 11845 | |
| 11846 | #if HAVE_DLFCN_H |
| 11847 | @@ -12214,10 +12873,10 @@ else |
| 11848 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 11849 | correspondingly for the symbols needed. */ |
| 11850 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 11851 | -void fnord () __attribute__((visibility("default"))); |
| 11852 | +int fnord () __attribute__((visibility("default"))); |
| 11853 | #endif |
| 11854 | |
| 11855 | -void fnord () { int i=42; } |
| 11856 | +int fnord () { return 42; } |
| 11857 | int main () |
| 11858 | { |
| 11859 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 11860 | @@ -12609,6 +13268,7 @@ $RM -r conftest* |
| 11861 | |
| 11862 | # Allow CC to be a program name with arguments. |
| 11863 | lt_save_CC=$CC |
| 11864 | + lt_save_CFLAGS=$CFLAGS |
| 11865 | lt_save_LD=$LD |
| 11866 | lt_save_GCC=$GCC |
| 11867 | GCC=$GXX |
| 11868 | @@ -12626,6 +13286,7 @@ $RM -r conftest* |
| 11869 | fi |
| 11870 | test -z "${LDCXX+set}" || LD=$LDCXX |
| 11871 | CC=${CXX-"c++"} |
| 11872 | + CFLAGS=$CXXFLAGS |
| 11873 | compiler=$CC |
| 11874 | compiler_CXX=$CC |
| 11875 | for cc_temp in $compiler""; do |
| 11876 | @@ -12908,7 +13569,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 11877 | allow_undefined_flag_CXX='-berok' |
| 11878 | # Determine the default libpath from the value encoded in an empty |
| 11879 | # executable. |
| 11880 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11881 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 11882 | + aix_libpath=$lt_cv_aix_libpath |
| 11883 | +else |
| 11884 | + if ${lt_cv_aix_libpath__CXX+:} false; then : |
| 11885 | + $as_echo_n "(cached) " >&6 |
| 11886 | +else |
| 11887 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11888 | /* end confdefs.h. */ |
| 11889 | |
| 11890 | int |
| 11891 | @@ -12921,22 +13588,29 @@ main () |
| 11892 | _ACEOF |
| 11893 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 11894 | |
| 11895 | -lt_aix_libpath_sed=' |
| 11896 | - /Import File Strings/,/^$/ { |
| 11897 | - /^0/ { |
| 11898 | - s/^0 *\(.*\)$/\1/ |
| 11899 | - p |
| 11900 | - } |
| 11901 | - }' |
| 11902 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11903 | -# Check for a 64-bit object if we didn't find anything. |
| 11904 | -if test -z "$aix_libpath"; then |
| 11905 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11906 | -fi |
| 11907 | + lt_aix_libpath_sed=' |
| 11908 | + /Import File Strings/,/^$/ { |
| 11909 | + /^0/ { |
| 11910 | + s/^0 *\([^ ]*\) *$/\1/ |
| 11911 | + p |
| 11912 | + } |
| 11913 | + }' |
| 11914 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11915 | + # Check for a 64-bit object if we didn't find anything. |
| 11916 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 11917 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11918 | + fi |
| 11919 | fi |
| 11920 | rm -f core conftest.err conftest.$ac_objext \ |
| 11921 | conftest$ac_exeext conftest.$ac_ext |
| 11922 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11923 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 11924 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 11925 | + fi |
| 11926 | + |
| 11927 | +fi |
| 11928 | + |
| 11929 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 11930 | +fi |
| 11931 | |
| 11932 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11933 | |
| 11934 | @@ -12949,7 +13623,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11935 | else |
| 11936 | # Determine the default libpath from the value encoded in an |
| 11937 | # empty executable. |
| 11938 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11939 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 11940 | + aix_libpath=$lt_cv_aix_libpath |
| 11941 | +else |
| 11942 | + if ${lt_cv_aix_libpath__CXX+:} false; then : |
| 11943 | + $as_echo_n "(cached) " >&6 |
| 11944 | +else |
| 11945 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 11946 | /* end confdefs.h. */ |
| 11947 | |
| 11948 | int |
| 11949 | @@ -12962,22 +13642,29 @@ main () |
| 11950 | _ACEOF |
| 11951 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 11952 | |
| 11953 | -lt_aix_libpath_sed=' |
| 11954 | - /Import File Strings/,/^$/ { |
| 11955 | - /^0/ { |
| 11956 | - s/^0 *\(.*\)$/\1/ |
| 11957 | - p |
| 11958 | - } |
| 11959 | - }' |
| 11960 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11961 | -# Check for a 64-bit object if we didn't find anything. |
| 11962 | -if test -z "$aix_libpath"; then |
| 11963 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11964 | -fi |
| 11965 | + lt_aix_libpath_sed=' |
| 11966 | + /Import File Strings/,/^$/ { |
| 11967 | + /^0/ { |
| 11968 | + s/^0 *\([^ ]*\) *$/\1/ |
| 11969 | + p |
| 11970 | + } |
| 11971 | + }' |
| 11972 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11973 | + # Check for a 64-bit object if we didn't find anything. |
| 11974 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 11975 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 11976 | + fi |
| 11977 | fi |
| 11978 | rm -f core conftest.err conftest.$ac_objext \ |
| 11979 | conftest$ac_exeext conftest.$ac_ext |
| 11980 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11981 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 11982 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 11983 | + fi |
| 11984 | + |
| 11985 | +fi |
| 11986 | + |
| 11987 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 11988 | +fi |
| 11989 | |
| 11990 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11991 | # Warning - without using the other run time loading flags, |
| 11992 | @@ -13020,29 +13707,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 11993 | ;; |
| 11994 | |
| 11995 | cygwin* | mingw* | pw32* | cegcc*) |
| 11996 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 11997 | - # as there is no search path for DLLs. |
| 11998 | - hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 11999 | - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 12000 | - allow_undefined_flag_CXX=unsupported |
| 12001 | - always_export_symbols_CXX=no |
| 12002 | - enable_shared_with_static_runtimes_CXX=yes |
| 12003 | - |
| 12004 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 12005 | - archive_cmds_CXX='$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' |
| 12006 | - # If the export-symbols file already is a .def file (1st line |
| 12007 | - # is EXPORTS), use it as is; otherwise, prepend... |
| 12008 | - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 12009 | - cp $export_symbols $output_objdir/$soname.def; |
| 12010 | - else |
| 12011 | - echo EXPORTS > $output_objdir/$soname.def; |
| 12012 | - cat $export_symbols >> $output_objdir/$soname.def; |
| 12013 | - fi~ |
| 12014 | - $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' |
| 12015 | - else |
| 12016 | - ld_shlibs_CXX=no |
| 12017 | - fi |
| 12018 | - ;; |
| 12019 | + case $GXX,$cc_basename in |
| 12020 | + ,cl* | no,cl*) |
| 12021 | + # Native MSVC |
| 12022 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 12023 | + # no search path for DLLs. |
| 12024 | + hardcode_libdir_flag_spec_CXX=' ' |
| 12025 | + allow_undefined_flag_CXX=unsupported |
| 12026 | + always_export_symbols_CXX=yes |
| 12027 | + file_list_spec_CXX='@' |
| 12028 | + # Tell ltmain to make .lib files, not .a files. |
| 12029 | + libext=lib |
| 12030 | + # Tell ltmain to make .dll files, not .so files. |
| 12031 | + shrext_cmds=".dll" |
| 12032 | + # FIXME: Setting linknames here is a bad hack. |
| 12033 | + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 12034 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 12035 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 12036 | + else |
| 12037 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 12038 | + fi~ |
| 12039 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 12040 | + linknames=' |
| 12041 | + # The linker will not automatically build a static lib if we build a DLL. |
| 12042 | + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' |
| 12043 | + enable_shared_with_static_runtimes_CXX=yes |
| 12044 | + # Don't use ranlib |
| 12045 | + old_postinstall_cmds_CXX='chmod 644 $oldlib' |
| 12046 | + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ |
| 12047 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 12048 | + case $lt_outputfile in |
| 12049 | + *.exe|*.EXE) ;; |
| 12050 | + *) |
| 12051 | + lt_outputfile="$lt_outputfile.exe" |
| 12052 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 12053 | + ;; |
| 12054 | + esac~ |
| 12055 | + func_to_tool_file "$lt_outputfile"~ |
| 12056 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 12057 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 12058 | + $RM "$lt_outputfile.manifest"; |
| 12059 | + fi' |
| 12060 | + ;; |
| 12061 | + *) |
| 12062 | + # g++ |
| 12063 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 12064 | + # as there is no search path for DLLs. |
| 12065 | + hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 12066 | + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 12067 | + allow_undefined_flag_CXX=unsupported |
| 12068 | + always_export_symbols_CXX=no |
| 12069 | + enable_shared_with_static_runtimes_CXX=yes |
| 12070 | + |
| 12071 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 12072 | + archive_cmds_CXX='$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' |
| 12073 | + # If the export-symbols file already is a .def file (1st line |
| 12074 | + # is EXPORTS), use it as is; otherwise, prepend... |
| 12075 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 12076 | + cp $export_symbols $output_objdir/$soname.def; |
| 12077 | + else |
| 12078 | + echo EXPORTS > $output_objdir/$soname.def; |
| 12079 | + cat $export_symbols >> $output_objdir/$soname.def; |
| 12080 | + fi~ |
| 12081 | + $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' |
| 12082 | + else |
| 12083 | + ld_shlibs_CXX=no |
| 12084 | + fi |
| 12085 | + ;; |
| 12086 | + esac |
| 12087 | + ;; |
| 12088 | darwin* | rhapsody*) |
| 12089 | |
| 12090 | |
| 12091 | @@ -13148,7 +13881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 12092 | ;; |
| 12093 | *) |
| 12094 | if test "$GXX" = yes; then |
| 12095 | - archive_cmds_CXX='$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' |
| 12096 | + archive_cmds_CXX='$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' |
| 12097 | else |
| 12098 | # FIXME: insert proper C++ library support |
| 12099 | ld_shlibs_CXX=no |
| 12100 | @@ -13219,10 +13952,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 12101 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 12102 | ;; |
| 12103 | ia64*) |
| 12104 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 12105 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 12106 | ;; |
| 12107 | *) |
| 12108 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 12109 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 12110 | ;; |
| 12111 | esac |
| 12112 | fi |
| 12113 | @@ -13263,9 +13996,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 12114 | *) |
| 12115 | if test "$GXX" = yes; then |
| 12116 | if test "$with_gnu_ld" = no; then |
| 12117 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 12118 | + archive_cmds_CXX='$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' |
| 12119 | else |
| 12120 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
| 12121 | + archive_cmds_CXX='$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' |
| 12122 | fi |
| 12123 | fi |
| 12124 | link_all_deplibs_CXX=yes |
| 12125 | @@ -13335,20 +14068,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 12126 | prelink_cmds_CXX='tpldir=Template.dir~ |
| 12127 | rm -rf $tpldir~ |
| 12128 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
| 12129 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
| 12130 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
| 12131 | old_archive_cmds_CXX='tpldir=Template.dir~ |
| 12132 | rm -rf $tpldir~ |
| 12133 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
| 12134 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
| 12135 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
| 12136 | $RANLIB $oldlib' |
| 12137 | archive_cmds_CXX='tpldir=Template.dir~ |
| 12138 | rm -rf $tpldir~ |
| 12139 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 12140 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 12141 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 12142 | archive_expsym_cmds_CXX='tpldir=Template.dir~ |
| 12143 | rm -rf $tpldir~ |
| 12144 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 12145 | - $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' |
| 12146 | + $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' |
| 12147 | ;; |
| 12148 | *) # Version 6 and above use weak symbols |
| 12149 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 12150 | @@ -13543,7 +14276,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 12151 | archive_cmds_CXX='$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' |
| 12152 | ;; |
| 12153 | *) |
| 12154 | - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 12155 | + archive_cmds_CXX='$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' |
| 12156 | ;; |
| 12157 | esac |
| 12158 | |
| 12159 | @@ -13589,7 +14322,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 12160 | |
| 12161 | solaris*) |
| 12162 | case $cc_basename in |
| 12163 | - CC*) |
| 12164 | + CC* | sunCC*) |
| 12165 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 12166 | archive_cmds_need_lc_CXX=yes |
| 12167 | no_undefined_flag_CXX=' -zdefs' |
| 12168 | @@ -13630,9 +14363,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 12169 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
| 12170 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
| 12171 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
| 12172 | - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 12173 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 12174 | archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 12175 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 12176 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 12177 | |
| 12178 | # Commands to make compiler produce verbose output that lists |
| 12179 | # what "hidden" libraries, object files and flags are used when |
| 12180 | @@ -13767,6 +14500,13 @@ private: |
| 12181 | }; |
| 12182 | _LT_EOF |
| 12183 | |
| 12184 | + |
| 12185 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
| 12186 | +case "$CC $CFLAGS " in #( |
| 12187 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
| 12188 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
| 12189 | +esac |
| 12190 | + |
| 12191 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 12192 | (eval $ac_compile) 2>&5 |
| 12193 | ac_status=$? |
| 12194 | @@ -13780,7 +14520,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 12195 | pre_test_object_deps_done=no |
| 12196 | |
| 12197 | for p in `eval "$output_verbose_link_cmd"`; do |
| 12198 | - case $p in |
| 12199 | + case ${prev}${p} in |
| 12200 | |
| 12201 | -L* | -R* | -l*) |
| 12202 | # Some compilers place space between "-{L,R}" and the path. |
| 12203 | @@ -13789,13 +14529,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 12204 | test $p = "-R"; then |
| 12205 | prev=$p |
| 12206 | continue |
| 12207 | - else |
| 12208 | - prev= |
| 12209 | fi |
| 12210 | |
| 12211 | + # Expand the sysroot to ease extracting the directories later. |
| 12212 | + if test -z "$prev"; then |
| 12213 | + case $p in |
| 12214 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
| 12215 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
| 12216 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
| 12217 | + esac |
| 12218 | + fi |
| 12219 | + case $p in |
| 12220 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
| 12221 | + esac |
| 12222 | if test "$pre_test_object_deps_done" = no; then |
| 12223 | - case $p in |
| 12224 | - -L* | -R*) |
| 12225 | + case ${prev} in |
| 12226 | + -L | -R) |
| 12227 | # Internal compiler library paths should come after those |
| 12228 | # provided the user. The postdeps already come after the |
| 12229 | # user supplied libs so there is no need to process them. |
| 12230 | @@ -13815,8 +14564,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 12231 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
| 12232 | fi |
| 12233 | fi |
| 12234 | + prev= |
| 12235 | ;; |
| 12236 | |
| 12237 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
| 12238 | *.$objext) |
| 12239 | # This assumes that the test object file only shows up |
| 12240 | # once in the compiler output. |
| 12241 | @@ -13852,6 +14603,7 @@ else |
| 12242 | fi |
| 12243 | |
| 12244 | $RM -f confest.$objext |
| 12245 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
| 12246 | |
| 12247 | # PORTME: override above test on systems where it is broken |
| 12248 | case $host_os in |
| 12249 | @@ -13887,7 +14639,7 @@ linux*) |
| 12250 | |
| 12251 | solaris*) |
| 12252 | case $cc_basename in |
| 12253 | - CC*) |
| 12254 | + CC* | sunCC*) |
| 12255 | # The more standards-conforming stlport4 library is |
| 12256 | # incompatible with the Cstd library. Avoid specifying |
| 12257 | # it if it's in CXXFLAGS. Ignore libCrun as |
| 12258 | @@ -13952,8 +14704,6 @@ fi |
| 12259 | lt_prog_compiler_pic_CXX= |
| 12260 | lt_prog_compiler_static_CXX= |
| 12261 | |
| 12262 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 12263 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 12264 | |
| 12265 | # C++ specific cases for pic, static, wl, etc. |
| 12266 | if test "$GXX" = yes; then |
| 12267 | @@ -14058,6 +14808,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 12268 | ;; |
| 12269 | esac |
| 12270 | ;; |
| 12271 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
| 12272 | + # This hack is so that the source file can tell whether it is being |
| 12273 | + # built for inclusion in a dll (and should export symbols for example). |
| 12274 | + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' |
| 12275 | + ;; |
| 12276 | dgux*) |
| 12277 | case $cc_basename in |
| 12278 | ec++*) |
| 12279 | @@ -14210,7 +14965,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 12280 | ;; |
| 12281 | solaris*) |
| 12282 | case $cc_basename in |
| 12283 | - CC*) |
| 12284 | + CC* | sunCC*) |
| 12285 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 12286 | lt_prog_compiler_pic_CXX='-KPIC' |
| 12287 | lt_prog_compiler_static_CXX='-Bstatic' |
| 12288 | @@ -14275,10 +15030,17 @@ case $host_os in |
| 12289 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" |
| 12290 | ;; |
| 12291 | esac |
| 12292 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 |
| 12293 | -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } |
| 12294 | - |
| 12295 | |
| 12296 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 12297 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 12298 | +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : |
| 12299 | + $as_echo_n "(cached) " >&6 |
| 12300 | +else |
| 12301 | + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX |
| 12302 | +fi |
| 12303 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 |
| 12304 | +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } |
| 12305 | +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX |
| 12306 | |
| 12307 | # |
| 12308 | # Check to make sure the PIC flag actually works. |
| 12309 | @@ -14336,6 +15098,8 @@ fi |
| 12310 | |
| 12311 | |
| 12312 | |
| 12313 | + |
| 12314 | + |
| 12315 | # |
| 12316 | # Check to make sure the static flag actually works. |
| 12317 | # |
| 12318 | @@ -14513,6 +15277,7 @@ fi |
| 12319 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 12320 | |
| 12321 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 12322 | + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 12323 | case $host_os in |
| 12324 | aix[4-9]*) |
| 12325 | # If we're using GNU nm, then we don't want the "-C" option. |
| 12326 | @@ -14527,15 +15292,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 12327 | ;; |
| 12328 | pw32*) |
| 12329 | export_symbols_cmds_CXX="$ltdll_cmds" |
| 12330 | - ;; |
| 12331 | + ;; |
| 12332 | cygwin* | mingw* | cegcc*) |
| 12333 | - export_symbols_cmds_CXX='$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' |
| 12334 | - ;; |
| 12335 | + case $cc_basename in |
| 12336 | + cl*) ;; |
| 12337 | + *) |
| 12338 | + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 12339 | + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 12340 | + ;; |
| 12341 | + esac |
| 12342 | + ;; |
| 12343 | *) |
| 12344 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 12345 | - ;; |
| 12346 | + ;; |
| 12347 | esac |
| 12348 | - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 12349 | |
| 12350 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 |
| 12351 | $as_echo "$ld_shlibs_CXX" >&6; } |
| 12352 | @@ -14798,8 +15568,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 12353 | need_version=no |
| 12354 | need_lib_prefix=no |
| 12355 | |
| 12356 | - case $GCC,$host_os in |
| 12357 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 12358 | + case $GCC,$cc_basename in |
| 12359 | + yes,*) |
| 12360 | + # gcc |
| 12361 | library_names_spec='$libname.dll.a' |
| 12362 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 12363 | postinstall_cmds='base_file=`basename \${file}`~ |
| 12364 | @@ -14831,13 +15602,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 12365 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 12366 | ;; |
| 12367 | esac |
| 12368 | + dynamic_linker='Win32 ld.exe' |
| 12369 | + ;; |
| 12370 | + |
| 12371 | + *,cl*) |
| 12372 | + # Native MSVC |
| 12373 | + libname_spec='$name' |
| 12374 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 12375 | + library_names_spec='${libname}.dll.lib' |
| 12376 | + |
| 12377 | + case $build_os in |
| 12378 | + mingw*) |
| 12379 | + sys_lib_search_path_spec= |
| 12380 | + lt_save_ifs=$IFS |
| 12381 | + IFS=';' |
| 12382 | + for lt_path in $LIB |
| 12383 | + do |
| 12384 | + IFS=$lt_save_ifs |
| 12385 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 12386 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 12387 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 12388 | + done |
| 12389 | + IFS=$lt_save_ifs |
| 12390 | + # Convert to MSYS style. |
| 12391 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 12392 | + ;; |
| 12393 | + cygwin*) |
| 12394 | + # Convert to unix form, then to dos form, then back to unix form |
| 12395 | + # but this time dos style (no spaces!) so that the unix form looks |
| 12396 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 12397 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 12398 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 12399 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 12400 | + ;; |
| 12401 | + *) |
| 12402 | + sys_lib_search_path_spec="$LIB" |
| 12403 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 12404 | + # It is most probably a Windows format PATH. |
| 12405 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 12406 | + else |
| 12407 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 12408 | + fi |
| 12409 | + # FIXME: find the short name or the path components, as spaces are |
| 12410 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 12411 | + ;; |
| 12412 | + esac |
| 12413 | + |
| 12414 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 12415 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 12416 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 12417 | + dldir=$destdir/`dirname \$dlpath`~ |
| 12418 | + test -d \$dldir || mkdir -p \$dldir~ |
| 12419 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 12420 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 12421 | + dlpath=$dir/\$dldll~ |
| 12422 | + $RM \$dlpath' |
| 12423 | + shlibpath_overrides_runpath=yes |
| 12424 | + dynamic_linker='Win32 link.exe' |
| 12425 | ;; |
| 12426 | |
| 12427 | *) |
| 12428 | + # Assume MSVC wrapper |
| 12429 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 12430 | + dynamic_linker='Win32 ld.exe' |
| 12431 | ;; |
| 12432 | esac |
| 12433 | - dynamic_linker='Win32 ld.exe' |
| 12434 | # FIXME: first we should search . and the directory the executable is in |
| 12435 | shlibpath_var=PATH |
| 12436 | ;; |
| 12437 | @@ -15377,6 +16206,7 @@ fi |
| 12438 | fi # test -n "$compiler" |
| 12439 | |
| 12440 | CC=$lt_save_CC |
| 12441 | + CFLAGS=$lt_save_CFLAGS |
| 12442 | LDCXX=$LD |
| 12443 | LD=$lt_save_LD |
| 12444 | GCC=$lt_save_GCC |
| 12445 | @@ -16321,13 +17151,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 12446 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 12447 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 12448 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 12449 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 12450 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 12451 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 12452 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 12453 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 12454 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 12455 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 12456 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 12457 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 12458 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 12459 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 12460 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 12461 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 12462 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 12463 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 12464 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 12465 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 12466 | @@ -16342,14 +17179,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 12467 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 12468 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 12469 | 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"`' |
| 12470 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 12471 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 12472 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 12473 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 12474 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 12475 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 12476 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 12477 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 12478 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 12479 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 12480 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 12481 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 12482 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 12483 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 12484 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 12485 | @@ -16382,12 +17222,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 12486 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 12487 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 12488 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 12489 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 12490 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 12491 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 12492 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 12493 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 12494 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 12495 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 12496 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 12497 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 12498 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 12499 | @@ -16426,8 +17266,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
| 12500 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
| 12501 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
| 12502 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
| 12503 | -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 12504 | lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' |
| 12505 | +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 12506 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
| 12507 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
| 12508 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
| 12509 | @@ -16454,12 +17294,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
| 12510 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
| 12511 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
| 12512 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
| 12513 | -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' |
| 12514 | always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' |
| 12515 | export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 12516 | exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 12517 | include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 12518 | prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 12519 | +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 12520 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
| 12521 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
| 12522 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
| 12523 | @@ -16497,8 +17337,13 @@ reload_flag \ |
| 12524 | OBJDUMP \ |
| 12525 | deplibs_check_method \ |
| 12526 | file_magic_cmd \ |
| 12527 | +file_magic_glob \ |
| 12528 | +want_nocaseglob \ |
| 12529 | +DLLTOOL \ |
| 12530 | +sharedlib_from_linklib_cmd \ |
| 12531 | AR \ |
| 12532 | AR_FLAGS \ |
| 12533 | +archiver_list_spec \ |
| 12534 | STRIP \ |
| 12535 | RANLIB \ |
| 12536 | CC \ |
| 12537 | @@ -16508,12 +17353,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 12538 | lt_cv_sys_global_symbol_to_cdecl \ |
| 12539 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 12540 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 12541 | +nm_file_list_spec \ |
| 12542 | lt_prog_compiler_no_builtin_flag \ |
| 12543 | -lt_prog_compiler_wl \ |
| 12544 | lt_prog_compiler_pic \ |
| 12545 | +lt_prog_compiler_wl \ |
| 12546 | lt_prog_compiler_static \ |
| 12547 | lt_cv_prog_compiler_c_o \ |
| 12548 | need_locks \ |
| 12549 | +MANIFEST_TOOL \ |
| 12550 | DSYMUTIL \ |
| 12551 | NMEDIT \ |
| 12552 | LIPO \ |
| 12553 | @@ -16529,7 +17376,6 @@ no_undefined_flag \ |
| 12554 | hardcode_libdir_flag_spec \ |
| 12555 | hardcode_libdir_flag_spec_ld \ |
| 12556 | hardcode_libdir_separator \ |
| 12557 | -fix_srcfile_path \ |
| 12558 | exclude_expsyms \ |
| 12559 | include_expsyms \ |
| 12560 | file_list_spec \ |
| 12561 | @@ -16551,8 +17397,8 @@ LD_CXX \ |
| 12562 | reload_flag_CXX \ |
| 12563 | compiler_CXX \ |
| 12564 | lt_prog_compiler_no_builtin_flag_CXX \ |
| 12565 | -lt_prog_compiler_wl_CXX \ |
| 12566 | lt_prog_compiler_pic_CXX \ |
| 12567 | +lt_prog_compiler_wl_CXX \ |
| 12568 | lt_prog_compiler_static_CXX \ |
| 12569 | lt_cv_prog_compiler_c_o_CXX \ |
| 12570 | export_dynamic_flag_spec_CXX \ |
| 12571 | @@ -16564,7 +17410,6 @@ no_undefined_flag_CXX \ |
| 12572 | hardcode_libdir_flag_spec_CXX \ |
| 12573 | hardcode_libdir_flag_spec_ld_CXX \ |
| 12574 | hardcode_libdir_separator_CXX \ |
| 12575 | -fix_srcfile_path_CXX \ |
| 12576 | exclude_expsyms_CXX \ |
| 12577 | include_expsyms_CXX \ |
| 12578 | file_list_spec_CXX \ |
| 12579 | @@ -16598,6 +17443,7 @@ module_cmds \ |
| 12580 | module_expsym_cmds \ |
| 12581 | export_symbols_cmds \ |
| 12582 | prelink_cmds \ |
| 12583 | +postlink_cmds \ |
| 12584 | postinstall_cmds \ |
| 12585 | postuninstall_cmds \ |
| 12586 | finish_cmds \ |
| 12587 | @@ -16612,7 +17458,8 @@ archive_expsym_cmds_CXX \ |
| 12588 | module_cmds_CXX \ |
| 12589 | module_expsym_cmds_CXX \ |
| 12590 | export_symbols_cmds_CXX \ |
| 12591 | -prelink_cmds_CXX; do |
| 12592 | +prelink_cmds_CXX \ |
| 12593 | +postlink_cmds_CXX; do |
| 12594 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
| 12595 | *[\\\\\\\`\\"\\\$]*) |
| 12596 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
| 12597 | @@ -17366,7 +18213,8 @@ $as_echo X"$file" | |
| 12598 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 12599 | # |
| 12600 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 12601 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 12602 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 12603 | +# Inc. |
| 12604 | # Written by Gordon Matzigkeit, 1996 |
| 12605 | # |
| 12606 | # This file is part of GNU Libtool. |
| 12607 | @@ -17469,19 +18317,42 @@ SP2NL=$lt_lt_SP2NL |
| 12608 | # turn newlines into spaces. |
| 12609 | NL2SP=$lt_lt_NL2SP |
| 12610 | |
| 12611 | +# convert \$build file names to \$host format. |
| 12612 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 12613 | + |
| 12614 | +# convert \$build files to toolchain format. |
| 12615 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 12616 | + |
| 12617 | # An object symbol dumper. |
| 12618 | OBJDUMP=$lt_OBJDUMP |
| 12619 | |
| 12620 | # Method to check whether dependent libraries are shared objects. |
| 12621 | deplibs_check_method=$lt_deplibs_check_method |
| 12622 | |
| 12623 | -# Command to use when deplibs_check_method == "file_magic". |
| 12624 | +# Command to use when deplibs_check_method = "file_magic". |
| 12625 | file_magic_cmd=$lt_file_magic_cmd |
| 12626 | |
| 12627 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 12628 | +file_magic_glob=$lt_file_magic_glob |
| 12629 | + |
| 12630 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 12631 | +want_nocaseglob=$lt_want_nocaseglob |
| 12632 | + |
| 12633 | +# DLL creation program. |
| 12634 | +DLLTOOL=$lt_DLLTOOL |
| 12635 | + |
| 12636 | +# Command to associate shared and link libraries. |
| 12637 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 12638 | + |
| 12639 | # The archiver. |
| 12640 | AR=$lt_AR |
| 12641 | + |
| 12642 | +# Flags to create an archive. |
| 12643 | AR_FLAGS=$lt_AR_FLAGS |
| 12644 | |
| 12645 | +# How to feed a file listing to the archiver. |
| 12646 | +archiver_list_spec=$lt_archiver_list_spec |
| 12647 | + |
| 12648 | # A symbol stripping program. |
| 12649 | STRIP=$lt_STRIP |
| 12650 | |
| 12651 | @@ -17511,6 +18382,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 12652 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 12653 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 12654 | |
| 12655 | +# Specify filename containing input files for \$NM. |
| 12656 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 12657 | + |
| 12658 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 12659 | +lt_sysroot=$lt_sysroot |
| 12660 | + |
| 12661 | # The name of the directory that contains temporary libtool files. |
| 12662 | objdir=$objdir |
| 12663 | |
| 12664 | @@ -17520,6 +18397,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 12665 | # Must we lock files when doing compilation? |
| 12666 | need_locks=$lt_need_locks |
| 12667 | |
| 12668 | +# Manifest tool. |
| 12669 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 12670 | + |
| 12671 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 12672 | DSYMUTIL=$lt_DSYMUTIL |
| 12673 | |
| 12674 | @@ -17634,12 +18514,12 @@ with_gcc=$GCC |
| 12675 | # Compiler flag to turn off builtin functions. |
| 12676 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 12677 | |
| 12678 | -# How to pass a linker flag through the compiler. |
| 12679 | -wl=$lt_lt_prog_compiler_wl |
| 12680 | - |
| 12681 | # Additional compiler flags for building library objects. |
| 12682 | pic_flag=$lt_lt_prog_compiler_pic |
| 12683 | |
| 12684 | +# How to pass a linker flag through the compiler. |
| 12685 | +wl=$lt_lt_prog_compiler_wl |
| 12686 | + |
| 12687 | # Compiler flag to prevent dynamic linking. |
| 12688 | link_static_flag=$lt_lt_prog_compiler_static |
| 12689 | |
| 12690 | @@ -17726,9 +18606,6 @@ inherit_rpath=$inherit_rpath |
| 12691 | # Whether libtool must link a program against all its dependency libraries. |
| 12692 | link_all_deplibs=$link_all_deplibs |
| 12693 | |
| 12694 | -# Fix the shell variable \$srcfile for the compiler. |
| 12695 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 12696 | - |
| 12697 | # Set to "yes" if exported symbols are required. |
| 12698 | always_export_symbols=$always_export_symbols |
| 12699 | |
| 12700 | @@ -17744,6 +18621,9 @@ include_expsyms=$lt_include_expsyms |
| 12701 | # Commands necessary for linking programs (against libraries) with templates. |
| 12702 | prelink_cmds=$lt_prelink_cmds |
| 12703 | |
| 12704 | +# Commands necessary for finishing linking programs. |
| 12705 | +postlink_cmds=$lt_postlink_cmds |
| 12706 | + |
| 12707 | # Specify filename containing input files. |
| 12708 | file_list_spec=$lt_file_list_spec |
| 12709 | |
| 12710 | @@ -17790,210 +18670,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 12711 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 12712 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 12713 | # is reportedly fixed, but why not run on old versions too? |
| 12714 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 12715 | - || (rm -f "$cfgfile"; exit 1) |
| 12716 | - |
| 12717 | - case $xsi_shell in |
| 12718 | - yes) |
| 12719 | - cat << \_LT_EOF >> "$cfgfile" |
| 12720 | - |
| 12721 | -# func_dirname file append nondir_replacement |
| 12722 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 12723 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 12724 | -func_dirname () |
| 12725 | -{ |
| 12726 | - case ${1} in |
| 12727 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 12728 | - * ) func_dirname_result="${3}" ;; |
| 12729 | - esac |
| 12730 | -} |
| 12731 | - |
| 12732 | -# func_basename file |
| 12733 | -func_basename () |
| 12734 | -{ |
| 12735 | - func_basename_result="${1##*/}" |
| 12736 | -} |
| 12737 | - |
| 12738 | -# func_dirname_and_basename file append nondir_replacement |
| 12739 | -# perform func_basename and func_dirname in a single function |
| 12740 | -# call: |
| 12741 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 12742 | -# add APPEND to the result, otherwise set result |
| 12743 | -# to NONDIR_REPLACEMENT. |
| 12744 | -# value returned in "$func_dirname_result" |
| 12745 | -# basename: Compute filename of FILE. |
| 12746 | -# value retuned in "$func_basename_result" |
| 12747 | -# Implementation must be kept synchronized with func_dirname |
| 12748 | -# and func_basename. For efficiency, we do not delegate to |
| 12749 | -# those functions but instead duplicate the functionality here. |
| 12750 | -func_dirname_and_basename () |
| 12751 | -{ |
| 12752 | - case ${1} in |
| 12753 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 12754 | - * ) func_dirname_result="${3}" ;; |
| 12755 | - esac |
| 12756 | - func_basename_result="${1##*/}" |
| 12757 | -} |
| 12758 | - |
| 12759 | -# func_stripname prefix suffix name |
| 12760 | -# strip PREFIX and SUFFIX off of NAME. |
| 12761 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 12762 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 12763 | -# dot (in which case that matches only a dot). |
| 12764 | -func_stripname () |
| 12765 | -{ |
| 12766 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 12767 | - # positional parameters, so assign one to ordinary parameter first. |
| 12768 | - func_stripname_result=${3} |
| 12769 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 12770 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 12771 | -} |
| 12772 | - |
| 12773 | -# func_opt_split |
| 12774 | -func_opt_split () |
| 12775 | -{ |
| 12776 | - func_opt_split_opt=${1%%=*} |
| 12777 | - func_opt_split_arg=${1#*=} |
| 12778 | -} |
| 12779 | - |
| 12780 | -# func_lo2o object |
| 12781 | -func_lo2o () |
| 12782 | -{ |
| 12783 | - case ${1} in |
| 12784 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 12785 | - *) func_lo2o_result=${1} ;; |
| 12786 | - esac |
| 12787 | -} |
| 12788 | - |
| 12789 | -# func_xform libobj-or-source |
| 12790 | -func_xform () |
| 12791 | -{ |
| 12792 | - func_xform_result=${1%.*}.lo |
| 12793 | -} |
| 12794 | - |
| 12795 | -# func_arith arithmetic-term... |
| 12796 | -func_arith () |
| 12797 | -{ |
| 12798 | - func_arith_result=$(( $* )) |
| 12799 | -} |
| 12800 | - |
| 12801 | -# func_len string |
| 12802 | -# STRING may not start with a hyphen. |
| 12803 | -func_len () |
| 12804 | -{ |
| 12805 | - func_len_result=${#1} |
| 12806 | -} |
| 12807 | - |
| 12808 | -_LT_EOF |
| 12809 | - ;; |
| 12810 | - *) # Bourne compatible functions. |
| 12811 | - cat << \_LT_EOF >> "$cfgfile" |
| 12812 | - |
| 12813 | -# func_dirname file append nondir_replacement |
| 12814 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 12815 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 12816 | -func_dirname () |
| 12817 | -{ |
| 12818 | - # Extract subdirectory from the argument. |
| 12819 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 12820 | - if test "X$func_dirname_result" = "X${1}"; then |
| 12821 | - func_dirname_result="${3}" |
| 12822 | - else |
| 12823 | - func_dirname_result="$func_dirname_result${2}" |
| 12824 | - fi |
| 12825 | -} |
| 12826 | - |
| 12827 | -# func_basename file |
| 12828 | -func_basename () |
| 12829 | -{ |
| 12830 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 12831 | -} |
| 12832 | - |
| 12833 | - |
| 12834 | -# func_stripname prefix suffix name |
| 12835 | -# strip PREFIX and SUFFIX off of NAME. |
| 12836 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 12837 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 12838 | -# dot (in which case that matches only a dot). |
| 12839 | -# func_strip_suffix prefix name |
| 12840 | -func_stripname () |
| 12841 | -{ |
| 12842 | - case ${2} in |
| 12843 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 12844 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 12845 | - esac |
| 12846 | -} |
| 12847 | - |
| 12848 | -# sed scripts: |
| 12849 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 12850 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 12851 | - |
| 12852 | -# func_opt_split |
| 12853 | -func_opt_split () |
| 12854 | -{ |
| 12855 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 12856 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 12857 | -} |
| 12858 | - |
| 12859 | -# func_lo2o object |
| 12860 | -func_lo2o () |
| 12861 | -{ |
| 12862 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 12863 | -} |
| 12864 | - |
| 12865 | -# func_xform libobj-or-source |
| 12866 | -func_xform () |
| 12867 | -{ |
| 12868 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 12869 | -} |
| 12870 | - |
| 12871 | -# func_arith arithmetic-term... |
| 12872 | -func_arith () |
| 12873 | -{ |
| 12874 | - func_arith_result=`expr "$@"` |
| 12875 | -} |
| 12876 | - |
| 12877 | -# func_len string |
| 12878 | -# STRING may not start with a hyphen. |
| 12879 | -func_len () |
| 12880 | -{ |
| 12881 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 12882 | -} |
| 12883 | - |
| 12884 | -_LT_EOF |
| 12885 | -esac |
| 12886 | - |
| 12887 | -case $lt_shell_append in |
| 12888 | - yes) |
| 12889 | - cat << \_LT_EOF >> "$cfgfile" |
| 12890 | - |
| 12891 | -# func_append var value |
| 12892 | -# Append VALUE to the end of shell variable VAR. |
| 12893 | -func_append () |
| 12894 | -{ |
| 12895 | - eval "$1+=\$2" |
| 12896 | -} |
| 12897 | -_LT_EOF |
| 12898 | - ;; |
| 12899 | - *) |
| 12900 | - cat << \_LT_EOF >> "$cfgfile" |
| 12901 | - |
| 12902 | -# func_append var value |
| 12903 | -# Append VALUE to the end of shell variable VAR. |
| 12904 | -func_append () |
| 12905 | -{ |
| 12906 | - eval "$1=\$$1\$2" |
| 12907 | -} |
| 12908 | - |
| 12909 | -_LT_EOF |
| 12910 | - ;; |
| 12911 | - esac |
| 12912 | - |
| 12913 | - |
| 12914 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 12915 | - || (rm -f "$cfgfile"; exit 1) |
| 12916 | - |
| 12917 | - mv -f "$cfgfile" "$ofile" || |
| 12918 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 12919 | + || (rm -f "$cfgfile"; exit 1) |
| 12920 | + |
| 12921 | + if test x"$xsi_shell" = xyes; then |
| 12922 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 12923 | +func_dirname ()\ |
| 12924 | +{\ |
| 12925 | +\ case ${1} in\ |
| 12926 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 12927 | +\ * ) func_dirname_result="${3}" ;;\ |
| 12928 | +\ esac\ |
| 12929 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 12930 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 12931 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 12932 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 12933 | + |
| 12934 | + |
| 12935 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 12936 | +func_basename ()\ |
| 12937 | +{\ |
| 12938 | +\ func_basename_result="${1##*/}"\ |
| 12939 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 12940 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 12941 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 12942 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 12943 | + |
| 12944 | + |
| 12945 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 12946 | +func_dirname_and_basename ()\ |
| 12947 | +{\ |
| 12948 | +\ case ${1} in\ |
| 12949 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 12950 | +\ * ) func_dirname_result="${3}" ;;\ |
| 12951 | +\ esac\ |
| 12952 | +\ func_basename_result="${1##*/}"\ |
| 12953 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 12954 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 12955 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 12956 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 12957 | + |
| 12958 | + |
| 12959 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 12960 | +func_stripname ()\ |
| 12961 | +{\ |
| 12962 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 12963 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 12964 | +\ func_stripname_result=${3}\ |
| 12965 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 12966 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 12967 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 12968 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 12969 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 12970 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 12971 | + |
| 12972 | + |
| 12973 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 12974 | +func_split_long_opt ()\ |
| 12975 | +{\ |
| 12976 | +\ func_split_long_opt_name=${1%%=*}\ |
| 12977 | +\ func_split_long_opt_arg=${1#*=}\ |
| 12978 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 12979 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 12980 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 12981 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 12982 | + |
| 12983 | + |
| 12984 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 12985 | +func_split_short_opt ()\ |
| 12986 | +{\ |
| 12987 | +\ func_split_short_opt_arg=${1#??}\ |
| 12988 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 12989 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 12990 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 12991 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 12992 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 12993 | + |
| 12994 | + |
| 12995 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 12996 | +func_lo2o ()\ |
| 12997 | +{\ |
| 12998 | +\ case ${1} in\ |
| 12999 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 13000 | +\ *) func_lo2o_result=${1} ;;\ |
| 13001 | +\ esac\ |
| 13002 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 13003 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 13004 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 13005 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 13006 | + |
| 13007 | + |
| 13008 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 13009 | +func_xform ()\ |
| 13010 | +{\ |
| 13011 | + func_xform_result=${1%.*}.lo\ |
| 13012 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 13013 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 13014 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 13015 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 13016 | + |
| 13017 | + |
| 13018 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 13019 | +func_arith ()\ |
| 13020 | +{\ |
| 13021 | + func_arith_result=$(( $* ))\ |
| 13022 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 13023 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 13024 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 13025 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 13026 | + |
| 13027 | + |
| 13028 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 13029 | +func_len ()\ |
| 13030 | +{\ |
| 13031 | + func_len_result=${#1}\ |
| 13032 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 13033 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 13034 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 13035 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 13036 | + |
| 13037 | +fi |
| 13038 | + |
| 13039 | +if test x"$lt_shell_append" = xyes; then |
| 13040 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 13041 | +func_append ()\ |
| 13042 | +{\ |
| 13043 | + eval "${1}+=\\${2}"\ |
| 13044 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 13045 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 13046 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 13047 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 13048 | + |
| 13049 | + |
| 13050 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 13051 | +func_append_quoted ()\ |
| 13052 | +{\ |
| 13053 | +\ func_quote_for_eval "${2}"\ |
| 13054 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 13055 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 13056 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 13057 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 13058 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 13059 | + |
| 13060 | + |
| 13061 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 13062 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 13063 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 13064 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 13065 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 13066 | +else |
| 13067 | + # Save a `func_append' function call even when '+=' is not available |
| 13068 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 13069 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 13070 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 13071 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 13072 | +fi |
| 13073 | + |
| 13074 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 13075 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 13076 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 13077 | +fi |
| 13078 | + |
| 13079 | + |
| 13080 | + mv -f "$cfgfile" "$ofile" || |
| 13081 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 13082 | chmod +x "$ofile" |
| 13083 | |
| 13084 | @@ -18021,12 +18860,12 @@ with_gcc=$GCC_CXX |
| 13085 | # Compiler flag to turn off builtin functions. |
| 13086 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
| 13087 | |
| 13088 | -# How to pass a linker flag through the compiler. |
| 13089 | -wl=$lt_lt_prog_compiler_wl_CXX |
| 13090 | - |
| 13091 | # Additional compiler flags for building library objects. |
| 13092 | pic_flag=$lt_lt_prog_compiler_pic_CXX |
| 13093 | |
| 13094 | +# How to pass a linker flag through the compiler. |
| 13095 | +wl=$lt_lt_prog_compiler_wl_CXX |
| 13096 | + |
| 13097 | # Compiler flag to prevent dynamic linking. |
| 13098 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
| 13099 | |
| 13100 | @@ -18113,9 +18952,6 @@ inherit_rpath=$inherit_rpath_CXX |
| 13101 | # Whether libtool must link a program against all its dependency libraries. |
| 13102 | link_all_deplibs=$link_all_deplibs_CXX |
| 13103 | |
| 13104 | -# Fix the shell variable \$srcfile for the compiler. |
| 13105 | -fix_srcfile_path=$lt_fix_srcfile_path_CXX |
| 13106 | - |
| 13107 | # Set to "yes" if exported symbols are required. |
| 13108 | always_export_symbols=$always_export_symbols_CXX |
| 13109 | |
| 13110 | @@ -18131,6 +18967,9 @@ include_expsyms=$lt_include_expsyms_CXX |
| 13111 | # Commands necessary for linking programs (against libraries) with templates. |
| 13112 | prelink_cmds=$lt_prelink_cmds_CXX |
| 13113 | |
| 13114 | +# Commands necessary for finishing linking programs. |
| 13115 | +postlink_cmds=$lt_postlink_cmds_CXX |
| 13116 | + |
| 13117 | # Specify filename containing input files. |
| 13118 | file_list_spec=$lt_file_list_spec_CXX |
| 13119 | |
| 13120 | diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in |
| 13121 | index ba7fdd6e8ad..3a0fc5dbbe7 100644 |
| 13122 | --- a/gprofng/src/Makefile.in |
| 13123 | +++ b/gprofng/src/Makefile.in |
| 13124 | @@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@ |
| 13125 | CYGPATH_W = @CYGPATH_W@ |
| 13126 | DEFS = @DEFS@ |
| 13127 | DEPDIR = @DEPDIR@ |
| 13128 | +DLLTOOL = @DLLTOOL@ |
| 13129 | DSYMUTIL = @DSYMUTIL@ |
| 13130 | DUMPBIN = @DUMPBIN@ |
| 13131 | ECHO_C = @ECHO_C@ |
| 13132 | @@ -359,6 +360,7 @@ LN_S = @LN_S@ |
| 13133 | LTLIBOBJS = @LTLIBOBJS@ |
| 13134 | MAINT = @MAINT@ |
| 13135 | MAKEINFO = @MAKEINFO@ |
| 13136 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 13137 | MKDIR_P = @MKDIR_P@ |
| 13138 | NM = @NM@ |
| 13139 | NMEDIT = @NMEDIT@ |
| 13140 | diff --git a/ld/Makefile.in b/ld/Makefile.in |
| 13141 | index 782d4017a60..71bbe487aef 100644 |
| 13142 | --- a/ld/Makefile.in |
| 13143 | +++ b/ld/Makefile.in |
| 13144 | @@ -383,6 +383,7 @@ CYGPATH_W = @CYGPATH_W@ |
| 13145 | DATADIRNAME = @DATADIRNAME@ |
| 13146 | DEFS = @DEFS@ |
| 13147 | DEPDIR = @DEPDIR@ |
| 13148 | +DLLTOOL = @DLLTOOL@ |
| 13149 | DSYMUTIL = @DSYMUTIL@ |
| 13150 | DUMPBIN = @DUMPBIN@ |
| 13151 | ECHO_C = @ECHO_C@ |
| 13152 | @@ -433,6 +434,7 @@ LN_S = @LN_S@ |
| 13153 | LTLIBOBJS = @LTLIBOBJS@ |
| 13154 | MAINT = @MAINT@ |
| 13155 | MAKEINFO = @MAKEINFO@ |
| 13156 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 13157 | MKDIR_P = @MKDIR_P@ |
| 13158 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
| 13159 | MSGFMT = @MSGFMT@ |
| 13160 | @@ -481,6 +483,7 @@ abs_builddir = @abs_builddir@ |
| 13161 | abs_srcdir = @abs_srcdir@ |
| 13162 | abs_top_builddir = @abs_top_builddir@ |
| 13163 | abs_top_srcdir = @abs_top_srcdir@ |
| 13164 | +ac_ct_AR = @ac_ct_AR@ |
| 13165 | ac_ct_CC = @ac_ct_CC@ |
| 13166 | ac_ct_CXX = @ac_ct_CXX@ |
| 13167 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 13168 | diff --git a/ld/configure b/ld/configure |
| 13169 | index d0a467ac101..45b20013a45 100755 |
| 13170 | --- a/ld/configure |
| 13171 | +++ b/ld/configure |
| 13172 | @@ -700,8 +700,11 @@ OTOOL |
| 13173 | LIPO |
| 13174 | NMEDIT |
| 13175 | DSYMUTIL |
| 13176 | +MANIFEST_TOOL |
| 13177 | RANLIB |
| 13178 | +ac_ct_AR |
| 13179 | AR |
| 13180 | +DLLTOOL |
| 13181 | OBJDUMP |
| 13182 | LN_S |
| 13183 | NM |
| 13184 | @@ -828,6 +831,7 @@ enable_static |
| 13185 | with_pic |
| 13186 | enable_fast_install |
| 13187 | with_gnu_ld |
| 13188 | +with_libtool_sysroot |
| 13189 | enable_libtool_lock |
| 13190 | enable_plugins |
| 13191 | enable_largefile |
| 13192 | @@ -1552,6 +1556,8 @@ Optional Packages: |
| 13193 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 13194 | both] |
| 13195 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 13196 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 13197 | + (or the compiler's sysroot if not specified). |
| 13198 | --with-lib-path=dir1:dir2... set default LIB_PATH |
| 13199 | --with-sysroot=DIR Search for usr/lib et al within DIR. |
| 13200 | --with-system-zlib use installed libz |
| 13201 | @@ -5399,8 +5405,8 @@ esac |
| 13202 | |
| 13203 | |
| 13204 | |
| 13205 | -macro_version='2.2.7a' |
| 13206 | -macro_revision='1.3134' |
| 13207 | +macro_version='2.4' |
| 13208 | +macro_revision='1.3293' |
| 13209 | |
| 13210 | |
| 13211 | |
| 13212 | @@ -5440,7 +5446,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 13213 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 13214 | $as_echo_n "checking how to print strings... " >&6; } |
| 13215 | # Test print first, because it will be a builtin if present. |
| 13216 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 13217 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 13218 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 13219 | ECHO='print -r --' |
| 13220 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 13221 | @@ -6133,8 +6139,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 13222 | # Try some XSI features |
| 13223 | xsi_shell=no |
| 13224 | ( _lt_dummy="a/b/c" |
| 13225 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 13226 | - = c,a/b,, \ |
| 13227 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 13228 | + = c,a/b,b/c, \ |
| 13229 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 13230 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 13231 | && xsi_shell=yes |
| 13232 | @@ -6183,6 +6189,80 @@ esac |
| 13233 | |
| 13234 | |
| 13235 | |
| 13236 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 13237 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 13238 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 13239 | + $as_echo_n "(cached) " >&6 |
| 13240 | +else |
| 13241 | + case $host in |
| 13242 | + *-*-mingw* ) |
| 13243 | + case $build in |
| 13244 | + *-*-mingw* ) # actually msys |
| 13245 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 13246 | + ;; |
| 13247 | + *-*-cygwin* ) |
| 13248 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 13249 | + ;; |
| 13250 | + * ) # otherwise, assume *nix |
| 13251 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 13252 | + ;; |
| 13253 | + esac |
| 13254 | + ;; |
| 13255 | + *-*-cygwin* ) |
| 13256 | + case $build in |
| 13257 | + *-*-mingw* ) # actually msys |
| 13258 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 13259 | + ;; |
| 13260 | + *-*-cygwin* ) |
| 13261 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 13262 | + ;; |
| 13263 | + * ) # otherwise, assume *nix |
| 13264 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 13265 | + ;; |
| 13266 | + esac |
| 13267 | + ;; |
| 13268 | + * ) # unhandled hosts (and "normal" native builds) |
| 13269 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 13270 | + ;; |
| 13271 | +esac |
| 13272 | + |
| 13273 | +fi |
| 13274 | + |
| 13275 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 13276 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 13277 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 13278 | + |
| 13279 | + |
| 13280 | + |
| 13281 | + |
| 13282 | + |
| 13283 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 13284 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 13285 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 13286 | + $as_echo_n "(cached) " >&6 |
| 13287 | +else |
| 13288 | + #assume ordinary cross tools, or native build. |
| 13289 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 13290 | +case $host in |
| 13291 | + *-*-mingw* ) |
| 13292 | + case $build in |
| 13293 | + *-*-mingw* ) # actually msys |
| 13294 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 13295 | + ;; |
| 13296 | + esac |
| 13297 | + ;; |
| 13298 | +esac |
| 13299 | + |
| 13300 | +fi |
| 13301 | + |
| 13302 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 13303 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 13304 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 13305 | + |
| 13306 | + |
| 13307 | + |
| 13308 | + |
| 13309 | + |
| 13310 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 13311 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 13312 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 13313 | @@ -6199,6 +6279,11 @@ case $reload_flag in |
| 13314 | esac |
| 13315 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 13316 | case $host_os in |
| 13317 | + cygwin* | mingw* | pw32* | cegcc*) |
| 13318 | + if test "$GCC" != yes; then |
| 13319 | + reload_cmds=false |
| 13320 | + fi |
| 13321 | + ;; |
| 13322 | darwin*) |
| 13323 | if test "$GCC" = yes; then |
| 13324 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 13325 | @@ -6367,7 +6452,8 @@ mingw* | pw32*) |
| 13326 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 13327 | lt_cv_file_magic_cmd='func_win32_libid' |
| 13328 | else |
| 13329 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 13330 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 13331 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 13332 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 13333 | fi |
| 13334 | ;; |
| 13335 | @@ -6521,6 +6607,21 @@ esac |
| 13336 | fi |
| 13337 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 13338 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 13339 | + |
| 13340 | +file_magic_glob= |
| 13341 | +want_nocaseglob=no |
| 13342 | +if test "$build" = "$host"; then |
| 13343 | + case $host_os in |
| 13344 | + mingw* | pw32*) |
| 13345 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 13346 | + want_nocaseglob=yes |
| 13347 | + else |
| 13348 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 13349 | + fi |
| 13350 | + ;; |
| 13351 | + esac |
| 13352 | +fi |
| 13353 | + |
| 13354 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 13355 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 13356 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 13357 | @@ -6536,6 +6637,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 13358 | |
| 13359 | |
| 13360 | |
| 13361 | + |
| 13362 | + |
| 13363 | + |
| 13364 | + |
| 13365 | + |
| 13366 | + |
| 13367 | + |
| 13368 | + |
| 13369 | + |
| 13370 | + |
| 13371 | +if test -n "$ac_tool_prefix"; then |
| 13372 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 13373 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 13374 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 13375 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 13376 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 13377 | + $as_echo_n "(cached) " >&6 |
| 13378 | +else |
| 13379 | + if test -n "$DLLTOOL"; then |
| 13380 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 13381 | +else |
| 13382 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 13383 | +for as_dir in $PATH |
| 13384 | +do |
| 13385 | + IFS=$as_save_IFS |
| 13386 | + test -z "$as_dir" && as_dir=. |
| 13387 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 13388 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 13389 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 13390 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 13391 | + break 2 |
| 13392 | + fi |
| 13393 | +done |
| 13394 | + done |
| 13395 | +IFS=$as_save_IFS |
| 13396 | + |
| 13397 | +fi |
| 13398 | +fi |
| 13399 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 13400 | +if test -n "$DLLTOOL"; then |
| 13401 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 13402 | +$as_echo "$DLLTOOL" >&6; } |
| 13403 | +else |
| 13404 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 13405 | +$as_echo "no" >&6; } |
| 13406 | +fi |
| 13407 | + |
| 13408 | + |
| 13409 | +fi |
| 13410 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 13411 | + ac_ct_DLLTOOL=$DLLTOOL |
| 13412 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 13413 | +set dummy dlltool; ac_word=$2 |
| 13414 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 13415 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 13416 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 13417 | + $as_echo_n "(cached) " >&6 |
| 13418 | +else |
| 13419 | + if test -n "$ac_ct_DLLTOOL"; then |
| 13420 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 13421 | +else |
| 13422 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 13423 | +for as_dir in $PATH |
| 13424 | +do |
| 13425 | + IFS=$as_save_IFS |
| 13426 | + test -z "$as_dir" && as_dir=. |
| 13427 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 13428 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 13429 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 13430 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 13431 | + break 2 |
| 13432 | + fi |
| 13433 | +done |
| 13434 | + done |
| 13435 | +IFS=$as_save_IFS |
| 13436 | + |
| 13437 | +fi |
| 13438 | +fi |
| 13439 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 13440 | +if test -n "$ac_ct_DLLTOOL"; then |
| 13441 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 13442 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 13443 | +else |
| 13444 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 13445 | +$as_echo "no" >&6; } |
| 13446 | +fi |
| 13447 | + |
| 13448 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 13449 | + DLLTOOL="false" |
| 13450 | + else |
| 13451 | + case $cross_compiling:$ac_tool_warned in |
| 13452 | +yes:) |
| 13453 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 13454 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 13455 | +ac_tool_warned=yes ;; |
| 13456 | +esac |
| 13457 | + DLLTOOL=$ac_ct_DLLTOOL |
| 13458 | + fi |
| 13459 | +else |
| 13460 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 13461 | +fi |
| 13462 | + |
| 13463 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 13464 | + |
| 13465 | + |
| 13466 | + |
| 13467 | + |
| 13468 | + |
| 13469 | + |
| 13470 | + |
| 13471 | + |
| 13472 | + |
| 13473 | + |
| 13474 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 13475 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 13476 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 13477 | + $as_echo_n "(cached) " >&6 |
| 13478 | +else |
| 13479 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 13480 | + |
| 13481 | +case $host_os in |
| 13482 | +cygwin* | mingw* | pw32* | cegcc*) |
| 13483 | + # two different shell functions defined in ltmain.sh |
| 13484 | + # decide which to use based on capabilities of $DLLTOOL |
| 13485 | + case `$DLLTOOL --help 2>&1` in |
| 13486 | + *--identify-strict*) |
| 13487 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 13488 | + ;; |
| 13489 | + *) |
| 13490 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 13491 | + ;; |
| 13492 | + esac |
| 13493 | + ;; |
| 13494 | +*) |
| 13495 | + # fallback: assume linklib IS sharedlib |
| 13496 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 13497 | + ;; |
| 13498 | +esac |
| 13499 | + |
| 13500 | +fi |
| 13501 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 13502 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 13503 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 13504 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 13505 | + |
| 13506 | + |
| 13507 | + |
| 13508 | + |
| 13509 | + |
| 13510 | + |
| 13511 | + |
| 13512 | plugin_option= |
| 13513 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 13514 | for plugin in $plugin_names; do |
| 13515 | @@ -6550,8 +6802,10 @@ for plugin in $plugin_names; do |
| 13516 | done |
| 13517 | |
| 13518 | if test -n "$ac_tool_prefix"; then |
| 13519 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 13520 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 13521 | + for ac_prog in ar |
| 13522 | + do |
| 13523 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 13524 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 13525 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 13526 | $as_echo_n "checking for $ac_word... " >&6; } |
| 13527 | if ${ac_cv_prog_AR+:} false; then : |
| 13528 | @@ -6567,7 +6821,7 @@ do |
| 13529 | test -z "$as_dir" && as_dir=. |
| 13530 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 13531 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 13532 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 13533 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 13534 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 13535 | break 2 |
| 13536 | fi |
| 13537 | @@ -6587,11 +6841,15 @@ $as_echo "no" >&6; } |
| 13538 | fi |
| 13539 | |
| 13540 | |
| 13541 | + test -n "$AR" && break |
| 13542 | + done |
| 13543 | fi |
| 13544 | -if test -z "$ac_cv_prog_AR"; then |
| 13545 | +if test -z "$AR"; then |
| 13546 | ac_ct_AR=$AR |
| 13547 | - # Extract the first word of "ar", so it can be a program name with args. |
| 13548 | -set dummy ar; ac_word=$2 |
| 13549 | + for ac_prog in ar |
| 13550 | +do |
| 13551 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 13552 | +set dummy $ac_prog; ac_word=$2 |
| 13553 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 13554 | $as_echo_n "checking for $ac_word... " >&6; } |
| 13555 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 13556 | @@ -6607,7 +6865,7 @@ do |
| 13557 | test -z "$as_dir" && as_dir=. |
| 13558 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 13559 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 13560 | - ac_cv_prog_ac_ct_AR="ar" |
| 13561 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 13562 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 13563 | break 2 |
| 13564 | fi |
| 13565 | @@ -6626,6 +6884,10 @@ else |
| 13566 | $as_echo "no" >&6; } |
| 13567 | fi |
| 13568 | |
| 13569 | + |
| 13570 | + test -n "$ac_ct_AR" && break |
| 13571 | +done |
| 13572 | + |
| 13573 | if test "x$ac_ct_AR" = x; then |
| 13574 | AR="false" |
| 13575 | else |
| 13576 | @@ -6637,25 +6899,19 @@ ac_tool_warned=yes ;; |
| 13577 | esac |
| 13578 | AR=$ac_ct_AR |
| 13579 | fi |
| 13580 | -else |
| 13581 | - AR="$ac_cv_prog_AR" |
| 13582 | fi |
| 13583 | |
| 13584 | -test -z "$AR" && AR=ar |
| 13585 | -if test -n "$plugin_option"; then |
| 13586 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 13587 | - touch conftest.c |
| 13588 | - $AR $plugin_option rc conftest.a conftest.c |
| 13589 | - if test "$?" != 0; then |
| 13590 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 13591 | + touch conftest.c |
| 13592 | + $AR $plugin_option rc conftest.a conftest.c |
| 13593 | + if test "$?" != 0; then |
| 13594 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 13595 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 13596 | - else |
| 13597 | - AR="$AR $plugin_option" |
| 13598 | - fi |
| 13599 | - rm -f conftest.* |
| 13600 | + else |
| 13601 | + AR="$AR $plugin_option" |
| 13602 | fi |
| 13603 | -fi |
| 13604 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 13605 | + rm -f conftest.* |
| 13606 | +: ${AR=ar} |
| 13607 | +: ${AR_FLAGS=cru} |
| 13608 | |
| 13609 | |
| 13610 | |
| 13611 | @@ -6667,6 +6923,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 13612 | |
| 13613 | |
| 13614 | |
| 13615 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 13616 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 13617 | +if ${lt_cv_ar_at_file+:} false; then : |
| 13618 | + $as_echo_n "(cached) " >&6 |
| 13619 | +else |
| 13620 | + lt_cv_ar_at_file=no |
| 13621 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 13622 | +/* end confdefs.h. */ |
| 13623 | + |
| 13624 | +int |
| 13625 | +main () |
| 13626 | +{ |
| 13627 | + |
| 13628 | + ; |
| 13629 | + return 0; |
| 13630 | +} |
| 13631 | +_ACEOF |
| 13632 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 13633 | + echo conftest.$ac_objext > conftest.lst |
| 13634 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 13635 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 13636 | + (eval $lt_ar_try) 2>&5 |
| 13637 | + ac_status=$? |
| 13638 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 13639 | + test $ac_status = 0; } |
| 13640 | + if test "$ac_status" -eq 0; then |
| 13641 | + # Ensure the archiver fails upon bogus file names. |
| 13642 | + rm -f conftest.$ac_objext libconftest.a |
| 13643 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 13644 | + (eval $lt_ar_try) 2>&5 |
| 13645 | + ac_status=$? |
| 13646 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 13647 | + test $ac_status = 0; } |
| 13648 | + if test "$ac_status" -ne 0; then |
| 13649 | + lt_cv_ar_at_file=@ |
| 13650 | + fi |
| 13651 | + fi |
| 13652 | + rm -f conftest.* libconftest.a |
| 13653 | + |
| 13654 | +fi |
| 13655 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 13656 | + |
| 13657 | +fi |
| 13658 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 13659 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 13660 | + |
| 13661 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 13662 | + archiver_list_spec= |
| 13663 | +else |
| 13664 | + archiver_list_spec=$lt_cv_ar_at_file |
| 13665 | +fi |
| 13666 | + |
| 13667 | + |
| 13668 | + |
| 13669 | + |
| 13670 | + |
| 13671 | + |
| 13672 | + |
| 13673 | if test -n "$ac_tool_prefix"; then |
| 13674 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 13675 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 13676 | @@ -7006,8 +7320,8 @@ esac |
| 13677 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 13678 | |
| 13679 | # Transform an extracted symbol line into symbol name and symbol address |
| 13680 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 13681 | -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'" |
| 13682 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 13683 | +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'" |
| 13684 | |
| 13685 | # Handle CRLF in mingw tool chain |
| 13686 | opt_cr= |
| 13687 | @@ -7043,6 +7357,7 @@ for ac_symprfx in "" "_"; do |
| 13688 | else |
| 13689 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 13690 | fi |
| 13691 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 13692 | |
| 13693 | # Check to see that the pipe works correctly. |
| 13694 | pipe_works=no |
| 13695 | @@ -7084,6 +7399,18 @@ _LT_EOF |
| 13696 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 13697 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 13698 | cat <<_LT_EOF > conftest.$ac_ext |
| 13699 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 13700 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 13701 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 13702 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 13703 | +# define LT_DLSYM_CONST |
| 13704 | +#elif defined(__osf__) |
| 13705 | +/* This system does not cope well with relocations in const data. */ |
| 13706 | +# define LT_DLSYM_CONST |
| 13707 | +#else |
| 13708 | +# define LT_DLSYM_CONST const |
| 13709 | +#endif |
| 13710 | + |
| 13711 | #ifdef __cplusplus |
| 13712 | extern "C" { |
| 13713 | #endif |
| 13714 | @@ -7095,7 +7422,7 @@ _LT_EOF |
| 13715 | cat <<_LT_EOF >> conftest.$ac_ext |
| 13716 | |
| 13717 | /* The mapping between symbol names and symbols. */ |
| 13718 | -const struct { |
| 13719 | +LT_DLSYM_CONST struct { |
| 13720 | const char *name; |
| 13721 | void *address; |
| 13722 | } |
| 13723 | @@ -7121,8 +7448,8 @@ static const void *lt_preloaded_setup() { |
| 13724 | _LT_EOF |
| 13725 | # Now try linking the two files. |
| 13726 | mv conftest.$ac_objext conftstm.$ac_objext |
| 13727 | - lt_save_LIBS="$LIBS" |
| 13728 | - lt_save_CFLAGS="$CFLAGS" |
| 13729 | + lt_globsym_save_LIBS=$LIBS |
| 13730 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 13731 | LIBS="conftstm.$ac_objext" |
| 13732 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 13733 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 13734 | @@ -7132,8 +7459,8 @@ _LT_EOF |
| 13735 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 13736 | pipe_works=yes |
| 13737 | fi |
| 13738 | - LIBS="$lt_save_LIBS" |
| 13739 | - CFLAGS="$lt_save_CFLAGS" |
| 13740 | + LIBS=$lt_globsym_save_LIBS |
| 13741 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 13742 | else |
| 13743 | echo "cannot find nm_test_func in $nlist" >&5 |
| 13744 | fi |
| 13745 | @@ -7170,6 +7497,17 @@ else |
| 13746 | $as_echo "ok" >&6; } |
| 13747 | fi |
| 13748 | |
| 13749 | +# Response file support. |
| 13750 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 13751 | + nm_file_list_spec='@' |
| 13752 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 13753 | + nm_file_list_spec='@' |
| 13754 | +fi |
| 13755 | + |
| 13756 | + |
| 13757 | + |
| 13758 | + |
| 13759 | + |
| 13760 | |
| 13761 | |
| 13762 | |
| 13763 | @@ -7186,6 +7524,44 @@ fi |
| 13764 | |
| 13765 | |
| 13766 | |
| 13767 | + |
| 13768 | + |
| 13769 | + |
| 13770 | + |
| 13771 | + |
| 13772 | + |
| 13773 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 13774 | +$as_echo_n "checking for sysroot... " >&6; } |
| 13775 | + |
| 13776 | +# Check whether --with-libtool-sysroot was given. |
| 13777 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 13778 | + withval=$with_libtool_sysroot; |
| 13779 | +else |
| 13780 | + with_libtool_sysroot=no |
| 13781 | +fi |
| 13782 | + |
| 13783 | + |
| 13784 | +lt_sysroot= |
| 13785 | +case ${with_libtool_sysroot} in #( |
| 13786 | + yes) |
| 13787 | + if test "$GCC" = yes; then |
| 13788 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 13789 | + fi |
| 13790 | + ;; #( |
| 13791 | + /*) |
| 13792 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 13793 | + ;; #( |
| 13794 | + no|'') |
| 13795 | + ;; #( |
| 13796 | + *) |
| 13797 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 13798 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 13799 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 13800 | + ;; |
| 13801 | +esac |
| 13802 | + |
| 13803 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 13804 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 13805 | |
| 13806 | |
| 13807 | |
| 13808 | @@ -7397,6 +7773,123 @@ esac |
| 13809 | |
| 13810 | need_locks="$enable_libtool_lock" |
| 13811 | |
| 13812 | +if test -n "$ac_tool_prefix"; then |
| 13813 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 13814 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 13815 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 13816 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 13817 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 13818 | + $as_echo_n "(cached) " >&6 |
| 13819 | +else |
| 13820 | + if test -n "$MANIFEST_TOOL"; then |
| 13821 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 13822 | +else |
| 13823 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 13824 | +for as_dir in $PATH |
| 13825 | +do |
| 13826 | + IFS=$as_save_IFS |
| 13827 | + test -z "$as_dir" && as_dir=. |
| 13828 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 13829 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 13830 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 13831 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 13832 | + break 2 |
| 13833 | + fi |
| 13834 | +done |
| 13835 | + done |
| 13836 | +IFS=$as_save_IFS |
| 13837 | + |
| 13838 | +fi |
| 13839 | +fi |
| 13840 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 13841 | +if test -n "$MANIFEST_TOOL"; then |
| 13842 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 13843 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 13844 | +else |
| 13845 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 13846 | +$as_echo "no" >&6; } |
| 13847 | +fi |
| 13848 | + |
| 13849 | + |
| 13850 | +fi |
| 13851 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 13852 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 13853 | + # Extract the first word of "mt", so it can be a program name with args. |
| 13854 | +set dummy mt; ac_word=$2 |
| 13855 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 13856 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 13857 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 13858 | + $as_echo_n "(cached) " >&6 |
| 13859 | +else |
| 13860 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 13861 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 13862 | +else |
| 13863 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 13864 | +for as_dir in $PATH |
| 13865 | +do |
| 13866 | + IFS=$as_save_IFS |
| 13867 | + test -z "$as_dir" && as_dir=. |
| 13868 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 13869 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 13870 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 13871 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 13872 | + break 2 |
| 13873 | + fi |
| 13874 | +done |
| 13875 | + done |
| 13876 | +IFS=$as_save_IFS |
| 13877 | + |
| 13878 | +fi |
| 13879 | +fi |
| 13880 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 13881 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 13882 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 13883 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 13884 | +else |
| 13885 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 13886 | +$as_echo "no" >&6; } |
| 13887 | +fi |
| 13888 | + |
| 13889 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 13890 | + MANIFEST_TOOL=":" |
| 13891 | + else |
| 13892 | + case $cross_compiling:$ac_tool_warned in |
| 13893 | +yes:) |
| 13894 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 13895 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 13896 | +ac_tool_warned=yes ;; |
| 13897 | +esac |
| 13898 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 13899 | + fi |
| 13900 | +else |
| 13901 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 13902 | +fi |
| 13903 | + |
| 13904 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 13905 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 13906 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 13907 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 13908 | + $as_echo_n "(cached) " >&6 |
| 13909 | +else |
| 13910 | + lt_cv_path_mainfest_tool=no |
| 13911 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 13912 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 13913 | + cat conftest.err >&5 |
| 13914 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 13915 | + lt_cv_path_mainfest_tool=yes |
| 13916 | + fi |
| 13917 | + rm -f conftest* |
| 13918 | +fi |
| 13919 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 13920 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 13921 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 13922 | + MANIFEST_TOOL=: |
| 13923 | +fi |
| 13924 | + |
| 13925 | + |
| 13926 | + |
| 13927 | + |
| 13928 | + |
| 13929 | |
| 13930 | case $host_os in |
| 13931 | rhapsody* | darwin*) |
| 13932 | @@ -7960,6 +8453,8 @@ _LT_EOF |
| 13933 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 13934 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 13935 | $AR cru libconftest.a conftest.o 2>&5 |
| 13936 | + echo "$RANLIB libconftest.a" >&5 |
| 13937 | + $RANLIB libconftest.a 2>&5 |
| 13938 | cat > conftest.c << _LT_EOF |
| 13939 | int main() { return 0;} |
| 13940 | _LT_EOF |
| 13941 | @@ -8028,6 +8523,16 @@ done |
| 13942 | |
| 13943 | |
| 13944 | |
| 13945 | +func_stripname_cnf () |
| 13946 | +{ |
| 13947 | + case ${2} in |
| 13948 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 13949 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 13950 | + esac |
| 13951 | +} # func_stripname_cnf |
| 13952 | + |
| 13953 | + |
| 13954 | + |
| 13955 | |
| 13956 | |
| 13957 | # Set options |
| 13958 | @@ -8543,8 +9048,6 @@ fi |
| 13959 | lt_prog_compiler_pic= |
| 13960 | lt_prog_compiler_static= |
| 13961 | |
| 13962 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 13963 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 13964 | |
| 13965 | if test "$GCC" = yes; then |
| 13966 | lt_prog_compiler_wl='-Wl,' |
| 13967 | @@ -8710,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 13968 | lt_prog_compiler_pic='--shared' |
| 13969 | lt_prog_compiler_static='--static' |
| 13970 | ;; |
| 13971 | + nagfor*) |
| 13972 | + # NAG Fortran compiler |
| 13973 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 13974 | + lt_prog_compiler_pic='-PIC' |
| 13975 | + lt_prog_compiler_static='-Bstatic' |
| 13976 | + ;; |
| 13977 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 13978 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 13979 | # which looks to be a dead project) |
| 13980 | @@ -8772,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 13981 | lt_prog_compiler_pic='-KPIC' |
| 13982 | lt_prog_compiler_static='-Bstatic' |
| 13983 | case $cc_basename in |
| 13984 | - f77* | f90* | f95*) |
| 13985 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 13986 | lt_prog_compiler_wl='-Qoption ld ';; |
| 13987 | *) |
| 13988 | lt_prog_compiler_wl='-Wl,';; |
| 13989 | @@ -8829,13 +9338,17 @@ case $host_os in |
| 13990 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 13991 | ;; |
| 13992 | esac |
| 13993 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 13994 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 13995 | - |
| 13996 | - |
| 13997 | - |
| 13998 | - |
| 13999 | |
| 14000 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 14001 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 14002 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 14003 | + $as_echo_n "(cached) " >&6 |
| 14004 | +else |
| 14005 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 14006 | +fi |
| 14007 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 14008 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 14009 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 14010 | |
| 14011 | # |
| 14012 | # Check to make sure the PIC flag actually works. |
| 14013 | @@ -8896,6 +9409,11 @@ fi |
| 14014 | |
| 14015 | |
| 14016 | |
| 14017 | + |
| 14018 | + |
| 14019 | + |
| 14020 | + |
| 14021 | + |
| 14022 | # |
| 14023 | # Check to make sure the static flag actually works. |
| 14024 | # |
| 14025 | @@ -9246,7 +9764,8 @@ _LT_EOF |
| 14026 | allow_undefined_flag=unsupported |
| 14027 | always_export_symbols=no |
| 14028 | enable_shared_with_static_runtimes=yes |
| 14029 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 14030 | + 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' |
| 14031 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 14032 | |
| 14033 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 14034 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 14035 | @@ -9345,12 +9864,12 @@ _LT_EOF |
| 14036 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 14037 | hardcode_libdir_flag_spec= |
| 14038 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 14039 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 14040 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 14041 | if test "x$supports_anon_versioning" = xyes; then |
| 14042 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 14043 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 14044 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 14045 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 14046 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 14047 | fi |
| 14048 | ;; |
| 14049 | esac |
| 14050 | @@ -9364,8 +9883,8 @@ _LT_EOF |
| 14051 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 14052 | wlarc= |
| 14053 | else |
| 14054 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 14055 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 14056 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 14057 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 14058 | fi |
| 14059 | ;; |
| 14060 | |
| 14061 | @@ -9383,8 +9902,8 @@ _LT_EOF |
| 14062 | |
| 14063 | _LT_EOF |
| 14064 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 14065 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 14066 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 14067 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 14068 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 14069 | else |
| 14070 | ld_shlibs=no |
| 14071 | fi |
| 14072 | @@ -9430,8 +9949,8 @@ _LT_EOF |
| 14073 | |
| 14074 | *) |
| 14075 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 14076 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 14077 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 14078 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 14079 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 14080 | else |
| 14081 | ld_shlibs=no |
| 14082 | fi |
| 14083 | @@ -9561,7 +10080,13 @@ _LT_EOF |
| 14084 | allow_undefined_flag='-berok' |
| 14085 | # Determine the default libpath from the value encoded in an |
| 14086 | # empty executable. |
| 14087 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14088 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 14089 | + aix_libpath=$lt_cv_aix_libpath |
| 14090 | +else |
| 14091 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 14092 | + $as_echo_n "(cached) " >&6 |
| 14093 | +else |
| 14094 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14095 | /* end confdefs.h. */ |
| 14096 | |
| 14097 | int |
| 14098 | @@ -9574,22 +10099,29 @@ main () |
| 14099 | _ACEOF |
| 14100 | if ac_fn_c_try_link "$LINENO"; then : |
| 14101 | |
| 14102 | -lt_aix_libpath_sed=' |
| 14103 | - /Import File Strings/,/^$/ { |
| 14104 | - /^0/ { |
| 14105 | - s/^0 *\(.*\)$/\1/ |
| 14106 | - p |
| 14107 | - } |
| 14108 | - }' |
| 14109 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14110 | -# Check for a 64-bit object if we didn't find anything. |
| 14111 | -if test -z "$aix_libpath"; then |
| 14112 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14113 | -fi |
| 14114 | + lt_aix_libpath_sed=' |
| 14115 | + /Import File Strings/,/^$/ { |
| 14116 | + /^0/ { |
| 14117 | + s/^0 *\([^ ]*\) *$/\1/ |
| 14118 | + p |
| 14119 | + } |
| 14120 | + }' |
| 14121 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14122 | + # Check for a 64-bit object if we didn't find anything. |
| 14123 | + if test -z "$lt_cv_aix_libpath_"; then |
| 14124 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14125 | + fi |
| 14126 | fi |
| 14127 | rm -f core conftest.err conftest.$ac_objext \ |
| 14128 | conftest$ac_exeext conftest.$ac_ext |
| 14129 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14130 | + if test -z "$lt_cv_aix_libpath_"; then |
| 14131 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 14132 | + fi |
| 14133 | + |
| 14134 | +fi |
| 14135 | + |
| 14136 | + aix_libpath=$lt_cv_aix_libpath_ |
| 14137 | +fi |
| 14138 | |
| 14139 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 14140 | 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" |
| 14141 | @@ -9601,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14142 | else |
| 14143 | # Determine the default libpath from the value encoded in an |
| 14144 | # empty executable. |
| 14145 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14146 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 14147 | + aix_libpath=$lt_cv_aix_libpath |
| 14148 | +else |
| 14149 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 14150 | + $as_echo_n "(cached) " >&6 |
| 14151 | +else |
| 14152 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14153 | /* end confdefs.h. */ |
| 14154 | |
| 14155 | int |
| 14156 | @@ -9614,22 +10152,29 @@ main () |
| 14157 | _ACEOF |
| 14158 | if ac_fn_c_try_link "$LINENO"; then : |
| 14159 | |
| 14160 | -lt_aix_libpath_sed=' |
| 14161 | - /Import File Strings/,/^$/ { |
| 14162 | - /^0/ { |
| 14163 | - s/^0 *\(.*\)$/\1/ |
| 14164 | - p |
| 14165 | - } |
| 14166 | - }' |
| 14167 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14168 | -# Check for a 64-bit object if we didn't find anything. |
| 14169 | -if test -z "$aix_libpath"; then |
| 14170 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14171 | -fi |
| 14172 | + lt_aix_libpath_sed=' |
| 14173 | + /Import File Strings/,/^$/ { |
| 14174 | + /^0/ { |
| 14175 | + s/^0 *\([^ ]*\) *$/\1/ |
| 14176 | + p |
| 14177 | + } |
| 14178 | + }' |
| 14179 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14180 | + # Check for a 64-bit object if we didn't find anything. |
| 14181 | + if test -z "$lt_cv_aix_libpath_"; then |
| 14182 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14183 | + fi |
| 14184 | fi |
| 14185 | rm -f core conftest.err conftest.$ac_objext \ |
| 14186 | conftest$ac_exeext conftest.$ac_ext |
| 14187 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14188 | + if test -z "$lt_cv_aix_libpath_"; then |
| 14189 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 14190 | + fi |
| 14191 | + |
| 14192 | +fi |
| 14193 | + |
| 14194 | + aix_libpath=$lt_cv_aix_libpath_ |
| 14195 | +fi |
| 14196 | |
| 14197 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 14198 | # Warning - without using the other run time loading flags, |
| 14199 | @@ -9673,21 +10218,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14200 | # When not using gcc, we currently assume that we are using |
| 14201 | # Microsoft Visual C++. |
| 14202 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 14203 | - # no search path for DLLs. |
| 14204 | - hardcode_libdir_flag_spec=' ' |
| 14205 | - allow_undefined_flag=unsupported |
| 14206 | - # Tell ltmain to make .lib files, not .a files. |
| 14207 | - libext=lib |
| 14208 | - # Tell ltmain to make .dll files, not .so files. |
| 14209 | - shrext_cmds=".dll" |
| 14210 | - # FIXME: Setting linknames here is a bad hack. |
| 14211 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 14212 | - # The linker will automatically build a .lib file if we build a DLL. |
| 14213 | - old_archive_from_new_cmds='true' |
| 14214 | - # FIXME: Should let the user specify the lib program. |
| 14215 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 14216 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 14217 | - enable_shared_with_static_runtimes=yes |
| 14218 | + # no search path for DLLs. |
| 14219 | + case $cc_basename in |
| 14220 | + cl*) |
| 14221 | + # Native MSVC |
| 14222 | + hardcode_libdir_flag_spec=' ' |
| 14223 | + allow_undefined_flag=unsupported |
| 14224 | + always_export_symbols=yes |
| 14225 | + file_list_spec='@' |
| 14226 | + # Tell ltmain to make .lib files, not .a files. |
| 14227 | + libext=lib |
| 14228 | + # Tell ltmain to make .dll files, not .so files. |
| 14229 | + shrext_cmds=".dll" |
| 14230 | + # FIXME: Setting linknames here is a bad hack. |
| 14231 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 14232 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 14233 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 14234 | + else |
| 14235 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 14236 | + fi~ |
| 14237 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 14238 | + linknames=' |
| 14239 | + # The linker will not automatically build a static lib if we build a DLL. |
| 14240 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 14241 | + enable_shared_with_static_runtimes=yes |
| 14242 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 14243 | + # Don't use ranlib |
| 14244 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 14245 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 14246 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 14247 | + case $lt_outputfile in |
| 14248 | + *.exe|*.EXE) ;; |
| 14249 | + *) |
| 14250 | + lt_outputfile="$lt_outputfile.exe" |
| 14251 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 14252 | + ;; |
| 14253 | + esac~ |
| 14254 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 14255 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 14256 | + $RM "$lt_outputfile.manifest"; |
| 14257 | + fi' |
| 14258 | + ;; |
| 14259 | + *) |
| 14260 | + # Assume MSVC wrapper |
| 14261 | + hardcode_libdir_flag_spec=' ' |
| 14262 | + allow_undefined_flag=unsupported |
| 14263 | + # Tell ltmain to make .lib files, not .a files. |
| 14264 | + libext=lib |
| 14265 | + # Tell ltmain to make .dll files, not .so files. |
| 14266 | + shrext_cmds=".dll" |
| 14267 | + # FIXME: Setting linknames here is a bad hack. |
| 14268 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 14269 | + # The linker will automatically build a .lib file if we build a DLL. |
| 14270 | + old_archive_from_new_cmds='true' |
| 14271 | + # FIXME: Should let the user specify the lib program. |
| 14272 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 14273 | + enable_shared_with_static_runtimes=yes |
| 14274 | + ;; |
| 14275 | + esac |
| 14276 | ;; |
| 14277 | |
| 14278 | darwin* | rhapsody*) |
| 14279 | @@ -9748,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14280 | |
| 14281 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 14282 | freebsd* | dragonfly*) |
| 14283 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 14284 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 14285 | hardcode_libdir_flag_spec='-R$libdir' |
| 14286 | hardcode_direct=yes |
| 14287 | hardcode_shlibpath_var=no |
| 14288 | @@ -9756,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14289 | |
| 14290 | hpux9*) |
| 14291 | if test "$GCC" = yes; then |
| 14292 | - 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' |
| 14293 | + 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' |
| 14294 | else |
| 14295 | 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' |
| 14296 | fi |
| 14297 | @@ -9772,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14298 | |
| 14299 | hpux10*) |
| 14300 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 14301 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 14302 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 14303 | else |
| 14304 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 14305 | fi |
| 14306 | @@ -9796,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14307 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 14308 | ;; |
| 14309 | ia64*) |
| 14310 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 14311 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 14312 | ;; |
| 14313 | *) |
| 14314 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 14315 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 14316 | ;; |
| 14317 | esac |
| 14318 | else |
| 14319 | @@ -9878,23 +10466,36 @@ fi |
| 14320 | |
| 14321 | irix5* | irix6* | nonstopux*) |
| 14322 | if test "$GCC" = yes; then |
| 14323 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 14324 | + 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' |
| 14325 | # Try to use the -exported_symbol ld option, if it does not |
| 14326 | # work, assume that -exports_file does not work either and |
| 14327 | # implicitly export all symbols. |
| 14328 | - save_LDFLAGS="$LDFLAGS" |
| 14329 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 14330 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14331 | + # This should be the same for all languages, so no per-tag cache variable. |
| 14332 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 14333 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 14334 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 14335 | + $as_echo_n "(cached) " >&6 |
| 14336 | +else |
| 14337 | + save_LDFLAGS="$LDFLAGS" |
| 14338 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 14339 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14340 | /* end confdefs.h. */ |
| 14341 | -int foo(void) {} |
| 14342 | +int foo (void) { return 0; } |
| 14343 | _ACEOF |
| 14344 | if ac_fn_c_try_link "$LINENO"; then : |
| 14345 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 14346 | - |
| 14347 | + lt_cv_irix_exported_symbol=yes |
| 14348 | +else |
| 14349 | + lt_cv_irix_exported_symbol=no |
| 14350 | fi |
| 14351 | rm -f core conftest.err conftest.$ac_objext \ |
| 14352 | conftest$ac_exeext conftest.$ac_ext |
| 14353 | - LDFLAGS="$save_LDFLAGS" |
| 14354 | + LDFLAGS="$save_LDFLAGS" |
| 14355 | +fi |
| 14356 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 14357 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 14358 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 14359 | + 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' |
| 14360 | + fi |
| 14361 | else |
| 14362 | 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' |
| 14363 | 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' |
| 14364 | @@ -9979,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 14365 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 14366 | if test "$GCC" = yes; then |
| 14367 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 14368 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 14369 | + 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' |
| 14370 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 14371 | else |
| 14372 | allow_undefined_flag=' -expect_unresolved \*' |
| 14373 | @@ -9998,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 14374 | no_undefined_flag=' -z defs' |
| 14375 | if test "$GCC" = yes; then |
| 14376 | wlarc='${wl}' |
| 14377 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 14378 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 14379 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 14380 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 14381 | + $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' |
| 14382 | else |
| 14383 | case `$CC -V 2>&1` in |
| 14384 | *"Compilers 5.0"*) |
| 14385 | @@ -10576,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 14386 | need_version=no |
| 14387 | need_lib_prefix=no |
| 14388 | |
| 14389 | - case $GCC,$host_os in |
| 14390 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 14391 | + case $GCC,$cc_basename in |
| 14392 | + yes,*) |
| 14393 | + # gcc |
| 14394 | library_names_spec='$libname.dll.a' |
| 14395 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 14396 | postinstall_cmds='base_file=`basename \${file}`~ |
| 14397 | @@ -10610,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 14398 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 14399 | ;; |
| 14400 | esac |
| 14401 | + dynamic_linker='Win32 ld.exe' |
| 14402 | + ;; |
| 14403 | + |
| 14404 | + *,cl*) |
| 14405 | + # Native MSVC |
| 14406 | + libname_spec='$name' |
| 14407 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 14408 | + library_names_spec='${libname}.dll.lib' |
| 14409 | + |
| 14410 | + case $build_os in |
| 14411 | + mingw*) |
| 14412 | + sys_lib_search_path_spec= |
| 14413 | + lt_save_ifs=$IFS |
| 14414 | + IFS=';' |
| 14415 | + for lt_path in $LIB |
| 14416 | + do |
| 14417 | + IFS=$lt_save_ifs |
| 14418 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 14419 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 14420 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 14421 | + done |
| 14422 | + IFS=$lt_save_ifs |
| 14423 | + # Convert to MSYS style. |
| 14424 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 14425 | + ;; |
| 14426 | + cygwin*) |
| 14427 | + # Convert to unix form, then to dos form, then back to unix form |
| 14428 | + # but this time dos style (no spaces!) so that the unix form looks |
| 14429 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 14430 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 14431 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 14432 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 14433 | + ;; |
| 14434 | + *) |
| 14435 | + sys_lib_search_path_spec="$LIB" |
| 14436 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 14437 | + # It is most probably a Windows format PATH. |
| 14438 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 14439 | + else |
| 14440 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 14441 | + fi |
| 14442 | + # FIXME: find the short name or the path components, as spaces are |
| 14443 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 14444 | + ;; |
| 14445 | + esac |
| 14446 | + |
| 14447 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 14448 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 14449 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 14450 | + dldir=$destdir/`dirname \$dlpath`~ |
| 14451 | + test -d \$dldir || mkdir -p \$dldir~ |
| 14452 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 14453 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 14454 | + dlpath=$dir/\$dldll~ |
| 14455 | + $RM \$dlpath' |
| 14456 | + shlibpath_overrides_runpath=yes |
| 14457 | + dynamic_linker='Win32 link.exe' |
| 14458 | ;; |
| 14459 | |
| 14460 | *) |
| 14461 | + # Assume MSVC wrapper |
| 14462 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 14463 | + dynamic_linker='Win32 ld.exe' |
| 14464 | ;; |
| 14465 | esac |
| 14466 | - dynamic_linker='Win32 ld.exe' |
| 14467 | # FIXME: first we should search . and the directory the executable is in |
| 14468 | shlibpath_var=PATH |
| 14469 | ;; |
| 14470 | @@ -11494,7 +12154,7 @@ else |
| 14471 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 14472 | lt_status=$lt_dlunknown |
| 14473 | cat > conftest.$ac_ext <<_LT_EOF |
| 14474 | -#line 11494 "configure" |
| 14475 | +#line $LINENO "configure" |
| 14476 | #include "confdefs.h" |
| 14477 | |
| 14478 | #if HAVE_DLFCN_H |
| 14479 | @@ -11538,10 +12198,10 @@ else |
| 14480 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 14481 | correspondingly for the symbols needed. */ |
| 14482 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 14483 | -void fnord () __attribute__((visibility("default"))); |
| 14484 | +int fnord () __attribute__((visibility("default"))); |
| 14485 | #endif |
| 14486 | |
| 14487 | -void fnord () { int i=42; } |
| 14488 | +int fnord () { return 42; } |
| 14489 | int main () |
| 14490 | { |
| 14491 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 14492 | @@ -11600,7 +12260,7 @@ else |
| 14493 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 14494 | lt_status=$lt_dlunknown |
| 14495 | cat > conftest.$ac_ext <<_LT_EOF |
| 14496 | -#line 11600 "configure" |
| 14497 | +#line $LINENO "configure" |
| 14498 | #include "confdefs.h" |
| 14499 | |
| 14500 | #if HAVE_DLFCN_H |
| 14501 | @@ -11644,10 +12304,10 @@ else |
| 14502 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 14503 | correspondingly for the symbols needed. */ |
| 14504 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 14505 | -void fnord () __attribute__((visibility("default"))); |
| 14506 | +int fnord () __attribute__((visibility("default"))); |
| 14507 | #endif |
| 14508 | |
| 14509 | -void fnord () { int i=42; } |
| 14510 | +int fnord () { return 42; } |
| 14511 | int main () |
| 14512 | { |
| 14513 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 14514 | @@ -12039,6 +12699,7 @@ $RM -r conftest* |
| 14515 | |
| 14516 | # Allow CC to be a program name with arguments. |
| 14517 | lt_save_CC=$CC |
| 14518 | + lt_save_CFLAGS=$CFLAGS |
| 14519 | lt_save_LD=$LD |
| 14520 | lt_save_GCC=$GCC |
| 14521 | GCC=$GXX |
| 14522 | @@ -12056,6 +12717,7 @@ $RM -r conftest* |
| 14523 | fi |
| 14524 | test -z "${LDCXX+set}" || LD=$LDCXX |
| 14525 | CC=${CXX-"c++"} |
| 14526 | + CFLAGS=$CXXFLAGS |
| 14527 | compiler=$CC |
| 14528 | compiler_CXX=$CC |
| 14529 | for cc_temp in $compiler""; do |
| 14530 | @@ -12338,7 +13000,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 14531 | allow_undefined_flag_CXX='-berok' |
| 14532 | # Determine the default libpath from the value encoded in an empty |
| 14533 | # executable. |
| 14534 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14535 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 14536 | + aix_libpath=$lt_cv_aix_libpath |
| 14537 | +else |
| 14538 | + if ${lt_cv_aix_libpath__CXX+:} false; then : |
| 14539 | + $as_echo_n "(cached) " >&6 |
| 14540 | +else |
| 14541 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14542 | /* end confdefs.h. */ |
| 14543 | |
| 14544 | int |
| 14545 | @@ -12351,22 +13019,29 @@ main () |
| 14546 | _ACEOF |
| 14547 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 14548 | |
| 14549 | -lt_aix_libpath_sed=' |
| 14550 | - /Import File Strings/,/^$/ { |
| 14551 | - /^0/ { |
| 14552 | - s/^0 *\(.*\)$/\1/ |
| 14553 | - p |
| 14554 | - } |
| 14555 | - }' |
| 14556 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14557 | -# Check for a 64-bit object if we didn't find anything. |
| 14558 | -if test -z "$aix_libpath"; then |
| 14559 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14560 | -fi |
| 14561 | + lt_aix_libpath_sed=' |
| 14562 | + /Import File Strings/,/^$/ { |
| 14563 | + /^0/ { |
| 14564 | + s/^0 *\([^ ]*\) *$/\1/ |
| 14565 | + p |
| 14566 | + } |
| 14567 | + }' |
| 14568 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14569 | + # Check for a 64-bit object if we didn't find anything. |
| 14570 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 14571 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14572 | + fi |
| 14573 | fi |
| 14574 | rm -f core conftest.err conftest.$ac_objext \ |
| 14575 | conftest$ac_exeext conftest.$ac_ext |
| 14576 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14577 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 14578 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 14579 | + fi |
| 14580 | + |
| 14581 | +fi |
| 14582 | + |
| 14583 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 14584 | +fi |
| 14585 | |
| 14586 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 14587 | |
| 14588 | @@ -12379,7 +13054,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14589 | else |
| 14590 | # Determine the default libpath from the value encoded in an |
| 14591 | # empty executable. |
| 14592 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14593 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 14594 | + aix_libpath=$lt_cv_aix_libpath |
| 14595 | +else |
| 14596 | + if ${lt_cv_aix_libpath__CXX+:} false; then : |
| 14597 | + $as_echo_n "(cached) " >&6 |
| 14598 | +else |
| 14599 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 14600 | /* end confdefs.h. */ |
| 14601 | |
| 14602 | int |
| 14603 | @@ -12392,22 +13073,29 @@ main () |
| 14604 | _ACEOF |
| 14605 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 14606 | |
| 14607 | -lt_aix_libpath_sed=' |
| 14608 | - /Import File Strings/,/^$/ { |
| 14609 | - /^0/ { |
| 14610 | - s/^0 *\(.*\)$/\1/ |
| 14611 | - p |
| 14612 | - } |
| 14613 | - }' |
| 14614 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14615 | -# Check for a 64-bit object if we didn't find anything. |
| 14616 | -if test -z "$aix_libpath"; then |
| 14617 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14618 | -fi |
| 14619 | + lt_aix_libpath_sed=' |
| 14620 | + /Import File Strings/,/^$/ { |
| 14621 | + /^0/ { |
| 14622 | + s/^0 *\([^ ]*\) *$/\1/ |
| 14623 | + p |
| 14624 | + } |
| 14625 | + }' |
| 14626 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14627 | + # Check for a 64-bit object if we didn't find anything. |
| 14628 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 14629 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 14630 | + fi |
| 14631 | fi |
| 14632 | rm -f core conftest.err conftest.$ac_objext \ |
| 14633 | conftest$ac_exeext conftest.$ac_ext |
| 14634 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14635 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 14636 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 14637 | + fi |
| 14638 | + |
| 14639 | +fi |
| 14640 | + |
| 14641 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 14642 | +fi |
| 14643 | |
| 14644 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 14645 | # Warning - without using the other run time loading flags, |
| 14646 | @@ -12450,29 +13138,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14647 | ;; |
| 14648 | |
| 14649 | cygwin* | mingw* | pw32* | cegcc*) |
| 14650 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 14651 | - # as there is no search path for DLLs. |
| 14652 | - hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 14653 | - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 14654 | - allow_undefined_flag_CXX=unsupported |
| 14655 | - always_export_symbols_CXX=no |
| 14656 | - enable_shared_with_static_runtimes_CXX=yes |
| 14657 | - |
| 14658 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 14659 | - archive_cmds_CXX='$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' |
| 14660 | - # If the export-symbols file already is a .def file (1st line |
| 14661 | - # is EXPORTS), use it as is; otherwise, prepend... |
| 14662 | - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 14663 | - cp $export_symbols $output_objdir/$soname.def; |
| 14664 | - else |
| 14665 | - echo EXPORTS > $output_objdir/$soname.def; |
| 14666 | - cat $export_symbols >> $output_objdir/$soname.def; |
| 14667 | - fi~ |
| 14668 | - $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' |
| 14669 | - else |
| 14670 | - ld_shlibs_CXX=no |
| 14671 | - fi |
| 14672 | - ;; |
| 14673 | + case $GXX,$cc_basename in |
| 14674 | + ,cl* | no,cl*) |
| 14675 | + # Native MSVC |
| 14676 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 14677 | + # no search path for DLLs. |
| 14678 | + hardcode_libdir_flag_spec_CXX=' ' |
| 14679 | + allow_undefined_flag_CXX=unsupported |
| 14680 | + always_export_symbols_CXX=yes |
| 14681 | + file_list_spec_CXX='@' |
| 14682 | + # Tell ltmain to make .lib files, not .a files. |
| 14683 | + libext=lib |
| 14684 | + # Tell ltmain to make .dll files, not .so files. |
| 14685 | + shrext_cmds=".dll" |
| 14686 | + # FIXME: Setting linknames here is a bad hack. |
| 14687 | + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 14688 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 14689 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 14690 | + else |
| 14691 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 14692 | + fi~ |
| 14693 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 14694 | + linknames=' |
| 14695 | + # The linker will not automatically build a static lib if we build a DLL. |
| 14696 | + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' |
| 14697 | + enable_shared_with_static_runtimes_CXX=yes |
| 14698 | + # Don't use ranlib |
| 14699 | + old_postinstall_cmds_CXX='chmod 644 $oldlib' |
| 14700 | + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ |
| 14701 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 14702 | + case $lt_outputfile in |
| 14703 | + *.exe|*.EXE) ;; |
| 14704 | + *) |
| 14705 | + lt_outputfile="$lt_outputfile.exe" |
| 14706 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 14707 | + ;; |
| 14708 | + esac~ |
| 14709 | + func_to_tool_file "$lt_outputfile"~ |
| 14710 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 14711 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 14712 | + $RM "$lt_outputfile.manifest"; |
| 14713 | + fi' |
| 14714 | + ;; |
| 14715 | + *) |
| 14716 | + # g++ |
| 14717 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 14718 | + # as there is no search path for DLLs. |
| 14719 | + hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 14720 | + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 14721 | + allow_undefined_flag_CXX=unsupported |
| 14722 | + always_export_symbols_CXX=no |
| 14723 | + enable_shared_with_static_runtimes_CXX=yes |
| 14724 | + |
| 14725 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 14726 | + archive_cmds_CXX='$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' |
| 14727 | + # If the export-symbols file already is a .def file (1st line |
| 14728 | + # is EXPORTS), use it as is; otherwise, prepend... |
| 14729 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 14730 | + cp $export_symbols $output_objdir/$soname.def; |
| 14731 | + else |
| 14732 | + echo EXPORTS > $output_objdir/$soname.def; |
| 14733 | + cat $export_symbols >> $output_objdir/$soname.def; |
| 14734 | + fi~ |
| 14735 | + $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' |
| 14736 | + else |
| 14737 | + ld_shlibs_CXX=no |
| 14738 | + fi |
| 14739 | + ;; |
| 14740 | + esac |
| 14741 | + ;; |
| 14742 | darwin* | rhapsody*) |
| 14743 | |
| 14744 | |
| 14745 | @@ -12578,7 +13312,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14746 | ;; |
| 14747 | *) |
| 14748 | if test "$GXX" = yes; then |
| 14749 | - archive_cmds_CXX='$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' |
| 14750 | + archive_cmds_CXX='$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' |
| 14751 | else |
| 14752 | # FIXME: insert proper C++ library support |
| 14753 | ld_shlibs_CXX=no |
| 14754 | @@ -12649,10 +13383,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14755 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 14756 | ;; |
| 14757 | ia64*) |
| 14758 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 14759 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 14760 | ;; |
| 14761 | *) |
| 14762 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 14763 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 14764 | ;; |
| 14765 | esac |
| 14766 | fi |
| 14767 | @@ -12693,9 +13427,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14768 | *) |
| 14769 | if test "$GXX" = yes; then |
| 14770 | if test "$with_gnu_ld" = no; then |
| 14771 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 14772 | + archive_cmds_CXX='$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' |
| 14773 | else |
| 14774 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
| 14775 | + archive_cmds_CXX='$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' |
| 14776 | fi |
| 14777 | fi |
| 14778 | link_all_deplibs_CXX=yes |
| 14779 | @@ -12765,20 +13499,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14780 | prelink_cmds_CXX='tpldir=Template.dir~ |
| 14781 | rm -rf $tpldir~ |
| 14782 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
| 14783 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
| 14784 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
| 14785 | old_archive_cmds_CXX='tpldir=Template.dir~ |
| 14786 | rm -rf $tpldir~ |
| 14787 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
| 14788 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
| 14789 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
| 14790 | $RANLIB $oldlib' |
| 14791 | archive_cmds_CXX='tpldir=Template.dir~ |
| 14792 | rm -rf $tpldir~ |
| 14793 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 14794 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 14795 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 14796 | archive_expsym_cmds_CXX='tpldir=Template.dir~ |
| 14797 | rm -rf $tpldir~ |
| 14798 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 14799 | - $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' |
| 14800 | + $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' |
| 14801 | ;; |
| 14802 | *) # Version 6 and above use weak symbols |
| 14803 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 14804 | @@ -12973,7 +13707,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14805 | archive_cmds_CXX='$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' |
| 14806 | ;; |
| 14807 | *) |
| 14808 | - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 14809 | + archive_cmds_CXX='$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' |
| 14810 | ;; |
| 14811 | esac |
| 14812 | |
| 14813 | @@ -13019,7 +13753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14814 | |
| 14815 | solaris*) |
| 14816 | case $cc_basename in |
| 14817 | - CC*) |
| 14818 | + CC* | sunCC*) |
| 14819 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 14820 | archive_cmds_need_lc_CXX=yes |
| 14821 | no_undefined_flag_CXX=' -zdefs' |
| 14822 | @@ -13060,9 +13794,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14823 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
| 14824 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
| 14825 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
| 14826 | - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 14827 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 14828 | archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 14829 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 14830 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 14831 | |
| 14832 | # Commands to make compiler produce verbose output that lists |
| 14833 | # what "hidden" libraries, object files and flags are used when |
| 14834 | @@ -13197,6 +13931,13 @@ private: |
| 14835 | }; |
| 14836 | _LT_EOF |
| 14837 | |
| 14838 | + |
| 14839 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
| 14840 | +case "$CC $CFLAGS " in #( |
| 14841 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
| 14842 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
| 14843 | +esac |
| 14844 | + |
| 14845 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 14846 | (eval $ac_compile) 2>&5 |
| 14847 | ac_status=$? |
| 14848 | @@ -13210,7 +13951,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 14849 | pre_test_object_deps_done=no |
| 14850 | |
| 14851 | for p in `eval "$output_verbose_link_cmd"`; do |
| 14852 | - case $p in |
| 14853 | + case ${prev}${p} in |
| 14854 | |
| 14855 | -L* | -R* | -l*) |
| 14856 | # Some compilers place space between "-{L,R}" and the path. |
| 14857 | @@ -13219,13 +13960,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 14858 | test $p = "-R"; then |
| 14859 | prev=$p |
| 14860 | continue |
| 14861 | - else |
| 14862 | - prev= |
| 14863 | fi |
| 14864 | |
| 14865 | + # Expand the sysroot to ease extracting the directories later. |
| 14866 | + if test -z "$prev"; then |
| 14867 | + case $p in |
| 14868 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
| 14869 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
| 14870 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
| 14871 | + esac |
| 14872 | + fi |
| 14873 | + case $p in |
| 14874 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
| 14875 | + esac |
| 14876 | if test "$pre_test_object_deps_done" = no; then |
| 14877 | - case $p in |
| 14878 | - -L* | -R*) |
| 14879 | + case ${prev} in |
| 14880 | + -L | -R) |
| 14881 | # Internal compiler library paths should come after those |
| 14882 | # provided the user. The postdeps already come after the |
| 14883 | # user supplied libs so there is no need to process them. |
| 14884 | @@ -13245,8 +13995,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 14885 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
| 14886 | fi |
| 14887 | fi |
| 14888 | + prev= |
| 14889 | ;; |
| 14890 | |
| 14891 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
| 14892 | *.$objext) |
| 14893 | # This assumes that the test object file only shows up |
| 14894 | # once in the compiler output. |
| 14895 | @@ -13282,6 +14034,7 @@ else |
| 14896 | fi |
| 14897 | |
| 14898 | $RM -f confest.$objext |
| 14899 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
| 14900 | |
| 14901 | # PORTME: override above test on systems where it is broken |
| 14902 | case $host_os in |
| 14903 | @@ -13317,7 +14070,7 @@ linux*) |
| 14904 | |
| 14905 | solaris*) |
| 14906 | case $cc_basename in |
| 14907 | - CC*) |
| 14908 | + CC* | sunCC*) |
| 14909 | # The more standards-conforming stlport4 library is |
| 14910 | # incompatible with the Cstd library. Avoid specifying |
| 14911 | # it if it's in CXXFLAGS. Ignore libCrun as |
| 14912 | @@ -13382,8 +14135,6 @@ fi |
| 14913 | lt_prog_compiler_pic_CXX= |
| 14914 | lt_prog_compiler_static_CXX= |
| 14915 | |
| 14916 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 14917 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 14918 | |
| 14919 | # C++ specific cases for pic, static, wl, etc. |
| 14920 | if test "$GXX" = yes; then |
| 14921 | @@ -13488,6 +14239,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 14922 | ;; |
| 14923 | esac |
| 14924 | ;; |
| 14925 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
| 14926 | + # This hack is so that the source file can tell whether it is being |
| 14927 | + # built for inclusion in a dll (and should export symbols for example). |
| 14928 | + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' |
| 14929 | + ;; |
| 14930 | dgux*) |
| 14931 | case $cc_basename in |
| 14932 | ec++*) |
| 14933 | @@ -13640,7 +14396,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 14934 | ;; |
| 14935 | solaris*) |
| 14936 | case $cc_basename in |
| 14937 | - CC*) |
| 14938 | + CC* | sunCC*) |
| 14939 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 14940 | lt_prog_compiler_pic_CXX='-KPIC' |
| 14941 | lt_prog_compiler_static_CXX='-Bstatic' |
| 14942 | @@ -13705,10 +14461,17 @@ case $host_os in |
| 14943 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" |
| 14944 | ;; |
| 14945 | esac |
| 14946 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 |
| 14947 | -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } |
| 14948 | - |
| 14949 | |
| 14950 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 14951 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 14952 | +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : |
| 14953 | + $as_echo_n "(cached) " >&6 |
| 14954 | +else |
| 14955 | + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX |
| 14956 | +fi |
| 14957 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 |
| 14958 | +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } |
| 14959 | +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX |
| 14960 | |
| 14961 | # |
| 14962 | # Check to make sure the PIC flag actually works. |
| 14963 | @@ -13766,6 +14529,8 @@ fi |
| 14964 | |
| 14965 | |
| 14966 | |
| 14967 | + |
| 14968 | + |
| 14969 | # |
| 14970 | # Check to make sure the static flag actually works. |
| 14971 | # |
| 14972 | @@ -13943,6 +14708,7 @@ fi |
| 14973 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 14974 | |
| 14975 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 14976 | + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 14977 | case $host_os in |
| 14978 | aix[4-9]*) |
| 14979 | # If we're using GNU nm, then we don't want the "-C" option. |
| 14980 | @@ -13957,15 +14723,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 14981 | ;; |
| 14982 | pw32*) |
| 14983 | export_symbols_cmds_CXX="$ltdll_cmds" |
| 14984 | - ;; |
| 14985 | + ;; |
| 14986 | cygwin* | mingw* | cegcc*) |
| 14987 | - export_symbols_cmds_CXX='$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' |
| 14988 | - ;; |
| 14989 | + case $cc_basename in |
| 14990 | + cl*) ;; |
| 14991 | + *) |
| 14992 | + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 14993 | + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 14994 | + ;; |
| 14995 | + esac |
| 14996 | + ;; |
| 14997 | *) |
| 14998 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 14999 | - ;; |
| 15000 | + ;; |
| 15001 | esac |
| 15002 | - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 15003 | |
| 15004 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 |
| 15005 | $as_echo "$ld_shlibs_CXX" >&6; } |
| 15006 | @@ -14228,8 +14999,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 15007 | need_version=no |
| 15008 | need_lib_prefix=no |
| 15009 | |
| 15010 | - case $GCC,$host_os in |
| 15011 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 15012 | + case $GCC,$cc_basename in |
| 15013 | + yes,*) |
| 15014 | + # gcc |
| 15015 | library_names_spec='$libname.dll.a' |
| 15016 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 15017 | postinstall_cmds='base_file=`basename \${file}`~ |
| 15018 | @@ -14261,13 +15033,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 15019 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 15020 | ;; |
| 15021 | esac |
| 15022 | + dynamic_linker='Win32 ld.exe' |
| 15023 | + ;; |
| 15024 | + |
| 15025 | + *,cl*) |
| 15026 | + # Native MSVC |
| 15027 | + libname_spec='$name' |
| 15028 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 15029 | + library_names_spec='${libname}.dll.lib' |
| 15030 | + |
| 15031 | + case $build_os in |
| 15032 | + mingw*) |
| 15033 | + sys_lib_search_path_spec= |
| 15034 | + lt_save_ifs=$IFS |
| 15035 | + IFS=';' |
| 15036 | + for lt_path in $LIB |
| 15037 | + do |
| 15038 | + IFS=$lt_save_ifs |
| 15039 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 15040 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 15041 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 15042 | + done |
| 15043 | + IFS=$lt_save_ifs |
| 15044 | + # Convert to MSYS style. |
| 15045 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 15046 | + ;; |
| 15047 | + cygwin*) |
| 15048 | + # Convert to unix form, then to dos form, then back to unix form |
| 15049 | + # but this time dos style (no spaces!) so that the unix form looks |
| 15050 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 15051 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 15052 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 15053 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 15054 | + ;; |
| 15055 | + *) |
| 15056 | + sys_lib_search_path_spec="$LIB" |
| 15057 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 15058 | + # It is most probably a Windows format PATH. |
| 15059 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 15060 | + else |
| 15061 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 15062 | + fi |
| 15063 | + # FIXME: find the short name or the path components, as spaces are |
| 15064 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 15065 | + ;; |
| 15066 | + esac |
| 15067 | + |
| 15068 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 15069 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 15070 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 15071 | + dldir=$destdir/`dirname \$dlpath`~ |
| 15072 | + test -d \$dldir || mkdir -p \$dldir~ |
| 15073 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 15074 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 15075 | + dlpath=$dir/\$dldll~ |
| 15076 | + $RM \$dlpath' |
| 15077 | + shlibpath_overrides_runpath=yes |
| 15078 | + dynamic_linker='Win32 link.exe' |
| 15079 | ;; |
| 15080 | |
| 15081 | *) |
| 15082 | + # Assume MSVC wrapper |
| 15083 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 15084 | + dynamic_linker='Win32 ld.exe' |
| 15085 | ;; |
| 15086 | esac |
| 15087 | - dynamic_linker='Win32 ld.exe' |
| 15088 | # FIXME: first we should search . and the directory the executable is in |
| 15089 | shlibpath_var=PATH |
| 15090 | ;; |
| 15091 | @@ -14807,6 +15637,7 @@ fi |
| 15092 | fi # test -n "$compiler" |
| 15093 | |
| 15094 | CC=$lt_save_CC |
| 15095 | + CFLAGS=$lt_save_CFLAGS |
| 15096 | LDCXX=$LD |
| 15097 | LD=$lt_save_LD |
| 15098 | GCC=$lt_save_GCC |
| 15099 | @@ -18172,13 +19003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 15100 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 15101 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 15102 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 15103 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 15104 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 15105 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 15106 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 15107 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 15108 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 15109 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 15110 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 15111 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 15112 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 15113 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 15114 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 15115 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 15116 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 15117 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 15118 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 15119 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 15120 | @@ -18193,14 +19031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 15121 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 15122 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 15123 | 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"`' |
| 15124 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 15125 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 15126 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 15127 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 15128 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 15129 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 15130 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 15131 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 15132 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 15133 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 15134 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 15135 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 15136 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 15137 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 15138 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 15139 | @@ -18233,12 +19074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 15140 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 15141 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 15142 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 15143 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 15144 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 15145 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 15146 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 15147 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 15148 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 15149 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 15150 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 15151 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 15152 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 15153 | @@ -18277,8 +19118,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
| 15154 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
| 15155 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
| 15156 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
| 15157 | -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 15158 | lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' |
| 15159 | +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 15160 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
| 15161 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
| 15162 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
| 15163 | @@ -18305,12 +19146,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
| 15164 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
| 15165 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
| 15166 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
| 15167 | -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' |
| 15168 | always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' |
| 15169 | export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 15170 | exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 15171 | include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 15172 | prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 15173 | +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 15174 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
| 15175 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
| 15176 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
| 15177 | @@ -18348,8 +19189,13 @@ reload_flag \ |
| 15178 | OBJDUMP \ |
| 15179 | deplibs_check_method \ |
| 15180 | file_magic_cmd \ |
| 15181 | +file_magic_glob \ |
| 15182 | +want_nocaseglob \ |
| 15183 | +DLLTOOL \ |
| 15184 | +sharedlib_from_linklib_cmd \ |
| 15185 | AR \ |
| 15186 | AR_FLAGS \ |
| 15187 | +archiver_list_spec \ |
| 15188 | STRIP \ |
| 15189 | RANLIB \ |
| 15190 | CC \ |
| 15191 | @@ -18359,12 +19205,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 15192 | lt_cv_sys_global_symbol_to_cdecl \ |
| 15193 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 15194 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 15195 | +nm_file_list_spec \ |
| 15196 | lt_prog_compiler_no_builtin_flag \ |
| 15197 | -lt_prog_compiler_wl \ |
| 15198 | lt_prog_compiler_pic \ |
| 15199 | +lt_prog_compiler_wl \ |
| 15200 | lt_prog_compiler_static \ |
| 15201 | lt_cv_prog_compiler_c_o \ |
| 15202 | need_locks \ |
| 15203 | +MANIFEST_TOOL \ |
| 15204 | DSYMUTIL \ |
| 15205 | NMEDIT \ |
| 15206 | LIPO \ |
| 15207 | @@ -18380,7 +19228,6 @@ no_undefined_flag \ |
| 15208 | hardcode_libdir_flag_spec \ |
| 15209 | hardcode_libdir_flag_spec_ld \ |
| 15210 | hardcode_libdir_separator \ |
| 15211 | -fix_srcfile_path \ |
| 15212 | exclude_expsyms \ |
| 15213 | include_expsyms \ |
| 15214 | file_list_spec \ |
| 15215 | @@ -18402,8 +19249,8 @@ LD_CXX \ |
| 15216 | reload_flag_CXX \ |
| 15217 | compiler_CXX \ |
| 15218 | lt_prog_compiler_no_builtin_flag_CXX \ |
| 15219 | -lt_prog_compiler_wl_CXX \ |
| 15220 | lt_prog_compiler_pic_CXX \ |
| 15221 | +lt_prog_compiler_wl_CXX \ |
| 15222 | lt_prog_compiler_static_CXX \ |
| 15223 | lt_cv_prog_compiler_c_o_CXX \ |
| 15224 | export_dynamic_flag_spec_CXX \ |
| 15225 | @@ -18415,7 +19262,6 @@ no_undefined_flag_CXX \ |
| 15226 | hardcode_libdir_flag_spec_CXX \ |
| 15227 | hardcode_libdir_flag_spec_ld_CXX \ |
| 15228 | hardcode_libdir_separator_CXX \ |
| 15229 | -fix_srcfile_path_CXX \ |
| 15230 | exclude_expsyms_CXX \ |
| 15231 | include_expsyms_CXX \ |
| 15232 | file_list_spec_CXX \ |
| 15233 | @@ -18449,6 +19295,7 @@ module_cmds \ |
| 15234 | module_expsym_cmds \ |
| 15235 | export_symbols_cmds \ |
| 15236 | prelink_cmds \ |
| 15237 | +postlink_cmds \ |
| 15238 | postinstall_cmds \ |
| 15239 | postuninstall_cmds \ |
| 15240 | finish_cmds \ |
| 15241 | @@ -18463,7 +19310,8 @@ archive_expsym_cmds_CXX \ |
| 15242 | module_cmds_CXX \ |
| 15243 | module_expsym_cmds_CXX \ |
| 15244 | export_symbols_cmds_CXX \ |
| 15245 | -prelink_cmds_CXX; do |
| 15246 | +prelink_cmds_CXX \ |
| 15247 | +postlink_cmds_CXX; do |
| 15248 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
| 15249 | *[\\\\\\\`\\"\\\$]*) |
| 15250 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
| 15251 | @@ -19228,7 +20076,8 @@ $as_echo X"$file" | |
| 15252 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 15253 | # |
| 15254 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 15255 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 15256 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 15257 | +# Inc. |
| 15258 | # Written by Gordon Matzigkeit, 1996 |
| 15259 | # |
| 15260 | # This file is part of GNU Libtool. |
| 15261 | @@ -19331,19 +20180,42 @@ SP2NL=$lt_lt_SP2NL |
| 15262 | # turn newlines into spaces. |
| 15263 | NL2SP=$lt_lt_NL2SP |
| 15264 | |
| 15265 | +# convert \$build file names to \$host format. |
| 15266 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 15267 | + |
| 15268 | +# convert \$build files to toolchain format. |
| 15269 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 15270 | + |
| 15271 | # An object symbol dumper. |
| 15272 | OBJDUMP=$lt_OBJDUMP |
| 15273 | |
| 15274 | # Method to check whether dependent libraries are shared objects. |
| 15275 | deplibs_check_method=$lt_deplibs_check_method |
| 15276 | |
| 15277 | -# Command to use when deplibs_check_method == "file_magic". |
| 15278 | +# Command to use when deplibs_check_method = "file_magic". |
| 15279 | file_magic_cmd=$lt_file_magic_cmd |
| 15280 | |
| 15281 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 15282 | +file_magic_glob=$lt_file_magic_glob |
| 15283 | + |
| 15284 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 15285 | +want_nocaseglob=$lt_want_nocaseglob |
| 15286 | + |
| 15287 | +# DLL creation program. |
| 15288 | +DLLTOOL=$lt_DLLTOOL |
| 15289 | + |
| 15290 | +# Command to associate shared and link libraries. |
| 15291 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 15292 | + |
| 15293 | # The archiver. |
| 15294 | AR=$lt_AR |
| 15295 | + |
| 15296 | +# Flags to create an archive. |
| 15297 | AR_FLAGS=$lt_AR_FLAGS |
| 15298 | |
| 15299 | +# How to feed a file listing to the archiver. |
| 15300 | +archiver_list_spec=$lt_archiver_list_spec |
| 15301 | + |
| 15302 | # A symbol stripping program. |
| 15303 | STRIP=$lt_STRIP |
| 15304 | |
| 15305 | @@ -19373,6 +20245,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 15306 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 15307 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 15308 | |
| 15309 | +# Specify filename containing input files for \$NM. |
| 15310 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 15311 | + |
| 15312 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 15313 | +lt_sysroot=$lt_sysroot |
| 15314 | + |
| 15315 | # The name of the directory that contains temporary libtool files. |
| 15316 | objdir=$objdir |
| 15317 | |
| 15318 | @@ -19382,6 +20260,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 15319 | # Must we lock files when doing compilation? |
| 15320 | need_locks=$lt_need_locks |
| 15321 | |
| 15322 | +# Manifest tool. |
| 15323 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 15324 | + |
| 15325 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 15326 | DSYMUTIL=$lt_DSYMUTIL |
| 15327 | |
| 15328 | @@ -19496,12 +20377,12 @@ with_gcc=$GCC |
| 15329 | # Compiler flag to turn off builtin functions. |
| 15330 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 15331 | |
| 15332 | -# How to pass a linker flag through the compiler. |
| 15333 | -wl=$lt_lt_prog_compiler_wl |
| 15334 | - |
| 15335 | # Additional compiler flags for building library objects. |
| 15336 | pic_flag=$lt_lt_prog_compiler_pic |
| 15337 | |
| 15338 | +# How to pass a linker flag through the compiler. |
| 15339 | +wl=$lt_lt_prog_compiler_wl |
| 15340 | + |
| 15341 | # Compiler flag to prevent dynamic linking. |
| 15342 | link_static_flag=$lt_lt_prog_compiler_static |
| 15343 | |
| 15344 | @@ -19588,9 +20469,6 @@ inherit_rpath=$inherit_rpath |
| 15345 | # Whether libtool must link a program against all its dependency libraries. |
| 15346 | link_all_deplibs=$link_all_deplibs |
| 15347 | |
| 15348 | -# Fix the shell variable \$srcfile for the compiler. |
| 15349 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 15350 | - |
| 15351 | # Set to "yes" if exported symbols are required. |
| 15352 | always_export_symbols=$always_export_symbols |
| 15353 | |
| 15354 | @@ -19606,6 +20484,9 @@ include_expsyms=$lt_include_expsyms |
| 15355 | # Commands necessary for linking programs (against libraries) with templates. |
| 15356 | prelink_cmds=$lt_prelink_cmds |
| 15357 | |
| 15358 | +# Commands necessary for finishing linking programs. |
| 15359 | +postlink_cmds=$lt_postlink_cmds |
| 15360 | + |
| 15361 | # Specify filename containing input files. |
| 15362 | file_list_spec=$lt_file_list_spec |
| 15363 | |
| 15364 | @@ -19652,210 +20533,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 15365 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 15366 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 15367 | # is reportedly fixed, but why not run on old versions too? |
| 15368 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 15369 | - || (rm -f "$cfgfile"; exit 1) |
| 15370 | - |
| 15371 | - case $xsi_shell in |
| 15372 | - yes) |
| 15373 | - cat << \_LT_EOF >> "$cfgfile" |
| 15374 | - |
| 15375 | -# func_dirname file append nondir_replacement |
| 15376 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 15377 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 15378 | -func_dirname () |
| 15379 | -{ |
| 15380 | - case ${1} in |
| 15381 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 15382 | - * ) func_dirname_result="${3}" ;; |
| 15383 | - esac |
| 15384 | -} |
| 15385 | - |
| 15386 | -# func_basename file |
| 15387 | -func_basename () |
| 15388 | -{ |
| 15389 | - func_basename_result="${1##*/}" |
| 15390 | -} |
| 15391 | - |
| 15392 | -# func_dirname_and_basename file append nondir_replacement |
| 15393 | -# perform func_basename and func_dirname in a single function |
| 15394 | -# call: |
| 15395 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 15396 | -# add APPEND to the result, otherwise set result |
| 15397 | -# to NONDIR_REPLACEMENT. |
| 15398 | -# value returned in "$func_dirname_result" |
| 15399 | -# basename: Compute filename of FILE. |
| 15400 | -# value retuned in "$func_basename_result" |
| 15401 | -# Implementation must be kept synchronized with func_dirname |
| 15402 | -# and func_basename. For efficiency, we do not delegate to |
| 15403 | -# those functions but instead duplicate the functionality here. |
| 15404 | -func_dirname_and_basename () |
| 15405 | -{ |
| 15406 | - case ${1} in |
| 15407 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 15408 | - * ) func_dirname_result="${3}" ;; |
| 15409 | - esac |
| 15410 | - func_basename_result="${1##*/}" |
| 15411 | -} |
| 15412 | - |
| 15413 | -# func_stripname prefix suffix name |
| 15414 | -# strip PREFIX and SUFFIX off of NAME. |
| 15415 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 15416 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 15417 | -# dot (in which case that matches only a dot). |
| 15418 | -func_stripname () |
| 15419 | -{ |
| 15420 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 15421 | - # positional parameters, so assign one to ordinary parameter first. |
| 15422 | - func_stripname_result=${3} |
| 15423 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 15424 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 15425 | -} |
| 15426 | - |
| 15427 | -# func_opt_split |
| 15428 | -func_opt_split () |
| 15429 | -{ |
| 15430 | - func_opt_split_opt=${1%%=*} |
| 15431 | - func_opt_split_arg=${1#*=} |
| 15432 | -} |
| 15433 | - |
| 15434 | -# func_lo2o object |
| 15435 | -func_lo2o () |
| 15436 | -{ |
| 15437 | - case ${1} in |
| 15438 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 15439 | - *) func_lo2o_result=${1} ;; |
| 15440 | - esac |
| 15441 | -} |
| 15442 | - |
| 15443 | -# func_xform libobj-or-source |
| 15444 | -func_xform () |
| 15445 | -{ |
| 15446 | - func_xform_result=${1%.*}.lo |
| 15447 | -} |
| 15448 | - |
| 15449 | -# func_arith arithmetic-term... |
| 15450 | -func_arith () |
| 15451 | -{ |
| 15452 | - func_arith_result=$(( $* )) |
| 15453 | -} |
| 15454 | - |
| 15455 | -# func_len string |
| 15456 | -# STRING may not start with a hyphen. |
| 15457 | -func_len () |
| 15458 | -{ |
| 15459 | - func_len_result=${#1} |
| 15460 | -} |
| 15461 | - |
| 15462 | -_LT_EOF |
| 15463 | - ;; |
| 15464 | - *) # Bourne compatible functions. |
| 15465 | - cat << \_LT_EOF >> "$cfgfile" |
| 15466 | - |
| 15467 | -# func_dirname file append nondir_replacement |
| 15468 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 15469 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 15470 | -func_dirname () |
| 15471 | -{ |
| 15472 | - # Extract subdirectory from the argument. |
| 15473 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 15474 | - if test "X$func_dirname_result" = "X${1}"; then |
| 15475 | - func_dirname_result="${3}" |
| 15476 | - else |
| 15477 | - func_dirname_result="$func_dirname_result${2}" |
| 15478 | - fi |
| 15479 | -} |
| 15480 | - |
| 15481 | -# func_basename file |
| 15482 | -func_basename () |
| 15483 | -{ |
| 15484 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 15485 | -} |
| 15486 | - |
| 15487 | - |
| 15488 | -# func_stripname prefix suffix name |
| 15489 | -# strip PREFIX and SUFFIX off of NAME. |
| 15490 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 15491 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 15492 | -# dot (in which case that matches only a dot). |
| 15493 | -# func_strip_suffix prefix name |
| 15494 | -func_stripname () |
| 15495 | -{ |
| 15496 | - case ${2} in |
| 15497 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 15498 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 15499 | - esac |
| 15500 | -} |
| 15501 | - |
| 15502 | -# sed scripts: |
| 15503 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 15504 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 15505 | - |
| 15506 | -# func_opt_split |
| 15507 | -func_opt_split () |
| 15508 | -{ |
| 15509 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 15510 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 15511 | -} |
| 15512 | - |
| 15513 | -# func_lo2o object |
| 15514 | -func_lo2o () |
| 15515 | -{ |
| 15516 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 15517 | -} |
| 15518 | - |
| 15519 | -# func_xform libobj-or-source |
| 15520 | -func_xform () |
| 15521 | -{ |
| 15522 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 15523 | -} |
| 15524 | - |
| 15525 | -# func_arith arithmetic-term... |
| 15526 | -func_arith () |
| 15527 | -{ |
| 15528 | - func_arith_result=`expr "$@"` |
| 15529 | -} |
| 15530 | - |
| 15531 | -# func_len string |
| 15532 | -# STRING may not start with a hyphen. |
| 15533 | -func_len () |
| 15534 | -{ |
| 15535 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 15536 | -} |
| 15537 | - |
| 15538 | -_LT_EOF |
| 15539 | -esac |
| 15540 | - |
| 15541 | -case $lt_shell_append in |
| 15542 | - yes) |
| 15543 | - cat << \_LT_EOF >> "$cfgfile" |
| 15544 | - |
| 15545 | -# func_append var value |
| 15546 | -# Append VALUE to the end of shell variable VAR. |
| 15547 | -func_append () |
| 15548 | -{ |
| 15549 | - eval "$1+=\$2" |
| 15550 | -} |
| 15551 | -_LT_EOF |
| 15552 | - ;; |
| 15553 | - *) |
| 15554 | - cat << \_LT_EOF >> "$cfgfile" |
| 15555 | - |
| 15556 | -# func_append var value |
| 15557 | -# Append VALUE to the end of shell variable VAR. |
| 15558 | -func_append () |
| 15559 | -{ |
| 15560 | - eval "$1=\$$1\$2" |
| 15561 | -} |
| 15562 | - |
| 15563 | -_LT_EOF |
| 15564 | - ;; |
| 15565 | - esac |
| 15566 | - |
| 15567 | - |
| 15568 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 15569 | - || (rm -f "$cfgfile"; exit 1) |
| 15570 | - |
| 15571 | - mv -f "$cfgfile" "$ofile" || |
| 15572 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 15573 | + || (rm -f "$cfgfile"; exit 1) |
| 15574 | + |
| 15575 | + if test x"$xsi_shell" = xyes; then |
| 15576 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 15577 | +func_dirname ()\ |
| 15578 | +{\ |
| 15579 | +\ case ${1} in\ |
| 15580 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 15581 | +\ * ) func_dirname_result="${3}" ;;\ |
| 15582 | +\ esac\ |
| 15583 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15584 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15585 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15586 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15587 | + |
| 15588 | + |
| 15589 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 15590 | +func_basename ()\ |
| 15591 | +{\ |
| 15592 | +\ func_basename_result="${1##*/}"\ |
| 15593 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15594 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15595 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15596 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15597 | + |
| 15598 | + |
| 15599 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 15600 | +func_dirname_and_basename ()\ |
| 15601 | +{\ |
| 15602 | +\ case ${1} in\ |
| 15603 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 15604 | +\ * ) func_dirname_result="${3}" ;;\ |
| 15605 | +\ esac\ |
| 15606 | +\ func_basename_result="${1##*/}"\ |
| 15607 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15608 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15609 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15610 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15611 | + |
| 15612 | + |
| 15613 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 15614 | +func_stripname ()\ |
| 15615 | +{\ |
| 15616 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 15617 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 15618 | +\ func_stripname_result=${3}\ |
| 15619 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 15620 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 15621 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15622 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15623 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15624 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15625 | + |
| 15626 | + |
| 15627 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 15628 | +func_split_long_opt ()\ |
| 15629 | +{\ |
| 15630 | +\ func_split_long_opt_name=${1%%=*}\ |
| 15631 | +\ func_split_long_opt_arg=${1#*=}\ |
| 15632 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15633 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15634 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15635 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15636 | + |
| 15637 | + |
| 15638 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 15639 | +func_split_short_opt ()\ |
| 15640 | +{\ |
| 15641 | +\ func_split_short_opt_arg=${1#??}\ |
| 15642 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 15643 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15644 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15645 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15646 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15647 | + |
| 15648 | + |
| 15649 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 15650 | +func_lo2o ()\ |
| 15651 | +{\ |
| 15652 | +\ case ${1} in\ |
| 15653 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 15654 | +\ *) func_lo2o_result=${1} ;;\ |
| 15655 | +\ esac\ |
| 15656 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15657 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15658 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15659 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15660 | + |
| 15661 | + |
| 15662 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 15663 | +func_xform ()\ |
| 15664 | +{\ |
| 15665 | + func_xform_result=${1%.*}.lo\ |
| 15666 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15667 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15668 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15669 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15670 | + |
| 15671 | + |
| 15672 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 15673 | +func_arith ()\ |
| 15674 | +{\ |
| 15675 | + func_arith_result=$(( $* ))\ |
| 15676 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15677 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15678 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15679 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15680 | + |
| 15681 | + |
| 15682 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 15683 | +func_len ()\ |
| 15684 | +{\ |
| 15685 | + func_len_result=${#1}\ |
| 15686 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15687 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15688 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15689 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15690 | + |
| 15691 | +fi |
| 15692 | + |
| 15693 | +if test x"$lt_shell_append" = xyes; then |
| 15694 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 15695 | +func_append ()\ |
| 15696 | +{\ |
| 15697 | + eval "${1}+=\\${2}"\ |
| 15698 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15699 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15700 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15701 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15702 | + |
| 15703 | + |
| 15704 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 15705 | +func_append_quoted ()\ |
| 15706 | +{\ |
| 15707 | +\ func_quote_for_eval "${2}"\ |
| 15708 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 15709 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 15710 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15711 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15712 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 15713 | + |
| 15714 | + |
| 15715 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 15716 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 15717 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15718 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15719 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 15720 | +else |
| 15721 | + # Save a `func_append' function call even when '+=' is not available |
| 15722 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 15723 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 15724 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 15725 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 15726 | +fi |
| 15727 | + |
| 15728 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 15729 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 15730 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 15731 | +fi |
| 15732 | + |
| 15733 | + |
| 15734 | + mv -f "$cfgfile" "$ofile" || |
| 15735 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 15736 | chmod +x "$ofile" |
| 15737 | |
| 15738 | @@ -19883,12 +20723,12 @@ with_gcc=$GCC_CXX |
| 15739 | # Compiler flag to turn off builtin functions. |
| 15740 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
| 15741 | |
| 15742 | -# How to pass a linker flag through the compiler. |
| 15743 | -wl=$lt_lt_prog_compiler_wl_CXX |
| 15744 | - |
| 15745 | # Additional compiler flags for building library objects. |
| 15746 | pic_flag=$lt_lt_prog_compiler_pic_CXX |
| 15747 | |
| 15748 | +# How to pass a linker flag through the compiler. |
| 15749 | +wl=$lt_lt_prog_compiler_wl_CXX |
| 15750 | + |
| 15751 | # Compiler flag to prevent dynamic linking. |
| 15752 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
| 15753 | |
| 15754 | @@ -19975,9 +20815,6 @@ inherit_rpath=$inherit_rpath_CXX |
| 15755 | # Whether libtool must link a program against all its dependency libraries. |
| 15756 | link_all_deplibs=$link_all_deplibs_CXX |
| 15757 | |
| 15758 | -# Fix the shell variable \$srcfile for the compiler. |
| 15759 | -fix_srcfile_path=$lt_fix_srcfile_path_CXX |
| 15760 | - |
| 15761 | # Set to "yes" if exported symbols are required. |
| 15762 | always_export_symbols=$always_export_symbols_CXX |
| 15763 | |
| 15764 | @@ -19993,6 +20830,9 @@ include_expsyms=$lt_include_expsyms_CXX |
| 15765 | # Commands necessary for linking programs (against libraries) with templates. |
| 15766 | prelink_cmds=$lt_prelink_cmds_CXX |
| 15767 | |
| 15768 | +# Commands necessary for finishing linking programs. |
| 15769 | +postlink_cmds=$lt_postlink_cmds_CXX |
| 15770 | + |
| 15771 | # Specify filename containing input files. |
| 15772 | file_list_spec=$lt_file_list_spec_CXX |
| 15773 | |
| 15774 | diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in |
| 15775 | index e6a4c8e2ef3..3547e3649b7 100644 |
| 15776 | --- a/libbacktrace/Makefile.in |
| 15777 | +++ b/libbacktrace/Makefile.in |
| 15778 | @@ -827,6 +827,7 @@ CPP = @CPP@ |
| 15779 | CPPFLAGS = @CPPFLAGS@ |
| 15780 | CYGPATH_W = @CYGPATH_W@ |
| 15781 | DEFS = @DEFS@ |
| 15782 | +DLLTOOL = @DLLTOOL@ |
| 15783 | DSYMUTIL = @DSYMUTIL@ |
| 15784 | DUMPBIN = @DUMPBIN@ |
| 15785 | DWZ = @DWZ@ |
| 15786 | @@ -854,6 +855,7 @@ LN_S = @LN_S@ |
| 15787 | LTLIBOBJS = @LTLIBOBJS@ |
| 15788 | MAINT = @MAINT@ |
| 15789 | MAKEINFO = @MAKEINFO@ |
| 15790 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 15791 | MKDIR_P = @MKDIR_P@ |
| 15792 | NM = @NM@ |
| 15793 | NMEDIT = @NMEDIT@ |
| 15794 | @@ -886,6 +888,7 @@ abs_builddir = @abs_builddir@ |
| 15795 | abs_srcdir = @abs_srcdir@ |
| 15796 | abs_top_builddir = @abs_top_builddir@ |
| 15797 | abs_top_srcdir = @abs_top_srcdir@ |
| 15798 | +ac_ct_AR = @ac_ct_AR@ |
| 15799 | ac_ct_CC = @ac_ct_CC@ |
| 15800 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 15801 | am__leading_dot = @am__leading_dot@ |
| 15802 | diff --git a/libbacktrace/configure b/libbacktrace/configure |
| 15803 | index 406b67b8cbc..b648da40aab 100755 |
| 15804 | --- a/libbacktrace/configure |
| 15805 | +++ b/libbacktrace/configure |
| 15806 | @@ -680,7 +680,10 @@ OTOOL |
| 15807 | LIPO |
| 15808 | NMEDIT |
| 15809 | DSYMUTIL |
| 15810 | +MANIFEST_TOOL |
| 15811 | +ac_ct_AR |
| 15812 | AR |
| 15813 | +DLLTOOL |
| 15814 | OBJDUMP |
| 15815 | LN_S |
| 15816 | NM |
| 15817 | @@ -798,6 +801,7 @@ enable_static |
| 15818 | with_pic |
| 15819 | enable_fast_install |
| 15820 | with_gnu_ld |
| 15821 | +with_libtool_sysroot |
| 15822 | enable_libtool_lock |
| 15823 | enable_largefile |
| 15824 | enable_cet |
| 15825 | @@ -1458,6 +1462,8 @@ Optional Packages: |
| 15826 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 15827 | both] |
| 15828 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 15829 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 15830 | + (or the compiler's sysroot if not specified). |
| 15831 | --with-system-libunwind use installed libunwind |
| 15832 | |
| 15833 | Some influential environment variables: |
| 15834 | @@ -5446,8 +5452,8 @@ esac |
| 15835 | |
| 15836 | |
| 15837 | |
| 15838 | -macro_version='2.2.7a' |
| 15839 | -macro_revision='1.3134' |
| 15840 | +macro_version='2.4' |
| 15841 | +macro_revision='1.3293' |
| 15842 | |
| 15843 | |
| 15844 | |
| 15845 | @@ -5487,7 +5493,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 15846 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 15847 | $as_echo_n "checking how to print strings... " >&6; } |
| 15848 | # Test print first, because it will be a builtin if present. |
| 15849 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 15850 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 15851 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 15852 | ECHO='print -r --' |
| 15853 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 15854 | @@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 15855 | # Try some XSI features |
| 15856 | xsi_shell=no |
| 15857 | ( _lt_dummy="a/b/c" |
| 15858 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 15859 | - = c,a/b,, \ |
| 15860 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 15861 | + = c,a/b,b/c, \ |
| 15862 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 15863 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 15864 | && xsi_shell=yes |
| 15865 | @@ -6230,6 +6236,80 @@ esac |
| 15866 | |
| 15867 | |
| 15868 | |
| 15869 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 15870 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 15871 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 15872 | + $as_echo_n "(cached) " >&6 |
| 15873 | +else |
| 15874 | + case $host in |
| 15875 | + *-*-mingw* ) |
| 15876 | + case $build in |
| 15877 | + *-*-mingw* ) # actually msys |
| 15878 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 15879 | + ;; |
| 15880 | + *-*-cygwin* ) |
| 15881 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 15882 | + ;; |
| 15883 | + * ) # otherwise, assume *nix |
| 15884 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 15885 | + ;; |
| 15886 | + esac |
| 15887 | + ;; |
| 15888 | + *-*-cygwin* ) |
| 15889 | + case $build in |
| 15890 | + *-*-mingw* ) # actually msys |
| 15891 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 15892 | + ;; |
| 15893 | + *-*-cygwin* ) |
| 15894 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 15895 | + ;; |
| 15896 | + * ) # otherwise, assume *nix |
| 15897 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 15898 | + ;; |
| 15899 | + esac |
| 15900 | + ;; |
| 15901 | + * ) # unhandled hosts (and "normal" native builds) |
| 15902 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 15903 | + ;; |
| 15904 | +esac |
| 15905 | + |
| 15906 | +fi |
| 15907 | + |
| 15908 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 15909 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 15910 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 15911 | + |
| 15912 | + |
| 15913 | + |
| 15914 | + |
| 15915 | + |
| 15916 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 15917 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 15918 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 15919 | + $as_echo_n "(cached) " >&6 |
| 15920 | +else |
| 15921 | + #assume ordinary cross tools, or native build. |
| 15922 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 15923 | +case $host in |
| 15924 | + *-*-mingw* ) |
| 15925 | + case $build in |
| 15926 | + *-*-mingw* ) # actually msys |
| 15927 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 15928 | + ;; |
| 15929 | + esac |
| 15930 | + ;; |
| 15931 | +esac |
| 15932 | + |
| 15933 | +fi |
| 15934 | + |
| 15935 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 15936 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 15937 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 15938 | + |
| 15939 | + |
| 15940 | + |
| 15941 | + |
| 15942 | + |
| 15943 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 15944 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 15945 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 15946 | @@ -6246,6 +6326,11 @@ case $reload_flag in |
| 15947 | esac |
| 15948 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 15949 | case $host_os in |
| 15950 | + cygwin* | mingw* | pw32* | cegcc*) |
| 15951 | + if test "$GCC" != yes; then |
| 15952 | + reload_cmds=false |
| 15953 | + fi |
| 15954 | + ;; |
| 15955 | darwin*) |
| 15956 | if test "$GCC" = yes; then |
| 15957 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 15958 | @@ -6414,7 +6499,8 @@ mingw* | pw32*) |
| 15959 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 15960 | lt_cv_file_magic_cmd='func_win32_libid' |
| 15961 | else |
| 15962 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 15963 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 15964 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 15965 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 15966 | fi |
| 15967 | ;; |
| 15968 | @@ -6568,6 +6654,21 @@ esac |
| 15969 | fi |
| 15970 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 15971 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 15972 | + |
| 15973 | +file_magic_glob= |
| 15974 | +want_nocaseglob=no |
| 15975 | +if test "$build" = "$host"; then |
| 15976 | + case $host_os in |
| 15977 | + mingw* | pw32*) |
| 15978 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 15979 | + want_nocaseglob=yes |
| 15980 | + else |
| 15981 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 15982 | + fi |
| 15983 | + ;; |
| 15984 | + esac |
| 15985 | +fi |
| 15986 | + |
| 15987 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 15988 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 15989 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 15990 | @@ -6583,6 +6684,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 15991 | |
| 15992 | |
| 15993 | |
| 15994 | + |
| 15995 | + |
| 15996 | + |
| 15997 | + |
| 15998 | + |
| 15999 | + |
| 16000 | + |
| 16001 | + |
| 16002 | + |
| 16003 | + |
| 16004 | +if test -n "$ac_tool_prefix"; then |
| 16005 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 16006 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 16007 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 16008 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 16009 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 16010 | + $as_echo_n "(cached) " >&6 |
| 16011 | +else |
| 16012 | + if test -n "$DLLTOOL"; then |
| 16013 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 16014 | +else |
| 16015 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 16016 | +for as_dir in $PATH |
| 16017 | +do |
| 16018 | + IFS=$as_save_IFS |
| 16019 | + test -z "$as_dir" && as_dir=. |
| 16020 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 16021 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 16022 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 16023 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 16024 | + break 2 |
| 16025 | + fi |
| 16026 | +done |
| 16027 | + done |
| 16028 | +IFS=$as_save_IFS |
| 16029 | + |
| 16030 | +fi |
| 16031 | +fi |
| 16032 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 16033 | +if test -n "$DLLTOOL"; then |
| 16034 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 16035 | +$as_echo "$DLLTOOL" >&6; } |
| 16036 | +else |
| 16037 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 16038 | +$as_echo "no" >&6; } |
| 16039 | +fi |
| 16040 | + |
| 16041 | + |
| 16042 | +fi |
| 16043 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 16044 | + ac_ct_DLLTOOL=$DLLTOOL |
| 16045 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 16046 | +set dummy dlltool; ac_word=$2 |
| 16047 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 16048 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 16049 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 16050 | + $as_echo_n "(cached) " >&6 |
| 16051 | +else |
| 16052 | + if test -n "$ac_ct_DLLTOOL"; then |
| 16053 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 16054 | +else |
| 16055 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 16056 | +for as_dir in $PATH |
| 16057 | +do |
| 16058 | + IFS=$as_save_IFS |
| 16059 | + test -z "$as_dir" && as_dir=. |
| 16060 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 16061 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 16062 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 16063 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 16064 | + break 2 |
| 16065 | + fi |
| 16066 | +done |
| 16067 | + done |
| 16068 | +IFS=$as_save_IFS |
| 16069 | + |
| 16070 | +fi |
| 16071 | +fi |
| 16072 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 16073 | +if test -n "$ac_ct_DLLTOOL"; then |
| 16074 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 16075 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 16076 | +else |
| 16077 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 16078 | +$as_echo "no" >&6; } |
| 16079 | +fi |
| 16080 | + |
| 16081 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 16082 | + DLLTOOL="false" |
| 16083 | + else |
| 16084 | + case $cross_compiling:$ac_tool_warned in |
| 16085 | +yes:) |
| 16086 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 16087 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 16088 | +ac_tool_warned=yes ;; |
| 16089 | +esac |
| 16090 | + DLLTOOL=$ac_ct_DLLTOOL |
| 16091 | + fi |
| 16092 | +else |
| 16093 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 16094 | +fi |
| 16095 | + |
| 16096 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 16097 | + |
| 16098 | + |
| 16099 | + |
| 16100 | + |
| 16101 | + |
| 16102 | + |
| 16103 | + |
| 16104 | + |
| 16105 | + |
| 16106 | + |
| 16107 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 16108 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 16109 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 16110 | + $as_echo_n "(cached) " >&6 |
| 16111 | +else |
| 16112 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 16113 | + |
| 16114 | +case $host_os in |
| 16115 | +cygwin* | mingw* | pw32* | cegcc*) |
| 16116 | + # two different shell functions defined in ltmain.sh |
| 16117 | + # decide which to use based on capabilities of $DLLTOOL |
| 16118 | + case `$DLLTOOL --help 2>&1` in |
| 16119 | + *--identify-strict*) |
| 16120 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 16121 | + ;; |
| 16122 | + *) |
| 16123 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 16124 | + ;; |
| 16125 | + esac |
| 16126 | + ;; |
| 16127 | +*) |
| 16128 | + # fallback: assume linklib IS sharedlib |
| 16129 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 16130 | + ;; |
| 16131 | +esac |
| 16132 | + |
| 16133 | +fi |
| 16134 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 16135 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 16136 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 16137 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 16138 | + |
| 16139 | + |
| 16140 | + |
| 16141 | + |
| 16142 | + |
| 16143 | + |
| 16144 | + |
| 16145 | plugin_option= |
| 16146 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 16147 | for plugin in $plugin_names; do |
| 16148 | @@ -6597,8 +6849,10 @@ for plugin in $plugin_names; do |
| 16149 | done |
| 16150 | |
| 16151 | if test -n "$ac_tool_prefix"; then |
| 16152 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 16153 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 16154 | + for ac_prog in ar |
| 16155 | + do |
| 16156 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 16157 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 16158 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 16159 | $as_echo_n "checking for $ac_word... " >&6; } |
| 16160 | if ${ac_cv_prog_AR+:} false; then : |
| 16161 | @@ -6614,7 +6868,7 @@ do |
| 16162 | test -z "$as_dir" && as_dir=. |
| 16163 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 16164 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 16165 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 16166 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 16167 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 16168 | break 2 |
| 16169 | fi |
| 16170 | @@ -6634,11 +6888,15 @@ $as_echo "no" >&6; } |
| 16171 | fi |
| 16172 | |
| 16173 | |
| 16174 | + test -n "$AR" && break |
| 16175 | + done |
| 16176 | fi |
| 16177 | -if test -z "$ac_cv_prog_AR"; then |
| 16178 | +if test -z "$AR"; then |
| 16179 | ac_ct_AR=$AR |
| 16180 | - # Extract the first word of "ar", so it can be a program name with args. |
| 16181 | -set dummy ar; ac_word=$2 |
| 16182 | + for ac_prog in ar |
| 16183 | +do |
| 16184 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 16185 | +set dummy $ac_prog; ac_word=$2 |
| 16186 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 16187 | $as_echo_n "checking for $ac_word... " >&6; } |
| 16188 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 16189 | @@ -6654,7 +6912,7 @@ do |
| 16190 | test -z "$as_dir" && as_dir=. |
| 16191 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 16192 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 16193 | - ac_cv_prog_ac_ct_AR="ar" |
| 16194 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 16195 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 16196 | break 2 |
| 16197 | fi |
| 16198 | @@ -6673,6 +6931,10 @@ else |
| 16199 | $as_echo "no" >&6; } |
| 16200 | fi |
| 16201 | |
| 16202 | + |
| 16203 | + test -n "$ac_ct_AR" && break |
| 16204 | +done |
| 16205 | + |
| 16206 | if test "x$ac_ct_AR" = x; then |
| 16207 | AR="false" |
| 16208 | else |
| 16209 | @@ -6684,25 +6946,19 @@ ac_tool_warned=yes ;; |
| 16210 | esac |
| 16211 | AR=$ac_ct_AR |
| 16212 | fi |
| 16213 | -else |
| 16214 | - AR="$ac_cv_prog_AR" |
| 16215 | fi |
| 16216 | |
| 16217 | -test -z "$AR" && AR=ar |
| 16218 | -if test -n "$plugin_option"; then |
| 16219 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 16220 | - touch conftest.c |
| 16221 | - $AR $plugin_option rc conftest.a conftest.c |
| 16222 | - if test "$?" != 0; then |
| 16223 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 16224 | + touch conftest.c |
| 16225 | + $AR $plugin_option rc conftest.a conftest.c |
| 16226 | + if test "$?" != 0; then |
| 16227 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 16228 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 16229 | - else |
| 16230 | - AR="$AR $plugin_option" |
| 16231 | - fi |
| 16232 | - rm -f conftest.* |
| 16233 | + else |
| 16234 | + AR="$AR $plugin_option" |
| 16235 | fi |
| 16236 | -fi |
| 16237 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 16238 | + rm -f conftest.* |
| 16239 | +: ${AR=ar} |
| 16240 | +: ${AR_FLAGS=cru} |
| 16241 | |
| 16242 | |
| 16243 | |
| 16244 | @@ -6714,6 +6970,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 16245 | |
| 16246 | |
| 16247 | |
| 16248 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 16249 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 16250 | +if ${lt_cv_ar_at_file+:} false; then : |
| 16251 | + $as_echo_n "(cached) " >&6 |
| 16252 | +else |
| 16253 | + lt_cv_ar_at_file=no |
| 16254 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16255 | +/* end confdefs.h. */ |
| 16256 | + |
| 16257 | +int |
| 16258 | +main () |
| 16259 | +{ |
| 16260 | + |
| 16261 | + ; |
| 16262 | + return 0; |
| 16263 | +} |
| 16264 | +_ACEOF |
| 16265 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 16266 | + echo conftest.$ac_objext > conftest.lst |
| 16267 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 16268 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 16269 | + (eval $lt_ar_try) 2>&5 |
| 16270 | + ac_status=$? |
| 16271 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 16272 | + test $ac_status = 0; } |
| 16273 | + if test "$ac_status" -eq 0; then |
| 16274 | + # Ensure the archiver fails upon bogus file names. |
| 16275 | + rm -f conftest.$ac_objext libconftest.a |
| 16276 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 16277 | + (eval $lt_ar_try) 2>&5 |
| 16278 | + ac_status=$? |
| 16279 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 16280 | + test $ac_status = 0; } |
| 16281 | + if test "$ac_status" -ne 0; then |
| 16282 | + lt_cv_ar_at_file=@ |
| 16283 | + fi |
| 16284 | + fi |
| 16285 | + rm -f conftest.* libconftest.a |
| 16286 | + |
| 16287 | +fi |
| 16288 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 16289 | + |
| 16290 | +fi |
| 16291 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 16292 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 16293 | + |
| 16294 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 16295 | + archiver_list_spec= |
| 16296 | +else |
| 16297 | + archiver_list_spec=$lt_cv_ar_at_file |
| 16298 | +fi |
| 16299 | + |
| 16300 | + |
| 16301 | + |
| 16302 | + |
| 16303 | + |
| 16304 | + |
| 16305 | + |
| 16306 | if test -n "$ac_tool_prefix"; then |
| 16307 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 16308 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 16309 | @@ -7053,8 +7367,8 @@ esac |
| 16310 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 16311 | |
| 16312 | # Transform an extracted symbol line into symbol name and symbol address |
| 16313 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 16314 | -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'" |
| 16315 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 16316 | +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'" |
| 16317 | |
| 16318 | # Handle CRLF in mingw tool chain |
| 16319 | opt_cr= |
| 16320 | @@ -7090,6 +7404,7 @@ for ac_symprfx in "" "_"; do |
| 16321 | else |
| 16322 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 16323 | fi |
| 16324 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 16325 | |
| 16326 | # Check to see that the pipe works correctly. |
| 16327 | pipe_works=no |
| 16328 | @@ -7131,6 +7446,18 @@ _LT_EOF |
| 16329 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 16330 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 16331 | cat <<_LT_EOF > conftest.$ac_ext |
| 16332 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 16333 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 16334 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 16335 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 16336 | +# define LT_DLSYM_CONST |
| 16337 | +#elif defined(__osf__) |
| 16338 | +/* This system does not cope well with relocations in const data. */ |
| 16339 | +# define LT_DLSYM_CONST |
| 16340 | +#else |
| 16341 | +# define LT_DLSYM_CONST const |
| 16342 | +#endif |
| 16343 | + |
| 16344 | #ifdef __cplusplus |
| 16345 | extern "C" { |
| 16346 | #endif |
| 16347 | @@ -7142,7 +7469,7 @@ _LT_EOF |
| 16348 | cat <<_LT_EOF >> conftest.$ac_ext |
| 16349 | |
| 16350 | /* The mapping between symbol names and symbols. */ |
| 16351 | -const struct { |
| 16352 | +LT_DLSYM_CONST struct { |
| 16353 | const char *name; |
| 16354 | void *address; |
| 16355 | } |
| 16356 | @@ -7168,8 +7495,8 @@ static const void *lt_preloaded_setup() { |
| 16357 | _LT_EOF |
| 16358 | # Now try linking the two files. |
| 16359 | mv conftest.$ac_objext conftstm.$ac_objext |
| 16360 | - lt_save_LIBS="$LIBS" |
| 16361 | - lt_save_CFLAGS="$CFLAGS" |
| 16362 | + lt_globsym_save_LIBS=$LIBS |
| 16363 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 16364 | LIBS="conftstm.$ac_objext" |
| 16365 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 16366 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 16367 | @@ -7179,8 +7506,8 @@ _LT_EOF |
| 16368 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 16369 | pipe_works=yes |
| 16370 | fi |
| 16371 | - LIBS="$lt_save_LIBS" |
| 16372 | - CFLAGS="$lt_save_CFLAGS" |
| 16373 | + LIBS=$lt_globsym_save_LIBS |
| 16374 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 16375 | else |
| 16376 | echo "cannot find nm_test_func in $nlist" >&5 |
| 16377 | fi |
| 16378 | @@ -7217,6 +7544,18 @@ else |
| 16379 | $as_echo "ok" >&6; } |
| 16380 | fi |
| 16381 | |
| 16382 | +# Response file support. |
| 16383 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 16384 | + nm_file_list_spec='@' |
| 16385 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 16386 | + nm_file_list_spec='@' |
| 16387 | +fi |
| 16388 | + |
| 16389 | + |
| 16390 | + |
| 16391 | + |
| 16392 | + |
| 16393 | + |
| 16394 | |
| 16395 | |
| 16396 | |
| 16397 | @@ -7233,6 +7572,43 @@ fi |
| 16398 | |
| 16399 | |
| 16400 | |
| 16401 | + |
| 16402 | + |
| 16403 | + |
| 16404 | + |
| 16405 | + |
| 16406 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 16407 | +$as_echo_n "checking for sysroot... " >&6; } |
| 16408 | + |
| 16409 | +# Check whether --with-libtool-sysroot was given. |
| 16410 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 16411 | + withval=$with_libtool_sysroot; |
| 16412 | +else |
| 16413 | + with_libtool_sysroot=no |
| 16414 | +fi |
| 16415 | + |
| 16416 | + |
| 16417 | +lt_sysroot= |
| 16418 | +case ${with_libtool_sysroot} in #( |
| 16419 | + yes) |
| 16420 | + if test "$GCC" = yes; then |
| 16421 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 16422 | + fi |
| 16423 | + ;; #( |
| 16424 | + /*) |
| 16425 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 16426 | + ;; #( |
| 16427 | + no|'') |
| 16428 | + ;; #( |
| 16429 | + *) |
| 16430 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 16431 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 16432 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 16433 | + ;; |
| 16434 | +esac |
| 16435 | + |
| 16436 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 16437 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 16438 | |
| 16439 | |
| 16440 | |
| 16441 | @@ -7444,6 +7820,123 @@ esac |
| 16442 | |
| 16443 | need_locks="$enable_libtool_lock" |
| 16444 | |
| 16445 | +if test -n "$ac_tool_prefix"; then |
| 16446 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 16447 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 16448 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 16449 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 16450 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 16451 | + $as_echo_n "(cached) " >&6 |
| 16452 | +else |
| 16453 | + if test -n "$MANIFEST_TOOL"; then |
| 16454 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 16455 | +else |
| 16456 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 16457 | +for as_dir in $PATH |
| 16458 | +do |
| 16459 | + IFS=$as_save_IFS |
| 16460 | + test -z "$as_dir" && as_dir=. |
| 16461 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 16462 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 16463 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 16464 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 16465 | + break 2 |
| 16466 | + fi |
| 16467 | +done |
| 16468 | + done |
| 16469 | +IFS=$as_save_IFS |
| 16470 | + |
| 16471 | +fi |
| 16472 | +fi |
| 16473 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 16474 | +if test -n "$MANIFEST_TOOL"; then |
| 16475 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 16476 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 16477 | +else |
| 16478 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 16479 | +$as_echo "no" >&6; } |
| 16480 | +fi |
| 16481 | + |
| 16482 | + |
| 16483 | +fi |
| 16484 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 16485 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 16486 | + # Extract the first word of "mt", so it can be a program name with args. |
| 16487 | +set dummy mt; ac_word=$2 |
| 16488 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 16489 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 16490 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 16491 | + $as_echo_n "(cached) " >&6 |
| 16492 | +else |
| 16493 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 16494 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 16495 | +else |
| 16496 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 16497 | +for as_dir in $PATH |
| 16498 | +do |
| 16499 | + IFS=$as_save_IFS |
| 16500 | + test -z "$as_dir" && as_dir=. |
| 16501 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 16502 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 16503 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 16504 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 16505 | + break 2 |
| 16506 | + fi |
| 16507 | +done |
| 16508 | + done |
| 16509 | +IFS=$as_save_IFS |
| 16510 | + |
| 16511 | +fi |
| 16512 | +fi |
| 16513 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 16514 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 16515 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 16516 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 16517 | +else |
| 16518 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 16519 | +$as_echo "no" >&6; } |
| 16520 | +fi |
| 16521 | + |
| 16522 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 16523 | + MANIFEST_TOOL=":" |
| 16524 | + else |
| 16525 | + case $cross_compiling:$ac_tool_warned in |
| 16526 | +yes:) |
| 16527 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 16528 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 16529 | +ac_tool_warned=yes ;; |
| 16530 | +esac |
| 16531 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 16532 | + fi |
| 16533 | +else |
| 16534 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 16535 | +fi |
| 16536 | + |
| 16537 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 16538 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 16539 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 16540 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 16541 | + $as_echo_n "(cached) " >&6 |
| 16542 | +else |
| 16543 | + lt_cv_path_mainfest_tool=no |
| 16544 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 16545 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 16546 | + cat conftest.err >&5 |
| 16547 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 16548 | + lt_cv_path_mainfest_tool=yes |
| 16549 | + fi |
| 16550 | + rm -f conftest* |
| 16551 | +fi |
| 16552 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 16553 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 16554 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 16555 | + MANIFEST_TOOL=: |
| 16556 | +fi |
| 16557 | + |
| 16558 | + |
| 16559 | + |
| 16560 | + |
| 16561 | + |
| 16562 | |
| 16563 | case $host_os in |
| 16564 | rhapsody* | darwin*) |
| 16565 | @@ -8007,6 +8500,8 @@ _LT_EOF |
| 16566 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 16567 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 16568 | $AR cru libconftest.a conftest.o 2>&5 |
| 16569 | + echo "$RANLIB libconftest.a" >&5 |
| 16570 | + $RANLIB libconftest.a 2>&5 |
| 16571 | cat > conftest.c << _LT_EOF |
| 16572 | int main() { return 0;} |
| 16573 | _LT_EOF |
| 16574 | @@ -8589,8 +9084,6 @@ fi |
| 16575 | lt_prog_compiler_pic= |
| 16576 | lt_prog_compiler_static= |
| 16577 | |
| 16578 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 16579 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 16580 | |
| 16581 | if test "$GCC" = yes; then |
| 16582 | lt_prog_compiler_wl='-Wl,' |
| 16583 | @@ -8756,6 +9249,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 16584 | lt_prog_compiler_pic='--shared' |
| 16585 | lt_prog_compiler_static='--static' |
| 16586 | ;; |
| 16587 | + nagfor*) |
| 16588 | + # NAG Fortran compiler |
| 16589 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 16590 | + lt_prog_compiler_pic='-PIC' |
| 16591 | + lt_prog_compiler_static='-Bstatic' |
| 16592 | + ;; |
| 16593 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 16594 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 16595 | # which looks to be a dead project) |
| 16596 | @@ -8818,7 +9317,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 16597 | lt_prog_compiler_pic='-KPIC' |
| 16598 | lt_prog_compiler_static='-Bstatic' |
| 16599 | case $cc_basename in |
| 16600 | - f77* | f90* | f95*) |
| 16601 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 16602 | lt_prog_compiler_wl='-Qoption ld ';; |
| 16603 | *) |
| 16604 | lt_prog_compiler_wl='-Wl,';; |
| 16605 | @@ -8875,13 +9374,17 @@ case $host_os in |
| 16606 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 16607 | ;; |
| 16608 | esac |
| 16609 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 16610 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 16611 | - |
| 16612 | - |
| 16613 | - |
| 16614 | - |
| 16615 | |
| 16616 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 16617 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 16618 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 16619 | + $as_echo_n "(cached) " >&6 |
| 16620 | +else |
| 16621 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 16622 | +fi |
| 16623 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 16624 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 16625 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 16626 | |
| 16627 | # |
| 16628 | # Check to make sure the PIC flag actually works. |
| 16629 | @@ -8942,6 +9445,11 @@ fi |
| 16630 | |
| 16631 | |
| 16632 | |
| 16633 | + |
| 16634 | + |
| 16635 | + |
| 16636 | + |
| 16637 | + |
| 16638 | # |
| 16639 | # Check to make sure the static flag actually works. |
| 16640 | # |
| 16641 | @@ -9292,7 +9800,8 @@ _LT_EOF |
| 16642 | allow_undefined_flag=unsupported |
| 16643 | always_export_symbols=no |
| 16644 | enable_shared_with_static_runtimes=yes |
| 16645 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 16646 | + 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' |
| 16647 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 16648 | |
| 16649 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 16650 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 16651 | @@ -9391,12 +9900,12 @@ _LT_EOF |
| 16652 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 16653 | hardcode_libdir_flag_spec= |
| 16654 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 16655 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 16656 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 16657 | if test "x$supports_anon_versioning" = xyes; then |
| 16658 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 16659 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 16660 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 16661 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 16662 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 16663 | fi |
| 16664 | ;; |
| 16665 | esac |
| 16666 | @@ -9410,8 +9919,8 @@ _LT_EOF |
| 16667 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 16668 | wlarc= |
| 16669 | else |
| 16670 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 16671 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 16672 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 16673 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 16674 | fi |
| 16675 | ;; |
| 16676 | |
| 16677 | @@ -9429,8 +9938,8 @@ _LT_EOF |
| 16678 | |
| 16679 | _LT_EOF |
| 16680 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 16681 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 16682 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 16683 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 16684 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 16685 | else |
| 16686 | ld_shlibs=no |
| 16687 | fi |
| 16688 | @@ -9476,8 +9985,8 @@ _LT_EOF |
| 16689 | |
| 16690 | *) |
| 16691 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 16692 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 16693 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 16694 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 16695 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 16696 | else |
| 16697 | ld_shlibs=no |
| 16698 | fi |
| 16699 | @@ -9607,7 +10116,13 @@ _LT_EOF |
| 16700 | allow_undefined_flag='-berok' |
| 16701 | # Determine the default libpath from the value encoded in an |
| 16702 | # empty executable. |
| 16703 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16704 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 16705 | + aix_libpath=$lt_cv_aix_libpath |
| 16706 | +else |
| 16707 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 16708 | + $as_echo_n "(cached) " >&6 |
| 16709 | +else |
| 16710 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16711 | /* end confdefs.h. */ |
| 16712 | |
| 16713 | int |
| 16714 | @@ -9620,22 +10135,29 @@ main () |
| 16715 | _ACEOF |
| 16716 | if ac_fn_c_try_link "$LINENO"; then : |
| 16717 | |
| 16718 | -lt_aix_libpath_sed=' |
| 16719 | - /Import File Strings/,/^$/ { |
| 16720 | - /^0/ { |
| 16721 | - s/^0 *\(.*\)$/\1/ |
| 16722 | - p |
| 16723 | - } |
| 16724 | - }' |
| 16725 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 16726 | -# Check for a 64-bit object if we didn't find anything. |
| 16727 | -if test -z "$aix_libpath"; then |
| 16728 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 16729 | -fi |
| 16730 | + lt_aix_libpath_sed=' |
| 16731 | + /Import File Strings/,/^$/ { |
| 16732 | + /^0/ { |
| 16733 | + s/^0 *\([^ ]*\) *$/\1/ |
| 16734 | + p |
| 16735 | + } |
| 16736 | + }' |
| 16737 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 16738 | + # Check for a 64-bit object if we didn't find anything. |
| 16739 | + if test -z "$lt_cv_aix_libpath_"; then |
| 16740 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 16741 | + fi |
| 16742 | fi |
| 16743 | rm -f core conftest.err conftest.$ac_objext \ |
| 16744 | conftest$ac_exeext conftest.$ac_ext |
| 16745 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16746 | + if test -z "$lt_cv_aix_libpath_"; then |
| 16747 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 16748 | + fi |
| 16749 | + |
| 16750 | +fi |
| 16751 | + |
| 16752 | + aix_libpath=$lt_cv_aix_libpath_ |
| 16753 | +fi |
| 16754 | |
| 16755 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 16756 | 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" |
| 16757 | @@ -9647,7 +10169,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16758 | else |
| 16759 | # Determine the default libpath from the value encoded in an |
| 16760 | # empty executable. |
| 16761 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16762 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 16763 | + aix_libpath=$lt_cv_aix_libpath |
| 16764 | +else |
| 16765 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 16766 | + $as_echo_n "(cached) " >&6 |
| 16767 | +else |
| 16768 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16769 | /* end confdefs.h. */ |
| 16770 | |
| 16771 | int |
| 16772 | @@ -9660,22 +10188,29 @@ main () |
| 16773 | _ACEOF |
| 16774 | if ac_fn_c_try_link "$LINENO"; then : |
| 16775 | |
| 16776 | -lt_aix_libpath_sed=' |
| 16777 | - /Import File Strings/,/^$/ { |
| 16778 | - /^0/ { |
| 16779 | - s/^0 *\(.*\)$/\1/ |
| 16780 | - p |
| 16781 | - } |
| 16782 | - }' |
| 16783 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 16784 | -# Check for a 64-bit object if we didn't find anything. |
| 16785 | -if test -z "$aix_libpath"; then |
| 16786 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 16787 | -fi |
| 16788 | + lt_aix_libpath_sed=' |
| 16789 | + /Import File Strings/,/^$/ { |
| 16790 | + /^0/ { |
| 16791 | + s/^0 *\([^ ]*\) *$/\1/ |
| 16792 | + p |
| 16793 | + } |
| 16794 | + }' |
| 16795 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 16796 | + # Check for a 64-bit object if we didn't find anything. |
| 16797 | + if test -z "$lt_cv_aix_libpath_"; then |
| 16798 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 16799 | + fi |
| 16800 | fi |
| 16801 | rm -f core conftest.err conftest.$ac_objext \ |
| 16802 | conftest$ac_exeext conftest.$ac_ext |
| 16803 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16804 | + if test -z "$lt_cv_aix_libpath_"; then |
| 16805 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 16806 | + fi |
| 16807 | + |
| 16808 | +fi |
| 16809 | + |
| 16810 | + aix_libpath=$lt_cv_aix_libpath_ |
| 16811 | +fi |
| 16812 | |
| 16813 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 16814 | # Warning - without using the other run time loading flags, |
| 16815 | @@ -9720,20 +10255,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16816 | # Microsoft Visual C++. |
| 16817 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 16818 | # no search path for DLLs. |
| 16819 | - hardcode_libdir_flag_spec=' ' |
| 16820 | - allow_undefined_flag=unsupported |
| 16821 | - # Tell ltmain to make .lib files, not .a files. |
| 16822 | - libext=lib |
| 16823 | - # Tell ltmain to make .dll files, not .so files. |
| 16824 | - shrext_cmds=".dll" |
| 16825 | - # FIXME: Setting linknames here is a bad hack. |
| 16826 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 16827 | - # The linker will automatically build a .lib file if we build a DLL. |
| 16828 | - old_archive_from_new_cmds='true' |
| 16829 | - # FIXME: Should let the user specify the lib program. |
| 16830 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 16831 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 16832 | - enable_shared_with_static_runtimes=yes |
| 16833 | + case $cc_basename in |
| 16834 | + cl*) |
| 16835 | + # Native MSVC |
| 16836 | + hardcode_libdir_flag_spec=' ' |
| 16837 | + allow_undefined_flag=unsupported |
| 16838 | + always_export_symbols=yes |
| 16839 | + file_list_spec='@' |
| 16840 | + # Tell ltmain to make .lib files, not .a files. |
| 16841 | + libext=lib |
| 16842 | + # Tell ltmain to make .dll files, not .so files. |
| 16843 | + shrext_cmds=".dll" |
| 16844 | + # FIXME: Setting linknames here is a bad hack. |
| 16845 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 16846 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 16847 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 16848 | + else |
| 16849 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 16850 | + fi~ |
| 16851 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 16852 | + linknames=' |
| 16853 | + # The linker will not automatically build a static lib if we build a DLL. |
| 16854 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 16855 | + enable_shared_with_static_runtimes=yes |
| 16856 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 16857 | + # Don't use ranlib |
| 16858 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 16859 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 16860 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 16861 | + case $lt_outputfile in |
| 16862 | + *.exe|*.EXE) ;; |
| 16863 | + *) |
| 16864 | + lt_outputfile="$lt_outputfile.exe" |
| 16865 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 16866 | + ;; |
| 16867 | + esac~ |
| 16868 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 16869 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 16870 | + $RM "$lt_outputfile.manifest"; |
| 16871 | + fi' |
| 16872 | + ;; |
| 16873 | + *) |
| 16874 | + # Assume MSVC wrapper |
| 16875 | + hardcode_libdir_flag_spec=' ' |
| 16876 | + allow_undefined_flag=unsupported |
| 16877 | + # Tell ltmain to make .lib files, not .a files. |
| 16878 | + libext=lib |
| 16879 | + # Tell ltmain to make .dll files, not .so files. |
| 16880 | + shrext_cmds=".dll" |
| 16881 | + # FIXME: Setting linknames here is a bad hack. |
| 16882 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 16883 | + # The linker will automatically build a .lib file if we build a DLL. |
| 16884 | + old_archive_from_new_cmds='true' |
| 16885 | + # FIXME: Should let the user specify the lib program. |
| 16886 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 16887 | + enable_shared_with_static_runtimes=yes |
| 16888 | + ;; |
| 16889 | + esac |
| 16890 | ;; |
| 16891 | |
| 16892 | darwin* | rhapsody*) |
| 16893 | @@ -9794,7 +10372,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16894 | |
| 16895 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 16896 | freebsd* | dragonfly*) |
| 16897 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 16898 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 16899 | hardcode_libdir_flag_spec='-R$libdir' |
| 16900 | hardcode_direct=yes |
| 16901 | hardcode_shlibpath_var=no |
| 16902 | @@ -9802,7 +10380,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16903 | |
| 16904 | hpux9*) |
| 16905 | if test "$GCC" = yes; then |
| 16906 | - 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' |
| 16907 | + 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' |
| 16908 | else |
| 16909 | 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' |
| 16910 | fi |
| 16911 | @@ -9818,7 +10396,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16912 | |
| 16913 | hpux10*) |
| 16914 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 16915 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 16916 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 16917 | else |
| 16918 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 16919 | fi |
| 16920 | @@ -9842,10 +10420,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16921 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 16922 | ;; |
| 16923 | ia64*) |
| 16924 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 16925 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 16926 | ;; |
| 16927 | *) |
| 16928 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 16929 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 16930 | ;; |
| 16931 | esac |
| 16932 | else |
| 16933 | @@ -9924,23 +10502,36 @@ fi |
| 16934 | |
| 16935 | irix5* | irix6* | nonstopux*) |
| 16936 | if test "$GCC" = yes; then |
| 16937 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 16938 | + 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' |
| 16939 | # Try to use the -exported_symbol ld option, if it does not |
| 16940 | # work, assume that -exports_file does not work either and |
| 16941 | # implicitly export all symbols. |
| 16942 | - save_LDFLAGS="$LDFLAGS" |
| 16943 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 16944 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16945 | + # This should be the same for all languages, so no per-tag cache variable. |
| 16946 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 16947 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 16948 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 16949 | + $as_echo_n "(cached) " >&6 |
| 16950 | +else |
| 16951 | + save_LDFLAGS="$LDFLAGS" |
| 16952 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 16953 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16954 | /* end confdefs.h. */ |
| 16955 | -int foo(void) {} |
| 16956 | +int foo (void) { return 0; } |
| 16957 | _ACEOF |
| 16958 | if ac_fn_c_try_link "$LINENO"; then : |
| 16959 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 16960 | - |
| 16961 | + lt_cv_irix_exported_symbol=yes |
| 16962 | +else |
| 16963 | + lt_cv_irix_exported_symbol=no |
| 16964 | fi |
| 16965 | rm -f core conftest.err conftest.$ac_objext \ |
| 16966 | conftest$ac_exeext conftest.$ac_ext |
| 16967 | - LDFLAGS="$save_LDFLAGS" |
| 16968 | + LDFLAGS="$save_LDFLAGS" |
| 16969 | +fi |
| 16970 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 16971 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 16972 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 16973 | + 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' |
| 16974 | + fi |
| 16975 | else |
| 16976 | 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' |
| 16977 | 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' |
| 16978 | @@ -10025,7 +10616,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 16979 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 16980 | if test "$GCC" = yes; then |
| 16981 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 16982 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 16983 | + 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' |
| 16984 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 16985 | else |
| 16986 | allow_undefined_flag=' -expect_unresolved \*' |
| 16987 | @@ -10044,9 +10635,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 16988 | no_undefined_flag=' -z defs' |
| 16989 | if test "$GCC" = yes; then |
| 16990 | wlarc='${wl}' |
| 16991 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 16992 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 16993 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 16994 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 16995 | + $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' |
| 16996 | else |
| 16997 | case `$CC -V 2>&1` in |
| 16998 | *"Compilers 5.0"*) |
| 16999 | @@ -10622,8 +11213,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 17000 | need_version=no |
| 17001 | need_lib_prefix=no |
| 17002 | |
| 17003 | - case $GCC,$host_os in |
| 17004 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 17005 | + case $GCC,$cc_basename in |
| 17006 | + yes,*) |
| 17007 | + # gcc |
| 17008 | library_names_spec='$libname.dll.a' |
| 17009 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 17010 | postinstall_cmds='base_file=`basename \${file}`~ |
| 17011 | @@ -10656,13 +11248,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 17012 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 17013 | ;; |
| 17014 | esac |
| 17015 | + dynamic_linker='Win32 ld.exe' |
| 17016 | + ;; |
| 17017 | + |
| 17018 | + *,cl*) |
| 17019 | + # Native MSVC |
| 17020 | + libname_spec='$name' |
| 17021 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 17022 | + library_names_spec='${libname}.dll.lib' |
| 17023 | + |
| 17024 | + case $build_os in |
| 17025 | + mingw*) |
| 17026 | + sys_lib_search_path_spec= |
| 17027 | + lt_save_ifs=$IFS |
| 17028 | + IFS=';' |
| 17029 | + for lt_path in $LIB |
| 17030 | + do |
| 17031 | + IFS=$lt_save_ifs |
| 17032 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 17033 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 17034 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 17035 | + done |
| 17036 | + IFS=$lt_save_ifs |
| 17037 | + # Convert to MSYS style. |
| 17038 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 17039 | + ;; |
| 17040 | + cygwin*) |
| 17041 | + # Convert to unix form, then to dos form, then back to unix form |
| 17042 | + # but this time dos style (no spaces!) so that the unix form looks |
| 17043 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 17044 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 17045 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 17046 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 17047 | + ;; |
| 17048 | + *) |
| 17049 | + sys_lib_search_path_spec="$LIB" |
| 17050 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 17051 | + # It is most probably a Windows format PATH. |
| 17052 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 17053 | + else |
| 17054 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 17055 | + fi |
| 17056 | + # FIXME: find the short name or the path components, as spaces are |
| 17057 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 17058 | + ;; |
| 17059 | + esac |
| 17060 | + |
| 17061 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 17062 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 17063 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 17064 | + dldir=$destdir/`dirname \$dlpath`~ |
| 17065 | + test -d \$dldir || mkdir -p \$dldir~ |
| 17066 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 17067 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 17068 | + dlpath=$dir/\$dldll~ |
| 17069 | + $RM \$dlpath' |
| 17070 | + shlibpath_overrides_runpath=yes |
| 17071 | + dynamic_linker='Win32 link.exe' |
| 17072 | ;; |
| 17073 | |
| 17074 | *) |
| 17075 | + # Assume MSVC wrapper |
| 17076 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 17077 | + dynamic_linker='Win32 ld.exe' |
| 17078 | ;; |
| 17079 | esac |
| 17080 | - dynamic_linker='Win32 ld.exe' |
| 17081 | # FIXME: first we should search . and the directory the executable is in |
| 17082 | shlibpath_var=PATH |
| 17083 | ;; |
| 17084 | @@ -11540,7 +12190,7 @@ else |
| 17085 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 17086 | lt_status=$lt_dlunknown |
| 17087 | cat > conftest.$ac_ext <<_LT_EOF |
| 17088 | -#line 11543 "configure" |
| 17089 | +#line $LINENO "configure" |
| 17090 | #include "confdefs.h" |
| 17091 | |
| 17092 | #if HAVE_DLFCN_H |
| 17093 | @@ -11584,10 +12234,10 @@ else |
| 17094 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 17095 | correspondingly for the symbols needed. */ |
| 17096 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 17097 | -void fnord () __attribute__((visibility("default"))); |
| 17098 | +int fnord () __attribute__((visibility("default"))); |
| 17099 | #endif |
| 17100 | |
| 17101 | -void fnord () { int i=42; } |
| 17102 | +int fnord () { return 42; } |
| 17103 | int main () |
| 17104 | { |
| 17105 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 17106 | @@ -11646,7 +12296,7 @@ else |
| 17107 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 17108 | lt_status=$lt_dlunknown |
| 17109 | cat > conftest.$ac_ext <<_LT_EOF |
| 17110 | -#line 11649 "configure" |
| 17111 | +#line $LINENO "configure" |
| 17112 | #include "confdefs.h" |
| 17113 | |
| 17114 | #if HAVE_DLFCN_H |
| 17115 | @@ -11690,10 +12340,10 @@ else |
| 17116 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 17117 | correspondingly for the symbols needed. */ |
| 17118 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 17119 | -void fnord () __attribute__((visibility("default"))); |
| 17120 | +int fnord () __attribute__((visibility("default"))); |
| 17121 | #endif |
| 17122 | |
| 17123 | -void fnord () { int i=42; } |
| 17124 | +int fnord () { return 42; } |
| 17125 | int main () |
| 17126 | { |
| 17127 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 17128 | @@ -14979,13 +15629,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 17129 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 17130 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 17131 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 17132 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 17133 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 17134 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 17135 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 17136 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 17137 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 17138 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 17139 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 17140 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 17141 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 17142 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 17143 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 17144 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 17145 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 17146 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 17147 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 17148 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 17149 | @@ -15000,14 +15657,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 17150 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 17151 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 17152 | 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"`' |
| 17153 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 17154 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 17155 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 17156 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 17157 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 17158 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 17159 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 17160 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 17161 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 17162 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 17163 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 17164 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 17165 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 17166 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 17167 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 17168 | @@ -15040,12 +15700,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 17169 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 17170 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 17171 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 17172 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 17173 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 17174 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 17175 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 17176 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 17177 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 17178 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 17179 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 17180 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 17181 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 17182 | @@ -15100,8 +15760,13 @@ reload_flag \ |
| 17183 | OBJDUMP \ |
| 17184 | deplibs_check_method \ |
| 17185 | file_magic_cmd \ |
| 17186 | +file_magic_glob \ |
| 17187 | +want_nocaseglob \ |
| 17188 | +DLLTOOL \ |
| 17189 | +sharedlib_from_linklib_cmd \ |
| 17190 | AR \ |
| 17191 | AR_FLAGS \ |
| 17192 | +archiver_list_spec \ |
| 17193 | STRIP \ |
| 17194 | RANLIB \ |
| 17195 | CC \ |
| 17196 | @@ -15111,12 +15776,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 17197 | lt_cv_sys_global_symbol_to_cdecl \ |
| 17198 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 17199 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 17200 | +nm_file_list_spec \ |
| 17201 | lt_prog_compiler_no_builtin_flag \ |
| 17202 | -lt_prog_compiler_wl \ |
| 17203 | lt_prog_compiler_pic \ |
| 17204 | +lt_prog_compiler_wl \ |
| 17205 | lt_prog_compiler_static \ |
| 17206 | lt_cv_prog_compiler_c_o \ |
| 17207 | need_locks \ |
| 17208 | +MANIFEST_TOOL \ |
| 17209 | DSYMUTIL \ |
| 17210 | NMEDIT \ |
| 17211 | LIPO \ |
| 17212 | @@ -15132,7 +15799,6 @@ no_undefined_flag \ |
| 17213 | hardcode_libdir_flag_spec \ |
| 17214 | hardcode_libdir_flag_spec_ld \ |
| 17215 | hardcode_libdir_separator \ |
| 17216 | -fix_srcfile_path \ |
| 17217 | exclude_expsyms \ |
| 17218 | include_expsyms \ |
| 17219 | file_list_spec \ |
| 17220 | @@ -15168,6 +15834,7 @@ module_cmds \ |
| 17221 | module_expsym_cmds \ |
| 17222 | export_symbols_cmds \ |
| 17223 | prelink_cmds \ |
| 17224 | +postlink_cmds \ |
| 17225 | postinstall_cmds \ |
| 17226 | postuninstall_cmds \ |
| 17227 | finish_cmds \ |
| 17228 | @@ -15866,7 +16533,8 @@ esac ;; |
| 17229 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 17230 | # |
| 17231 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 17232 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 17233 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 17234 | +# Inc. |
| 17235 | # Written by Gordon Matzigkeit, 1996 |
| 17236 | # |
| 17237 | # This file is part of GNU Libtool. |
| 17238 | @@ -15969,19 +16637,42 @@ SP2NL=$lt_lt_SP2NL |
| 17239 | # turn newlines into spaces. |
| 17240 | NL2SP=$lt_lt_NL2SP |
| 17241 | |
| 17242 | +# convert \$build file names to \$host format. |
| 17243 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 17244 | + |
| 17245 | +# convert \$build files to toolchain format. |
| 17246 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 17247 | + |
| 17248 | # An object symbol dumper. |
| 17249 | OBJDUMP=$lt_OBJDUMP |
| 17250 | |
| 17251 | # Method to check whether dependent libraries are shared objects. |
| 17252 | deplibs_check_method=$lt_deplibs_check_method |
| 17253 | |
| 17254 | -# Command to use when deplibs_check_method == "file_magic". |
| 17255 | +# Command to use when deplibs_check_method = "file_magic". |
| 17256 | file_magic_cmd=$lt_file_magic_cmd |
| 17257 | |
| 17258 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 17259 | +file_magic_glob=$lt_file_magic_glob |
| 17260 | + |
| 17261 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 17262 | +want_nocaseglob=$lt_want_nocaseglob |
| 17263 | + |
| 17264 | +# DLL creation program. |
| 17265 | +DLLTOOL=$lt_DLLTOOL |
| 17266 | + |
| 17267 | +# Command to associate shared and link libraries. |
| 17268 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 17269 | + |
| 17270 | # The archiver. |
| 17271 | AR=$lt_AR |
| 17272 | + |
| 17273 | +# Flags to create an archive. |
| 17274 | AR_FLAGS=$lt_AR_FLAGS |
| 17275 | |
| 17276 | +# How to feed a file listing to the archiver. |
| 17277 | +archiver_list_spec=$lt_archiver_list_spec |
| 17278 | + |
| 17279 | # A symbol stripping program. |
| 17280 | STRIP=$lt_STRIP |
| 17281 | |
| 17282 | @@ -16011,6 +16702,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 17283 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 17284 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 17285 | |
| 17286 | +# Specify filename containing input files for \$NM. |
| 17287 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 17288 | + |
| 17289 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 17290 | +lt_sysroot=$lt_sysroot |
| 17291 | + |
| 17292 | # The name of the directory that contains temporary libtool files. |
| 17293 | objdir=$objdir |
| 17294 | |
| 17295 | @@ -16020,6 +16717,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 17296 | # Must we lock files when doing compilation? |
| 17297 | need_locks=$lt_need_locks |
| 17298 | |
| 17299 | +# Manifest tool. |
| 17300 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 17301 | + |
| 17302 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 17303 | DSYMUTIL=$lt_DSYMUTIL |
| 17304 | |
| 17305 | @@ -16134,12 +16834,12 @@ with_gcc=$GCC |
| 17306 | # Compiler flag to turn off builtin functions. |
| 17307 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 17308 | |
| 17309 | -# How to pass a linker flag through the compiler. |
| 17310 | -wl=$lt_lt_prog_compiler_wl |
| 17311 | - |
| 17312 | # Additional compiler flags for building library objects. |
| 17313 | pic_flag=$lt_lt_prog_compiler_pic |
| 17314 | |
| 17315 | +# How to pass a linker flag through the compiler. |
| 17316 | +wl=$lt_lt_prog_compiler_wl |
| 17317 | + |
| 17318 | # Compiler flag to prevent dynamic linking. |
| 17319 | link_static_flag=$lt_lt_prog_compiler_static |
| 17320 | |
| 17321 | @@ -16226,9 +16926,6 @@ inherit_rpath=$inherit_rpath |
| 17322 | # Whether libtool must link a program against all its dependency libraries. |
| 17323 | link_all_deplibs=$link_all_deplibs |
| 17324 | |
| 17325 | -# Fix the shell variable \$srcfile for the compiler. |
| 17326 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 17327 | - |
| 17328 | # Set to "yes" if exported symbols are required. |
| 17329 | always_export_symbols=$always_export_symbols |
| 17330 | |
| 17331 | @@ -16244,6 +16941,9 @@ include_expsyms=$lt_include_expsyms |
| 17332 | # Commands necessary for linking programs (against libraries) with templates. |
| 17333 | prelink_cmds=$lt_prelink_cmds |
| 17334 | |
| 17335 | +# Commands necessary for finishing linking programs. |
| 17336 | +postlink_cmds=$lt_postlink_cmds |
| 17337 | + |
| 17338 | # Specify filename containing input files. |
| 17339 | file_list_spec=$lt_file_list_spec |
| 17340 | |
| 17341 | @@ -16276,210 +16976,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 17342 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 17343 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 17344 | # is reportedly fixed, but why not run on old versions too? |
| 17345 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 17346 | - || (rm -f "$cfgfile"; exit 1) |
| 17347 | - |
| 17348 | - case $xsi_shell in |
| 17349 | - yes) |
| 17350 | - cat << \_LT_EOF >> "$cfgfile" |
| 17351 | - |
| 17352 | -# func_dirname file append nondir_replacement |
| 17353 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 17354 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 17355 | -func_dirname () |
| 17356 | -{ |
| 17357 | - case ${1} in |
| 17358 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 17359 | - * ) func_dirname_result="${3}" ;; |
| 17360 | - esac |
| 17361 | -} |
| 17362 | - |
| 17363 | -# func_basename file |
| 17364 | -func_basename () |
| 17365 | -{ |
| 17366 | - func_basename_result="${1##*/}" |
| 17367 | -} |
| 17368 | - |
| 17369 | -# func_dirname_and_basename file append nondir_replacement |
| 17370 | -# perform func_basename and func_dirname in a single function |
| 17371 | -# call: |
| 17372 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 17373 | -# add APPEND to the result, otherwise set result |
| 17374 | -# to NONDIR_REPLACEMENT. |
| 17375 | -# value returned in "$func_dirname_result" |
| 17376 | -# basename: Compute filename of FILE. |
| 17377 | -# value retuned in "$func_basename_result" |
| 17378 | -# Implementation must be kept synchronized with func_dirname |
| 17379 | -# and func_basename. For efficiency, we do not delegate to |
| 17380 | -# those functions but instead duplicate the functionality here. |
| 17381 | -func_dirname_and_basename () |
| 17382 | -{ |
| 17383 | - case ${1} in |
| 17384 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 17385 | - * ) func_dirname_result="${3}" ;; |
| 17386 | - esac |
| 17387 | - func_basename_result="${1##*/}" |
| 17388 | -} |
| 17389 | - |
| 17390 | -# func_stripname prefix suffix name |
| 17391 | -# strip PREFIX and SUFFIX off of NAME. |
| 17392 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 17393 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 17394 | -# dot (in which case that matches only a dot). |
| 17395 | -func_stripname () |
| 17396 | -{ |
| 17397 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 17398 | - # positional parameters, so assign one to ordinary parameter first. |
| 17399 | - func_stripname_result=${3} |
| 17400 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 17401 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 17402 | -} |
| 17403 | - |
| 17404 | -# func_opt_split |
| 17405 | -func_opt_split () |
| 17406 | -{ |
| 17407 | - func_opt_split_opt=${1%%=*} |
| 17408 | - func_opt_split_arg=${1#*=} |
| 17409 | -} |
| 17410 | - |
| 17411 | -# func_lo2o object |
| 17412 | -func_lo2o () |
| 17413 | -{ |
| 17414 | - case ${1} in |
| 17415 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 17416 | - *) func_lo2o_result=${1} ;; |
| 17417 | - esac |
| 17418 | -} |
| 17419 | - |
| 17420 | -# func_xform libobj-or-source |
| 17421 | -func_xform () |
| 17422 | -{ |
| 17423 | - func_xform_result=${1%.*}.lo |
| 17424 | -} |
| 17425 | - |
| 17426 | -# func_arith arithmetic-term... |
| 17427 | -func_arith () |
| 17428 | -{ |
| 17429 | - func_arith_result=$(( $* )) |
| 17430 | -} |
| 17431 | - |
| 17432 | -# func_len string |
| 17433 | -# STRING may not start with a hyphen. |
| 17434 | -func_len () |
| 17435 | -{ |
| 17436 | - func_len_result=${#1} |
| 17437 | -} |
| 17438 | - |
| 17439 | -_LT_EOF |
| 17440 | - ;; |
| 17441 | - *) # Bourne compatible functions. |
| 17442 | - cat << \_LT_EOF >> "$cfgfile" |
| 17443 | - |
| 17444 | -# func_dirname file append nondir_replacement |
| 17445 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 17446 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 17447 | -func_dirname () |
| 17448 | -{ |
| 17449 | - # Extract subdirectory from the argument. |
| 17450 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 17451 | - if test "X$func_dirname_result" = "X${1}"; then |
| 17452 | - func_dirname_result="${3}" |
| 17453 | - else |
| 17454 | - func_dirname_result="$func_dirname_result${2}" |
| 17455 | - fi |
| 17456 | -} |
| 17457 | - |
| 17458 | -# func_basename file |
| 17459 | -func_basename () |
| 17460 | -{ |
| 17461 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 17462 | -} |
| 17463 | - |
| 17464 | - |
| 17465 | -# func_stripname prefix suffix name |
| 17466 | -# strip PREFIX and SUFFIX off of NAME. |
| 17467 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 17468 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 17469 | -# dot (in which case that matches only a dot). |
| 17470 | -# func_strip_suffix prefix name |
| 17471 | -func_stripname () |
| 17472 | -{ |
| 17473 | - case ${2} in |
| 17474 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 17475 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 17476 | - esac |
| 17477 | -} |
| 17478 | - |
| 17479 | -# sed scripts: |
| 17480 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 17481 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 17482 | - |
| 17483 | -# func_opt_split |
| 17484 | -func_opt_split () |
| 17485 | -{ |
| 17486 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 17487 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 17488 | -} |
| 17489 | - |
| 17490 | -# func_lo2o object |
| 17491 | -func_lo2o () |
| 17492 | -{ |
| 17493 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 17494 | -} |
| 17495 | - |
| 17496 | -# func_xform libobj-or-source |
| 17497 | -func_xform () |
| 17498 | -{ |
| 17499 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 17500 | -} |
| 17501 | - |
| 17502 | -# func_arith arithmetic-term... |
| 17503 | -func_arith () |
| 17504 | -{ |
| 17505 | - func_arith_result=`expr "$@"` |
| 17506 | -} |
| 17507 | - |
| 17508 | -# func_len string |
| 17509 | -# STRING may not start with a hyphen. |
| 17510 | -func_len () |
| 17511 | -{ |
| 17512 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 17513 | -} |
| 17514 | - |
| 17515 | -_LT_EOF |
| 17516 | -esac |
| 17517 | - |
| 17518 | -case $lt_shell_append in |
| 17519 | - yes) |
| 17520 | - cat << \_LT_EOF >> "$cfgfile" |
| 17521 | - |
| 17522 | -# func_append var value |
| 17523 | -# Append VALUE to the end of shell variable VAR. |
| 17524 | -func_append () |
| 17525 | -{ |
| 17526 | - eval "$1+=\$2" |
| 17527 | -} |
| 17528 | -_LT_EOF |
| 17529 | - ;; |
| 17530 | - *) |
| 17531 | - cat << \_LT_EOF >> "$cfgfile" |
| 17532 | - |
| 17533 | -# func_append var value |
| 17534 | -# Append VALUE to the end of shell variable VAR. |
| 17535 | -func_append () |
| 17536 | -{ |
| 17537 | - eval "$1=\$$1\$2" |
| 17538 | -} |
| 17539 | - |
| 17540 | -_LT_EOF |
| 17541 | - ;; |
| 17542 | - esac |
| 17543 | - |
| 17544 | - |
| 17545 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 17546 | - || (rm -f "$cfgfile"; exit 1) |
| 17547 | - |
| 17548 | - mv -f "$cfgfile" "$ofile" || |
| 17549 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 17550 | + || (rm -f "$cfgfile"; exit 1) |
| 17551 | + |
| 17552 | + if test x"$xsi_shell" = xyes; then |
| 17553 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 17554 | +func_dirname ()\ |
| 17555 | +{\ |
| 17556 | +\ case ${1} in\ |
| 17557 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 17558 | +\ * ) func_dirname_result="${3}" ;;\ |
| 17559 | +\ esac\ |
| 17560 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17561 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17562 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17563 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17564 | + |
| 17565 | + |
| 17566 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 17567 | +func_basename ()\ |
| 17568 | +{\ |
| 17569 | +\ func_basename_result="${1##*/}"\ |
| 17570 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17571 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17572 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17573 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17574 | + |
| 17575 | + |
| 17576 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 17577 | +func_dirname_and_basename ()\ |
| 17578 | +{\ |
| 17579 | +\ case ${1} in\ |
| 17580 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 17581 | +\ * ) func_dirname_result="${3}" ;;\ |
| 17582 | +\ esac\ |
| 17583 | +\ func_basename_result="${1##*/}"\ |
| 17584 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17585 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17586 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17587 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17588 | + |
| 17589 | + |
| 17590 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 17591 | +func_stripname ()\ |
| 17592 | +{\ |
| 17593 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 17594 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 17595 | +\ func_stripname_result=${3}\ |
| 17596 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 17597 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 17598 | +} # Extended-shell func_stripname 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_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 17605 | +func_split_long_opt ()\ |
| 17606 | +{\ |
| 17607 | +\ func_split_long_opt_name=${1%%=*}\ |
| 17608 | +\ func_split_long_opt_arg=${1#*=}\ |
| 17609 | +} # Extended-shell func_split_long_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_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 17616 | +func_split_short_opt ()\ |
| 17617 | +{\ |
| 17618 | +\ func_split_short_opt_arg=${1#??}\ |
| 17619 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 17620 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17621 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17622 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17623 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17624 | + |
| 17625 | + |
| 17626 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 17627 | +func_lo2o ()\ |
| 17628 | +{\ |
| 17629 | +\ case ${1} in\ |
| 17630 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 17631 | +\ *) func_lo2o_result=${1} ;;\ |
| 17632 | +\ esac\ |
| 17633 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17634 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17635 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17636 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17637 | + |
| 17638 | + |
| 17639 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 17640 | +func_xform ()\ |
| 17641 | +{\ |
| 17642 | + func_xform_result=${1%.*}.lo\ |
| 17643 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17644 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17645 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17646 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17647 | + |
| 17648 | + |
| 17649 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 17650 | +func_arith ()\ |
| 17651 | +{\ |
| 17652 | + func_arith_result=$(( $* ))\ |
| 17653 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17654 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17655 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17656 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17657 | + |
| 17658 | + |
| 17659 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 17660 | +func_len ()\ |
| 17661 | +{\ |
| 17662 | + func_len_result=${#1}\ |
| 17663 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17664 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17665 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17666 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17667 | + |
| 17668 | +fi |
| 17669 | + |
| 17670 | +if test x"$lt_shell_append" = xyes; then |
| 17671 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 17672 | +func_append ()\ |
| 17673 | +{\ |
| 17674 | + eval "${1}+=\\${2}"\ |
| 17675 | +} # Extended-shell func_append 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 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 17682 | +func_append_quoted ()\ |
| 17683 | +{\ |
| 17684 | +\ func_quote_for_eval "${2}"\ |
| 17685 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 17686 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 17687 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17688 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17689 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 17690 | + |
| 17691 | + |
| 17692 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 17693 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 17694 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17695 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17696 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 17697 | +else |
| 17698 | + # Save a `func_append' function call even when '+=' is not available |
| 17699 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 17700 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 17701 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 17702 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 17703 | +fi |
| 17704 | + |
| 17705 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 17706 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 17707 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 17708 | +fi |
| 17709 | + |
| 17710 | + |
| 17711 | + mv -f "$cfgfile" "$ofile" || |
| 17712 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 17713 | chmod +x "$ofile" |
| 17714 | |
| 17715 | diff --git a/libctf/Makefile.in b/libctf/Makefile.in |
| 17716 | index 1984f50867a..51a3dd26e87 100644 |
| 17717 | --- a/libctf/Makefile.in |
| 17718 | +++ b/libctf/Makefile.in |
| 17719 | @@ -393,6 +393,7 @@ CYGPATH_W = @CYGPATH_W@ |
| 17720 | DATADIRNAME = @DATADIRNAME@ |
| 17721 | DEFS = @DEFS@ |
| 17722 | DEPDIR = @DEPDIR@ |
| 17723 | +DLLTOOL = @DLLTOOL@ |
| 17724 | DSYMUTIL = @DSYMUTIL@ |
| 17725 | DUMPBIN = @DUMPBIN@ |
| 17726 | ECHO_C = @ECHO_C@ |
| 17727 | @@ -426,6 +427,7 @@ LN_S = @LN_S@ |
| 17728 | LTLIBOBJS = @LTLIBOBJS@ |
| 17729 | MAINT = @MAINT@ |
| 17730 | MAKEINFO = @MAKEINFO@ |
| 17731 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 17732 | MKDIR_P = @MKDIR_P@ |
| 17733 | NM = @NM@ |
| 17734 | NMEDIT = @NMEDIT@ |
| 17735 | diff --git a/libctf/configure b/libctf/configure |
| 17736 | index 8704bc215f4..c1bf438bda6 100755 |
| 17737 | --- a/libctf/configure |
| 17738 | +++ b/libctf/configure |
| 17739 | @@ -669,6 +669,8 @@ OTOOL |
| 17740 | LIPO |
| 17741 | NMEDIT |
| 17742 | DSYMUTIL |
| 17743 | +MANIFEST_TOOL |
| 17744 | +DLLTOOL |
| 17745 | OBJDUMP |
| 17746 | LN_S |
| 17747 | NM |
| 17748 | @@ -800,6 +802,7 @@ enable_static |
| 17749 | with_pic |
| 17750 | enable_fast_install |
| 17751 | with_gnu_ld |
| 17752 | +with_libtool_sysroot |
| 17753 | enable_libtool_lock |
| 17754 | enable_largefile |
| 17755 | enable_werror_always |
| 17756 | @@ -1463,6 +1466,8 @@ Optional Packages: |
| 17757 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 17758 | both] |
| 17759 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 17760 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 17761 | + (or the compiler's sysroot if not specified). |
| 17762 | --with-system-zlib use installed libz |
| 17763 | |
| 17764 | Some influential environment variables: |
| 17765 | @@ -5571,8 +5576,8 @@ esac |
| 17766 | |
| 17767 | |
| 17768 | |
| 17769 | -macro_version='2.2.7a' |
| 17770 | -macro_revision='1.3134' |
| 17771 | +macro_version='2.4' |
| 17772 | +macro_revision='1.3293' |
| 17773 | |
| 17774 | |
| 17775 | |
| 17776 | @@ -5612,7 +5617,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 17777 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 17778 | $as_echo_n "checking how to print strings... " >&6; } |
| 17779 | # Test print first, because it will be a builtin if present. |
| 17780 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 17781 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 17782 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 17783 | ECHO='print -r --' |
| 17784 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 17785 | @@ -6305,8 +6310,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 17786 | # Try some XSI features |
| 17787 | xsi_shell=no |
| 17788 | ( _lt_dummy="a/b/c" |
| 17789 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 17790 | - = c,a/b,, \ |
| 17791 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 17792 | + = c,a/b,b/c, \ |
| 17793 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 17794 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 17795 | && xsi_shell=yes |
| 17796 | @@ -6355,6 +6360,80 @@ esac |
| 17797 | |
| 17798 | |
| 17799 | |
| 17800 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 17801 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 17802 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 17803 | + $as_echo_n "(cached) " >&6 |
| 17804 | +else |
| 17805 | + case $host in |
| 17806 | + *-*-mingw* ) |
| 17807 | + case $build in |
| 17808 | + *-*-mingw* ) # actually msys |
| 17809 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 17810 | + ;; |
| 17811 | + *-*-cygwin* ) |
| 17812 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 17813 | + ;; |
| 17814 | + * ) # otherwise, assume *nix |
| 17815 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 17816 | + ;; |
| 17817 | + esac |
| 17818 | + ;; |
| 17819 | + *-*-cygwin* ) |
| 17820 | + case $build in |
| 17821 | + *-*-mingw* ) # actually msys |
| 17822 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 17823 | + ;; |
| 17824 | + *-*-cygwin* ) |
| 17825 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 17826 | + ;; |
| 17827 | + * ) # otherwise, assume *nix |
| 17828 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 17829 | + ;; |
| 17830 | + esac |
| 17831 | + ;; |
| 17832 | + * ) # unhandled hosts (and "normal" native builds) |
| 17833 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 17834 | + ;; |
| 17835 | +esac |
| 17836 | + |
| 17837 | +fi |
| 17838 | + |
| 17839 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 17840 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 17841 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 17842 | + |
| 17843 | + |
| 17844 | + |
| 17845 | + |
| 17846 | + |
| 17847 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 17848 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 17849 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 17850 | + $as_echo_n "(cached) " >&6 |
| 17851 | +else |
| 17852 | + #assume ordinary cross tools, or native build. |
| 17853 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 17854 | +case $host in |
| 17855 | + *-*-mingw* ) |
| 17856 | + case $build in |
| 17857 | + *-*-mingw* ) # actually msys |
| 17858 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 17859 | + ;; |
| 17860 | + esac |
| 17861 | + ;; |
| 17862 | +esac |
| 17863 | + |
| 17864 | +fi |
| 17865 | + |
| 17866 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 17867 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 17868 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 17869 | + |
| 17870 | + |
| 17871 | + |
| 17872 | + |
| 17873 | + |
| 17874 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 17875 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 17876 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 17877 | @@ -6371,6 +6450,11 @@ case $reload_flag in |
| 17878 | esac |
| 17879 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 17880 | case $host_os in |
| 17881 | + cygwin* | mingw* | pw32* | cegcc*) |
| 17882 | + if test "$GCC" != yes; then |
| 17883 | + reload_cmds=false |
| 17884 | + fi |
| 17885 | + ;; |
| 17886 | darwin*) |
| 17887 | if test "$GCC" = yes; then |
| 17888 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 17889 | @@ -6539,7 +6623,8 @@ mingw* | pw32*) |
| 17890 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 17891 | lt_cv_file_magic_cmd='func_win32_libid' |
| 17892 | else |
| 17893 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 17894 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 17895 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 17896 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 17897 | fi |
| 17898 | ;; |
| 17899 | @@ -6693,6 +6778,21 @@ esac |
| 17900 | fi |
| 17901 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 17902 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 17903 | + |
| 17904 | +file_magic_glob= |
| 17905 | +want_nocaseglob=no |
| 17906 | +if test "$build" = "$host"; then |
| 17907 | + case $host_os in |
| 17908 | + mingw* | pw32*) |
| 17909 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 17910 | + want_nocaseglob=yes |
| 17911 | + else |
| 17912 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 17913 | + fi |
| 17914 | + ;; |
| 17915 | + esac |
| 17916 | +fi |
| 17917 | + |
| 17918 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 17919 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 17920 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 17921 | @@ -6708,6 +6808,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 17922 | |
| 17923 | |
| 17924 | |
| 17925 | + |
| 17926 | + |
| 17927 | + |
| 17928 | + |
| 17929 | + |
| 17930 | + |
| 17931 | + |
| 17932 | + |
| 17933 | + |
| 17934 | + |
| 17935 | +if test -n "$ac_tool_prefix"; then |
| 17936 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 17937 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 17938 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17939 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 17940 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 17941 | + $as_echo_n "(cached) " >&6 |
| 17942 | +else |
| 17943 | + if test -n "$DLLTOOL"; then |
| 17944 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 17945 | +else |
| 17946 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 17947 | +for as_dir in $PATH |
| 17948 | +do |
| 17949 | + IFS=$as_save_IFS |
| 17950 | + test -z "$as_dir" && as_dir=. |
| 17951 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 17952 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 17953 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 17954 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17955 | + break 2 |
| 17956 | + fi |
| 17957 | +done |
| 17958 | + done |
| 17959 | +IFS=$as_save_IFS |
| 17960 | + |
| 17961 | +fi |
| 17962 | +fi |
| 17963 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 17964 | +if test -n "$DLLTOOL"; then |
| 17965 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 17966 | +$as_echo "$DLLTOOL" >&6; } |
| 17967 | +else |
| 17968 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 17969 | +$as_echo "no" >&6; } |
| 17970 | +fi |
| 17971 | + |
| 17972 | + |
| 17973 | +fi |
| 17974 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 17975 | + ac_ct_DLLTOOL=$DLLTOOL |
| 17976 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 17977 | +set dummy dlltool; ac_word=$2 |
| 17978 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17979 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 17980 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 17981 | + $as_echo_n "(cached) " >&6 |
| 17982 | +else |
| 17983 | + if test -n "$ac_ct_DLLTOOL"; then |
| 17984 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 17985 | +else |
| 17986 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 17987 | +for as_dir in $PATH |
| 17988 | +do |
| 17989 | + IFS=$as_save_IFS |
| 17990 | + test -z "$as_dir" && as_dir=. |
| 17991 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 17992 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 17993 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 17994 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17995 | + break 2 |
| 17996 | + fi |
| 17997 | +done |
| 17998 | + done |
| 17999 | +IFS=$as_save_IFS |
| 18000 | + |
| 18001 | +fi |
| 18002 | +fi |
| 18003 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 18004 | +if test -n "$ac_ct_DLLTOOL"; then |
| 18005 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 18006 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 18007 | +else |
| 18008 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 18009 | +$as_echo "no" >&6; } |
| 18010 | +fi |
| 18011 | + |
| 18012 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 18013 | + DLLTOOL="false" |
| 18014 | + else |
| 18015 | + case $cross_compiling:$ac_tool_warned in |
| 18016 | +yes:) |
| 18017 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 18018 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 18019 | +ac_tool_warned=yes ;; |
| 18020 | +esac |
| 18021 | + DLLTOOL=$ac_ct_DLLTOOL |
| 18022 | + fi |
| 18023 | +else |
| 18024 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 18025 | +fi |
| 18026 | + |
| 18027 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 18028 | + |
| 18029 | + |
| 18030 | + |
| 18031 | + |
| 18032 | + |
| 18033 | + |
| 18034 | + |
| 18035 | + |
| 18036 | + |
| 18037 | + |
| 18038 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 18039 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 18040 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 18041 | + $as_echo_n "(cached) " >&6 |
| 18042 | +else |
| 18043 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 18044 | + |
| 18045 | +case $host_os in |
| 18046 | +cygwin* | mingw* | pw32* | cegcc*) |
| 18047 | + # two different shell functions defined in ltmain.sh |
| 18048 | + # decide which to use based on capabilities of $DLLTOOL |
| 18049 | + case `$DLLTOOL --help 2>&1` in |
| 18050 | + *--identify-strict*) |
| 18051 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 18052 | + ;; |
| 18053 | + *) |
| 18054 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 18055 | + ;; |
| 18056 | + esac |
| 18057 | + ;; |
| 18058 | +*) |
| 18059 | + # fallback: assume linklib IS sharedlib |
| 18060 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 18061 | + ;; |
| 18062 | +esac |
| 18063 | + |
| 18064 | +fi |
| 18065 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 18066 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 18067 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 18068 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 18069 | + |
| 18070 | + |
| 18071 | + |
| 18072 | + |
| 18073 | + |
| 18074 | + |
| 18075 | + |
| 18076 | plugin_option= |
| 18077 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 18078 | for plugin in $plugin_names; do |
| 18079 | @@ -6722,8 +6973,10 @@ for plugin in $plugin_names; do |
| 18080 | done |
| 18081 | |
| 18082 | if test -n "$ac_tool_prefix"; then |
| 18083 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 18084 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 18085 | + for ac_prog in ar |
| 18086 | + do |
| 18087 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 18088 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 18089 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 18090 | $as_echo_n "checking for $ac_word... " >&6; } |
| 18091 | if ${ac_cv_prog_AR+:} false; then : |
| 18092 | @@ -6739,7 +6992,7 @@ do |
| 18093 | test -z "$as_dir" && as_dir=. |
| 18094 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 18095 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 18096 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 18097 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 18098 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 18099 | break 2 |
| 18100 | fi |
| 18101 | @@ -6759,11 +7012,15 @@ $as_echo "no" >&6; } |
| 18102 | fi |
| 18103 | |
| 18104 | |
| 18105 | + test -n "$AR" && break |
| 18106 | + done |
| 18107 | fi |
| 18108 | -if test -z "$ac_cv_prog_AR"; then |
| 18109 | +if test -z "$AR"; then |
| 18110 | ac_ct_AR=$AR |
| 18111 | - # Extract the first word of "ar", so it can be a program name with args. |
| 18112 | -set dummy ar; ac_word=$2 |
| 18113 | + for ac_prog in ar |
| 18114 | +do |
| 18115 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 18116 | +set dummy $ac_prog; ac_word=$2 |
| 18117 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 18118 | $as_echo_n "checking for $ac_word... " >&6; } |
| 18119 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 18120 | @@ -6779,7 +7036,7 @@ do |
| 18121 | test -z "$as_dir" && as_dir=. |
| 18122 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 18123 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 18124 | - ac_cv_prog_ac_ct_AR="ar" |
| 18125 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 18126 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 18127 | break 2 |
| 18128 | fi |
| 18129 | @@ -6798,6 +7055,10 @@ else |
| 18130 | $as_echo "no" >&6; } |
| 18131 | fi |
| 18132 | |
| 18133 | + |
| 18134 | + test -n "$ac_ct_AR" && break |
| 18135 | +done |
| 18136 | + |
| 18137 | if test "x$ac_ct_AR" = x; then |
| 18138 | AR="false" |
| 18139 | else |
| 18140 | @@ -6809,25 +7070,19 @@ ac_tool_warned=yes ;; |
| 18141 | esac |
| 18142 | AR=$ac_ct_AR |
| 18143 | fi |
| 18144 | -else |
| 18145 | - AR="$ac_cv_prog_AR" |
| 18146 | fi |
| 18147 | |
| 18148 | -test -z "$AR" && AR=ar |
| 18149 | -if test -n "$plugin_option"; then |
| 18150 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 18151 | - touch conftest.c |
| 18152 | - $AR $plugin_option rc conftest.a conftest.c |
| 18153 | - if test "$?" != 0; then |
| 18154 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 18155 | + touch conftest.c |
| 18156 | + $AR $plugin_option rc conftest.a conftest.c |
| 18157 | + if test "$?" != 0; then |
| 18158 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 18159 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 18160 | - else |
| 18161 | - AR="$AR $plugin_option" |
| 18162 | - fi |
| 18163 | - rm -f conftest.* |
| 18164 | + else |
| 18165 | + AR="$AR $plugin_option" |
| 18166 | fi |
| 18167 | -fi |
| 18168 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 18169 | + rm -f conftest.* |
| 18170 | +: ${AR=ar} |
| 18171 | +: ${AR_FLAGS=cru} |
| 18172 | |
| 18173 | |
| 18174 | |
| 18175 | @@ -6839,6 +7094,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 18176 | |
| 18177 | |
| 18178 | |
| 18179 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 18180 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 18181 | +if ${lt_cv_ar_at_file+:} false; then : |
| 18182 | + $as_echo_n "(cached) " >&6 |
| 18183 | +else |
| 18184 | + lt_cv_ar_at_file=no |
| 18185 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18186 | +/* end confdefs.h. */ |
| 18187 | + |
| 18188 | +int |
| 18189 | +main () |
| 18190 | +{ |
| 18191 | + |
| 18192 | + ; |
| 18193 | + return 0; |
| 18194 | +} |
| 18195 | +_ACEOF |
| 18196 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 18197 | + echo conftest.$ac_objext > conftest.lst |
| 18198 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 18199 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 18200 | + (eval $lt_ar_try) 2>&5 |
| 18201 | + ac_status=$? |
| 18202 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 18203 | + test $ac_status = 0; } |
| 18204 | + if test "$ac_status" -eq 0; then |
| 18205 | + # Ensure the archiver fails upon bogus file names. |
| 18206 | + rm -f conftest.$ac_objext libconftest.a |
| 18207 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 18208 | + (eval $lt_ar_try) 2>&5 |
| 18209 | + ac_status=$? |
| 18210 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 18211 | + test $ac_status = 0; } |
| 18212 | + if test "$ac_status" -ne 0; then |
| 18213 | + lt_cv_ar_at_file=@ |
| 18214 | + fi |
| 18215 | + fi |
| 18216 | + rm -f conftest.* libconftest.a |
| 18217 | + |
| 18218 | +fi |
| 18219 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 18220 | + |
| 18221 | +fi |
| 18222 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 18223 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 18224 | + |
| 18225 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 18226 | + archiver_list_spec= |
| 18227 | +else |
| 18228 | + archiver_list_spec=$lt_cv_ar_at_file |
| 18229 | +fi |
| 18230 | + |
| 18231 | + |
| 18232 | + |
| 18233 | + |
| 18234 | + |
| 18235 | + |
| 18236 | + |
| 18237 | if test -n "$ac_tool_prefix"; then |
| 18238 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 18239 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 18240 | @@ -7178,8 +7491,8 @@ esac |
| 18241 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 18242 | |
| 18243 | # Transform an extracted symbol line into symbol name and symbol address |
| 18244 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 18245 | -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'" |
| 18246 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 18247 | +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'" |
| 18248 | |
| 18249 | # Handle CRLF in mingw tool chain |
| 18250 | opt_cr= |
| 18251 | @@ -7215,6 +7528,7 @@ for ac_symprfx in "" "_"; do |
| 18252 | else |
| 18253 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 18254 | fi |
| 18255 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 18256 | |
| 18257 | # Check to see that the pipe works correctly. |
| 18258 | pipe_works=no |
| 18259 | @@ -7256,6 +7570,18 @@ _LT_EOF |
| 18260 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 18261 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 18262 | cat <<_LT_EOF > conftest.$ac_ext |
| 18263 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 18264 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 18265 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 18266 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 18267 | +# define LT_DLSYM_CONST |
| 18268 | +#elif defined(__osf__) |
| 18269 | +/* This system does not cope well with relocations in const data. */ |
| 18270 | +# define LT_DLSYM_CONST |
| 18271 | +#else |
| 18272 | +# define LT_DLSYM_CONST const |
| 18273 | +#endif |
| 18274 | + |
| 18275 | #ifdef __cplusplus |
| 18276 | extern "C" { |
| 18277 | #endif |
| 18278 | @@ -7267,7 +7593,7 @@ _LT_EOF |
| 18279 | cat <<_LT_EOF >> conftest.$ac_ext |
| 18280 | |
| 18281 | /* The mapping between symbol names and symbols. */ |
| 18282 | -const struct { |
| 18283 | +LT_DLSYM_CONST struct { |
| 18284 | const char *name; |
| 18285 | void *address; |
| 18286 | } |
| 18287 | @@ -7293,8 +7619,8 @@ static const void *lt_preloaded_setup() { |
| 18288 | _LT_EOF |
| 18289 | # Now try linking the two files. |
| 18290 | mv conftest.$ac_objext conftstm.$ac_objext |
| 18291 | - lt_save_LIBS="$LIBS" |
| 18292 | - lt_save_CFLAGS="$CFLAGS" |
| 18293 | + lt_globsym_save_LIBS=$LIBS |
| 18294 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 18295 | LIBS="conftstm.$ac_objext" |
| 18296 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 18297 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 18298 | @@ -7304,8 +7630,8 @@ _LT_EOF |
| 18299 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 18300 | pipe_works=yes |
| 18301 | fi |
| 18302 | - LIBS="$lt_save_LIBS" |
| 18303 | - CFLAGS="$lt_save_CFLAGS" |
| 18304 | + LIBS=$lt_globsym_save_LIBS |
| 18305 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 18306 | else |
| 18307 | echo "cannot find nm_test_func in $nlist" >&5 |
| 18308 | fi |
| 18309 | @@ -7342,6 +7668,14 @@ else |
| 18310 | $as_echo "ok" >&6; } |
| 18311 | fi |
| 18312 | |
| 18313 | +# Response file support. |
| 18314 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 18315 | + nm_file_list_spec='@' |
| 18316 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 18317 | + nm_file_list_spec='@' |
| 18318 | +fi |
| 18319 | + |
| 18320 | + |
| 18321 | |
| 18322 | |
| 18323 | |
| 18324 | @@ -7360,6 +7694,47 @@ fi |
| 18325 | |
| 18326 | |
| 18327 | |
| 18328 | + |
| 18329 | + |
| 18330 | + |
| 18331 | + |
| 18332 | + |
| 18333 | + |
| 18334 | + |
| 18335 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 18336 | +$as_echo_n "checking for sysroot... " >&6; } |
| 18337 | + |
| 18338 | +# Check whether --with-libtool-sysroot was given. |
| 18339 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 18340 | + withval=$with_libtool_sysroot; |
| 18341 | +else |
| 18342 | + with_libtool_sysroot=no |
| 18343 | +fi |
| 18344 | + |
| 18345 | + |
| 18346 | +lt_sysroot= |
| 18347 | +case ${with_libtool_sysroot} in #( |
| 18348 | + yes) |
| 18349 | + if test "$GCC" = yes; then |
| 18350 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 18351 | + fi |
| 18352 | + ;; #( |
| 18353 | + /*) |
| 18354 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 18355 | + ;; #( |
| 18356 | + no|'') |
| 18357 | + ;; #( |
| 18358 | + *) |
| 18359 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 18360 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 18361 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 18362 | + ;; |
| 18363 | +esac |
| 18364 | + |
| 18365 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 18366 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 18367 | + |
| 18368 | + |
| 18369 | |
| 18370 | |
| 18371 | |
| 18372 | @@ -7569,6 +7944,123 @@ esac |
| 18373 | |
| 18374 | need_locks="$enable_libtool_lock" |
| 18375 | |
| 18376 | +if test -n "$ac_tool_prefix"; then |
| 18377 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 18378 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 18379 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 18380 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 18381 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 18382 | + $as_echo_n "(cached) " >&6 |
| 18383 | +else |
| 18384 | + if test -n "$MANIFEST_TOOL"; then |
| 18385 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 18386 | +else |
| 18387 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 18388 | +for as_dir in $PATH |
| 18389 | +do |
| 18390 | + IFS=$as_save_IFS |
| 18391 | + test -z "$as_dir" && as_dir=. |
| 18392 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 18393 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 18394 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 18395 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 18396 | + break 2 |
| 18397 | + fi |
| 18398 | +done |
| 18399 | + done |
| 18400 | +IFS=$as_save_IFS |
| 18401 | + |
| 18402 | +fi |
| 18403 | +fi |
| 18404 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 18405 | +if test -n "$MANIFEST_TOOL"; then |
| 18406 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 18407 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 18408 | +else |
| 18409 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 18410 | +$as_echo "no" >&6; } |
| 18411 | +fi |
| 18412 | + |
| 18413 | + |
| 18414 | +fi |
| 18415 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 18416 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 18417 | + # Extract the first word of "mt", so it can be a program name with args. |
| 18418 | +set dummy mt; ac_word=$2 |
| 18419 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 18420 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 18421 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 18422 | + $as_echo_n "(cached) " >&6 |
| 18423 | +else |
| 18424 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 18425 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 18426 | +else |
| 18427 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 18428 | +for as_dir in $PATH |
| 18429 | +do |
| 18430 | + IFS=$as_save_IFS |
| 18431 | + test -z "$as_dir" && as_dir=. |
| 18432 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 18433 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 18434 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 18435 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 18436 | + break 2 |
| 18437 | + fi |
| 18438 | +done |
| 18439 | + done |
| 18440 | +IFS=$as_save_IFS |
| 18441 | + |
| 18442 | +fi |
| 18443 | +fi |
| 18444 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 18445 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 18446 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 18447 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 18448 | +else |
| 18449 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 18450 | +$as_echo "no" >&6; } |
| 18451 | +fi |
| 18452 | + |
| 18453 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 18454 | + MANIFEST_TOOL=":" |
| 18455 | + else |
| 18456 | + case $cross_compiling:$ac_tool_warned in |
| 18457 | +yes:) |
| 18458 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 18459 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 18460 | +ac_tool_warned=yes ;; |
| 18461 | +esac |
| 18462 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 18463 | + fi |
| 18464 | +else |
| 18465 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 18466 | +fi |
| 18467 | + |
| 18468 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 18469 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 18470 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 18471 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 18472 | + $as_echo_n "(cached) " >&6 |
| 18473 | +else |
| 18474 | + lt_cv_path_mainfest_tool=no |
| 18475 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 18476 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 18477 | + cat conftest.err >&5 |
| 18478 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 18479 | + lt_cv_path_mainfest_tool=yes |
| 18480 | + fi |
| 18481 | + rm -f conftest* |
| 18482 | +fi |
| 18483 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 18484 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 18485 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 18486 | + MANIFEST_TOOL=: |
| 18487 | +fi |
| 18488 | + |
| 18489 | + |
| 18490 | + |
| 18491 | + |
| 18492 | + |
| 18493 | |
| 18494 | case $host_os in |
| 18495 | rhapsody* | darwin*) |
| 18496 | @@ -8132,6 +8624,8 @@ _LT_EOF |
| 18497 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 18498 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 18499 | $AR cru libconftest.a conftest.o 2>&5 |
| 18500 | + echo "$RANLIB libconftest.a" >&5 |
| 18501 | + $RANLIB libconftest.a 2>&5 |
| 18502 | cat > conftest.c << _LT_EOF |
| 18503 | int main() { return 0;} |
| 18504 | _LT_EOF |
| 18505 | @@ -8684,8 +9178,6 @@ fi |
| 18506 | lt_prog_compiler_pic= |
| 18507 | lt_prog_compiler_static= |
| 18508 | |
| 18509 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 18510 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18511 | |
| 18512 | if test "$GCC" = yes; then |
| 18513 | lt_prog_compiler_wl='-Wl,' |
| 18514 | @@ -8851,6 +9343,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18515 | lt_prog_compiler_pic='--shared' |
| 18516 | lt_prog_compiler_static='--static' |
| 18517 | ;; |
| 18518 | + nagfor*) |
| 18519 | + # NAG Fortran compiler |
| 18520 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 18521 | + lt_prog_compiler_pic='-PIC' |
| 18522 | + lt_prog_compiler_static='-Bstatic' |
| 18523 | + ;; |
| 18524 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 18525 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 18526 | # which looks to be a dead project) |
| 18527 | @@ -8913,7 +9411,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18528 | lt_prog_compiler_pic='-KPIC' |
| 18529 | lt_prog_compiler_static='-Bstatic' |
| 18530 | case $cc_basename in |
| 18531 | - f77* | f90* | f95*) |
| 18532 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 18533 | lt_prog_compiler_wl='-Qoption ld ';; |
| 18534 | *) |
| 18535 | lt_prog_compiler_wl='-Wl,';; |
| 18536 | @@ -8970,13 +9468,17 @@ case $host_os in |
| 18537 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 18538 | ;; |
| 18539 | esac |
| 18540 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 18541 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 18542 | - |
| 18543 | - |
| 18544 | - |
| 18545 | - |
| 18546 | |
| 18547 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 18548 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18549 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 18550 | + $as_echo_n "(cached) " >&6 |
| 18551 | +else |
| 18552 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 18553 | +fi |
| 18554 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 18555 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 18556 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 18557 | |
| 18558 | # |
| 18559 | # Check to make sure the PIC flag actually works. |
| 18560 | @@ -9037,6 +9539,11 @@ fi |
| 18561 | |
| 18562 | |
| 18563 | |
| 18564 | + |
| 18565 | + |
| 18566 | + |
| 18567 | + |
| 18568 | + |
| 18569 | # |
| 18570 | # Check to make sure the static flag actually works. |
| 18571 | # |
| 18572 | @@ -9387,7 +9894,8 @@ _LT_EOF |
| 18573 | allow_undefined_flag=unsupported |
| 18574 | always_export_symbols=no |
| 18575 | enable_shared_with_static_runtimes=yes |
| 18576 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 18577 | + 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' |
| 18578 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 18579 | |
| 18580 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 18581 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 18582 | @@ -9486,12 +9994,12 @@ _LT_EOF |
| 18583 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 18584 | hardcode_libdir_flag_spec= |
| 18585 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 18586 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 18587 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 18588 | if test "x$supports_anon_versioning" = xyes; then |
| 18589 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 18590 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 18591 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 18592 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 18593 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 18594 | fi |
| 18595 | ;; |
| 18596 | esac |
| 18597 | @@ -9505,8 +10013,8 @@ _LT_EOF |
| 18598 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 18599 | wlarc= |
| 18600 | else |
| 18601 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18602 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18603 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18604 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18605 | fi |
| 18606 | ;; |
| 18607 | |
| 18608 | @@ -9524,8 +10032,8 @@ _LT_EOF |
| 18609 | |
| 18610 | _LT_EOF |
| 18611 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 18612 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18613 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18614 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18615 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18616 | else |
| 18617 | ld_shlibs=no |
| 18618 | fi |
| 18619 | @@ -9571,8 +10079,8 @@ _LT_EOF |
| 18620 | |
| 18621 | *) |
| 18622 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 18623 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18624 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18625 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18626 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18627 | else |
| 18628 | ld_shlibs=no |
| 18629 | fi |
| 18630 | @@ -9702,7 +10210,13 @@ _LT_EOF |
| 18631 | allow_undefined_flag='-berok' |
| 18632 | # Determine the default libpath from the value encoded in an |
| 18633 | # empty executable. |
| 18634 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18635 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 18636 | + aix_libpath=$lt_cv_aix_libpath |
| 18637 | +else |
| 18638 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 18639 | + $as_echo_n "(cached) " >&6 |
| 18640 | +else |
| 18641 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18642 | /* end confdefs.h. */ |
| 18643 | |
| 18644 | int |
| 18645 | @@ -9715,22 +10229,29 @@ main () |
| 18646 | _ACEOF |
| 18647 | if ac_fn_c_try_link "$LINENO"; then : |
| 18648 | |
| 18649 | -lt_aix_libpath_sed=' |
| 18650 | - /Import File Strings/,/^$/ { |
| 18651 | - /^0/ { |
| 18652 | - s/^0 *\(.*\)$/\1/ |
| 18653 | - p |
| 18654 | - } |
| 18655 | - }' |
| 18656 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18657 | -# Check for a 64-bit object if we didn't find anything. |
| 18658 | -if test -z "$aix_libpath"; then |
| 18659 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18660 | -fi |
| 18661 | + lt_aix_libpath_sed=' |
| 18662 | + /Import File Strings/,/^$/ { |
| 18663 | + /^0/ { |
| 18664 | + s/^0 *\([^ ]*\) *$/\1/ |
| 18665 | + p |
| 18666 | + } |
| 18667 | + }' |
| 18668 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18669 | + # Check for a 64-bit object if we didn't find anything. |
| 18670 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18671 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18672 | + fi |
| 18673 | fi |
| 18674 | rm -f core conftest.err conftest.$ac_objext \ |
| 18675 | conftest$ac_exeext conftest.$ac_ext |
| 18676 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18677 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18678 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 18679 | + fi |
| 18680 | + |
| 18681 | +fi |
| 18682 | + |
| 18683 | + aix_libpath=$lt_cv_aix_libpath_ |
| 18684 | +fi |
| 18685 | |
| 18686 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 18687 | 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" |
| 18688 | @@ -9742,7 +10263,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18689 | else |
| 18690 | # Determine the default libpath from the value encoded in an |
| 18691 | # empty executable. |
| 18692 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18693 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 18694 | + aix_libpath=$lt_cv_aix_libpath |
| 18695 | +else |
| 18696 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 18697 | + $as_echo_n "(cached) " >&6 |
| 18698 | +else |
| 18699 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18700 | /* end confdefs.h. */ |
| 18701 | |
| 18702 | int |
| 18703 | @@ -9755,22 +10282,29 @@ main () |
| 18704 | _ACEOF |
| 18705 | if ac_fn_c_try_link "$LINENO"; then : |
| 18706 | |
| 18707 | -lt_aix_libpath_sed=' |
| 18708 | - /Import File Strings/,/^$/ { |
| 18709 | - /^0/ { |
| 18710 | - s/^0 *\(.*\)$/\1/ |
| 18711 | - p |
| 18712 | - } |
| 18713 | - }' |
| 18714 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18715 | -# Check for a 64-bit object if we didn't find anything. |
| 18716 | -if test -z "$aix_libpath"; then |
| 18717 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18718 | -fi |
| 18719 | + lt_aix_libpath_sed=' |
| 18720 | + /Import File Strings/,/^$/ { |
| 18721 | + /^0/ { |
| 18722 | + s/^0 *\([^ ]*\) *$/\1/ |
| 18723 | + p |
| 18724 | + } |
| 18725 | + }' |
| 18726 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18727 | + # Check for a 64-bit object if we didn't find anything. |
| 18728 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18729 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18730 | + fi |
| 18731 | fi |
| 18732 | rm -f core conftest.err conftest.$ac_objext \ |
| 18733 | conftest$ac_exeext conftest.$ac_ext |
| 18734 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18735 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18736 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 18737 | + fi |
| 18738 | + |
| 18739 | +fi |
| 18740 | + |
| 18741 | + aix_libpath=$lt_cv_aix_libpath_ |
| 18742 | +fi |
| 18743 | |
| 18744 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 18745 | # Warning - without using the other run time loading flags, |
| 18746 | @@ -9815,20 +10349,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18747 | # Microsoft Visual C++. |
| 18748 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 18749 | # no search path for DLLs. |
| 18750 | - hardcode_libdir_flag_spec=' ' |
| 18751 | - allow_undefined_flag=unsupported |
| 18752 | - # Tell ltmain to make .lib files, not .a files. |
| 18753 | - libext=lib |
| 18754 | - # Tell ltmain to make .dll files, not .so files. |
| 18755 | - shrext_cmds=".dll" |
| 18756 | - # FIXME: Setting linknames here is a bad hack. |
| 18757 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 18758 | - # The linker will automatically build a .lib file if we build a DLL. |
| 18759 | - old_archive_from_new_cmds='true' |
| 18760 | - # FIXME: Should let the user specify the lib program. |
| 18761 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 18762 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 18763 | - enable_shared_with_static_runtimes=yes |
| 18764 | + case $cc_basename in |
| 18765 | + cl*) |
| 18766 | + # Native MSVC |
| 18767 | + hardcode_libdir_flag_spec=' ' |
| 18768 | + allow_undefined_flag=unsupported |
| 18769 | + always_export_symbols=yes |
| 18770 | + file_list_spec='@' |
| 18771 | + # Tell ltmain to make .lib files, not .a files. |
| 18772 | + libext=lib |
| 18773 | + # Tell ltmain to make .dll files, not .so files. |
| 18774 | + shrext_cmds=".dll" |
| 18775 | + # FIXME: Setting linknames here is a bad hack. |
| 18776 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 18777 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 18778 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 18779 | + else |
| 18780 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 18781 | + fi~ |
| 18782 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 18783 | + linknames=' |
| 18784 | + # The linker will not automatically build a static lib if we build a DLL. |
| 18785 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 18786 | + enable_shared_with_static_runtimes=yes |
| 18787 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 18788 | + # Don't use ranlib |
| 18789 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 18790 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 18791 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 18792 | + case $lt_outputfile in |
| 18793 | + *.exe|*.EXE) ;; |
| 18794 | + *) |
| 18795 | + lt_outputfile="$lt_outputfile.exe" |
| 18796 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 18797 | + ;; |
| 18798 | + esac~ |
| 18799 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 18800 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 18801 | + $RM "$lt_outputfile.manifest"; |
| 18802 | + fi' |
| 18803 | + ;; |
| 18804 | + *) |
| 18805 | + # Assume MSVC wrapper |
| 18806 | + hardcode_libdir_flag_spec=' ' |
| 18807 | + allow_undefined_flag=unsupported |
| 18808 | + # Tell ltmain to make .lib files, not .a files. |
| 18809 | + libext=lib |
| 18810 | + # Tell ltmain to make .dll files, not .so files. |
| 18811 | + shrext_cmds=".dll" |
| 18812 | + # FIXME: Setting linknames here is a bad hack. |
| 18813 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 18814 | + # The linker will automatically build a .lib file if we build a DLL. |
| 18815 | + old_archive_from_new_cmds='true' |
| 18816 | + # FIXME: Should let the user specify the lib program. |
| 18817 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 18818 | + enable_shared_with_static_runtimes=yes |
| 18819 | + ;; |
| 18820 | + esac |
| 18821 | ;; |
| 18822 | |
| 18823 | darwin* | rhapsody*) |
| 18824 | @@ -9889,7 +10466,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18825 | |
| 18826 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 18827 | freebsd* | dragonfly*) |
| 18828 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 18829 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 18830 | hardcode_libdir_flag_spec='-R$libdir' |
| 18831 | hardcode_direct=yes |
| 18832 | hardcode_shlibpath_var=no |
| 18833 | @@ -9897,7 +10474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18834 | |
| 18835 | hpux9*) |
| 18836 | if test "$GCC" = yes; then |
| 18837 | - 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' |
| 18838 | + 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' |
| 18839 | else |
| 18840 | 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' |
| 18841 | fi |
| 18842 | @@ -9913,7 +10490,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18843 | |
| 18844 | hpux10*) |
| 18845 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 18846 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18847 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18848 | else |
| 18849 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 18850 | fi |
| 18851 | @@ -9937,10 +10514,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18852 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18853 | ;; |
| 18854 | ia64*) |
| 18855 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 18856 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 18857 | ;; |
| 18858 | *) |
| 18859 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18860 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18861 | ;; |
| 18862 | esac |
| 18863 | else |
| 18864 | @@ -10019,23 +10596,36 @@ fi |
| 18865 | |
| 18866 | irix5* | irix6* | nonstopux*) |
| 18867 | if test "$GCC" = yes; then |
| 18868 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 18869 | + 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' |
| 18870 | # Try to use the -exported_symbol ld option, if it does not |
| 18871 | # work, assume that -exports_file does not work either and |
| 18872 | # implicitly export all symbols. |
| 18873 | - save_LDFLAGS="$LDFLAGS" |
| 18874 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 18875 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18876 | + # This should be the same for all languages, so no per-tag cache variable. |
| 18877 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 18878 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 18879 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 18880 | + $as_echo_n "(cached) " >&6 |
| 18881 | +else |
| 18882 | + save_LDFLAGS="$LDFLAGS" |
| 18883 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 18884 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18885 | /* end confdefs.h. */ |
| 18886 | -int foo(void) {} |
| 18887 | +int foo (void) { return 0; } |
| 18888 | _ACEOF |
| 18889 | if ac_fn_c_try_link "$LINENO"; then : |
| 18890 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 18891 | - |
| 18892 | + lt_cv_irix_exported_symbol=yes |
| 18893 | +else |
| 18894 | + lt_cv_irix_exported_symbol=no |
| 18895 | fi |
| 18896 | rm -f core conftest.err conftest.$ac_objext \ |
| 18897 | conftest$ac_exeext conftest.$ac_ext |
| 18898 | - LDFLAGS="$save_LDFLAGS" |
| 18899 | + LDFLAGS="$save_LDFLAGS" |
| 18900 | +fi |
| 18901 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 18902 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 18903 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 18904 | + 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' |
| 18905 | + fi |
| 18906 | else |
| 18907 | 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' |
| 18908 | 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' |
| 18909 | @@ -10120,7 +10710,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 18910 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 18911 | if test "$GCC" = yes; then |
| 18912 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 18913 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 18914 | + 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' |
| 18915 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 18916 | else |
| 18917 | allow_undefined_flag=' -expect_unresolved \*' |
| 18918 | @@ -10139,9 +10729,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 18919 | no_undefined_flag=' -z defs' |
| 18920 | if test "$GCC" = yes; then |
| 18921 | wlarc='${wl}' |
| 18922 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18923 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18924 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 18925 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 18926 | + $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' |
| 18927 | else |
| 18928 | case `$CC -V 2>&1` in |
| 18929 | *"Compilers 5.0"*) |
| 18930 | @@ -10717,8 +11307,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 18931 | need_version=no |
| 18932 | need_lib_prefix=no |
| 18933 | |
| 18934 | - case $GCC,$host_os in |
| 18935 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 18936 | + case $GCC,$cc_basename in |
| 18937 | + yes,*) |
| 18938 | + # gcc |
| 18939 | library_names_spec='$libname.dll.a' |
| 18940 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 18941 | postinstall_cmds='base_file=`basename \${file}`~ |
| 18942 | @@ -10751,13 +11342,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 18943 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 18944 | ;; |
| 18945 | esac |
| 18946 | + dynamic_linker='Win32 ld.exe' |
| 18947 | + ;; |
| 18948 | + |
| 18949 | + *,cl*) |
| 18950 | + # Native MSVC |
| 18951 | + libname_spec='$name' |
| 18952 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 18953 | + library_names_spec='${libname}.dll.lib' |
| 18954 | + |
| 18955 | + case $build_os in |
| 18956 | + mingw*) |
| 18957 | + sys_lib_search_path_spec= |
| 18958 | + lt_save_ifs=$IFS |
| 18959 | + IFS=';' |
| 18960 | + for lt_path in $LIB |
| 18961 | + do |
| 18962 | + IFS=$lt_save_ifs |
| 18963 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 18964 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 18965 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 18966 | + done |
| 18967 | + IFS=$lt_save_ifs |
| 18968 | + # Convert to MSYS style. |
| 18969 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 18970 | + ;; |
| 18971 | + cygwin*) |
| 18972 | + # Convert to unix form, then to dos form, then back to unix form |
| 18973 | + # but this time dos style (no spaces!) so that the unix form looks |
| 18974 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 18975 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 18976 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 18977 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 18978 | + ;; |
| 18979 | + *) |
| 18980 | + sys_lib_search_path_spec="$LIB" |
| 18981 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 18982 | + # It is most probably a Windows format PATH. |
| 18983 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 18984 | + else |
| 18985 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 18986 | + fi |
| 18987 | + # FIXME: find the short name or the path components, as spaces are |
| 18988 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 18989 | + ;; |
| 18990 | + esac |
| 18991 | + |
| 18992 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 18993 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 18994 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 18995 | + dldir=$destdir/`dirname \$dlpath`~ |
| 18996 | + test -d \$dldir || mkdir -p \$dldir~ |
| 18997 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 18998 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 18999 | + dlpath=$dir/\$dldll~ |
| 19000 | + $RM \$dlpath' |
| 19001 | + shlibpath_overrides_runpath=yes |
| 19002 | + dynamic_linker='Win32 link.exe' |
| 19003 | ;; |
| 19004 | |
| 19005 | *) |
| 19006 | + # Assume MSVC wrapper |
| 19007 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 19008 | + dynamic_linker='Win32 ld.exe' |
| 19009 | ;; |
| 19010 | esac |
| 19011 | - dynamic_linker='Win32 ld.exe' |
| 19012 | # FIXME: first we should search . and the directory the executable is in |
| 19013 | shlibpath_var=PATH |
| 19014 | ;; |
| 19015 | @@ -11635,7 +12284,7 @@ else |
| 19016 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 19017 | lt_status=$lt_dlunknown |
| 19018 | cat > conftest.$ac_ext <<_LT_EOF |
| 19019 | -#line 11638 "configure" |
| 19020 | +#line $LINENO "configure" |
| 19021 | #include "confdefs.h" |
| 19022 | |
| 19023 | #if HAVE_DLFCN_H |
| 19024 | @@ -11679,10 +12328,10 @@ else |
| 19025 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 19026 | correspondingly for the symbols needed. */ |
| 19027 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 19028 | -void fnord () __attribute__((visibility("default"))); |
| 19029 | +int fnord () __attribute__((visibility("default"))); |
| 19030 | #endif |
| 19031 | |
| 19032 | -void fnord () { int i=42; } |
| 19033 | +int fnord () { return 42; } |
| 19034 | int main () |
| 19035 | { |
| 19036 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 19037 | @@ -11741,7 +12390,7 @@ else |
| 19038 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 19039 | lt_status=$lt_dlunknown |
| 19040 | cat > conftest.$ac_ext <<_LT_EOF |
| 19041 | -#line 11744 "configure" |
| 19042 | +#line $LINENO "configure" |
| 19043 | #include "confdefs.h" |
| 19044 | |
| 19045 | #if HAVE_DLFCN_H |
| 19046 | @@ -11785,10 +12434,10 @@ else |
| 19047 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 19048 | correspondingly for the symbols needed. */ |
| 19049 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 19050 | -void fnord () __attribute__((visibility("default"))); |
| 19051 | +int fnord () __attribute__((visibility("default"))); |
| 19052 | #endif |
| 19053 | |
| 19054 | -void fnord () { int i=42; } |
| 19055 | +int fnord () { return 42; } |
| 19056 | int main () |
| 19057 | { |
| 19058 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 19059 | @@ -14473,13 +15122,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 19060 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 19061 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 19062 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 19063 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 19064 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 19065 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 19066 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 19067 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 19068 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 19069 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 19070 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 19071 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 19072 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 19073 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 19074 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 19075 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 19076 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 19077 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 19078 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 19079 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 19080 | @@ -14494,14 +15150,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 19081 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 19082 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 19083 | 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"`' |
| 19084 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 19085 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 19086 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 19087 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 19088 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 19089 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 19090 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 19091 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 19092 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 19093 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 19094 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 19095 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 19096 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 19097 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 19098 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 19099 | @@ -14534,12 +15193,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 19100 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 19101 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 19102 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 19103 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 19104 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 19105 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 19106 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 19107 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 19108 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 19109 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 19110 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 19111 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 19112 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 19113 | @@ -14594,8 +15253,13 @@ reload_flag \ |
| 19114 | OBJDUMP \ |
| 19115 | deplibs_check_method \ |
| 19116 | file_magic_cmd \ |
| 19117 | +file_magic_glob \ |
| 19118 | +want_nocaseglob \ |
| 19119 | +DLLTOOL \ |
| 19120 | +sharedlib_from_linklib_cmd \ |
| 19121 | AR \ |
| 19122 | AR_FLAGS \ |
| 19123 | +archiver_list_spec \ |
| 19124 | STRIP \ |
| 19125 | RANLIB \ |
| 19126 | CC \ |
| 19127 | @@ -14605,12 +15269,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 19128 | lt_cv_sys_global_symbol_to_cdecl \ |
| 19129 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 19130 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 19131 | +nm_file_list_spec \ |
| 19132 | lt_prog_compiler_no_builtin_flag \ |
| 19133 | -lt_prog_compiler_wl \ |
| 19134 | lt_prog_compiler_pic \ |
| 19135 | +lt_prog_compiler_wl \ |
| 19136 | lt_prog_compiler_static \ |
| 19137 | lt_cv_prog_compiler_c_o \ |
| 19138 | need_locks \ |
| 19139 | +MANIFEST_TOOL \ |
| 19140 | DSYMUTIL \ |
| 19141 | NMEDIT \ |
| 19142 | LIPO \ |
| 19143 | @@ -14626,7 +15292,6 @@ no_undefined_flag \ |
| 19144 | hardcode_libdir_flag_spec \ |
| 19145 | hardcode_libdir_flag_spec_ld \ |
| 19146 | hardcode_libdir_separator \ |
| 19147 | -fix_srcfile_path \ |
| 19148 | exclude_expsyms \ |
| 19149 | include_expsyms \ |
| 19150 | file_list_spec \ |
| 19151 | @@ -14662,6 +15327,7 @@ module_cmds \ |
| 19152 | module_expsym_cmds \ |
| 19153 | export_symbols_cmds \ |
| 19154 | prelink_cmds \ |
| 19155 | +postlink_cmds \ |
| 19156 | postinstall_cmds \ |
| 19157 | postuninstall_cmds \ |
| 19158 | finish_cmds \ |
| 19159 | @@ -15418,7 +16084,8 @@ $as_echo X"$file" | |
| 19160 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 19161 | # |
| 19162 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 19163 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 19164 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 19165 | +# Inc. |
| 19166 | # Written by Gordon Matzigkeit, 1996 |
| 19167 | # |
| 19168 | # This file is part of GNU Libtool. |
| 19169 | @@ -15521,19 +16188,42 @@ SP2NL=$lt_lt_SP2NL |
| 19170 | # turn newlines into spaces. |
| 19171 | NL2SP=$lt_lt_NL2SP |
| 19172 | |
| 19173 | +# convert \$build file names to \$host format. |
| 19174 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 19175 | + |
| 19176 | +# convert \$build files to toolchain format. |
| 19177 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 19178 | + |
| 19179 | # An object symbol dumper. |
| 19180 | OBJDUMP=$lt_OBJDUMP |
| 19181 | |
| 19182 | # Method to check whether dependent libraries are shared objects. |
| 19183 | deplibs_check_method=$lt_deplibs_check_method |
| 19184 | |
| 19185 | -# Command to use when deplibs_check_method == "file_magic". |
| 19186 | +# Command to use when deplibs_check_method = "file_magic". |
| 19187 | file_magic_cmd=$lt_file_magic_cmd |
| 19188 | |
| 19189 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 19190 | +file_magic_glob=$lt_file_magic_glob |
| 19191 | + |
| 19192 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 19193 | +want_nocaseglob=$lt_want_nocaseglob |
| 19194 | + |
| 19195 | +# DLL creation program. |
| 19196 | +DLLTOOL=$lt_DLLTOOL |
| 19197 | + |
| 19198 | +# Command to associate shared and link libraries. |
| 19199 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 19200 | + |
| 19201 | # The archiver. |
| 19202 | AR=$lt_AR |
| 19203 | + |
| 19204 | +# Flags to create an archive. |
| 19205 | AR_FLAGS=$lt_AR_FLAGS |
| 19206 | |
| 19207 | +# How to feed a file listing to the archiver. |
| 19208 | +archiver_list_spec=$lt_archiver_list_spec |
| 19209 | + |
| 19210 | # A symbol stripping program. |
| 19211 | STRIP=$lt_STRIP |
| 19212 | |
| 19213 | @@ -15563,6 +16253,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 19214 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 19215 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 19216 | |
| 19217 | +# Specify filename containing input files for \$NM. |
| 19218 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 19219 | + |
| 19220 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 19221 | +lt_sysroot=$lt_sysroot |
| 19222 | + |
| 19223 | # The name of the directory that contains temporary libtool files. |
| 19224 | objdir=$objdir |
| 19225 | |
| 19226 | @@ -15572,6 +16268,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 19227 | # Must we lock files when doing compilation? |
| 19228 | need_locks=$lt_need_locks |
| 19229 | |
| 19230 | +# Manifest tool. |
| 19231 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 19232 | + |
| 19233 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 19234 | DSYMUTIL=$lt_DSYMUTIL |
| 19235 | |
| 19236 | @@ -15686,12 +16385,12 @@ with_gcc=$GCC |
| 19237 | # Compiler flag to turn off builtin functions. |
| 19238 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 19239 | |
| 19240 | -# How to pass a linker flag through the compiler. |
| 19241 | -wl=$lt_lt_prog_compiler_wl |
| 19242 | - |
| 19243 | # Additional compiler flags for building library objects. |
| 19244 | pic_flag=$lt_lt_prog_compiler_pic |
| 19245 | |
| 19246 | +# How to pass a linker flag through the compiler. |
| 19247 | +wl=$lt_lt_prog_compiler_wl |
| 19248 | + |
| 19249 | # Compiler flag to prevent dynamic linking. |
| 19250 | link_static_flag=$lt_lt_prog_compiler_static |
| 19251 | |
| 19252 | @@ -15778,9 +16477,6 @@ inherit_rpath=$inherit_rpath |
| 19253 | # Whether libtool must link a program against all its dependency libraries. |
| 19254 | link_all_deplibs=$link_all_deplibs |
| 19255 | |
| 19256 | -# Fix the shell variable \$srcfile for the compiler. |
| 19257 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 19258 | - |
| 19259 | # Set to "yes" if exported symbols are required. |
| 19260 | always_export_symbols=$always_export_symbols |
| 19261 | |
| 19262 | @@ -15796,6 +16492,9 @@ include_expsyms=$lt_include_expsyms |
| 19263 | # Commands necessary for linking programs (against libraries) with templates. |
| 19264 | prelink_cmds=$lt_prelink_cmds |
| 19265 | |
| 19266 | +# Commands necessary for finishing linking programs. |
| 19267 | +postlink_cmds=$lt_postlink_cmds |
| 19268 | + |
| 19269 | # Specify filename containing input files. |
| 19270 | file_list_spec=$lt_file_list_spec |
| 19271 | |
| 19272 | @@ -15828,210 +16527,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 19273 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 19274 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 19275 | # is reportedly fixed, but why not run on old versions too? |
| 19276 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 19277 | - || (rm -f "$cfgfile"; exit 1) |
| 19278 | - |
| 19279 | - case $xsi_shell in |
| 19280 | - yes) |
| 19281 | - cat << \_LT_EOF >> "$cfgfile" |
| 19282 | - |
| 19283 | -# func_dirname file append nondir_replacement |
| 19284 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 19285 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 19286 | -func_dirname () |
| 19287 | -{ |
| 19288 | - case ${1} in |
| 19289 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 19290 | - * ) func_dirname_result="${3}" ;; |
| 19291 | - esac |
| 19292 | -} |
| 19293 | - |
| 19294 | -# func_basename file |
| 19295 | -func_basename () |
| 19296 | -{ |
| 19297 | - func_basename_result="${1##*/}" |
| 19298 | -} |
| 19299 | - |
| 19300 | -# func_dirname_and_basename file append nondir_replacement |
| 19301 | -# perform func_basename and func_dirname in a single function |
| 19302 | -# call: |
| 19303 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 19304 | -# add APPEND to the result, otherwise set result |
| 19305 | -# to NONDIR_REPLACEMENT. |
| 19306 | -# value returned in "$func_dirname_result" |
| 19307 | -# basename: Compute filename of FILE. |
| 19308 | -# value retuned in "$func_basename_result" |
| 19309 | -# Implementation must be kept synchronized with func_dirname |
| 19310 | -# and func_basename. For efficiency, we do not delegate to |
| 19311 | -# those functions but instead duplicate the functionality here. |
| 19312 | -func_dirname_and_basename () |
| 19313 | -{ |
| 19314 | - case ${1} in |
| 19315 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 19316 | - * ) func_dirname_result="${3}" ;; |
| 19317 | - esac |
| 19318 | - func_basename_result="${1##*/}" |
| 19319 | -} |
| 19320 | - |
| 19321 | -# func_stripname prefix suffix name |
| 19322 | -# strip PREFIX and SUFFIX off of NAME. |
| 19323 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 19324 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 19325 | -# dot (in which case that matches only a dot). |
| 19326 | -func_stripname () |
| 19327 | -{ |
| 19328 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 19329 | - # positional parameters, so assign one to ordinary parameter first. |
| 19330 | - func_stripname_result=${3} |
| 19331 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 19332 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 19333 | -} |
| 19334 | - |
| 19335 | -# func_opt_split |
| 19336 | -func_opt_split () |
| 19337 | -{ |
| 19338 | - func_opt_split_opt=${1%%=*} |
| 19339 | - func_opt_split_arg=${1#*=} |
| 19340 | -} |
| 19341 | - |
| 19342 | -# func_lo2o object |
| 19343 | -func_lo2o () |
| 19344 | -{ |
| 19345 | - case ${1} in |
| 19346 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 19347 | - *) func_lo2o_result=${1} ;; |
| 19348 | - esac |
| 19349 | -} |
| 19350 | - |
| 19351 | -# func_xform libobj-or-source |
| 19352 | -func_xform () |
| 19353 | -{ |
| 19354 | - func_xform_result=${1%.*}.lo |
| 19355 | -} |
| 19356 | - |
| 19357 | -# func_arith arithmetic-term... |
| 19358 | -func_arith () |
| 19359 | -{ |
| 19360 | - func_arith_result=$(( $* )) |
| 19361 | -} |
| 19362 | - |
| 19363 | -# func_len string |
| 19364 | -# STRING may not start with a hyphen. |
| 19365 | -func_len () |
| 19366 | -{ |
| 19367 | - func_len_result=${#1} |
| 19368 | -} |
| 19369 | - |
| 19370 | -_LT_EOF |
| 19371 | - ;; |
| 19372 | - *) # Bourne compatible functions. |
| 19373 | - cat << \_LT_EOF >> "$cfgfile" |
| 19374 | - |
| 19375 | -# func_dirname file append nondir_replacement |
| 19376 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 19377 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 19378 | -func_dirname () |
| 19379 | -{ |
| 19380 | - # Extract subdirectory from the argument. |
| 19381 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 19382 | - if test "X$func_dirname_result" = "X${1}"; then |
| 19383 | - func_dirname_result="${3}" |
| 19384 | - else |
| 19385 | - func_dirname_result="$func_dirname_result${2}" |
| 19386 | - fi |
| 19387 | -} |
| 19388 | - |
| 19389 | -# func_basename file |
| 19390 | -func_basename () |
| 19391 | -{ |
| 19392 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 19393 | -} |
| 19394 | - |
| 19395 | - |
| 19396 | -# func_stripname prefix suffix name |
| 19397 | -# strip PREFIX and SUFFIX off of NAME. |
| 19398 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 19399 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 19400 | -# dot (in which case that matches only a dot). |
| 19401 | -# func_strip_suffix prefix name |
| 19402 | -func_stripname () |
| 19403 | -{ |
| 19404 | - case ${2} in |
| 19405 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 19406 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 19407 | - esac |
| 19408 | -} |
| 19409 | - |
| 19410 | -# sed scripts: |
| 19411 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 19412 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 19413 | - |
| 19414 | -# func_opt_split |
| 19415 | -func_opt_split () |
| 19416 | -{ |
| 19417 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 19418 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 19419 | -} |
| 19420 | - |
| 19421 | -# func_lo2o object |
| 19422 | -func_lo2o () |
| 19423 | -{ |
| 19424 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 19425 | -} |
| 19426 | - |
| 19427 | -# func_xform libobj-or-source |
| 19428 | -func_xform () |
| 19429 | -{ |
| 19430 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 19431 | -} |
| 19432 | - |
| 19433 | -# func_arith arithmetic-term... |
| 19434 | -func_arith () |
| 19435 | -{ |
| 19436 | - func_arith_result=`expr "$@"` |
| 19437 | -} |
| 19438 | - |
| 19439 | -# func_len string |
| 19440 | -# STRING may not start with a hyphen. |
| 19441 | -func_len () |
| 19442 | -{ |
| 19443 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 19444 | -} |
| 19445 | - |
| 19446 | -_LT_EOF |
| 19447 | -esac |
| 19448 | - |
| 19449 | -case $lt_shell_append in |
| 19450 | - yes) |
| 19451 | - cat << \_LT_EOF >> "$cfgfile" |
| 19452 | - |
| 19453 | -# func_append var value |
| 19454 | -# Append VALUE to the end of shell variable VAR. |
| 19455 | -func_append () |
| 19456 | -{ |
| 19457 | - eval "$1+=\$2" |
| 19458 | -} |
| 19459 | -_LT_EOF |
| 19460 | - ;; |
| 19461 | - *) |
| 19462 | - cat << \_LT_EOF >> "$cfgfile" |
| 19463 | - |
| 19464 | -# func_append var value |
| 19465 | -# Append VALUE to the end of shell variable VAR. |
| 19466 | -func_append () |
| 19467 | -{ |
| 19468 | - eval "$1=\$$1\$2" |
| 19469 | -} |
| 19470 | - |
| 19471 | -_LT_EOF |
| 19472 | - ;; |
| 19473 | - esac |
| 19474 | - |
| 19475 | - |
| 19476 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 19477 | - || (rm -f "$cfgfile"; exit 1) |
| 19478 | - |
| 19479 | - mv -f "$cfgfile" "$ofile" || |
| 19480 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 19481 | + || (rm -f "$cfgfile"; exit 1) |
| 19482 | + |
| 19483 | + if test x"$xsi_shell" = xyes; then |
| 19484 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 19485 | +func_dirname ()\ |
| 19486 | +{\ |
| 19487 | +\ case ${1} in\ |
| 19488 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 19489 | +\ * ) func_dirname_result="${3}" ;;\ |
| 19490 | +\ esac\ |
| 19491 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19492 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19493 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19494 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19495 | + |
| 19496 | + |
| 19497 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 19498 | +func_basename ()\ |
| 19499 | +{\ |
| 19500 | +\ func_basename_result="${1##*/}"\ |
| 19501 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19502 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19503 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19504 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19505 | + |
| 19506 | + |
| 19507 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 19508 | +func_dirname_and_basename ()\ |
| 19509 | +{\ |
| 19510 | +\ case ${1} in\ |
| 19511 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 19512 | +\ * ) func_dirname_result="${3}" ;;\ |
| 19513 | +\ esac\ |
| 19514 | +\ func_basename_result="${1##*/}"\ |
| 19515 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19516 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19517 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19518 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19519 | + |
| 19520 | + |
| 19521 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 19522 | +func_stripname ()\ |
| 19523 | +{\ |
| 19524 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 19525 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 19526 | +\ func_stripname_result=${3}\ |
| 19527 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 19528 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 19529 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19530 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19531 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19532 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19533 | + |
| 19534 | + |
| 19535 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 19536 | +func_split_long_opt ()\ |
| 19537 | +{\ |
| 19538 | +\ func_split_long_opt_name=${1%%=*}\ |
| 19539 | +\ func_split_long_opt_arg=${1#*=}\ |
| 19540 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19541 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19542 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19543 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19544 | + |
| 19545 | + |
| 19546 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 19547 | +func_split_short_opt ()\ |
| 19548 | +{\ |
| 19549 | +\ func_split_short_opt_arg=${1#??}\ |
| 19550 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 19551 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19552 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19553 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19554 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19555 | + |
| 19556 | + |
| 19557 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 19558 | +func_lo2o ()\ |
| 19559 | +{\ |
| 19560 | +\ case ${1} in\ |
| 19561 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 19562 | +\ *) func_lo2o_result=${1} ;;\ |
| 19563 | +\ esac\ |
| 19564 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19565 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19566 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19567 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19568 | + |
| 19569 | + |
| 19570 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 19571 | +func_xform ()\ |
| 19572 | +{\ |
| 19573 | + func_xform_result=${1%.*}.lo\ |
| 19574 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19575 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19576 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19577 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19578 | + |
| 19579 | + |
| 19580 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 19581 | +func_arith ()\ |
| 19582 | +{\ |
| 19583 | + func_arith_result=$(( $* ))\ |
| 19584 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19585 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19586 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19587 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19588 | + |
| 19589 | + |
| 19590 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 19591 | +func_len ()\ |
| 19592 | +{\ |
| 19593 | + func_len_result=${#1}\ |
| 19594 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19595 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19596 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19597 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19598 | + |
| 19599 | +fi |
| 19600 | + |
| 19601 | +if test x"$lt_shell_append" = xyes; then |
| 19602 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 19603 | +func_append ()\ |
| 19604 | +{\ |
| 19605 | + eval "${1}+=\\${2}"\ |
| 19606 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19607 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19608 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19609 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19610 | + |
| 19611 | + |
| 19612 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 19613 | +func_append_quoted ()\ |
| 19614 | +{\ |
| 19615 | +\ func_quote_for_eval "${2}"\ |
| 19616 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 19617 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19618 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19619 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19620 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19621 | + |
| 19622 | + |
| 19623 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 19624 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 19625 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19626 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19627 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 19628 | +else |
| 19629 | + # Save a `func_append' function call even when '+=' is not available |
| 19630 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 19631 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19632 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19633 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 19634 | +fi |
| 19635 | + |
| 19636 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 19637 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 19638 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 19639 | +fi |
| 19640 | + |
| 19641 | + |
| 19642 | + mv -f "$cfgfile" "$ofile" || |
| 19643 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 19644 | chmod +x "$ofile" |
| 19645 | |
| 19646 | diff --git a/libtool.m4 b/libtool.m4 |
| 19647 | index ad63ebbb385..b65c22bf80d 100644 |
| 19648 | --- a/libtool.m4 |
| 19649 | +++ b/libtool.m4 |
| 19650 | @@ -1,7 +1,8 @@ |
| 19651 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
| 19652 | # |
| 19653 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 19654 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 19655 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 19656 | +# Inc. |
| 19657 | # Written by Gordon Matzigkeit, 1996 |
| 19658 | # |
| 19659 | # This file is free software; the Free Software Foundation gives |
| 19660 | @@ -10,7 +11,8 @@ |
| 19661 | |
| 19662 | m4_define([_LT_COPYING], [dnl |
| 19663 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 19664 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 19665 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 19666 | +# Inc. |
| 19667 | # Written by Gordon Matzigkeit, 1996 |
| 19668 | # |
| 19669 | # This file is part of GNU Libtool. |
| 19670 | @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl |
| 19671 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 19672 | ]) |
| 19673 | |
| 19674 | -# serial 56 LT_INIT |
| 19675 | +# serial 57 LT_INIT |
| 19676 | |
| 19677 | |
| 19678 | # LT_PREREQ(VERSION) |
| 19679 | @@ -166,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl |
| 19680 | dnl |
| 19681 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 19682 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
| 19683 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl |
| 19684 | m4_require([_LT_CMD_RELOAD])dnl |
| 19685 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
| 19686 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl |
| 19687 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
| 19688 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
| 19689 | +m4_require([_LT_WITH_SYSROOT])dnl |
| 19690 | |
| 19691 | _LT_CONFIG_LIBTOOL_INIT([ |
| 19692 | # See if we are running on zsh, and set the options which allow our |
| 19693 | @@ -632,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl |
| 19694 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
| 19695 | configured by $[0], generated by m4_PACKAGE_STRING. |
| 19696 | |
| 19697 | -Copyright (C) 2009 Free Software Foundation, Inc. |
| 19698 | +Copyright (C) 2010 Free Software Foundation, Inc. |
| 19699 | This config.lt script is free software; the Free Software Foundation |
| 19700 | gives unlimited permision to copy, distribute and modify it." |
| 19701 | |
| 19702 | @@ -746,15 +751,12 @@ _LT_EOF |
| 19703 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 19704 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 19705 | # is reportedly fixed, but why not run on old versions too? |
| 19706 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 19707 | - || (rm -f "$cfgfile"; exit 1) |
| 19708 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 19709 | + || (rm -f "$cfgfile"; exit 1) |
| 19710 | |
| 19711 | - _LT_PROG_XSI_SHELLFNS |
| 19712 | + _LT_PROG_REPLACE_SHELLFNS |
| 19713 | |
| 19714 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 19715 | - || (rm -f "$cfgfile"; exit 1) |
| 19716 | - |
| 19717 | - mv -f "$cfgfile" "$ofile" || |
| 19718 | + mv -f "$cfgfile" "$ofile" || |
| 19719 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 19720 | chmod +x "$ofile" |
| 19721 | ], |
| 19722 | @@ -980,6 +982,8 @@ _LT_EOF |
| 19723 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
| 19724 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
| 19725 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
| 19726 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
| 19727 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
| 19728 | cat > conftest.c << _LT_EOF |
| 19729 | int main() { return 0;} |
| 19730 | _LT_EOF |
| 19731 | @@ -1069,30 +1073,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], |
| 19732 | fi |
| 19733 | ]) |
| 19734 | |
| 19735 | -# _LT_SYS_MODULE_PATH_AIX |
| 19736 | -# ----------------------- |
| 19737 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
| 19738 | +# ---------------------------------- |
| 19739 | # Links a minimal program and checks the executable |
| 19740 | # for the system default hardcoded library path. In most cases, |
| 19741 | # this is /usr/lib:/lib, but when the MPI compilers are used |
| 19742 | # the location of the communication and MPI libs are included too. |
| 19743 | # If we don't find anything, use the default library path according |
| 19744 | # to the aix ld manual. |
| 19745 | +# Store the results from the different compilers for each TAGNAME. |
| 19746 | +# Allow to override them for all tags through lt_cv_aix_libpath. |
| 19747 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
| 19748 | [m4_require([_LT_DECL_SED])dnl |
| 19749 | -AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ |
| 19750 | -lt_aix_libpath_sed=' |
| 19751 | - /Import File Strings/,/^$/ { |
| 19752 | - /^0/ { |
| 19753 | - s/^0 *\(.*\)$/\1/ |
| 19754 | - p |
| 19755 | - } |
| 19756 | - }' |
| 19757 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 19758 | -# Check for a 64-bit object if we didn't find anything. |
| 19759 | -if test -z "$aix_libpath"; then |
| 19760 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 19761 | -fi],[]) |
| 19762 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 19763 | +if test "${lt_cv_aix_libpath+set}" = set; then |
| 19764 | + aix_libpath=$lt_cv_aix_libpath |
| 19765 | +else |
| 19766 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
| 19767 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
| 19768 | + lt_aix_libpath_sed='[ |
| 19769 | + /Import File Strings/,/^$/ { |
| 19770 | + /^0/ { |
| 19771 | + s/^0 *\([^ ]*\) *$/\1/ |
| 19772 | + p |
| 19773 | + } |
| 19774 | + }]' |
| 19775 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 19776 | + # Check for a 64-bit object if we didn't find anything. |
| 19777 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
| 19778 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 19779 | + fi],[]) |
| 19780 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
| 19781 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" |
| 19782 | + fi |
| 19783 | + ]) |
| 19784 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) |
| 19785 | +fi |
| 19786 | ])# _LT_SYS_MODULE_PATH_AIX |
| 19787 | |
| 19788 | |
| 19789 | @@ -1117,7 +1132,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 19790 | |
| 19791 | AC_MSG_CHECKING([how to print strings]) |
| 19792 | # Test print first, because it will be a builtin if present. |
| 19793 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 19794 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 19795 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 19796 | ECHO='print -r --' |
| 19797 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 19798 | @@ -1161,6 +1176,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
| 19799 | ])# _LT_PROG_ECHO_BACKSLASH |
| 19800 | |
| 19801 | |
| 19802 | +# _LT_WITH_SYSROOT |
| 19803 | +# ---------------- |
| 19804 | +AC_DEFUN([_LT_WITH_SYSROOT], |
| 19805 | +[AC_MSG_CHECKING([for sysroot]) |
| 19806 | +AC_ARG_WITH([libtool-sysroot], |
| 19807 | +[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR |
| 19808 | + (or the compiler's sysroot if not specified).], |
| 19809 | +[], [with_libtool_sysroot=no]) |
| 19810 | + |
| 19811 | +dnl lt_sysroot will always be passed unquoted. We quote it here |
| 19812 | +dnl in case the user passed a directory name. |
| 19813 | +lt_sysroot= |
| 19814 | +case ${with_libtool_sysroot} in #( |
| 19815 | + yes) |
| 19816 | + if test "$GCC" = yes; then |
| 19817 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 19818 | + fi |
| 19819 | + ;; #( |
| 19820 | + /*) |
| 19821 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 19822 | + ;; #( |
| 19823 | + no|'') |
| 19824 | + ;; #( |
| 19825 | + *) |
| 19826 | + AC_MSG_RESULT([${with_libtool_sysroot}]) |
| 19827 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) |
| 19828 | + ;; |
| 19829 | +esac |
| 19830 | + |
| 19831 | + AC_MSG_RESULT([${lt_sysroot:-no}]) |
| 19832 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl |
| 19833 | +[dependent libraries, and in which our libraries should be installed.])]) |
| 19834 | + |
| 19835 | # _LT_ENABLE_LOCK |
| 19836 | # --------------- |
| 19837 | m4_defun([_LT_ENABLE_LOCK], |
| 19838 | @@ -1320,6 +1368,51 @@ need_locks="$enable_libtool_lock" |
| 19839 | ])# _LT_ENABLE_LOCK |
| 19840 | |
| 19841 | |
| 19842 | +# _LT_PROG_AR |
| 19843 | +# ----------- |
| 19844 | +m4_defun([_LT_PROG_AR], |
| 19845 | +[AC_CHECK_TOOLS(AR, [ar], false) |
| 19846 | + touch conftest.c |
| 19847 | + $AR $plugin_option rc conftest.a conftest.c |
| 19848 | + if test "$?" != 0; then |
| 19849 | + AC_MSG_WARN([Failed: $AR $plugin_option rc]) |
| 19850 | + else |
| 19851 | + AR="$AR $plugin_option" |
| 19852 | + fi |
| 19853 | + rm -f conftest.* |
| 19854 | +: ${AR=ar} |
| 19855 | +: ${AR_FLAGS=cru} |
| 19856 | +_LT_DECL([], [AR], [1], [The archiver]) |
| 19857 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
| 19858 | + |
| 19859 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], |
| 19860 | + [lt_cv_ar_at_file=no |
| 19861 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], |
| 19862 | + [echo conftest.$ac_objext > conftest.lst |
| 19863 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' |
| 19864 | + AC_TRY_EVAL([lt_ar_try]) |
| 19865 | + if test "$ac_status" -eq 0; then |
| 19866 | + # Ensure the archiver fails upon bogus file names. |
| 19867 | + rm -f conftest.$ac_objext libconftest.a |
| 19868 | + AC_TRY_EVAL([lt_ar_try]) |
| 19869 | + if test "$ac_status" -ne 0; then |
| 19870 | + lt_cv_ar_at_file=@ |
| 19871 | + fi |
| 19872 | + fi |
| 19873 | + rm -f conftest.* libconftest.a |
| 19874 | + ]) |
| 19875 | + ]) |
| 19876 | + |
| 19877 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 19878 | + archiver_list_spec= |
| 19879 | +else |
| 19880 | + archiver_list_spec=$lt_cv_ar_at_file |
| 19881 | +fi |
| 19882 | +_LT_DECL([], [archiver_list_spec], [1], |
| 19883 | + [How to feed a file listing to the archiver]) |
| 19884 | +])# _LT_PROG_AR |
| 19885 | + |
| 19886 | + |
| 19887 | # _LT_CMD_OLD_ARCHIVE |
| 19888 | # ------------------- |
| 19889 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
| 19890 | @@ -1336,23 +1429,7 @@ for plugin in $plugin_names; do |
| 19891 | fi |
| 19892 | done |
| 19893 | |
| 19894 | -AC_CHECK_TOOL(AR, ar, false) |
| 19895 | -test -z "$AR" && AR=ar |
| 19896 | -if test -n "$plugin_option"; then |
| 19897 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 19898 | - touch conftest.c |
| 19899 | - $AR $plugin_option rc conftest.a conftest.c |
| 19900 | - if test "$?" != 0; then |
| 19901 | - AC_MSG_WARN([Failed: $AR $plugin_option rc]) |
| 19902 | - else |
| 19903 | - AR="$AR $plugin_option" |
| 19904 | - fi |
| 19905 | - rm -f conftest.* |
| 19906 | - fi |
| 19907 | -fi |
| 19908 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 19909 | -_LT_DECL([], [AR], [1], [The archiver]) |
| 19910 | -_LT_DECL([], [AR_FLAGS], [1]) |
| 19911 | +_LT_PROG_AR |
| 19912 | |
| 19913 | AC_CHECK_TOOL(STRIP, strip, :) |
| 19914 | test -z "$STRIP" && STRIP=: |
| 19915 | @@ -1653,7 +1730,7 @@ else |
| 19916 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 19917 | lt_status=$lt_dlunknown |
| 19918 | cat > conftest.$ac_ext <<_LT_EOF |
| 19919 | -[#line __oline__ "configure" |
| 19920 | +[#line $LINENO "configure" |
| 19921 | #include "confdefs.h" |
| 19922 | |
| 19923 | #if HAVE_DLFCN_H |
| 19924 | @@ -1697,10 +1774,10 @@ else |
| 19925 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 19926 | correspondingly for the symbols needed. */ |
| 19927 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 19928 | -void fnord () __attribute__((visibility("default"))); |
| 19929 | +int fnord () __attribute__((visibility("default"))); |
| 19930 | #endif |
| 19931 | |
| 19932 | -void fnord () { int i=42; } |
| 19933 | +int fnord () { return 42; } |
| 19934 | int main () |
| 19935 | { |
| 19936 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 19937 | @@ -2240,8 +2317,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 19938 | need_version=no |
| 19939 | need_lib_prefix=no |
| 19940 | |
| 19941 | - case $GCC,$host_os in |
| 19942 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 19943 | + case $GCC,$cc_basename in |
| 19944 | + yes,*) |
| 19945 | + # gcc |
| 19946 | library_names_spec='$libname.dll.a' |
| 19947 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 19948 | postinstall_cmds='base_file=`basename \${file}`~ |
| 19949 | @@ -2274,13 +2352,71 @@ m4_if([$1], [],[ |
| 19950 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
| 19951 | ;; |
| 19952 | esac |
| 19953 | + dynamic_linker='Win32 ld.exe' |
| 19954 | + ;; |
| 19955 | + |
| 19956 | + *,cl*) |
| 19957 | + # Native MSVC |
| 19958 | + libname_spec='$name' |
| 19959 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
| 19960 | + library_names_spec='${libname}.dll.lib' |
| 19961 | + |
| 19962 | + case $build_os in |
| 19963 | + mingw*) |
| 19964 | + sys_lib_search_path_spec= |
| 19965 | + lt_save_ifs=$IFS |
| 19966 | + IFS=';' |
| 19967 | + for lt_path in $LIB |
| 19968 | + do |
| 19969 | + IFS=$lt_save_ifs |
| 19970 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 19971 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 19972 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 19973 | + done |
| 19974 | + IFS=$lt_save_ifs |
| 19975 | + # Convert to MSYS style. |
| 19976 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` |
| 19977 | + ;; |
| 19978 | + cygwin*) |
| 19979 | + # Convert to unix form, then to dos form, then back to unix form |
| 19980 | + # but this time dos style (no spaces!) so that the unix form looks |
| 19981 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 19982 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 19983 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 19984 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 19985 | + ;; |
| 19986 | + *) |
| 19987 | + sys_lib_search_path_spec="$LIB" |
| 19988 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
| 19989 | + # It is most probably a Windows format PATH. |
| 19990 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 19991 | + else |
| 19992 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 19993 | + fi |
| 19994 | + # FIXME: find the short name or the path components, as spaces are |
| 19995 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 19996 | + ;; |
| 19997 | + esac |
| 19998 | + |
| 19999 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 20000 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 20001 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 20002 | + dldir=$destdir/`dirname \$dlpath`~ |
| 20003 | + test -d \$dldir || mkdir -p \$dldir~ |
| 20004 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 20005 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 20006 | + dlpath=$dir/\$dldll~ |
| 20007 | + $RM \$dlpath' |
| 20008 | + shlibpath_overrides_runpath=yes |
| 20009 | + dynamic_linker='Win32 link.exe' |
| 20010 | ;; |
| 20011 | |
| 20012 | *) |
| 20013 | + # Assume MSVC wrapper |
| 20014 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 20015 | + dynamic_linker='Win32 ld.exe' |
| 20016 | ;; |
| 20017 | esac |
| 20018 | - dynamic_linker='Win32 ld.exe' |
| 20019 | # FIXME: first we should search . and the directory the executable is in |
| 20020 | shlibpath_var=PATH |
| 20021 | ;; |
| 20022 | @@ -2970,6 +3106,11 @@ case $reload_flag in |
| 20023 | esac |
| 20024 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 20025 | case $host_os in |
| 20026 | + cygwin* | mingw* | pw32* | cegcc*) |
| 20027 | + if test "$GCC" != yes; then |
| 20028 | + reload_cmds=false |
| 20029 | + fi |
| 20030 | + ;; |
| 20031 | darwin*) |
| 20032 | if test "$GCC" = yes; then |
| 20033 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 20034 | @@ -3036,7 +3177,8 @@ mingw* | pw32*) |
| 20035 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 20036 | lt_cv_file_magic_cmd='func_win32_libid' |
| 20037 | else |
| 20038 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 20039 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 20040 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 20041 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 20042 | fi |
| 20043 | ;; |
| 20044 | @@ -3187,6 +3329,21 @@ tpf*) |
| 20045 | ;; |
| 20046 | esac |
| 20047 | ]) |
| 20048 | + |
| 20049 | +file_magic_glob= |
| 20050 | +want_nocaseglob=no |
| 20051 | +if test "$build" = "$host"; then |
| 20052 | + case $host_os in |
| 20053 | + mingw* | pw32*) |
| 20054 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 20055 | + want_nocaseglob=yes |
| 20056 | + else |
| 20057 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` |
| 20058 | + fi |
| 20059 | + ;; |
| 20060 | + esac |
| 20061 | +fi |
| 20062 | + |
| 20063 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 20064 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 20065 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 20066 | @@ -3194,7 +3351,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 20067 | _LT_DECL([], [deplibs_check_method], [1], |
| 20068 | [Method to check whether dependent libraries are shared objects]) |
| 20069 | _LT_DECL([], [file_magic_cmd], [1], |
| 20070 | - [Command to use when deplibs_check_method == "file_magic"]) |
| 20071 | + [Command to use when deplibs_check_method = "file_magic"]) |
| 20072 | +_LT_DECL([], [file_magic_glob], [1], |
| 20073 | + [How to find potential files when deplibs_check_method = "file_magic"]) |
| 20074 | +_LT_DECL([], [want_nocaseglob], [1], |
| 20075 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) |
| 20076 | ])# _LT_CHECK_MAGIC_METHOD |
| 20077 | |
| 20078 | |
| 20079 | @@ -3305,6 +3466,67 @@ dnl aclocal-1.4 backwards compatibility: |
| 20080 | dnl AC_DEFUN([AM_PROG_NM], []) |
| 20081 | dnl AC_DEFUN([AC_PROG_NM], []) |
| 20082 | |
| 20083 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
| 20084 | +# -------------------------------- |
| 20085 | +# how to determine the name of the shared library |
| 20086 | +# associated with a specific link library. |
| 20087 | +# -- PORTME fill in with the dynamic library characteristics |
| 20088 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], |
| 20089 | +[m4_require([_LT_DECL_EGREP]) |
| 20090 | +m4_require([_LT_DECL_OBJDUMP]) |
| 20091 | +m4_require([_LT_DECL_DLLTOOL]) |
| 20092 | +AC_CACHE_CHECK([how to associate runtime and link libraries], |
| 20093 | +lt_cv_sharedlib_from_linklib_cmd, |
| 20094 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 20095 | + |
| 20096 | +case $host_os in |
| 20097 | +cygwin* | mingw* | pw32* | cegcc*) |
| 20098 | + # two different shell functions defined in ltmain.sh |
| 20099 | + # decide which to use based on capabilities of $DLLTOOL |
| 20100 | + case `$DLLTOOL --help 2>&1` in |
| 20101 | + *--identify-strict*) |
| 20102 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 20103 | + ;; |
| 20104 | + *) |
| 20105 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 20106 | + ;; |
| 20107 | + esac |
| 20108 | + ;; |
| 20109 | +*) |
| 20110 | + # fallback: assume linklib IS sharedlib |
| 20111 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 20112 | + ;; |
| 20113 | +esac |
| 20114 | +]) |
| 20115 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 20116 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 20117 | + |
| 20118 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], |
| 20119 | + [Command to associate shared and link libraries]) |
| 20120 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
| 20121 | + |
| 20122 | + |
| 20123 | +# _LT_PATH_MANIFEST_TOOL |
| 20124 | +# ---------------------- |
| 20125 | +# locate the manifest tool |
| 20126 | +m4_defun([_LT_PATH_MANIFEST_TOOL], |
| 20127 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) |
| 20128 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 20129 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], |
| 20130 | + [lt_cv_path_mainfest_tool=no |
| 20131 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD |
| 20132 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 20133 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
| 20134 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 20135 | + lt_cv_path_mainfest_tool=yes |
| 20136 | + fi |
| 20137 | + rm -f conftest*]) |
| 20138 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 20139 | + MANIFEST_TOOL=: |
| 20140 | +fi |
| 20141 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl |
| 20142 | +])# _LT_PATH_MANIFEST_TOOL |
| 20143 | + |
| 20144 | |
| 20145 | # LT_LIB_M |
| 20146 | # -------- |
| 20147 | @@ -3431,8 +3653,8 @@ esac |
| 20148 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 20149 | |
| 20150 | # Transform an extracted symbol line into symbol name and symbol address |
| 20151 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 20152 | -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'" |
| 20153 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 20154 | +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'" |
| 20155 | |
| 20156 | # Handle CRLF in mingw tool chain |
| 20157 | opt_cr= |
| 20158 | @@ -3468,6 +3690,7 @@ for ac_symprfx in "" "_"; do |
| 20159 | else |
| 20160 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 20161 | fi |
| 20162 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 20163 | |
| 20164 | # Check to see that the pipe works correctly. |
| 20165 | pipe_works=no |
| 20166 | @@ -3501,6 +3724,18 @@ _LT_EOF |
| 20167 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 20168 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 20169 | cat <<_LT_EOF > conftest.$ac_ext |
| 20170 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 20171 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 20172 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 20173 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 20174 | +# define LT@&t@_DLSYM_CONST |
| 20175 | +#elif defined(__osf__) |
| 20176 | +/* This system does not cope well with relocations in const data. */ |
| 20177 | +# define LT@&t@_DLSYM_CONST |
| 20178 | +#else |
| 20179 | +# define LT@&t@_DLSYM_CONST const |
| 20180 | +#endif |
| 20181 | + |
| 20182 | #ifdef __cplusplus |
| 20183 | extern "C" { |
| 20184 | #endif |
| 20185 | @@ -3512,7 +3747,7 @@ _LT_EOF |
| 20186 | cat <<_LT_EOF >> conftest.$ac_ext |
| 20187 | |
| 20188 | /* The mapping between symbol names and symbols. */ |
| 20189 | -const struct { |
| 20190 | +LT@&t@_DLSYM_CONST struct { |
| 20191 | const char *name; |
| 20192 | void *address; |
| 20193 | } |
| 20194 | @@ -3538,15 +3773,15 @@ static const void *lt_preloaded_setup() { |
| 20195 | _LT_EOF |
| 20196 | # Now try linking the two files. |
| 20197 | mv conftest.$ac_objext conftstm.$ac_objext |
| 20198 | - lt_save_LIBS="$LIBS" |
| 20199 | - lt_save_CFLAGS="$CFLAGS" |
| 20200 | + lt_globsym_save_LIBS=$LIBS |
| 20201 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 20202 | LIBS="conftstm.$ac_objext" |
| 20203 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
| 20204 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
| 20205 | pipe_works=yes |
| 20206 | fi |
| 20207 | - LIBS="$lt_save_LIBS" |
| 20208 | - CFLAGS="$lt_save_CFLAGS" |
| 20209 | + LIBS=$lt_globsym_save_LIBS |
| 20210 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 20211 | else |
| 20212 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
| 20213 | fi |
| 20214 | @@ -3579,6 +3814,13 @@ else |
| 20215 | AC_MSG_RESULT(ok) |
| 20216 | fi |
| 20217 | |
| 20218 | +# Response file support. |
| 20219 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 20220 | + nm_file_list_spec='@' |
| 20221 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then |
| 20222 | + nm_file_list_spec='@' |
| 20223 | +fi |
| 20224 | + |
| 20225 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
| 20226 | [Take the output of nm and produce a listing of raw symbols and C names]) |
| 20227 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
| 20228 | @@ -3589,6 +3831,8 @@ _LT_DECL([global_symbol_to_c_name_address], |
| 20229 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
| 20230 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
| 20231 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
| 20232 | +_LT_DECL([], [nm_file_list_spec], [1], |
| 20233 | + [Specify filename containing input files for $NM]) |
| 20234 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
| 20235 | |
| 20236 | |
| 20237 | @@ -3600,7 +3844,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= |
| 20238 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
| 20239 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
| 20240 | |
| 20241 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) |
| 20242 | m4_if([$1], [CXX], [ |
| 20243 | # C++ specific cases for pic, static, wl, etc. |
| 20244 | if test "$GXX" = yes; then |
| 20245 | @@ -3706,6 +3949,12 @@ m4_if([$1], [CXX], [ |
| 20246 | ;; |
| 20247 | esac |
| 20248 | ;; |
| 20249 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
| 20250 | + # This hack is so that the source file can tell whether it is being |
| 20251 | + # built for inclusion in a dll (and should export symbols for example). |
| 20252 | + m4_if([$1], [GCJ], [], |
| 20253 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
| 20254 | + ;; |
| 20255 | dgux*) |
| 20256 | case $cc_basename in |
| 20257 | ec++*) |
| 20258 | @@ -3858,7 +4107,7 @@ m4_if([$1], [CXX], [ |
| 20259 | ;; |
| 20260 | solaris*) |
| 20261 | case $cc_basename in |
| 20262 | - CC*) |
| 20263 | + CC* | sunCC*) |
| 20264 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 20265 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
| 20266 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 20267 | @@ -4081,6 +4330,12 @@ m4_if([$1], [CXX], [ |
| 20268 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
| 20269 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
| 20270 | ;; |
| 20271 | + nagfor*) |
| 20272 | + # NAG Fortran compiler |
| 20273 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' |
| 20274 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
| 20275 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 20276 | + ;; |
| 20277 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 20278 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 20279 | # which looks to be a dead project) |
| 20280 | @@ -4143,7 +4398,7 @@ m4_if([$1], [CXX], [ |
| 20281 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
| 20282 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 20283 | case $cc_basename in |
| 20284 | - f77* | f90* | f95*) |
| 20285 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 20286 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
| 20287 | *) |
| 20288 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
| 20289 | @@ -4200,9 +4455,11 @@ case $host_os in |
| 20290 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
| 20291 | ;; |
| 20292 | esac |
| 20293 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
| 20294 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
| 20295 | - [How to pass a linker flag through the compiler]) |
| 20296 | + |
| 20297 | +AC_CACHE_CHECK([for $compiler option to produce PIC], |
| 20298 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
| 20299 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
| 20300 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) |
| 20301 | |
| 20302 | # |
| 20303 | # Check to make sure the PIC flag actually works. |
| 20304 | @@ -4221,6 +4478,8 @@ fi |
| 20305 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
| 20306 | [Additional compiler flags for building library objects]) |
| 20307 | |
| 20308 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
| 20309 | + [How to pass a linker flag through the compiler]) |
| 20310 | # |
| 20311 | # Check to make sure the static flag actually works. |
| 20312 | # |
| 20313 | @@ -4241,6 +4500,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], |
| 20314 | m4_defun([_LT_LINKER_SHLIBS], |
| 20315 | [AC_REQUIRE([LT_PATH_LD])dnl |
| 20316 | AC_REQUIRE([LT_PATH_NM])dnl |
| 20317 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
| 20318 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 20319 | m4_require([_LT_DECL_EGREP])dnl |
| 20320 | m4_require([_LT_DECL_SED])dnl |
| 20321 | @@ -4249,6 +4509,7 @@ m4_require([_LT_TAG_COMPILER])dnl |
| 20322 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
| 20323 | m4_if([$1], [CXX], [ |
| 20324 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 20325 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
| 20326 | case $host_os in |
| 20327 | aix[[4-9]]*) |
| 20328 | # If we're using GNU nm, then we don't want the "-C" option. |
| 20329 | @@ -4263,15 +4524,20 @@ m4_if([$1], [CXX], [ |
| 20330 | ;; |
| 20331 | pw32*) |
| 20332 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
| 20333 | - ;; |
| 20334 | + ;; |
| 20335 | cygwin* | mingw* | cegcc*) |
| 20336 | - _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' |
| 20337 | - ;; |
| 20338 | + case $cc_basename in |
| 20339 | + cl*) ;; |
| 20340 | + *) |
| 20341 | + _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' |
| 20342 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
| 20343 | + ;; |
| 20344 | + esac |
| 20345 | + ;; |
| 20346 | *) |
| 20347 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 20348 | - ;; |
| 20349 | + ;; |
| 20350 | esac |
| 20351 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
| 20352 | ], [ |
| 20353 | runpath_var= |
| 20354 | _LT_TAGVAR(allow_undefined_flag, $1)= |
| 20355 | @@ -4439,7 +4705,8 @@ _LT_EOF |
| 20356 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 20357 | _LT_TAGVAR(always_export_symbols, $1)=no |
| 20358 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 20359 | - _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' |
| 20360 | + _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' |
| 20361 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
| 20362 | |
| 20363 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 20364 | _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' |
| 20365 | @@ -4538,12 +4805,12 @@ _LT_EOF |
| 20366 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
| 20367 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
| 20368 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
| 20369 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 20370 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 20371 | if test "x$supports_anon_versioning" = xyes; then |
| 20372 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
| 20373 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 20374 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 20375 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 20376 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 20377 | fi |
| 20378 | ;; |
| 20379 | esac |
| 20380 | @@ -4557,8 +4824,8 @@ _LT_EOF |
| 20381 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 20382 | wlarc= |
| 20383 | else |
| 20384 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20385 | - _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' |
| 20386 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20387 | + _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' |
| 20388 | fi |
| 20389 | ;; |
| 20390 | |
| 20391 | @@ -4576,8 +4843,8 @@ _LT_EOF |
| 20392 | |
| 20393 | _LT_EOF |
| 20394 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 20395 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20396 | - _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' |
| 20397 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20398 | + _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' |
| 20399 | else |
| 20400 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 20401 | fi |
| 20402 | @@ -4623,8 +4890,8 @@ _LT_EOF |
| 20403 | |
| 20404 | *) |
| 20405 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 20406 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20407 | - _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' |
| 20408 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20409 | + _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' |
| 20410 | else |
| 20411 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 20412 | fi |
| 20413 | @@ -4754,7 +5021,7 @@ _LT_EOF |
| 20414 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
| 20415 | # Determine the default libpath from the value encoded in an |
| 20416 | # empty executable. |
| 20417 | - _LT_SYS_MODULE_PATH_AIX |
| 20418 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 20419 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 20420 | _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" |
| 20421 | else |
| 20422 | @@ -4765,7 +5032,7 @@ _LT_EOF |
| 20423 | else |
| 20424 | # Determine the default libpath from the value encoded in an |
| 20425 | # empty executable. |
| 20426 | - _LT_SYS_MODULE_PATH_AIX |
| 20427 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 20428 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 20429 | # Warning - without using the other run time loading flags, |
| 20430 | # -berok will link without error, but may produce a broken library. |
| 20431 | @@ -4809,20 +5076,63 @@ _LT_EOF |
| 20432 | # Microsoft Visual C++. |
| 20433 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 20434 | # no search path for DLLs. |
| 20435 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 20436 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 20437 | - # Tell ltmain to make .lib files, not .a files. |
| 20438 | - libext=lib |
| 20439 | - # Tell ltmain to make .dll files, not .so files. |
| 20440 | - shrext_cmds=".dll" |
| 20441 | - # FIXME: Setting linknames here is a bad hack. |
| 20442 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 20443 | - # The linker will automatically build a .lib file if we build a DLL. |
| 20444 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 20445 | - # FIXME: Should let the user specify the lib program. |
| 20446 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 20447 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
| 20448 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 20449 | + case $cc_basename in |
| 20450 | + cl*) |
| 20451 | + # Native MSVC |
| 20452 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 20453 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 20454 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
| 20455 | + _LT_TAGVAR(file_list_spec, $1)='@' |
| 20456 | + # Tell ltmain to make .lib files, not .a files. |
| 20457 | + libext=lib |
| 20458 | + # Tell ltmain to make .dll files, not .so files. |
| 20459 | + shrext_cmds=".dll" |
| 20460 | + # FIXME: Setting linknames here is a bad hack. |
| 20461 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 20462 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 20463 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 20464 | + else |
| 20465 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 20466 | + fi~ |
| 20467 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 20468 | + linknames=' |
| 20469 | + # The linker will not automatically build a static lib if we build a DLL. |
| 20470 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 20471 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 20472 | + _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' |
| 20473 | + # Don't use ranlib |
| 20474 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
| 20475 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
| 20476 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 20477 | + case $lt_outputfile in |
| 20478 | + *.exe|*.EXE) ;; |
| 20479 | + *) |
| 20480 | + lt_outputfile="$lt_outputfile.exe" |
| 20481 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 20482 | + ;; |
| 20483 | + esac~ |
| 20484 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 20485 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 20486 | + $RM "$lt_outputfile.manifest"; |
| 20487 | + fi' |
| 20488 | + ;; |
| 20489 | + *) |
| 20490 | + # Assume MSVC wrapper |
| 20491 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 20492 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 20493 | + # Tell ltmain to make .lib files, not .a files. |
| 20494 | + libext=lib |
| 20495 | + # Tell ltmain to make .dll files, not .so files. |
| 20496 | + shrext_cmds=".dll" |
| 20497 | + # FIXME: Setting linknames here is a bad hack. |
| 20498 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 20499 | + # The linker will automatically build a .lib file if we build a DLL. |
| 20500 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 20501 | + # FIXME: Should let the user specify the lib program. |
| 20502 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 20503 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 20504 | + ;; |
| 20505 | + esac |
| 20506 | ;; |
| 20507 | |
| 20508 | darwin* | rhapsody*) |
| 20509 | @@ -4856,7 +5166,7 @@ _LT_EOF |
| 20510 | |
| 20511 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 20512 | freebsd* | dragonfly*) |
| 20513 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 20514 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 20515 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
| 20516 | _LT_TAGVAR(hardcode_direct, $1)=yes |
| 20517 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
| 20518 | @@ -4864,7 +5174,7 @@ _LT_EOF |
| 20519 | |
| 20520 | hpux9*) |
| 20521 | if test "$GCC" = yes; then |
| 20522 | - _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' |
| 20523 | + _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' |
| 20524 | else |
| 20525 | _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' |
| 20526 | fi |
| 20527 | @@ -4880,7 +5190,7 @@ _LT_EOF |
| 20528 | |
| 20529 | hpux10*) |
| 20530 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 20531 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20532 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20533 | else |
| 20534 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 20535 | fi |
| 20536 | @@ -4904,10 +5214,10 @@ _LT_EOF |
| 20537 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20538 | ;; |
| 20539 | ia64*) |
| 20540 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 20541 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 20542 | ;; |
| 20543 | *) |
| 20544 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20545 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20546 | ;; |
| 20547 | esac |
| 20548 | else |
| 20549 | @@ -4954,16 +5264,31 @@ _LT_EOF |
| 20550 | |
| 20551 | irix5* | irix6* | nonstopux*) |
| 20552 | if test "$GCC" = yes; then |
| 20553 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 20554 | + _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' |
| 20555 | # Try to use the -exported_symbol ld option, if it does not |
| 20556 | # work, assume that -exports_file does not work either and |
| 20557 | # implicitly export all symbols. |
| 20558 | - save_LDFLAGS="$LDFLAGS" |
| 20559 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 20560 | - AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], |
| 20561 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 20562 | - ) |
| 20563 | - LDFLAGS="$save_LDFLAGS" |
| 20564 | + # This should be the same for all languages, so no per-tag cache variable. |
| 20565 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
| 20566 | + [lt_cv_irix_exported_symbol], |
| 20567 | + [save_LDFLAGS="$LDFLAGS" |
| 20568 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 20569 | + AC_LINK_IFELSE( |
| 20570 | + [AC_LANG_SOURCE( |
| 20571 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], |
| 20572 | + [C++], [[int foo (void) { return 0; }]], |
| 20573 | + [Fortran 77], [[ |
| 20574 | + subroutine foo |
| 20575 | + end]], |
| 20576 | + [Fortran], [[ |
| 20577 | + subroutine foo |
| 20578 | + end]])])], |
| 20579 | + [lt_cv_irix_exported_symbol=yes], |
| 20580 | + [lt_cv_irix_exported_symbol=no]) |
| 20581 | + LDFLAGS="$save_LDFLAGS"]) |
| 20582 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 20583 | + _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' |
| 20584 | + fi |
| 20585 | else |
| 20586 | _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' |
| 20587 | _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' |
| 20588 | @@ -5048,7 +5373,7 @@ _LT_EOF |
| 20589 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 20590 | if test "$GCC" = yes; then |
| 20591 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
| 20592 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 20593 | + _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' |
| 20594 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
| 20595 | else |
| 20596 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
| 20597 | @@ -5067,9 +5392,9 @@ _LT_EOF |
| 20598 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
| 20599 | if test "$GCC" = yes; then |
| 20600 | wlarc='${wl}' |
| 20601 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20602 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20603 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 20604 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 20605 | + $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' |
| 20606 | else |
| 20607 | case `$CC -V 2>&1` in |
| 20608 | *"Compilers 5.0"*) |
| 20609 | @@ -5341,8 +5666,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], |
| 20610 | to runtime path list]) |
| 20611 | _LT_TAGDECL([], [link_all_deplibs], [0], |
| 20612 | [Whether libtool must link a program against all its dependency libraries]) |
| 20613 | -_LT_TAGDECL([], [fix_srcfile_path], [1], |
| 20614 | - [Fix the shell variable $srcfile for the compiler]) |
| 20615 | _LT_TAGDECL([], [always_export_symbols], [0], |
| 20616 | [Set to "yes" if exported symbols are required]) |
| 20617 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
| 20618 | @@ -5353,6 +5676,8 @@ _LT_TAGDECL([], [include_expsyms], [1], |
| 20619 | [Symbols that must always be exported]) |
| 20620 | _LT_TAGDECL([], [prelink_cmds], [2], |
| 20621 | [Commands necessary for linking programs (against libraries) with templates]) |
| 20622 | +_LT_TAGDECL([], [postlink_cmds], [2], |
| 20623 | + [Commands necessary for finishing linking programs]) |
| 20624 | _LT_TAGDECL([], [file_list_spec], [1], |
| 20625 | [Specify filename containing input files]) |
| 20626 | dnl FIXME: Not yet implemented |
| 20627 | @@ -5454,6 +5779,7 @@ CC="$lt_save_CC" |
| 20628 | m4_defun([_LT_LANG_CXX_CONFIG], |
| 20629 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 20630 | m4_require([_LT_DECL_EGREP])dnl |
| 20631 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
| 20632 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
| 20633 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
| 20634 | (test "X$CXX" != "Xg++"))) ; then |
| 20635 | @@ -5515,6 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20636 | |
| 20637 | # Allow CC to be a program name with arguments. |
| 20638 | lt_save_CC=$CC |
| 20639 | + lt_save_CFLAGS=$CFLAGS |
| 20640 | lt_save_LD=$LD |
| 20641 | lt_save_GCC=$GCC |
| 20642 | GCC=$GXX |
| 20643 | @@ -5532,6 +5859,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20644 | fi |
| 20645 | test -z "${LDCXX+set}" || LD=$LDCXX |
| 20646 | CC=${CXX-"c++"} |
| 20647 | + CFLAGS=$CXXFLAGS |
| 20648 | compiler=$CC |
| 20649 | _LT_TAGVAR(compiler, $1)=$CC |
| 20650 | _LT_CC_BASENAME([$compiler]) |
| 20651 | @@ -5695,7 +6023,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20652 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
| 20653 | # Determine the default libpath from the value encoded in an empty |
| 20654 | # executable. |
| 20655 | - _LT_SYS_MODULE_PATH_AIX |
| 20656 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 20657 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 20658 | |
| 20659 | _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" |
| 20660 | @@ -5707,7 +6035,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20661 | else |
| 20662 | # Determine the default libpath from the value encoded in an |
| 20663 | # empty executable. |
| 20664 | - _LT_SYS_MODULE_PATH_AIX |
| 20665 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 20666 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 20667 | # Warning - without using the other run time loading flags, |
| 20668 | # -berok will link without error, but may produce a broken library. |
| 20669 | @@ -5749,29 +6077,75 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20670 | ;; |
| 20671 | |
| 20672 | cygwin* | mingw* | pw32* | cegcc*) |
| 20673 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
| 20674 | - # as there is no search path for DLLs. |
| 20675 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
| 20676 | - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
| 20677 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 20678 | - _LT_TAGVAR(always_export_symbols, $1)=no |
| 20679 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 20680 | - |
| 20681 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 20682 | - _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' |
| 20683 | - # If the export-symbols file already is a .def file (1st line |
| 20684 | - # is EXPORTS), use it as is; otherwise, prepend... |
| 20685 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 20686 | - cp $export_symbols $output_objdir/$soname.def; |
| 20687 | - else |
| 20688 | - echo EXPORTS > $output_objdir/$soname.def; |
| 20689 | - cat $export_symbols >> $output_objdir/$soname.def; |
| 20690 | - fi~ |
| 20691 | - $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' |
| 20692 | - else |
| 20693 | - _LT_TAGVAR(ld_shlibs, $1)=no |
| 20694 | - fi |
| 20695 | - ;; |
| 20696 | + case $GXX,$cc_basename in |
| 20697 | + ,cl* | no,cl*) |
| 20698 | + # Native MSVC |
| 20699 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 20700 | + # no search path for DLLs. |
| 20701 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 20702 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 20703 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
| 20704 | + _LT_TAGVAR(file_list_spec, $1)='@' |
| 20705 | + # Tell ltmain to make .lib files, not .a files. |
| 20706 | + libext=lib |
| 20707 | + # Tell ltmain to make .dll files, not .so files. |
| 20708 | + shrext_cmds=".dll" |
| 20709 | + # FIXME: Setting linknames here is a bad hack. |
| 20710 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 20711 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 20712 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 20713 | + else |
| 20714 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 20715 | + fi~ |
| 20716 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 20717 | + linknames=' |
| 20718 | + # The linker will not automatically build a static lib if we build a DLL. |
| 20719 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 20720 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 20721 | + # Don't use ranlib |
| 20722 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
| 20723 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
| 20724 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 20725 | + case $lt_outputfile in |
| 20726 | + *.exe|*.EXE) ;; |
| 20727 | + *) |
| 20728 | + lt_outputfile="$lt_outputfile.exe" |
| 20729 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 20730 | + ;; |
| 20731 | + esac~ |
| 20732 | + func_to_tool_file "$lt_outputfile"~ |
| 20733 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 20734 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 20735 | + $RM "$lt_outputfile.manifest"; |
| 20736 | + fi' |
| 20737 | + ;; |
| 20738 | + *) |
| 20739 | + # g++ |
| 20740 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
| 20741 | + # as there is no search path for DLLs. |
| 20742 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
| 20743 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
| 20744 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 20745 | + _LT_TAGVAR(always_export_symbols, $1)=no |
| 20746 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 20747 | + |
| 20748 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 20749 | + _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' |
| 20750 | + # If the export-symbols file already is a .def file (1st line |
| 20751 | + # is EXPORTS), use it as is; otherwise, prepend... |
| 20752 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 20753 | + cp $export_symbols $output_objdir/$soname.def; |
| 20754 | + else |
| 20755 | + echo EXPORTS > $output_objdir/$soname.def; |
| 20756 | + cat $export_symbols >> $output_objdir/$soname.def; |
| 20757 | + fi~ |
| 20758 | + $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' |
| 20759 | + else |
| 20760 | + _LT_TAGVAR(ld_shlibs, $1)=no |
| 20761 | + fi |
| 20762 | + ;; |
| 20763 | + esac |
| 20764 | + ;; |
| 20765 | darwin* | rhapsody*) |
| 20766 | _LT_DARWIN_LINKER_FEATURES($1) |
| 20767 | ;; |
| 20768 | @@ -5846,7 +6220,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20769 | ;; |
| 20770 | *) |
| 20771 | if test "$GXX" = yes; then |
| 20772 | - _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' |
| 20773 | + _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' |
| 20774 | else |
| 20775 | # FIXME: insert proper C++ library support |
| 20776 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 20777 | @@ -5917,10 +6291,10 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20778 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 20779 | ;; |
| 20780 | ia64*) |
| 20781 | - _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' |
| 20782 | + _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' |
| 20783 | ;; |
| 20784 | *) |
| 20785 | - _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' |
| 20786 | + _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' |
| 20787 | ;; |
| 20788 | esac |
| 20789 | fi |
| 20790 | @@ -5961,9 +6335,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20791 | *) |
| 20792 | if test "$GXX" = yes; then |
| 20793 | if test "$with_gnu_ld" = no; then |
| 20794 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 20795 | + _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' |
| 20796 | else |
| 20797 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
| 20798 | + _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' |
| 20799 | fi |
| 20800 | fi |
| 20801 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
| 20802 | @@ -6033,20 +6407,20 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20803 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
| 20804 | rm -rf $tpldir~ |
| 20805 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
| 20806 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
| 20807 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
| 20808 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
| 20809 | rm -rf $tpldir~ |
| 20810 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
| 20811 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
| 20812 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
| 20813 | $RANLIB $oldlib' |
| 20814 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
| 20815 | rm -rf $tpldir~ |
| 20816 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 20817 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 20818 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 20819 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
| 20820 | rm -rf $tpldir~ |
| 20821 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 20822 | - $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' |
| 20823 | + $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' |
| 20824 | ;; |
| 20825 | *) # Version 6 and above use weak symbols |
| 20826 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 20827 | @@ -6241,7 +6615,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20828 | _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' |
| 20829 | ;; |
| 20830 | *) |
| 20831 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 20832 | + _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' |
| 20833 | ;; |
| 20834 | esac |
| 20835 | |
| 20836 | @@ -6287,7 +6661,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20837 | |
| 20838 | solaris*) |
| 20839 | case $cc_basename in |
| 20840 | - CC*) |
| 20841 | + CC* | sunCC*) |
| 20842 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 20843 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
| 20844 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
| 20845 | @@ -6328,9 +6702,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20846 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
| 20847 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
| 20848 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
| 20849 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 20850 | + _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' |
| 20851 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 20852 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 20853 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 20854 | |
| 20855 | # Commands to make compiler produce verbose output that lists |
| 20856 | # what "hidden" libraries, object files and flags are used when |
| 20857 | @@ -6459,6 +6833,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 20858 | fi # test -n "$compiler" |
| 20859 | |
| 20860 | CC=$lt_save_CC |
| 20861 | + CFLAGS=$lt_save_CFLAGS |
| 20862 | LDCXX=$LD |
| 20863 | LD=$lt_save_LD |
| 20864 | GCC=$lt_save_GCC |
| 20865 | @@ -6473,6 +6848,29 @@ AC_LANG_POP |
| 20866 | ])# _LT_LANG_CXX_CONFIG |
| 20867 | |
| 20868 | |
| 20869 | +# _LT_FUNC_STRIPNAME_CNF |
| 20870 | +# ---------------------- |
| 20871 | +# func_stripname_cnf prefix suffix name |
| 20872 | +# strip PREFIX and SUFFIX off of NAME. |
| 20873 | +# PREFIX and SUFFIX must not contain globbing or regex special |
| 20874 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 20875 | +# dot (in which case that matches only a dot). |
| 20876 | +# |
| 20877 | +# This function is identical to the (non-XSI) version of func_stripname, |
| 20878 | +# except this one can be used by m4 code that may be executed by configure, |
| 20879 | +# rather than the libtool script. |
| 20880 | +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl |
| 20881 | +AC_REQUIRE([_LT_DECL_SED]) |
| 20882 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) |
| 20883 | +func_stripname_cnf () |
| 20884 | +{ |
| 20885 | + case ${2} in |
| 20886 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 20887 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 20888 | + esac |
| 20889 | +} # func_stripname_cnf |
| 20890 | +])# _LT_FUNC_STRIPNAME_CNF |
| 20891 | + |
| 20892 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
| 20893 | # --------------------------------- |
| 20894 | # Figure out "hidden" library dependencies from verbose |
| 20895 | @@ -6481,6 +6879,7 @@ AC_LANG_POP |
| 20896 | # objects, libraries and library flags. |
| 20897 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
| 20898 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 20899 | +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl |
| 20900 | # Dependencies to place before and after the object being linked: |
| 20901 | _LT_TAGVAR(predep_objects, $1)= |
| 20902 | _LT_TAGVAR(postdep_objects, $1)= |
| 20903 | @@ -6531,6 +6930,13 @@ public class foo { |
| 20904 | }; |
| 20905 | _LT_EOF |
| 20906 | ]) |
| 20907 | + |
| 20908 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
| 20909 | +case "$CC $CFLAGS " in #( |
| 20910 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
| 20911 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
| 20912 | +esac |
| 20913 | + |
| 20914 | dnl Parse the compiler output and extract the necessary |
| 20915 | dnl objects, libraries and library flags. |
| 20916 | if AC_TRY_EVAL(ac_compile); then |
| 20917 | @@ -6542,7 +6948,7 @@ if AC_TRY_EVAL(ac_compile); then |
| 20918 | pre_test_object_deps_done=no |
| 20919 | |
| 20920 | for p in `eval "$output_verbose_link_cmd"`; do |
| 20921 | - case $p in |
| 20922 | + case ${prev}${p} in |
| 20923 | |
| 20924 | -L* | -R* | -l*) |
| 20925 | # Some compilers place space between "-{L,R}" and the path. |
| 20926 | @@ -6551,13 +6957,22 @@ if AC_TRY_EVAL(ac_compile); then |
| 20927 | test $p = "-R"; then |
| 20928 | prev=$p |
| 20929 | continue |
| 20930 | - else |
| 20931 | - prev= |
| 20932 | fi |
| 20933 | |
| 20934 | + # Expand the sysroot to ease extracting the directories later. |
| 20935 | + if test -z "$prev"; then |
| 20936 | + case $p in |
| 20937 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
| 20938 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
| 20939 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
| 20940 | + esac |
| 20941 | + fi |
| 20942 | + case $p in |
| 20943 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
| 20944 | + esac |
| 20945 | if test "$pre_test_object_deps_done" = no; then |
| 20946 | - case $p in |
| 20947 | - -L* | -R*) |
| 20948 | + case ${prev} in |
| 20949 | + -L | -R) |
| 20950 | # Internal compiler library paths should come after those |
| 20951 | # provided the user. The postdeps already come after the |
| 20952 | # user supplied libs so there is no need to process them. |
| 20953 | @@ -6577,8 +6992,10 @@ if AC_TRY_EVAL(ac_compile); then |
| 20954 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
| 20955 | fi |
| 20956 | fi |
| 20957 | + prev= |
| 20958 | ;; |
| 20959 | |
| 20960 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
| 20961 | *.$objext) |
| 20962 | # This assumes that the test object file only shows up |
| 20963 | # once in the compiler output. |
| 20964 | @@ -6614,6 +7031,7 @@ else |
| 20965 | fi |
| 20966 | |
| 20967 | $RM -f confest.$objext |
| 20968 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
| 20969 | |
| 20970 | # PORTME: override above test on systems where it is broken |
| 20971 | m4_if([$1], [CXX], |
| 20972 | @@ -6650,7 +7068,7 @@ linux*) |
| 20973 | |
| 20974 | solaris*) |
| 20975 | case $cc_basename in |
| 20976 | - CC*) |
| 20977 | + CC* | sunCC*) |
| 20978 | # The more standards-conforming stlport4 library is |
| 20979 | # incompatible with the Cstd library. Avoid specifying |
| 20980 | # it if it's in CXXFLAGS. Ignore libCrun as |
| 20981 | @@ -6763,7 +7181,9 @@ if test "$_lt_disable_F77" != yes; then |
| 20982 | # Allow CC to be a program name with arguments. |
| 20983 | lt_save_CC="$CC" |
| 20984 | lt_save_GCC=$GCC |
| 20985 | + lt_save_CFLAGS=$CFLAGS |
| 20986 | CC=${F77-"f77"} |
| 20987 | + CFLAGS=$FFLAGS |
| 20988 | compiler=$CC |
| 20989 | _LT_TAGVAR(compiler, $1)=$CC |
| 20990 | _LT_CC_BASENAME([$compiler]) |
| 20991 | @@ -6817,6 +7237,7 @@ if test "$_lt_disable_F77" != yes; then |
| 20992 | |
| 20993 | GCC=$lt_save_GCC |
| 20994 | CC="$lt_save_CC" |
| 20995 | + CFLAGS="$lt_save_CFLAGS" |
| 20996 | fi # test "$_lt_disable_F77" != yes |
| 20997 | |
| 20998 | AC_LANG_POP |
| 20999 | @@ -6893,7 +7314,9 @@ if test "$_lt_disable_FC" != yes; then |
| 21000 | # Allow CC to be a program name with arguments. |
| 21001 | lt_save_CC="$CC" |
| 21002 | lt_save_GCC=$GCC |
| 21003 | + lt_save_CFLAGS=$CFLAGS |
| 21004 | CC=${FC-"f95"} |
| 21005 | + CFLAGS=$FCFLAGS |
| 21006 | compiler=$CC |
| 21007 | GCC=$ac_cv_fc_compiler_gnu |
| 21008 | |
| 21009 | @@ -6949,7 +7372,8 @@ if test "$_lt_disable_FC" != yes; then |
| 21010 | fi # test -n "$compiler" |
| 21011 | |
| 21012 | GCC=$lt_save_GCC |
| 21013 | - CC="$lt_save_CC" |
| 21014 | + CC=$lt_save_CC |
| 21015 | + CFLAGS=$lt_save_CFLAGS |
| 21016 | fi # test "$_lt_disable_FC" != yes |
| 21017 | |
| 21018 | AC_LANG_POP |
| 21019 | @@ -6986,10 +7410,12 @@ _LT_COMPILER_BOILERPLATE |
| 21020 | _LT_LINKER_BOILERPLATE |
| 21021 | |
| 21022 | # Allow CC to be a program name with arguments. |
| 21023 | -lt_save_CC="$CC" |
| 21024 | +lt_save_CC=$CC |
| 21025 | +lt_save_CFLAGS=$CFLAGS |
| 21026 | lt_save_GCC=$GCC |
| 21027 | GCC=yes |
| 21028 | CC=${GCJ-"gcj"} |
| 21029 | +CFLAGS=$GCJFLAGS |
| 21030 | compiler=$CC |
| 21031 | _LT_TAGVAR(compiler, $1)=$CC |
| 21032 | _LT_TAGVAR(LD, $1)="$LD" |
| 21033 | @@ -7020,7 +7446,8 @@ fi |
| 21034 | AC_LANG_RESTORE |
| 21035 | |
| 21036 | GCC=$lt_save_GCC |
| 21037 | -CC="$lt_save_CC" |
| 21038 | +CC=$lt_save_CC |
| 21039 | +CFLAGS=$lt_save_CFLAGS |
| 21040 | ])# _LT_LANG_GCJ_CONFIG |
| 21041 | |
| 21042 | |
| 21043 | @@ -7055,9 +7482,11 @@ _LT_LINKER_BOILERPLATE |
| 21044 | |
| 21045 | # Allow CC to be a program name with arguments. |
| 21046 | lt_save_CC="$CC" |
| 21047 | +lt_save_CFLAGS=$CFLAGS |
| 21048 | lt_save_GCC=$GCC |
| 21049 | GCC= |
| 21050 | CC=${RC-"windres"} |
| 21051 | +CFLAGS= |
| 21052 | compiler=$CC |
| 21053 | _LT_TAGVAR(compiler, $1)=$CC |
| 21054 | _LT_CC_BASENAME([$compiler]) |
| 21055 | @@ -7070,7 +7499,8 @@ fi |
| 21056 | |
| 21057 | GCC=$lt_save_GCC |
| 21058 | AC_LANG_RESTORE |
| 21059 | -CC="$lt_save_CC" |
| 21060 | +CC=$lt_save_CC |
| 21061 | +CFLAGS=$lt_save_CFLAGS |
| 21062 | ])# _LT_LANG_RC_CONFIG |
| 21063 | |
| 21064 | |
| 21065 | @@ -7129,6 +7559,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) |
| 21066 | AC_SUBST([OBJDUMP]) |
| 21067 | ]) |
| 21068 | |
| 21069 | +# _LT_DECL_DLLTOOL |
| 21070 | +# ---------------- |
| 21071 | +# Ensure DLLTOOL variable is set. |
| 21072 | +m4_defun([_LT_DECL_DLLTOOL], |
| 21073 | +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
| 21074 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 21075 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) |
| 21076 | +AC_SUBST([DLLTOOL]) |
| 21077 | +]) |
| 21078 | |
| 21079 | # _LT_DECL_SED |
| 21080 | # ------------ |
| 21081 | @@ -7222,8 +7661,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], |
| 21082 | # Try some XSI features |
| 21083 | xsi_shell=no |
| 21084 | ( _lt_dummy="a/b/c" |
| 21085 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 21086 | - = c,a/b,, \ |
| 21087 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 21088 | + = c,a/b,b/c, \ |
| 21089 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 21090 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 21091 | && xsi_shell=yes |
| 21092 | @@ -7262,206 +7701,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl |
| 21093 | ])# _LT_CHECK_SHELL_FEATURES |
| 21094 | |
| 21095 | |
| 21096 | -# _LT_PROG_XSI_SHELLFNS |
| 21097 | -# --------------------- |
| 21098 | -# Bourne and XSI compatible variants of some useful shell functions. |
| 21099 | -m4_defun([_LT_PROG_XSI_SHELLFNS], |
| 21100 | -[case $xsi_shell in |
| 21101 | - yes) |
| 21102 | - cat << \_LT_EOF >> "$cfgfile" |
| 21103 | - |
| 21104 | -# func_dirname file append nondir_replacement |
| 21105 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 21106 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 21107 | -func_dirname () |
| 21108 | -{ |
| 21109 | - case ${1} in |
| 21110 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 21111 | - * ) func_dirname_result="${3}" ;; |
| 21112 | - esac |
| 21113 | -} |
| 21114 | - |
| 21115 | -# func_basename file |
| 21116 | -func_basename () |
| 21117 | -{ |
| 21118 | - func_basename_result="${1##*/}" |
| 21119 | -} |
| 21120 | - |
| 21121 | -# func_dirname_and_basename file append nondir_replacement |
| 21122 | -# perform func_basename and func_dirname in a single function |
| 21123 | -# call: |
| 21124 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 21125 | -# add APPEND to the result, otherwise set result |
| 21126 | -# to NONDIR_REPLACEMENT. |
| 21127 | -# value returned in "$func_dirname_result" |
| 21128 | -# basename: Compute filename of FILE. |
| 21129 | -# value retuned in "$func_basename_result" |
| 21130 | -# Implementation must be kept synchronized with func_dirname |
| 21131 | -# and func_basename. For efficiency, we do not delegate to |
| 21132 | -# those functions but instead duplicate the functionality here. |
| 21133 | -func_dirname_and_basename () |
| 21134 | -{ |
| 21135 | - case ${1} in |
| 21136 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 21137 | - * ) func_dirname_result="${3}" ;; |
| 21138 | - esac |
| 21139 | - func_basename_result="${1##*/}" |
| 21140 | -} |
| 21141 | - |
| 21142 | -# func_stripname prefix suffix name |
| 21143 | -# strip PREFIX and SUFFIX off of NAME. |
| 21144 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 21145 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 21146 | -# dot (in which case that matches only a dot). |
| 21147 | -func_stripname () |
| 21148 | -{ |
| 21149 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 21150 | - # positional parameters, so assign one to ordinary parameter first. |
| 21151 | - func_stripname_result=${3} |
| 21152 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 21153 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 21154 | -} |
| 21155 | - |
| 21156 | -# func_opt_split |
| 21157 | -func_opt_split () |
| 21158 | -{ |
| 21159 | - func_opt_split_opt=${1%%=*} |
| 21160 | - func_opt_split_arg=${1#*=} |
| 21161 | -} |
| 21162 | - |
| 21163 | -# func_lo2o object |
| 21164 | -func_lo2o () |
| 21165 | -{ |
| 21166 | - case ${1} in |
| 21167 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 21168 | - *) func_lo2o_result=${1} ;; |
| 21169 | - esac |
| 21170 | -} |
| 21171 | - |
| 21172 | -# func_xform libobj-or-source |
| 21173 | -func_xform () |
| 21174 | -{ |
| 21175 | - func_xform_result=${1%.*}.lo |
| 21176 | -} |
| 21177 | - |
| 21178 | -# func_arith arithmetic-term... |
| 21179 | -func_arith () |
| 21180 | -{ |
| 21181 | - func_arith_result=$(( $[*] )) |
| 21182 | -} |
| 21183 | - |
| 21184 | -# func_len string |
| 21185 | -# STRING may not start with a hyphen. |
| 21186 | -func_len () |
| 21187 | -{ |
| 21188 | - func_len_result=${#1} |
| 21189 | -} |
| 21190 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
| 21191 | +# ------------------------------------------------------ |
| 21192 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
| 21193 | +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
| 21194 | +m4_defun([_LT_PROG_FUNCTION_REPLACE], |
| 21195 | +[dnl { |
| 21196 | +sed -e '/^$1 ()$/,/^} # $1 /c\ |
| 21197 | +$1 ()\ |
| 21198 | +{\ |
| 21199 | +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
| 21200 | +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21201 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21202 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21203 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21204 | +]) |
| 21205 | |
| 21206 | -_LT_EOF |
| 21207 | - ;; |
| 21208 | - *) # Bourne compatible functions. |
| 21209 | - cat << \_LT_EOF >> "$cfgfile" |
| 21210 | |
| 21211 | -# func_dirname file append nondir_replacement |
| 21212 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 21213 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 21214 | -func_dirname () |
| 21215 | -{ |
| 21216 | - # Extract subdirectory from the argument. |
| 21217 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 21218 | - if test "X$func_dirname_result" = "X${1}"; then |
| 21219 | - func_dirname_result="${3}" |
| 21220 | - else |
| 21221 | - func_dirname_result="$func_dirname_result${2}" |
| 21222 | - fi |
| 21223 | -} |
| 21224 | +# _LT_PROG_REPLACE_SHELLFNS |
| 21225 | +# ------------------------- |
| 21226 | +# Replace existing portable implementations of several shell functions with |
| 21227 | +# equivalent extended shell implementations where those features are available.. |
| 21228 | +m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
| 21229 | +[if test x"$xsi_shell" = xyes; then |
| 21230 | + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
| 21231 | + case ${1} in |
| 21232 | + */*) func_dirname_result="${1%/*}${2}" ;; |
| 21233 | + * ) func_dirname_result="${3}" ;; |
| 21234 | + esac]) |
| 21235 | + |
| 21236 | + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
| 21237 | + func_basename_result="${1##*/}"]) |
| 21238 | + |
| 21239 | + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
| 21240 | + case ${1} in |
| 21241 | + */*) func_dirname_result="${1%/*}${2}" ;; |
| 21242 | + * ) func_dirname_result="${3}" ;; |
| 21243 | + esac |
| 21244 | + func_basename_result="${1##*/}"]) |
| 21245 | |
| 21246 | -# func_basename file |
| 21247 | -func_basename () |
| 21248 | -{ |
| 21249 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 21250 | -} |
| 21251 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
| 21252 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 21253 | + # positional parameters, so assign one to ordinary parameter first. |
| 21254 | + func_stripname_result=${3} |
| 21255 | + func_stripname_result=${func_stripname_result#"${1}"} |
| 21256 | + func_stripname_result=${func_stripname_result%"${2}"}]) |
| 21257 | |
| 21258 | -dnl func_dirname_and_basename |
| 21259 | -dnl A portable version of this function is already defined in general.m4sh |
| 21260 | -dnl so there is no need for it here. |
| 21261 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
| 21262 | + func_split_long_opt_name=${1%%=*} |
| 21263 | + func_split_long_opt_arg=${1#*=}]) |
| 21264 | |
| 21265 | -# func_stripname prefix suffix name |
| 21266 | -# strip PREFIX and SUFFIX off of NAME. |
| 21267 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 21268 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 21269 | -# dot (in which case that matches only a dot). |
| 21270 | -# func_strip_suffix prefix name |
| 21271 | -func_stripname () |
| 21272 | -{ |
| 21273 | - case ${2} in |
| 21274 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 21275 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 21276 | - esac |
| 21277 | -} |
| 21278 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
| 21279 | + func_split_short_opt_arg=${1#??} |
| 21280 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
| 21281 | |
| 21282 | -# sed scripts: |
| 21283 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' |
| 21284 | -my_sed_long_arg='1s/^-[[^=]]*=//' |
| 21285 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
| 21286 | + case ${1} in |
| 21287 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 21288 | + *) func_lo2o_result=${1} ;; |
| 21289 | + esac]) |
| 21290 | |
| 21291 | -# func_opt_split |
| 21292 | -func_opt_split () |
| 21293 | -{ |
| 21294 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 21295 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 21296 | -} |
| 21297 | + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
| 21298 | |
| 21299 | -# func_lo2o object |
| 21300 | -func_lo2o () |
| 21301 | -{ |
| 21302 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 21303 | -} |
| 21304 | + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) |
| 21305 | |
| 21306 | -# func_xform libobj-or-source |
| 21307 | -func_xform () |
| 21308 | -{ |
| 21309 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` |
| 21310 | -} |
| 21311 | + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) |
| 21312 | +fi |
| 21313 | |
| 21314 | -# func_arith arithmetic-term... |
| 21315 | -func_arith () |
| 21316 | -{ |
| 21317 | - func_arith_result=`expr "$[@]"` |
| 21318 | -} |
| 21319 | +if test x"$lt_shell_append" = xyes; then |
| 21320 | + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) |
| 21321 | |
| 21322 | -# func_len string |
| 21323 | -# STRING may not start with a hyphen. |
| 21324 | -func_len () |
| 21325 | -{ |
| 21326 | - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 21327 | -} |
| 21328 | + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl |
| 21329 | + func_quote_for_eval "${2}" |
| 21330 | +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ |
| 21331 | + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) |
| 21332 | |
| 21333 | -_LT_EOF |
| 21334 | -esac |
| 21335 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 21336 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 21337 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21338 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21339 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 21340 | +else |
| 21341 | + # Save a `func_append' function call even when '+=' is not available |
| 21342 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 21343 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21344 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21345 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 21346 | +fi |
| 21347 | |
| 21348 | -case $lt_shell_append in |
| 21349 | - yes) |
| 21350 | - cat << \_LT_EOF >> "$cfgfile" |
| 21351 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 21352 | + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) |
| 21353 | +fi |
| 21354 | +]) |
| 21355 | |
| 21356 | -# func_append var value |
| 21357 | -# Append VALUE to the end of shell variable VAR. |
| 21358 | -func_append () |
| 21359 | -{ |
| 21360 | - eval "$[1]+=\$[2]" |
| 21361 | -} |
| 21362 | -_LT_EOF |
| 21363 | +# _LT_PATH_CONVERSION_FUNCTIONS |
| 21364 | +# ----------------------------- |
| 21365 | +# Determine which file name conversion functions should be used by |
| 21366 | +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed |
| 21367 | +# for certain cross-compile configurations and native mingw. |
| 21368 | +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], |
| 21369 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
| 21370 | +AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
| 21371 | +AC_MSG_CHECKING([how to convert $build file names to $host format]) |
| 21372 | +AC_CACHE_VAL(lt_cv_to_host_file_cmd, |
| 21373 | +[case $host in |
| 21374 | + *-*-mingw* ) |
| 21375 | + case $build in |
| 21376 | + *-*-mingw* ) # actually msys |
| 21377 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 21378 | + ;; |
| 21379 | + *-*-cygwin* ) |
| 21380 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 21381 | + ;; |
| 21382 | + * ) # otherwise, assume *nix |
| 21383 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 21384 | + ;; |
| 21385 | + esac |
| 21386 | ;; |
| 21387 | - *) |
| 21388 | - cat << \_LT_EOF >> "$cfgfile" |
| 21389 | - |
| 21390 | -# func_append var value |
| 21391 | -# Append VALUE to the end of shell variable VAR. |
| 21392 | -func_append () |
| 21393 | -{ |
| 21394 | - eval "$[1]=\$$[1]\$[2]" |
| 21395 | -} |
| 21396 | - |
| 21397 | -_LT_EOF |
| 21398 | + *-*-cygwin* ) |
| 21399 | + case $build in |
| 21400 | + *-*-mingw* ) # actually msys |
| 21401 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 21402 | + ;; |
| 21403 | + *-*-cygwin* ) |
| 21404 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 21405 | + ;; |
| 21406 | + * ) # otherwise, assume *nix |
| 21407 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 21408 | + ;; |
| 21409 | + esac |
| 21410 | ;; |
| 21411 | - esac |
| 21412 | + * ) # unhandled hosts (and "normal" native builds) |
| 21413 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 21414 | + ;; |
| 21415 | +esac |
| 21416 | +]) |
| 21417 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 21418 | +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) |
| 21419 | +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], |
| 21420 | + [0], [convert $build file names to $host format])dnl |
| 21421 | + |
| 21422 | +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) |
| 21423 | +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, |
| 21424 | +[#assume ordinary cross tools, or native build. |
| 21425 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 21426 | +case $host in |
| 21427 | + *-*-mingw* ) |
| 21428 | + case $build in |
| 21429 | + *-*-mingw* ) # actually msys |
| 21430 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 21431 | + ;; |
| 21432 | + esac |
| 21433 | + ;; |
| 21434 | +esac |
| 21435 | ]) |
| 21436 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 21437 | +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) |
| 21438 | +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], |
| 21439 | + [0], [convert $build files to toolchain format])dnl |
| 21440 | +])# _LT_PATH_CONVERSION_FUNCTIONS |
| 21441 | diff --git a/ltmain.sh b/ltmain.sh |
| 21442 | index 9503ec85d70..70e856e0659 100644 |
| 21443 | --- a/ltmain.sh |
| 21444 | +++ b/ltmain.sh |
| 21445 | @@ -1,10 +1,9 @@ |
| 21446 | -# Generated from ltmain.m4sh. |
| 21447 | |
| 21448 | -# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a |
| 21449 | +# libtool (GNU libtool) 2.4 |
| 21450 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
| 21451 | |
| 21452 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
| 21453 | -# 2007, 2008, 2009 Free Software Foundation, Inc. |
| 21454 | +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 21455 | # This is free software; see the source for copying conditions. There is NO |
| 21456 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 21457 | |
| 21458 | @@ -38,7 +37,6 @@ |
| 21459 | # -n, --dry-run display commands without modifying any files |
| 21460 | # --features display basic configuration information and exit |
| 21461 | # --mode=MODE use operation mode MODE |
| 21462 | -# --no-finish let install mode avoid finish commands |
| 21463 | # --preserve-dup-deps don't remove duplicate dependency libraries |
| 21464 | # --quiet, --silent don't print informational messages |
| 21465 | # --no-quiet, --no-silent |
| 21466 | @@ -71,17 +69,19 @@ |
| 21467 | # compiler: $LTCC |
| 21468 | # compiler flags: $LTCFLAGS |
| 21469 | # linker: $LD (gnu? $with_gnu_ld) |
| 21470 | -# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a |
| 21471 | +# $progname: (GNU libtool) 2.4 |
| 21472 | # automake: $automake_version |
| 21473 | # autoconf: $autoconf_version |
| 21474 | # |
| 21475 | # Report bugs to <bug-libtool@gnu.org>. |
| 21476 | +# GNU libtool home page: <http://www.gnu.org/software/libtool/>. |
| 21477 | +# General help using GNU software: <http://www.gnu.org/gethelp/>. |
| 21478 | |
| 21479 | PROGRAM=libtool |
| 21480 | PACKAGE=libtool |
| 21481 | -VERSION=2.2.7a |
| 21482 | -TIMESTAMP=" 1.3134 2009-11-29" |
| 21483 | -package_revision=1.3134 |
| 21484 | +VERSION=2.4 |
| 21485 | +TIMESTAMP="" |
| 21486 | +package_revision=1.3293 |
| 21487 | |
| 21488 | # Be Bourne compatible |
| 21489 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
| 21490 | @@ -106,9 +106,6 @@ _LTECHO_EOF' |
| 21491 | } |
| 21492 | |
| 21493 | # NLS nuisances: We save the old values to restore during execute mode. |
| 21494 | -# Only set LANG and LC_ALL to C if already set. |
| 21495 | -# These must not be set unconditionally because not all systems understand |
| 21496 | -# e.g. LANG=C (notably SCO). |
| 21497 | lt_user_locale= |
| 21498 | lt_safe_locale= |
| 21499 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES |
| 21500 | @@ -121,15 +118,13 @@ do |
| 21501 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" |
| 21502 | fi" |
| 21503 | done |
| 21504 | +LC_ALL=C |
| 21505 | +LANGUAGE=C |
| 21506 | +export LANGUAGE LC_ALL |
| 21507 | |
| 21508 | $lt_unset CDPATH |
| 21509 | |
| 21510 | |
| 21511 | - |
| 21512 | - |
| 21513 | - |
| 21514 | - |
| 21515 | - |
| 21516 | # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh |
| 21517 | # is ksh but when the shell is invoked as "sh" and the current value of |
| 21518 | # the _XPG environment variable is not equal to 1 (one), the special |
| 21519 | @@ -140,7 +135,7 @@ progpath="$0" |
| 21520 | |
| 21521 | |
| 21522 | : ${CP="cp -f"} |
| 21523 | -: ${ECHO=$as_echo} |
| 21524 | +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
| 21525 | : ${EGREP="/bin/grep -E"} |
| 21526 | : ${FGREP="/bin/grep -F"} |
| 21527 | : ${GREP="/bin/grep"} |
| 21528 | @@ -149,7 +144,7 @@ progpath="$0" |
| 21529 | : ${MKDIR="mkdir"} |
| 21530 | : ${MV="mv -f"} |
| 21531 | : ${RM="rm -f"} |
| 21532 | -: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} |
| 21533 | +: ${SED="/bin/sed"} |
| 21534 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
| 21535 | : ${Xsed="$SED -e 1s/^X//"} |
| 21536 | |
| 21537 | @@ -169,6 +164,27 @@ IFS=" $lt_nl" |
| 21538 | dirname="s,/[^/]*$,," |
| 21539 | basename="s,^.*/,," |
| 21540 | |
| 21541 | +# func_dirname file append nondir_replacement |
| 21542 | +# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 21543 | +# otherwise set result to NONDIR_REPLACEMENT. |
| 21544 | +func_dirname () |
| 21545 | +{ |
| 21546 | + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 21547 | + if test "X$func_dirname_result" = "X${1}"; then |
| 21548 | + func_dirname_result="${3}" |
| 21549 | + else |
| 21550 | + func_dirname_result="$func_dirname_result${2}" |
| 21551 | + fi |
| 21552 | +} # func_dirname may be replaced by extended shell implementation |
| 21553 | + |
| 21554 | + |
| 21555 | +# func_basename file |
| 21556 | +func_basename () |
| 21557 | +{ |
| 21558 | + func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 21559 | +} # func_basename may be replaced by extended shell implementation |
| 21560 | + |
| 21561 | + |
| 21562 | # func_dirname_and_basename file append nondir_replacement |
| 21563 | # perform func_basename and func_dirname in a single function |
| 21564 | # call: |
| 21565 | @@ -183,17 +199,31 @@ basename="s,^.*/,," |
| 21566 | # those functions but instead duplicate the functionality here. |
| 21567 | func_dirname_and_basename () |
| 21568 | { |
| 21569 | - # Extract subdirectory from the argument. |
| 21570 | - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` |
| 21571 | - if test "X$func_dirname_result" = "X${1}"; then |
| 21572 | - func_dirname_result="${3}" |
| 21573 | - else |
| 21574 | - func_dirname_result="$func_dirname_result${2}" |
| 21575 | - fi |
| 21576 | - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` |
| 21577 | -} |
| 21578 | + # Extract subdirectory from the argument. |
| 21579 | + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` |
| 21580 | + if test "X$func_dirname_result" = "X${1}"; then |
| 21581 | + func_dirname_result="${3}" |
| 21582 | + else |
| 21583 | + func_dirname_result="$func_dirname_result${2}" |
| 21584 | + fi |
| 21585 | + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` |
| 21586 | +} # func_dirname_and_basename may be replaced by extended shell implementation |
| 21587 | + |
| 21588 | + |
| 21589 | +# func_stripname prefix suffix name |
| 21590 | +# strip PREFIX and SUFFIX off of NAME. |
| 21591 | +# PREFIX and SUFFIX must not contain globbing or regex special |
| 21592 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 21593 | +# dot (in which case that matches only a dot). |
| 21594 | +# func_strip_suffix prefix name |
| 21595 | +func_stripname () |
| 21596 | +{ |
| 21597 | + case ${2} in |
| 21598 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 21599 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 21600 | + esac |
| 21601 | +} # func_stripname may be replaced by extended shell implementation |
| 21602 | |
| 21603 | -# Generated shell functions inserted here. |
| 21604 | |
| 21605 | # These SED scripts presuppose an absolute path with a trailing slash. |
| 21606 | pathcar='s,^/\([^/]*\).*$,\1,' |
| 21607 | @@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' |
| 21608 | # Same as above, but do not quote variable references. |
| 21609 | double_quote_subst='s/\(["`\\]\)/\\\1/g' |
| 21610 | |
| 21611 | +# Sed substitution that turns a string into a regex matching for the |
| 21612 | +# string literally. |
| 21613 | +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' |
| 21614 | + |
| 21615 | +# Sed substitution that converts a w32 file name or path |
| 21616 | +# which contains forward slashes, into one that contains |
| 21617 | +# (escaped) backslashes. A very naive implementation. |
| 21618 | +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 21619 | + |
| 21620 | # Re-`\' parameter expansions in output of double_quote_subst that were |
| 21621 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' |
| 21622 | # in input to double_quote_subst, that '$' was protected from expansion. |
| 21623 | @@ -404,7 +443,7 @@ opt_warning=: |
| 21624 | # name if it has been set yet. |
| 21625 | func_echo () |
| 21626 | { |
| 21627 | - $ECHO "$progname${mode+: }$mode: $*" |
| 21628 | + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" |
| 21629 | } |
| 21630 | |
| 21631 | # func_verbose arg... |
| 21632 | @@ -430,14 +469,14 @@ func_echo_all () |
| 21633 | # Echo program name prefixed message to standard error. |
| 21634 | func_error () |
| 21635 | { |
| 21636 | - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 |
| 21637 | + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 |
| 21638 | } |
| 21639 | |
| 21640 | # func_warning arg... |
| 21641 | # Echo program name prefixed warning message to standard error. |
| 21642 | func_warning () |
| 21643 | { |
| 21644 | - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 |
| 21645 | + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 |
| 21646 | |
| 21647 | # bash bug again: |
| 21648 | : |
| 21649 | @@ -656,19 +695,35 @@ func_show_eval_locale () |
| 21650 | fi |
| 21651 | } |
| 21652 | |
| 21653 | - |
| 21654 | - |
| 21655 | +# func_tr_sh |
| 21656 | +# Turn $1 into a string suitable for a shell variable name. |
| 21657 | +# Result is stored in $func_tr_sh_result. All characters |
| 21658 | +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, |
| 21659 | +# if $1 begins with a digit, a '_' is prepended as well. |
| 21660 | +func_tr_sh () |
| 21661 | +{ |
| 21662 | + case $1 in |
| 21663 | + [0-9]* | *[!a-zA-Z0-9_]*) |
| 21664 | + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` |
| 21665 | + ;; |
| 21666 | + * ) |
| 21667 | + func_tr_sh_result=$1 |
| 21668 | + ;; |
| 21669 | + esac |
| 21670 | +} |
| 21671 | |
| 21672 | |
| 21673 | # func_version |
| 21674 | # Echo version message to standard output and exit. |
| 21675 | func_version () |
| 21676 | { |
| 21677 | + $opt_debug |
| 21678 | + |
| 21679 | $SED -n '/(C)/!b go |
| 21680 | :more |
| 21681 | /\./!{ |
| 21682 | N |
| 21683 | - s/\n# // |
| 21684 | + s/\n# / / |
| 21685 | b more |
| 21686 | } |
| 21687 | :go |
| 21688 | @@ -685,7 +740,9 @@ func_version () |
| 21689 | # Echo short help message to standard output and exit. |
| 21690 | func_usage () |
| 21691 | { |
| 21692 | - $SED -n '/^# Usage:/,/^# *-h/ { |
| 21693 | + $opt_debug |
| 21694 | + |
| 21695 | + $SED -n '/^# Usage:/,/^# *.*--help/ { |
| 21696 | s/^# // |
| 21697 | s/^# *$// |
| 21698 | s/\$progname/'$progname'/ |
| 21699 | @@ -701,7 +758,10 @@ func_usage () |
| 21700 | # unless 'noexit' is passed as argument. |
| 21701 | func_help () |
| 21702 | { |
| 21703 | + $opt_debug |
| 21704 | + |
| 21705 | $SED -n '/^# Usage:/,/# Report bugs to/ { |
| 21706 | + :print |
| 21707 | s/^# // |
| 21708 | s/^# *$// |
| 21709 | s*\$progname*'$progname'* |
| 21710 | @@ -714,7 +774,11 @@ func_help () |
| 21711 | s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ |
| 21712 | s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ |
| 21713 | p |
| 21714 | - }' < "$progpath" |
| 21715 | + d |
| 21716 | + } |
| 21717 | + /^# .* home page:/b print |
| 21718 | + /^# General help using/b print |
| 21719 | + ' < "$progpath" |
| 21720 | ret=$? |
| 21721 | if test -z "$1"; then |
| 21722 | exit $ret |
| 21723 | @@ -726,12 +790,39 @@ func_help () |
| 21724 | # exit_cmd. |
| 21725 | func_missing_arg () |
| 21726 | { |
| 21727 | - func_error "missing argument for $1" |
| 21728 | + $opt_debug |
| 21729 | + |
| 21730 | + func_error "missing argument for $1." |
| 21731 | exit_cmd=exit |
| 21732 | } |
| 21733 | |
| 21734 | -exit_cmd=: |
| 21735 | |
| 21736 | +# func_split_short_opt shortopt |
| 21737 | +# Set func_split_short_opt_name and func_split_short_opt_arg shell |
| 21738 | +# variables after splitting SHORTOPT after the 2nd character. |
| 21739 | +func_split_short_opt () |
| 21740 | +{ |
| 21741 | + my_sed_short_opt='1s/^\(..\).*$/\1/;q' |
| 21742 | + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' |
| 21743 | + |
| 21744 | + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` |
| 21745 | + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` |
| 21746 | +} # func_split_short_opt may be replaced by extended shell implementation |
| 21747 | + |
| 21748 | + |
| 21749 | +# func_split_long_opt longopt |
| 21750 | +# Set func_split_long_opt_name and func_split_long_opt_arg shell |
| 21751 | +# variables after splitting LONGOPT at the `=' sign. |
| 21752 | +func_split_long_opt () |
| 21753 | +{ |
| 21754 | + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' |
| 21755 | + my_sed_long_arg='1s/^--[^=]*=//' |
| 21756 | + |
| 21757 | + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` |
| 21758 | + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` |
| 21759 | +} # func_split_long_opt may be replaced by extended shell implementation |
| 21760 | + |
| 21761 | +exit_cmd=: |
| 21762 | |
| 21763 | |
| 21764 | |
| 21765 | @@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" |
| 21766 | magic_exe="%%%MAGIC EXE variable%%%" |
| 21767 | |
| 21768 | # Global variables. |
| 21769 | -# $mode is unset |
| 21770 | nonopt= |
| 21771 | -execute_dlfiles= |
| 21772 | preserve_args= |
| 21773 | lo2o="s/\\.lo\$/.${objext}/" |
| 21774 | o2lo="s/\\.${objext}\$/.lo/" |
| 21775 | extracted_archives= |
| 21776 | extracted_serial=0 |
| 21777 | |
| 21778 | -opt_dry_run=false |
| 21779 | -opt_finish=: |
| 21780 | -opt_duplicate_deps=false |
| 21781 | -opt_silent=false |
| 21782 | -opt_debug=: |
| 21783 | - |
| 21784 | # If this variable is set in any of the actions, the command in it |
| 21785 | # will be execed at the end. This prevents here-documents from being |
| 21786 | # left over by shells. |
| 21787 | exec_cmd= |
| 21788 | |
| 21789 | +# func_append var value |
| 21790 | +# Append VALUE to the end of shell variable VAR. |
| 21791 | +func_append () |
| 21792 | +{ |
| 21793 | + eval "${1}=\$${1}\${2}" |
| 21794 | +} # func_append may be replaced by extended shell implementation |
| 21795 | + |
| 21796 | +# func_append_quoted var value |
| 21797 | +# Quote VALUE and append to the end of shell variable VAR, separated |
| 21798 | +# by a space. |
| 21799 | +func_append_quoted () |
| 21800 | +{ |
| 21801 | + func_quote_for_eval "${2}" |
| 21802 | + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" |
| 21803 | +} # func_append_quoted may be replaced by extended shell implementation |
| 21804 | + |
| 21805 | + |
| 21806 | +# func_arith arithmetic-term... |
| 21807 | +func_arith () |
| 21808 | +{ |
| 21809 | + func_arith_result=`expr "${@}"` |
| 21810 | +} # func_arith may be replaced by extended shell implementation |
| 21811 | + |
| 21812 | + |
| 21813 | +# func_len string |
| 21814 | +# STRING may not start with a hyphen. |
| 21815 | +func_len () |
| 21816 | +{ |
| 21817 | + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 21818 | +} # func_len may be replaced by extended shell implementation |
| 21819 | + |
| 21820 | + |
| 21821 | +# func_lo2o object |
| 21822 | +func_lo2o () |
| 21823 | +{ |
| 21824 | + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 21825 | +} # func_lo2o may be replaced by extended shell implementation |
| 21826 | + |
| 21827 | + |
| 21828 | +# func_xform libobj-or-source |
| 21829 | +func_xform () |
| 21830 | +{ |
| 21831 | + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 21832 | +} # func_xform may be replaced by extended shell implementation |
| 21833 | + |
| 21834 | + |
| 21835 | # func_fatal_configuration arg... |
| 21836 | # Echo program name prefixed message to standard error, followed by |
| 21837 | # a configuration failure hint, and exit. |
| 21838 | @@ -850,130 +979,204 @@ func_enable_tag () |
| 21839 | esac |
| 21840 | } |
| 21841 | |
| 21842 | -# Parse options once, thoroughly. This comes as soon as possible in |
| 21843 | -# the script to make things like `libtool --version' happen quickly. |
| 21844 | +# func_check_version_match |
| 21845 | +# Ensure that we are using m4 macros, and libtool script from the same |
| 21846 | +# release of libtool. |
| 21847 | +func_check_version_match () |
| 21848 | { |
| 21849 | + if test "$package_revision" != "$macro_revision"; then |
| 21850 | + if test "$VERSION" != "$macro_version"; then |
| 21851 | + if test -z "$macro_version"; then |
| 21852 | + cat >&2 <<_LT_EOF |
| 21853 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 21854 | +$progname: definition of this LT_INIT comes from an older release. |
| 21855 | +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 21856 | +$progname: and run autoconf again. |
| 21857 | +_LT_EOF |
| 21858 | + else |
| 21859 | + cat >&2 <<_LT_EOF |
| 21860 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 21861 | +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. |
| 21862 | +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 21863 | +$progname: and run autoconf again. |
| 21864 | +_LT_EOF |
| 21865 | + fi |
| 21866 | + else |
| 21867 | + cat >&2 <<_LT_EOF |
| 21868 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, |
| 21869 | +$progname: but the definition of this LT_INIT comes from revision $macro_revision. |
| 21870 | +$progname: You should recreate aclocal.m4 with macros from revision $package_revision |
| 21871 | +$progname: of $PACKAGE $VERSION and run autoconf again. |
| 21872 | +_LT_EOF |
| 21873 | + fi |
| 21874 | |
| 21875 | - # Shorthand for --mode=foo, only valid as the first argument |
| 21876 | - case $1 in |
| 21877 | - clean|clea|cle|cl) |
| 21878 | - shift; set dummy --mode clean ${1+"$@"}; shift |
| 21879 | - ;; |
| 21880 | - compile|compil|compi|comp|com|co|c) |
| 21881 | - shift; set dummy --mode compile ${1+"$@"}; shift |
| 21882 | - ;; |
| 21883 | - execute|execut|execu|exec|exe|ex|e) |
| 21884 | - shift; set dummy --mode execute ${1+"$@"}; shift |
| 21885 | - ;; |
| 21886 | - finish|finis|fini|fin|fi|f) |
| 21887 | - shift; set dummy --mode finish ${1+"$@"}; shift |
| 21888 | - ;; |
| 21889 | - install|instal|insta|inst|ins|in|i) |
| 21890 | - shift; set dummy --mode install ${1+"$@"}; shift |
| 21891 | - ;; |
| 21892 | - link|lin|li|l) |
| 21893 | - shift; set dummy --mode link ${1+"$@"}; shift |
| 21894 | - ;; |
| 21895 | - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
| 21896 | - shift; set dummy --mode uninstall ${1+"$@"}; shift |
| 21897 | - ;; |
| 21898 | - esac |
| 21899 | + exit $EXIT_MISMATCH |
| 21900 | + fi |
| 21901 | +} |
| 21902 | + |
| 21903 | + |
| 21904 | +# Shorthand for --mode=foo, only valid as the first argument |
| 21905 | +case $1 in |
| 21906 | +clean|clea|cle|cl) |
| 21907 | + shift; set dummy --mode clean ${1+"$@"}; shift |
| 21908 | + ;; |
| 21909 | +compile|compil|compi|comp|com|co|c) |
| 21910 | + shift; set dummy --mode compile ${1+"$@"}; shift |
| 21911 | + ;; |
| 21912 | +execute|execut|execu|exec|exe|ex|e) |
| 21913 | + shift; set dummy --mode execute ${1+"$@"}; shift |
| 21914 | + ;; |
| 21915 | +finish|finis|fini|fin|fi|f) |
| 21916 | + shift; set dummy --mode finish ${1+"$@"}; shift |
| 21917 | + ;; |
| 21918 | +install|instal|insta|inst|ins|in|i) |
| 21919 | + shift; set dummy --mode install ${1+"$@"}; shift |
| 21920 | + ;; |
| 21921 | +link|lin|li|l) |
| 21922 | + shift; set dummy --mode link ${1+"$@"}; shift |
| 21923 | + ;; |
| 21924 | +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
| 21925 | + shift; set dummy --mode uninstall ${1+"$@"}; shift |
| 21926 | + ;; |
| 21927 | +esac |
| 21928 | |
| 21929 | - # Parse non-mode specific arguments: |
| 21930 | - while test "$#" -gt 0; do |
| 21931 | + |
| 21932 | + |
| 21933 | +# Option defaults: |
| 21934 | +opt_debug=: |
| 21935 | +opt_dry_run=false |
| 21936 | +opt_config=false |
| 21937 | +opt_preserve_dup_deps=false |
| 21938 | +opt_features=false |
| 21939 | +opt_finish=false |
| 21940 | +opt_help=false |
| 21941 | +opt_help_all=false |
| 21942 | +opt_silent=: |
| 21943 | +opt_verbose=: |
| 21944 | +opt_silent=false |
| 21945 | +opt_verbose=false |
| 21946 | + |
| 21947 | + |
| 21948 | +# Parse options once, thoroughly. This comes as soon as possible in the |
| 21949 | +# script to make things like `--version' happen as quickly as we can. |
| 21950 | +{ |
| 21951 | + # this just eases exit handling |
| 21952 | + while test $# -gt 0; do |
| 21953 | opt="$1" |
| 21954 | shift |
| 21955 | - |
| 21956 | case $opt in |
| 21957 | - --config) func_config ;; |
| 21958 | - |
| 21959 | - --debug) preserve_args="$preserve_args $opt" |
| 21960 | + --debug|-x) opt_debug='set -x' |
| 21961 | func_echo "enabling shell trace mode" |
| 21962 | - opt_debug='set -x' |
| 21963 | $opt_debug |
| 21964 | ;; |
| 21965 | - |
| 21966 | - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 21967 | - execute_dlfiles="$execute_dlfiles $1" |
| 21968 | - shift |
| 21969 | + --dry-run|--dryrun|-n) |
| 21970 | + opt_dry_run=: |
| 21971 | ;; |
| 21972 | - |
| 21973 | - --dry-run | -n) opt_dry_run=: ;; |
| 21974 | - --features) func_features ;; |
| 21975 | - --finish) mode="finish" ;; |
| 21976 | - --no-finish) opt_finish=false ;; |
| 21977 | - |
| 21978 | - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 21979 | - case $1 in |
| 21980 | - # Valid mode arguments: |
| 21981 | - clean) ;; |
| 21982 | - compile) ;; |
| 21983 | - execute) ;; |
| 21984 | - finish) ;; |
| 21985 | - install) ;; |
| 21986 | - link) ;; |
| 21987 | - relink) ;; |
| 21988 | - uninstall) ;; |
| 21989 | - |
| 21990 | - # Catch anything else as an error |
| 21991 | - *) func_error "invalid argument for $opt" |
| 21992 | - exit_cmd=exit |
| 21993 | - break |
| 21994 | - ;; |
| 21995 | - esac |
| 21996 | - |
| 21997 | - mode="$1" |
| 21998 | + --config) |
| 21999 | + opt_config=: |
| 22000 | +func_config |
| 22001 | + ;; |
| 22002 | + --dlopen|-dlopen) |
| 22003 | + optarg="$1" |
| 22004 | + opt_dlopen="${opt_dlopen+$opt_dlopen |
| 22005 | +}$optarg" |
| 22006 | shift |
| 22007 | ;; |
| 22008 | - |
| 22009 | --preserve-dup-deps) |
| 22010 | - opt_duplicate_deps=: ;; |
| 22011 | - |
| 22012 | - --quiet|--silent) preserve_args="$preserve_args $opt" |
| 22013 | - opt_silent=: |
| 22014 | - opt_verbose=false |
| 22015 | + opt_preserve_dup_deps=: |
| 22016 | ;; |
| 22017 | - |
| 22018 | - --no-quiet|--no-silent) |
| 22019 | - preserve_args="$preserve_args $opt" |
| 22020 | - opt_silent=false |
| 22021 | + --features) |
| 22022 | + opt_features=: |
| 22023 | +func_features |
| 22024 | ;; |
| 22025 | - |
| 22026 | - --verbose| -v) preserve_args="$preserve_args $opt" |
| 22027 | + --finish) |
| 22028 | + opt_finish=: |
| 22029 | +set dummy --mode finish ${1+"$@"}; shift |
| 22030 | + ;; |
| 22031 | + --help) |
| 22032 | + opt_help=: |
| 22033 | + ;; |
| 22034 | + --help-all) |
| 22035 | + opt_help_all=: |
| 22036 | +opt_help=': help-all' |
| 22037 | + ;; |
| 22038 | + --mode) |
| 22039 | + test $# = 0 && func_missing_arg $opt && break |
| 22040 | + optarg="$1" |
| 22041 | + opt_mode="$optarg" |
| 22042 | +case $optarg in |
| 22043 | + # Valid mode arguments: |
| 22044 | + clean|compile|execute|finish|install|link|relink|uninstall) ;; |
| 22045 | + |
| 22046 | + # Catch anything else as an error |
| 22047 | + *) func_error "invalid argument for $opt" |
| 22048 | + exit_cmd=exit |
| 22049 | + break |
| 22050 | + ;; |
| 22051 | +esac |
| 22052 | + shift |
| 22053 | + ;; |
| 22054 | + --no-silent|--no-quiet) |
| 22055 | opt_silent=false |
| 22056 | - opt_verbose=: |
| 22057 | +func_append preserve_args " $opt" |
| 22058 | ;; |
| 22059 | - |
| 22060 | - --no-verbose) preserve_args="$preserve_args $opt" |
| 22061 | + --no-verbose) |
| 22062 | opt_verbose=false |
| 22063 | +func_append preserve_args " $opt" |
| 22064 | ;; |
| 22065 | - |
| 22066 | - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 22067 | - preserve_args="$preserve_args $opt $1" |
| 22068 | - func_enable_tag "$1" # tagname is set here |
| 22069 | + --silent|--quiet) |
| 22070 | + opt_silent=: |
| 22071 | +func_append preserve_args " $opt" |
| 22072 | + opt_verbose=false |
| 22073 | + ;; |
| 22074 | + --verbose|-v) |
| 22075 | + opt_verbose=: |
| 22076 | +func_append preserve_args " $opt" |
| 22077 | +opt_silent=false |
| 22078 | + ;; |
| 22079 | + --tag) |
| 22080 | + test $# = 0 && func_missing_arg $opt && break |
| 22081 | + optarg="$1" |
| 22082 | + opt_tag="$optarg" |
| 22083 | +func_append preserve_args " $opt $optarg" |
| 22084 | +func_enable_tag "$optarg" |
| 22085 | shift |
| 22086 | ;; |
| 22087 | |
| 22088 | + -\?|-h) func_usage ;; |
| 22089 | + --help) func_help ;; |
| 22090 | + --version) func_version ;; |
| 22091 | + |
| 22092 | # Separate optargs to long options: |
| 22093 | - -dlopen=*|--mode=*|--tag=*) |
| 22094 | - func_opt_split "$opt" |
| 22095 | - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} |
| 22096 | + --*=*) |
| 22097 | + func_split_long_opt "$opt" |
| 22098 | + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} |
| 22099 | shift |
| 22100 | ;; |
| 22101 | |
| 22102 | - -\?|-h) func_usage ;; |
| 22103 | - --help) opt_help=: ;; |
| 22104 | - --help-all) opt_help=': help-all' ;; |
| 22105 | - --version) func_version ;; |
| 22106 | - |
| 22107 | - -*) func_fatal_help "unrecognized option \`$opt'" ;; |
| 22108 | - |
| 22109 | - *) nonopt="$opt" |
| 22110 | - break |
| 22111 | + # Separate non-argument short options: |
| 22112 | + -\?*|-h*|-n*|-v*) |
| 22113 | + func_split_short_opt "$opt" |
| 22114 | + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} |
| 22115 | + shift |
| 22116 | ;; |
| 22117 | + |
| 22118 | + --) break ;; |
| 22119 | + -*) func_fatal_help "unrecognized option \`$opt'" ;; |
| 22120 | + *) set dummy "$opt" ${1+"$@"}; shift; break ;; |
| 22121 | esac |
| 22122 | done |
| 22123 | |
| 22124 | + # Validate options: |
| 22125 | + |
| 22126 | + # save first non-option argument |
| 22127 | + if test "$#" -gt 0; then |
| 22128 | + nonopt="$opt" |
| 22129 | + shift |
| 22130 | + fi |
| 22131 | + |
| 22132 | + # preserve --debug |
| 22133 | + test "$opt_debug" = : || func_append preserve_args " --debug" |
| 22134 | |
| 22135 | case $host in |
| 22136 | *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) |
| 22137 | @@ -981,82 +1184,44 @@ func_enable_tag () |
| 22138 | opt_duplicate_compiler_generated_deps=: |
| 22139 | ;; |
| 22140 | *) |
| 22141 | - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps |
| 22142 | + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps |
| 22143 | ;; |
| 22144 | esac |
| 22145 | |
| 22146 | - # Having warned about all mis-specified options, bail out if |
| 22147 | - # anything was wrong. |
| 22148 | - $exit_cmd $EXIT_FAILURE |
| 22149 | -} |
| 22150 | + $opt_help || { |
| 22151 | + # Sanity checks first: |
| 22152 | + func_check_version_match |
| 22153 | |
| 22154 | -# func_check_version_match |
| 22155 | -# Ensure that we are using m4 macros, and libtool script from the same |
| 22156 | -# release of libtool. |
| 22157 | -func_check_version_match () |
| 22158 | -{ |
| 22159 | - if test "$package_revision" != "$macro_revision"; then |
| 22160 | - if test "$VERSION" != "$macro_version"; then |
| 22161 | - if test -z "$macro_version"; then |
| 22162 | - cat >&2 <<_LT_EOF |
| 22163 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 22164 | -$progname: definition of this LT_INIT comes from an older release. |
| 22165 | -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 22166 | -$progname: and run autoconf again. |
| 22167 | -_LT_EOF |
| 22168 | - else |
| 22169 | - cat >&2 <<_LT_EOF |
| 22170 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 22171 | -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. |
| 22172 | -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 22173 | -$progname: and run autoconf again. |
| 22174 | -_LT_EOF |
| 22175 | - fi |
| 22176 | - else |
| 22177 | - cat >&2 <<_LT_EOF |
| 22178 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, |
| 22179 | -$progname: but the definition of this LT_INIT comes from revision $macro_revision. |
| 22180 | -$progname: You should recreate aclocal.m4 with macros from revision $package_revision |
| 22181 | -$progname: of $PACKAGE $VERSION and run autoconf again. |
| 22182 | -_LT_EOF |
| 22183 | + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
| 22184 | + func_fatal_configuration "not configured to build any kind of library" |
| 22185 | fi |
| 22186 | |
| 22187 | - exit $EXIT_MISMATCH |
| 22188 | - fi |
| 22189 | -} |
| 22190 | - |
| 22191 | + # Darwin sucks |
| 22192 | + eval std_shrext=\"$shrext_cmds\" |
| 22193 | |
| 22194 | -## ----------- ## |
| 22195 | -## Main. ## |
| 22196 | -## ----------- ## |
| 22197 | - |
| 22198 | -$opt_help || { |
| 22199 | - # Sanity checks first: |
| 22200 | - func_check_version_match |
| 22201 | - |
| 22202 | - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
| 22203 | - func_fatal_configuration "not configured to build any kind of library" |
| 22204 | - fi |
| 22205 | + # Only execute mode is allowed to have -dlopen flags. |
| 22206 | + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then |
| 22207 | + func_error "unrecognized option \`-dlopen'" |
| 22208 | + $ECHO "$help" 1>&2 |
| 22209 | + exit $EXIT_FAILURE |
| 22210 | + fi |
| 22211 | |
| 22212 | - test -z "$mode" && func_fatal_error "error: you must specify a MODE." |
| 22213 | + # Change the help message to a mode-specific one. |
| 22214 | + generic_help="$help" |
| 22215 | + help="Try \`$progname --help --mode=$opt_mode' for more information." |
| 22216 | + } |
| 22217 | |
| 22218 | |
| 22219 | - # Darwin sucks |
| 22220 | - eval "std_shrext=\"$shrext_cmds\"" |
| 22221 | + # Bail if the options were screwed |
| 22222 | + $exit_cmd $EXIT_FAILURE |
| 22223 | +} |
| 22224 | |
| 22225 | |
| 22226 | - # Only execute mode is allowed to have -dlopen flags. |
| 22227 | - if test -n "$execute_dlfiles" && test "$mode" != execute; then |
| 22228 | - func_error "unrecognized option \`-dlopen'" |
| 22229 | - $ECHO "$help" 1>&2 |
| 22230 | - exit $EXIT_FAILURE |
| 22231 | - fi |
| 22232 | |
| 22233 | - # Change the help message to a mode-specific one. |
| 22234 | - generic_help="$help" |
| 22235 | - help="Try \`$progname --help --mode=$mode' for more information." |
| 22236 | -} |
| 22237 | |
| 22238 | +## ----------- ## |
| 22239 | +## Main. ## |
| 22240 | +## ----------- ## |
| 22241 | |
| 22242 | # func_lalib_p file |
| 22243 | # True iff FILE is a libtool `.la' library or `.lo' object file. |
| 22244 | @@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () |
| 22245 | # temporary ltwrapper_script. |
| 22246 | func_ltwrapper_scriptname () |
| 22247 | { |
| 22248 | - func_ltwrapper_scriptname_result="" |
| 22249 | - if func_ltwrapper_executable_p "$1"; then |
| 22250 | - func_dirname_and_basename "$1" "" "." |
| 22251 | - func_stripname '' '.exe' "$func_basename_result" |
| 22252 | - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" |
| 22253 | - fi |
| 22254 | + func_dirname_and_basename "$1" "" "." |
| 22255 | + func_stripname '' '.exe' "$func_basename_result" |
| 22256 | + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" |
| 22257 | } |
| 22258 | |
| 22259 | # func_ltwrapper_p file |
| 22260 | @@ -1149,7 +1311,7 @@ func_execute_cmds () |
| 22261 | save_ifs=$IFS; IFS='~' |
| 22262 | for cmd in $1; do |
| 22263 | IFS=$save_ifs |
| 22264 | - eval "cmd=\"$cmd\"" |
| 22265 | + eval cmd=\"$cmd\" |
| 22266 | func_show_eval "$cmd" "${2-:}" |
| 22267 | done |
| 22268 | IFS=$save_ifs |
| 22269 | @@ -1172,6 +1334,37 @@ func_source () |
| 22270 | } |
| 22271 | |
| 22272 | |
| 22273 | +# func_resolve_sysroot PATH |
| 22274 | +# Replace a leading = in PATH with a sysroot. Store the result into |
| 22275 | +# func_resolve_sysroot_result |
| 22276 | +func_resolve_sysroot () |
| 22277 | +{ |
| 22278 | + func_resolve_sysroot_result=$1 |
| 22279 | + case $func_resolve_sysroot_result in |
| 22280 | + =*) |
| 22281 | + func_stripname '=' '' "$func_resolve_sysroot_result" |
| 22282 | + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result |
| 22283 | + ;; |
| 22284 | + esac |
| 22285 | +} |
| 22286 | + |
| 22287 | +# func_replace_sysroot PATH |
| 22288 | +# If PATH begins with the sysroot, replace it with = and |
| 22289 | +# store the result into func_replace_sysroot_result. |
| 22290 | +func_replace_sysroot () |
| 22291 | +{ |
| 22292 | + case "$lt_sysroot:$1" in |
| 22293 | + ?*:"$lt_sysroot"*) |
| 22294 | + func_stripname "$lt_sysroot" '' "$1" |
| 22295 | + func_replace_sysroot_result="=$func_stripname_result" |
| 22296 | + ;; |
| 22297 | + *) |
| 22298 | + # Including no sysroot. |
| 22299 | + func_replace_sysroot_result=$1 |
| 22300 | + ;; |
| 22301 | + esac |
| 22302 | +} |
| 22303 | + |
| 22304 | # func_infer_tag arg |
| 22305 | # Infer tagged configuration to use if any are available and |
| 22306 | # if one wasn't chosen via the "--tag" command line option. |
| 22307 | @@ -1184,8 +1377,7 @@ func_infer_tag () |
| 22308 | if test -n "$available_tags" && test -z "$tagname"; then |
| 22309 | CC_quoted= |
| 22310 | for arg in $CC; do |
| 22311 | - func_quote_for_eval "$arg" |
| 22312 | - CC_quoted="$CC_quoted $func_quote_for_eval_result" |
| 22313 | + func_append_quoted CC_quoted "$arg" |
| 22314 | done |
| 22315 | CC_expanded=`func_echo_all $CC` |
| 22316 | CC_quoted_expanded=`func_echo_all $CC_quoted` |
| 22317 | @@ -1204,8 +1396,7 @@ func_infer_tag () |
| 22318 | CC_quoted= |
| 22319 | for arg in $CC; do |
| 22320 | # Double-quote args containing other shell metacharacters. |
| 22321 | - func_quote_for_eval "$arg" |
| 22322 | - CC_quoted="$CC_quoted $func_quote_for_eval_result" |
| 22323 | + func_append_quoted CC_quoted "$arg" |
| 22324 | done |
| 22325 | CC_expanded=`func_echo_all $CC` |
| 22326 | CC_quoted_expanded=`func_echo_all $CC_quoted` |
| 22327 | @@ -1274,6 +1465,486 @@ EOF |
| 22328 | } |
| 22329 | } |
| 22330 | |
| 22331 | + |
| 22332 | +################################################## |
| 22333 | +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # |
| 22334 | +################################################## |
| 22335 | + |
| 22336 | +# func_convert_core_file_wine_to_w32 ARG |
| 22337 | +# Helper function used by file name conversion functions when $build is *nix, |
| 22338 | +# and $host is mingw, cygwin, or some other w32 environment. Relies on a |
| 22339 | +# correctly configured wine environment available, with the winepath program |
| 22340 | +# in $build's $PATH. |
| 22341 | +# |
| 22342 | +# ARG is the $build file name to be converted to w32 format. |
| 22343 | +# Result is available in $func_convert_core_file_wine_to_w32_result, and will |
| 22344 | +# be empty on error (or when ARG is empty) |
| 22345 | +func_convert_core_file_wine_to_w32 () |
| 22346 | +{ |
| 22347 | + $opt_debug |
| 22348 | + func_convert_core_file_wine_to_w32_result="$1" |
| 22349 | + if test -n "$1"; then |
| 22350 | + # Unfortunately, winepath does not exit with a non-zero error code, so we |
| 22351 | + # are forced to check the contents of stdout. On the other hand, if the |
| 22352 | + # command is not found, the shell will set an exit code of 127 and print |
| 22353 | + # *an error message* to stdout. So we must check for both error code of |
| 22354 | + # zero AND non-empty stdout, which explains the odd construction: |
| 22355 | + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` |
| 22356 | + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then |
| 22357 | + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | |
| 22358 | + $SED -e "$lt_sed_naive_backslashify"` |
| 22359 | + else |
| 22360 | + func_convert_core_file_wine_to_w32_result= |
| 22361 | + fi |
| 22362 | + fi |
| 22363 | +} |
| 22364 | +# end: func_convert_core_file_wine_to_w32 |
| 22365 | + |
| 22366 | + |
| 22367 | +# func_convert_core_path_wine_to_w32 ARG |
| 22368 | +# Helper function used by path conversion functions when $build is *nix, and |
| 22369 | +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly |
| 22370 | +# configured wine environment available, with the winepath program in $build's |
| 22371 | +# $PATH. Assumes ARG has no leading or trailing path separator characters. |
| 22372 | +# |
| 22373 | +# ARG is path to be converted from $build format to win32. |
| 22374 | +# Result is available in $func_convert_core_path_wine_to_w32_result. |
| 22375 | +# Unconvertible file (directory) names in ARG are skipped; if no directory names |
| 22376 | +# are convertible, then the result may be empty. |
| 22377 | +func_convert_core_path_wine_to_w32 () |
| 22378 | +{ |
| 22379 | + $opt_debug |
| 22380 | + # unfortunately, winepath doesn't convert paths, only file names |
| 22381 | + func_convert_core_path_wine_to_w32_result="" |
| 22382 | + if test -n "$1"; then |
| 22383 | + oldIFS=$IFS |
| 22384 | + IFS=: |
| 22385 | + for func_convert_core_path_wine_to_w32_f in $1; do |
| 22386 | + IFS=$oldIFS |
| 22387 | + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" |
| 22388 | + if test -n "$func_convert_core_file_wine_to_w32_result" ; then |
| 22389 | + if test -z "$func_convert_core_path_wine_to_w32_result"; then |
| 22390 | + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" |
| 22391 | + else |
| 22392 | + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" |
| 22393 | + fi |
| 22394 | + fi |
| 22395 | + done |
| 22396 | + IFS=$oldIFS |
| 22397 | + fi |
| 22398 | +} |
| 22399 | +# end: func_convert_core_path_wine_to_w32 |
| 22400 | + |
| 22401 | + |
| 22402 | +# func_cygpath ARGS... |
| 22403 | +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when |
| 22404 | +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) |
| 22405 | +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or |
| 22406 | +# (2), returns the Cygwin file name or path in func_cygpath_result (input |
| 22407 | +# file name or path is assumed to be in w32 format, as previously converted |
| 22408 | +# from $build's *nix or MSYS format). In case (3), returns the w32 file name |
| 22409 | +# or path in func_cygpath_result (input file name or path is assumed to be in |
| 22410 | +# Cygwin format). Returns an empty string on error. |
| 22411 | +# |
| 22412 | +# ARGS are passed to cygpath, with the last one being the file name or path to |
| 22413 | +# be converted. |
| 22414 | +# |
| 22415 | +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH |
| 22416 | +# environment variable; do not put it in $PATH. |
| 22417 | +func_cygpath () |
| 22418 | +{ |
| 22419 | + $opt_debug |
| 22420 | + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then |
| 22421 | + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` |
| 22422 | + if test "$?" -ne 0; then |
| 22423 | + # on failure, ensure result is empty |
| 22424 | + func_cygpath_result= |
| 22425 | + fi |
| 22426 | + else |
| 22427 | + func_cygpath_result= |
| 22428 | + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" |
| 22429 | + fi |
| 22430 | +} |
| 22431 | +#end: func_cygpath |
| 22432 | + |
| 22433 | + |
| 22434 | +# func_convert_core_msys_to_w32 ARG |
| 22435 | +# Convert file name or path ARG from MSYS format to w32 format. Return |
| 22436 | +# result in func_convert_core_msys_to_w32_result. |
| 22437 | +func_convert_core_msys_to_w32 () |
| 22438 | +{ |
| 22439 | + $opt_debug |
| 22440 | + # awkward: cmd appends spaces to result |
| 22441 | + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | |
| 22442 | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 22443 | +} |
| 22444 | +#end: func_convert_core_msys_to_w32 |
| 22445 | + |
| 22446 | + |
| 22447 | +# func_convert_file_check ARG1 ARG2 |
| 22448 | +# Verify that ARG1 (a file name in $build format) was converted to $host |
| 22449 | +# format in ARG2. Otherwise, emit an error message, but continue (resetting |
| 22450 | +# func_to_host_file_result to ARG1). |
| 22451 | +func_convert_file_check () |
| 22452 | +{ |
| 22453 | + $opt_debug |
| 22454 | + if test -z "$2" && test -n "$1" ; then |
| 22455 | + func_error "Could not determine host file name corresponding to" |
| 22456 | + func_error " \`$1'" |
| 22457 | + func_error "Continuing, but uninstalled executables may not work." |
| 22458 | + # Fallback: |
| 22459 | + func_to_host_file_result="$1" |
| 22460 | + fi |
| 22461 | +} |
| 22462 | +# end func_convert_file_check |
| 22463 | + |
| 22464 | + |
| 22465 | +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH |
| 22466 | +# Verify that FROM_PATH (a path in $build format) was converted to $host |
| 22467 | +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting |
| 22468 | +# func_to_host_file_result to a simplistic fallback value (see below). |
| 22469 | +func_convert_path_check () |
| 22470 | +{ |
| 22471 | + $opt_debug |
| 22472 | + if test -z "$4" && test -n "$3"; then |
| 22473 | + func_error "Could not determine the host path corresponding to" |
| 22474 | + func_error " \`$3'" |
| 22475 | + func_error "Continuing, but uninstalled executables may not work." |
| 22476 | + # Fallback. This is a deliberately simplistic "conversion" and |
| 22477 | + # should not be "improved". See libtool.info. |
| 22478 | + if test "x$1" != "x$2"; then |
| 22479 | + lt_replace_pathsep_chars="s|$1|$2|g" |
| 22480 | + func_to_host_path_result=`echo "$3" | |
| 22481 | + $SED -e "$lt_replace_pathsep_chars"` |
| 22482 | + else |
| 22483 | + func_to_host_path_result="$3" |
| 22484 | + fi |
| 22485 | + fi |
| 22486 | +} |
| 22487 | +# end func_convert_path_check |
| 22488 | + |
| 22489 | + |
| 22490 | +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG |
| 22491 | +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT |
| 22492 | +# and appending REPL if ORIG matches BACKPAT. |
| 22493 | +func_convert_path_front_back_pathsep () |
| 22494 | +{ |
| 22495 | + $opt_debug |
| 22496 | + case $4 in |
| 22497 | + $1 ) func_to_host_path_result="$3$func_to_host_path_result" |
| 22498 | + ;; |
| 22499 | + esac |
| 22500 | + case $4 in |
| 22501 | + $2 ) func_append func_to_host_path_result "$3" |
| 22502 | + ;; |
| 22503 | + esac |
| 22504 | +} |
| 22505 | +# end func_convert_path_front_back_pathsep |
| 22506 | + |
| 22507 | + |
| 22508 | +################################################## |
| 22509 | +# $build to $host FILE NAME CONVERSION FUNCTIONS # |
| 22510 | +################################################## |
| 22511 | +# invoked via `$to_host_file_cmd ARG' |
| 22512 | +# |
| 22513 | +# In each case, ARG is the path to be converted from $build to $host format. |
| 22514 | +# Result will be available in $func_to_host_file_result. |
| 22515 | + |
| 22516 | + |
| 22517 | +# func_to_host_file ARG |
| 22518 | +# Converts the file name ARG from $build format to $host format. Return result |
| 22519 | +# in func_to_host_file_result. |
| 22520 | +func_to_host_file () |
| 22521 | +{ |
| 22522 | + $opt_debug |
| 22523 | + $to_host_file_cmd "$1" |
| 22524 | +} |
| 22525 | +# end func_to_host_file |
| 22526 | + |
| 22527 | + |
| 22528 | +# func_to_tool_file ARG LAZY |
| 22529 | +# converts the file name ARG from $build format to toolchain format. Return |
| 22530 | +# result in func_to_tool_file_result. If the conversion in use is listed |
| 22531 | +# in (the comma separated) LAZY, no conversion takes place. |
| 22532 | +func_to_tool_file () |
| 22533 | +{ |
| 22534 | + $opt_debug |
| 22535 | + case ,$2, in |
| 22536 | + *,"$to_tool_file_cmd",*) |
| 22537 | + func_to_tool_file_result=$1 |
| 22538 | + ;; |
| 22539 | + *) |
| 22540 | + $to_tool_file_cmd "$1" |
| 22541 | + func_to_tool_file_result=$func_to_host_file_result |
| 22542 | + ;; |
| 22543 | + esac |
| 22544 | +} |
| 22545 | +# end func_to_tool_file |
| 22546 | + |
| 22547 | + |
| 22548 | +# func_convert_file_noop ARG |
| 22549 | +# Copy ARG to func_to_host_file_result. |
| 22550 | +func_convert_file_noop () |
| 22551 | +{ |
| 22552 | + func_to_host_file_result="$1" |
| 22553 | +} |
| 22554 | +# end func_convert_file_noop |
| 22555 | + |
| 22556 | + |
| 22557 | +# func_convert_file_msys_to_w32 ARG |
| 22558 | +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic |
| 22559 | +# conversion to w32 is not available inside the cwrapper. Returns result in |
| 22560 | +# func_to_host_file_result. |
| 22561 | +func_convert_file_msys_to_w32 () |
| 22562 | +{ |
| 22563 | + $opt_debug |
| 22564 | + func_to_host_file_result="$1" |
| 22565 | + if test -n "$1"; then |
| 22566 | + func_convert_core_msys_to_w32 "$1" |
| 22567 | + func_to_host_file_result="$func_convert_core_msys_to_w32_result" |
| 22568 | + fi |
| 22569 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 22570 | +} |
| 22571 | +# end func_convert_file_msys_to_w32 |
| 22572 | + |
| 22573 | + |
| 22574 | +# func_convert_file_cygwin_to_w32 ARG |
| 22575 | +# Convert file name ARG from Cygwin to w32 format. Returns result in |
| 22576 | +# func_to_host_file_result. |
| 22577 | +func_convert_file_cygwin_to_w32 () |
| 22578 | +{ |
| 22579 | + $opt_debug |
| 22580 | + func_to_host_file_result="$1" |
| 22581 | + if test -n "$1"; then |
| 22582 | + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use |
| 22583 | + # LT_CYGPATH in this case. |
| 22584 | + func_to_host_file_result=`cygpath -m "$1"` |
| 22585 | + fi |
| 22586 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 22587 | +} |
| 22588 | +# end func_convert_file_cygwin_to_w32 |
| 22589 | + |
| 22590 | + |
| 22591 | +# func_convert_file_nix_to_w32 ARG |
| 22592 | +# Convert file name ARG from *nix to w32 format. Requires a wine environment |
| 22593 | +# and a working winepath. Returns result in func_to_host_file_result. |
| 22594 | +func_convert_file_nix_to_w32 () |
| 22595 | +{ |
| 22596 | + $opt_debug |
| 22597 | + func_to_host_file_result="$1" |
| 22598 | + if test -n "$1"; then |
| 22599 | + func_convert_core_file_wine_to_w32 "$1" |
| 22600 | + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" |
| 22601 | + fi |
| 22602 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 22603 | +} |
| 22604 | +# end func_convert_file_nix_to_w32 |
| 22605 | + |
| 22606 | + |
| 22607 | +# func_convert_file_msys_to_cygwin ARG |
| 22608 | +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. |
| 22609 | +# Returns result in func_to_host_file_result. |
| 22610 | +func_convert_file_msys_to_cygwin () |
| 22611 | +{ |
| 22612 | + $opt_debug |
| 22613 | + func_to_host_file_result="$1" |
| 22614 | + if test -n "$1"; then |
| 22615 | + func_convert_core_msys_to_w32 "$1" |
| 22616 | + func_cygpath -u "$func_convert_core_msys_to_w32_result" |
| 22617 | + func_to_host_file_result="$func_cygpath_result" |
| 22618 | + fi |
| 22619 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 22620 | +} |
| 22621 | +# end func_convert_file_msys_to_cygwin |
| 22622 | + |
| 22623 | + |
| 22624 | +# func_convert_file_nix_to_cygwin ARG |
| 22625 | +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed |
| 22626 | +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result |
| 22627 | +# in func_to_host_file_result. |
| 22628 | +func_convert_file_nix_to_cygwin () |
| 22629 | +{ |
| 22630 | + $opt_debug |
| 22631 | + func_to_host_file_result="$1" |
| 22632 | + if test -n "$1"; then |
| 22633 | + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. |
| 22634 | + func_convert_core_file_wine_to_w32 "$1" |
| 22635 | + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" |
| 22636 | + func_to_host_file_result="$func_cygpath_result" |
| 22637 | + fi |
| 22638 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 22639 | +} |
| 22640 | +# end func_convert_file_nix_to_cygwin |
| 22641 | + |
| 22642 | + |
| 22643 | +############################################# |
| 22644 | +# $build to $host PATH CONVERSION FUNCTIONS # |
| 22645 | +############################################# |
| 22646 | +# invoked via `$to_host_path_cmd ARG' |
| 22647 | +# |
| 22648 | +# In each case, ARG is the path to be converted from $build to $host format. |
| 22649 | +# The result will be available in $func_to_host_path_result. |
| 22650 | +# |
| 22651 | +# Path separators are also converted from $build format to $host format. If |
| 22652 | +# ARG begins or ends with a path separator character, it is preserved (but |
| 22653 | +# converted to $host format) on output. |
| 22654 | +# |
| 22655 | +# All path conversion functions are named using the following convention: |
| 22656 | +# file name conversion function : func_convert_file_X_to_Y () |
| 22657 | +# path conversion function : func_convert_path_X_to_Y () |
| 22658 | +# where, for any given $build/$host combination the 'X_to_Y' value is the |
| 22659 | +# same. If conversion functions are added for new $build/$host combinations, |
| 22660 | +# the two new functions must follow this pattern, or func_init_to_host_path_cmd |
| 22661 | +# will break. |
| 22662 | + |
| 22663 | + |
| 22664 | +# func_init_to_host_path_cmd |
| 22665 | +# Ensures that function "pointer" variable $to_host_path_cmd is set to the |
| 22666 | +# appropriate value, based on the value of $to_host_file_cmd. |
| 22667 | +to_host_path_cmd= |
| 22668 | +func_init_to_host_path_cmd () |
| 22669 | +{ |
| 22670 | + $opt_debug |
| 22671 | + if test -z "$to_host_path_cmd"; then |
| 22672 | + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" |
| 22673 | + to_host_path_cmd="func_convert_path_${func_stripname_result}" |
| 22674 | + fi |
| 22675 | +} |
| 22676 | + |
| 22677 | + |
| 22678 | +# func_to_host_path ARG |
| 22679 | +# Converts the path ARG from $build format to $host format. Return result |
| 22680 | +# in func_to_host_path_result. |
| 22681 | +func_to_host_path () |
| 22682 | +{ |
| 22683 | + $opt_debug |
| 22684 | + func_init_to_host_path_cmd |
| 22685 | + $to_host_path_cmd "$1" |
| 22686 | +} |
| 22687 | +# end func_to_host_path |
| 22688 | + |
| 22689 | + |
| 22690 | +# func_convert_path_noop ARG |
| 22691 | +# Copy ARG to func_to_host_path_result. |
| 22692 | +func_convert_path_noop () |
| 22693 | +{ |
| 22694 | + func_to_host_path_result="$1" |
| 22695 | +} |
| 22696 | +# end func_convert_path_noop |
| 22697 | + |
| 22698 | + |
| 22699 | +# func_convert_path_msys_to_w32 ARG |
| 22700 | +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic |
| 22701 | +# conversion to w32 is not available inside the cwrapper. Returns result in |
| 22702 | +# func_to_host_path_result. |
| 22703 | +func_convert_path_msys_to_w32 () |
| 22704 | +{ |
| 22705 | + $opt_debug |
| 22706 | + func_to_host_path_result="$1" |
| 22707 | + if test -n "$1"; then |
| 22708 | + # Remove leading and trailing path separator characters from ARG. MSYS |
| 22709 | + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; |
| 22710 | + # and winepath ignores them completely. |
| 22711 | + func_stripname : : "$1" |
| 22712 | + func_to_host_path_tmp1=$func_stripname_result |
| 22713 | + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" |
| 22714 | + func_to_host_path_result="$func_convert_core_msys_to_w32_result" |
| 22715 | + func_convert_path_check : ";" \ |
| 22716 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 22717 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 22718 | + fi |
| 22719 | +} |
| 22720 | +# end func_convert_path_msys_to_w32 |
| 22721 | + |
| 22722 | + |
| 22723 | +# func_convert_path_cygwin_to_w32 ARG |
| 22724 | +# Convert path ARG from Cygwin to w32 format. Returns result in |
| 22725 | +# func_to_host_file_result. |
| 22726 | +func_convert_path_cygwin_to_w32 () |
| 22727 | +{ |
| 22728 | + $opt_debug |
| 22729 | + func_to_host_path_result="$1" |
| 22730 | + if test -n "$1"; then |
| 22731 | + # See func_convert_path_msys_to_w32: |
| 22732 | + func_stripname : : "$1" |
| 22733 | + func_to_host_path_tmp1=$func_stripname_result |
| 22734 | + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` |
| 22735 | + func_convert_path_check : ";" \ |
| 22736 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 22737 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 22738 | + fi |
| 22739 | +} |
| 22740 | +# end func_convert_path_cygwin_to_w32 |
| 22741 | + |
| 22742 | + |
| 22743 | +# func_convert_path_nix_to_w32 ARG |
| 22744 | +# Convert path ARG from *nix to w32 format. Requires a wine environment and |
| 22745 | +# a working winepath. Returns result in func_to_host_file_result. |
| 22746 | +func_convert_path_nix_to_w32 () |
| 22747 | +{ |
| 22748 | + $opt_debug |
| 22749 | + func_to_host_path_result="$1" |
| 22750 | + if test -n "$1"; then |
| 22751 | + # See func_convert_path_msys_to_w32: |
| 22752 | + func_stripname : : "$1" |
| 22753 | + func_to_host_path_tmp1=$func_stripname_result |
| 22754 | + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" |
| 22755 | + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" |
| 22756 | + func_convert_path_check : ";" \ |
| 22757 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 22758 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 22759 | + fi |
| 22760 | +} |
| 22761 | +# end func_convert_path_nix_to_w32 |
| 22762 | + |
| 22763 | + |
| 22764 | +# func_convert_path_msys_to_cygwin ARG |
| 22765 | +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. |
| 22766 | +# Returns result in func_to_host_file_result. |
| 22767 | +func_convert_path_msys_to_cygwin () |
| 22768 | +{ |
| 22769 | + $opt_debug |
| 22770 | + func_to_host_path_result="$1" |
| 22771 | + if test -n "$1"; then |
| 22772 | + # See func_convert_path_msys_to_w32: |
| 22773 | + func_stripname : : "$1" |
| 22774 | + func_to_host_path_tmp1=$func_stripname_result |
| 22775 | + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" |
| 22776 | + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" |
| 22777 | + func_to_host_path_result="$func_cygpath_result" |
| 22778 | + func_convert_path_check : : \ |
| 22779 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 22780 | + func_convert_path_front_back_pathsep ":*" "*:" : "$1" |
| 22781 | + fi |
| 22782 | +} |
| 22783 | +# end func_convert_path_msys_to_cygwin |
| 22784 | + |
| 22785 | + |
| 22786 | +# func_convert_path_nix_to_cygwin ARG |
| 22787 | +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a |
| 22788 | +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in |
| 22789 | +# func_to_host_file_result. |
| 22790 | +func_convert_path_nix_to_cygwin () |
| 22791 | +{ |
| 22792 | + $opt_debug |
| 22793 | + func_to_host_path_result="$1" |
| 22794 | + if test -n "$1"; then |
| 22795 | + # Remove leading and trailing path separator characters from |
| 22796 | + # ARG. msys behavior is inconsistent here, cygpath turns them |
| 22797 | + # into '.;' and ';.', and winepath ignores them completely. |
| 22798 | + func_stripname : : "$1" |
| 22799 | + func_to_host_path_tmp1=$func_stripname_result |
| 22800 | + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" |
| 22801 | + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" |
| 22802 | + func_to_host_path_result="$func_cygpath_result" |
| 22803 | + func_convert_path_check : : \ |
| 22804 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 22805 | + func_convert_path_front_back_pathsep ":*" "*:" : "$1" |
| 22806 | + fi |
| 22807 | +} |
| 22808 | +# end func_convert_path_nix_to_cygwin |
| 22809 | + |
| 22810 | + |
| 22811 | # func_mode_compile arg... |
| 22812 | func_mode_compile () |
| 22813 | { |
| 22814 | @@ -1314,12 +1985,12 @@ func_mode_compile () |
| 22815 | ;; |
| 22816 | |
| 22817 | -pie | -fpie | -fPIE) |
| 22818 | - pie_flag="$pie_flag $arg" |
| 22819 | + func_append pie_flag " $arg" |
| 22820 | continue |
| 22821 | ;; |
| 22822 | |
| 22823 | -shared | -static | -prefer-pic | -prefer-non-pic) |
| 22824 | - later="$later $arg" |
| 22825 | + func_append later " $arg" |
| 22826 | continue |
| 22827 | ;; |
| 22828 | |
| 22829 | @@ -1340,15 +2011,14 @@ func_mode_compile () |
| 22830 | save_ifs="$IFS"; IFS=',' |
| 22831 | for arg in $args; do |
| 22832 | IFS="$save_ifs" |
| 22833 | - func_quote_for_eval "$arg" |
| 22834 | - lastarg="$lastarg $func_quote_for_eval_result" |
| 22835 | + func_append_quoted lastarg "$arg" |
| 22836 | done |
| 22837 | IFS="$save_ifs" |
| 22838 | func_stripname ' ' '' "$lastarg" |
| 22839 | lastarg=$func_stripname_result |
| 22840 | |
| 22841 | # Add the arguments to base_compile. |
| 22842 | - base_compile="$base_compile $lastarg" |
| 22843 | + func_append base_compile " $lastarg" |
| 22844 | continue |
| 22845 | ;; |
| 22846 | |
| 22847 | @@ -1364,8 +2034,7 @@ func_mode_compile () |
| 22848 | esac # case $arg_mode |
| 22849 | |
| 22850 | # Aesthetically quote the previous argument. |
| 22851 | - func_quote_for_eval "$lastarg" |
| 22852 | - base_compile="$base_compile $func_quote_for_eval_result" |
| 22853 | + func_append_quoted base_compile "$lastarg" |
| 22854 | done # for arg |
| 22855 | |
| 22856 | case $arg_mode in |
| 22857 | @@ -1496,17 +2165,16 @@ compiler." |
| 22858 | $opt_dry_run || $RM $removelist |
| 22859 | exit $EXIT_FAILURE |
| 22860 | fi |
| 22861 | - removelist="$removelist $output_obj" |
| 22862 | + func_append removelist " $output_obj" |
| 22863 | $ECHO "$srcfile" > "$lockfile" |
| 22864 | fi |
| 22865 | |
| 22866 | $opt_dry_run || $RM $removelist |
| 22867 | - removelist="$removelist $lockfile" |
| 22868 | + func_append removelist " $lockfile" |
| 22869 | trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 |
| 22870 | |
| 22871 | - if test -n "$fix_srcfile_path"; then |
| 22872 | - eval "srcfile=\"$fix_srcfile_path\"" |
| 22873 | - fi |
| 22874 | + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 |
| 22875 | + srcfile=$func_to_tool_file_result |
| 22876 | func_quote_for_eval "$srcfile" |
| 22877 | qsrcfile=$func_quote_for_eval_result |
| 22878 | |
| 22879 | @@ -1526,7 +2194,7 @@ compiler." |
| 22880 | |
| 22881 | if test -z "$output_obj"; then |
| 22882 | # Place PIC objects in $objdir |
| 22883 | - command="$command -o $lobj" |
| 22884 | + func_append command " -o $lobj" |
| 22885 | fi |
| 22886 | |
| 22887 | func_show_eval_locale "$command" \ |
| 22888 | @@ -1573,11 +2241,11 @@ compiler." |
| 22889 | command="$base_compile $qsrcfile $pic_flag" |
| 22890 | fi |
| 22891 | if test "$compiler_c_o" = yes; then |
| 22892 | - command="$command -o $obj" |
| 22893 | + func_append command " -o $obj" |
| 22894 | fi |
| 22895 | |
| 22896 | # Suppress compiler output if we already did a PIC compilation. |
| 22897 | - command="$command$suppress_output" |
| 22898 | + func_append command "$suppress_output" |
| 22899 | func_show_eval_locale "$command" \ |
| 22900 | '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' |
| 22901 | |
| 22902 | @@ -1622,13 +2290,13 @@ compiler." |
| 22903 | } |
| 22904 | |
| 22905 | $opt_help || { |
| 22906 | - test "$mode" = compile && func_mode_compile ${1+"$@"} |
| 22907 | + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} |
| 22908 | } |
| 22909 | |
| 22910 | func_mode_help () |
| 22911 | { |
| 22912 | # We need to display help for each of the modes. |
| 22913 | - case $mode in |
| 22914 | + case $opt_mode in |
| 22915 | "") |
| 22916 | # Generic help is extracted from the usage comments |
| 22917 | # at the start of this file. |
| 22918 | @@ -1659,8 +2327,8 @@ This mode accepts the following additional options: |
| 22919 | |
| 22920 | -o OUTPUT-FILE set the output file name to OUTPUT-FILE |
| 22921 | -no-suppress do not suppress compiler output for multiple passes |
| 22922 | - -prefer-pic try to building PIC objects only |
| 22923 | - -prefer-non-pic try to building non-PIC objects only |
| 22924 | + -prefer-pic try to build PIC objects only |
| 22925 | + -prefer-non-pic try to build non-PIC objects only |
| 22926 | -shared do not build a \`.o' file suitable for static linking |
| 22927 | -static only build a \`.o' file suitable for static linking |
| 22928 | -Wc,FLAG pass FLAG directly to the compiler |
| 22929 | @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." |
| 22930 | ;; |
| 22931 | |
| 22932 | *) |
| 22933 | - func_fatal_help "invalid operation mode \`$mode'" |
| 22934 | + func_fatal_help "invalid operation mode \`$opt_mode'" |
| 22935 | ;; |
| 22936 | esac |
| 22937 | |
| 22938 | @@ -1819,13 +2487,13 @@ if $opt_help; then |
| 22939 | else |
| 22940 | { |
| 22941 | func_help noexit |
| 22942 | - for mode in compile link execute install finish uninstall clean; do |
| 22943 | + for opt_mode in compile link execute install finish uninstall clean; do |
| 22944 | func_mode_help |
| 22945 | done |
| 22946 | } | sed -n '1p; 2,$s/^Usage:/ or: /p' |
| 22947 | { |
| 22948 | func_help noexit |
| 22949 | - for mode in compile link execute install finish uninstall clean; do |
| 22950 | + for opt_mode in compile link execute install finish uninstall clean; do |
| 22951 | echo |
| 22952 | func_mode_help |
| 22953 | done |
| 22954 | @@ -1854,13 +2522,16 @@ func_mode_execute () |
| 22955 | func_fatal_help "you must specify a COMMAND" |
| 22956 | |
| 22957 | # Handle -dlopen flags immediately. |
| 22958 | - for file in $execute_dlfiles; do |
| 22959 | + for file in $opt_dlopen; do |
| 22960 | test -f "$file" \ |
| 22961 | || func_fatal_help "\`$file' is not a file" |
| 22962 | |
| 22963 | dir= |
| 22964 | case $file in |
| 22965 | *.la) |
| 22966 | + func_resolve_sysroot "$file" |
| 22967 | + file=$func_resolve_sysroot_result |
| 22968 | + |
| 22969 | # Check to see that this really is a libtool archive. |
| 22970 | func_lalib_unsafe_p "$file" \ |
| 22971 | || func_fatal_help "\`$lib' is not a valid libtool archive" |
| 22972 | @@ -1882,7 +2553,7 @@ func_mode_execute () |
| 22973 | dir="$func_dirname_result" |
| 22974 | |
| 22975 | if test -f "$dir/$objdir/$dlname"; then |
| 22976 | - dir="$dir/$objdir" |
| 22977 | + func_append dir "/$objdir" |
| 22978 | else |
| 22979 | if test ! -f "$dir/$dlname"; then |
| 22980 | func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" |
| 22981 | @@ -1907,10 +2578,10 @@ func_mode_execute () |
| 22982 | test -n "$absdir" && dir="$absdir" |
| 22983 | |
| 22984 | # Now add the directory to shlibpath_var. |
| 22985 | - if eval test -z \"\$$shlibpath_var\"; then |
| 22986 | - eval $shlibpath_var=\$dir |
| 22987 | + if eval "test -z \"\$$shlibpath_var\""; then |
| 22988 | + eval "$shlibpath_var=\"\$dir\"" |
| 22989 | else |
| 22990 | - eval $shlibpath_var=\$dir:\$$shlibpath_var |
| 22991 | + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" |
| 22992 | fi |
| 22993 | done |
| 22994 | |
| 22995 | @@ -1939,8 +2610,7 @@ func_mode_execute () |
| 22996 | ;; |
| 22997 | esac |
| 22998 | # Quote arguments (to preserve shell metacharacters). |
| 22999 | - func_quote_for_eval "$file" |
| 23000 | - args="$args $func_quote_for_eval_result" |
| 23001 | + func_append_quoted args "$file" |
| 23002 | done |
| 23003 | |
| 23004 | if test "X$opt_dry_run" = Xfalse; then |
| 23005 | @@ -1972,22 +2642,59 @@ func_mode_execute () |
| 23006 | fi |
| 23007 | } |
| 23008 | |
| 23009 | -test "$mode" = execute && func_mode_execute ${1+"$@"} |
| 23010 | +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} |
| 23011 | |
| 23012 | |
| 23013 | # func_mode_finish arg... |
| 23014 | func_mode_finish () |
| 23015 | { |
| 23016 | $opt_debug |
| 23017 | - libdirs="$nonopt" |
| 23018 | + libs= |
| 23019 | + libdirs= |
| 23020 | admincmds= |
| 23021 | |
| 23022 | - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 23023 | - for dir |
| 23024 | - do |
| 23025 | - libdirs="$libdirs $dir" |
| 23026 | - done |
| 23027 | + for opt in "$nonopt" ${1+"$@"} |
| 23028 | + do |
| 23029 | + if test -d "$opt"; then |
| 23030 | + func_append libdirs " $opt" |
| 23031 | |
| 23032 | + elif test -f "$opt"; then |
| 23033 | + if func_lalib_unsafe_p "$opt"; then |
| 23034 | + func_append libs " $opt" |
| 23035 | + else |
| 23036 | + func_warning "\`$opt' is not a valid libtool archive" |
| 23037 | + fi |
| 23038 | + |
| 23039 | + else |
| 23040 | + func_fatal_error "invalid argument \`$opt'" |
| 23041 | + fi |
| 23042 | + done |
| 23043 | + |
| 23044 | + if test -n "$libs"; then |
| 23045 | + if test -n "$lt_sysroot"; then |
| 23046 | + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` |
| 23047 | + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" |
| 23048 | + else |
| 23049 | + sysroot_cmd= |
| 23050 | + fi |
| 23051 | + |
| 23052 | + # Remove sysroot references |
| 23053 | + if $opt_dry_run; then |
| 23054 | + for lib in $libs; do |
| 23055 | + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" |
| 23056 | + done |
| 23057 | + else |
| 23058 | + tmpdir=`func_mktempdir` |
| 23059 | + for lib in $libs; do |
| 23060 | + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ |
| 23061 | + > $tmpdir/tmp-la |
| 23062 | + mv -f $tmpdir/tmp-la $lib |
| 23063 | + done |
| 23064 | + ${RM}r "$tmpdir" |
| 23065 | + fi |
| 23066 | + fi |
| 23067 | + |
| 23068 | + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 23069 | for libdir in $libdirs; do |
| 23070 | if test -n "$finish_cmds"; then |
| 23071 | # Do each command in the finish commands. |
| 23072 | @@ -1997,7 +2704,7 @@ func_mode_finish () |
| 23073 | if test -n "$finish_eval"; then |
| 23074 | # Do the single finish_eval. |
| 23075 | eval cmds=\"$finish_eval\" |
| 23076 | - $opt_dry_run || eval "$cmds" || admincmds="$admincmds |
| 23077 | + $opt_dry_run || eval "$cmds" || func_append admincmds " |
| 23078 | $cmds" |
| 23079 | fi |
| 23080 | done |
| 23081 | @@ -2006,53 +2713,55 @@ func_mode_finish () |
| 23082 | # Exit here if they wanted silent mode. |
| 23083 | $opt_silent && exit $EXIT_SUCCESS |
| 23084 | |
| 23085 | - echo "----------------------------------------------------------------------" |
| 23086 | - echo "Libraries have been installed in:" |
| 23087 | - for libdir in $libdirs; do |
| 23088 | - $ECHO " $libdir" |
| 23089 | - done |
| 23090 | - echo |
| 23091 | - echo "If you ever happen to want to link against installed libraries" |
| 23092 | - echo "in a given directory, LIBDIR, you must either use libtool, and" |
| 23093 | - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" |
| 23094 | - echo "flag during linking and do at least one of the following:" |
| 23095 | - if test -n "$shlibpath_var"; then |
| 23096 | - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" |
| 23097 | - echo " during execution" |
| 23098 | - fi |
| 23099 | - if test -n "$runpath_var"; then |
| 23100 | - echo " - add LIBDIR to the \`$runpath_var' environment variable" |
| 23101 | - echo " during linking" |
| 23102 | - fi |
| 23103 | - if test -n "$hardcode_libdir_flag_spec"; then |
| 23104 | - libdir=LIBDIR |
| 23105 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 23106 | + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 23107 | + echo "----------------------------------------------------------------------" |
| 23108 | + echo "Libraries have been installed in:" |
| 23109 | + for libdir in $libdirs; do |
| 23110 | + $ECHO " $libdir" |
| 23111 | + done |
| 23112 | + echo |
| 23113 | + echo "If you ever happen to want to link against installed libraries" |
| 23114 | + echo "in a given directory, LIBDIR, you must either use libtool, and" |
| 23115 | + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" |
| 23116 | + echo "flag during linking and do at least one of the following:" |
| 23117 | + if test -n "$shlibpath_var"; then |
| 23118 | + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" |
| 23119 | + echo " during execution" |
| 23120 | + fi |
| 23121 | + if test -n "$runpath_var"; then |
| 23122 | + echo " - add LIBDIR to the \`$runpath_var' environment variable" |
| 23123 | + echo " during linking" |
| 23124 | + fi |
| 23125 | + if test -n "$hardcode_libdir_flag_spec"; then |
| 23126 | + libdir=LIBDIR |
| 23127 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 23128 | |
| 23129 | - $ECHO " - use the \`$flag' linker flag" |
| 23130 | - fi |
| 23131 | - if test -n "$admincmds"; then |
| 23132 | - $ECHO " - have your system administrator run these commands:$admincmds" |
| 23133 | - fi |
| 23134 | - if test -f /etc/ld.so.conf; then |
| 23135 | - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" |
| 23136 | - fi |
| 23137 | - echo |
| 23138 | + $ECHO " - use the \`$flag' linker flag" |
| 23139 | + fi |
| 23140 | + if test -n "$admincmds"; then |
| 23141 | + $ECHO " - have your system administrator run these commands:$admincmds" |
| 23142 | + fi |
| 23143 | + if test -f /etc/ld.so.conf; then |
| 23144 | + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" |
| 23145 | + fi |
| 23146 | + echo |
| 23147 | |
| 23148 | - echo "See any operating system documentation about shared libraries for" |
| 23149 | - case $host in |
| 23150 | - solaris2.[6789]|solaris2.1[0-9]) |
| 23151 | - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" |
| 23152 | - echo "pages." |
| 23153 | - ;; |
| 23154 | - *) |
| 23155 | - echo "more information, such as the ld(1) and ld.so(8) manual pages." |
| 23156 | - ;; |
| 23157 | - esac |
| 23158 | - echo "----------------------------------------------------------------------" |
| 23159 | + echo "See any operating system documentation about shared libraries for" |
| 23160 | + case $host in |
| 23161 | + solaris2.[6789]|solaris2.1[0-9]) |
| 23162 | + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" |
| 23163 | + echo "pages." |
| 23164 | + ;; |
| 23165 | + *) |
| 23166 | + echo "more information, such as the ld(1) and ld.so(8) manual pages." |
| 23167 | + ;; |
| 23168 | + esac |
| 23169 | + echo "----------------------------------------------------------------------" |
| 23170 | + fi |
| 23171 | exit $EXIT_SUCCESS |
| 23172 | } |
| 23173 | |
| 23174 | -test "$mode" = finish && func_mode_finish ${1+"$@"} |
| 23175 | +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} |
| 23176 | |
| 23177 | |
| 23178 | # func_mode_install arg... |
| 23179 | @@ -2077,7 +2786,7 @@ func_mode_install () |
| 23180 | # The real first argument should be the name of the installation program. |
| 23181 | # Aesthetically quote it. |
| 23182 | func_quote_for_eval "$arg" |
| 23183 | - install_prog="$install_prog$func_quote_for_eval_result" |
| 23184 | + func_append install_prog "$func_quote_for_eval_result" |
| 23185 | install_shared_prog=$install_prog |
| 23186 | case " $install_prog " in |
| 23187 | *[\\\ /]cp\ *) install_cp=: ;; |
| 23188 | @@ -2097,7 +2806,7 @@ func_mode_install () |
| 23189 | do |
| 23190 | arg2= |
| 23191 | if test -n "$dest"; then |
| 23192 | - files="$files $dest" |
| 23193 | + func_append files " $dest" |
| 23194 | dest=$arg |
| 23195 | continue |
| 23196 | fi |
| 23197 | @@ -2135,11 +2844,11 @@ func_mode_install () |
| 23198 | |
| 23199 | # Aesthetically quote the argument. |
| 23200 | func_quote_for_eval "$arg" |
| 23201 | - install_prog="$install_prog $func_quote_for_eval_result" |
| 23202 | + func_append install_prog " $func_quote_for_eval_result" |
| 23203 | if test -n "$arg2"; then |
| 23204 | func_quote_for_eval "$arg2" |
| 23205 | fi |
| 23206 | - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" |
| 23207 | + func_append install_shared_prog " $func_quote_for_eval_result" |
| 23208 | done |
| 23209 | |
| 23210 | test -z "$install_prog" && \ |
| 23211 | @@ -2151,7 +2860,7 @@ func_mode_install () |
| 23212 | if test -n "$install_override_mode" && $no_mode; then |
| 23213 | if $install_cp; then :; else |
| 23214 | func_quote_for_eval "$install_override_mode" |
| 23215 | - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" |
| 23216 | + func_append install_shared_prog " -m $func_quote_for_eval_result" |
| 23217 | fi |
| 23218 | fi |
| 23219 | |
| 23220 | @@ -2209,10 +2918,13 @@ func_mode_install () |
| 23221 | case $file in |
| 23222 | *.$libext) |
| 23223 | # Do the static libraries later. |
| 23224 | - staticlibs="$staticlibs $file" |
| 23225 | + func_append staticlibs " $file" |
| 23226 | ;; |
| 23227 | |
| 23228 | *.la) |
| 23229 | + func_resolve_sysroot "$file" |
| 23230 | + file=$func_resolve_sysroot_result |
| 23231 | + |
| 23232 | # Check to see that this really is a libtool archive. |
| 23233 | func_lalib_unsafe_p "$file" \ |
| 23234 | || func_fatal_help "\`$file' is not a valid libtool archive" |
| 23235 | @@ -2226,23 +2938,30 @@ func_mode_install () |
| 23236 | if test "X$destdir" = "X$libdir"; then |
| 23237 | case "$current_libdirs " in |
| 23238 | *" $libdir "*) ;; |
| 23239 | - *) current_libdirs="$current_libdirs $libdir" ;; |
| 23240 | + *) func_append current_libdirs " $libdir" ;; |
| 23241 | esac |
| 23242 | else |
| 23243 | # Note the libdir as a future libdir. |
| 23244 | case "$future_libdirs " in |
| 23245 | *" $libdir "*) ;; |
| 23246 | - *) future_libdirs="$future_libdirs $libdir" ;; |
| 23247 | + *) func_append future_libdirs " $libdir" ;; |
| 23248 | esac |
| 23249 | fi |
| 23250 | |
| 23251 | func_dirname "$file" "/" "" |
| 23252 | dir="$func_dirname_result" |
| 23253 | - dir="$dir$objdir" |
| 23254 | + func_append dir "$objdir" |
| 23255 | |
| 23256 | if test -n "$relink_command"; then |
| 23257 | + # Strip any trailing slash from the destination. |
| 23258 | + func_stripname '' '/' "$libdir" |
| 23259 | + destlibdir=$func_stripname_result |
| 23260 | + |
| 23261 | + func_stripname '' '/' "$destdir" |
| 23262 | + s_destdir=$func_stripname_result |
| 23263 | + |
| 23264 | # Determine the prefix the user has applied to our future dir. |
| 23265 | - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` |
| 23266 | + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` |
| 23267 | |
| 23268 | # Don't allow the user to place us outside of our expected |
| 23269 | # location b/c this prevents finding dependent libraries that |
| 23270 | @@ -2315,7 +3034,7 @@ func_mode_install () |
| 23271 | func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' |
| 23272 | |
| 23273 | # Maybe install the static library, too. |
| 23274 | - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |
| 23275 | + test -n "$old_library" && func_append staticlibs " $dir/$old_library" |
| 23276 | ;; |
| 23277 | |
| 23278 | *.lo) |
| 23279 | @@ -2503,7 +3222,7 @@ func_mode_install () |
| 23280 | test -n "$future_libdirs" && \ |
| 23281 | func_warning "remember to run \`$progname --finish$future_libdirs'" |
| 23282 | |
| 23283 | - if test -n "$current_libdirs" && $opt_finish; then |
| 23284 | + if test -n "$current_libdirs"; then |
| 23285 | # Maybe just do a dry run. |
| 23286 | $opt_dry_run && current_libdirs=" -n$current_libdirs" |
| 23287 | exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' |
| 23288 | @@ -2512,7 +3231,7 @@ func_mode_install () |
| 23289 | fi |
| 23290 | } |
| 23291 | |
| 23292 | -test "$mode" = install && func_mode_install ${1+"$@"} |
| 23293 | +test "$opt_mode" = install && func_mode_install ${1+"$@"} |
| 23294 | |
| 23295 | |
| 23296 | # func_generate_dlsyms outputname originator pic_p |
| 23297 | @@ -2559,6 +3278,18 @@ extern \"C\" { |
| 23298 | #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" |
| 23299 | #endif |
| 23300 | |
| 23301 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 23302 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 23303 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 23304 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 23305 | +# define LT_DLSYM_CONST |
| 23306 | +#elif defined(__osf__) |
| 23307 | +/* This system does not cope well with relocations in const data. */ |
| 23308 | +# define LT_DLSYM_CONST |
| 23309 | +#else |
| 23310 | +# define LT_DLSYM_CONST const |
| 23311 | +#endif |
| 23312 | + |
| 23313 | /* External symbol declarations for the compiler. */\ |
| 23314 | " |
| 23315 | |
| 23316 | @@ -2570,21 +3301,22 @@ extern \"C\" { |
| 23317 | # Add our own program objects to the symbol list. |
| 23318 | progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` |
| 23319 | for progfile in $progfiles; do |
| 23320 | - func_verbose "extracting global C symbols from \`$progfile'" |
| 23321 | - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" |
| 23322 | + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 |
| 23323 | + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" |
| 23324 | + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" |
| 23325 | done |
| 23326 | |
| 23327 | if test -n "$exclude_expsyms"; then |
| 23328 | $opt_dry_run || { |
| 23329 | - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T |
| 23330 | - $MV "$nlist"T "$nlist" |
| 23331 | + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' |
| 23332 | + eval '$MV "$nlist"T "$nlist"' |
| 23333 | } |
| 23334 | fi |
| 23335 | |
| 23336 | if test -n "$export_symbols_regex"; then |
| 23337 | $opt_dry_run || { |
| 23338 | - $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T |
| 23339 | - $MV "$nlist"T "$nlist" |
| 23340 | + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' |
| 23341 | + eval '$MV "$nlist"T "$nlist"' |
| 23342 | } |
| 23343 | fi |
| 23344 | |
| 23345 | @@ -2593,23 +3325,23 @@ extern \"C\" { |
| 23346 | export_symbols="$output_objdir/$outputname.exp" |
| 23347 | $opt_dry_run || { |
| 23348 | $RM $export_symbols |
| 23349 | - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" |
| 23350 | + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' |
| 23351 | case $host in |
| 23352 | *cygwin* | *mingw* | *cegcc* ) |
| 23353 | - echo EXPORTS > "$output_objdir/$outputname.def" |
| 23354 | - cat "$export_symbols" >> "$output_objdir/$outputname.def" |
| 23355 | + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' |
| 23356 | + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' |
| 23357 | ;; |
| 23358 | esac |
| 23359 | } |
| 23360 | else |
| 23361 | $opt_dry_run || { |
| 23362 | - ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" |
| 23363 | - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T |
| 23364 | - $MV "$nlist"T "$nlist" |
| 23365 | + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' |
| 23366 | + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' |
| 23367 | + eval '$MV "$nlist"T "$nlist"' |
| 23368 | case $host in |
| 23369 | *cygwin* | *mingw* | *cegcc* ) |
| 23370 | - echo EXPORTS > "$output_objdir/$outputname.def" |
| 23371 | - cat "$nlist" >> "$output_objdir/$outputname.def" |
| 23372 | + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' |
| 23373 | + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' |
| 23374 | ;; |
| 23375 | esac |
| 23376 | } |
| 23377 | @@ -2620,10 +3352,52 @@ extern \"C\" { |
| 23378 | func_verbose "extracting global C symbols from \`$dlprefile'" |
| 23379 | func_basename "$dlprefile" |
| 23380 | name="$func_basename_result" |
| 23381 | - $opt_dry_run || { |
| 23382 | - $ECHO ": $name " >> "$nlist" |
| 23383 | - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 23384 | - } |
| 23385 | + case $host in |
| 23386 | + *cygwin* | *mingw* | *cegcc* ) |
| 23387 | + # if an import library, we need to obtain dlname |
| 23388 | + if func_win32_import_lib_p "$dlprefile"; then |
| 23389 | + func_tr_sh "$dlprefile" |
| 23390 | + eval "curr_lafile=\$libfile_$func_tr_sh_result" |
| 23391 | + dlprefile_dlbasename="" |
| 23392 | + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then |
| 23393 | + # Use subshell, to avoid clobbering current variable values |
| 23394 | + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` |
| 23395 | + if test -n "$dlprefile_dlname" ; then |
| 23396 | + func_basename "$dlprefile_dlname" |
| 23397 | + dlprefile_dlbasename="$func_basename_result" |
| 23398 | + else |
| 23399 | + # no lafile. user explicitly requested -dlpreopen <import library>. |
| 23400 | + $sharedlib_from_linklib_cmd "$dlprefile" |
| 23401 | + dlprefile_dlbasename=$sharedlib_from_linklib_result |
| 23402 | + fi |
| 23403 | + fi |
| 23404 | + $opt_dry_run || { |
| 23405 | + if test -n "$dlprefile_dlbasename" ; then |
| 23406 | + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' |
| 23407 | + else |
| 23408 | + func_warning "Could not compute DLL name from $name" |
| 23409 | + eval '$ECHO ": $name " >> "$nlist"' |
| 23410 | + fi |
| 23411 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 23412 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | |
| 23413 | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" |
| 23414 | + } |
| 23415 | + else # not an import lib |
| 23416 | + $opt_dry_run || { |
| 23417 | + eval '$ECHO ": $name " >> "$nlist"' |
| 23418 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 23419 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 23420 | + } |
| 23421 | + fi |
| 23422 | + ;; |
| 23423 | + *) |
| 23424 | + $opt_dry_run || { |
| 23425 | + eval '$ECHO ": $name " >> "$nlist"' |
| 23426 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 23427 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 23428 | + } |
| 23429 | + ;; |
| 23430 | + esac |
| 23431 | done |
| 23432 | |
| 23433 | $opt_dry_run || { |
| 23434 | @@ -2661,26 +3435,9 @@ typedef struct { |
| 23435 | const char *name; |
| 23436 | void *address; |
| 23437 | } lt_dlsymlist; |
| 23438 | -" |
| 23439 | - case $host in |
| 23440 | - *cygwin* | *mingw* | *cegcc* ) |
| 23441 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 23442 | -/* DATA imports from DLLs on WIN32 con't be const, because |
| 23443 | - runtime relocations are performed -- see ld's documentation |
| 23444 | - on pseudo-relocs. */" |
| 23445 | - lt_dlsym_const= ;; |
| 23446 | - *osf5*) |
| 23447 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 23448 | -/* This system does not cope well with relocations in const data */" |
| 23449 | - lt_dlsym_const= ;; |
| 23450 | - *) |
| 23451 | - lt_dlsym_const=const ;; |
| 23452 | - esac |
| 23453 | - |
| 23454 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 23455 | -extern $lt_dlsym_const lt_dlsymlist |
| 23456 | +extern LT_DLSYM_CONST lt_dlsymlist |
| 23457 | lt_${my_prefix}_LTX_preloaded_symbols[]; |
| 23458 | -$lt_dlsym_const lt_dlsymlist |
| 23459 | +LT_DLSYM_CONST lt_dlsymlist |
| 23460 | lt_${my_prefix}_LTX_preloaded_symbols[] = |
| 23461 | {\ |
| 23462 | { \"$my_originator\", (void *) 0 }," |
| 23463 | @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { |
| 23464 | for arg in $LTCFLAGS; do |
| 23465 | case $arg in |
| 23466 | -pie | -fpie | -fPIE) ;; |
| 23467 | - *) symtab_cflags="$symtab_cflags $arg" ;; |
| 23468 | + *) func_append symtab_cflags " $arg" ;; |
| 23469 | esac |
| 23470 | done |
| 23471 | |
| 23472 | @@ -2796,9 +3553,11 @@ func_win32_libid () |
| 23473 | win32_libid_type="x86 archive import" |
| 23474 | ;; |
| 23475 | *ar\ archive*) # could be an import, or static |
| 23476 | - if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | |
| 23477 | - $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then |
| 23478 | - win32_nmres=`$NM -f posix -A "$1" | |
| 23479 | + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. |
| 23480 | + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | |
| 23481 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then |
| 23482 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 23483 | + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | |
| 23484 | $SED -n -e ' |
| 23485 | 1,100{ |
| 23486 | / I /{ |
| 23487 | @@ -2827,6 +3586,131 @@ func_win32_libid () |
| 23488 | $ECHO "$win32_libid_type" |
| 23489 | } |
| 23490 | |
| 23491 | +# func_cygming_dll_for_implib ARG |
| 23492 | +# |
| 23493 | +# Platform-specific function to extract the |
| 23494 | +# name of the DLL associated with the specified |
| 23495 | +# import library ARG. |
| 23496 | +# Invoked by eval'ing the libtool variable |
| 23497 | +# $sharedlib_from_linklib_cmd |
| 23498 | +# Result is available in the variable |
| 23499 | +# $sharedlib_from_linklib_result |
| 23500 | +func_cygming_dll_for_implib () |
| 23501 | +{ |
| 23502 | + $opt_debug |
| 23503 | + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` |
| 23504 | +} |
| 23505 | + |
| 23506 | +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs |
| 23507 | +# |
| 23508 | +# The is the core of a fallback implementation of a |
| 23509 | +# platform-specific function to extract the name of the |
| 23510 | +# DLL associated with the specified import library LIBNAME. |
| 23511 | +# |
| 23512 | +# SECTION_NAME is either .idata$6 or .idata$7, depending |
| 23513 | +# on the platform and compiler that created the implib. |
| 23514 | +# |
| 23515 | +# Echos the name of the DLL associated with the |
| 23516 | +# specified import library. |
| 23517 | +func_cygming_dll_for_implib_fallback_core () |
| 23518 | +{ |
| 23519 | + $opt_debug |
| 23520 | + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` |
| 23521 | + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | |
| 23522 | + $SED '/^Contents of section '"$match_literal"':/{ |
| 23523 | + # Place marker at beginning of archive member dllname section |
| 23524 | + s/.*/====MARK====/ |
| 23525 | + p |
| 23526 | + d |
| 23527 | + } |
| 23528 | + # These lines can sometimes be longer than 43 characters, but |
| 23529 | + # are always uninteresting |
| 23530 | + /:[ ]*file format pe[i]\{,1\}-/d |
| 23531 | + /^In archive [^:]*:/d |
| 23532 | + # Ensure marker is printed |
| 23533 | + /^====MARK====/p |
| 23534 | + # Remove all lines with less than 43 characters |
| 23535 | + /^.\{43\}/!d |
| 23536 | + # From remaining lines, remove first 43 characters |
| 23537 | + s/^.\{43\}//' | |
| 23538 | + $SED -n ' |
| 23539 | + # Join marker and all lines until next marker into a single line |
| 23540 | + /^====MARK====/ b para |
| 23541 | + H |
| 23542 | + $ b para |
| 23543 | + b |
| 23544 | + :para |
| 23545 | + x |
| 23546 | + s/\n//g |
| 23547 | + # Remove the marker |
| 23548 | + s/^====MARK====// |
| 23549 | + # Remove trailing dots and whitespace |
| 23550 | + s/[\. \t]*$// |
| 23551 | + # Print |
| 23552 | + /./p' | |
| 23553 | + # we now have a list, one entry per line, of the stringified |
| 23554 | + # contents of the appropriate section of all members of the |
| 23555 | + # archive which possess that section. Heuristic: eliminate |
| 23556 | + # all those which have a first or second character that is |
| 23557 | + # a '.' (that is, objdump's representation of an unprintable |
| 23558 | + # character.) This should work for all archives with less than |
| 23559 | + # 0x302f exports -- but will fail for DLLs whose name actually |
| 23560 | + # begins with a literal '.' or a single character followed by |
| 23561 | + # a '.'. |
| 23562 | + # |
| 23563 | + # Of those that remain, print the first one. |
| 23564 | + $SED -e '/^\./d;/^.\./d;q' |
| 23565 | +} |
| 23566 | + |
| 23567 | +# func_cygming_gnu_implib_p ARG |
| 23568 | +# This predicate returns with zero status (TRUE) if |
| 23569 | +# ARG is a GNU/binutils-style import library. Returns |
| 23570 | +# with nonzero status (FALSE) otherwise. |
| 23571 | +func_cygming_gnu_implib_p () |
| 23572 | +{ |
| 23573 | + $opt_debug |
| 23574 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 23575 | + 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)$'` |
| 23576 | + test -n "$func_cygming_gnu_implib_tmp" |
| 23577 | +} |
| 23578 | + |
| 23579 | +# func_cygming_ms_implib_p ARG |
| 23580 | +# This predicate returns with zero status (TRUE) if |
| 23581 | +# ARG is an MS-style import library. Returns |
| 23582 | +# with nonzero status (FALSE) otherwise. |
| 23583 | +func_cygming_ms_implib_p () |
| 23584 | +{ |
| 23585 | + $opt_debug |
| 23586 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 23587 | + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` |
| 23588 | + test -n "$func_cygming_ms_implib_tmp" |
| 23589 | +} |
| 23590 | + |
| 23591 | +# func_cygming_dll_for_implib_fallback ARG |
| 23592 | +# Platform-specific function to extract the |
| 23593 | +# name of the DLL associated with the specified |
| 23594 | +# import library ARG. |
| 23595 | +# |
| 23596 | +# This fallback implementation is for use when $DLLTOOL |
| 23597 | +# does not support the --identify-strict option. |
| 23598 | +# Invoked by eval'ing the libtool variable |
| 23599 | +# $sharedlib_from_linklib_cmd |
| 23600 | +# Result is available in the variable |
| 23601 | +# $sharedlib_from_linklib_result |
| 23602 | +func_cygming_dll_for_implib_fallback () |
| 23603 | +{ |
| 23604 | + $opt_debug |
| 23605 | + if func_cygming_gnu_implib_p "$1" ; then |
| 23606 | + # binutils import library |
| 23607 | + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` |
| 23608 | + elif func_cygming_ms_implib_p "$1" ; then |
| 23609 | + # ms-generated import library |
| 23610 | + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` |
| 23611 | + else |
| 23612 | + # unknown |
| 23613 | + sharedlib_from_linklib_result="" |
| 23614 | + fi |
| 23615 | +} |
| 23616 | |
| 23617 | |
| 23618 | # func_extract_an_archive dir oldlib |
| 23619 | @@ -2917,7 +3801,7 @@ func_extract_archives () |
| 23620 | darwin_file= |
| 23621 | darwin_files= |
| 23622 | for darwin_file in $darwin_filelist; do |
| 23623 | - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` |
| 23624 | + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` |
| 23625 | $LIPO -create -output "$darwin_file" $darwin_files |
| 23626 | done # $darwin_filelist |
| 23627 | $RM -rf unfat-$$ |
| 23628 | @@ -2932,7 +3816,7 @@ func_extract_archives () |
| 23629 | func_extract_an_archive "$my_xdir" "$my_xabs" |
| 23630 | ;; |
| 23631 | esac |
| 23632 | - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` |
| 23633 | + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` |
| 23634 | done |
| 23635 | |
| 23636 | func_extract_archives_result="$my_oldobjs" |
| 23637 | @@ -3014,7 +3898,110 @@ func_fallback_echo () |
| 23638 | _LTECHO_EOF' |
| 23639 | } |
| 23640 | ECHO=\"$qECHO\" |
| 23641 | - fi\ |
| 23642 | + fi |
| 23643 | + |
| 23644 | +# Very basic option parsing. These options are (a) specific to |
| 23645 | +# the libtool wrapper, (b) are identical between the wrapper |
| 23646 | +# /script/ and the wrapper /executable/ which is used only on |
| 23647 | +# windows platforms, and (c) all begin with the string "--lt-" |
| 23648 | +# (application programs are unlikely to have options which match |
| 23649 | +# this pattern). |
| 23650 | +# |
| 23651 | +# There are only two supported options: --lt-debug and |
| 23652 | +# --lt-dump-script. There is, deliberately, no --lt-help. |
| 23653 | +# |
| 23654 | +# The first argument to this parsing function should be the |
| 23655 | +# script's $0 value, followed by "$@". |
| 23656 | +lt_option_debug= |
| 23657 | +func_parse_lt_options () |
| 23658 | +{ |
| 23659 | + lt_script_arg0=\$0 |
| 23660 | + shift |
| 23661 | + for lt_opt |
| 23662 | + do |
| 23663 | + case \"\$lt_opt\" in |
| 23664 | + --lt-debug) lt_option_debug=1 ;; |
| 23665 | + --lt-dump-script) |
| 23666 | + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` |
| 23667 | + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. |
| 23668 | + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` |
| 23669 | + cat \"\$lt_dump_D/\$lt_dump_F\" |
| 23670 | + exit 0 |
| 23671 | + ;; |
| 23672 | + --lt-*) |
| 23673 | + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 |
| 23674 | + exit 1 |
| 23675 | + ;; |
| 23676 | + esac |
| 23677 | + done |
| 23678 | + |
| 23679 | + # Print the debug banner immediately: |
| 23680 | + if test -n \"\$lt_option_debug\"; then |
| 23681 | + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 |
| 23682 | + fi |
| 23683 | +} |
| 23684 | + |
| 23685 | +# Used when --lt-debug. Prints its arguments to stdout |
| 23686 | +# (redirection is the responsibility of the caller) |
| 23687 | +func_lt_dump_args () |
| 23688 | +{ |
| 23689 | + lt_dump_args_N=1; |
| 23690 | + for lt_arg |
| 23691 | + do |
| 23692 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" |
| 23693 | + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` |
| 23694 | + done |
| 23695 | +} |
| 23696 | + |
| 23697 | +# Core function for launching the target application |
| 23698 | +func_exec_program_core () |
| 23699 | +{ |
| 23700 | +" |
| 23701 | + case $host in |
| 23702 | + # Backslashes separate directories on plain windows |
| 23703 | + *-*-mingw | *-*-os2* | *-cegcc*) |
| 23704 | + $ECHO "\ |
| 23705 | + if test -n \"\$lt_option_debug\"; then |
| 23706 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 |
| 23707 | + func_lt_dump_args \${1+\"\$@\"} 1>&2 |
| 23708 | + fi |
| 23709 | + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} |
| 23710 | +" |
| 23711 | + ;; |
| 23712 | + |
| 23713 | + *) |
| 23714 | + $ECHO "\ |
| 23715 | + if test -n \"\$lt_option_debug\"; then |
| 23716 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 |
| 23717 | + func_lt_dump_args \${1+\"\$@\"} 1>&2 |
| 23718 | + fi |
| 23719 | + exec \"\$progdir/\$program\" \${1+\"\$@\"} |
| 23720 | +" |
| 23721 | + ;; |
| 23722 | + esac |
| 23723 | + $ECHO "\ |
| 23724 | + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 |
| 23725 | + exit 1 |
| 23726 | +} |
| 23727 | + |
| 23728 | +# A function to encapsulate launching the target application |
| 23729 | +# Strips options in the --lt-* namespace from \$@ and |
| 23730 | +# launches target application with the remaining arguments. |
| 23731 | +func_exec_program () |
| 23732 | +{ |
| 23733 | + for lt_wr_arg |
| 23734 | + do |
| 23735 | + case \$lt_wr_arg in |
| 23736 | + --lt-*) ;; |
| 23737 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
| 23738 | + esac |
| 23739 | + shift |
| 23740 | + done |
| 23741 | + func_exec_program_core \${1+\"\$@\"} |
| 23742 | +} |
| 23743 | + |
| 23744 | + # Parse options |
| 23745 | + func_parse_lt_options \"\$0\" \${1+\"\$@\"} |
| 23746 | |
| 23747 | # Find the directory that this script lives in. |
| 23748 | thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` |
| 23749 | @@ -3078,7 +4065,7 @@ _LTECHO_EOF' |
| 23750 | |
| 23751 | # relink executable if necessary |
| 23752 | if test -n \"\$relink_command\"; then |
| 23753 | - if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : |
| 23754 | + if relink_command_output=\`eval \$relink_command 2>&1\`; then : |
| 23755 | else |
| 23756 | $ECHO \"\$relink_command_output\" >&2 |
| 23757 | $RM \"\$progdir/\$file\" |
| 23758 | @@ -3102,6 +4089,18 @@ _LTECHO_EOF' |
| 23759 | |
| 23760 | if test -f \"\$progdir/\$program\"; then" |
| 23761 | |
| 23762 | + # fixup the dll searchpath if we need to. |
| 23763 | + # |
| 23764 | + # Fix the DLL searchpath if we need to. Do this before prepending |
| 23765 | + # to shlibpath, because on Windows, both are PATH and uninstalled |
| 23766 | + # libraries must come first. |
| 23767 | + if test -n "$dllsearchpath"; then |
| 23768 | + $ECHO "\ |
| 23769 | + # Add the dll search path components to the executable PATH |
| 23770 | + PATH=$dllsearchpath:\$PATH |
| 23771 | +" |
| 23772 | + fi |
| 23773 | + |
| 23774 | # Export our shlibpath_var if we have one. |
| 23775 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then |
| 23776 | $ECHO "\ |
| 23777 | @@ -3116,35 +4115,10 @@ _LTECHO_EOF' |
| 23778 | " |
| 23779 | fi |
| 23780 | |
| 23781 | - # fixup the dll searchpath if we need to. |
| 23782 | - if test -n "$dllsearchpath"; then |
| 23783 | - $ECHO "\ |
| 23784 | - # Add the dll search path components to the executable PATH |
| 23785 | - PATH=$dllsearchpath:\$PATH |
| 23786 | -" |
| 23787 | - fi |
| 23788 | - |
| 23789 | $ECHO "\ |
| 23790 | if test \"\$libtool_execute_magic\" != \"$magic\"; then |
| 23791 | # Run the actual program with our arguments. |
| 23792 | -" |
| 23793 | - case $host in |
| 23794 | - # Backslashes separate directories on plain windows |
| 23795 | - *-*-mingw | *-*-os2* | *-cegcc*) |
| 23796 | - $ECHO "\ |
| 23797 | - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} |
| 23798 | -" |
| 23799 | - ;; |
| 23800 | - |
| 23801 | - *) |
| 23802 | - $ECHO "\ |
| 23803 | - exec \"\$progdir/\$program\" \${1+\"\$@\"} |
| 23804 | -" |
| 23805 | - ;; |
| 23806 | - esac |
| 23807 | - $ECHO "\ |
| 23808 | - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 |
| 23809 | - exit 1 |
| 23810 | + func_exec_program \${1+\"\$@\"} |
| 23811 | fi |
| 23812 | else |
| 23813 | # The program doesn't exist. |
| 23814 | @@ -3158,166 +4132,6 @@ fi\ |
| 23815 | } |
| 23816 | |
| 23817 | |
| 23818 | -# func_to_host_path arg |
| 23819 | -# |
| 23820 | -# Convert paths to host format when used with build tools. |
| 23821 | -# Intended for use with "native" mingw (where libtool itself |
| 23822 | -# is running under the msys shell), or in the following cross- |
| 23823 | -# build environments: |
| 23824 | -# $build $host |
| 23825 | -# mingw (msys) mingw [e.g. native] |
| 23826 | -# cygwin mingw |
| 23827 | -# *nix + wine mingw |
| 23828 | -# where wine is equipped with the `winepath' executable. |
| 23829 | -# In the native mingw case, the (msys) shell automatically |
| 23830 | -# converts paths for any non-msys applications it launches, |
| 23831 | -# but that facility isn't available from inside the cwrapper. |
| 23832 | -# Similar accommodations are necessary for $host mingw and |
| 23833 | -# $build cygwin. Calling this function does no harm for other |
| 23834 | -# $host/$build combinations not listed above. |
| 23835 | -# |
| 23836 | -# ARG is the path (on $build) that should be converted to |
| 23837 | -# the proper representation for $host. The result is stored |
| 23838 | -# in $func_to_host_path_result. |
| 23839 | -func_to_host_path () |
| 23840 | -{ |
| 23841 | - func_to_host_path_result="$1" |
| 23842 | - if test -n "$1"; then |
| 23843 | - case $host in |
| 23844 | - *mingw* ) |
| 23845 | - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 23846 | - case $build in |
| 23847 | - *mingw* ) # actually, msys |
| 23848 | - # awkward: cmd appends spaces to result |
| 23849 | - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | |
| 23850 | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 23851 | - ;; |
| 23852 | - *cygwin* ) |
| 23853 | - func_to_host_path_result=`cygpath -w "$1" | |
| 23854 | - $SED -e "$lt_sed_naive_backslashify"` |
| 23855 | - ;; |
| 23856 | - * ) |
| 23857 | - # Unfortunately, winepath does not exit with a non-zero |
| 23858 | - # error code, so we are forced to check the contents of |
| 23859 | - # stdout. On the other hand, if the command is not |
| 23860 | - # found, the shell will set an exit code of 127 and print |
| 23861 | - # *an error message* to stdout. So we must check for both |
| 23862 | - # error code of zero AND non-empty stdout, which explains |
| 23863 | - # the odd construction: |
| 23864 | - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` |
| 23865 | - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then |
| 23866 | - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | |
| 23867 | - $SED -e "$lt_sed_naive_backslashify"` |
| 23868 | - else |
| 23869 | - # Allow warning below. |
| 23870 | - func_to_host_path_result= |
| 23871 | - fi |
| 23872 | - ;; |
| 23873 | - esac |
| 23874 | - if test -z "$func_to_host_path_result" ; then |
| 23875 | - func_error "Could not determine host path corresponding to" |
| 23876 | - func_error " \`$1'" |
| 23877 | - func_error "Continuing, but uninstalled executables may not work." |
| 23878 | - # Fallback: |
| 23879 | - func_to_host_path_result="$1" |
| 23880 | - fi |
| 23881 | - ;; |
| 23882 | - esac |
| 23883 | - fi |
| 23884 | -} |
| 23885 | -# end: func_to_host_path |
| 23886 | - |
| 23887 | -# func_to_host_pathlist arg |
| 23888 | -# |
| 23889 | -# Convert pathlists to host format when used with build tools. |
| 23890 | -# See func_to_host_path(), above. This function supports the |
| 23891 | -# following $build/$host combinations (but does no harm for |
| 23892 | -# combinations not listed here): |
| 23893 | -# $build $host |
| 23894 | -# mingw (msys) mingw [e.g. native] |
| 23895 | -# cygwin mingw |
| 23896 | -# *nix + wine mingw |
| 23897 | -# |
| 23898 | -# Path separators are also converted from $build format to |
| 23899 | -# $host format. If ARG begins or ends with a path separator |
| 23900 | -# character, it is preserved (but converted to $host format) |
| 23901 | -# on output. |
| 23902 | -# |
| 23903 | -# ARG is a pathlist (on $build) that should be converted to |
| 23904 | -# the proper representation on $host. The result is stored |
| 23905 | -# in $func_to_host_pathlist_result. |
| 23906 | -func_to_host_pathlist () |
| 23907 | -{ |
| 23908 | - func_to_host_pathlist_result="$1" |
| 23909 | - if test -n "$1"; then |
| 23910 | - case $host in |
| 23911 | - *mingw* ) |
| 23912 | - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 23913 | - # Remove leading and trailing path separator characters from |
| 23914 | - # ARG. msys behavior is inconsistent here, cygpath turns them |
| 23915 | - # into '.;' and ';.', and winepath ignores them completely. |
| 23916 | - func_stripname : : "$1" |
| 23917 | - func_to_host_pathlist_tmp1=$func_stripname_result |
| 23918 | - case $build in |
| 23919 | - *mingw* ) # Actually, msys. |
| 23920 | - # Awkward: cmd appends spaces to result. |
| 23921 | - func_to_host_pathlist_result=` |
| 23922 | - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | |
| 23923 | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 23924 | - ;; |
| 23925 | - *cygwin* ) |
| 23926 | - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | |
| 23927 | - $SED -e "$lt_sed_naive_backslashify"` |
| 23928 | - ;; |
| 23929 | - * ) |
| 23930 | - # unfortunately, winepath doesn't convert pathlists |
| 23931 | - func_to_host_pathlist_result="" |
| 23932 | - func_to_host_pathlist_oldIFS=$IFS |
| 23933 | - IFS=: |
| 23934 | - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do |
| 23935 | - IFS=$func_to_host_pathlist_oldIFS |
| 23936 | - if test -n "$func_to_host_pathlist_f" ; then |
| 23937 | - func_to_host_path "$func_to_host_pathlist_f" |
| 23938 | - if test -n "$func_to_host_path_result" ; then |
| 23939 | - if test -z "$func_to_host_pathlist_result" ; then |
| 23940 | - func_to_host_pathlist_result="$func_to_host_path_result" |
| 23941 | - else |
| 23942 | - func_append func_to_host_pathlist_result ";$func_to_host_path_result" |
| 23943 | - fi |
| 23944 | - fi |
| 23945 | - fi |
| 23946 | - done |
| 23947 | - IFS=$func_to_host_pathlist_oldIFS |
| 23948 | - ;; |
| 23949 | - esac |
| 23950 | - if test -z "$func_to_host_pathlist_result"; then |
| 23951 | - func_error "Could not determine the host path(s) corresponding to" |
| 23952 | - func_error " \`$1'" |
| 23953 | - func_error "Continuing, but uninstalled executables may not work." |
| 23954 | - # Fallback. This may break if $1 contains DOS-style drive |
| 23955 | - # specifications. The fix is not to complicate the expression |
| 23956 | - # below, but for the user to provide a working wine installation |
| 23957 | - # with winepath so that path translation in the cross-to-mingw |
| 23958 | - # case works properly. |
| 23959 | - lt_replace_pathsep_nix_to_dos="s|:|;|g" |
| 23960 | - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ |
| 23961 | - $SED -e "$lt_replace_pathsep_nix_to_dos"` |
| 23962 | - fi |
| 23963 | - # Now, add the leading and trailing path separators back |
| 23964 | - case "$1" in |
| 23965 | - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" |
| 23966 | - ;; |
| 23967 | - esac |
| 23968 | - case "$1" in |
| 23969 | - *: ) func_append func_to_host_pathlist_result ";" |
| 23970 | - ;; |
| 23971 | - esac |
| 23972 | - ;; |
| 23973 | - esac |
| 23974 | - fi |
| 23975 | -} |
| 23976 | -# end: func_to_host_pathlist |
| 23977 | - |
| 23978 | # func_emit_cwrapperexe_src |
| 23979 | # emit the source code for a wrapper executable on stdout |
| 23980 | # Must ONLY be called from within func_mode_link because |
| 23981 | @@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () |
| 23982 | |
| 23983 | This wrapper executable should never be moved out of the build directory. |
| 23984 | If it is, it will not operate correctly. |
| 23985 | - |
| 23986 | - Currently, it simply execs the wrapper *script* "$SHELL $output", |
| 23987 | - but could eventually absorb all of the scripts functionality and |
| 23988 | - exec $objdir/$outputname directly. |
| 23989 | */ |
| 23990 | EOF |
| 23991 | cat <<"EOF" |
| 23992 | @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); |
| 23993 | if (stale) { free ((void *) stale); stale = 0; } \ |
| 23994 | } while (0) |
| 23995 | |
| 23996 | -#undef LTWRAPPER_DEBUGPRINTF |
| 23997 | -#if defined LT_DEBUGWRAPPER |
| 23998 | -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args |
| 23999 | -static void |
| 24000 | -ltwrapper_debugprintf (const char *fmt, ...) |
| 24001 | -{ |
| 24002 | - va_list args; |
| 24003 | - va_start (args, fmt); |
| 24004 | - (void) vfprintf (stderr, fmt, args); |
| 24005 | - va_end (args); |
| 24006 | -} |
| 24007 | +#if defined(LT_DEBUGWRAPPER) |
| 24008 | +static int lt_debug = 1; |
| 24009 | #else |
| 24010 | -# define LTWRAPPER_DEBUGPRINTF(args) |
| 24011 | +static int lt_debug = 0; |
| 24012 | #endif |
| 24013 | |
| 24014 | -const char *program_name = NULL; |
| 24015 | +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ |
| 24016 | |
| 24017 | void *xmalloc (size_t num); |
| 24018 | char *xstrdup (const char *string); |
| 24019 | @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); |
| 24020 | int make_executable (const char *path); |
| 24021 | int check_executable (const char *path); |
| 24022 | char *strendzap (char *str, const char *pat); |
| 24023 | -void lt_fatal (const char *message, ...); |
| 24024 | +void lt_debugprintf (const char *file, int line, const char *fmt, ...); |
| 24025 | +void lt_fatal (const char *file, int line, const char *message, ...); |
| 24026 | +static const char *nonnull (const char *s); |
| 24027 | +static const char *nonempty (const char *s); |
| 24028 | void lt_setenv (const char *name, const char *value); |
| 24029 | char *lt_extend_str (const char *orig_value, const char *add, int to_end); |
| 24030 | void lt_update_exe_path (const char *name, const char *value); |
| 24031 | @@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); |
| 24032 | EOF |
| 24033 | |
| 24034 | cat <<EOF |
| 24035 | -const char * MAGIC_EXE = "$magic_exe"; |
| 24036 | +volatile const char * MAGIC_EXE = "$magic_exe"; |
| 24037 | const char * LIB_PATH_VARNAME = "$shlibpath_var"; |
| 24038 | EOF |
| 24039 | |
| 24040 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then |
| 24041 | - func_to_host_pathlist "$temp_rpath" |
| 24042 | + func_to_host_path "$temp_rpath" |
| 24043 | cat <<EOF |
| 24044 | -const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; |
| 24045 | +const char * LIB_PATH_VALUE = "$func_to_host_path_result"; |
| 24046 | EOF |
| 24047 | else |
| 24048 | cat <<"EOF" |
| 24049 | @@ -3513,10 +4317,10 @@ EOF |
| 24050 | fi |
| 24051 | |
| 24052 | if test -n "$dllsearchpath"; then |
| 24053 | - func_to_host_pathlist "$dllsearchpath:" |
| 24054 | + func_to_host_path "$dllsearchpath:" |
| 24055 | cat <<EOF |
| 24056 | const char * EXE_PATH_VARNAME = "PATH"; |
| 24057 | -const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; |
| 24058 | +const char * EXE_PATH_VALUE = "$func_to_host_path_result"; |
| 24059 | EOF |
| 24060 | else |
| 24061 | cat <<"EOF" |
| 24062 | @@ -3539,12 +4343,10 @@ EOF |
| 24063 | cat <<"EOF" |
| 24064 | |
| 24065 | #define LTWRAPPER_OPTION_PREFIX "--lt-" |
| 24066 | -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 |
| 24067 | |
| 24068 | -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; |
| 24069 | static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; |
| 24070 | - |
| 24071 | static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; |
| 24072 | +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; |
| 24073 | |
| 24074 | int |
| 24075 | main (int argc, char *argv[]) |
| 24076 | @@ -3561,10 +4363,13 @@ main (int argc, char *argv[]) |
| 24077 | int i; |
| 24078 | |
| 24079 | program_name = (char *) xstrdup (base_name (argv[0])); |
| 24080 | - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); |
| 24081 | - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); |
| 24082 | + newargz = XMALLOC (char *, argc + 1); |
| 24083 | |
| 24084 | - /* very simple arg parsing; don't want to rely on getopt */ |
| 24085 | + /* very simple arg parsing; don't want to rely on getopt |
| 24086 | + * also, copy all non cwrapper options to newargz, except |
| 24087 | + * argz[0], which is handled differently |
| 24088 | + */ |
| 24089 | + newargc=0; |
| 24090 | for (i = 1; i < argc; i++) |
| 24091 | { |
| 24092 | if (strcmp (argv[i], dumpscript_opt) == 0) |
| 24093 | @@ -3581,21 +4386,54 @@ EOF |
| 24094 | lt_dump_script (stdout); |
| 24095 | return 0; |
| 24096 | } |
| 24097 | + if (strcmp (argv[i], debug_opt) == 0) |
| 24098 | + { |
| 24099 | + lt_debug = 1; |
| 24100 | + continue; |
| 24101 | + } |
| 24102 | + if (strcmp (argv[i], ltwrapper_option_prefix) == 0) |
| 24103 | + { |
| 24104 | + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX |
| 24105 | + namespace, but it is not one of the ones we know about and |
| 24106 | + have already dealt with, above (inluding dump-script), then |
| 24107 | + report an error. Otherwise, targets might begin to believe |
| 24108 | + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX |
| 24109 | + namespace. The first time any user complains about this, we'll |
| 24110 | + need to make LTWRAPPER_OPTION_PREFIX a configure-time option |
| 24111 | + or a configure.ac-settable value. |
| 24112 | + */ |
| 24113 | + lt_fatal (__FILE__, __LINE__, |
| 24114 | + "unrecognized %s option: '%s'", |
| 24115 | + ltwrapper_option_prefix, argv[i]); |
| 24116 | + } |
| 24117 | + /* otherwise ... */ |
| 24118 | + newargz[++newargc] = xstrdup (argv[i]); |
| 24119 | } |
| 24120 | + newargz[++newargc] = NULL; |
| 24121 | + |
| 24122 | +EOF |
| 24123 | + cat <<EOF |
| 24124 | + /* The GNU banner must be the first non-error debug message */ |
| 24125 | + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); |
| 24126 | +EOF |
| 24127 | + cat <<"EOF" |
| 24128 | + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); |
| 24129 | + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); |
| 24130 | |
| 24131 | - newargz = XMALLOC (char *, argc + 1); |
| 24132 | tmp_pathspec = find_executable (argv[0]); |
| 24133 | if (tmp_pathspec == NULL) |
| 24134 | - lt_fatal ("Couldn't find %s", argv[0]); |
| 24135 | - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", |
| 24136 | - tmp_pathspec)); |
| 24137 | + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); |
| 24138 | + lt_debugprintf (__FILE__, __LINE__, |
| 24139 | + "(main) found exe (before symlink chase) at: %s\n", |
| 24140 | + tmp_pathspec); |
| 24141 | |
| 24142 | actual_cwrapper_path = chase_symlinks (tmp_pathspec); |
| 24143 | - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", |
| 24144 | - actual_cwrapper_path)); |
| 24145 | + lt_debugprintf (__FILE__, __LINE__, |
| 24146 | + "(main) found exe (after symlink chase) at: %s\n", |
| 24147 | + actual_cwrapper_path); |
| 24148 | XFREE (tmp_pathspec); |
| 24149 | |
| 24150 | - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); |
| 24151 | + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); |
| 24152 | strendzap (actual_cwrapper_path, actual_cwrapper_name); |
| 24153 | |
| 24154 | /* wrapper name transforms */ |
| 24155 | @@ -3613,8 +4451,9 @@ EOF |
| 24156 | target_name = tmp_pathspec; |
| 24157 | tmp_pathspec = 0; |
| 24158 | |
| 24159 | - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", |
| 24160 | - target_name)); |
| 24161 | + lt_debugprintf (__FILE__, __LINE__, |
| 24162 | + "(main) libtool target name: %s\n", |
| 24163 | + target_name); |
| 24164 | EOF |
| 24165 | |
| 24166 | cat <<EOF |
| 24167 | @@ -3664,35 +4503,19 @@ EOF |
| 24168 | |
| 24169 | lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ |
| 24170 | lt_setenv ("DUALCASE", "1"); /* for MSK sh */ |
| 24171 | - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); |
| 24172 | + /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must |
| 24173 | + be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) |
| 24174 | + because on Windows, both *_VARNAMEs are PATH but uninstalled |
| 24175 | + libraries must come first. */ |
| 24176 | lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); |
| 24177 | + lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); |
| 24178 | |
| 24179 | - newargc=0; |
| 24180 | - for (i = 1; i < argc; i++) |
| 24181 | - { |
| 24182 | - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) |
| 24183 | - { |
| 24184 | - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX |
| 24185 | - namespace, but it is not one of the ones we know about and |
| 24186 | - have already dealt with, above (inluding dump-script), then |
| 24187 | - report an error. Otherwise, targets might begin to believe |
| 24188 | - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX |
| 24189 | - namespace. The first time any user complains about this, we'll |
| 24190 | - need to make LTWRAPPER_OPTION_PREFIX a configure-time option |
| 24191 | - or a configure.ac-settable value. |
| 24192 | - */ |
| 24193 | - lt_fatal ("Unrecognized option in %s namespace: '%s'", |
| 24194 | - ltwrapper_option_prefix, argv[i]); |
| 24195 | - } |
| 24196 | - /* otherwise ... */ |
| 24197 | - newargz[++newargc] = xstrdup (argv[i]); |
| 24198 | - } |
| 24199 | - newargz[++newargc] = NULL; |
| 24200 | - |
| 24201 | - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); |
| 24202 | + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", |
| 24203 | + nonnull (lt_argv_zero)); |
| 24204 | for (i = 0; i < newargc; i++) |
| 24205 | { |
| 24206 | - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); |
| 24207 | + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", |
| 24208 | + i, nonnull (newargz[i])); |
| 24209 | } |
| 24210 | |
| 24211 | EOF |
| 24212 | @@ -3706,7 +4529,9 @@ EOF |
| 24213 | if (rval == -1) |
| 24214 | { |
| 24215 | /* failed to start process */ |
| 24216 | - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); |
| 24217 | + lt_debugprintf (__FILE__, __LINE__, |
| 24218 | + "(main) failed to launch target \"%s\": %s\n", |
| 24219 | + lt_argv_zero, nonnull (strerror (errno))); |
| 24220 | return 127; |
| 24221 | } |
| 24222 | return rval; |
| 24223 | @@ -3728,7 +4553,7 @@ xmalloc (size_t num) |
| 24224 | { |
| 24225 | void *p = (void *) malloc (num); |
| 24226 | if (!p) |
| 24227 | - lt_fatal ("Memory exhausted"); |
| 24228 | + lt_fatal (__FILE__, __LINE__, "memory exhausted"); |
| 24229 | |
| 24230 | return p; |
| 24231 | } |
| 24232 | @@ -3762,8 +4587,8 @@ check_executable (const char *path) |
| 24233 | { |
| 24234 | struct stat st; |
| 24235 | |
| 24236 | - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", |
| 24237 | - path ? (*path ? path : "EMPTY!") : "NULL!")); |
| 24238 | + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", |
| 24239 | + nonempty (path)); |
| 24240 | if ((!path) || (!*path)) |
| 24241 | return 0; |
| 24242 | |
| 24243 | @@ -3780,8 +4605,8 @@ make_executable (const char *path) |
| 24244 | int rval = 0; |
| 24245 | struct stat st; |
| 24246 | |
| 24247 | - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", |
| 24248 | - path ? (*path ? path : "EMPTY!") : "NULL!")); |
| 24249 | + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", |
| 24250 | + nonempty (path)); |
| 24251 | if ((!path) || (!*path)) |
| 24252 | return 0; |
| 24253 | |
| 24254 | @@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) |
| 24255 | int tmp_len; |
| 24256 | char *concat_name; |
| 24257 | |
| 24258 | - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", |
| 24259 | - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); |
| 24260 | + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", |
| 24261 | + nonempty (wrapper)); |
| 24262 | |
| 24263 | if ((wrapper == NULL) || (*wrapper == '\0')) |
| 24264 | return NULL; |
| 24265 | @@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) |
| 24266 | { |
| 24267 | /* empty path: current directory */ |
| 24268 | if (getcwd (tmp, LT_PATHMAX) == NULL) |
| 24269 | - lt_fatal ("getcwd failed"); |
| 24270 | + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", |
| 24271 | + nonnull (strerror (errno))); |
| 24272 | tmp_len = strlen (tmp); |
| 24273 | concat_name = |
| 24274 | XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); |
| 24275 | @@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) |
| 24276 | } |
| 24277 | /* Relative path | not found in path: prepend cwd */ |
| 24278 | if (getcwd (tmp, LT_PATHMAX) == NULL) |
| 24279 | - lt_fatal ("getcwd failed"); |
| 24280 | + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", |
| 24281 | + nonnull (strerror (errno))); |
| 24282 | tmp_len = strlen (tmp); |
| 24283 | concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); |
| 24284 | memcpy (concat_name, tmp, tmp_len); |
| 24285 | @@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) |
| 24286 | int has_symlinks = 0; |
| 24287 | while (strlen (tmp_pathspec) && !has_symlinks) |
| 24288 | { |
| 24289 | - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", |
| 24290 | - tmp_pathspec)); |
| 24291 | + lt_debugprintf (__FILE__, __LINE__, |
| 24292 | + "checking path component for symlinks: %s\n", |
| 24293 | + tmp_pathspec); |
| 24294 | if (lstat (tmp_pathspec, &s) == 0) |
| 24295 | { |
| 24296 | if (S_ISLNK (s.st_mode) != 0) |
| 24297 | @@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) |
| 24298 | } |
| 24299 | else |
| 24300 | { |
| 24301 | - char *errstr = strerror (errno); |
| 24302 | - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); |
| 24303 | + lt_fatal (__FILE__, __LINE__, |
| 24304 | + "error accessing file \"%s\": %s", |
| 24305 | + tmp_pathspec, nonnull (strerror (errno))); |
| 24306 | } |
| 24307 | } |
| 24308 | XFREE (tmp_pathspec); |
| 24309 | @@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) |
| 24310 | tmp_pathspec = realpath (pathspec, buf); |
| 24311 | if (tmp_pathspec == 0) |
| 24312 | { |
| 24313 | - lt_fatal ("Could not follow symlinks for %s", pathspec); |
| 24314 | + lt_fatal (__FILE__, __LINE__, |
| 24315 | + "could not follow symlinks for %s", pathspec); |
| 24316 | } |
| 24317 | return xstrdup (tmp_pathspec); |
| 24318 | #endif |
| 24319 | @@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) |
| 24320 | return str; |
| 24321 | } |
| 24322 | |
| 24323 | +void |
| 24324 | +lt_debugprintf (const char *file, int line, const char *fmt, ...) |
| 24325 | +{ |
| 24326 | + va_list args; |
| 24327 | + if (lt_debug) |
| 24328 | + { |
| 24329 | + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); |
| 24330 | + va_start (args, fmt); |
| 24331 | + (void) vfprintf (stderr, fmt, args); |
| 24332 | + va_end (args); |
| 24333 | + } |
| 24334 | +} |
| 24335 | + |
| 24336 | static void |
| 24337 | -lt_error_core (int exit_status, const char *mode, |
| 24338 | +lt_error_core (int exit_status, const char *file, |
| 24339 | + int line, const char *mode, |
| 24340 | const char *message, va_list ap) |
| 24341 | { |
| 24342 | - fprintf (stderr, "%s: %s: ", program_name, mode); |
| 24343 | + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); |
| 24344 | vfprintf (stderr, message, ap); |
| 24345 | fprintf (stderr, ".\n"); |
| 24346 | |
| 24347 | @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, |
| 24348 | } |
| 24349 | |
| 24350 | void |
| 24351 | -lt_fatal (const char *message, ...) |
| 24352 | +lt_fatal (const char *file, int line, const char *message, ...) |
| 24353 | { |
| 24354 | va_list ap; |
| 24355 | va_start (ap, message); |
| 24356 | - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); |
| 24357 | + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); |
| 24358 | va_end (ap); |
| 24359 | } |
| 24360 | |
| 24361 | +static const char * |
| 24362 | +nonnull (const char *s) |
| 24363 | +{ |
| 24364 | + return s ? s : "(null)"; |
| 24365 | +} |
| 24366 | + |
| 24367 | +static const char * |
| 24368 | +nonempty (const char *s) |
| 24369 | +{ |
| 24370 | + return (s && !*s) ? "(empty)" : nonnull (s); |
| 24371 | +} |
| 24372 | + |
| 24373 | void |
| 24374 | lt_setenv (const char *name, const char *value) |
| 24375 | { |
| 24376 | - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", |
| 24377 | - (name ? name : "<NULL>"), |
| 24378 | - (value ? value : "<NULL>"))); |
| 24379 | + lt_debugprintf (__FILE__, __LINE__, |
| 24380 | + "(lt_setenv) setting '%s' to '%s'\n", |
| 24381 | + nonnull (name), nonnull (value)); |
| 24382 | { |
| 24383 | #ifdef HAVE_SETENV |
| 24384 | /* always make a copy, for consistency with !HAVE_SETENV */ |
| 24385 | @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) |
| 24386 | void |
| 24387 | lt_update_exe_path (const char *name, const char *value) |
| 24388 | { |
| 24389 | - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", |
| 24390 | - (name ? name : "<NULL>"), |
| 24391 | - (value ? value : "<NULL>"))); |
| 24392 | + lt_debugprintf (__FILE__, __LINE__, |
| 24393 | + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", |
| 24394 | + nonnull (name), nonnull (value)); |
| 24395 | |
| 24396 | if (name && *name && value && *value) |
| 24397 | { |
| 24398 | @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) |
| 24399 | void |
| 24400 | lt_update_lib_path (const char *name, const char *value) |
| 24401 | { |
| 24402 | - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", |
| 24403 | - (name ? name : "<NULL>"), |
| 24404 | - (value ? value : "<NULL>"))); |
| 24405 | + lt_debugprintf (__FILE__, __LINE__, |
| 24406 | + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", |
| 24407 | + nonnull (name), nonnull (value)); |
| 24408 | |
| 24409 | if (name && *name && value && *value) |
| 24410 | { |
| 24411 | @@ -4222,7 +5078,7 @@ EOF |
| 24412 | func_win32_import_lib_p () |
| 24413 | { |
| 24414 | $opt_debug |
| 24415 | - case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in |
| 24416 | + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in |
| 24417 | *import*) : ;; |
| 24418 | *) false ;; |
| 24419 | esac |
| 24420 | @@ -4401,9 +5257,9 @@ func_mode_link () |
| 24421 | ;; |
| 24422 | *) |
| 24423 | if test "$prev" = dlfiles; then |
| 24424 | - dlfiles="$dlfiles $arg" |
| 24425 | + func_append dlfiles " $arg" |
| 24426 | else |
| 24427 | - dlprefiles="$dlprefiles $arg" |
| 24428 | + func_append dlprefiles " $arg" |
| 24429 | fi |
| 24430 | prev= |
| 24431 | continue |
| 24432 | @@ -4427,7 +5283,7 @@ func_mode_link () |
| 24433 | *-*-darwin*) |
| 24434 | case "$deplibs " in |
| 24435 | *" $qarg.ltframework "*) ;; |
| 24436 | - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later |
| 24437 | + *) func_append deplibs " $qarg.ltframework" # this is fixed later |
| 24438 | ;; |
| 24439 | esac |
| 24440 | ;; |
| 24441 | @@ -4446,7 +5302,7 @@ func_mode_link () |
| 24442 | moreargs= |
| 24443 | for fil in `cat "$save_arg"` |
| 24444 | do |
| 24445 | -# moreargs="$moreargs $fil" |
| 24446 | +# func_append moreargs " $fil" |
| 24447 | arg=$fil |
| 24448 | # A libtool-controlled object. |
| 24449 | |
| 24450 | @@ -4475,7 +5331,7 @@ func_mode_link () |
| 24451 | |
| 24452 | if test "$prev" = dlfiles; then |
| 24453 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then |
| 24454 | - dlfiles="$dlfiles $pic_object" |
| 24455 | + func_append dlfiles " $pic_object" |
| 24456 | prev= |
| 24457 | continue |
| 24458 | else |
| 24459 | @@ -4487,7 +5343,7 @@ func_mode_link () |
| 24460 | # CHECK ME: I think I busted this. -Ossama |
| 24461 | if test "$prev" = dlprefiles; then |
| 24462 | # Preload the old-style object. |
| 24463 | - dlprefiles="$dlprefiles $pic_object" |
| 24464 | + func_append dlprefiles " $pic_object" |
| 24465 | prev= |
| 24466 | fi |
| 24467 | |
| 24468 | @@ -4557,12 +5413,12 @@ func_mode_link () |
| 24469 | if test "$prev" = rpath; then |
| 24470 | case "$rpath " in |
| 24471 | *" $arg "*) ;; |
| 24472 | - *) rpath="$rpath $arg" ;; |
| 24473 | + *) func_append rpath " $arg" ;; |
| 24474 | esac |
| 24475 | else |
| 24476 | case "$xrpath " in |
| 24477 | *" $arg "*) ;; |
| 24478 | - *) xrpath="$xrpath $arg" ;; |
| 24479 | + *) func_append xrpath " $arg" ;; |
| 24480 | esac |
| 24481 | fi |
| 24482 | prev= |
| 24483 | @@ -4574,28 +5430,28 @@ func_mode_link () |
| 24484 | continue |
| 24485 | ;; |
| 24486 | weak) |
| 24487 | - weak_libs="$weak_libs $arg" |
| 24488 | + func_append weak_libs " $arg" |
| 24489 | prev= |
| 24490 | continue |
| 24491 | ;; |
| 24492 | xcclinker) |
| 24493 | - linker_flags="$linker_flags $qarg" |
| 24494 | - compiler_flags="$compiler_flags $qarg" |
| 24495 | + func_append linker_flags " $qarg" |
| 24496 | + func_append compiler_flags " $qarg" |
| 24497 | prev= |
| 24498 | func_append compile_command " $qarg" |
| 24499 | func_append finalize_command " $qarg" |
| 24500 | continue |
| 24501 | ;; |
| 24502 | xcompiler) |
| 24503 | - compiler_flags="$compiler_flags $qarg" |
| 24504 | + func_append compiler_flags " $qarg" |
| 24505 | prev= |
| 24506 | func_append compile_command " $qarg" |
| 24507 | func_append finalize_command " $qarg" |
| 24508 | continue |
| 24509 | ;; |
| 24510 | xlinker) |
| 24511 | - linker_flags="$linker_flags $qarg" |
| 24512 | - compiler_flags="$compiler_flags $wl$qarg" |
| 24513 | + func_append linker_flags " $qarg" |
| 24514 | + func_append compiler_flags " $wl$qarg" |
| 24515 | prev= |
| 24516 | func_append compile_command " $wl$qarg" |
| 24517 | func_append finalize_command " $wl$qarg" |
| 24518 | @@ -4686,15 +5542,16 @@ func_mode_link () |
| 24519 | ;; |
| 24520 | |
| 24521 | -L*) |
| 24522 | - func_stripname '-L' '' "$arg" |
| 24523 | - dir=$func_stripname_result |
| 24524 | - if test -z "$dir"; then |
| 24525 | + func_stripname "-L" '' "$arg" |
| 24526 | + if test -z "$func_stripname_result"; then |
| 24527 | if test "$#" -gt 0; then |
| 24528 | func_fatal_error "require no space between \`-L' and \`$1'" |
| 24529 | else |
| 24530 | func_fatal_error "need path for \`-L' option" |
| 24531 | fi |
| 24532 | fi |
| 24533 | + func_resolve_sysroot "$func_stripname_result" |
| 24534 | + dir=$func_resolve_sysroot_result |
| 24535 | # We need an absolute path. |
| 24536 | case $dir in |
| 24537 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
| 24538 | @@ -4706,10 +5563,16 @@ func_mode_link () |
| 24539 | ;; |
| 24540 | esac |
| 24541 | case "$deplibs " in |
| 24542 | - *" -L$dir "*) ;; |
| 24543 | + *" -L$dir "* | *" $arg "*) |
| 24544 | + # Will only happen for absolute or sysroot arguments |
| 24545 | + ;; |
| 24546 | *) |
| 24547 | - deplibs="$deplibs -L$dir" |
| 24548 | - lib_search_path="$lib_search_path $dir" |
| 24549 | + # Preserve sysroot, but never include relative directories |
| 24550 | + case $dir in |
| 24551 | + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; |
| 24552 | + *) func_append deplibs " -L$dir" ;; |
| 24553 | + esac |
| 24554 | + func_append lib_search_path " $dir" |
| 24555 | ;; |
| 24556 | esac |
| 24557 | case $host in |
| 24558 | @@ -4718,12 +5581,12 @@ func_mode_link () |
| 24559 | case :$dllsearchpath: in |
| 24560 | *":$dir:"*) ;; |
| 24561 | ::) dllsearchpath=$dir;; |
| 24562 | - *) dllsearchpath="$dllsearchpath:$dir";; |
| 24563 | + *) func_append dllsearchpath ":$dir";; |
| 24564 | esac |
| 24565 | case :$dllsearchpath: in |
| 24566 | *":$testbindir:"*) ;; |
| 24567 | ::) dllsearchpath=$testbindir;; |
| 24568 | - *) dllsearchpath="$dllsearchpath:$testbindir";; |
| 24569 | + *) func_append dllsearchpath ":$testbindir";; |
| 24570 | esac |
| 24571 | ;; |
| 24572 | esac |
| 24573 | @@ -4747,7 +5610,7 @@ func_mode_link () |
| 24574 | ;; |
| 24575 | *-*-rhapsody* | *-*-darwin1.[012]) |
| 24576 | # Rhapsody C and math libraries are in the System framework |
| 24577 | - deplibs="$deplibs System.ltframework" |
| 24578 | + func_append deplibs " System.ltframework" |
| 24579 | continue |
| 24580 | ;; |
| 24581 | *-*-sco3.2v5* | *-*-sco5v6*) |
| 24582 | @@ -4758,9 +5621,6 @@ func_mode_link () |
| 24583 | # Compiler inserts libc in the correct place for threads to work |
| 24584 | test "X$arg" = "X-lc" && continue |
| 24585 | ;; |
| 24586 | - *-*-linux*) |
| 24587 | - test "X$arg" = "X-lc" && continue |
| 24588 | - ;; |
| 24589 | esac |
| 24590 | elif test "X$arg" = "X-lc_r"; then |
| 24591 | case $host in |
| 24592 | @@ -4770,7 +5630,7 @@ func_mode_link () |
| 24593 | ;; |
| 24594 | esac |
| 24595 | fi |
| 24596 | - deplibs="$deplibs $arg" |
| 24597 | + func_append deplibs " $arg" |
| 24598 | continue |
| 24599 | ;; |
| 24600 | |
| 24601 | @@ -4782,8 +5642,8 @@ func_mode_link () |
| 24602 | # Tru64 UNIX uses -model [arg] to determine the layout of C++ |
| 24603 | # classes, name mangling, and exception handling. |
| 24604 | # Darwin uses the -arch flag to determine output architecture. |
| 24605 | - -model|-arch|-isysroot) |
| 24606 | - compiler_flags="$compiler_flags $arg" |
| 24607 | + -model|-arch|-isysroot|--sysroot) |
| 24608 | + func_append compiler_flags " $arg" |
| 24609 | func_append compile_command " $arg" |
| 24610 | func_append finalize_command " $arg" |
| 24611 | prev=xcompiler |
| 24612 | @@ -4791,12 +5651,12 @@ func_mode_link () |
| 24613 | ;; |
| 24614 | |
| 24615 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
| 24616 | - compiler_flags="$compiler_flags $arg" |
| 24617 | + func_append compiler_flags " $arg" |
| 24618 | func_append compile_command " $arg" |
| 24619 | func_append finalize_command " $arg" |
| 24620 | case "$new_inherited_linker_flags " in |
| 24621 | *" $arg "*) ;; |
| 24622 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; |
| 24623 | + * ) func_append new_inherited_linker_flags " $arg" ;; |
| 24624 | esac |
| 24625 | continue |
| 24626 | ;; |
| 24627 | @@ -4863,13 +5723,17 @@ func_mode_link () |
| 24628 | # We need an absolute path. |
| 24629 | case $dir in |
| 24630 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
| 24631 | + =*) |
| 24632 | + func_stripname '=' '' "$dir" |
| 24633 | + dir=$lt_sysroot$func_stripname_result |
| 24634 | + ;; |
| 24635 | *) |
| 24636 | func_fatal_error "only absolute run-paths are allowed" |
| 24637 | ;; |
| 24638 | esac |
| 24639 | case "$xrpath " in |
| 24640 | *" $dir "*) ;; |
| 24641 | - *) xrpath="$xrpath $dir" ;; |
| 24642 | + *) func_append xrpath " $dir" ;; |
| 24643 | esac |
| 24644 | continue |
| 24645 | ;; |
| 24646 | @@ -4922,8 +5786,8 @@ func_mode_link () |
| 24647 | for flag in $args; do |
| 24648 | IFS="$save_ifs" |
| 24649 | func_quote_for_eval "$flag" |
| 24650 | - arg="$arg $func_quote_for_eval_result" |
| 24651 | - compiler_flags="$compiler_flags $func_quote_for_eval_result" |
| 24652 | + func_append arg " $func_quote_for_eval_result" |
| 24653 | + func_append compiler_flags " $func_quote_for_eval_result" |
| 24654 | done |
| 24655 | IFS="$save_ifs" |
| 24656 | func_stripname ' ' '' "$arg" |
| 24657 | @@ -4938,9 +5802,9 @@ func_mode_link () |
| 24658 | for flag in $args; do |
| 24659 | IFS="$save_ifs" |
| 24660 | func_quote_for_eval "$flag" |
| 24661 | - arg="$arg $wl$func_quote_for_eval_result" |
| 24662 | - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" |
| 24663 | - linker_flags="$linker_flags $func_quote_for_eval_result" |
| 24664 | + func_append arg " $wl$func_quote_for_eval_result" |
| 24665 | + func_append compiler_flags " $wl$func_quote_for_eval_result" |
| 24666 | + func_append linker_flags " $func_quote_for_eval_result" |
| 24667 | done |
| 24668 | IFS="$save_ifs" |
| 24669 | func_stripname ' ' '' "$arg" |
| 24670 | @@ -4968,24 +5832,27 @@ func_mode_link () |
| 24671 | arg="$func_quote_for_eval_result" |
| 24672 | ;; |
| 24673 | |
| 24674 | - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler |
| 24675 | - # -r[0-9][0-9]* specifies the processor on the SGI compiler |
| 24676 | - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler |
| 24677 | - # +DA*, +DD* enable 64-bit mode on the HP compiler |
| 24678 | - # -q* pass through compiler args for the IBM compiler |
| 24679 | - # -m*, -t[45]*, -txscale* pass through architecture-specific |
| 24680 | - # compiler args for GCC |
| 24681 | - # -F/path gives path to uninstalled frameworks, gcc on darwin |
| 24682 | - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC |
| 24683 | - # @file GCC response files |
| 24684 | - # -tp=* Portland pgcc target processor selection |
| 24685 | + # Flags to be passed through unchanged, with rationale: |
| 24686 | + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler |
| 24687 | + # -r[0-9][0-9]* specify processor for the SGI compiler |
| 24688 | + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler |
| 24689 | + # +DA*, +DD* enable 64-bit mode for the HP compiler |
| 24690 | + # -q* compiler args for the IBM compiler |
| 24691 | + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC |
| 24692 | + # -F/path path to uninstalled frameworks, gcc on darwin |
| 24693 | + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC |
| 24694 | + # @file GCC response files |
| 24695 | + # -tp=* Portland pgcc target processor selection |
| 24696 | + # --sysroot=* for sysroot support |
| 24697 | + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization |
| 24698 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
| 24699 | - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) |
| 24700 | + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
| 24701 | + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) |
| 24702 | func_quote_for_eval "$arg" |
| 24703 | arg="$func_quote_for_eval_result" |
| 24704 | func_append compile_command " $arg" |
| 24705 | func_append finalize_command " $arg" |
| 24706 | - compiler_flags="$compiler_flags $arg" |
| 24707 | + func_append compiler_flags " $arg" |
| 24708 | continue |
| 24709 | ;; |
| 24710 | |
| 24711 | @@ -4997,7 +5864,7 @@ func_mode_link () |
| 24712 | |
| 24713 | *.$objext) |
| 24714 | # A standard object. |
| 24715 | - objs="$objs $arg" |
| 24716 | + func_append objs " $arg" |
| 24717 | ;; |
| 24718 | |
| 24719 | *.lo) |
| 24720 | @@ -5028,7 +5895,7 @@ func_mode_link () |
| 24721 | |
| 24722 | if test "$prev" = dlfiles; then |
| 24723 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then |
| 24724 | - dlfiles="$dlfiles $pic_object" |
| 24725 | + func_append dlfiles " $pic_object" |
| 24726 | prev= |
| 24727 | continue |
| 24728 | else |
| 24729 | @@ -5040,7 +5907,7 @@ func_mode_link () |
| 24730 | # CHECK ME: I think I busted this. -Ossama |
| 24731 | if test "$prev" = dlprefiles; then |
| 24732 | # Preload the old-style object. |
| 24733 | - dlprefiles="$dlprefiles $pic_object" |
| 24734 | + func_append dlprefiles " $pic_object" |
| 24735 | prev= |
| 24736 | fi |
| 24737 | |
| 24738 | @@ -5085,24 +5952,25 @@ func_mode_link () |
| 24739 | |
| 24740 | *.$libext) |
| 24741 | # An archive. |
| 24742 | - deplibs="$deplibs $arg" |
| 24743 | - old_deplibs="$old_deplibs $arg" |
| 24744 | + func_append deplibs " $arg" |
| 24745 | + func_append old_deplibs " $arg" |
| 24746 | continue |
| 24747 | ;; |
| 24748 | |
| 24749 | *.la) |
| 24750 | # A libtool-controlled library. |
| 24751 | |
| 24752 | + func_resolve_sysroot "$arg" |
| 24753 | if test "$prev" = dlfiles; then |
| 24754 | # This library was specified with -dlopen. |
| 24755 | - dlfiles="$dlfiles $arg" |
| 24756 | + func_append dlfiles " $func_resolve_sysroot_result" |
| 24757 | prev= |
| 24758 | elif test "$prev" = dlprefiles; then |
| 24759 | # The library was specified with -dlpreopen. |
| 24760 | - dlprefiles="$dlprefiles $arg" |
| 24761 | + func_append dlprefiles " $func_resolve_sysroot_result" |
| 24762 | prev= |
| 24763 | else |
| 24764 | - deplibs="$deplibs $arg" |
| 24765 | + func_append deplibs " $func_resolve_sysroot_result" |
| 24766 | fi |
| 24767 | continue |
| 24768 | ;; |
| 24769 | @@ -5127,7 +5995,7 @@ func_mode_link () |
| 24770 | func_fatal_help "the \`$prevarg' option requires an argument" |
| 24771 | |
| 24772 | if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then |
| 24773 | - eval "arg=\"$export_dynamic_flag_spec\"" |
| 24774 | + eval arg=\"$export_dynamic_flag_spec\" |
| 24775 | func_append compile_command " $arg" |
| 24776 | func_append finalize_command " $arg" |
| 24777 | fi |
| 24778 | @@ -5144,11 +6012,13 @@ func_mode_link () |
| 24779 | else |
| 24780 | shlib_search_path= |
| 24781 | fi |
| 24782 | - eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" |
| 24783 | - eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" |
| 24784 | + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" |
| 24785 | + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" |
| 24786 | |
| 24787 | func_dirname "$output" "/" "" |
| 24788 | output_objdir="$func_dirname_result$objdir" |
| 24789 | + func_to_tool_file "$output_objdir/" |
| 24790 | + tool_output_objdir=$func_to_tool_file_result |
| 24791 | # Create the object directory. |
| 24792 | func_mkdir_p "$output_objdir" |
| 24793 | |
| 24794 | @@ -5169,12 +6039,12 @@ func_mode_link () |
| 24795 | # Find all interdependent deplibs by searching for libraries |
| 24796 | # that are linked more than once (e.g. -la -lb -la) |
| 24797 | for deplib in $deplibs; do |
| 24798 | - if $opt_duplicate_deps ; then |
| 24799 | + if $opt_preserve_dup_deps ; then |
| 24800 | case "$libs " in |
| 24801 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 24802 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 24803 | esac |
| 24804 | fi |
| 24805 | - libs="$libs $deplib" |
| 24806 | + func_append libs " $deplib" |
| 24807 | done |
| 24808 | |
| 24809 | if test "$linkmode" = lib; then |
| 24810 | @@ -5187,9 +6057,9 @@ func_mode_link () |
| 24811 | if $opt_duplicate_compiler_generated_deps; then |
| 24812 | for pre_post_dep in $predeps $postdeps; do |
| 24813 | case "$pre_post_deps " in |
| 24814 | - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; |
| 24815 | + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; |
| 24816 | esac |
| 24817 | - pre_post_deps="$pre_post_deps $pre_post_dep" |
| 24818 | + func_append pre_post_deps " $pre_post_dep" |
| 24819 | done |
| 24820 | fi |
| 24821 | pre_post_deps= |
| 24822 | @@ -5256,8 +6126,9 @@ func_mode_link () |
| 24823 | for lib in $dlprefiles; do |
| 24824 | # Ignore non-libtool-libs |
| 24825 | dependency_libs= |
| 24826 | + func_resolve_sysroot "$lib" |
| 24827 | case $lib in |
| 24828 | - *.la) func_source "$lib" ;; |
| 24829 | + *.la) func_source "$func_resolve_sysroot_result" ;; |
| 24830 | esac |
| 24831 | |
| 24832 | # Collect preopened libtool deplibs, except any this library |
| 24833 | @@ -5267,7 +6138,7 @@ func_mode_link () |
| 24834 | deplib_base=$func_basename_result |
| 24835 | case " $weak_libs " in |
| 24836 | *" $deplib_base "*) ;; |
| 24837 | - *) deplibs="$deplibs $deplib" ;; |
| 24838 | + *) func_append deplibs " $deplib" ;; |
| 24839 | esac |
| 24840 | done |
| 24841 | done |
| 24842 | @@ -5288,11 +6159,11 @@ func_mode_link () |
| 24843 | compile_deplibs="$deplib $compile_deplibs" |
| 24844 | finalize_deplibs="$deplib $finalize_deplibs" |
| 24845 | else |
| 24846 | - compiler_flags="$compiler_flags $deplib" |
| 24847 | + func_append compiler_flags " $deplib" |
| 24848 | if test "$linkmode" = lib ; then |
| 24849 | case "$new_inherited_linker_flags " in |
| 24850 | *" $deplib "*) ;; |
| 24851 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; |
| 24852 | + * ) func_append new_inherited_linker_flags " $deplib" ;; |
| 24853 | esac |
| 24854 | fi |
| 24855 | fi |
| 24856 | @@ -5377,7 +6248,7 @@ func_mode_link () |
| 24857 | if test "$linkmode" = lib ; then |
| 24858 | case "$new_inherited_linker_flags " in |
| 24859 | *" $deplib "*) ;; |
| 24860 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; |
| 24861 | + * ) func_append new_inherited_linker_flags " $deplib" ;; |
| 24862 | esac |
| 24863 | fi |
| 24864 | fi |
| 24865 | @@ -5390,7 +6261,8 @@ func_mode_link () |
| 24866 | test "$pass" = conv && continue |
| 24867 | newdependency_libs="$deplib $newdependency_libs" |
| 24868 | func_stripname '-L' '' "$deplib" |
| 24869 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 24870 | + func_resolve_sysroot "$func_stripname_result" |
| 24871 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 24872 | ;; |
| 24873 | prog) |
| 24874 | if test "$pass" = conv; then |
| 24875 | @@ -5404,7 +6276,8 @@ func_mode_link () |
| 24876 | finalize_deplibs="$deplib $finalize_deplibs" |
| 24877 | fi |
| 24878 | func_stripname '-L' '' "$deplib" |
| 24879 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 24880 | + func_resolve_sysroot "$func_stripname_result" |
| 24881 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 24882 | ;; |
| 24883 | *) |
| 24884 | func_warning "\`-L' is ignored for archives/objects" |
| 24885 | @@ -5415,17 +6288,21 @@ func_mode_link () |
| 24886 | -R*) |
| 24887 | if test "$pass" = link; then |
| 24888 | func_stripname '-R' '' "$deplib" |
| 24889 | - dir=$func_stripname_result |
| 24890 | + func_resolve_sysroot "$func_stripname_result" |
| 24891 | + dir=$func_resolve_sysroot_result |
| 24892 | # Make sure the xrpath contains only unique directories. |
| 24893 | case "$xrpath " in |
| 24894 | *" $dir "*) ;; |
| 24895 | - *) xrpath="$xrpath $dir" ;; |
| 24896 | + *) func_append xrpath " $dir" ;; |
| 24897 | esac |
| 24898 | fi |
| 24899 | deplibs="$deplib $deplibs" |
| 24900 | continue |
| 24901 | ;; |
| 24902 | - *.la) lib="$deplib" ;; |
| 24903 | + *.la) |
| 24904 | + func_resolve_sysroot "$deplib" |
| 24905 | + lib=$func_resolve_sysroot_result |
| 24906 | + ;; |
| 24907 | *.$libext) |
| 24908 | if test "$pass" = conv; then |
| 24909 | deplibs="$deplib $deplibs" |
| 24910 | @@ -5488,11 +6365,11 @@ func_mode_link () |
| 24911 | if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
| 24912 | # If there is no dlopen support or we're linking statically, |
| 24913 | # we need to preload. |
| 24914 | - newdlprefiles="$newdlprefiles $deplib" |
| 24915 | + func_append newdlprefiles " $deplib" |
| 24916 | compile_deplibs="$deplib $compile_deplibs" |
| 24917 | finalize_deplibs="$deplib $finalize_deplibs" |
| 24918 | else |
| 24919 | - newdlfiles="$newdlfiles $deplib" |
| 24920 | + func_append newdlfiles " $deplib" |
| 24921 | fi |
| 24922 | fi |
| 24923 | continue |
| 24924 | @@ -5538,7 +6415,7 @@ func_mode_link () |
| 24925 | for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do |
| 24926 | case " $new_inherited_linker_flags " in |
| 24927 | *" $tmp_inherited_linker_flag "*) ;; |
| 24928 | - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; |
| 24929 | + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; |
| 24930 | esac |
| 24931 | done |
| 24932 | fi |
| 24933 | @@ -5546,8 +6423,8 @@ func_mode_link () |
| 24934 | if test "$linkmode,$pass" = "lib,link" || |
| 24935 | test "$linkmode,$pass" = "prog,scan" || |
| 24936 | { test "$linkmode" != prog && test "$linkmode" != lib; }; then |
| 24937 | - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" |
| 24938 | - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" |
| 24939 | + test -n "$dlopen" && func_append dlfiles " $dlopen" |
| 24940 | + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" |
| 24941 | fi |
| 24942 | |
| 24943 | if test "$pass" = conv; then |
| 24944 | @@ -5558,20 +6435,20 @@ func_mode_link () |
| 24945 | func_fatal_error "cannot find name of link library for \`$lib'" |
| 24946 | fi |
| 24947 | # It is a libtool convenience library, so add in its objects. |
| 24948 | - convenience="$convenience $ladir/$objdir/$old_library" |
| 24949 | - old_convenience="$old_convenience $ladir/$objdir/$old_library" |
| 24950 | + func_append convenience " $ladir/$objdir/$old_library" |
| 24951 | + func_append old_convenience " $ladir/$objdir/$old_library" |
| 24952 | elif test "$linkmode" != prog && test "$linkmode" != lib; then |
| 24953 | func_fatal_error "\`$lib' is not a convenience library" |
| 24954 | fi |
| 24955 | tmp_libs= |
| 24956 | for deplib in $dependency_libs; do |
| 24957 | deplibs="$deplib $deplibs" |
| 24958 | - if $opt_duplicate_deps ; then |
| 24959 | + if $opt_preserve_dup_deps ; then |
| 24960 | case "$tmp_libs " in |
| 24961 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 24962 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 24963 | esac |
| 24964 | fi |
| 24965 | - tmp_libs="$tmp_libs $deplib" |
| 24966 | + func_append tmp_libs " $deplib" |
| 24967 | done |
| 24968 | continue |
| 24969 | fi # $pass = conv |
| 24970 | @@ -5579,9 +6456,15 @@ func_mode_link () |
| 24971 | |
| 24972 | # Get the name of the library we link against. |
| 24973 | linklib= |
| 24974 | - for l in $old_library $library_names; do |
| 24975 | - linklib="$l" |
| 24976 | - done |
| 24977 | + if test -n "$old_library" && |
| 24978 | + { test "$prefer_static_libs" = yes || |
| 24979 | + test "$prefer_static_libs,$installed" = "built,no"; }; then |
| 24980 | + linklib=$old_library |
| 24981 | + else |
| 24982 | + for l in $old_library $library_names; do |
| 24983 | + linklib="$l" |
| 24984 | + done |
| 24985 | + fi |
| 24986 | if test -z "$linklib"; then |
| 24987 | func_fatal_error "cannot find name of link library for \`$lib'" |
| 24988 | fi |
| 24989 | @@ -5598,9 +6481,9 @@ func_mode_link () |
| 24990 | # statically, we need to preload. We also need to preload any |
| 24991 | # dependent libraries so libltdl's deplib preloader doesn't |
| 24992 | # bomb out in the load deplibs phase. |
| 24993 | - dlprefiles="$dlprefiles $lib $dependency_libs" |
| 24994 | + func_append dlprefiles " $lib $dependency_libs" |
| 24995 | else |
| 24996 | - newdlfiles="$newdlfiles $lib" |
| 24997 | + func_append newdlfiles " $lib" |
| 24998 | fi |
| 24999 | continue |
| 25000 | fi # $pass = dlopen |
| 25001 | @@ -5622,14 +6505,14 @@ func_mode_link () |
| 25002 | |
| 25003 | # Find the relevant object directory and library name. |
| 25004 | if test "X$installed" = Xyes; then |
| 25005 | - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
| 25006 | + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
| 25007 | func_warning "library \`$lib' was moved." |
| 25008 | dir="$ladir" |
| 25009 | absdir="$abs_ladir" |
| 25010 | libdir="$abs_ladir" |
| 25011 | else |
| 25012 | - dir="$libdir" |
| 25013 | - absdir="$libdir" |
| 25014 | + dir="$lt_sysroot$libdir" |
| 25015 | + absdir="$lt_sysroot$libdir" |
| 25016 | fi |
| 25017 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes |
| 25018 | else |
| 25019 | @@ -5637,12 +6520,12 @@ func_mode_link () |
| 25020 | dir="$ladir" |
| 25021 | absdir="$abs_ladir" |
| 25022 | # Remove this search path later |
| 25023 | - notinst_path="$notinst_path $abs_ladir" |
| 25024 | + func_append notinst_path " $abs_ladir" |
| 25025 | else |
| 25026 | dir="$ladir/$objdir" |
| 25027 | absdir="$abs_ladir/$objdir" |
| 25028 | # Remove this search path later |
| 25029 | - notinst_path="$notinst_path $abs_ladir" |
| 25030 | + func_append notinst_path " $abs_ladir" |
| 25031 | fi |
| 25032 | fi # $installed = yes |
| 25033 | func_stripname 'lib' '.la' "$laname" |
| 25034 | @@ -5653,20 +6536,46 @@ func_mode_link () |
| 25035 | if test -z "$libdir" && test "$linkmode" = prog; then |
| 25036 | func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" |
| 25037 | fi |
| 25038 | - # Prefer using a static library (so that no silly _DYNAMIC symbols |
| 25039 | - # are required to link). |
| 25040 | - if test -n "$old_library"; then |
| 25041 | - newdlprefiles="$newdlprefiles $dir/$old_library" |
| 25042 | - # Keep a list of preopened convenience libraries to check |
| 25043 | - # that they are being used correctly in the link pass. |
| 25044 | - test -z "$libdir" && \ |
| 25045 | - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" |
| 25046 | - # Otherwise, use the dlname, so that lt_dlopen finds it. |
| 25047 | - elif test -n "$dlname"; then |
| 25048 | - newdlprefiles="$newdlprefiles $dir/$dlname" |
| 25049 | - else |
| 25050 | - newdlprefiles="$newdlprefiles $dir/$linklib" |
| 25051 | - fi |
| 25052 | + case "$host" in |
| 25053 | + # special handling for platforms with PE-DLLs. |
| 25054 | + *cygwin* | *mingw* | *cegcc* ) |
| 25055 | + # Linker will automatically link against shared library if both |
| 25056 | + # static and shared are present. Therefore, ensure we extract |
| 25057 | + # symbols from the import library if a shared library is present |
| 25058 | + # (otherwise, the dlopen module name will be incorrect). We do |
| 25059 | + # this by putting the import library name into $newdlprefiles. |
| 25060 | + # We recover the dlopen module name by 'saving' the la file |
| 25061 | + # name in a special purpose variable, and (later) extracting the |
| 25062 | + # dlname from the la file. |
| 25063 | + if test -n "$dlname"; then |
| 25064 | + func_tr_sh "$dir/$linklib" |
| 25065 | + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" |
| 25066 | + func_append newdlprefiles " $dir/$linklib" |
| 25067 | + else |
| 25068 | + func_append newdlprefiles " $dir/$old_library" |
| 25069 | + # Keep a list of preopened convenience libraries to check |
| 25070 | + # that they are being used correctly in the link pass. |
| 25071 | + test -z "$libdir" && \ |
| 25072 | + func_append dlpreconveniencelibs " $dir/$old_library" |
| 25073 | + fi |
| 25074 | + ;; |
| 25075 | + * ) |
| 25076 | + # Prefer using a static library (so that no silly _DYNAMIC symbols |
| 25077 | + # are required to link). |
| 25078 | + if test -n "$old_library"; then |
| 25079 | + func_append newdlprefiles " $dir/$old_library" |
| 25080 | + # Keep a list of preopened convenience libraries to check |
| 25081 | + # that they are being used correctly in the link pass. |
| 25082 | + test -z "$libdir" && \ |
| 25083 | + func_append dlpreconveniencelibs " $dir/$old_library" |
| 25084 | + # Otherwise, use the dlname, so that lt_dlopen finds it. |
| 25085 | + elif test -n "$dlname"; then |
| 25086 | + func_append newdlprefiles " $dir/$dlname" |
| 25087 | + else |
| 25088 | + func_append newdlprefiles " $dir/$linklib" |
| 25089 | + fi |
| 25090 | + ;; |
| 25091 | + esac |
| 25092 | fi # $pass = dlpreopen |
| 25093 | |
| 25094 | if test -z "$libdir"; then |
| 25095 | @@ -5684,7 +6593,7 @@ func_mode_link () |
| 25096 | |
| 25097 | |
| 25098 | if test "$linkmode" = prog && test "$pass" != link; then |
| 25099 | - newlib_search_path="$newlib_search_path $ladir" |
| 25100 | + func_append newlib_search_path " $ladir" |
| 25101 | deplibs="$lib $deplibs" |
| 25102 | |
| 25103 | linkalldeplibs=no |
| 25104 | @@ -5697,7 +6606,8 @@ func_mode_link () |
| 25105 | for deplib in $dependency_libs; do |
| 25106 | case $deplib in |
| 25107 | -L*) func_stripname '-L' '' "$deplib" |
| 25108 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 25109 | + func_resolve_sysroot "$func_stripname_result" |
| 25110 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 25111 | ;; |
| 25112 | esac |
| 25113 | # Need to link against all dependency_libs? |
| 25114 | @@ -5708,12 +6618,12 @@ func_mode_link () |
| 25115 | # or/and link against static libraries |
| 25116 | newdependency_libs="$deplib $newdependency_libs" |
| 25117 | fi |
| 25118 | - if $opt_duplicate_deps ; then |
| 25119 | + if $opt_preserve_dup_deps ; then |
| 25120 | case "$tmp_libs " in |
| 25121 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 25122 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 25123 | esac |
| 25124 | fi |
| 25125 | - tmp_libs="$tmp_libs $deplib" |
| 25126 | + func_append tmp_libs " $deplib" |
| 25127 | done # for deplib |
| 25128 | continue |
| 25129 | fi # $linkmode = prog... |
| 25130 | @@ -5728,7 +6638,7 @@ func_mode_link () |
| 25131 | # Make sure the rpath contains only unique directories. |
| 25132 | case "$temp_rpath:" in |
| 25133 | *"$absdir:"*) ;; |
| 25134 | - *) temp_rpath="$temp_rpath$absdir:" ;; |
| 25135 | + *) func_append temp_rpath "$absdir:" ;; |
| 25136 | esac |
| 25137 | fi |
| 25138 | |
| 25139 | @@ -5740,7 +6650,7 @@ func_mode_link () |
| 25140 | *) |
| 25141 | case "$compile_rpath " in |
| 25142 | *" $absdir "*) ;; |
| 25143 | - *) compile_rpath="$compile_rpath $absdir" |
| 25144 | + *) func_append compile_rpath " $absdir" ;; |
| 25145 | esac |
| 25146 | ;; |
| 25147 | esac |
| 25148 | @@ -5749,7 +6659,7 @@ func_mode_link () |
| 25149 | *) |
| 25150 | case "$finalize_rpath " in |
| 25151 | *" $libdir "*) ;; |
| 25152 | - *) finalize_rpath="$finalize_rpath $libdir" |
| 25153 | + *) func_append finalize_rpath " $libdir" ;; |
| 25154 | esac |
| 25155 | ;; |
| 25156 | esac |
| 25157 | @@ -5774,12 +6684,12 @@ func_mode_link () |
| 25158 | case $host in |
| 25159 | *cygwin* | *mingw* | *cegcc*) |
| 25160 | # No point in relinking DLLs because paths are not encoded |
| 25161 | - notinst_deplibs="$notinst_deplibs $lib" |
| 25162 | + func_append notinst_deplibs " $lib" |
| 25163 | need_relink=no |
| 25164 | ;; |
| 25165 | *) |
| 25166 | if test "$installed" = no; then |
| 25167 | - notinst_deplibs="$notinst_deplibs $lib" |
| 25168 | + func_append notinst_deplibs " $lib" |
| 25169 | need_relink=yes |
| 25170 | fi |
| 25171 | ;; |
| 25172 | @@ -5814,7 +6724,7 @@ func_mode_link () |
| 25173 | *) |
| 25174 | case "$compile_rpath " in |
| 25175 | *" $absdir "*) ;; |
| 25176 | - *) compile_rpath="$compile_rpath $absdir" |
| 25177 | + *) func_append compile_rpath " $absdir" ;; |
| 25178 | esac |
| 25179 | ;; |
| 25180 | esac |
| 25181 | @@ -5823,7 +6733,7 @@ func_mode_link () |
| 25182 | *) |
| 25183 | case "$finalize_rpath " in |
| 25184 | *" $libdir "*) ;; |
| 25185 | - *) finalize_rpath="$finalize_rpath $libdir" |
| 25186 | + *) func_append finalize_rpath " $libdir" ;; |
| 25187 | esac |
| 25188 | ;; |
| 25189 | esac |
| 25190 | @@ -5835,7 +6745,7 @@ func_mode_link () |
| 25191 | shift |
| 25192 | realname="$1" |
| 25193 | shift |
| 25194 | - eval "libname=\"$libname_spec\"" |
| 25195 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 25196 | # use dlname if we got it. it's perfectly good, no? |
| 25197 | if test -n "$dlname"; then |
| 25198 | soname="$dlname" |
| 25199 | @@ -5848,7 +6758,7 @@ func_mode_link () |
| 25200 | versuffix="-$major" |
| 25201 | ;; |
| 25202 | esac |
| 25203 | - eval "soname=\"$soname_spec\"" |
| 25204 | + eval soname=\"$soname_spec\" |
| 25205 | else |
| 25206 | soname="$realname" |
| 25207 | fi |
| 25208 | @@ -5877,7 +6787,7 @@ func_mode_link () |
| 25209 | linklib=$newlib |
| 25210 | fi # test -n "$old_archive_from_expsyms_cmds" |
| 25211 | |
| 25212 | - if test "$linkmode" = prog || test "$mode" != relink; then |
| 25213 | + if test "$linkmode" = prog || test "$opt_mode" != relink; then |
| 25214 | add_shlibpath= |
| 25215 | add_dir= |
| 25216 | add= |
| 25217 | @@ -5933,7 +6843,7 @@ func_mode_link () |
| 25218 | if test -n "$inst_prefix_dir"; then |
| 25219 | case $libdir in |
| 25220 | [\\/]*) |
| 25221 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 25222 | + func_append add_dir " -L$inst_prefix_dir$libdir" |
| 25223 | ;; |
| 25224 | esac |
| 25225 | fi |
| 25226 | @@ -5955,7 +6865,7 @@ func_mode_link () |
| 25227 | if test -n "$add_shlibpath"; then |
| 25228 | case :$compile_shlibpath: in |
| 25229 | *":$add_shlibpath:"*) ;; |
| 25230 | - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; |
| 25231 | + *) func_append compile_shlibpath "$add_shlibpath:" ;; |
| 25232 | esac |
| 25233 | fi |
| 25234 | if test "$linkmode" = prog; then |
| 25235 | @@ -5969,13 +6879,13 @@ func_mode_link () |
| 25236 | test "$hardcode_shlibpath_var" = yes; then |
| 25237 | case :$finalize_shlibpath: in |
| 25238 | *":$libdir:"*) ;; |
| 25239 | - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |
| 25240 | + *) func_append finalize_shlibpath "$libdir:" ;; |
| 25241 | esac |
| 25242 | fi |
| 25243 | fi |
| 25244 | fi |
| 25245 | |
| 25246 | - if test "$linkmode" = prog || test "$mode" = relink; then |
| 25247 | + if test "$linkmode" = prog || test "$opt_mode" = relink; then |
| 25248 | add_shlibpath= |
| 25249 | add_dir= |
| 25250 | add= |
| 25251 | @@ -5989,7 +6899,7 @@ func_mode_link () |
| 25252 | elif test "$hardcode_shlibpath_var" = yes; then |
| 25253 | case :$finalize_shlibpath: in |
| 25254 | *":$libdir:"*) ;; |
| 25255 | - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |
| 25256 | + *) func_append finalize_shlibpath "$libdir:" ;; |
| 25257 | esac |
| 25258 | add="-l$name" |
| 25259 | elif test "$hardcode_automatic" = yes; then |
| 25260 | @@ -6001,12 +6911,12 @@ func_mode_link () |
| 25261 | fi |
| 25262 | else |
| 25263 | # We cannot seem to hardcode it, guess we'll fake it. |
| 25264 | - add_dir="-L$libdir" |
| 25265 | + add_dir="-L$lt_sysroot$libdir" |
| 25266 | # Try looking first in the location we're being installed to. |
| 25267 | if test -n "$inst_prefix_dir"; then |
| 25268 | case $libdir in |
| 25269 | [\\/]*) |
| 25270 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 25271 | + func_append add_dir " -L$inst_prefix_dir$libdir" |
| 25272 | ;; |
| 25273 | esac |
| 25274 | fi |
| 25275 | @@ -6083,27 +6993,33 @@ func_mode_link () |
| 25276 | temp_xrpath=$func_stripname_result |
| 25277 | case " $xrpath " in |
| 25278 | *" $temp_xrpath "*) ;; |
| 25279 | - *) xrpath="$xrpath $temp_xrpath";; |
| 25280 | + *) func_append xrpath " $temp_xrpath";; |
| 25281 | esac;; |
| 25282 | - *) temp_deplibs="$temp_deplibs $libdir";; |
| 25283 | + *) func_append temp_deplibs " $libdir";; |
| 25284 | esac |
| 25285 | done |
| 25286 | dependency_libs="$temp_deplibs" |
| 25287 | fi |
| 25288 | |
| 25289 | - newlib_search_path="$newlib_search_path $absdir" |
| 25290 | + func_append newlib_search_path " $absdir" |
| 25291 | # Link against this library |
| 25292 | test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" |
| 25293 | # ... and its dependency_libs |
| 25294 | tmp_libs= |
| 25295 | for deplib in $dependency_libs; do |
| 25296 | newdependency_libs="$deplib $newdependency_libs" |
| 25297 | - if $opt_duplicate_deps ; then |
| 25298 | + case $deplib in |
| 25299 | + -L*) func_stripname '-L' '' "$deplib" |
| 25300 | + func_resolve_sysroot "$func_stripname_result";; |
| 25301 | + *) func_resolve_sysroot "$deplib" ;; |
| 25302 | + esac |
| 25303 | + if $opt_preserve_dup_deps ; then |
| 25304 | case "$tmp_libs " in |
| 25305 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 25306 | + *" $func_resolve_sysroot_result "*) |
| 25307 | + func_append specialdeplibs " $func_resolve_sysroot_result" ;; |
| 25308 | esac |
| 25309 | fi |
| 25310 | - tmp_libs="$tmp_libs $deplib" |
| 25311 | + func_append tmp_libs " $func_resolve_sysroot_result" |
| 25312 | done |
| 25313 | |
| 25314 | if test "$link_all_deplibs" != no; then |
| 25315 | @@ -6113,8 +7029,10 @@ func_mode_link () |
| 25316 | case $deplib in |
| 25317 | -L*) path="$deplib" ;; |
| 25318 | *.la) |
| 25319 | + func_resolve_sysroot "$deplib" |
| 25320 | + deplib=$func_resolve_sysroot_result |
| 25321 | func_dirname "$deplib" "" "." |
| 25322 | - dir="$func_dirname_result" |
| 25323 | + dir=$func_dirname_result |
| 25324 | # We need an absolute path. |
| 25325 | case $dir in |
| 25326 | [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; |
| 25327 | @@ -6130,7 +7048,7 @@ func_mode_link () |
| 25328 | case $host in |
| 25329 | *-*-darwin*) |
| 25330 | depdepl= |
| 25331 | - deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 25332 | + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 25333 | if test -n "$deplibrary_names" ; then |
| 25334 | for tmp in $deplibrary_names ; do |
| 25335 | depdepl=$tmp |
| 25336 | @@ -6141,8 +7059,8 @@ func_mode_link () |
| 25337 | if test -z "$darwin_install_name"; then |
| 25338 | darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` |
| 25339 | fi |
| 25340 | - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" |
| 25341 | - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" |
| 25342 | + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" |
| 25343 | + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" |
| 25344 | path= |
| 25345 | fi |
| 25346 | fi |
| 25347 | @@ -6152,7 +7070,7 @@ func_mode_link () |
| 25348 | ;; |
| 25349 | esac |
| 25350 | else |
| 25351 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 25352 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 25353 | test -z "$libdir" && \ |
| 25354 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
| 25355 | test "$absdir" != "$libdir" && \ |
| 25356 | @@ -6192,7 +7110,7 @@ func_mode_link () |
| 25357 | for dir in $newlib_search_path; do |
| 25358 | case "$lib_search_path " in |
| 25359 | *" $dir "*) ;; |
| 25360 | - *) lib_search_path="$lib_search_path $dir" ;; |
| 25361 | + *) func_append lib_search_path " $dir" ;; |
| 25362 | esac |
| 25363 | done |
| 25364 | newlib_search_path= |
| 25365 | @@ -6205,7 +7123,7 @@ func_mode_link () |
| 25366 | fi |
| 25367 | for var in $vars dependency_libs; do |
| 25368 | # Add libraries to $var in reverse order |
| 25369 | - eval tmp_libs=\$$var |
| 25370 | + eval tmp_libs=\"\$$var\" |
| 25371 | new_libs= |
| 25372 | for deplib in $tmp_libs; do |
| 25373 | # FIXME: Pedantically, this is the right thing to do, so |
| 25374 | @@ -6250,13 +7168,13 @@ func_mode_link () |
| 25375 | -L*) |
| 25376 | case " $tmp_libs " in |
| 25377 | *" $deplib "*) ;; |
| 25378 | - *) tmp_libs="$tmp_libs $deplib" ;; |
| 25379 | + *) func_append tmp_libs " $deplib" ;; |
| 25380 | esac |
| 25381 | ;; |
| 25382 | - *) tmp_libs="$tmp_libs $deplib" ;; |
| 25383 | + *) func_append tmp_libs " $deplib" ;; |
| 25384 | esac |
| 25385 | done |
| 25386 | - eval $var=\$tmp_libs |
| 25387 | + eval $var=\"$tmp_libs\" |
| 25388 | done # for var |
| 25389 | fi |
| 25390 | # Last step: remove runtime libs from dependency_libs |
| 25391 | @@ -6269,7 +7187,7 @@ func_mode_link () |
| 25392 | ;; |
| 25393 | esac |
| 25394 | if test -n "$i" ; then |
| 25395 | - tmp_libs="$tmp_libs $i" |
| 25396 | + func_append tmp_libs " $i" |
| 25397 | fi |
| 25398 | done |
| 25399 | dependency_libs=$tmp_libs |
| 25400 | @@ -6310,7 +7228,7 @@ func_mode_link () |
| 25401 | # Now set the variables for building old libraries. |
| 25402 | build_libtool_libs=no |
| 25403 | oldlibs="$output" |
| 25404 | - objs="$objs$old_deplibs" |
| 25405 | + func_append objs "$old_deplibs" |
| 25406 | ;; |
| 25407 | |
| 25408 | lib) |
| 25409 | @@ -6319,8 +7237,8 @@ func_mode_link () |
| 25410 | lib*) |
| 25411 | func_stripname 'lib' '.la' "$outputname" |
| 25412 | name=$func_stripname_result |
| 25413 | - eval "shared_ext=\"$shrext_cmds\"" |
| 25414 | - eval "libname=\"$libname_spec\"" |
| 25415 | + eval shared_ext=\"$shrext_cmds\" |
| 25416 | + eval libname=\"$libname_spec\" |
| 25417 | ;; |
| 25418 | *) |
| 25419 | test "$module" = no && \ |
| 25420 | @@ -6330,8 +7248,8 @@ func_mode_link () |
| 25421 | # Add the "lib" prefix for modules if required |
| 25422 | func_stripname '' '.la' "$outputname" |
| 25423 | name=$func_stripname_result |
| 25424 | - eval "shared_ext=\"$shrext_cmds\"" |
| 25425 | - eval "libname=\"$libname_spec\"" |
| 25426 | + eval shared_ext=\"$shrext_cmds\" |
| 25427 | + eval libname=\"$libname_spec\" |
| 25428 | else |
| 25429 | func_stripname '' '.la' "$outputname" |
| 25430 | libname=$func_stripname_result |
| 25431 | @@ -6346,7 +7264,7 @@ func_mode_link () |
| 25432 | echo |
| 25433 | $ECHO "*** Warning: Linking the shared library $output against the non-libtool" |
| 25434 | $ECHO "*** objects $objs is not portable!" |
| 25435 | - libobjs="$libobjs $objs" |
| 25436 | + func_append libobjs " $objs" |
| 25437 | fi |
| 25438 | fi |
| 25439 | |
| 25440 | @@ -6544,7 +7462,7 @@ func_mode_link () |
| 25441 | done |
| 25442 | |
| 25443 | # Make executables depend on our current version. |
| 25444 | - verstring="$verstring:${current}.0" |
| 25445 | + func_append verstring ":${current}.0" |
| 25446 | ;; |
| 25447 | |
| 25448 | qnx) |
| 25449 | @@ -6612,10 +7530,10 @@ func_mode_link () |
| 25450 | fi |
| 25451 | |
| 25452 | func_generate_dlsyms "$libname" "$libname" "yes" |
| 25453 | - libobjs="$libobjs $symfileobj" |
| 25454 | + func_append libobjs " $symfileobj" |
| 25455 | test "X$libobjs" = "X " && libobjs= |
| 25456 | |
| 25457 | - if test "$mode" != relink; then |
| 25458 | + if test "$opt_mode" != relink; then |
| 25459 | # Remove our outputs, but don't remove object files since they |
| 25460 | # may have been created when compiling PIC objects. |
| 25461 | removelist= |
| 25462 | @@ -6631,7 +7549,7 @@ func_mode_link () |
| 25463 | continue |
| 25464 | fi |
| 25465 | fi |
| 25466 | - removelist="$removelist $p" |
| 25467 | + func_append removelist " $p" |
| 25468 | ;; |
| 25469 | *) ;; |
| 25470 | esac |
| 25471 | @@ -6642,7 +7560,7 @@ func_mode_link () |
| 25472 | |
| 25473 | # Now set the variables for building old libraries. |
| 25474 | if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then |
| 25475 | - oldlibs="$oldlibs $output_objdir/$libname.$libext" |
| 25476 | + func_append oldlibs " $output_objdir/$libname.$libext" |
| 25477 | |
| 25478 | # Transform .lo files to .o files. |
| 25479 | oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` |
| 25480 | @@ -6659,10 +7577,11 @@ func_mode_link () |
| 25481 | # If the user specified any rpath flags, then add them. |
| 25482 | temp_xrpath= |
| 25483 | for libdir in $xrpath; do |
| 25484 | - temp_xrpath="$temp_xrpath -R$libdir" |
| 25485 | + func_replace_sysroot "$libdir" |
| 25486 | + func_append temp_xrpath " -R$func_replace_sysroot_result" |
| 25487 | case "$finalize_rpath " in |
| 25488 | *" $libdir "*) ;; |
| 25489 | - *) finalize_rpath="$finalize_rpath $libdir" ;; |
| 25490 | + *) func_append finalize_rpath " $libdir" ;; |
| 25491 | esac |
| 25492 | done |
| 25493 | if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then |
| 25494 | @@ -6676,7 +7595,7 @@ func_mode_link () |
| 25495 | for lib in $old_dlfiles; do |
| 25496 | case " $dlprefiles $dlfiles " in |
| 25497 | *" $lib "*) ;; |
| 25498 | - *) dlfiles="$dlfiles $lib" ;; |
| 25499 | + *) func_append dlfiles " $lib" ;; |
| 25500 | esac |
| 25501 | done |
| 25502 | |
| 25503 | @@ -6686,7 +7605,7 @@ func_mode_link () |
| 25504 | for lib in $old_dlprefiles; do |
| 25505 | case "$dlprefiles " in |
| 25506 | *" $lib "*) ;; |
| 25507 | - *) dlprefiles="$dlprefiles $lib" ;; |
| 25508 | + *) func_append dlprefiles " $lib" ;; |
| 25509 | esac |
| 25510 | done |
| 25511 | |
| 25512 | @@ -6698,7 +7617,7 @@ func_mode_link () |
| 25513 | ;; |
| 25514 | *-*-rhapsody* | *-*-darwin1.[012]) |
| 25515 | # Rhapsody C library is in the System framework |
| 25516 | - deplibs="$deplibs System.ltframework" |
| 25517 | + func_append deplibs " System.ltframework" |
| 25518 | ;; |
| 25519 | *-*-netbsd*) |
| 25520 | # Don't link with libc until the a.out ld.so is fixed. |
| 25521 | @@ -6715,7 +7634,7 @@ func_mode_link () |
| 25522 | *) |
| 25523 | # Add libc to deplibs on all other systems if necessary. |
| 25524 | if test "$build_libtool_need_lc" = "yes"; then |
| 25525 | - deplibs="$deplibs -lc" |
| 25526 | + func_append deplibs " -lc" |
| 25527 | fi |
| 25528 | ;; |
| 25529 | esac |
| 25530 | @@ -6764,18 +7683,18 @@ EOF |
| 25531 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 25532 | case " $predeps $postdeps " in |
| 25533 | *" $i "*) |
| 25534 | - newdeplibs="$newdeplibs $i" |
| 25535 | + func_append newdeplibs " $i" |
| 25536 | i="" |
| 25537 | ;; |
| 25538 | esac |
| 25539 | fi |
| 25540 | if test -n "$i" ; then |
| 25541 | - eval "libname=\"$libname_spec\"" |
| 25542 | - eval "deplib_matches=\"$library_names_spec\"" |
| 25543 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 25544 | + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` |
| 25545 | set dummy $deplib_matches; shift |
| 25546 | deplib_match=$1 |
| 25547 | if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then |
| 25548 | - newdeplibs="$newdeplibs $i" |
| 25549 | + func_append newdeplibs " $i" |
| 25550 | else |
| 25551 | droppeddeps=yes |
| 25552 | echo |
| 25553 | @@ -6789,7 +7708,7 @@ EOF |
| 25554 | fi |
| 25555 | ;; |
| 25556 | *) |
| 25557 | - newdeplibs="$newdeplibs $i" |
| 25558 | + func_append newdeplibs " $i" |
| 25559 | ;; |
| 25560 | esac |
| 25561 | done |
| 25562 | @@ -6807,18 +7726,18 @@ EOF |
| 25563 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 25564 | case " $predeps $postdeps " in |
| 25565 | *" $i "*) |
| 25566 | - newdeplibs="$newdeplibs $i" |
| 25567 | + func_append newdeplibs " $i" |
| 25568 | i="" |
| 25569 | ;; |
| 25570 | esac |
| 25571 | fi |
| 25572 | if test -n "$i" ; then |
| 25573 | - eval "libname=\"$libname_spec\"" |
| 25574 | - eval "deplib_matches=\"$library_names_spec\"" |
| 25575 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 25576 | + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` |
| 25577 | set dummy $deplib_matches; shift |
| 25578 | deplib_match=$1 |
| 25579 | if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then |
| 25580 | - newdeplibs="$newdeplibs $i" |
| 25581 | + func_append newdeplibs " $i" |
| 25582 | else |
| 25583 | droppeddeps=yes |
| 25584 | echo |
| 25585 | @@ -6840,7 +7759,7 @@ EOF |
| 25586 | fi |
| 25587 | ;; |
| 25588 | *) |
| 25589 | - newdeplibs="$newdeplibs $i" |
| 25590 | + func_append newdeplibs " $i" |
| 25591 | ;; |
| 25592 | esac |
| 25593 | done |
| 25594 | @@ -6857,15 +7776,27 @@ EOF |
| 25595 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 25596 | case " $predeps $postdeps " in |
| 25597 | *" $a_deplib "*) |
| 25598 | - newdeplibs="$newdeplibs $a_deplib" |
| 25599 | + func_append newdeplibs " $a_deplib" |
| 25600 | a_deplib="" |
| 25601 | ;; |
| 25602 | esac |
| 25603 | fi |
| 25604 | if test -n "$a_deplib" ; then |
| 25605 | - eval "libname=\"$libname_spec\"" |
| 25606 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 25607 | + if test -n "$file_magic_glob"; then |
| 25608 | + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` |
| 25609 | + else |
| 25610 | + libnameglob=$libname |
| 25611 | + fi |
| 25612 | + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` |
| 25613 | for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do |
| 25614 | - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` |
| 25615 | + if test "$want_nocaseglob" = yes; then |
| 25616 | + shopt -s nocaseglob |
| 25617 | + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` |
| 25618 | + $nocaseglob |
| 25619 | + else |
| 25620 | + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` |
| 25621 | + fi |
| 25622 | for potent_lib in $potential_libs; do |
| 25623 | # Follow soft links. |
| 25624 | if ls -lLd "$potent_lib" 2>/dev/null | |
| 25625 | @@ -6885,10 +7816,10 @@ EOF |
| 25626 | *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; |
| 25627 | esac |
| 25628 | done |
| 25629 | - if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | |
| 25630 | + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | |
| 25631 | $SED -e 10q | |
| 25632 | $EGREP "$file_magic_regex" > /dev/null; then |
| 25633 | - newdeplibs="$newdeplibs $a_deplib" |
| 25634 | + func_append newdeplibs " $a_deplib" |
| 25635 | a_deplib="" |
| 25636 | break 2 |
| 25637 | fi |
| 25638 | @@ -6913,7 +7844,7 @@ EOF |
| 25639 | ;; |
| 25640 | *) |
| 25641 | # Add a -L argument. |
| 25642 | - newdeplibs="$newdeplibs $a_deplib" |
| 25643 | + func_append newdeplibs " $a_deplib" |
| 25644 | ;; |
| 25645 | esac |
| 25646 | done # Gone through all deplibs. |
| 25647 | @@ -6929,20 +7860,20 @@ EOF |
| 25648 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 25649 | case " $predeps $postdeps " in |
| 25650 | *" $a_deplib "*) |
| 25651 | - newdeplibs="$newdeplibs $a_deplib" |
| 25652 | + func_append newdeplibs " $a_deplib" |
| 25653 | a_deplib="" |
| 25654 | ;; |
| 25655 | esac |
| 25656 | fi |
| 25657 | if test -n "$a_deplib" ; then |
| 25658 | - eval "libname=\"$libname_spec\"" |
| 25659 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 25660 | for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do |
| 25661 | potential_libs=`ls $i/$libname[.-]* 2>/dev/null` |
| 25662 | for potent_lib in $potential_libs; do |
| 25663 | potlib="$potent_lib" # see symlink-check above in file_magic test |
| 25664 | if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ |
| 25665 | $EGREP "$match_pattern_regex" > /dev/null; then |
| 25666 | - newdeplibs="$newdeplibs $a_deplib" |
| 25667 | + func_append newdeplibs " $a_deplib" |
| 25668 | a_deplib="" |
| 25669 | break 2 |
| 25670 | fi |
| 25671 | @@ -6967,7 +7898,7 @@ EOF |
| 25672 | ;; |
| 25673 | *) |
| 25674 | # Add a -L argument. |
| 25675 | - newdeplibs="$newdeplibs $a_deplib" |
| 25676 | + func_append newdeplibs " $a_deplib" |
| 25677 | ;; |
| 25678 | esac |
| 25679 | done # Gone through all deplibs. |
| 25680 | @@ -7071,7 +8002,7 @@ EOF |
| 25681 | *) |
| 25682 | case " $deplibs " in |
| 25683 | *" -L$path/$objdir "*) |
| 25684 | - new_libs="$new_libs -L$path/$objdir" ;; |
| 25685 | + func_append new_libs " -L$path/$objdir" ;; |
| 25686 | esac |
| 25687 | ;; |
| 25688 | esac |
| 25689 | @@ -7081,10 +8012,10 @@ EOF |
| 25690 | -L*) |
| 25691 | case " $new_libs " in |
| 25692 | *" $deplib "*) ;; |
| 25693 | - *) new_libs="$new_libs $deplib" ;; |
| 25694 | + *) func_append new_libs " $deplib" ;; |
| 25695 | esac |
| 25696 | ;; |
| 25697 | - *) new_libs="$new_libs $deplib" ;; |
| 25698 | + *) func_append new_libs " $deplib" ;; |
| 25699 | esac |
| 25700 | done |
| 25701 | deplibs="$new_libs" |
| 25702 | @@ -7101,10 +8032,12 @@ EOF |
| 25703 | hardcode_libdirs= |
| 25704 | dep_rpath= |
| 25705 | rpath="$finalize_rpath" |
| 25706 | - test "$mode" != relink && rpath="$compile_rpath$rpath" |
| 25707 | + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" |
| 25708 | for libdir in $rpath; do |
| 25709 | if test -n "$hardcode_libdir_flag_spec"; then |
| 25710 | if test -n "$hardcode_libdir_separator"; then |
| 25711 | + func_replace_sysroot "$libdir" |
| 25712 | + libdir=$func_replace_sysroot_result |
| 25713 | if test -z "$hardcode_libdirs"; then |
| 25714 | hardcode_libdirs="$libdir" |
| 25715 | else |
| 25716 | @@ -7113,18 +8046,18 @@ EOF |
| 25717 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 25718 | ;; |
| 25719 | *) |
| 25720 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 25721 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 25722 | ;; |
| 25723 | esac |
| 25724 | fi |
| 25725 | else |
| 25726 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 25727 | - dep_rpath="$dep_rpath $flag" |
| 25728 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 25729 | + func_append dep_rpath " $flag" |
| 25730 | fi |
| 25731 | elif test -n "$runpath_var"; then |
| 25732 | case "$perm_rpath " in |
| 25733 | *" $libdir "*) ;; |
| 25734 | - *) perm_rpath="$perm_rpath $libdir" ;; |
| 25735 | + *) func_apped perm_rpath " $libdir" ;; |
| 25736 | esac |
| 25737 | fi |
| 25738 | done |
| 25739 | @@ -7133,40 +8066,38 @@ EOF |
| 25740 | test -n "$hardcode_libdirs"; then |
| 25741 | libdir="$hardcode_libdirs" |
| 25742 | if test -n "$hardcode_libdir_flag_spec_ld"; then |
| 25743 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" |
| 25744 | + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
| 25745 | else |
| 25746 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
| 25747 | + eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
| 25748 | fi |
| 25749 | fi |
| 25750 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
| 25751 | # We should set the runpath_var. |
| 25752 | rpath= |
| 25753 | for dir in $perm_rpath; do |
| 25754 | - rpath="$rpath$dir:" |
| 25755 | + func_append rpath "$dir:" |
| 25756 | done |
| 25757 | - eval $runpath_var=\$rpath\$$runpath_var |
| 25758 | - export $runpath_var |
| 25759 | + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" |
| 25760 | fi |
| 25761 | test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" |
| 25762 | fi |
| 25763 | |
| 25764 | shlibpath="$finalize_shlibpath" |
| 25765 | - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" |
| 25766 | + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" |
| 25767 | if test -n "$shlibpath"; then |
| 25768 | - eval $shlibpath_var=\$shlibpath\$$shlibpath_var |
| 25769 | - export $shlibpath_var |
| 25770 | + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" |
| 25771 | fi |
| 25772 | |
| 25773 | # Get the real and link names of the library. |
| 25774 | - eval "shared_ext=\"$shrext_cmds\"" |
| 25775 | - eval "library_names=\"$library_names_spec\"" |
| 25776 | + eval shared_ext=\"$shrext_cmds\" |
| 25777 | + eval library_names=\"$library_names_spec\" |
| 25778 | set dummy $library_names |
| 25779 | shift |
| 25780 | realname="$1" |
| 25781 | shift |
| 25782 | |
| 25783 | if test -n "$soname_spec"; then |
| 25784 | - eval "soname=\"$soname_spec\"" |
| 25785 | + eval soname=\"$soname_spec\" |
| 25786 | else |
| 25787 | soname="$realname" |
| 25788 | fi |
| 25789 | @@ -7178,7 +8109,7 @@ EOF |
| 25790 | linknames= |
| 25791 | for link |
| 25792 | do |
| 25793 | - linknames="$linknames $link" |
| 25794 | + func_append linknames " $link" |
| 25795 | done |
| 25796 | |
| 25797 | # Use standard objects if they are pic |
| 25798 | @@ -7189,7 +8120,7 @@ EOF |
| 25799 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 25800 | $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" |
| 25801 | export_symbols="$output_objdir/$libname.uexp" |
| 25802 | - delfiles="$delfiles $export_symbols" |
| 25803 | + func_append delfiles " $export_symbols" |
| 25804 | fi |
| 25805 | |
| 25806 | orig_export_symbols= |
| 25807 | @@ -7220,13 +8151,45 @@ EOF |
| 25808 | $opt_dry_run || $RM $export_symbols |
| 25809 | cmds=$export_symbols_cmds |
| 25810 | save_ifs="$IFS"; IFS='~' |
| 25811 | - for cmd in $cmds; do |
| 25812 | + for cmd1 in $cmds; do |
| 25813 | IFS="$save_ifs" |
| 25814 | - eval "cmd=\"$cmd\"" |
| 25815 | - func_len " $cmd" |
| 25816 | - len=$func_len_result |
| 25817 | - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 25818 | + # Take the normal branch if the nm_file_list_spec branch |
| 25819 | + # doesn't work or if tool conversion is not needed. |
| 25820 | + case $nm_file_list_spec~$to_tool_file_cmd in |
| 25821 | + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) |
| 25822 | + try_normal_branch=yes |
| 25823 | + eval cmd=\"$cmd1\" |
| 25824 | + func_len " $cmd" |
| 25825 | + len=$func_len_result |
| 25826 | + ;; |
| 25827 | + *) |
| 25828 | + try_normal_branch=no |
| 25829 | + ;; |
| 25830 | + esac |
| 25831 | + if test "$try_normal_branch" = yes \ |
| 25832 | + && { test "$len" -lt "$max_cmd_len" \ |
| 25833 | + || test "$max_cmd_len" -le -1; } |
| 25834 | + then |
| 25835 | + func_show_eval "$cmd" 'exit $?' |
| 25836 | + skipped_export=false |
| 25837 | + elif test -n "$nm_file_list_spec"; then |
| 25838 | + func_basename "$output" |
| 25839 | + output_la=$func_basename_result |
| 25840 | + save_libobjs=$libobjs |
| 25841 | + save_output=$output |
| 25842 | + output=${output_objdir}/${output_la}.nm |
| 25843 | + func_to_tool_file "$output" |
| 25844 | + libobjs=$nm_file_list_spec$func_to_tool_file_result |
| 25845 | + func_append delfiles " $output" |
| 25846 | + func_verbose "creating $NM input file list: $output" |
| 25847 | + for obj in $save_libobjs; do |
| 25848 | + func_to_tool_file "$obj" |
| 25849 | + $ECHO "$func_to_tool_file_result" |
| 25850 | + done > "$output" |
| 25851 | + eval cmd=\"$cmd1\" |
| 25852 | func_show_eval "$cmd" 'exit $?' |
| 25853 | + output=$save_output |
| 25854 | + libobjs=$save_libobjs |
| 25855 | skipped_export=false |
| 25856 | else |
| 25857 | # The command line is too long to execute in one step. |
| 25858 | @@ -7248,7 +8211,7 @@ EOF |
| 25859 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 25860 | tmp_export_symbols="$export_symbols" |
| 25861 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" |
| 25862 | - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" |
| 25863 | + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' |
| 25864 | fi |
| 25865 | |
| 25866 | if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then |
| 25867 | @@ -7260,7 +8223,7 @@ EOF |
| 25868 | # global variables. join(1) would be nice here, but unfortunately |
| 25869 | # isn't a blessed tool. |
| 25870 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter |
| 25871 | - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" |
| 25872 | + func_append delfiles " $export_symbols $output_objdir/$libname.filter" |
| 25873 | export_symbols=$output_objdir/$libname.def |
| 25874 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols |
| 25875 | fi |
| 25876 | @@ -7270,7 +8233,7 @@ EOF |
| 25877 | case " $convenience " in |
| 25878 | *" $test_deplib "*) ;; |
| 25879 | *) |
| 25880 | - tmp_deplibs="$tmp_deplibs $test_deplib" |
| 25881 | + func_append tmp_deplibs " $test_deplib" |
| 25882 | ;; |
| 25883 | esac |
| 25884 | done |
| 25885 | @@ -7286,43 +8249,43 @@ EOF |
| 25886 | fi |
| 25887 | if test -n "$whole_archive_flag_spec"; then |
| 25888 | save_libobjs=$libobjs |
| 25889 | - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" |
| 25890 | + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" |
| 25891 | test "X$libobjs" = "X " && libobjs= |
| 25892 | else |
| 25893 | gentop="$output_objdir/${outputname}x" |
| 25894 | - generated="$generated $gentop" |
| 25895 | + func_append generated " $gentop" |
| 25896 | |
| 25897 | func_extract_archives $gentop $convenience |
| 25898 | - libobjs="$libobjs $func_extract_archives_result" |
| 25899 | + func_append libobjs " $func_extract_archives_result" |
| 25900 | test "X$libobjs" = "X " && libobjs= |
| 25901 | fi |
| 25902 | fi |
| 25903 | |
| 25904 | if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then |
| 25905 | - eval "flag=\"$thread_safe_flag_spec\"" |
| 25906 | - linker_flags="$linker_flags $flag" |
| 25907 | + eval flag=\"$thread_safe_flag_spec\" |
| 25908 | + func_append linker_flags " $flag" |
| 25909 | fi |
| 25910 | |
| 25911 | # Make a backup of the uninstalled library when relinking |
| 25912 | - if test "$mode" = relink; then |
| 25913 | - $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? |
| 25914 | + if test "$opt_mode" = relink; then |
| 25915 | + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? |
| 25916 | fi |
| 25917 | |
| 25918 | # Do each of the archive commands. |
| 25919 | if test "$module" = yes && test -n "$module_cmds" ; then |
| 25920 | if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then |
| 25921 | - eval "test_cmds=\"$module_expsym_cmds\"" |
| 25922 | + eval test_cmds=\"$module_expsym_cmds\" |
| 25923 | cmds=$module_expsym_cmds |
| 25924 | else |
| 25925 | - eval "test_cmds=\"$module_cmds\"" |
| 25926 | + eval test_cmds=\"$module_cmds\" |
| 25927 | cmds=$module_cmds |
| 25928 | fi |
| 25929 | else |
| 25930 | if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then |
| 25931 | - eval "test_cmds=\"$archive_expsym_cmds\"" |
| 25932 | + eval test_cmds=\"$archive_expsym_cmds\" |
| 25933 | cmds=$archive_expsym_cmds |
| 25934 | else |
| 25935 | - eval "test_cmds=\"$archive_cmds\"" |
| 25936 | + eval test_cmds=\"$archive_cmds\" |
| 25937 | cmds=$archive_cmds |
| 25938 | fi |
| 25939 | fi |
| 25940 | @@ -7366,10 +8329,13 @@ EOF |
| 25941 | echo 'INPUT (' > $output |
| 25942 | for obj in $save_libobjs |
| 25943 | do |
| 25944 | - $ECHO "$obj" >> $output |
| 25945 | + func_to_tool_file "$obj" |
| 25946 | + $ECHO "$func_to_tool_file_result" >> $output |
| 25947 | done |
| 25948 | echo ')' >> $output |
| 25949 | - delfiles="$delfiles $output" |
| 25950 | + func_append delfiles " $output" |
| 25951 | + func_to_tool_file "$output" |
| 25952 | + output=$func_to_tool_file_result |
| 25953 | elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then |
| 25954 | output=${output_objdir}/${output_la}.lnk |
| 25955 | func_verbose "creating linker input file list: $output" |
| 25956 | @@ -7383,15 +8349,17 @@ EOF |
| 25957 | fi |
| 25958 | for obj |
| 25959 | do |
| 25960 | - $ECHO "$obj" >> $output |
| 25961 | + func_to_tool_file "$obj" |
| 25962 | + $ECHO "$func_to_tool_file_result" >> $output |
| 25963 | done |
| 25964 | - delfiles="$delfiles $output" |
| 25965 | - output=$firstobj\"$file_list_spec$output\" |
| 25966 | + func_append delfiles " $output" |
| 25967 | + func_to_tool_file "$output" |
| 25968 | + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" |
| 25969 | else |
| 25970 | if test -n "$save_libobjs"; then |
| 25971 | func_verbose "creating reloadable object files..." |
| 25972 | output=$output_objdir/$output_la-${k}.$objext |
| 25973 | - eval "test_cmds=\"$reload_cmds\"" |
| 25974 | + eval test_cmds=\"$reload_cmds\" |
| 25975 | func_len " $test_cmds" |
| 25976 | len0=$func_len_result |
| 25977 | len=$len0 |
| 25978 | @@ -7411,12 +8379,12 @@ EOF |
| 25979 | if test "$k" -eq 1 ; then |
| 25980 | # The first file doesn't have a previous command to add. |
| 25981 | reload_objs=$objlist |
| 25982 | - eval "concat_cmds=\"$reload_cmds\"" |
| 25983 | + eval concat_cmds=\"$reload_cmds\" |
| 25984 | else |
| 25985 | # All subsequent reloadable object files will link in |
| 25986 | # the last one created. |
| 25987 | reload_objs="$objlist $last_robj" |
| 25988 | - eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" |
| 25989 | + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" |
| 25990 | fi |
| 25991 | last_robj=$output_objdir/$output_la-${k}.$objext |
| 25992 | func_arith $k + 1 |
| 25993 | @@ -7433,11 +8401,11 @@ EOF |
| 25994 | # files will link in the last one created. |
| 25995 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 25996 | reload_objs="$objlist $last_robj" |
| 25997 | - eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" |
| 25998 | + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" |
| 25999 | if test -n "$last_robj"; then |
| 26000 | - eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" |
| 26001 | + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" |
| 26002 | fi |
| 26003 | - delfiles="$delfiles $output" |
| 26004 | + func_append delfiles " $output" |
| 26005 | |
| 26006 | else |
| 26007 | output= |
| 26008 | @@ -7450,9 +8418,9 @@ EOF |
| 26009 | libobjs=$output |
| 26010 | # Append the command to create the export file. |
| 26011 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 26012 | - eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" |
| 26013 | + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" |
| 26014 | if test -n "$last_robj"; then |
| 26015 | - eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" |
| 26016 | + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" |
| 26017 | fi |
| 26018 | fi |
| 26019 | |
| 26020 | @@ -7471,7 +8439,7 @@ EOF |
| 26021 | lt_exit=$? |
| 26022 | |
| 26023 | # Restore the uninstalled library and exit |
| 26024 | - if test "$mode" = relink; then |
| 26025 | + if test "$opt_mode" = relink; then |
| 26026 | ( cd "$output_objdir" && \ |
| 26027 | $RM "${realname}T" && \ |
| 26028 | $MV "${realname}U" "$realname" ) |
| 26029 | @@ -7492,7 +8460,7 @@ EOF |
| 26030 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 26031 | tmp_export_symbols="$export_symbols" |
| 26032 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" |
| 26033 | - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" |
| 26034 | + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' |
| 26035 | fi |
| 26036 | |
| 26037 | if test -n "$orig_export_symbols"; then |
| 26038 | @@ -7504,7 +8472,7 @@ EOF |
| 26039 | # global variables. join(1) would be nice here, but unfortunately |
| 26040 | # isn't a blessed tool. |
| 26041 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter |
| 26042 | - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" |
| 26043 | + func_append delfiles " $export_symbols $output_objdir/$libname.filter" |
| 26044 | export_symbols=$output_objdir/$libname.def |
| 26045 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols |
| 26046 | fi |
| 26047 | @@ -7515,7 +8483,7 @@ EOF |
| 26048 | output=$save_output |
| 26049 | |
| 26050 | if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then |
| 26051 | - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" |
| 26052 | + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" |
| 26053 | test "X$libobjs" = "X " && libobjs= |
| 26054 | fi |
| 26055 | # Expand the library linking commands again to reset the |
| 26056 | @@ -7539,23 +8507,23 @@ EOF |
| 26057 | |
| 26058 | if test -n "$delfiles"; then |
| 26059 | # Append the command to remove temporary files to $cmds. |
| 26060 | - eval "cmds=\"\$cmds~\$RM $delfiles\"" |
| 26061 | + eval cmds=\"\$cmds~\$RM $delfiles\" |
| 26062 | fi |
| 26063 | |
| 26064 | # Add any objects from preloaded convenience libraries |
| 26065 | if test -n "$dlprefiles"; then |
| 26066 | gentop="$output_objdir/${outputname}x" |
| 26067 | - generated="$generated $gentop" |
| 26068 | + func_append generated " $gentop" |
| 26069 | |
| 26070 | func_extract_archives $gentop $dlprefiles |
| 26071 | - libobjs="$libobjs $func_extract_archives_result" |
| 26072 | + func_append libobjs " $func_extract_archives_result" |
| 26073 | test "X$libobjs" = "X " && libobjs= |
| 26074 | fi |
| 26075 | |
| 26076 | save_ifs="$IFS"; IFS='~' |
| 26077 | for cmd in $cmds; do |
| 26078 | IFS="$save_ifs" |
| 26079 | - eval "cmd=\"$cmd\"" |
| 26080 | + eval cmd=\"$cmd\" |
| 26081 | $opt_silent || { |
| 26082 | func_quote_for_expand "$cmd" |
| 26083 | eval "func_echo $func_quote_for_expand_result" |
| 26084 | @@ -7564,7 +8532,7 @@ EOF |
| 26085 | lt_exit=$? |
| 26086 | |
| 26087 | # Restore the uninstalled library and exit |
| 26088 | - if test "$mode" = relink; then |
| 26089 | + if test "$opt_mode" = relink; then |
| 26090 | ( cd "$output_objdir" && \ |
| 26091 | $RM "${realname}T" && \ |
| 26092 | $MV "${realname}U" "$realname" ) |
| 26093 | @@ -7576,8 +8544,8 @@ EOF |
| 26094 | IFS="$save_ifs" |
| 26095 | |
| 26096 | # Restore the uninstalled library and exit |
| 26097 | - if test "$mode" = relink; then |
| 26098 | - $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? |
| 26099 | + if test "$opt_mode" = relink; then |
| 26100 | + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? |
| 26101 | |
| 26102 | if test -n "$convenience"; then |
| 26103 | if test -z "$whole_archive_flag_spec"; then |
| 26104 | @@ -7656,17 +8624,20 @@ EOF |
| 26105 | |
| 26106 | if test -n "$convenience"; then |
| 26107 | if test -n "$whole_archive_flag_spec"; then |
| 26108 | - eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" |
| 26109 | + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" |
| 26110 | reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` |
| 26111 | else |
| 26112 | gentop="$output_objdir/${obj}x" |
| 26113 | - generated="$generated $gentop" |
| 26114 | + func_append generated " $gentop" |
| 26115 | |
| 26116 | func_extract_archives $gentop $convenience |
| 26117 | reload_conv_objs="$reload_objs $func_extract_archives_result" |
| 26118 | fi |
| 26119 | fi |
| 26120 | |
| 26121 | + # If we're not building shared, we need to use non_pic_objs |
| 26122 | + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" |
| 26123 | + |
| 26124 | # Create the old-style object. |
| 26125 | reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test |
| 26126 | |
| 26127 | @@ -7690,7 +8661,7 @@ EOF |
| 26128 | # Create an invalid libtool object if no PIC, so that we don't |
| 26129 | # accidentally link it into a program. |
| 26130 | # $show "echo timestamp > $libobj" |
| 26131 | - # $opt_dry_run || echo timestamp > $libobj || exit $? |
| 26132 | + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? |
| 26133 | exit $EXIT_SUCCESS |
| 26134 | fi |
| 26135 | |
| 26136 | @@ -7740,8 +8711,8 @@ EOF |
| 26137 | if test "$tagname" = CXX ; then |
| 26138 | case ${MACOSX_DEPLOYMENT_TARGET-10.0} in |
| 26139 | 10.[0123]) |
| 26140 | - compile_command="$compile_command ${wl}-bind_at_load" |
| 26141 | - finalize_command="$finalize_command ${wl}-bind_at_load" |
| 26142 | + func_append compile_command " ${wl}-bind_at_load" |
| 26143 | + func_append finalize_command " ${wl}-bind_at_load" |
| 26144 | ;; |
| 26145 | esac |
| 26146 | fi |
| 26147 | @@ -7761,7 +8732,7 @@ EOF |
| 26148 | *) |
| 26149 | case " $compile_deplibs " in |
| 26150 | *" -L$path/$objdir "*) |
| 26151 | - new_libs="$new_libs -L$path/$objdir" ;; |
| 26152 | + func_append new_libs " -L$path/$objdir" ;; |
| 26153 | esac |
| 26154 | ;; |
| 26155 | esac |
| 26156 | @@ -7771,17 +8742,17 @@ EOF |
| 26157 | -L*) |
| 26158 | case " $new_libs " in |
| 26159 | *" $deplib "*) ;; |
| 26160 | - *) new_libs="$new_libs $deplib" ;; |
| 26161 | + *) func_append new_libs " $deplib" ;; |
| 26162 | esac |
| 26163 | ;; |
| 26164 | - *) new_libs="$new_libs $deplib" ;; |
| 26165 | + *) func_append new_libs " $deplib" ;; |
| 26166 | esac |
| 26167 | done |
| 26168 | compile_deplibs="$new_libs" |
| 26169 | |
| 26170 | |
| 26171 | - compile_command="$compile_command $compile_deplibs" |
| 26172 | - finalize_command="$finalize_command $finalize_deplibs" |
| 26173 | + func_append compile_command " $compile_deplibs" |
| 26174 | + func_append finalize_command " $finalize_deplibs" |
| 26175 | |
| 26176 | if test -n "$rpath$xrpath"; then |
| 26177 | # If the user specified any rpath flags, then add them. |
| 26178 | @@ -7789,7 +8760,7 @@ EOF |
| 26179 | # This is the magic to use -rpath. |
| 26180 | case "$finalize_rpath " in |
| 26181 | *" $libdir "*) ;; |
| 26182 | - *) finalize_rpath="$finalize_rpath $libdir" ;; |
| 26183 | + *) func_append finalize_rpath " $libdir" ;; |
| 26184 | esac |
| 26185 | done |
| 26186 | fi |
| 26187 | @@ -7808,18 +8779,18 @@ EOF |
| 26188 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 26189 | ;; |
| 26190 | *) |
| 26191 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 26192 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 26193 | ;; |
| 26194 | esac |
| 26195 | fi |
| 26196 | else |
| 26197 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 26198 | - rpath="$rpath $flag" |
| 26199 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 26200 | + func_append rpath " $flag" |
| 26201 | fi |
| 26202 | elif test -n "$runpath_var"; then |
| 26203 | case "$perm_rpath " in |
| 26204 | *" $libdir "*) ;; |
| 26205 | - *) perm_rpath="$perm_rpath $libdir" ;; |
| 26206 | + *) func_append perm_rpath " $libdir" ;; |
| 26207 | esac |
| 26208 | fi |
| 26209 | case $host in |
| 26210 | @@ -7828,12 +8799,12 @@ EOF |
| 26211 | case :$dllsearchpath: in |
| 26212 | *":$libdir:"*) ;; |
| 26213 | ::) dllsearchpath=$libdir;; |
| 26214 | - *) dllsearchpath="$dllsearchpath:$libdir";; |
| 26215 | + *) func_append dllsearchpath ":$libdir";; |
| 26216 | esac |
| 26217 | case :$dllsearchpath: in |
| 26218 | *":$testbindir:"*) ;; |
| 26219 | ::) dllsearchpath=$testbindir;; |
| 26220 | - *) dllsearchpath="$dllsearchpath:$testbindir";; |
| 26221 | + *) func_append dllsearchpath ":$testbindir";; |
| 26222 | esac |
| 26223 | ;; |
| 26224 | esac |
| 26225 | @@ -7842,7 +8813,7 @@ EOF |
| 26226 | if test -n "$hardcode_libdir_separator" && |
| 26227 | test -n "$hardcode_libdirs"; then |
| 26228 | libdir="$hardcode_libdirs" |
| 26229 | - eval "rpath=\" $hardcode_libdir_flag_spec\"" |
| 26230 | + eval rpath=\" $hardcode_libdir_flag_spec\" |
| 26231 | fi |
| 26232 | compile_rpath="$rpath" |
| 26233 | |
| 26234 | @@ -7859,18 +8830,18 @@ EOF |
| 26235 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 26236 | ;; |
| 26237 | *) |
| 26238 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 26239 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 26240 | ;; |
| 26241 | esac |
| 26242 | fi |
| 26243 | else |
| 26244 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 26245 | - rpath="$rpath $flag" |
| 26246 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 26247 | + func_append rpath " $flag" |
| 26248 | fi |
| 26249 | elif test -n "$runpath_var"; then |
| 26250 | case "$finalize_perm_rpath " in |
| 26251 | *" $libdir "*) ;; |
| 26252 | - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; |
| 26253 | + *) func_append finalize_perm_rpath " $libdir" ;; |
| 26254 | esac |
| 26255 | fi |
| 26256 | done |
| 26257 | @@ -7878,7 +8849,7 @@ EOF |
| 26258 | if test -n "$hardcode_libdir_separator" && |
| 26259 | test -n "$hardcode_libdirs"; then |
| 26260 | libdir="$hardcode_libdirs" |
| 26261 | - eval "rpath=\" $hardcode_libdir_flag_spec\"" |
| 26262 | + eval rpath=\" $hardcode_libdir_flag_spec\" |
| 26263 | fi |
| 26264 | finalize_rpath="$rpath" |
| 26265 | |
| 26266 | @@ -7921,6 +8892,12 @@ EOF |
| 26267 | exit_status=0 |
| 26268 | func_show_eval "$link_command" 'exit_status=$?' |
| 26269 | |
| 26270 | + if test -n "$postlink_cmds"; then |
| 26271 | + func_to_tool_file "$output" |
| 26272 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` |
| 26273 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 26274 | + fi |
| 26275 | + |
| 26276 | # Delete the generated files. |
| 26277 | if test -f "$output_objdir/${outputname}S.${objext}"; then |
| 26278 | func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' |
| 26279 | @@ -7943,7 +8920,7 @@ EOF |
| 26280 | # We should set the runpath_var. |
| 26281 | rpath= |
| 26282 | for dir in $perm_rpath; do |
| 26283 | - rpath="$rpath$dir:" |
| 26284 | + func_append rpath "$dir:" |
| 26285 | done |
| 26286 | compile_var="$runpath_var=\"$rpath\$$runpath_var\" " |
| 26287 | fi |
| 26288 | @@ -7951,7 +8928,7 @@ EOF |
| 26289 | # We should set the runpath_var. |
| 26290 | rpath= |
| 26291 | for dir in $finalize_perm_rpath; do |
| 26292 | - rpath="$rpath$dir:" |
| 26293 | + func_append rpath "$dir:" |
| 26294 | done |
| 26295 | finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " |
| 26296 | fi |
| 26297 | @@ -7966,6 +8943,13 @@ EOF |
| 26298 | $opt_dry_run || $RM $output |
| 26299 | # Link the executable and exit |
| 26300 | func_show_eval "$link_command" 'exit $?' |
| 26301 | + |
| 26302 | + if test -n "$postlink_cmds"; then |
| 26303 | + func_to_tool_file "$output" |
| 26304 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` |
| 26305 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 26306 | + fi |
| 26307 | + |
| 26308 | exit $EXIT_SUCCESS |
| 26309 | fi |
| 26310 | |
| 26311 | @@ -7999,6 +8983,12 @@ EOF |
| 26312 | |
| 26313 | func_show_eval "$link_command" 'exit $?' |
| 26314 | |
| 26315 | + if test -n "$postlink_cmds"; then |
| 26316 | + func_to_tool_file "$output_objdir/$outputname" |
| 26317 | + 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'` |
| 26318 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 26319 | + fi |
| 26320 | + |
| 26321 | # Now create the wrapper script. |
| 26322 | func_verbose "creating $output" |
| 26323 | |
| 26324 | @@ -8096,7 +9086,7 @@ EOF |
| 26325 | else |
| 26326 | oldobjs="$old_deplibs $non_pic_objects" |
| 26327 | if test "$preload" = yes && test -f "$symfileobj"; then |
| 26328 | - oldobjs="$oldobjs $symfileobj" |
| 26329 | + func_append oldobjs " $symfileobj" |
| 26330 | fi |
| 26331 | fi |
| 26332 | addlibs="$old_convenience" |
| 26333 | @@ -8104,10 +9094,10 @@ EOF |
| 26334 | |
| 26335 | if test -n "$addlibs"; then |
| 26336 | gentop="$output_objdir/${outputname}x" |
| 26337 | - generated="$generated $gentop" |
| 26338 | + func_append generated " $gentop" |
| 26339 | |
| 26340 | func_extract_archives $gentop $addlibs |
| 26341 | - oldobjs="$oldobjs $func_extract_archives_result" |
| 26342 | + func_append oldobjs " $func_extract_archives_result" |
| 26343 | fi |
| 26344 | |
| 26345 | # Do each command in the archive commands. |
| 26346 | @@ -8118,10 +9108,10 @@ EOF |
| 26347 | # Add any objects from preloaded convenience libraries |
| 26348 | if test -n "$dlprefiles"; then |
| 26349 | gentop="$output_objdir/${outputname}x" |
| 26350 | - generated="$generated $gentop" |
| 26351 | + func_append generated " $gentop" |
| 26352 | |
| 26353 | func_extract_archives $gentop $dlprefiles |
| 26354 | - oldobjs="$oldobjs $func_extract_archives_result" |
| 26355 | + func_append oldobjs " $func_extract_archives_result" |
| 26356 | fi |
| 26357 | |
| 26358 | # POSIX demands no paths to be encoded in archives. We have |
| 26359 | @@ -8139,7 +9129,7 @@ EOF |
| 26360 | else |
| 26361 | echo "copying selected object files to avoid basename conflicts..." |
| 26362 | gentop="$output_objdir/${outputname}x" |
| 26363 | - generated="$generated $gentop" |
| 26364 | + func_append generated " $gentop" |
| 26365 | func_mkdir_p "$gentop" |
| 26366 | save_oldobjs=$oldobjs |
| 26367 | oldobjs= |
| 26368 | @@ -8163,18 +9153,28 @@ EOF |
| 26369 | esac |
| 26370 | done |
| 26371 | func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" |
| 26372 | - oldobjs="$oldobjs $gentop/$newobj" |
| 26373 | + func_append oldobjs " $gentop/$newobj" |
| 26374 | ;; |
| 26375 | - *) oldobjs="$oldobjs $obj" ;; |
| 26376 | + *) func_append oldobjs " $obj" ;; |
| 26377 | esac |
| 26378 | done |
| 26379 | fi |
| 26380 | - eval "cmds=\"$old_archive_cmds\"" |
| 26381 | + eval cmds=\"$old_archive_cmds\" |
| 26382 | |
| 26383 | func_len " $cmds" |
| 26384 | len=$func_len_result |
| 26385 | if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 26386 | cmds=$old_archive_cmds |
| 26387 | + elif test -n "$archiver_list_spec"; then |
| 26388 | + func_verbose "using command file archive linking..." |
| 26389 | + for obj in $oldobjs |
| 26390 | + do |
| 26391 | + func_to_tool_file "$obj" |
| 26392 | + $ECHO "$func_to_tool_file_result" |
| 26393 | + done > $output_objdir/$libname.libcmd |
| 26394 | + func_to_tool_file "$output_objdir/$libname.libcmd" |
| 26395 | + oldobjs=" $archiver_list_spec$func_to_tool_file_result" |
| 26396 | + cmds=$old_archive_cmds |
| 26397 | else |
| 26398 | # the command line is too long to link in one step, link in parts |
| 26399 | func_verbose "using piecewise archive linking..." |
| 26400 | @@ -8189,7 +9189,7 @@ EOF |
| 26401 | do |
| 26402 | last_oldobj=$obj |
| 26403 | done |
| 26404 | - eval "test_cmds=\"$old_archive_cmds\"" |
| 26405 | + eval test_cmds=\"$old_archive_cmds\" |
| 26406 | func_len " $test_cmds" |
| 26407 | len0=$func_len_result |
| 26408 | len=$len0 |
| 26409 | @@ -8208,7 +9208,7 @@ EOF |
| 26410 | RANLIB=$save_RANLIB |
| 26411 | fi |
| 26412 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 26413 | - eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" |
| 26414 | + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" |
| 26415 | objlist= |
| 26416 | len=$len0 |
| 26417 | fi |
| 26418 | @@ -8216,9 +9216,9 @@ EOF |
| 26419 | RANLIB=$save_RANLIB |
| 26420 | oldobjs=$objlist |
| 26421 | if test "X$oldobjs" = "X" ; then |
| 26422 | - eval "cmds=\"\$concat_cmds\"" |
| 26423 | + eval cmds=\"\$concat_cmds\" |
| 26424 | else |
| 26425 | - eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" |
| 26426 | + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" |
| 26427 | fi |
| 26428 | fi |
| 26429 | fi |
| 26430 | @@ -8268,12 +9268,23 @@ EOF |
| 26431 | *.la) |
| 26432 | func_basename "$deplib" |
| 26433 | name="$func_basename_result" |
| 26434 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 26435 | + func_resolve_sysroot "$deplib" |
| 26436 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 26437 | test -z "$libdir" && \ |
| 26438 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
| 26439 | - newdependency_libs="$newdependency_libs $libdir/$name" |
| 26440 | + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
| 26441 | + ;; |
| 26442 | + -L*) |
| 26443 | + func_stripname -L '' "$deplib" |
| 26444 | + func_replace_sysroot "$func_stripname_result" |
| 26445 | + func_append newdependency_libs " -L$func_replace_sysroot_result" |
| 26446 | ;; |
| 26447 | - *) newdependency_libs="$newdependency_libs $deplib" ;; |
| 26448 | + -R*) |
| 26449 | + func_stripname -R '' "$deplib" |
| 26450 | + func_replace_sysroot "$func_stripname_result" |
| 26451 | + func_append newdependency_libs " -R$func_replace_sysroot_result" |
| 26452 | + ;; |
| 26453 | + *) func_append newdependency_libs " $deplib" ;; |
| 26454 | esac |
| 26455 | done |
| 26456 | dependency_libs="$newdependency_libs" |
| 26457 | @@ -8284,12 +9295,14 @@ EOF |
| 26458 | *.la) |
| 26459 | func_basename "$lib" |
| 26460 | name="$func_basename_result" |
| 26461 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
| 26462 | + func_resolve_sysroot "$lib" |
| 26463 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 26464 | + |
| 26465 | test -z "$libdir" && \ |
| 26466 | func_fatal_error "\`$lib' is not a valid libtool archive" |
| 26467 | - newdlfiles="$newdlfiles $libdir/$name" |
| 26468 | + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" |
| 26469 | ;; |
| 26470 | - *) newdlfiles="$newdlfiles $lib" ;; |
| 26471 | + *) func_append newdlfiles " $lib" ;; |
| 26472 | esac |
| 26473 | done |
| 26474 | dlfiles="$newdlfiles" |
| 26475 | @@ -8303,10 +9316,11 @@ EOF |
| 26476 | # the library: |
| 26477 | func_basename "$lib" |
| 26478 | name="$func_basename_result" |
| 26479 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
| 26480 | + func_resolve_sysroot "$lib" |
| 26481 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 26482 | test -z "$libdir" && \ |
| 26483 | func_fatal_error "\`$lib' is not a valid libtool archive" |
| 26484 | - newdlprefiles="$newdlprefiles $libdir/$name" |
| 26485 | + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" |
| 26486 | ;; |
| 26487 | esac |
| 26488 | done |
| 26489 | @@ -8318,7 +9332,7 @@ EOF |
| 26490 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; |
| 26491 | *) abs=`pwd`"/$lib" ;; |
| 26492 | esac |
| 26493 | - newdlfiles="$newdlfiles $abs" |
| 26494 | + func_append newdlfiles " $abs" |
| 26495 | done |
| 26496 | dlfiles="$newdlfiles" |
| 26497 | newdlprefiles= |
| 26498 | @@ -8327,7 +9341,7 @@ EOF |
| 26499 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; |
| 26500 | *) abs=`pwd`"/$lib" ;; |
| 26501 | esac |
| 26502 | - newdlprefiles="$newdlprefiles $abs" |
| 26503 | + func_append newdlprefiles " $abs" |
| 26504 | done |
| 26505 | dlprefiles="$newdlprefiles" |
| 26506 | fi |
| 26507 | @@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" |
| 26508 | exit $EXIT_SUCCESS |
| 26509 | } |
| 26510 | |
| 26511 | -{ test "$mode" = link || test "$mode" = relink; } && |
| 26512 | +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && |
| 26513 | func_mode_link ${1+"$@"} |
| 26514 | |
| 26515 | |
| 26516 | @@ -8432,9 +9446,9 @@ func_mode_uninstall () |
| 26517 | for arg |
| 26518 | do |
| 26519 | case $arg in |
| 26520 | - -f) RM="$RM $arg"; rmforce=yes ;; |
| 26521 | - -*) RM="$RM $arg" ;; |
| 26522 | - *) files="$files $arg" ;; |
| 26523 | + -f) func_append RM " $arg"; rmforce=yes ;; |
| 26524 | + -*) func_append RM " $arg" ;; |
| 26525 | + *) func_append files " $arg" ;; |
| 26526 | esac |
| 26527 | done |
| 26528 | |
| 26529 | @@ -8443,24 +9457,23 @@ func_mode_uninstall () |
| 26530 | |
| 26531 | rmdirs= |
| 26532 | |
| 26533 | - origobjdir="$objdir" |
| 26534 | for file in $files; do |
| 26535 | func_dirname "$file" "" "." |
| 26536 | dir="$func_dirname_result" |
| 26537 | if test "X$dir" = X.; then |
| 26538 | - objdir="$origobjdir" |
| 26539 | + odir="$objdir" |
| 26540 | else |
| 26541 | - objdir="$dir/$origobjdir" |
| 26542 | + odir="$dir/$objdir" |
| 26543 | fi |
| 26544 | func_basename "$file" |
| 26545 | name="$func_basename_result" |
| 26546 | - test "$mode" = uninstall && objdir="$dir" |
| 26547 | + test "$opt_mode" = uninstall && odir="$dir" |
| 26548 | |
| 26549 | - # Remember objdir for removal later, being careful to avoid duplicates |
| 26550 | - if test "$mode" = clean; then |
| 26551 | + # Remember odir for removal later, being careful to avoid duplicates |
| 26552 | + if test "$opt_mode" = clean; then |
| 26553 | case " $rmdirs " in |
| 26554 | - *" $objdir "*) ;; |
| 26555 | - *) rmdirs="$rmdirs $objdir" ;; |
| 26556 | + *" $odir "*) ;; |
| 26557 | + *) func_append rmdirs " $odir" ;; |
| 26558 | esac |
| 26559 | fi |
| 26560 | |
| 26561 | @@ -8486,18 +9499,17 @@ func_mode_uninstall () |
| 26562 | |
| 26563 | # Delete the libtool libraries and symlinks. |
| 26564 | for n in $library_names; do |
| 26565 | - rmfiles="$rmfiles $objdir/$n" |
| 26566 | + func_append rmfiles " $odir/$n" |
| 26567 | done |
| 26568 | - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" |
| 26569 | + test -n "$old_library" && func_append rmfiles " $odir/$old_library" |
| 26570 | |
| 26571 | - case "$mode" in |
| 26572 | + case "$opt_mode" in |
| 26573 | clean) |
| 26574 | - case " $library_names " in |
| 26575 | - # " " in the beginning catches empty $dlname |
| 26576 | + case " $library_names " in |
| 26577 | *" $dlname "*) ;; |
| 26578 | - *) rmfiles="$rmfiles $objdir/$dlname" ;; |
| 26579 | + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; |
| 26580 | esac |
| 26581 | - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
| 26582 | + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" |
| 26583 | ;; |
| 26584 | uninstall) |
| 26585 | if test -n "$library_names"; then |
| 26586 | @@ -8525,19 +9537,19 @@ func_mode_uninstall () |
| 26587 | # Add PIC object to the list of files to remove. |
| 26588 | if test -n "$pic_object" && |
| 26589 | test "$pic_object" != none; then |
| 26590 | - rmfiles="$rmfiles $dir/$pic_object" |
| 26591 | + func_append rmfiles " $dir/$pic_object" |
| 26592 | fi |
| 26593 | |
| 26594 | # Add non-PIC object to the list of files to remove. |
| 26595 | if test -n "$non_pic_object" && |
| 26596 | test "$non_pic_object" != none; then |
| 26597 | - rmfiles="$rmfiles $dir/$non_pic_object" |
| 26598 | + func_append rmfiles " $dir/$non_pic_object" |
| 26599 | fi |
| 26600 | fi |
| 26601 | ;; |
| 26602 | |
| 26603 | *) |
| 26604 | - if test "$mode" = clean ; then |
| 26605 | + if test "$opt_mode" = clean ; then |
| 26606 | noexename=$name |
| 26607 | case $file in |
| 26608 | *.exe) |
| 26609 | @@ -8547,7 +9559,7 @@ func_mode_uninstall () |
| 26610 | noexename=$func_stripname_result |
| 26611 | # $file with .exe has already been added to rmfiles, |
| 26612 | # add $file without .exe |
| 26613 | - rmfiles="$rmfiles $file" |
| 26614 | + func_append rmfiles " $file" |
| 26615 | ;; |
| 26616 | esac |
| 26617 | # Do a test to see if this is a libtool program. |
| 26618 | @@ -8556,7 +9568,7 @@ func_mode_uninstall () |
| 26619 | func_ltwrapper_scriptname "$file" |
| 26620 | relink_command= |
| 26621 | func_source $func_ltwrapper_scriptname_result |
| 26622 | - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" |
| 26623 | + func_append rmfiles " $func_ltwrapper_scriptname_result" |
| 26624 | else |
| 26625 | relink_command= |
| 26626 | func_source $dir/$noexename |
| 26627 | @@ -8564,12 +9576,12 @@ func_mode_uninstall () |
| 26628 | |
| 26629 | # note $name still contains .exe if it was in $file originally |
| 26630 | # as does the version of $file that was added into $rmfiles |
| 26631 | - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" |
| 26632 | + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" |
| 26633 | if test "$fast_install" = yes && test -n "$relink_command"; then |
| 26634 | - rmfiles="$rmfiles $objdir/lt-$name" |
| 26635 | + func_append rmfiles " $odir/lt-$name" |
| 26636 | fi |
| 26637 | if test "X$noexename" != "X$name" ; then |
| 26638 | - rmfiles="$rmfiles $objdir/lt-${noexename}.c" |
| 26639 | + func_append rmfiles " $odir/lt-${noexename}.c" |
| 26640 | fi |
| 26641 | fi |
| 26642 | fi |
| 26643 | @@ -8577,7 +9589,6 @@ func_mode_uninstall () |
| 26644 | esac |
| 26645 | func_show_eval "$RM $rmfiles" 'exit_status=1' |
| 26646 | done |
| 26647 | - objdir="$origobjdir" |
| 26648 | |
| 26649 | # Try to remove the ${objdir}s in the directories where we deleted files |
| 26650 | for dir in $rmdirs; do |
| 26651 | @@ -8589,16 +9600,16 @@ func_mode_uninstall () |
| 26652 | exit $exit_status |
| 26653 | } |
| 26654 | |
| 26655 | -{ test "$mode" = uninstall || test "$mode" = clean; } && |
| 26656 | +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && |
| 26657 | func_mode_uninstall ${1+"$@"} |
| 26658 | |
| 26659 | -test -z "$mode" && { |
| 26660 | +test -z "$opt_mode" && { |
| 26661 | help="$generic_help" |
| 26662 | func_fatal_help "you must specify a MODE" |
| 26663 | } |
| 26664 | |
| 26665 | test -z "$exec_cmd" && \ |
| 26666 | - func_fatal_help "invalid operation mode \`$mode'" |
| 26667 | + func_fatal_help "invalid operation mode \`$opt_mode'" |
| 26668 | |
| 26669 | if test -n "$exec_cmd"; then |
| 26670 | eval exec "$exec_cmd" |
| 26671 | diff --git a/ltoptions.m4 b/ltoptions.m4 |
| 26672 | index 5ef12ced2a8..17cfd51c0b3 100644 |
| 26673 | --- a/ltoptions.m4 |
| 26674 | +++ b/ltoptions.m4 |
| 26675 | @@ -8,7 +8,7 @@ |
| 26676 | # unlimited permission to copy and/or distribute it, with or without |
| 26677 | # modifications, as long as this notice is preserved. |
| 26678 | |
| 26679 | -# serial 6 ltoptions.m4 |
| 26680 | +# serial 7 ltoptions.m4 |
| 26681 | |
| 26682 | # This is to help aclocal find these macros, as it can't see m4_define. |
| 26683 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
| 26684 | diff --git a/ltversion.m4 b/ltversion.m4 |
| 26685 | index bf87f77132d..9c7b5d41185 100644 |
| 26686 | --- a/ltversion.m4 |
| 26687 | +++ b/ltversion.m4 |
| 26688 | @@ -7,17 +7,17 @@ |
| 26689 | # unlimited permission to copy and/or distribute it, with or without |
| 26690 | # modifications, as long as this notice is preserved. |
| 26691 | |
| 26692 | -# Generated from ltversion.in. |
| 26693 | +# @configure_input@ |
| 26694 | |
| 26695 | -# serial 3134 ltversion.m4 |
| 26696 | +# serial 3293 ltversion.m4 |
| 26697 | # This file is part of GNU Libtool |
| 26698 | |
| 26699 | -m4_define([LT_PACKAGE_VERSION], [2.2.7a]) |
| 26700 | -m4_define([LT_PACKAGE_REVISION], [1.3134]) |
| 26701 | +m4_define([LT_PACKAGE_VERSION], [2.4]) |
| 26702 | +m4_define([LT_PACKAGE_REVISION], [1.3293]) |
| 26703 | |
| 26704 | AC_DEFUN([LTVERSION_VERSION], |
| 26705 | -[macro_version='2.2.7a' |
| 26706 | -macro_revision='1.3134' |
| 26707 | +[macro_version='2.4' |
| 26708 | +macro_revision='1.3293' |
| 26709 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
| 26710 | _LT_DECL(, macro_revision, 0) |
| 26711 | ]) |
| 26712 | diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 |
| 26713 | index bf92b5e0790..c573da90c5c 100644 |
| 26714 | --- a/lt~obsolete.m4 |
| 26715 | +++ b/lt~obsolete.m4 |
| 26716 | @@ -7,7 +7,7 @@ |
| 26717 | # unlimited permission to copy and/or distribute it, with or without |
| 26718 | # modifications, as long as this notice is preserved. |
| 26719 | |
| 26720 | -# serial 4 lt~obsolete.m4 |
| 26721 | +# serial 5 lt~obsolete.m4 |
| 26722 | |
| 26723 | # These exist entirely to fool aclocal when bootstrapping libtool. |
| 26724 | # |
| 26725 | diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in |
| 26726 | index 2257b0872af..73aae3b210f 100644 |
| 26727 | --- a/opcodes/Makefile.in |
| 26728 | +++ b/opcodes/Makefile.in |
| 26729 | @@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@ |
| 26730 | DATADIRNAME = @DATADIRNAME@ |
| 26731 | DEFS = @DEFS@ |
| 26732 | DEPDIR = @DEPDIR@ |
| 26733 | +DLLTOOL = @DLLTOOL@ |
| 26734 | DSYMUTIL = @DSYMUTIL@ |
| 26735 | DUMPBIN = @DUMPBIN@ |
| 26736 | ECHO_C = @ECHO_C@ |
| 26737 | @@ -325,6 +326,7 @@ LN_S = @LN_S@ |
| 26738 | LTLIBOBJS = @LTLIBOBJS@ |
| 26739 | MAINT = @MAINT@ |
| 26740 | MAKEINFO = @MAKEINFO@ |
| 26741 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 26742 | MKDIR_P = @MKDIR_P@ |
| 26743 | MKINSTALLDIRS = @MKINSTALLDIRS@ |
| 26744 | MSGFMT = @MSGFMT@ |
| 26745 | @@ -363,6 +365,7 @@ abs_builddir = @abs_builddir@ |
| 26746 | abs_srcdir = @abs_srcdir@ |
| 26747 | abs_top_builddir = @abs_top_builddir@ |
| 26748 | abs_top_srcdir = @abs_top_srcdir@ |
| 26749 | +ac_ct_AR = @ac_ct_AR@ |
| 26750 | ac_ct_CC = @ac_ct_CC@ |
| 26751 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 26752 | am__include = @am__include@ |
| 26753 | diff --git a/opcodes/configure b/opcodes/configure |
| 26754 | index db023b48c28..c562aada2a4 100755 |
| 26755 | --- a/opcodes/configure |
| 26756 | +++ b/opcodes/configure |
| 26757 | @@ -682,6 +682,9 @@ OTOOL |
| 26758 | LIPO |
| 26759 | NMEDIT |
| 26760 | DSYMUTIL |
| 26761 | +MANIFEST_TOOL |
| 26762 | +ac_ct_AR |
| 26763 | +DLLTOOL |
| 26764 | OBJDUMP |
| 26765 | LN_S |
| 26766 | NM |
| 26767 | @@ -800,6 +803,7 @@ enable_static |
| 26768 | with_pic |
| 26769 | enable_fast_install |
| 26770 | with_gnu_ld |
| 26771 | +with_libtool_sysroot |
| 26772 | enable_libtool_lock |
| 26773 | enable_checking |
| 26774 | enable_targets |
| 26775 | @@ -1468,6 +1472,8 @@ Optional Packages: |
| 26776 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 26777 | both] |
| 26778 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 26779 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 26780 | + (or the compiler's sysroot if not specified). |
| 26781 | |
| 26782 | Some influential environment variables: |
| 26783 | CC C compiler command |
| 26784 | @@ -4977,8 +4983,8 @@ esac |
| 26785 | |
| 26786 | |
| 26787 | |
| 26788 | -macro_version='2.2.7a' |
| 26789 | -macro_revision='1.3134' |
| 26790 | +macro_version='2.4' |
| 26791 | +macro_revision='1.3293' |
| 26792 | |
| 26793 | |
| 26794 | |
| 26795 | @@ -5018,7 +5024,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 26796 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 26797 | $as_echo_n "checking how to print strings... " >&6; } |
| 26798 | # Test print first, because it will be a builtin if present. |
| 26799 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 26800 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 26801 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 26802 | ECHO='print -r --' |
| 26803 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 26804 | @@ -5711,8 +5717,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 26805 | # Try some XSI features |
| 26806 | xsi_shell=no |
| 26807 | ( _lt_dummy="a/b/c" |
| 26808 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 26809 | - = c,a/b,, \ |
| 26810 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 26811 | + = c,a/b,b/c, \ |
| 26812 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 26813 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 26814 | && xsi_shell=yes |
| 26815 | @@ -5761,6 +5767,80 @@ esac |
| 26816 | |
| 26817 | |
| 26818 | |
| 26819 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 26820 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 26821 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 26822 | + $as_echo_n "(cached) " >&6 |
| 26823 | +else |
| 26824 | + case $host in |
| 26825 | + *-*-mingw* ) |
| 26826 | + case $build in |
| 26827 | + *-*-mingw* ) # actually msys |
| 26828 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 26829 | + ;; |
| 26830 | + *-*-cygwin* ) |
| 26831 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 26832 | + ;; |
| 26833 | + * ) # otherwise, assume *nix |
| 26834 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 26835 | + ;; |
| 26836 | + esac |
| 26837 | + ;; |
| 26838 | + *-*-cygwin* ) |
| 26839 | + case $build in |
| 26840 | + *-*-mingw* ) # actually msys |
| 26841 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 26842 | + ;; |
| 26843 | + *-*-cygwin* ) |
| 26844 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 26845 | + ;; |
| 26846 | + * ) # otherwise, assume *nix |
| 26847 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 26848 | + ;; |
| 26849 | + esac |
| 26850 | + ;; |
| 26851 | + * ) # unhandled hosts (and "normal" native builds) |
| 26852 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 26853 | + ;; |
| 26854 | +esac |
| 26855 | + |
| 26856 | +fi |
| 26857 | + |
| 26858 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 26859 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 26860 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 26861 | + |
| 26862 | + |
| 26863 | + |
| 26864 | + |
| 26865 | + |
| 26866 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 26867 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 26868 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 26869 | + $as_echo_n "(cached) " >&6 |
| 26870 | +else |
| 26871 | + #assume ordinary cross tools, or native build. |
| 26872 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 26873 | +case $host in |
| 26874 | + *-*-mingw* ) |
| 26875 | + case $build in |
| 26876 | + *-*-mingw* ) # actually msys |
| 26877 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 26878 | + ;; |
| 26879 | + esac |
| 26880 | + ;; |
| 26881 | +esac |
| 26882 | + |
| 26883 | +fi |
| 26884 | + |
| 26885 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 26886 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 26887 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 26888 | + |
| 26889 | + |
| 26890 | + |
| 26891 | + |
| 26892 | + |
| 26893 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 26894 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 26895 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 26896 | @@ -5777,6 +5857,11 @@ case $reload_flag in |
| 26897 | esac |
| 26898 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 26899 | case $host_os in |
| 26900 | + cygwin* | mingw* | pw32* | cegcc*) |
| 26901 | + if test "$GCC" != yes; then |
| 26902 | + reload_cmds=false |
| 26903 | + fi |
| 26904 | + ;; |
| 26905 | darwin*) |
| 26906 | if test "$GCC" = yes; then |
| 26907 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 26908 | @@ -5945,7 +6030,8 @@ mingw* | pw32*) |
| 26909 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 26910 | lt_cv_file_magic_cmd='func_win32_libid' |
| 26911 | else |
| 26912 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 26913 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 26914 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 26915 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 26916 | fi |
| 26917 | ;; |
| 26918 | @@ -6099,6 +6185,21 @@ esac |
| 26919 | fi |
| 26920 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 26921 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 26922 | + |
| 26923 | +file_magic_glob= |
| 26924 | +want_nocaseglob=no |
| 26925 | +if test "$build" = "$host"; then |
| 26926 | + case $host_os in |
| 26927 | + mingw* | pw32*) |
| 26928 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 26929 | + want_nocaseglob=yes |
| 26930 | + else |
| 26931 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 26932 | + fi |
| 26933 | + ;; |
| 26934 | + esac |
| 26935 | +fi |
| 26936 | + |
| 26937 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 26938 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 26939 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 26940 | @@ -6114,6 +6215,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 26941 | |
| 26942 | |
| 26943 | |
| 26944 | + |
| 26945 | + |
| 26946 | + |
| 26947 | + |
| 26948 | + |
| 26949 | + |
| 26950 | + |
| 26951 | + |
| 26952 | + |
| 26953 | + |
| 26954 | +if test -n "$ac_tool_prefix"; then |
| 26955 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 26956 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 26957 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 26958 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 26959 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 26960 | + $as_echo_n "(cached) " >&6 |
| 26961 | +else |
| 26962 | + if test -n "$DLLTOOL"; then |
| 26963 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 26964 | +else |
| 26965 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 26966 | +for as_dir in $PATH |
| 26967 | +do |
| 26968 | + IFS=$as_save_IFS |
| 26969 | + test -z "$as_dir" && as_dir=. |
| 26970 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 26971 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 26972 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 26973 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 26974 | + break 2 |
| 26975 | + fi |
| 26976 | +done |
| 26977 | + done |
| 26978 | +IFS=$as_save_IFS |
| 26979 | + |
| 26980 | +fi |
| 26981 | +fi |
| 26982 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 26983 | +if test -n "$DLLTOOL"; then |
| 26984 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 26985 | +$as_echo "$DLLTOOL" >&6; } |
| 26986 | +else |
| 26987 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 26988 | +$as_echo "no" >&6; } |
| 26989 | +fi |
| 26990 | + |
| 26991 | + |
| 26992 | +fi |
| 26993 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 26994 | + ac_ct_DLLTOOL=$DLLTOOL |
| 26995 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 26996 | +set dummy dlltool; ac_word=$2 |
| 26997 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 26998 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 26999 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 27000 | + $as_echo_n "(cached) " >&6 |
| 27001 | +else |
| 27002 | + if test -n "$ac_ct_DLLTOOL"; then |
| 27003 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 27004 | +else |
| 27005 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 27006 | +for as_dir in $PATH |
| 27007 | +do |
| 27008 | + IFS=$as_save_IFS |
| 27009 | + test -z "$as_dir" && as_dir=. |
| 27010 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 27011 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 27012 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 27013 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 27014 | + break 2 |
| 27015 | + fi |
| 27016 | +done |
| 27017 | + done |
| 27018 | +IFS=$as_save_IFS |
| 27019 | + |
| 27020 | +fi |
| 27021 | +fi |
| 27022 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 27023 | +if test -n "$ac_ct_DLLTOOL"; then |
| 27024 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 27025 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 27026 | +else |
| 27027 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 27028 | +$as_echo "no" >&6; } |
| 27029 | +fi |
| 27030 | + |
| 27031 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 27032 | + DLLTOOL="false" |
| 27033 | + else |
| 27034 | + case $cross_compiling:$ac_tool_warned in |
| 27035 | +yes:) |
| 27036 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 27037 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 27038 | +ac_tool_warned=yes ;; |
| 27039 | +esac |
| 27040 | + DLLTOOL=$ac_ct_DLLTOOL |
| 27041 | + fi |
| 27042 | +else |
| 27043 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 27044 | +fi |
| 27045 | + |
| 27046 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 27047 | + |
| 27048 | + |
| 27049 | + |
| 27050 | + |
| 27051 | + |
| 27052 | + |
| 27053 | + |
| 27054 | + |
| 27055 | + |
| 27056 | + |
| 27057 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 27058 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 27059 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 27060 | + $as_echo_n "(cached) " >&6 |
| 27061 | +else |
| 27062 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 27063 | + |
| 27064 | +case $host_os in |
| 27065 | +cygwin* | mingw* | pw32* | cegcc*) |
| 27066 | + # two different shell functions defined in ltmain.sh |
| 27067 | + # decide which to use based on capabilities of $DLLTOOL |
| 27068 | + case `$DLLTOOL --help 2>&1` in |
| 27069 | + *--identify-strict*) |
| 27070 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 27071 | + ;; |
| 27072 | + *) |
| 27073 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 27074 | + ;; |
| 27075 | + esac |
| 27076 | + ;; |
| 27077 | +*) |
| 27078 | + # fallback: assume linklib IS sharedlib |
| 27079 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 27080 | + ;; |
| 27081 | +esac |
| 27082 | + |
| 27083 | +fi |
| 27084 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 27085 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 27086 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 27087 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 27088 | + |
| 27089 | + |
| 27090 | + |
| 27091 | + |
| 27092 | + |
| 27093 | + |
| 27094 | + |
| 27095 | plugin_option= |
| 27096 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 27097 | for plugin in $plugin_names; do |
| 27098 | @@ -6128,8 +6380,10 @@ for plugin in $plugin_names; do |
| 27099 | done |
| 27100 | |
| 27101 | if test -n "$ac_tool_prefix"; then |
| 27102 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 27103 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 27104 | + for ac_prog in ar |
| 27105 | + do |
| 27106 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 27107 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 27108 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 27109 | $as_echo_n "checking for $ac_word... " >&6; } |
| 27110 | if ${ac_cv_prog_AR+:} false; then : |
| 27111 | @@ -6145,7 +6399,7 @@ do |
| 27112 | test -z "$as_dir" && as_dir=. |
| 27113 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 27114 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 27115 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 27116 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 27117 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 27118 | break 2 |
| 27119 | fi |
| 27120 | @@ -6165,11 +6419,15 @@ $as_echo "no" >&6; } |
| 27121 | fi |
| 27122 | |
| 27123 | |
| 27124 | + test -n "$AR" && break |
| 27125 | + done |
| 27126 | fi |
| 27127 | -if test -z "$ac_cv_prog_AR"; then |
| 27128 | +if test -z "$AR"; then |
| 27129 | ac_ct_AR=$AR |
| 27130 | - # Extract the first word of "ar", so it can be a program name with args. |
| 27131 | -set dummy ar; ac_word=$2 |
| 27132 | + for ac_prog in ar |
| 27133 | +do |
| 27134 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 27135 | +set dummy $ac_prog; ac_word=$2 |
| 27136 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 27137 | $as_echo_n "checking for $ac_word... " >&6; } |
| 27138 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 27139 | @@ -6185,7 +6443,7 @@ do |
| 27140 | test -z "$as_dir" && as_dir=. |
| 27141 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 27142 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 27143 | - ac_cv_prog_ac_ct_AR="ar" |
| 27144 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 27145 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 27146 | break 2 |
| 27147 | fi |
| 27148 | @@ -6204,6 +6462,10 @@ else |
| 27149 | $as_echo "no" >&6; } |
| 27150 | fi |
| 27151 | |
| 27152 | + |
| 27153 | + test -n "$ac_ct_AR" && break |
| 27154 | +done |
| 27155 | + |
| 27156 | if test "x$ac_ct_AR" = x; then |
| 27157 | AR="false" |
| 27158 | else |
| 27159 | @@ -6215,25 +6477,20 @@ ac_tool_warned=yes ;; |
| 27160 | esac |
| 27161 | AR=$ac_ct_AR |
| 27162 | fi |
| 27163 | -else |
| 27164 | - AR="$ac_cv_prog_AR" |
| 27165 | fi |
| 27166 | |
| 27167 | -test -z "$AR" && AR=ar |
| 27168 | -if test -n "$plugin_option"; then |
| 27169 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 27170 | - touch conftest.c |
| 27171 | - $AR $plugin_option rc conftest.a conftest.c |
| 27172 | - if test "$?" != 0; then |
| 27173 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 27174 | + touch conftest.c |
| 27175 | + $AR $plugin_option rc conftest.a conftest.c |
| 27176 | + if test "$?" != 0; then |
| 27177 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 27178 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 27179 | - else |
| 27180 | - AR="$AR $plugin_option" |
| 27181 | - fi |
| 27182 | - rm -f conftest.* |
| 27183 | + else |
| 27184 | + AR="$AR $plugin_option" |
| 27185 | fi |
| 27186 | -fi |
| 27187 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 27188 | + rm -f conftest.* |
| 27189 | +: ${AR=ar} |
| 27190 | +: ${AR_FLAGS=cru} |
| 27191 | + |
| 27192 | |
| 27193 | |
| 27194 | |
| 27195 | @@ -6244,6 +6501,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 27196 | |
| 27197 | |
| 27198 | |
| 27199 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 27200 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 27201 | +if ${lt_cv_ar_at_file+:} false; then : |
| 27202 | + $as_echo_n "(cached) " >&6 |
| 27203 | +else |
| 27204 | + lt_cv_ar_at_file=no |
| 27205 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 27206 | +/* end confdefs.h. */ |
| 27207 | + |
| 27208 | +int |
| 27209 | +main () |
| 27210 | +{ |
| 27211 | + |
| 27212 | + ; |
| 27213 | + return 0; |
| 27214 | +} |
| 27215 | +_ACEOF |
| 27216 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 27217 | + echo conftest.$ac_objext > conftest.lst |
| 27218 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 27219 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 27220 | + (eval $lt_ar_try) 2>&5 |
| 27221 | + ac_status=$? |
| 27222 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 27223 | + test $ac_status = 0; } |
| 27224 | + if test "$ac_status" -eq 0; then |
| 27225 | + # Ensure the archiver fails upon bogus file names. |
| 27226 | + rm -f conftest.$ac_objext libconftest.a |
| 27227 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 27228 | + (eval $lt_ar_try) 2>&5 |
| 27229 | + ac_status=$? |
| 27230 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 27231 | + test $ac_status = 0; } |
| 27232 | + if test "$ac_status" -ne 0; then |
| 27233 | + lt_cv_ar_at_file=@ |
| 27234 | + fi |
| 27235 | + fi |
| 27236 | + rm -f conftest.* libconftest.a |
| 27237 | + |
| 27238 | +fi |
| 27239 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 27240 | + |
| 27241 | +fi |
| 27242 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 27243 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 27244 | + |
| 27245 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 27246 | + archiver_list_spec= |
| 27247 | +else |
| 27248 | + archiver_list_spec=$lt_cv_ar_at_file |
| 27249 | +fi |
| 27250 | + |
| 27251 | + |
| 27252 | + |
| 27253 | + |
| 27254 | + |
| 27255 | + |
| 27256 | |
| 27257 | if test -n "$ac_tool_prefix"; then |
| 27258 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 27259 | @@ -6584,8 +6898,8 @@ esac |
| 27260 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 27261 | |
| 27262 | # Transform an extracted symbol line into symbol name and symbol address |
| 27263 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 27264 | -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'" |
| 27265 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 27266 | +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'" |
| 27267 | |
| 27268 | # Handle CRLF in mingw tool chain |
| 27269 | opt_cr= |
| 27270 | @@ -6621,6 +6935,7 @@ for ac_symprfx in "" "_"; do |
| 27271 | else |
| 27272 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 27273 | fi |
| 27274 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 27275 | |
| 27276 | # Check to see that the pipe works correctly. |
| 27277 | pipe_works=no |
| 27278 | @@ -6662,6 +6977,18 @@ _LT_EOF |
| 27279 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 27280 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 27281 | cat <<_LT_EOF > conftest.$ac_ext |
| 27282 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 27283 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 27284 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 27285 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 27286 | +# define LT_DLSYM_CONST |
| 27287 | +#elif defined(__osf__) |
| 27288 | +/* This system does not cope well with relocations in const data. */ |
| 27289 | +# define LT_DLSYM_CONST |
| 27290 | +#else |
| 27291 | +# define LT_DLSYM_CONST const |
| 27292 | +#endif |
| 27293 | + |
| 27294 | #ifdef __cplusplus |
| 27295 | extern "C" { |
| 27296 | #endif |
| 27297 | @@ -6673,7 +7000,7 @@ _LT_EOF |
| 27298 | cat <<_LT_EOF >> conftest.$ac_ext |
| 27299 | |
| 27300 | /* The mapping between symbol names and symbols. */ |
| 27301 | -const struct { |
| 27302 | +LT_DLSYM_CONST struct { |
| 27303 | const char *name; |
| 27304 | void *address; |
| 27305 | } |
| 27306 | @@ -6699,8 +7026,8 @@ static const void *lt_preloaded_setup() { |
| 27307 | _LT_EOF |
| 27308 | # Now try linking the two files. |
| 27309 | mv conftest.$ac_objext conftstm.$ac_objext |
| 27310 | - lt_save_LIBS="$LIBS" |
| 27311 | - lt_save_CFLAGS="$CFLAGS" |
| 27312 | + lt_globsym_save_LIBS=$LIBS |
| 27313 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 27314 | LIBS="conftstm.$ac_objext" |
| 27315 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 27316 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 27317 | @@ -6710,8 +7037,8 @@ _LT_EOF |
| 27318 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 27319 | pipe_works=yes |
| 27320 | fi |
| 27321 | - LIBS="$lt_save_LIBS" |
| 27322 | - CFLAGS="$lt_save_CFLAGS" |
| 27323 | + LIBS=$lt_globsym_save_LIBS |
| 27324 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 27325 | else |
| 27326 | echo "cannot find nm_test_func in $nlist" >&5 |
| 27327 | fi |
| 27328 | @@ -6748,6 +7075,14 @@ else |
| 27329 | $as_echo "ok" >&6; } |
| 27330 | fi |
| 27331 | |
| 27332 | +# Response file support. |
| 27333 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 27334 | + nm_file_list_spec='@' |
| 27335 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 27336 | + nm_file_list_spec='@' |
| 27337 | +fi |
| 27338 | + |
| 27339 | + |
| 27340 | |
| 27341 | |
| 27342 | |
| 27343 | @@ -6766,6 +7101,47 @@ fi |
| 27344 | |
| 27345 | |
| 27346 | |
| 27347 | + |
| 27348 | + |
| 27349 | + |
| 27350 | + |
| 27351 | + |
| 27352 | + |
| 27353 | + |
| 27354 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 27355 | +$as_echo_n "checking for sysroot... " >&6; } |
| 27356 | + |
| 27357 | +# Check whether --with-libtool-sysroot was given. |
| 27358 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 27359 | + withval=$with_libtool_sysroot; |
| 27360 | +else |
| 27361 | + with_libtool_sysroot=no |
| 27362 | +fi |
| 27363 | + |
| 27364 | + |
| 27365 | +lt_sysroot= |
| 27366 | +case ${with_libtool_sysroot} in #( |
| 27367 | + yes) |
| 27368 | + if test "$GCC" = yes; then |
| 27369 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 27370 | + fi |
| 27371 | + ;; #( |
| 27372 | + /*) |
| 27373 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 27374 | + ;; #( |
| 27375 | + no|'') |
| 27376 | + ;; #( |
| 27377 | + *) |
| 27378 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 27379 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 27380 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 27381 | + ;; |
| 27382 | +esac |
| 27383 | + |
| 27384 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 27385 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 27386 | + |
| 27387 | + |
| 27388 | |
| 27389 | |
| 27390 | |
| 27391 | @@ -6975,6 +7351,123 @@ esac |
| 27392 | |
| 27393 | need_locks="$enable_libtool_lock" |
| 27394 | |
| 27395 | +if test -n "$ac_tool_prefix"; then |
| 27396 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 27397 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 27398 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 27399 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 27400 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 27401 | + $as_echo_n "(cached) " >&6 |
| 27402 | +else |
| 27403 | + if test -n "$MANIFEST_TOOL"; then |
| 27404 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 27405 | +else |
| 27406 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 27407 | +for as_dir in $PATH |
| 27408 | +do |
| 27409 | + IFS=$as_save_IFS |
| 27410 | + test -z "$as_dir" && as_dir=. |
| 27411 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 27412 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 27413 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 27414 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 27415 | + break 2 |
| 27416 | + fi |
| 27417 | +done |
| 27418 | + done |
| 27419 | +IFS=$as_save_IFS |
| 27420 | + |
| 27421 | +fi |
| 27422 | +fi |
| 27423 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 27424 | +if test -n "$MANIFEST_TOOL"; then |
| 27425 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 27426 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 27427 | +else |
| 27428 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 27429 | +$as_echo "no" >&6; } |
| 27430 | +fi |
| 27431 | + |
| 27432 | + |
| 27433 | +fi |
| 27434 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 27435 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 27436 | + # Extract the first word of "mt", so it can be a program name with args. |
| 27437 | +set dummy mt; ac_word=$2 |
| 27438 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 27439 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 27440 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 27441 | + $as_echo_n "(cached) " >&6 |
| 27442 | +else |
| 27443 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 27444 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 27445 | +else |
| 27446 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 27447 | +for as_dir in $PATH |
| 27448 | +do |
| 27449 | + IFS=$as_save_IFS |
| 27450 | + test -z "$as_dir" && as_dir=. |
| 27451 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 27452 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 27453 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 27454 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 27455 | + break 2 |
| 27456 | + fi |
| 27457 | +done |
| 27458 | + done |
| 27459 | +IFS=$as_save_IFS |
| 27460 | + |
| 27461 | +fi |
| 27462 | +fi |
| 27463 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 27464 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 27465 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 27466 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 27467 | +else |
| 27468 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 27469 | +$as_echo "no" >&6; } |
| 27470 | +fi |
| 27471 | + |
| 27472 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 27473 | + MANIFEST_TOOL=":" |
| 27474 | + else |
| 27475 | + case $cross_compiling:$ac_tool_warned in |
| 27476 | +yes:) |
| 27477 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 27478 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 27479 | +ac_tool_warned=yes ;; |
| 27480 | +esac |
| 27481 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 27482 | + fi |
| 27483 | +else |
| 27484 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 27485 | +fi |
| 27486 | + |
| 27487 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 27488 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 27489 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 27490 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 27491 | + $as_echo_n "(cached) " >&6 |
| 27492 | +else |
| 27493 | + lt_cv_path_mainfest_tool=no |
| 27494 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 27495 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 27496 | + cat conftest.err >&5 |
| 27497 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 27498 | + lt_cv_path_mainfest_tool=yes |
| 27499 | + fi |
| 27500 | + rm -f conftest* |
| 27501 | +fi |
| 27502 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 27503 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 27504 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 27505 | + MANIFEST_TOOL=: |
| 27506 | +fi |
| 27507 | + |
| 27508 | + |
| 27509 | + |
| 27510 | + |
| 27511 | + |
| 27512 | |
| 27513 | case $host_os in |
| 27514 | rhapsody* | darwin*) |
| 27515 | @@ -7538,6 +8031,8 @@ _LT_EOF |
| 27516 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 27517 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 27518 | $AR cru libconftest.a conftest.o 2>&5 |
| 27519 | + echo "$RANLIB libconftest.a" >&5 |
| 27520 | + $RANLIB libconftest.a 2>&5 |
| 27521 | cat > conftest.c << _LT_EOF |
| 27522 | int main() { return 0;} |
| 27523 | _LT_EOF |
| 27524 | @@ -8090,8 +8585,6 @@ fi |
| 27525 | lt_prog_compiler_pic= |
| 27526 | lt_prog_compiler_static= |
| 27527 | |
| 27528 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 27529 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 27530 | |
| 27531 | if test "$GCC" = yes; then |
| 27532 | lt_prog_compiler_wl='-Wl,' |
| 27533 | @@ -8257,6 +8750,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 27534 | lt_prog_compiler_pic='--shared' |
| 27535 | lt_prog_compiler_static='--static' |
| 27536 | ;; |
| 27537 | + nagfor*) |
| 27538 | + # NAG Fortran compiler |
| 27539 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 27540 | + lt_prog_compiler_pic='-PIC' |
| 27541 | + lt_prog_compiler_static='-Bstatic' |
| 27542 | + ;; |
| 27543 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 27544 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 27545 | # which looks to be a dead project) |
| 27546 | @@ -8319,7 +8818,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 27547 | lt_prog_compiler_pic='-KPIC' |
| 27548 | lt_prog_compiler_static='-Bstatic' |
| 27549 | case $cc_basename in |
| 27550 | - f77* | f90* | f95*) |
| 27551 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 27552 | lt_prog_compiler_wl='-Qoption ld ';; |
| 27553 | *) |
| 27554 | lt_prog_compiler_wl='-Wl,';; |
| 27555 | @@ -8376,13 +8875,17 @@ case $host_os in |
| 27556 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 27557 | ;; |
| 27558 | esac |
| 27559 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 27560 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 27561 | - |
| 27562 | - |
| 27563 | - |
| 27564 | - |
| 27565 | |
| 27566 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 27567 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 27568 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 27569 | + $as_echo_n "(cached) " >&6 |
| 27570 | +else |
| 27571 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 27572 | +fi |
| 27573 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 27574 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 27575 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 27576 | |
| 27577 | # |
| 27578 | # Check to make sure the PIC flag actually works. |
| 27579 | @@ -8443,6 +8946,11 @@ fi |
| 27580 | |
| 27581 | |
| 27582 | |
| 27583 | + |
| 27584 | + |
| 27585 | + |
| 27586 | + |
| 27587 | + |
| 27588 | # |
| 27589 | # Check to make sure the static flag actually works. |
| 27590 | # |
| 27591 | @@ -8793,7 +9301,8 @@ _LT_EOF |
| 27592 | allow_undefined_flag=unsupported |
| 27593 | always_export_symbols=no |
| 27594 | enable_shared_with_static_runtimes=yes |
| 27595 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 27596 | + 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' |
| 27597 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 27598 | |
| 27599 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 27600 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 27601 | @@ -8892,12 +9401,12 @@ _LT_EOF |
| 27602 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 27603 | hardcode_libdir_flag_spec= |
| 27604 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 27605 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 27606 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 27607 | if test "x$supports_anon_versioning" = xyes; then |
| 27608 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 27609 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 27610 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 27611 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 27612 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 27613 | fi |
| 27614 | ;; |
| 27615 | esac |
| 27616 | @@ -8911,8 +9420,8 @@ _LT_EOF |
| 27617 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 27618 | wlarc= |
| 27619 | else |
| 27620 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 27621 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 27622 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 27623 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 27624 | fi |
| 27625 | ;; |
| 27626 | |
| 27627 | @@ -8930,8 +9439,8 @@ _LT_EOF |
| 27628 | |
| 27629 | _LT_EOF |
| 27630 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 27631 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 27632 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 27633 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 27634 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 27635 | else |
| 27636 | ld_shlibs=no |
| 27637 | fi |
| 27638 | @@ -8977,8 +9486,8 @@ _LT_EOF |
| 27639 | |
| 27640 | *) |
| 27641 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 27642 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 27643 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 27644 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 27645 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 27646 | else |
| 27647 | ld_shlibs=no |
| 27648 | fi |
| 27649 | @@ -9108,7 +9617,13 @@ _LT_EOF |
| 27650 | allow_undefined_flag='-berok' |
| 27651 | # Determine the default libpath from the value encoded in an |
| 27652 | # empty executable. |
| 27653 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 27654 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 27655 | + aix_libpath=$lt_cv_aix_libpath |
| 27656 | +else |
| 27657 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 27658 | + $as_echo_n "(cached) " >&6 |
| 27659 | +else |
| 27660 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 27661 | /* end confdefs.h. */ |
| 27662 | |
| 27663 | int |
| 27664 | @@ -9121,22 +9636,29 @@ main () |
| 27665 | _ACEOF |
| 27666 | if ac_fn_c_try_link "$LINENO"; then : |
| 27667 | |
| 27668 | -lt_aix_libpath_sed=' |
| 27669 | - /Import File Strings/,/^$/ { |
| 27670 | - /^0/ { |
| 27671 | - s/^0 *\(.*\)$/\1/ |
| 27672 | - p |
| 27673 | - } |
| 27674 | - }' |
| 27675 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 27676 | -# Check for a 64-bit object if we didn't find anything. |
| 27677 | -if test -z "$aix_libpath"; then |
| 27678 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 27679 | -fi |
| 27680 | + lt_aix_libpath_sed=' |
| 27681 | + /Import File Strings/,/^$/ { |
| 27682 | + /^0/ { |
| 27683 | + s/^0 *\([^ ]*\) *$/\1/ |
| 27684 | + p |
| 27685 | + } |
| 27686 | + }' |
| 27687 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 27688 | + # Check for a 64-bit object if we didn't find anything. |
| 27689 | + if test -z "$lt_cv_aix_libpath_"; then |
| 27690 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 27691 | + fi |
| 27692 | fi |
| 27693 | rm -f core conftest.err conftest.$ac_objext \ |
| 27694 | conftest$ac_exeext conftest.$ac_ext |
| 27695 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 27696 | + if test -z "$lt_cv_aix_libpath_"; then |
| 27697 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 27698 | + fi |
| 27699 | + |
| 27700 | +fi |
| 27701 | + |
| 27702 | + aix_libpath=$lt_cv_aix_libpath_ |
| 27703 | +fi |
| 27704 | |
| 27705 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 27706 | 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" |
| 27707 | @@ -9148,7 +9670,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 27708 | else |
| 27709 | # Determine the default libpath from the value encoded in an |
| 27710 | # empty executable. |
| 27711 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 27712 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 27713 | + aix_libpath=$lt_cv_aix_libpath |
| 27714 | +else |
| 27715 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 27716 | + $as_echo_n "(cached) " >&6 |
| 27717 | +else |
| 27718 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 27719 | /* end confdefs.h. */ |
| 27720 | |
| 27721 | int |
| 27722 | @@ -9161,22 +9689,29 @@ main () |
| 27723 | _ACEOF |
| 27724 | if ac_fn_c_try_link "$LINENO"; then : |
| 27725 | |
| 27726 | -lt_aix_libpath_sed=' |
| 27727 | - /Import File Strings/,/^$/ { |
| 27728 | - /^0/ { |
| 27729 | - s/^0 *\(.*\)$/\1/ |
| 27730 | - p |
| 27731 | - } |
| 27732 | - }' |
| 27733 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 27734 | -# Check for a 64-bit object if we didn't find anything. |
| 27735 | -if test -z "$aix_libpath"; then |
| 27736 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 27737 | -fi |
| 27738 | + lt_aix_libpath_sed=' |
| 27739 | + /Import File Strings/,/^$/ { |
| 27740 | + /^0/ { |
| 27741 | + s/^0 *\([^ ]*\) *$/\1/ |
| 27742 | + p |
| 27743 | + } |
| 27744 | + }' |
| 27745 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 27746 | + # Check for a 64-bit object if we didn't find anything. |
| 27747 | + if test -z "$lt_cv_aix_libpath_"; then |
| 27748 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 27749 | + fi |
| 27750 | fi |
| 27751 | rm -f core conftest.err conftest.$ac_objext \ |
| 27752 | conftest$ac_exeext conftest.$ac_ext |
| 27753 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 27754 | + if test -z "$lt_cv_aix_libpath_"; then |
| 27755 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 27756 | + fi |
| 27757 | + |
| 27758 | +fi |
| 27759 | + |
| 27760 | + aix_libpath=$lt_cv_aix_libpath_ |
| 27761 | +fi |
| 27762 | |
| 27763 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 27764 | # Warning - without using the other run time loading flags, |
| 27765 | @@ -9221,20 +9756,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 27766 | # Microsoft Visual C++. |
| 27767 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 27768 | # no search path for DLLs. |
| 27769 | - hardcode_libdir_flag_spec=' ' |
| 27770 | - allow_undefined_flag=unsupported |
| 27771 | - # Tell ltmain to make .lib files, not .a files. |
| 27772 | - libext=lib |
| 27773 | - # Tell ltmain to make .dll files, not .so files. |
| 27774 | - shrext_cmds=".dll" |
| 27775 | - # FIXME: Setting linknames here is a bad hack. |
| 27776 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 27777 | - # The linker will automatically build a .lib file if we build a DLL. |
| 27778 | - old_archive_from_new_cmds='true' |
| 27779 | - # FIXME: Should let the user specify the lib program. |
| 27780 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 27781 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 27782 | - enable_shared_with_static_runtimes=yes |
| 27783 | + case $cc_basename in |
| 27784 | + cl*) |
| 27785 | + # Native MSVC |
| 27786 | + hardcode_libdir_flag_spec=' ' |
| 27787 | + allow_undefined_flag=unsupported |
| 27788 | + always_export_symbols=yes |
| 27789 | + file_list_spec='@' |
| 27790 | + # Tell ltmain to make .lib files, not .a files. |
| 27791 | + libext=lib |
| 27792 | + # Tell ltmain to make .dll files, not .so files. |
| 27793 | + shrext_cmds=".dll" |
| 27794 | + # FIXME: Setting linknames here is a bad hack. |
| 27795 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 27796 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 27797 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 27798 | + else |
| 27799 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 27800 | + fi~ |
| 27801 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 27802 | + linknames=' |
| 27803 | + # The linker will not automatically build a static lib if we build a DLL. |
| 27804 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 27805 | + enable_shared_with_static_runtimes=yes |
| 27806 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 27807 | + # Don't use ranlib |
| 27808 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 27809 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 27810 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 27811 | + case $lt_outputfile in |
| 27812 | + *.exe|*.EXE) ;; |
| 27813 | + *) |
| 27814 | + lt_outputfile="$lt_outputfile.exe" |
| 27815 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 27816 | + ;; |
| 27817 | + esac~ |
| 27818 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 27819 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 27820 | + $RM "$lt_outputfile.manifest"; |
| 27821 | + fi' |
| 27822 | + ;; |
| 27823 | + *) |
| 27824 | + # Assume MSVC wrapper |
| 27825 | + hardcode_libdir_flag_spec=' ' |
| 27826 | + allow_undefined_flag=unsupported |
| 27827 | + # Tell ltmain to make .lib files, not .a files. |
| 27828 | + libext=lib |
| 27829 | + # Tell ltmain to make .dll files, not .so files. |
| 27830 | + shrext_cmds=".dll" |
| 27831 | + # FIXME: Setting linknames here is a bad hack. |
| 27832 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 27833 | + # The linker will automatically build a .lib file if we build a DLL. |
| 27834 | + old_archive_from_new_cmds='true' |
| 27835 | + # FIXME: Should let the user specify the lib program. |
| 27836 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 27837 | + enable_shared_with_static_runtimes=yes |
| 27838 | + ;; |
| 27839 | + esac |
| 27840 | ;; |
| 27841 | |
| 27842 | darwin* | rhapsody*) |
| 27843 | @@ -9295,7 +9873,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 27844 | |
| 27845 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 27846 | freebsd* | dragonfly*) |
| 27847 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 27848 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 27849 | hardcode_libdir_flag_spec='-R$libdir' |
| 27850 | hardcode_direct=yes |
| 27851 | hardcode_shlibpath_var=no |
| 27852 | @@ -9303,7 +9881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 27853 | |
| 27854 | hpux9*) |
| 27855 | if test "$GCC" = yes; then |
| 27856 | - 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' |
| 27857 | + 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' |
| 27858 | else |
| 27859 | 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' |
| 27860 | fi |
| 27861 | @@ -9319,7 +9897,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 27862 | |
| 27863 | hpux10*) |
| 27864 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 27865 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 27866 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 27867 | else |
| 27868 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 27869 | fi |
| 27870 | @@ -9343,10 +9921,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 27871 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 27872 | ;; |
| 27873 | ia64*) |
| 27874 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 27875 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 27876 | ;; |
| 27877 | *) |
| 27878 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 27879 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 27880 | ;; |
| 27881 | esac |
| 27882 | else |
| 27883 | @@ -9425,23 +10003,36 @@ fi |
| 27884 | |
| 27885 | irix5* | irix6* | nonstopux*) |
| 27886 | if test "$GCC" = yes; then |
| 27887 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 27888 | + 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' |
| 27889 | # Try to use the -exported_symbol ld option, if it does not |
| 27890 | # work, assume that -exports_file does not work either and |
| 27891 | # implicitly export all symbols. |
| 27892 | - save_LDFLAGS="$LDFLAGS" |
| 27893 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 27894 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 27895 | + # This should be the same for all languages, so no per-tag cache variable. |
| 27896 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 27897 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 27898 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 27899 | + $as_echo_n "(cached) " >&6 |
| 27900 | +else |
| 27901 | + save_LDFLAGS="$LDFLAGS" |
| 27902 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 27903 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 27904 | /* end confdefs.h. */ |
| 27905 | -int foo(void) {} |
| 27906 | +int foo (void) { return 0; } |
| 27907 | _ACEOF |
| 27908 | if ac_fn_c_try_link "$LINENO"; then : |
| 27909 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 27910 | - |
| 27911 | + lt_cv_irix_exported_symbol=yes |
| 27912 | +else |
| 27913 | + lt_cv_irix_exported_symbol=no |
| 27914 | fi |
| 27915 | rm -f core conftest.err conftest.$ac_objext \ |
| 27916 | conftest$ac_exeext conftest.$ac_ext |
| 27917 | - LDFLAGS="$save_LDFLAGS" |
| 27918 | + LDFLAGS="$save_LDFLAGS" |
| 27919 | +fi |
| 27920 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 27921 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 27922 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 27923 | + 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' |
| 27924 | + fi |
| 27925 | else |
| 27926 | 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' |
| 27927 | 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' |
| 27928 | @@ -9526,7 +10117,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 27929 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 27930 | if test "$GCC" = yes; then |
| 27931 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 27932 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 27933 | + 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' |
| 27934 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 27935 | else |
| 27936 | allow_undefined_flag=' -expect_unresolved \*' |
| 27937 | @@ -9545,9 +10136,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 27938 | no_undefined_flag=' -z defs' |
| 27939 | if test "$GCC" = yes; then |
| 27940 | wlarc='${wl}' |
| 27941 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 27942 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 27943 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 27944 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 27945 | + $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' |
| 27946 | else |
| 27947 | case `$CC -V 2>&1` in |
| 27948 | *"Compilers 5.0"*) |
| 27949 | @@ -10123,8 +10714,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 27950 | need_version=no |
| 27951 | need_lib_prefix=no |
| 27952 | |
| 27953 | - case $GCC,$host_os in |
| 27954 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 27955 | + case $GCC,$cc_basename in |
| 27956 | + yes,*) |
| 27957 | + # gcc |
| 27958 | library_names_spec='$libname.dll.a' |
| 27959 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 27960 | postinstall_cmds='base_file=`basename \${file}`~ |
| 27961 | @@ -10157,13 +10749,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 27962 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 27963 | ;; |
| 27964 | esac |
| 27965 | + dynamic_linker='Win32 ld.exe' |
| 27966 | + ;; |
| 27967 | + |
| 27968 | + *,cl*) |
| 27969 | + # Native MSVC |
| 27970 | + libname_spec='$name' |
| 27971 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 27972 | + library_names_spec='${libname}.dll.lib' |
| 27973 | + |
| 27974 | + case $build_os in |
| 27975 | + mingw*) |
| 27976 | + sys_lib_search_path_spec= |
| 27977 | + lt_save_ifs=$IFS |
| 27978 | + IFS=';' |
| 27979 | + for lt_path in $LIB |
| 27980 | + do |
| 27981 | + IFS=$lt_save_ifs |
| 27982 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 27983 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 27984 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 27985 | + done |
| 27986 | + IFS=$lt_save_ifs |
| 27987 | + # Convert to MSYS style. |
| 27988 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 27989 | + ;; |
| 27990 | + cygwin*) |
| 27991 | + # Convert to unix form, then to dos form, then back to unix form |
| 27992 | + # but this time dos style (no spaces!) so that the unix form looks |
| 27993 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 27994 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 27995 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 27996 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 27997 | + ;; |
| 27998 | + *) |
| 27999 | + sys_lib_search_path_spec="$LIB" |
| 28000 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 28001 | + # It is most probably a Windows format PATH. |
| 28002 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 28003 | + else |
| 28004 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 28005 | + fi |
| 28006 | + # FIXME: find the short name or the path components, as spaces are |
| 28007 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 28008 | + ;; |
| 28009 | + esac |
| 28010 | + |
| 28011 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 28012 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 28013 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 28014 | + dldir=$destdir/`dirname \$dlpath`~ |
| 28015 | + test -d \$dldir || mkdir -p \$dldir~ |
| 28016 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 28017 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 28018 | + dlpath=$dir/\$dldll~ |
| 28019 | + $RM \$dlpath' |
| 28020 | + shlibpath_overrides_runpath=yes |
| 28021 | + dynamic_linker='Win32 link.exe' |
| 28022 | ;; |
| 28023 | |
| 28024 | *) |
| 28025 | + # Assume MSVC wrapper |
| 28026 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 28027 | + dynamic_linker='Win32 ld.exe' |
| 28028 | ;; |
| 28029 | esac |
| 28030 | - dynamic_linker='Win32 ld.exe' |
| 28031 | # FIXME: first we should search . and the directory the executable is in |
| 28032 | shlibpath_var=PATH |
| 28033 | ;; |
| 28034 | @@ -11041,7 +11691,7 @@ else |
| 28035 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 28036 | lt_status=$lt_dlunknown |
| 28037 | cat > conftest.$ac_ext <<_LT_EOF |
| 28038 | -#line 11044 "configure" |
| 28039 | +#line $LINENO "configure" |
| 28040 | #include "confdefs.h" |
| 28041 | |
| 28042 | #if HAVE_DLFCN_H |
| 28043 | @@ -11085,10 +11735,10 @@ else |
| 28044 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 28045 | correspondingly for the symbols needed. */ |
| 28046 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 28047 | -void fnord () __attribute__((visibility("default"))); |
| 28048 | +int fnord () __attribute__((visibility("default"))); |
| 28049 | #endif |
| 28050 | |
| 28051 | -void fnord () { int i=42; } |
| 28052 | +int fnord () { return 42; } |
| 28053 | int main () |
| 28054 | { |
| 28055 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 28056 | @@ -11147,7 +11797,7 @@ else |
| 28057 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 28058 | lt_status=$lt_dlunknown |
| 28059 | cat > conftest.$ac_ext <<_LT_EOF |
| 28060 | -#line 11150 "configure" |
| 28061 | +#line $LINENO "configure" |
| 28062 | #include "confdefs.h" |
| 28063 | |
| 28064 | #if HAVE_DLFCN_H |
| 28065 | @@ -11191,10 +11841,10 @@ else |
| 28066 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 28067 | correspondingly for the symbols needed. */ |
| 28068 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 28069 | -void fnord () __attribute__((visibility("default"))); |
| 28070 | +int fnord () __attribute__((visibility("default"))); |
| 28071 | #endif |
| 28072 | |
| 28073 | -void fnord () { int i=42; } |
| 28074 | +int fnord () { return 42; } |
| 28075 | int main () |
| 28076 | { |
| 28077 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 28078 | @@ -13396,13 +14046,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 28079 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 28080 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 28081 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 28082 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 28083 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 28084 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 28085 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 28086 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 28087 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 28088 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 28089 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 28090 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 28091 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 28092 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 28093 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 28094 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 28095 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 28096 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 28097 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 28098 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 28099 | @@ -13417,14 +14074,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 28100 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 28101 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 28102 | 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"`' |
| 28103 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 28104 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 28105 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 28106 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 28107 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 28108 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 28109 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 28110 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 28111 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 28112 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 28113 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 28114 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 28115 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 28116 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 28117 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 28118 | @@ -13457,12 +14117,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 28119 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 28120 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 28121 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 28122 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 28123 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 28124 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 28125 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 28126 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 28127 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 28128 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 28129 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 28130 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 28131 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 28132 | @@ -13517,8 +14177,13 @@ reload_flag \ |
| 28133 | OBJDUMP \ |
| 28134 | deplibs_check_method \ |
| 28135 | file_magic_cmd \ |
| 28136 | +file_magic_glob \ |
| 28137 | +want_nocaseglob \ |
| 28138 | +DLLTOOL \ |
| 28139 | +sharedlib_from_linklib_cmd \ |
| 28140 | AR \ |
| 28141 | AR_FLAGS \ |
| 28142 | +archiver_list_spec \ |
| 28143 | STRIP \ |
| 28144 | RANLIB \ |
| 28145 | CC \ |
| 28146 | @@ -13528,12 +14193,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 28147 | lt_cv_sys_global_symbol_to_cdecl \ |
| 28148 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 28149 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 28150 | +nm_file_list_spec \ |
| 28151 | lt_prog_compiler_no_builtin_flag \ |
| 28152 | -lt_prog_compiler_wl \ |
| 28153 | lt_prog_compiler_pic \ |
| 28154 | +lt_prog_compiler_wl \ |
| 28155 | lt_prog_compiler_static \ |
| 28156 | lt_cv_prog_compiler_c_o \ |
| 28157 | need_locks \ |
| 28158 | +MANIFEST_TOOL \ |
| 28159 | DSYMUTIL \ |
| 28160 | NMEDIT \ |
| 28161 | LIPO \ |
| 28162 | @@ -13549,7 +14216,6 @@ no_undefined_flag \ |
| 28163 | hardcode_libdir_flag_spec \ |
| 28164 | hardcode_libdir_flag_spec_ld \ |
| 28165 | hardcode_libdir_separator \ |
| 28166 | -fix_srcfile_path \ |
| 28167 | exclude_expsyms \ |
| 28168 | include_expsyms \ |
| 28169 | file_list_spec \ |
| 28170 | @@ -13585,6 +14251,7 @@ module_cmds \ |
| 28171 | module_expsym_cmds \ |
| 28172 | export_symbols_cmds \ |
| 28173 | prelink_cmds \ |
| 28174 | +postlink_cmds \ |
| 28175 | postinstall_cmds \ |
| 28176 | postuninstall_cmds \ |
| 28177 | finish_cmds \ |
| 28178 | @@ -14350,7 +15017,8 @@ $as_echo X"$file" | |
| 28179 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 28180 | # |
| 28181 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 28182 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 28183 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 28184 | +# Inc. |
| 28185 | # Written by Gordon Matzigkeit, 1996 |
| 28186 | # |
| 28187 | # This file is part of GNU Libtool. |
| 28188 | @@ -14453,19 +15121,42 @@ SP2NL=$lt_lt_SP2NL |
| 28189 | # turn newlines into spaces. |
| 28190 | NL2SP=$lt_lt_NL2SP |
| 28191 | |
| 28192 | +# convert \$build file names to \$host format. |
| 28193 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 28194 | + |
| 28195 | +# convert \$build files to toolchain format. |
| 28196 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 28197 | + |
| 28198 | # An object symbol dumper. |
| 28199 | OBJDUMP=$lt_OBJDUMP |
| 28200 | |
| 28201 | # Method to check whether dependent libraries are shared objects. |
| 28202 | deplibs_check_method=$lt_deplibs_check_method |
| 28203 | |
| 28204 | -# Command to use when deplibs_check_method == "file_magic". |
| 28205 | +# Command to use when deplibs_check_method = "file_magic". |
| 28206 | file_magic_cmd=$lt_file_magic_cmd |
| 28207 | |
| 28208 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 28209 | +file_magic_glob=$lt_file_magic_glob |
| 28210 | + |
| 28211 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 28212 | +want_nocaseglob=$lt_want_nocaseglob |
| 28213 | + |
| 28214 | +# DLL creation program. |
| 28215 | +DLLTOOL=$lt_DLLTOOL |
| 28216 | + |
| 28217 | +# Command to associate shared and link libraries. |
| 28218 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 28219 | + |
| 28220 | # The archiver. |
| 28221 | AR=$lt_AR |
| 28222 | + |
| 28223 | +# Flags to create an archive. |
| 28224 | AR_FLAGS=$lt_AR_FLAGS |
| 28225 | |
| 28226 | +# How to feed a file listing to the archiver. |
| 28227 | +archiver_list_spec=$lt_archiver_list_spec |
| 28228 | + |
| 28229 | # A symbol stripping program. |
| 28230 | STRIP=$lt_STRIP |
| 28231 | |
| 28232 | @@ -14495,6 +15186,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 28233 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 28234 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 28235 | |
| 28236 | +# Specify filename containing input files for \$NM. |
| 28237 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 28238 | + |
| 28239 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 28240 | +lt_sysroot=$lt_sysroot |
| 28241 | + |
| 28242 | # The name of the directory that contains temporary libtool files. |
| 28243 | objdir=$objdir |
| 28244 | |
| 28245 | @@ -14504,6 +15201,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 28246 | # Must we lock files when doing compilation? |
| 28247 | need_locks=$lt_need_locks |
| 28248 | |
| 28249 | +# Manifest tool. |
| 28250 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 28251 | + |
| 28252 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 28253 | DSYMUTIL=$lt_DSYMUTIL |
| 28254 | |
| 28255 | @@ -14618,12 +15318,12 @@ with_gcc=$GCC |
| 28256 | # Compiler flag to turn off builtin functions. |
| 28257 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 28258 | |
| 28259 | -# How to pass a linker flag through the compiler. |
| 28260 | -wl=$lt_lt_prog_compiler_wl |
| 28261 | - |
| 28262 | # Additional compiler flags for building library objects. |
| 28263 | pic_flag=$lt_lt_prog_compiler_pic |
| 28264 | |
| 28265 | +# How to pass a linker flag through the compiler. |
| 28266 | +wl=$lt_lt_prog_compiler_wl |
| 28267 | + |
| 28268 | # Compiler flag to prevent dynamic linking. |
| 28269 | link_static_flag=$lt_lt_prog_compiler_static |
| 28270 | |
| 28271 | @@ -14710,9 +15410,6 @@ inherit_rpath=$inherit_rpath |
| 28272 | # Whether libtool must link a program against all its dependency libraries. |
| 28273 | link_all_deplibs=$link_all_deplibs |
| 28274 | |
| 28275 | -# Fix the shell variable \$srcfile for the compiler. |
| 28276 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 28277 | - |
| 28278 | # Set to "yes" if exported symbols are required. |
| 28279 | always_export_symbols=$always_export_symbols |
| 28280 | |
| 28281 | @@ -14728,6 +15425,9 @@ include_expsyms=$lt_include_expsyms |
| 28282 | # Commands necessary for linking programs (against libraries) with templates. |
| 28283 | prelink_cmds=$lt_prelink_cmds |
| 28284 | |
| 28285 | +# Commands necessary for finishing linking programs. |
| 28286 | +postlink_cmds=$lt_postlink_cmds |
| 28287 | + |
| 28288 | # Specify filename containing input files. |
| 28289 | file_list_spec=$lt_file_list_spec |
| 28290 | |
| 28291 | @@ -14760,210 +15460,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 28292 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 28293 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 28294 | # is reportedly fixed, but why not run on old versions too? |
| 28295 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 28296 | - || (rm -f "$cfgfile"; exit 1) |
| 28297 | - |
| 28298 | - case $xsi_shell in |
| 28299 | - yes) |
| 28300 | - cat << \_LT_EOF >> "$cfgfile" |
| 28301 | - |
| 28302 | -# func_dirname file append nondir_replacement |
| 28303 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 28304 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 28305 | -func_dirname () |
| 28306 | -{ |
| 28307 | - case ${1} in |
| 28308 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 28309 | - * ) func_dirname_result="${3}" ;; |
| 28310 | - esac |
| 28311 | -} |
| 28312 | - |
| 28313 | -# func_basename file |
| 28314 | -func_basename () |
| 28315 | -{ |
| 28316 | - func_basename_result="${1##*/}" |
| 28317 | -} |
| 28318 | - |
| 28319 | -# func_dirname_and_basename file append nondir_replacement |
| 28320 | -# perform func_basename and func_dirname in a single function |
| 28321 | -# call: |
| 28322 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 28323 | -# add APPEND to the result, otherwise set result |
| 28324 | -# to NONDIR_REPLACEMENT. |
| 28325 | -# value returned in "$func_dirname_result" |
| 28326 | -# basename: Compute filename of FILE. |
| 28327 | -# value retuned in "$func_basename_result" |
| 28328 | -# Implementation must be kept synchronized with func_dirname |
| 28329 | -# and func_basename. For efficiency, we do not delegate to |
| 28330 | -# those functions but instead duplicate the functionality here. |
| 28331 | -func_dirname_and_basename () |
| 28332 | -{ |
| 28333 | - case ${1} in |
| 28334 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 28335 | - * ) func_dirname_result="${3}" ;; |
| 28336 | - esac |
| 28337 | - func_basename_result="${1##*/}" |
| 28338 | -} |
| 28339 | - |
| 28340 | -# func_stripname prefix suffix name |
| 28341 | -# strip PREFIX and SUFFIX off of NAME. |
| 28342 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 28343 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 28344 | -# dot (in which case that matches only a dot). |
| 28345 | -func_stripname () |
| 28346 | -{ |
| 28347 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 28348 | - # positional parameters, so assign one to ordinary parameter first. |
| 28349 | - func_stripname_result=${3} |
| 28350 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 28351 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 28352 | -} |
| 28353 | - |
| 28354 | -# func_opt_split |
| 28355 | -func_opt_split () |
| 28356 | -{ |
| 28357 | - func_opt_split_opt=${1%%=*} |
| 28358 | - func_opt_split_arg=${1#*=} |
| 28359 | -} |
| 28360 | - |
| 28361 | -# func_lo2o object |
| 28362 | -func_lo2o () |
| 28363 | -{ |
| 28364 | - case ${1} in |
| 28365 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 28366 | - *) func_lo2o_result=${1} ;; |
| 28367 | - esac |
| 28368 | -} |
| 28369 | - |
| 28370 | -# func_xform libobj-or-source |
| 28371 | -func_xform () |
| 28372 | -{ |
| 28373 | - func_xform_result=${1%.*}.lo |
| 28374 | -} |
| 28375 | - |
| 28376 | -# func_arith arithmetic-term... |
| 28377 | -func_arith () |
| 28378 | -{ |
| 28379 | - func_arith_result=$(( $* )) |
| 28380 | -} |
| 28381 | - |
| 28382 | -# func_len string |
| 28383 | -# STRING may not start with a hyphen. |
| 28384 | -func_len () |
| 28385 | -{ |
| 28386 | - func_len_result=${#1} |
| 28387 | -} |
| 28388 | - |
| 28389 | -_LT_EOF |
| 28390 | - ;; |
| 28391 | - *) # Bourne compatible functions. |
| 28392 | - cat << \_LT_EOF >> "$cfgfile" |
| 28393 | - |
| 28394 | -# func_dirname file append nondir_replacement |
| 28395 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 28396 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 28397 | -func_dirname () |
| 28398 | -{ |
| 28399 | - # Extract subdirectory from the argument. |
| 28400 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 28401 | - if test "X$func_dirname_result" = "X${1}"; then |
| 28402 | - func_dirname_result="${3}" |
| 28403 | - else |
| 28404 | - func_dirname_result="$func_dirname_result${2}" |
| 28405 | - fi |
| 28406 | -} |
| 28407 | - |
| 28408 | -# func_basename file |
| 28409 | -func_basename () |
| 28410 | -{ |
| 28411 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 28412 | -} |
| 28413 | - |
| 28414 | - |
| 28415 | -# func_stripname prefix suffix name |
| 28416 | -# strip PREFIX and SUFFIX off of NAME. |
| 28417 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 28418 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 28419 | -# dot (in which case that matches only a dot). |
| 28420 | -# func_strip_suffix prefix name |
| 28421 | -func_stripname () |
| 28422 | -{ |
| 28423 | - case ${2} in |
| 28424 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 28425 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 28426 | - esac |
| 28427 | -} |
| 28428 | - |
| 28429 | -# sed scripts: |
| 28430 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 28431 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 28432 | - |
| 28433 | -# func_opt_split |
| 28434 | -func_opt_split () |
| 28435 | -{ |
| 28436 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 28437 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 28438 | -} |
| 28439 | - |
| 28440 | -# func_lo2o object |
| 28441 | -func_lo2o () |
| 28442 | -{ |
| 28443 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 28444 | -} |
| 28445 | - |
| 28446 | -# func_xform libobj-or-source |
| 28447 | -func_xform () |
| 28448 | -{ |
| 28449 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 28450 | -} |
| 28451 | - |
| 28452 | -# func_arith arithmetic-term... |
| 28453 | -func_arith () |
| 28454 | -{ |
| 28455 | - func_arith_result=`expr "$@"` |
| 28456 | -} |
| 28457 | - |
| 28458 | -# func_len string |
| 28459 | -# STRING may not start with a hyphen. |
| 28460 | -func_len () |
| 28461 | -{ |
| 28462 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 28463 | -} |
| 28464 | - |
| 28465 | -_LT_EOF |
| 28466 | -esac |
| 28467 | - |
| 28468 | -case $lt_shell_append in |
| 28469 | - yes) |
| 28470 | - cat << \_LT_EOF >> "$cfgfile" |
| 28471 | - |
| 28472 | -# func_append var value |
| 28473 | -# Append VALUE to the end of shell variable VAR. |
| 28474 | -func_append () |
| 28475 | -{ |
| 28476 | - eval "$1+=\$2" |
| 28477 | -} |
| 28478 | -_LT_EOF |
| 28479 | - ;; |
| 28480 | - *) |
| 28481 | - cat << \_LT_EOF >> "$cfgfile" |
| 28482 | - |
| 28483 | -# func_append var value |
| 28484 | -# Append VALUE to the end of shell variable VAR. |
| 28485 | -func_append () |
| 28486 | -{ |
| 28487 | - eval "$1=\$$1\$2" |
| 28488 | -} |
| 28489 | - |
| 28490 | -_LT_EOF |
| 28491 | - ;; |
| 28492 | - esac |
| 28493 | - |
| 28494 | - |
| 28495 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 28496 | - || (rm -f "$cfgfile"; exit 1) |
| 28497 | - |
| 28498 | - mv -f "$cfgfile" "$ofile" || |
| 28499 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 28500 | + || (rm -f "$cfgfile"; exit 1) |
| 28501 | + |
| 28502 | + if test x"$xsi_shell" = xyes; then |
| 28503 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 28504 | +func_dirname ()\ |
| 28505 | +{\ |
| 28506 | +\ case ${1} in\ |
| 28507 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 28508 | +\ * ) func_dirname_result="${3}" ;;\ |
| 28509 | +\ esac\ |
| 28510 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28511 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28512 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28513 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28514 | + |
| 28515 | + |
| 28516 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 28517 | +func_basename ()\ |
| 28518 | +{\ |
| 28519 | +\ func_basename_result="${1##*/}"\ |
| 28520 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28521 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28522 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28523 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28524 | + |
| 28525 | + |
| 28526 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 28527 | +func_dirname_and_basename ()\ |
| 28528 | +{\ |
| 28529 | +\ case ${1} in\ |
| 28530 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 28531 | +\ * ) func_dirname_result="${3}" ;;\ |
| 28532 | +\ esac\ |
| 28533 | +\ func_basename_result="${1##*/}"\ |
| 28534 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28535 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28536 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28537 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28538 | + |
| 28539 | + |
| 28540 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 28541 | +func_stripname ()\ |
| 28542 | +{\ |
| 28543 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 28544 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 28545 | +\ func_stripname_result=${3}\ |
| 28546 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 28547 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 28548 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28549 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28550 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28551 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28552 | + |
| 28553 | + |
| 28554 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 28555 | +func_split_long_opt ()\ |
| 28556 | +{\ |
| 28557 | +\ func_split_long_opt_name=${1%%=*}\ |
| 28558 | +\ func_split_long_opt_arg=${1#*=}\ |
| 28559 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28560 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28561 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28562 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28563 | + |
| 28564 | + |
| 28565 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 28566 | +func_split_short_opt ()\ |
| 28567 | +{\ |
| 28568 | +\ func_split_short_opt_arg=${1#??}\ |
| 28569 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 28570 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28571 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28572 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28573 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28574 | + |
| 28575 | + |
| 28576 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 28577 | +func_lo2o ()\ |
| 28578 | +{\ |
| 28579 | +\ case ${1} in\ |
| 28580 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 28581 | +\ *) func_lo2o_result=${1} ;;\ |
| 28582 | +\ esac\ |
| 28583 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28584 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28585 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28586 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28587 | + |
| 28588 | + |
| 28589 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 28590 | +func_xform ()\ |
| 28591 | +{\ |
| 28592 | + func_xform_result=${1%.*}.lo\ |
| 28593 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28594 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28595 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28596 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28597 | + |
| 28598 | + |
| 28599 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 28600 | +func_arith ()\ |
| 28601 | +{\ |
| 28602 | + func_arith_result=$(( $* ))\ |
| 28603 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28604 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28605 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28606 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28607 | + |
| 28608 | + |
| 28609 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 28610 | +func_len ()\ |
| 28611 | +{\ |
| 28612 | + func_len_result=${#1}\ |
| 28613 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28614 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28615 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28616 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28617 | + |
| 28618 | +fi |
| 28619 | + |
| 28620 | +if test x"$lt_shell_append" = xyes; then |
| 28621 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 28622 | +func_append ()\ |
| 28623 | +{\ |
| 28624 | + eval "${1}+=\\${2}"\ |
| 28625 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28626 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28627 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28628 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28629 | + |
| 28630 | + |
| 28631 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 28632 | +func_append_quoted ()\ |
| 28633 | +{\ |
| 28634 | +\ func_quote_for_eval "${2}"\ |
| 28635 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 28636 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 28637 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28638 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28639 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 28640 | + |
| 28641 | + |
| 28642 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 28643 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 28644 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28645 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28646 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 28647 | +else |
| 28648 | + # Save a `func_append' function call even when '+=' is not available |
| 28649 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 28650 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 28651 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 28652 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 28653 | +fi |
| 28654 | + |
| 28655 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 28656 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 28657 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 28658 | +fi |
| 28659 | + |
| 28660 | + |
| 28661 | + mv -f "$cfgfile" "$ofile" || |
| 28662 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 28663 | chmod +x "$ofile" |
| 28664 | |
| 28665 | diff --git a/sim/Makefile.in b/sim/Makefile.in |
| 28666 | index dbbaa84224a..f819bbe0bdd 100644 |
| 28667 | --- a/sim/Makefile.in |
| 28668 | +++ b/sim/Makefile.in |
| 28669 | @@ -744,6 +744,7 @@ C_DIALECT = @C_DIALECT@ |
| 28670 | DATADIRNAME = @DATADIRNAME@ |
| 28671 | DEFS = @DEFS@ |
| 28672 | DEPDIR = @DEPDIR@ |
| 28673 | +DLLTOOL = @DLLTOOL@ |
| 28674 | DSYMUTIL = @DSYMUTIL@ |
| 28675 | DTC = @DTC@ |
| 28676 | DUMPBIN = @DUMPBIN@ |
| 28677 | @@ -809,6 +810,7 @@ LN_S = @LN_S@ |
| 28678 | LTLIBOBJS = @LTLIBOBJS@ |
| 28679 | MAINT = @MAINT@ |
| 28680 | MAKEINFO = @MAKEINFO@ |
| 28681 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 28682 | MKDIR_P = @MKDIR_P@ |
| 28683 | NM = @NM@ |
| 28684 | NMEDIT = @NMEDIT@ |
| 28685 | @@ -859,6 +861,7 @@ abs_builddir = @abs_builddir@ |
| 28686 | abs_srcdir = @abs_srcdir@ |
| 28687 | abs_top_builddir = @abs_top_builddir@ |
| 28688 | abs_top_srcdir = @abs_top_srcdir@ |
| 28689 | +ac_ct_AR = @ac_ct_AR@ |
| 28690 | ac_ct_CC = @ac_ct_CC@ |
| 28691 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 28692 | am__include = @am__include@ |
| 28693 | diff --git a/zlib/Makefile.in b/zlib/Makefile.in |
| 28694 | index c7584492a65..0605835c14f 100644 |
| 28695 | --- a/zlib/Makefile.in |
| 28696 | +++ b/zlib/Makefile.in |
| 28697 | @@ -1,7 +1,7 @@ |
| 28698 | -# Makefile.in generated by automake 1.16.5 from Makefile.am. |
| 28699 | +# Makefile.in generated by automake 1.15.1 from Makefile.am. |
| 28700 | # @configure_input@ |
| 28701 | |
| 28702 | -# Copyright (C) 1994-2021 Free Software Foundation, Inc. |
| 28703 | +# Copyright (C) 1994-2017 Free Software Foundation, Inc. |
| 28704 | |
| 28705 | # This Makefile.in is free software; the Free Software Foundation |
| 28706 | # gives unlimited permission to copy and/or distribute it, |
| 28707 | @@ -138,7 +138,6 @@ am__uninstall_files_from_dir = { \ |
| 28708 | } |
| 28709 | am__installdirs = "$(DESTDIR)$(toolexeclibdir)" |
| 28710 | LIBRARIES = $(toolexeclib_LIBRARIES) |
| 28711 | -LTLIBRARIES = $(noinst_LTLIBRARIES) |
| 28712 | ARFLAGS = cru |
| 28713 | AM_V_AR = $(am__v_AR_@AM_V@) |
| 28714 | am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) |
| 28715 | @@ -161,6 +160,7 @@ am__objects_1 = libz_a-adler32.$(OBJEXT) libz_a-compress.$(OBJEXT) \ |
| 28716 | libz_a-zutil.$(OBJEXT) |
| 28717 | @TARGET_LIBRARY_FALSE@am_libz_a_OBJECTS = $(am__objects_1) |
| 28718 | libz_a_OBJECTS = $(am_libz_a_OBJECTS) |
| 28719 | +LTLIBRARIES = $(noinst_LTLIBRARIES) |
| 28720 | libzgcj_convenience_la_LIBADD = |
| 28721 | am__libzgcj_convenience_la_SOURCES_DIST = adler32.c compress.c crc32.c \ |
| 28722 | crc32.h deflate.c deflate.h gzguts.h gzread.c gzclose.c \ |
| 28723 | @@ -192,22 +192,7 @@ am__v_at_0 = @ |
| 28724 | am__v_at_1 = |
| 28725 | DEFAULT_INCLUDES = -I.@am__isrc@ |
| 28726 | depcomp = $(SHELL) $(top_srcdir)/../depcomp |
| 28727 | -am__maybe_remake_depfiles = depfiles |
| 28728 | -am__depfiles_remade = ./$(DEPDIR)/adler32.Plo ./$(DEPDIR)/compress.Plo \ |
| 28729 | - ./$(DEPDIR)/crc32.Plo ./$(DEPDIR)/deflate.Plo \ |
| 28730 | - ./$(DEPDIR)/gzclose.Plo ./$(DEPDIR)/gzlib.Plo \ |
| 28731 | - ./$(DEPDIR)/gzread.Plo ./$(DEPDIR)/gzwrite.Plo \ |
| 28732 | - ./$(DEPDIR)/infback.Plo ./$(DEPDIR)/inffast.Plo \ |
| 28733 | - ./$(DEPDIR)/inflate.Plo ./$(DEPDIR)/inftrees.Plo \ |
| 28734 | - ./$(DEPDIR)/libz_a-adler32.Po ./$(DEPDIR)/libz_a-compress.Po \ |
| 28735 | - ./$(DEPDIR)/libz_a-crc32.Po ./$(DEPDIR)/libz_a-deflate.Po \ |
| 28736 | - ./$(DEPDIR)/libz_a-gzclose.Po ./$(DEPDIR)/libz_a-gzlib.Po \ |
| 28737 | - ./$(DEPDIR)/libz_a-gzread.Po ./$(DEPDIR)/libz_a-gzwrite.Po \ |
| 28738 | - ./$(DEPDIR)/libz_a-infback.Po ./$(DEPDIR)/libz_a-inffast.Po \ |
| 28739 | - ./$(DEPDIR)/libz_a-inflate.Po ./$(DEPDIR)/libz_a-inftrees.Po \ |
| 28740 | - ./$(DEPDIR)/libz_a-trees.Po ./$(DEPDIR)/libz_a-uncompr.Po \ |
| 28741 | - ./$(DEPDIR)/libz_a-zutil.Po ./$(DEPDIR)/trees.Plo \ |
| 28742 | - ./$(DEPDIR)/uncompr.Plo ./$(DEPDIR)/zutil.Plo |
| 28743 | +am__depfiles_maybe = depfiles |
| 28744 | am__mv = mv -f |
| 28745 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
| 28746 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
| 28747 | @@ -252,6 +237,9 @@ am__define_uniq_tagged_files = \ |
| 28748 | unique=`for i in $$list; do \ |
| 28749 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
| 28750 | done | $(am__uniquify_input)` |
| 28751 | +ETAGS = etags |
| 28752 | +CTAGS = ctags |
| 28753 | +CSCOPE = cscope |
| 28754 | AM_RECURSIVE_TARGETS = cscope |
| 28755 | am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../compile \ |
| 28756 | $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ |
| 28757 | @@ -272,8 +260,6 @@ am__post_remove_distdir = $(am__remove_distdir) |
| 28758 | DIST_ARCHIVES = $(distdir).tar.gz |
| 28759 | GZIP_ENV = --best |
| 28760 | DIST_TARGETS = dist-gzip |
| 28761 | -# Exists only to be overridden by the user if desired. |
| 28762 | -AM_DISTCHECK_DVI_TARGET = dvi |
| 28763 | distuninstallcheck_listfiles = find . -type f -print |
| 28764 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
| 28765 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
| 28766 | @@ -292,18 +278,16 @@ CFLAGS = @CFLAGS@ |
| 28767 | COMPPATH = @COMPPATH@ |
| 28768 | CPP = @CPP@ |
| 28769 | CPPFLAGS = @CPPFLAGS@ |
| 28770 | -CSCOPE = @CSCOPE@ |
| 28771 | -CTAGS = @CTAGS@ |
| 28772 | CYGPATH_W = @CYGPATH_W@ |
| 28773 | DEFS = @DEFS@ |
| 28774 | DEPDIR = @DEPDIR@ |
| 28775 | +DLLTOOL = @DLLTOOL@ |
| 28776 | DSYMUTIL = @DSYMUTIL@ |
| 28777 | DUMPBIN = @DUMPBIN@ |
| 28778 | ECHO_C = @ECHO_C@ |
| 28779 | ECHO_N = @ECHO_N@ |
| 28780 | ECHO_T = @ECHO_T@ |
| 28781 | EGREP = @EGREP@ |
| 28782 | -ETAGS = @ETAGS@ |
| 28783 | EXEEXT = @EXEEXT@ |
| 28784 | FGREP = @FGREP@ |
| 28785 | GREP = @GREP@ |
| 28786 | @@ -322,6 +306,7 @@ LN_S = @LN_S@ |
| 28787 | LTLIBOBJS = @LTLIBOBJS@ |
| 28788 | MAINT = @MAINT@ |
| 28789 | MAKEINFO = @MAKEINFO@ |
| 28790 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| 28791 | MKDIR_P = @MKDIR_P@ |
| 28792 | NM = @NM@ |
| 28793 | NMEDIT = @NMEDIT@ |
| 28794 | @@ -348,6 +333,7 @@ abs_builddir = @abs_builddir@ |
| 28795 | abs_srcdir = @abs_srcdir@ |
| 28796 | abs_top_builddir = @abs_top_builddir@ |
| 28797 | abs_top_srcdir = @abs_top_srcdir@ |
| 28798 | +ac_ct_AR = @ac_ct_AR@ |
| 28799 | ac_ct_CC = @ac_ct_CC@ |
| 28800 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| 28801 | am__include = @am__include@ |
| 28802 | @@ -491,8 +477,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 28803 | echo ' $(SHELL) ./config.status'; \ |
| 28804 | $(SHELL) ./config.status;; \ |
| 28805 | *) \ |
| 28806 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ |
| 28807 | - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ |
| 28808 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
| 28809 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
| 28810 | esac; |
| 28811 | $(top_srcdir)/../multilib.am $(am__empty): |
| 28812 | |
| 28813 | @@ -536,6 +522,11 @@ uninstall-toolexeclibLIBRARIES: |
| 28814 | clean-toolexeclibLIBRARIES: |
| 28815 | -test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES) |
| 28816 | |
| 28817 | +libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES) |
| 28818 | + $(AM_V_at)-rm -f libz.a |
| 28819 | + $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD) |
| 28820 | + $(AM_V_at)$(RANLIB) libz.a |
| 28821 | + |
| 28822 | clean-noinstLTLIBRARIES: |
| 28823 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) |
| 28824 | @list='$(noinst_LTLIBRARIES)'; \ |
| 28825 | @@ -547,11 +538,6 @@ clean-noinstLTLIBRARIES: |
| 28826 | rm -f $${locs}; \ |
| 28827 | } |
| 28828 | |
| 28829 | -libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES) |
| 28830 | - $(AM_V_at)-rm -f libz.a |
| 28831 | - $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD) |
| 28832 | - $(AM_V_at)$(RANLIB) libz.a |
| 28833 | - |
| 28834 | libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) $(EXTRA_libzgcj_convenience_la_DEPENDENCIES) |
| 28835 | $(AM_V_CCLD)$(LINK) $(am_libzgcj_convenience_la_rpath) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS) |
| 28836 | |
| 28837 | @@ -561,42 +547,36 @@ mostlyclean-compile: |
| 28838 | distclean-compile: |
| 28839 | -rm -f *.tab.c |
| 28840 | |
| 28841 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ # am--include-marker |
| 28842 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ # am--include-marker |
| 28843 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ # am--include-marker |
| 28844 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ # am--include-marker |
| 28845 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@ # am--include-marker |
| 28846 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@ # am--include-marker |
| 28847 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@ # am--include-marker |
| 28848 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@ # am--include-marker |
| 28849 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@ # am--include-marker |
| 28850 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ # am--include-marker |
| 28851 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ # am--include-marker |
| 28852 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ # am--include-marker |
| 28853 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@ # am--include-marker |
| 28854 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@ # am--include-marker |
| 28855 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@ # am--include-marker |
| 28856 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@ # am--include-marker |
| 28857 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@ # am--include-marker |
| 28858 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@ # am--include-marker |
| 28859 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@ # am--include-marker |
| 28860 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@ # am--include-marker |
| 28861 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@ # am--include-marker |
| 28862 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@ # am--include-marker |
| 28863 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@ # am--include-marker |
| 28864 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@ # am--include-marker |
| 28865 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@ # am--include-marker |
| 28866 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@ # am--include-marker |
| 28867 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@ # am--include-marker |
| 28868 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ # am--include-marker |
| 28869 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ # am--include-marker |
| 28870 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ # am--include-marker |
| 28871 | - |
| 28872 | -$(am__depfiles_remade): |
| 28873 | - @$(MKDIR_P) $(@D) |
| 28874 | - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ |
| 28875 | - |
| 28876 | -am--depfiles: $(am__depfiles_remade) |
| 28877 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ |
| 28878 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ |
| 28879 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ |
| 28880 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ |
| 28881 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@ |
| 28882 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@ |
| 28883 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@ |
| 28884 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@ |
| 28885 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@ |
| 28886 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ |
| 28887 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ |
| 28888 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ |
| 28889 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@ |
| 28890 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@ |
| 28891 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@ |
| 28892 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@ |
| 28893 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@ |
| 28894 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@ |
| 28895 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@ |
| 28896 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@ |
| 28897 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@ |
| 28898 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@ |
| 28899 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@ |
| 28900 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@ |
| 28901 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@ |
| 28902 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@ |
| 28903 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@ |
| 28904 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ |
| 28905 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ |
| 28906 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ |
| 28907 | |
| 28908 | .c.o: |
| 28909 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
| 28910 | @@ -896,10 +876,8 @@ cscopelist-am: $(am__tagged_files) |
| 28911 | distclean-tags: |
| 28912 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
| 28913 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
| 28914 | -distdir: $(BUILT_SOURCES) |
| 28915 | - $(MAKE) $(AM_MAKEFLAGS) distdir-am |
| 28916 | |
| 28917 | -distdir-am: $(DISTFILES) |
| 28918 | +distdir: $(DISTFILES) |
| 28919 | $(am__remove_distdir) |
| 28920 | test -d "$(distdir)" || mkdir "$(distdir)" |
| 28921 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
| 28922 | @@ -954,10 +932,6 @@ dist-xz: distdir |
| 28923 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
| 28924 | $(am__post_remove_distdir) |
| 28925 | |
| 28926 | -dist-zstd: distdir |
| 28927 | - tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst |
| 28928 | - $(am__post_remove_distdir) |
| 28929 | - |
| 28930 | dist-tarZ: distdir |
| 28931 | @echo WARNING: "Support for distribution archives compressed with" \ |
| 28932 | "legacy program 'compress' is deprecated." >&2 |
| 28933 | @@ -1000,8 +974,6 @@ distcheck: dist |
| 28934 | eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ |
| 28935 | *.zip*) \ |
| 28936 | unzip $(distdir).zip ;;\ |
| 28937 | - *.tar.zst*) \ |
| 28938 | - zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ |
| 28939 | esac |
| 28940 | chmod -R a-w $(distdir) |
| 28941 | chmod u+w $(distdir) |
| 28942 | @@ -1017,7 +989,7 @@ distcheck: dist |
| 28943 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
| 28944 | --srcdir=../.. --prefix="$$dc_install_base" \ |
| 28945 | && $(MAKE) $(AM_MAKEFLAGS) \ |
| 28946 | - && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ |
| 28947 | + && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
| 28948 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
| 28949 | && $(MAKE) $(AM_MAKEFLAGS) install \ |
| 28950 | && $(MAKE) $(AM_MAKEFLAGS) installcheck \ |
| 28951 | @@ -1113,36 +1085,7 @@ clean-am: clean-generic clean-libtool clean-local \ |
| 28952 | |
| 28953 | distclean: distclean-am |
| 28954 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
| 28955 | - -rm -f ./$(DEPDIR)/adler32.Plo |
| 28956 | - -rm -f ./$(DEPDIR)/compress.Plo |
| 28957 | - -rm -f ./$(DEPDIR)/crc32.Plo |
| 28958 | - -rm -f ./$(DEPDIR)/deflate.Plo |
| 28959 | - -rm -f ./$(DEPDIR)/gzclose.Plo |
| 28960 | - -rm -f ./$(DEPDIR)/gzlib.Plo |
| 28961 | - -rm -f ./$(DEPDIR)/gzread.Plo |
| 28962 | - -rm -f ./$(DEPDIR)/gzwrite.Plo |
| 28963 | - -rm -f ./$(DEPDIR)/infback.Plo |
| 28964 | - -rm -f ./$(DEPDIR)/inffast.Plo |
| 28965 | - -rm -f ./$(DEPDIR)/inflate.Plo |
| 28966 | - -rm -f ./$(DEPDIR)/inftrees.Plo |
| 28967 | - -rm -f ./$(DEPDIR)/libz_a-adler32.Po |
| 28968 | - -rm -f ./$(DEPDIR)/libz_a-compress.Po |
| 28969 | - -rm -f ./$(DEPDIR)/libz_a-crc32.Po |
| 28970 | - -rm -f ./$(DEPDIR)/libz_a-deflate.Po |
| 28971 | - -rm -f ./$(DEPDIR)/libz_a-gzclose.Po |
| 28972 | - -rm -f ./$(DEPDIR)/libz_a-gzlib.Po |
| 28973 | - -rm -f ./$(DEPDIR)/libz_a-gzread.Po |
| 28974 | - -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po |
| 28975 | - -rm -f ./$(DEPDIR)/libz_a-infback.Po |
| 28976 | - -rm -f ./$(DEPDIR)/libz_a-inffast.Po |
| 28977 | - -rm -f ./$(DEPDIR)/libz_a-inflate.Po |
| 28978 | - -rm -f ./$(DEPDIR)/libz_a-inftrees.Po |
| 28979 | - -rm -f ./$(DEPDIR)/libz_a-trees.Po |
| 28980 | - -rm -f ./$(DEPDIR)/libz_a-uncompr.Po |
| 28981 | - -rm -f ./$(DEPDIR)/libz_a-zutil.Po |
| 28982 | - -rm -f ./$(DEPDIR)/trees.Plo |
| 28983 | - -rm -f ./$(DEPDIR)/uncompr.Plo |
| 28984 | - -rm -f ./$(DEPDIR)/zutil.Plo |
| 28985 | + -rm -rf ./$(DEPDIR) |
| 28986 | -rm -f Makefile |
| 28987 | distclean-am: clean-am distclean-compile distclean-generic \ |
| 28988 | distclean-libtool distclean-local distclean-tags |
| 28989 | @@ -1190,36 +1133,7 @@ installcheck-am: |
| 28990 | maintainer-clean: maintainer-clean-am |
| 28991 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
| 28992 | -rm -rf $(top_srcdir)/autom4te.cache |
| 28993 | - -rm -f ./$(DEPDIR)/adler32.Plo |
| 28994 | - -rm -f ./$(DEPDIR)/compress.Plo |
| 28995 | - -rm -f ./$(DEPDIR)/crc32.Plo |
| 28996 | - -rm -f ./$(DEPDIR)/deflate.Plo |
| 28997 | - -rm -f ./$(DEPDIR)/gzclose.Plo |
| 28998 | - -rm -f ./$(DEPDIR)/gzlib.Plo |
| 28999 | - -rm -f ./$(DEPDIR)/gzread.Plo |
| 29000 | - -rm -f ./$(DEPDIR)/gzwrite.Plo |
| 29001 | - -rm -f ./$(DEPDIR)/infback.Plo |
| 29002 | - -rm -f ./$(DEPDIR)/inffast.Plo |
| 29003 | - -rm -f ./$(DEPDIR)/inflate.Plo |
| 29004 | - -rm -f ./$(DEPDIR)/inftrees.Plo |
| 29005 | - -rm -f ./$(DEPDIR)/libz_a-adler32.Po |
| 29006 | - -rm -f ./$(DEPDIR)/libz_a-compress.Po |
| 29007 | - -rm -f ./$(DEPDIR)/libz_a-crc32.Po |
| 29008 | - -rm -f ./$(DEPDIR)/libz_a-deflate.Po |
| 29009 | - -rm -f ./$(DEPDIR)/libz_a-gzclose.Po |
| 29010 | - -rm -f ./$(DEPDIR)/libz_a-gzlib.Po |
| 29011 | - -rm -f ./$(DEPDIR)/libz_a-gzread.Po |
| 29012 | - -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po |
| 29013 | - -rm -f ./$(DEPDIR)/libz_a-infback.Po |
| 29014 | - -rm -f ./$(DEPDIR)/libz_a-inffast.Po |
| 29015 | - -rm -f ./$(DEPDIR)/libz_a-inflate.Po |
| 29016 | - -rm -f ./$(DEPDIR)/libz_a-inftrees.Po |
| 29017 | - -rm -f ./$(DEPDIR)/libz_a-trees.Po |
| 29018 | - -rm -f ./$(DEPDIR)/libz_a-uncompr.Po |
| 29019 | - -rm -f ./$(DEPDIR)/libz_a-zutil.Po |
| 29020 | - -rm -f ./$(DEPDIR)/trees.Plo |
| 29021 | - -rm -f ./$(DEPDIR)/uncompr.Plo |
| 29022 | - -rm -f ./$(DEPDIR)/zutil.Plo |
| 29023 | + -rm -rf ./$(DEPDIR) |
| 29024 | -rm -f Makefile |
| 29025 | maintainer-clean-am: distclean-am maintainer-clean-generic \ |
| 29026 | maintainer-clean-local |
| 29027 | @@ -1241,17 +1155,17 @@ uninstall-am: uninstall-toolexeclibLIBRARIES |
| 29028 | |
| 29029 | .MAKE: install-am install-strip |
| 29030 | |
| 29031 | -.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles am--refresh \ |
| 29032 | - check check-am clean clean-cscope clean-generic clean-libtool \ |
| 29033 | +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \ |
| 29034 | + check-am clean clean-cscope clean-generic clean-libtool \ |
| 29035 | clean-local clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES \ |
| 29036 | cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ |
| 29037 | dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ |
| 29038 | - dist-zstd distcheck distclean distclean-compile \ |
| 29039 | - distclean-generic distclean-libtool distclean-local \ |
| 29040 | - distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
| 29041 | - dvi-am html html-am info info-am install install-am \ |
| 29042 | - install-data install-data-am install-dvi install-dvi-am \ |
| 29043 | - install-exec install-exec-am install-exec-local install-html \ |
| 29044 | + distcheck distclean distclean-compile distclean-generic \ |
| 29045 | + distclean-libtool distclean-local distclean-tags \ |
| 29046 | + distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
| 29047 | + html-am info info-am install install-am install-data \ |
| 29048 | + install-data-am install-dvi install-dvi-am install-exec \ |
| 29049 | + install-exec-am install-exec-local install-html \ |
| 29050 | install-html-am install-info install-info-am install-man \ |
| 29051 | install-pdf install-pdf-am install-ps install-ps-am \ |
| 29052 | install-strip install-toolexeclibLIBRARIES installcheck \ |
| 29053 | diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4 |
| 29054 | index 3538b0f0aea..e5eed57bd68 100644 |
| 29055 | --- a/zlib/aclocal.m4 |
| 29056 | +++ b/zlib/aclocal.m4 |
| 29057 | @@ -1,6 +1,6 @@ |
| 29058 | -# generated automatically by aclocal 1.16.5 -*- Autoconf -*- |
| 29059 | +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- |
| 29060 | |
| 29061 | -# Copyright (C) 1996-2021 Free Software Foundation, Inc. |
| 29062 | +# Copyright (C) 1996-2017 Free Software Foundation, Inc. |
| 29063 | |
| 29064 | # This file is free software; the Free Software Foundation |
| 29065 | # gives unlimited permission to copy and/or distribute it, |
| 29066 | @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. |
| 29067 | If you have problems, you may need to regenerate the build system entirely. |
| 29068 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
| 29069 | |
| 29070 | -# Copyright (C) 2002-2021 Free Software Foundation, Inc. |
| 29071 | +# Copyright (C) 2002-2017 Free Software Foundation, Inc. |
| 29072 | # |
| 29073 | # This file is free software; the Free Software Foundation |
| 29074 | # gives unlimited permission to copy and/or distribute it, |
| 29075 | @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) |
| 29076 | # generated from the m4 files accompanying Automake X.Y. |
| 29077 | # (This private macro should not be called outside this file.) |
| 29078 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
| 29079 | -[am__api_version='1.16' |
| 29080 | +[am__api_version='1.15' |
| 29081 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
| 29082 | dnl require some minimum version. Point them to the right macro. |
| 29083 | -m4_if([$1], [1.16.5], [], |
| 29084 | +m4_if([$1], [1.15.1], [], |
| 29085 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
| 29086 | ]) |
| 29087 | |
| 29088 | @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) |
| 29089 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
| 29090 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
| 29091 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
| 29092 | -[AM_AUTOMAKE_VERSION([1.16.5])dnl |
| 29093 | +[AM_AUTOMAKE_VERSION([1.15.1])dnl |
| 29094 | m4_ifndef([AC_AUTOCONF_VERSION], |
| 29095 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
| 29096 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
| 29097 | |
| 29098 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
| 29099 | |
| 29100 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. |
| 29101 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
| 29102 | # |
| 29103 | # This file is free software; the Free Software Foundation |
| 29104 | # gives unlimited permission to copy and/or distribute it, |
| 29105 | @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` |
| 29106 | |
| 29107 | # AM_CONDITIONAL -*- Autoconf -*- |
| 29108 | |
| 29109 | -# Copyright (C) 1997-2021 Free Software Foundation, Inc. |
| 29110 | +# Copyright (C) 1997-2017 Free Software Foundation, Inc. |
| 29111 | # |
| 29112 | # This file is free software; the Free Software Foundation |
| 29113 | # gives unlimited permission to copy and/or distribute it, |
| 29114 | @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( |
| 29115 | Usually this means the macro was only invoked conditionally.]]) |
| 29116 | fi])]) |
| 29117 | |
| 29118 | -# Copyright (C) 1999-2021 Free Software Foundation, Inc. |
| 29119 | +# Copyright (C) 1999-2017 Free Software Foundation, Inc. |
| 29120 | # |
| 29121 | # This file is free software; the Free Software Foundation |
| 29122 | # gives unlimited permission to copy and/or distribute it, |
| 29123 | @@ -332,12 +332,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl |
| 29124 | |
| 29125 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
| 29126 | |
| 29127 | -# Copyright (C) 1999-2021 Free Software Foundation, Inc. |
| 29128 | +# Copyright (C) 1999-2017 Free Software Foundation, Inc. |
| 29129 | # |
| 29130 | # This file is free software; the Free Software Foundation |
| 29131 | # gives unlimited permission to copy and/or distribute it, |
| 29132 | # with or without modifications, as long as this notice is preserved. |
| 29133 | |
| 29134 | + |
| 29135 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
| 29136 | # ------------------------------ |
| 29137 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
| 29138 | @@ -345,43 +346,49 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
| 29139 | # Older Autoconf quotes --file arguments for eval, but not when files |
| 29140 | # are listed without --file. Let's play safe and only enable the eval |
| 29141 | # if we detect the quoting. |
| 29142 | - # TODO: see whether this extra hack can be removed once we start |
| 29143 | - # requiring Autoconf 2.70 or later. |
| 29144 | - AS_CASE([$CONFIG_FILES], |
| 29145 | - [*\'*], [eval set x "$CONFIG_FILES"], |
| 29146 | - [*], [set x $CONFIG_FILES]) |
| 29147 | + case $CONFIG_FILES in |
| 29148 | + *\'*) eval set x "$CONFIG_FILES" ;; |
| 29149 | + *) set x $CONFIG_FILES ;; |
| 29150 | + esac |
| 29151 | shift |
| 29152 | - # Used to flag and report bootstrapping failures. |
| 29153 | - am_rc=0 |
| 29154 | - for am_mf |
| 29155 | + for mf |
| 29156 | do |
| 29157 | # Strip MF so we end up with the name of the file. |
| 29158 | - am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` |
| 29159 | - # Check whether this is an Automake generated Makefile which includes |
| 29160 | - # dependency-tracking related rules and includes. |
| 29161 | - # Grep'ing the whole file directly is not great: AIX grep has a line |
| 29162 | + mf=`echo "$mf" | sed -e 's/:.*$//'` |
| 29163 | + # Check whether this is an Automake generated Makefile or not. |
| 29164 | + # We used to match only the files named 'Makefile.in', but |
| 29165 | + # some people rename them; so instead we look at the file content. |
| 29166 | + # Grep'ing the first line is not enough: some people post-process |
| 29167 | + # each Makefile.in and add a new line on top of each file to say so. |
| 29168 | + # Grep'ing the whole file is not good either: AIX grep has a line |
| 29169 | # limit of 2048, but all sed's we know have understand at least 4000. |
| 29170 | - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ |
| 29171 | - || continue |
| 29172 | - am_dirpart=`AS_DIRNAME(["$am_mf"])` |
| 29173 | - am_filepart=`AS_BASENAME(["$am_mf"])` |
| 29174 | - AM_RUN_LOG([cd "$am_dirpart" \ |
| 29175 | - && sed -e '/# am--include-marker/d' "$am_filepart" \ |
| 29176 | - | $MAKE -f - am--depfiles]) || am_rc=$? |
| 29177 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
| 29178 | + dirpart=`AS_DIRNAME("$mf")` |
| 29179 | + else |
| 29180 | + continue |
| 29181 | + fi |
| 29182 | + # Extract the definition of DEPDIR, am__include, and am__quote |
| 29183 | + # from the Makefile without running 'make'. |
| 29184 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
| 29185 | + test -z "$DEPDIR" && continue |
| 29186 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` |
| 29187 | + test -z "$am__include" && continue |
| 29188 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
| 29189 | + # Find all dependency output files, they are included files with |
| 29190 | + # $(DEPDIR) in their names. We invoke sed twice because it is the |
| 29191 | + # simplest approach to changing $(DEPDIR) to its actual value in the |
| 29192 | + # expansion. |
| 29193 | + for file in `sed -n " |
| 29194 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
| 29195 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
| 29196 | + # Make sure the directory exists. |
| 29197 | + test -f "$dirpart/$file" && continue |
| 29198 | + fdir=`AS_DIRNAME(["$file"])` |
| 29199 | + AS_MKDIR_P([$dirpart/$fdir]) |
| 29200 | + # echo "creating $dirpart/$file" |
| 29201 | + echo '# dummy' > "$dirpart/$file" |
| 29202 | + done |
| 29203 | done |
| 29204 | - if test $am_rc -ne 0; then |
| 29205 | - AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments |
| 29206 | - for automatic dependency tracking. If GNU make was not used, consider |
| 29207 | - re-running the configure script with MAKE="gmake" (or whatever is |
| 29208 | - necessary). You can also try re-running configure with the |
| 29209 | - '--disable-dependency-tracking' option to at least be able to build |
| 29210 | - the package (albeit without support for automatic dependency tracking).]) |
| 29211 | - fi |
| 29212 | - AS_UNSET([am_dirpart]) |
| 29213 | - AS_UNSET([am_filepart]) |
| 29214 | - AS_UNSET([am_mf]) |
| 29215 | - AS_UNSET([am_rc]) |
| 29216 | - rm -f conftest-deps.mk |
| 29217 | } |
| 29218 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
| 29219 | |
| 29220 | @@ -390,17 +397,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
| 29221 | # ----------------------------- |
| 29222 | # This macro should only be invoked once -- use via AC_REQUIRE. |
| 29223 | # |
| 29224 | -# This code is only required when automatic dependency tracking is enabled. |
| 29225 | -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in |
| 29226 | -# order to bootstrap the dependency handling code. |
| 29227 | +# This code is only required when automatic dependency tracking |
| 29228 | +# is enabled. FIXME. This creates each '.P' file that we will |
| 29229 | +# need in order to bootstrap the dependency handling code. |
| 29230 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
| 29231 | [AC_CONFIG_COMMANDS([depfiles], |
| 29232 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], |
| 29233 | - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) |
| 29234 | + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
| 29235 | +]) |
| 29236 | |
| 29237 | # Do all the work for Automake. -*- Autoconf -*- |
| 29238 | |
| 29239 | -# Copyright (C) 1996-2021 Free Software Foundation, Inc. |
| 29240 | +# Copyright (C) 1996-2017 Free Software Foundation, Inc. |
| 29241 | # |
| 29242 | # This file is free software; the Free Software Foundation |
| 29243 | # gives unlimited permission to copy and/or distribute it, |
| 29244 | @@ -428,10 +436,6 @@ m4_defn([AC_PROG_CC]) |
| 29245 | # release and drop the old call support. |
| 29246 | AC_DEFUN([AM_INIT_AUTOMAKE], |
| 29247 | [AC_PREREQ([2.65])dnl |
| 29248 | -m4_ifdef([_$0_ALREADY_INIT], |
| 29249 | - [m4_fatal([$0 expanded multiple times |
| 29250 | -]m4_defn([_$0_ALREADY_INIT]))], |
| 29251 | - [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl |
| 29252 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
| 29253 | dnl the ones we care about. |
| 29254 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
| 29255 | @@ -468,7 +472,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
| 29256 | [_AM_SET_OPTIONS([$1])dnl |
| 29257 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
| 29258 | m4_if( |
| 29259 | - m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), |
| 29260 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
| 29261 | [ok:ok],, |
| 29262 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
| 29263 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
| 29264 | @@ -491,8 +495,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
| 29265 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
| 29266 | # For better backward compatibility. To be removed once Automake 1.9.x |
| 29267 | # dies out for good. For more background, see: |
| 29268 | -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
| 29269 | -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
| 29270 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
| 29271 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
| 29272 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
| 29273 | # We need awk for the "check" target (and possibly the TAP driver). The |
| 29274 | # system "awk" is bad on some platforms. |
| 29275 | @@ -520,20 +524,6 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
| 29276 | [m4_define([AC_PROG_OBJCXX], |
| 29277 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
| 29278 | ]) |
| 29279 | -# Variables for tags utilities; see am/tags.am |
| 29280 | -if test -z "$CTAGS"; then |
| 29281 | - CTAGS=ctags |
| 29282 | -fi |
| 29283 | -AC_SUBST([CTAGS]) |
| 29284 | -if test -z "$ETAGS"; then |
| 29285 | - ETAGS=etags |
| 29286 | -fi |
| 29287 | -AC_SUBST([ETAGS]) |
| 29288 | -if test -z "$CSCOPE"; then |
| 29289 | - CSCOPE=cscope |
| 29290 | -fi |
| 29291 | -AC_SUBST([CSCOPE]) |
| 29292 | - |
| 29293 | AC_REQUIRE([AM_SILENT_RULES])dnl |
| 29294 | dnl The testsuite driver may need to know about EXEEXT, so add the |
| 29295 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
| 29296 | @@ -573,7 +563,7 @@ END |
| 29297 | Aborting the configuration process, to ensure you take notice of the issue. |
| 29298 | |
| 29299 | You can download and install GNU coreutils to get an 'rm' implementation |
| 29300 | -that behaves properly: <https://www.gnu.org/software/coreutils/>. |
| 29301 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
| 29302 | |
| 29303 | If you want to complete the configuration process using your problematic |
| 29304 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
| 29305 | @@ -615,7 +605,7 @@ for _am_header in $config_headers :; do |
| 29306 | done |
| 29307 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
| 29308 | |
| 29309 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. |
| 29310 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
| 29311 | # |
| 29312 | # This file is free software; the Free Software Foundation |
| 29313 | # gives unlimited permission to copy and/or distribute it, |
| 29314 | @@ -639,7 +629,7 @@ AC_SUBST([install_sh])]) |
| 29315 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
| 29316 | # From Jim Meyering |
| 29317 | |
| 29318 | -# Copyright (C) 1996-2021 Free Software Foundation, Inc. |
| 29319 | +# Copyright (C) 1996-2017 Free Software Foundation, Inc. |
| 29320 | # |
| 29321 | # This file is free software; the Free Software Foundation |
| 29322 | # gives unlimited permission to copy and/or distribute it, |
| 29323 | @@ -674,7 +664,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
| 29324 | |
| 29325 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
| 29326 | |
| 29327 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. |
| 29328 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
| 29329 | # |
| 29330 | # This file is free software; the Free Software Foundation |
| 29331 | # gives unlimited permission to copy and/or distribute it, |
| 29332 | @@ -682,42 +672,49 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
| 29333 | |
| 29334 | # AM_MAKE_INCLUDE() |
| 29335 | # ----------------- |
| 29336 | -# Check whether make has an 'include' directive that can support all |
| 29337 | -# the idioms we need for our automatic dependency tracking code. |
| 29338 | +# Check to see how make treats includes. |
| 29339 | AC_DEFUN([AM_MAKE_INCLUDE], |
| 29340 | -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) |
| 29341 | -cat > confinc.mk << 'END' |
| 29342 | +[am_make=${MAKE-make} |
| 29343 | +cat > confinc << 'END' |
| 29344 | am__doit: |
| 29345 | - @echo this is the am__doit target >confinc.out |
| 29346 | + @echo this is the am__doit target |
| 29347 | .PHONY: am__doit |
| 29348 | END |
| 29349 | +# If we don't find an include directive, just comment out the code. |
| 29350 | +AC_MSG_CHECKING([for style of include used by $am_make]) |
| 29351 | am__include="#" |
| 29352 | am__quote= |
| 29353 | -# BSD make does it like this. |
| 29354 | -echo '.include "confinc.mk" # ignored' > confmf.BSD |
| 29355 | -# Other make implementations (GNU, Solaris 10, AIX) do it like this. |
| 29356 | -echo 'include confinc.mk # ignored' > confmf.GNU |
| 29357 | -_am_result=no |
| 29358 | -for s in GNU BSD; do |
| 29359 | - AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) |
| 29360 | - AS_CASE([$?:`cat confinc.out 2>/dev/null`], |
| 29361 | - ['0:this is the am__doit target'], |
| 29362 | - [AS_CASE([$s], |
| 29363 | - [BSD], [am__include='.include' am__quote='"'], |
| 29364 | - [am__include='include' am__quote=''])]) |
| 29365 | - if test "$am__include" != "#"; then |
| 29366 | - _am_result="yes ($s style)" |
| 29367 | - break |
| 29368 | - fi |
| 29369 | -done |
| 29370 | -rm -f confinc.* confmf.* |
| 29371 | -AC_MSG_RESULT([${_am_result}]) |
| 29372 | -AC_SUBST([am__include])]) |
| 29373 | -AC_SUBST([am__quote])]) |
| 29374 | +_am_result=none |
| 29375 | +# First try GNU make style include. |
| 29376 | +echo "include confinc" > confmf |
| 29377 | +# Ignore all kinds of additional output from 'make'. |
| 29378 | +case `$am_make -s -f confmf 2> /dev/null` in #( |
| 29379 | +*the\ am__doit\ target*) |
| 29380 | + am__include=include |
| 29381 | + am__quote= |
| 29382 | + _am_result=GNU |
| 29383 | + ;; |
| 29384 | +esac |
| 29385 | +# Now try BSD make style include. |
| 29386 | +if test "$am__include" = "#"; then |
| 29387 | + echo '.include "confinc"' > confmf |
| 29388 | + case `$am_make -s -f confmf 2> /dev/null` in #( |
| 29389 | + *the\ am__doit\ target*) |
| 29390 | + am__include=.include |
| 29391 | + am__quote="\"" |
| 29392 | + _am_result=BSD |
| 29393 | + ;; |
| 29394 | + esac |
| 29395 | +fi |
| 29396 | +AC_SUBST([am__include]) |
| 29397 | +AC_SUBST([am__quote]) |
| 29398 | +AC_MSG_RESULT([$_am_result]) |
| 29399 | +rm -f confinc confmf |
| 29400 | +]) |
| 29401 | |
| 29402 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
| 29403 | |
| 29404 | -# Copyright (C) 1997-2021 Free Software Foundation, Inc. |
| 29405 | +# Copyright (C) 1997-2017 Free Software Foundation, Inc. |
| 29406 | # |
| 29407 | # This file is free software; the Free Software Foundation |
| 29408 | # gives unlimited permission to copy and/or distribute it, |
| 29409 | @@ -738,7 +735,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN], |
| 29410 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
| 29411 | AC_REQUIRE_AUX_FILE([missing])dnl |
| 29412 | if test x"${MISSING+set}" != xset; then |
| 29413 | - MISSING="\${SHELL} '$am_aux_dir/missing'" |
| 29414 | + case $am_aux_dir in |
| 29415 | + *\ * | *\ *) |
| 29416 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; |
| 29417 | + *) |
| 29418 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; |
| 29419 | + esac |
| 29420 | fi |
| 29421 | # Use eval to expand $SHELL |
| 29422 | if eval "$MISSING --is-lightweight"; then |
| 29423 | @@ -751,7 +753,7 @@ fi |
| 29424 | |
| 29425 | # Helper functions for option handling. -*- Autoconf -*- |
| 29426 | |
| 29427 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. |
| 29428 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
| 29429 | # |
| 29430 | # This file is free software; the Free Software Foundation |
| 29431 | # gives unlimited permission to copy and/or distribute it, |
| 29432 | @@ -780,7 +782,7 @@ AC_DEFUN([_AM_SET_OPTIONS], |
| 29433 | AC_DEFUN([_AM_IF_OPTION], |
| 29434 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
| 29435 | |
| 29436 | -# Copyright (C) 1999-2021 Free Software Foundation, Inc. |
| 29437 | +# Copyright (C) 1999-2017 Free Software Foundation, Inc. |
| 29438 | # |
| 29439 | # This file is free software; the Free Software Foundation |
| 29440 | # gives unlimited permission to copy and/or distribute it, |
| 29441 | @@ -827,7 +829,7 @@ AC_LANG_POP([C])]) |
| 29442 | # For backward compatibility. |
| 29443 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
| 29444 | |
| 29445 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. |
| 29446 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
| 29447 | # |
| 29448 | # This file is free software; the Free Software Foundation |
| 29449 | # gives unlimited permission to copy and/or distribute it, |
| 29450 | @@ -846,7 +848,7 @@ AC_DEFUN([AM_RUN_LOG], |
| 29451 | |
| 29452 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
| 29453 | |
| 29454 | -# Copyright (C) 1996-2021 Free Software Foundation, Inc. |
| 29455 | +# Copyright (C) 1996-2017 Free Software Foundation, Inc. |
| 29456 | # |
| 29457 | # This file is free software; the Free Software Foundation |
| 29458 | # gives unlimited permission to copy and/or distribute it, |
| 29459 | @@ -927,7 +929,7 @@ AC_CONFIG_COMMANDS_PRE( |
| 29460 | rm -f conftest.file |
| 29461 | ]) |
| 29462 | |
| 29463 | -# Copyright (C) 2009-2021 Free Software Foundation, Inc. |
| 29464 | +# Copyright (C) 2009-2017 Free Software Foundation, Inc. |
| 29465 | # |
| 29466 | # This file is free software; the Free Software Foundation |
| 29467 | # gives unlimited permission to copy and/or distribute it, |
| 29468 | @@ -987,7 +989,7 @@ AC_SUBST([AM_BACKSLASH])dnl |
| 29469 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
| 29470 | ]) |
| 29471 | |
| 29472 | -# Copyright (C) 2001-2021 Free Software Foundation, Inc. |
| 29473 | +# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
| 29474 | # |
| 29475 | # This file is free software; the Free Software Foundation |
| 29476 | # gives unlimited permission to copy and/or distribute it, |
| 29477 | @@ -1015,7 +1017,7 @@ fi |
| 29478 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
| 29479 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
| 29480 | |
| 29481 | -# Copyright (C) 2006-2021 Free Software Foundation, Inc. |
| 29482 | +# Copyright (C) 2006-2017 Free Software Foundation, Inc. |
| 29483 | # |
| 29484 | # This file is free software; the Free Software Foundation |
| 29485 | # gives unlimited permission to copy and/or distribute it, |
| 29486 | @@ -1034,7 +1036,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
| 29487 | |
| 29488 | # Check how to create a tarball. -*- Autoconf -*- |
| 29489 | |
| 29490 | -# Copyright (C) 2004-2021 Free Software Foundation, Inc. |
| 29491 | +# Copyright (C) 2004-2017 Free Software Foundation, Inc. |
| 29492 | # |
| 29493 | # This file is free software; the Free Software Foundation |
| 29494 | # gives unlimited permission to copy and/or distribute it, |
| 29495 | diff --git a/zlib/configure b/zlib/configure |
| 29496 | index 0a9ad9e8ccb..35b44e2819c 100755 |
| 29497 | --- a/zlib/configure |
| 29498 | +++ b/zlib/configure |
| 29499 | @@ -646,8 +646,11 @@ OTOOL |
| 29500 | LIPO |
| 29501 | NMEDIT |
| 29502 | DSYMUTIL |
| 29503 | +MANIFEST_TOOL |
| 29504 | RANLIB |
| 29505 | +ac_ct_AR |
| 29506 | AR |
| 29507 | +DLLTOOL |
| 29508 | OBJDUMP |
| 29509 | LN_S |
| 29510 | NM |
| 29511 | @@ -666,6 +669,7 @@ am__nodep |
| 29512 | AMDEPBACKSLASH |
| 29513 | AMDEP_FALSE |
| 29514 | AMDEP_TRUE |
| 29515 | +am__quote |
| 29516 | am__include |
| 29517 | DEPDIR |
| 29518 | OBJEXT |
| 29519 | @@ -683,9 +687,6 @@ AM_BACKSLASH |
| 29520 | AM_DEFAULT_VERBOSITY |
| 29521 | AM_DEFAULT_V |
| 29522 | AM_V |
| 29523 | -CSCOPE |
| 29524 | -ETAGS |
| 29525 | -CTAGS |
| 29526 | am__untar |
| 29527 | am__tar |
| 29528 | AMTAR |
| 29529 | @@ -760,8 +761,7 @@ PACKAGE_VERSION |
| 29530 | PACKAGE_TARNAME |
| 29531 | PACKAGE_NAME |
| 29532 | PATH_SEPARATOR |
| 29533 | -SHELL |
| 29534 | -am__quote' |
| 29535 | +SHELL' |
| 29536 | ac_subst_files='' |
| 29537 | ac_user_opts=' |
| 29538 | enable_option_checking |
| 29539 | @@ -777,6 +777,7 @@ enable_static |
| 29540 | with_pic |
| 29541 | enable_fast_install |
| 29542 | with_gnu_ld |
| 29543 | +with_libtool_sysroot |
| 29544 | enable_libtool_lock |
| 29545 | enable_host_shared |
| 29546 | ' |
| 29547 | @@ -1431,6 +1432,8 @@ Optional Packages: |
| 29548 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 29549 | both] |
| 29550 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 29551 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 29552 | + (or the compiler's sysroot if not specified). |
| 29553 | |
| 29554 | Some influential environment variables: |
| 29555 | CC C compiler command |
| 29556 | @@ -2417,7 +2420,7 @@ test -n "$target_alias" && |
| 29557 | mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" |
| 29558 | |
| 29559 | |
| 29560 | -am__api_version='1.16' |
| 29561 | +am__api_version='1.15' |
| 29562 | |
| 29563 | # Find a good install program. We prefer a C program (faster), |
| 29564 | # so one script is as good as another. But avoid the broken or |
| 29565 | @@ -2593,7 +2596,12 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` |
| 29566 | am_aux_dir=`cd "$ac_aux_dir" && pwd` |
| 29567 | |
| 29568 | if test x"${MISSING+set}" != xset; then |
| 29569 | - MISSING="\${SHELL} '$am_aux_dir/missing'" |
| 29570 | + case $am_aux_dir in |
| 29571 | + *\ * | *\ *) |
| 29572 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; |
| 29573 | + *) |
| 29574 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; |
| 29575 | + esac |
| 29576 | fi |
| 29577 | # Use eval to expand $SHELL |
| 29578 | if eval "$MISSING --is-lightweight"; then |
| 29579 | @@ -2928,8 +2936,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
| 29580 | |
| 29581 | # For better backward compatibility. To be removed once Automake 1.9.x |
| 29582 | # dies out for good. For more background, see: |
| 29583 | -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
| 29584 | -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
| 29585 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
| 29586 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
| 29587 | mkdir_p='$(MKDIR_P)' |
| 29588 | |
| 29589 | # We need awk for the "check" target (and possibly the TAP driver). The |
| 29590 | @@ -2948,20 +2956,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
| 29591 | |
| 29592 | |
| 29593 | |
| 29594 | -# Variables for tags utilities; see am/tags.am |
| 29595 | -if test -z "$CTAGS"; then |
| 29596 | - CTAGS=ctags |
| 29597 | -fi |
| 29598 | - |
| 29599 | -if test -z "$ETAGS"; then |
| 29600 | - ETAGS=etags |
| 29601 | -fi |
| 29602 | - |
| 29603 | -if test -z "$CSCOPE"; then |
| 29604 | - CSCOPE=cscope |
| 29605 | -fi |
| 29606 | - |
| 29607 | - |
| 29608 | |
| 29609 | # POSIX will say in a future version that running "rm -f" with no argument |
| 29610 | # is OK; and we want to be able to make that assumption in our Makefile |
| 29611 | @@ -2994,7 +2988,7 @@ END |
| 29612 | Aborting the configuration process, to ensure you take notice of the issue. |
| 29613 | |
| 29614 | You can download and install GNU coreutils to get an 'rm' implementation |
| 29615 | -that behaves properly: <https://www.gnu.org/software/coreutils/>. |
| 29616 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
| 29617 | |
| 29618 | If you want to complete the configuration process using your problematic |
| 29619 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
| 29620 | @@ -3998,45 +3992,45 @@ DEPDIR="${am__leading_dot}deps" |
| 29621 | |
| 29622 | ac_config_commands="$ac_config_commands depfiles" |
| 29623 | |
| 29624 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 |
| 29625 | -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } |
| 29626 | -cat > confinc.mk << 'END' |
| 29627 | + |
| 29628 | +am_make=${MAKE-make} |
| 29629 | +cat > confinc << 'END' |
| 29630 | am__doit: |
| 29631 | - @echo this is the am__doit target >confinc.out |
| 29632 | + @echo this is the am__doit target |
| 29633 | .PHONY: am__doit |
| 29634 | END |
| 29635 | +# If we don't find an include directive, just comment out the code. |
| 29636 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 |
| 29637 | +$as_echo_n "checking for style of include used by $am_make... " >&6; } |
| 29638 | am__include="#" |
| 29639 | am__quote= |
| 29640 | -# BSD make does it like this. |
| 29641 | -echo '.include "confinc.mk" # ignored' > confmf.BSD |
| 29642 | -# Other make implementations (GNU, Solaris 10, AIX) do it like this. |
| 29643 | -echo 'include confinc.mk # ignored' > confmf.GNU |
| 29644 | -_am_result=no |
| 29645 | -for s in GNU BSD; do |
| 29646 | - { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 |
| 29647 | - (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 |
| 29648 | - ac_status=$? |
| 29649 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 29650 | - (exit $ac_status); } |
| 29651 | - case $?:`cat confinc.out 2>/dev/null` in #( |
| 29652 | - '0:this is the am__doit target') : |
| 29653 | - case $s in #( |
| 29654 | - BSD) : |
| 29655 | - am__include='.include' am__quote='"' ;; #( |
| 29656 | - *) : |
| 29657 | - am__include='include' am__quote='' ;; |
| 29658 | -esac ;; #( |
| 29659 | - *) : |
| 29660 | - ;; |
| 29661 | +_am_result=none |
| 29662 | +# First try GNU make style include. |
| 29663 | +echo "include confinc" > confmf |
| 29664 | +# Ignore all kinds of additional output from 'make'. |
| 29665 | +case `$am_make -s -f confmf 2> /dev/null` in #( |
| 29666 | +*the\ am__doit\ target*) |
| 29667 | + am__include=include |
| 29668 | + am__quote= |
| 29669 | + _am_result=GNU |
| 29670 | + ;; |
| 29671 | esac |
| 29672 | - if test "$am__include" != "#"; then |
| 29673 | - _am_result="yes ($s style)" |
| 29674 | - break |
| 29675 | - fi |
| 29676 | -done |
| 29677 | -rm -f confinc.* confmf.* |
| 29678 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 |
| 29679 | -$as_echo "${_am_result}" >&6; } |
| 29680 | +# Now try BSD make style include. |
| 29681 | +if test "$am__include" = "#"; then |
| 29682 | + echo '.include "confinc"' > confmf |
| 29683 | + case `$am_make -s -f confmf 2> /dev/null` in #( |
| 29684 | + *the\ am__doit\ target*) |
| 29685 | + am__include=.include |
| 29686 | + am__quote="\"" |
| 29687 | + _am_result=BSD |
| 29688 | + ;; |
| 29689 | + esac |
| 29690 | +fi |
| 29691 | + |
| 29692 | + |
| 29693 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 |
| 29694 | +$as_echo "$_am_result" >&6; } |
| 29695 | +rm -f confinc confmf |
| 29696 | |
| 29697 | # Check whether --enable-dependency-tracking was given. |
| 29698 | if test "${enable_dependency_tracking+set}" = set; then : |
| 29699 | @@ -4198,8 +4192,8 @@ esac |
| 29700 | |
| 29701 | |
| 29702 | |
| 29703 | -macro_version='2.2.7a' |
| 29704 | -macro_revision='1.3134' |
| 29705 | +macro_version='2.4' |
| 29706 | +macro_revision='1.3293' |
| 29707 | |
| 29708 | |
| 29709 | |
| 29710 | @@ -4239,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 29711 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 29712 | $as_echo_n "checking how to print strings... " >&6; } |
| 29713 | # Test print first, because it will be a builtin if present. |
| 29714 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 29715 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 29716 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 29717 | ECHO='print -r --' |
| 29718 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 29719 | @@ -5062,8 +5056,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 29720 | # Try some XSI features |
| 29721 | xsi_shell=no |
| 29722 | ( _lt_dummy="a/b/c" |
| 29723 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 29724 | - = c,a/b,, \ |
| 29725 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 29726 | + = c,a/b,b/c, \ |
| 29727 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 29728 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 29729 | && xsi_shell=yes |
| 29730 | @@ -5112,6 +5106,80 @@ esac |
| 29731 | |
| 29732 | |
| 29733 | |
| 29734 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 29735 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 29736 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
| 29737 | + $as_echo_n "(cached) " >&6 |
| 29738 | +else |
| 29739 | + case $host in |
| 29740 | + *-*-mingw* ) |
| 29741 | + case $build in |
| 29742 | + *-*-mingw* ) # actually msys |
| 29743 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 29744 | + ;; |
| 29745 | + *-*-cygwin* ) |
| 29746 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 29747 | + ;; |
| 29748 | + * ) # otherwise, assume *nix |
| 29749 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 29750 | + ;; |
| 29751 | + esac |
| 29752 | + ;; |
| 29753 | + *-*-cygwin* ) |
| 29754 | + case $build in |
| 29755 | + *-*-mingw* ) # actually msys |
| 29756 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 29757 | + ;; |
| 29758 | + *-*-cygwin* ) |
| 29759 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 29760 | + ;; |
| 29761 | + * ) # otherwise, assume *nix |
| 29762 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 29763 | + ;; |
| 29764 | + esac |
| 29765 | + ;; |
| 29766 | + * ) # unhandled hosts (and "normal" native builds) |
| 29767 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 29768 | + ;; |
| 29769 | +esac |
| 29770 | + |
| 29771 | +fi |
| 29772 | + |
| 29773 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 29774 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 29775 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 29776 | + |
| 29777 | + |
| 29778 | + |
| 29779 | + |
| 29780 | + |
| 29781 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 29782 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 29783 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
| 29784 | + $as_echo_n "(cached) " >&6 |
| 29785 | +else |
| 29786 | + #assume ordinary cross tools, or native build. |
| 29787 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 29788 | +case $host in |
| 29789 | + *-*-mingw* ) |
| 29790 | + case $build in |
| 29791 | + *-*-mingw* ) # actually msys |
| 29792 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 29793 | + ;; |
| 29794 | + esac |
| 29795 | + ;; |
| 29796 | +esac |
| 29797 | + |
| 29798 | +fi |
| 29799 | + |
| 29800 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 29801 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 29802 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 29803 | + |
| 29804 | + |
| 29805 | + |
| 29806 | + |
| 29807 | + |
| 29808 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 29809 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 29810 | if ${lt_cv_ld_reload_flag+:} false; then : |
| 29811 | @@ -5128,6 +5196,11 @@ case $reload_flag in |
| 29812 | esac |
| 29813 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 29814 | case $host_os in |
| 29815 | + cygwin* | mingw* | pw32* | cegcc*) |
| 29816 | + if test "$GCC" != yes; then |
| 29817 | + reload_cmds=false |
| 29818 | + fi |
| 29819 | + ;; |
| 29820 | darwin*) |
| 29821 | if test "$GCC" = yes; then |
| 29822 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 29823 | @@ -5296,7 +5369,8 @@ mingw* | pw32*) |
| 29824 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 29825 | lt_cv_file_magic_cmd='func_win32_libid' |
| 29826 | else |
| 29827 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 29828 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 29829 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 29830 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 29831 | fi |
| 29832 | ;; |
| 29833 | @@ -5450,6 +5524,21 @@ esac |
| 29834 | fi |
| 29835 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 29836 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 29837 | + |
| 29838 | +file_magic_glob= |
| 29839 | +want_nocaseglob=no |
| 29840 | +if test "$build" = "$host"; then |
| 29841 | + case $host_os in |
| 29842 | + mingw* | pw32*) |
| 29843 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 29844 | + want_nocaseglob=yes |
| 29845 | + else |
| 29846 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 29847 | + fi |
| 29848 | + ;; |
| 29849 | + esac |
| 29850 | +fi |
| 29851 | + |
| 29852 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 29853 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 29854 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 29855 | @@ -5465,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 29856 | |
| 29857 | |
| 29858 | |
| 29859 | + |
| 29860 | + |
| 29861 | + |
| 29862 | + |
| 29863 | + |
| 29864 | + |
| 29865 | + |
| 29866 | + |
| 29867 | + |
| 29868 | + |
| 29869 | +if test -n "$ac_tool_prefix"; then |
| 29870 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 29871 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 29872 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 29873 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 29874 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
| 29875 | + $as_echo_n "(cached) " >&6 |
| 29876 | +else |
| 29877 | + if test -n "$DLLTOOL"; then |
| 29878 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 29879 | +else |
| 29880 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 29881 | +for as_dir in $PATH |
| 29882 | +do |
| 29883 | + IFS=$as_save_IFS |
| 29884 | + test -z "$as_dir" && as_dir=. |
| 29885 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 29886 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 29887 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 29888 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 29889 | + break 2 |
| 29890 | + fi |
| 29891 | +done |
| 29892 | + done |
| 29893 | +IFS=$as_save_IFS |
| 29894 | + |
| 29895 | +fi |
| 29896 | +fi |
| 29897 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 29898 | +if test -n "$DLLTOOL"; then |
| 29899 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 29900 | +$as_echo "$DLLTOOL" >&6; } |
| 29901 | +else |
| 29902 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 29903 | +$as_echo "no" >&6; } |
| 29904 | +fi |
| 29905 | + |
| 29906 | + |
| 29907 | +fi |
| 29908 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 29909 | + ac_ct_DLLTOOL=$DLLTOOL |
| 29910 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 29911 | +set dummy dlltool; ac_word=$2 |
| 29912 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 29913 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 29914 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
| 29915 | + $as_echo_n "(cached) " >&6 |
| 29916 | +else |
| 29917 | + if test -n "$ac_ct_DLLTOOL"; then |
| 29918 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 29919 | +else |
| 29920 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 29921 | +for as_dir in $PATH |
| 29922 | +do |
| 29923 | + IFS=$as_save_IFS |
| 29924 | + test -z "$as_dir" && as_dir=. |
| 29925 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 29926 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 29927 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 29928 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 29929 | + break 2 |
| 29930 | + fi |
| 29931 | +done |
| 29932 | + done |
| 29933 | +IFS=$as_save_IFS |
| 29934 | + |
| 29935 | +fi |
| 29936 | +fi |
| 29937 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 29938 | +if test -n "$ac_ct_DLLTOOL"; then |
| 29939 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 29940 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 29941 | +else |
| 29942 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 29943 | +$as_echo "no" >&6; } |
| 29944 | +fi |
| 29945 | + |
| 29946 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 29947 | + DLLTOOL="false" |
| 29948 | + else |
| 29949 | + case $cross_compiling:$ac_tool_warned in |
| 29950 | +yes:) |
| 29951 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 29952 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 29953 | +ac_tool_warned=yes ;; |
| 29954 | +esac |
| 29955 | + DLLTOOL=$ac_ct_DLLTOOL |
| 29956 | + fi |
| 29957 | +else |
| 29958 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 29959 | +fi |
| 29960 | + |
| 29961 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 29962 | + |
| 29963 | + |
| 29964 | + |
| 29965 | + |
| 29966 | + |
| 29967 | + |
| 29968 | + |
| 29969 | + |
| 29970 | + |
| 29971 | + |
| 29972 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 29973 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 29974 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
| 29975 | + $as_echo_n "(cached) " >&6 |
| 29976 | +else |
| 29977 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 29978 | + |
| 29979 | +case $host_os in |
| 29980 | +cygwin* | mingw* | pw32* | cegcc*) |
| 29981 | + # two different shell functions defined in ltmain.sh |
| 29982 | + # decide which to use based on capabilities of $DLLTOOL |
| 29983 | + case `$DLLTOOL --help 2>&1` in |
| 29984 | + *--identify-strict*) |
| 29985 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 29986 | + ;; |
| 29987 | + *) |
| 29988 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 29989 | + ;; |
| 29990 | + esac |
| 29991 | + ;; |
| 29992 | +*) |
| 29993 | + # fallback: assume linklib IS sharedlib |
| 29994 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 29995 | + ;; |
| 29996 | +esac |
| 29997 | + |
| 29998 | +fi |
| 29999 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 30000 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 30001 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 30002 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 30003 | + |
| 30004 | + |
| 30005 | + |
| 30006 | + |
| 30007 | + |
| 30008 | + |
| 30009 | + |
| 30010 | + |
| 30011 | plugin_option= |
| 30012 | plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" |
| 30013 | for plugin in $plugin_names; do |
| 30014 | @@ -5479,8 +5720,10 @@ for plugin in $plugin_names; do |
| 30015 | done |
| 30016 | |
| 30017 | if test -n "$ac_tool_prefix"; then |
| 30018 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 30019 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 30020 | + for ac_prog in ar |
| 30021 | + do |
| 30022 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 30023 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 30024 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 30025 | $as_echo_n "checking for $ac_word... " >&6; } |
| 30026 | if ${ac_cv_prog_AR+:} false; then : |
| 30027 | @@ -5496,7 +5739,7 @@ do |
| 30028 | test -z "$as_dir" && as_dir=. |
| 30029 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 30030 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 30031 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 30032 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 30033 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 30034 | break 2 |
| 30035 | fi |
| 30036 | @@ -5516,11 +5759,15 @@ $as_echo "no" >&6; } |
| 30037 | fi |
| 30038 | |
| 30039 | |
| 30040 | + test -n "$AR" && break |
| 30041 | + done |
| 30042 | fi |
| 30043 | -if test -z "$ac_cv_prog_AR"; then |
| 30044 | +if test -z "$AR"; then |
| 30045 | ac_ct_AR=$AR |
| 30046 | - # Extract the first word of "ar", so it can be a program name with args. |
| 30047 | -set dummy ar; ac_word=$2 |
| 30048 | + for ac_prog in ar |
| 30049 | +do |
| 30050 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 30051 | +set dummy $ac_prog; ac_word=$2 |
| 30052 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 30053 | $as_echo_n "checking for $ac_word... " >&6; } |
| 30054 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
| 30055 | @@ -5536,7 +5783,7 @@ do |
| 30056 | test -z "$as_dir" && as_dir=. |
| 30057 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 30058 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 30059 | - ac_cv_prog_ac_ct_AR="ar" |
| 30060 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 30061 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 30062 | break 2 |
| 30063 | fi |
| 30064 | @@ -5555,6 +5802,10 @@ else |
| 30065 | $as_echo "no" >&6; } |
| 30066 | fi |
| 30067 | |
| 30068 | + |
| 30069 | + test -n "$ac_ct_AR" && break |
| 30070 | +done |
| 30071 | + |
| 30072 | if test "x$ac_ct_AR" = x; then |
| 30073 | AR="false" |
| 30074 | else |
| 30075 | @@ -5566,25 +5817,22 @@ ac_tool_warned=yes ;; |
| 30076 | esac |
| 30077 | AR=$ac_ct_AR |
| 30078 | fi |
| 30079 | -else |
| 30080 | - AR="$ac_cv_prog_AR" |
| 30081 | fi |
| 30082 | |
| 30083 | -test -z "$AR" && AR=ar |
| 30084 | -if test -n "$plugin_option"; then |
| 30085 | - if $AR --help 2>&1 | grep -q "\--plugin"; then |
| 30086 | - touch conftest.c |
| 30087 | - $AR $plugin_option rc conftest.a conftest.c |
| 30088 | - if test "$?" != 0; then |
| 30089 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 30090 | + touch conftest.c |
| 30091 | + $AR $plugin_option rc conftest.a conftest.c |
| 30092 | + if test "$?" != 0; then |
| 30093 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 |
| 30094 | $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} |
| 30095 | - else |
| 30096 | - AR="$AR $plugin_option" |
| 30097 | - fi |
| 30098 | - rm -f conftest.* |
| 30099 | + else |
| 30100 | + AR="$AR $plugin_option" |
| 30101 | fi |
| 30102 | -fi |
| 30103 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 30104 | + rm -f conftest.* |
| 30105 | +: ${AR=ar} |
| 30106 | +: ${AR_FLAGS=cru} |
| 30107 | + |
| 30108 | + |
| 30109 | + |
| 30110 | |
| 30111 | |
| 30112 | |
| 30113 | @@ -5593,6 +5841,61 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 30114 | |
| 30115 | |
| 30116 | |
| 30117 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 30118 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 30119 | +if ${lt_cv_ar_at_file+:} false; then : |
| 30120 | + $as_echo_n "(cached) " >&6 |
| 30121 | +else |
| 30122 | + lt_cv_ar_at_file=no |
| 30123 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 30124 | +/* end confdefs.h. */ |
| 30125 | + |
| 30126 | +int |
| 30127 | +main () |
| 30128 | +{ |
| 30129 | + |
| 30130 | + ; |
| 30131 | + return 0; |
| 30132 | +} |
| 30133 | +_ACEOF |
| 30134 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 30135 | + echo conftest.$ac_objext > conftest.lst |
| 30136 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 30137 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 30138 | + (eval $lt_ar_try) 2>&5 |
| 30139 | + ac_status=$? |
| 30140 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 30141 | + test $ac_status = 0; } |
| 30142 | + if test "$ac_status" -eq 0; then |
| 30143 | + # Ensure the archiver fails upon bogus file names. |
| 30144 | + rm -f conftest.$ac_objext libconftest.a |
| 30145 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 30146 | + (eval $lt_ar_try) 2>&5 |
| 30147 | + ac_status=$? |
| 30148 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 30149 | + test $ac_status = 0; } |
| 30150 | + if test "$ac_status" -ne 0; then |
| 30151 | + lt_cv_ar_at_file=@ |
| 30152 | + fi |
| 30153 | + fi |
| 30154 | + rm -f conftest.* libconftest.a |
| 30155 | + |
| 30156 | +fi |
| 30157 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 30158 | + |
| 30159 | +fi |
| 30160 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 30161 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 30162 | + |
| 30163 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 30164 | + archiver_list_spec= |
| 30165 | +else |
| 30166 | + archiver_list_spec=$lt_cv_ar_at_file |
| 30167 | +fi |
| 30168 | + |
| 30169 | + |
| 30170 | + |
| 30171 | + |
| 30172 | |
| 30173 | |
| 30174 | |
| 30175 | @@ -5935,8 +6238,8 @@ esac |
| 30176 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 30177 | |
| 30178 | # Transform an extracted symbol line into symbol name and symbol address |
| 30179 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 30180 | -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'" |
| 30181 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 30182 | +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'" |
| 30183 | |
| 30184 | # Handle CRLF in mingw tool chain |
| 30185 | opt_cr= |
| 30186 | @@ -5972,6 +6275,7 @@ for ac_symprfx in "" "_"; do |
| 30187 | else |
| 30188 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 30189 | fi |
| 30190 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 30191 | |
| 30192 | # Check to see that the pipe works correctly. |
| 30193 | pipe_works=no |
| 30194 | @@ -6013,6 +6317,18 @@ _LT_EOF |
| 30195 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 30196 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 30197 | cat <<_LT_EOF > conftest.$ac_ext |
| 30198 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 30199 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 30200 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 30201 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 30202 | +# define LT_DLSYM_CONST |
| 30203 | +#elif defined(__osf__) |
| 30204 | +/* This system does not cope well with relocations in const data. */ |
| 30205 | +# define LT_DLSYM_CONST |
| 30206 | +#else |
| 30207 | +# define LT_DLSYM_CONST const |
| 30208 | +#endif |
| 30209 | + |
| 30210 | #ifdef __cplusplus |
| 30211 | extern "C" { |
| 30212 | #endif |
| 30213 | @@ -6024,7 +6340,7 @@ _LT_EOF |
| 30214 | cat <<_LT_EOF >> conftest.$ac_ext |
| 30215 | |
| 30216 | /* The mapping between symbol names and symbols. */ |
| 30217 | -const struct { |
| 30218 | +LT_DLSYM_CONST struct { |
| 30219 | const char *name; |
| 30220 | void *address; |
| 30221 | } |
| 30222 | @@ -6050,8 +6366,8 @@ static const void *lt_preloaded_setup() { |
| 30223 | _LT_EOF |
| 30224 | # Now try linking the two files. |
| 30225 | mv conftest.$ac_objext conftstm.$ac_objext |
| 30226 | - lt_save_LIBS="$LIBS" |
| 30227 | - lt_save_CFLAGS="$CFLAGS" |
| 30228 | + lt_globsym_save_LIBS=$LIBS |
| 30229 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 30230 | LIBS="conftstm.$ac_objext" |
| 30231 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 30232 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 30233 | @@ -6061,8 +6377,8 @@ _LT_EOF |
| 30234 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 30235 | pipe_works=yes |
| 30236 | fi |
| 30237 | - LIBS="$lt_save_LIBS" |
| 30238 | - CFLAGS="$lt_save_CFLAGS" |
| 30239 | + LIBS=$lt_globsym_save_LIBS |
| 30240 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 30241 | else |
| 30242 | echo "cannot find nm_test_func in $nlist" >&5 |
| 30243 | fi |
| 30244 | @@ -6099,6 +6415,16 @@ else |
| 30245 | $as_echo "ok" >&6; } |
| 30246 | fi |
| 30247 | |
| 30248 | +# Response file support. |
| 30249 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 30250 | + nm_file_list_spec='@' |
| 30251 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 30252 | + nm_file_list_spec='@' |
| 30253 | +fi |
| 30254 | + |
| 30255 | + |
| 30256 | + |
| 30257 | + |
| 30258 | |
| 30259 | |
| 30260 | |
| 30261 | @@ -6116,6 +6442,44 @@ fi |
| 30262 | |
| 30263 | |
| 30264 | |
| 30265 | + |
| 30266 | + |
| 30267 | + |
| 30268 | + |
| 30269 | + |
| 30270 | + |
| 30271 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 30272 | +$as_echo_n "checking for sysroot... " >&6; } |
| 30273 | + |
| 30274 | +# Check whether --with-libtool-sysroot was given. |
| 30275 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 30276 | + withval=$with_libtool_sysroot; |
| 30277 | +else |
| 30278 | + with_libtool_sysroot=no |
| 30279 | +fi |
| 30280 | + |
| 30281 | + |
| 30282 | +lt_sysroot= |
| 30283 | +case ${with_libtool_sysroot} in #( |
| 30284 | + yes) |
| 30285 | + if test "$GCC" = yes; then |
| 30286 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 30287 | + fi |
| 30288 | + ;; #( |
| 30289 | + /*) |
| 30290 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 30291 | + ;; #( |
| 30292 | + no|'') |
| 30293 | + ;; #( |
| 30294 | + *) |
| 30295 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 30296 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 30297 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
| 30298 | + ;; |
| 30299 | +esac |
| 30300 | + |
| 30301 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 30302 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 30303 | |
| 30304 | |
| 30305 | |
| 30306 | @@ -6324,11 +6688,128 @@ sparc*-*solaris*) |
| 30307 | ;; |
| 30308 | esac |
| 30309 | fi |
| 30310 | - rm -rf conftest* |
| 30311 | - ;; |
| 30312 | + rm -rf conftest* |
| 30313 | + ;; |
| 30314 | +esac |
| 30315 | + |
| 30316 | +need_locks="$enable_libtool_lock" |
| 30317 | + |
| 30318 | +if test -n "$ac_tool_prefix"; then |
| 30319 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 30320 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 30321 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 30322 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 30323 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
| 30324 | + $as_echo_n "(cached) " >&6 |
| 30325 | +else |
| 30326 | + if test -n "$MANIFEST_TOOL"; then |
| 30327 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 30328 | +else |
| 30329 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 30330 | +for as_dir in $PATH |
| 30331 | +do |
| 30332 | + IFS=$as_save_IFS |
| 30333 | + test -z "$as_dir" && as_dir=. |
| 30334 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 30335 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 30336 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 30337 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 30338 | + break 2 |
| 30339 | + fi |
| 30340 | +done |
| 30341 | + done |
| 30342 | +IFS=$as_save_IFS |
| 30343 | + |
| 30344 | +fi |
| 30345 | +fi |
| 30346 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 30347 | +if test -n "$MANIFEST_TOOL"; then |
| 30348 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 30349 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 30350 | +else |
| 30351 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 30352 | +$as_echo "no" >&6; } |
| 30353 | +fi |
| 30354 | + |
| 30355 | + |
| 30356 | +fi |
| 30357 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 30358 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 30359 | + # Extract the first word of "mt", so it can be a program name with args. |
| 30360 | +set dummy mt; ac_word=$2 |
| 30361 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 30362 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 30363 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
| 30364 | + $as_echo_n "(cached) " >&6 |
| 30365 | +else |
| 30366 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 30367 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 30368 | +else |
| 30369 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 30370 | +for as_dir in $PATH |
| 30371 | +do |
| 30372 | + IFS=$as_save_IFS |
| 30373 | + test -z "$as_dir" && as_dir=. |
| 30374 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 30375 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
| 30376 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 30377 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 30378 | + break 2 |
| 30379 | + fi |
| 30380 | +done |
| 30381 | + done |
| 30382 | +IFS=$as_save_IFS |
| 30383 | + |
| 30384 | +fi |
| 30385 | +fi |
| 30386 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 30387 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 30388 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 30389 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 30390 | +else |
| 30391 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 30392 | +$as_echo "no" >&6; } |
| 30393 | +fi |
| 30394 | + |
| 30395 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 30396 | + MANIFEST_TOOL=":" |
| 30397 | + else |
| 30398 | + case $cross_compiling:$ac_tool_warned in |
| 30399 | +yes:) |
| 30400 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 30401 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 30402 | +ac_tool_warned=yes ;; |
| 30403 | esac |
| 30404 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 30405 | + fi |
| 30406 | +else |
| 30407 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 30408 | +fi |
| 30409 | + |
| 30410 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 30411 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 30412 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 30413 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
| 30414 | + $as_echo_n "(cached) " >&6 |
| 30415 | +else |
| 30416 | + lt_cv_path_mainfest_tool=no |
| 30417 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 30418 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 30419 | + cat conftest.err >&5 |
| 30420 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 30421 | + lt_cv_path_mainfest_tool=yes |
| 30422 | + fi |
| 30423 | + rm -f conftest* |
| 30424 | +fi |
| 30425 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 30426 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 30427 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 30428 | + MANIFEST_TOOL=: |
| 30429 | +fi |
| 30430 | + |
| 30431 | + |
| 30432 | + |
| 30433 | |
| 30434 | -need_locks="$enable_libtool_lock" |
| 30435 | |
| 30436 | |
| 30437 | case $host_os in |
| 30438 | @@ -6896,6 +7377,8 @@ _LT_EOF |
| 30439 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 30440 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 30441 | $AR cru libconftest.a conftest.o 2>&5 |
| 30442 | + echo "$RANLIB libconftest.a" >&5 |
| 30443 | + $RANLIB libconftest.a 2>&5 |
| 30444 | cat > conftest.c << _LT_EOF |
| 30445 | int main() { return 0;} |
| 30446 | _LT_EOF |
| 30447 | @@ -7745,8 +8228,6 @@ fi |
| 30448 | lt_prog_compiler_pic= |
| 30449 | lt_prog_compiler_static= |
| 30450 | |
| 30451 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 30452 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 30453 | |
| 30454 | if test "$GCC" = yes; then |
| 30455 | lt_prog_compiler_wl='-Wl,' |
| 30456 | @@ -7912,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 30457 | lt_prog_compiler_pic='--shared' |
| 30458 | lt_prog_compiler_static='--static' |
| 30459 | ;; |
| 30460 | + nagfor*) |
| 30461 | + # NAG Fortran compiler |
| 30462 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 30463 | + lt_prog_compiler_pic='-PIC' |
| 30464 | + lt_prog_compiler_static='-Bstatic' |
| 30465 | + ;; |
| 30466 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 30467 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 30468 | # which looks to be a dead project) |
| 30469 | @@ -7974,7 +8461,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 30470 | lt_prog_compiler_pic='-KPIC' |
| 30471 | lt_prog_compiler_static='-Bstatic' |
| 30472 | case $cc_basename in |
| 30473 | - f77* | f90* | f95*) |
| 30474 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 30475 | lt_prog_compiler_wl='-Qoption ld ';; |
| 30476 | *) |
| 30477 | lt_prog_compiler_wl='-Wl,';; |
| 30478 | @@ -8031,13 +8518,17 @@ case $host_os in |
| 30479 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 30480 | ;; |
| 30481 | esac |
| 30482 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 30483 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 30484 | - |
| 30485 | - |
| 30486 | - |
| 30487 | - |
| 30488 | |
| 30489 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 30490 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 30491 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
| 30492 | + $as_echo_n "(cached) " >&6 |
| 30493 | +else |
| 30494 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 30495 | +fi |
| 30496 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 30497 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 30498 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 30499 | |
| 30500 | # |
| 30501 | # Check to make sure the PIC flag actually works. |
| 30502 | @@ -8098,6 +8589,11 @@ fi |
| 30503 | |
| 30504 | |
| 30505 | |
| 30506 | + |
| 30507 | + |
| 30508 | + |
| 30509 | + |
| 30510 | + |
| 30511 | # |
| 30512 | # Check to make sure the static flag actually works. |
| 30513 | # |
| 30514 | @@ -8448,7 +8944,8 @@ _LT_EOF |
| 30515 | allow_undefined_flag=unsupported |
| 30516 | always_export_symbols=no |
| 30517 | enable_shared_with_static_runtimes=yes |
| 30518 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 30519 | + 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' |
| 30520 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 30521 | |
| 30522 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 30523 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 30524 | @@ -8547,12 +9044,12 @@ _LT_EOF |
| 30525 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 30526 | hardcode_libdir_flag_spec= |
| 30527 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 30528 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 30529 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 30530 | if test "x$supports_anon_versioning" = xyes; then |
| 30531 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 30532 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 30533 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 30534 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 30535 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 30536 | fi |
| 30537 | ;; |
| 30538 | esac |
| 30539 | @@ -8566,8 +9063,8 @@ _LT_EOF |
| 30540 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 30541 | wlarc= |
| 30542 | else |
| 30543 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 30544 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 30545 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 30546 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 30547 | fi |
| 30548 | ;; |
| 30549 | |
| 30550 | @@ -8585,8 +9082,8 @@ _LT_EOF |
| 30551 | |
| 30552 | _LT_EOF |
| 30553 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 30554 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 30555 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 30556 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 30557 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 30558 | else |
| 30559 | ld_shlibs=no |
| 30560 | fi |
| 30561 | @@ -8632,8 +9129,8 @@ _LT_EOF |
| 30562 | |
| 30563 | *) |
| 30564 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 30565 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 30566 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 30567 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 30568 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 30569 | else |
| 30570 | ld_shlibs=no |
| 30571 | fi |
| 30572 | @@ -8763,7 +9260,13 @@ _LT_EOF |
| 30573 | allow_undefined_flag='-berok' |
| 30574 | # Determine the default libpath from the value encoded in an |
| 30575 | # empty executable. |
| 30576 | - if test x$gcc_no_link = xyes; then |
| 30577 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 30578 | + aix_libpath=$lt_cv_aix_libpath |
| 30579 | +else |
| 30580 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 30581 | + $as_echo_n "(cached) " >&6 |
| 30582 | +else |
| 30583 | + if test x$gcc_no_link = xyes; then |
| 30584 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 30585 | fi |
| 30586 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 30587 | @@ -8779,22 +9282,29 @@ main () |
| 30588 | _ACEOF |
| 30589 | if ac_fn_c_try_link "$LINENO"; then : |
| 30590 | |
| 30591 | -lt_aix_libpath_sed=' |
| 30592 | - /Import File Strings/,/^$/ { |
| 30593 | - /^0/ { |
| 30594 | - s/^0 *\(.*\)$/\1/ |
| 30595 | - p |
| 30596 | - } |
| 30597 | - }' |
| 30598 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 30599 | -# Check for a 64-bit object if we didn't find anything. |
| 30600 | -if test -z "$aix_libpath"; then |
| 30601 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 30602 | -fi |
| 30603 | + lt_aix_libpath_sed=' |
| 30604 | + /Import File Strings/,/^$/ { |
| 30605 | + /^0/ { |
| 30606 | + s/^0 *\([^ ]*\) *$/\1/ |
| 30607 | + p |
| 30608 | + } |
| 30609 | + }' |
| 30610 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 30611 | + # Check for a 64-bit object if we didn't find anything. |
| 30612 | + if test -z "$lt_cv_aix_libpath_"; then |
| 30613 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 30614 | + fi |
| 30615 | fi |
| 30616 | rm -f core conftest.err conftest.$ac_objext \ |
| 30617 | conftest$ac_exeext conftest.$ac_ext |
| 30618 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 30619 | + if test -z "$lt_cv_aix_libpath_"; then |
| 30620 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 30621 | + fi |
| 30622 | + |
| 30623 | +fi |
| 30624 | + |
| 30625 | + aix_libpath=$lt_cv_aix_libpath_ |
| 30626 | +fi |
| 30627 | |
| 30628 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 30629 | 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" |
| 30630 | @@ -8806,7 +9316,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 30631 | else |
| 30632 | # Determine the default libpath from the value encoded in an |
| 30633 | # empty executable. |
| 30634 | - if test x$gcc_no_link = xyes; then |
| 30635 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 30636 | + aix_libpath=$lt_cv_aix_libpath |
| 30637 | +else |
| 30638 | + if ${lt_cv_aix_libpath_+:} false; then : |
| 30639 | + $as_echo_n "(cached) " >&6 |
| 30640 | +else |
| 30641 | + if test x$gcc_no_link = xyes; then |
| 30642 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 30643 | fi |
| 30644 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 30645 | @@ -8822,22 +9338,29 @@ main () |
| 30646 | _ACEOF |
| 30647 | if ac_fn_c_try_link "$LINENO"; then : |
| 30648 | |
| 30649 | -lt_aix_libpath_sed=' |
| 30650 | - /Import File Strings/,/^$/ { |
| 30651 | - /^0/ { |
| 30652 | - s/^0 *\(.*\)$/\1/ |
| 30653 | - p |
| 30654 | - } |
| 30655 | - }' |
| 30656 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 30657 | -# Check for a 64-bit object if we didn't find anything. |
| 30658 | -if test -z "$aix_libpath"; then |
| 30659 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 30660 | -fi |
| 30661 | + lt_aix_libpath_sed=' |
| 30662 | + /Import File Strings/,/^$/ { |
| 30663 | + /^0/ { |
| 30664 | + s/^0 *\([^ ]*\) *$/\1/ |
| 30665 | + p |
| 30666 | + } |
| 30667 | + }' |
| 30668 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 30669 | + # Check for a 64-bit object if we didn't find anything. |
| 30670 | + if test -z "$lt_cv_aix_libpath_"; then |
| 30671 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 30672 | + fi |
| 30673 | fi |
| 30674 | rm -f core conftest.err conftest.$ac_objext \ |
| 30675 | conftest$ac_exeext conftest.$ac_ext |
| 30676 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 30677 | + if test -z "$lt_cv_aix_libpath_"; then |
| 30678 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 30679 | + fi |
| 30680 | + |
| 30681 | +fi |
| 30682 | + |
| 30683 | + aix_libpath=$lt_cv_aix_libpath_ |
| 30684 | +fi |
| 30685 | |
| 30686 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 30687 | # Warning - without using the other run time loading flags, |
| 30688 | @@ -8882,20 +9405,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 30689 | # Microsoft Visual C++. |
| 30690 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 30691 | # no search path for DLLs. |
| 30692 | - hardcode_libdir_flag_spec=' ' |
| 30693 | - allow_undefined_flag=unsupported |
| 30694 | - # Tell ltmain to make .lib files, not .a files. |
| 30695 | - libext=lib |
| 30696 | - # Tell ltmain to make .dll files, not .so files. |
| 30697 | - shrext_cmds=".dll" |
| 30698 | - # FIXME: Setting linknames here is a bad hack. |
| 30699 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 30700 | - # The linker will automatically build a .lib file if we build a DLL. |
| 30701 | - old_archive_from_new_cmds='true' |
| 30702 | - # FIXME: Should let the user specify the lib program. |
| 30703 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 30704 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 30705 | - enable_shared_with_static_runtimes=yes |
| 30706 | + case $cc_basename in |
| 30707 | + cl*) |
| 30708 | + # Native MSVC |
| 30709 | + hardcode_libdir_flag_spec=' ' |
| 30710 | + allow_undefined_flag=unsupported |
| 30711 | + always_export_symbols=yes |
| 30712 | + file_list_spec='@' |
| 30713 | + # Tell ltmain to make .lib files, not .a files. |
| 30714 | + libext=lib |
| 30715 | + # Tell ltmain to make .dll files, not .so files. |
| 30716 | + shrext_cmds=".dll" |
| 30717 | + # FIXME: Setting linknames here is a bad hack. |
| 30718 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 30719 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 30720 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 30721 | + else |
| 30722 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 30723 | + fi~ |
| 30724 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 30725 | + linknames=' |
| 30726 | + # The linker will not automatically build a static lib if we build a DLL. |
| 30727 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 30728 | + enable_shared_with_static_runtimes=yes |
| 30729 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 30730 | + # Don't use ranlib |
| 30731 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 30732 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 30733 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 30734 | + case $lt_outputfile in |
| 30735 | + *.exe|*.EXE) ;; |
| 30736 | + *) |
| 30737 | + lt_outputfile="$lt_outputfile.exe" |
| 30738 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 30739 | + ;; |
| 30740 | + esac~ |
| 30741 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 30742 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 30743 | + $RM "$lt_outputfile.manifest"; |
| 30744 | + fi' |
| 30745 | + ;; |
| 30746 | + *) |
| 30747 | + # Assume MSVC wrapper |
| 30748 | + hardcode_libdir_flag_spec=' ' |
| 30749 | + allow_undefined_flag=unsupported |
| 30750 | + # Tell ltmain to make .lib files, not .a files. |
| 30751 | + libext=lib |
| 30752 | + # Tell ltmain to make .dll files, not .so files. |
| 30753 | + shrext_cmds=".dll" |
| 30754 | + # FIXME: Setting linknames here is a bad hack. |
| 30755 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 30756 | + # The linker will automatically build a .lib file if we build a DLL. |
| 30757 | + old_archive_from_new_cmds='true' |
| 30758 | + # FIXME: Should let the user specify the lib program. |
| 30759 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 30760 | + enable_shared_with_static_runtimes=yes |
| 30761 | + ;; |
| 30762 | + esac |
| 30763 | ;; |
| 30764 | |
| 30765 | darwin* | rhapsody*) |
| 30766 | @@ -8956,7 +9522,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 30767 | |
| 30768 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 30769 | freebsd* | dragonfly*) |
| 30770 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 30771 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 30772 | hardcode_libdir_flag_spec='-R$libdir' |
| 30773 | hardcode_direct=yes |
| 30774 | hardcode_shlibpath_var=no |
| 30775 | @@ -8964,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 30776 | |
| 30777 | hpux9*) |
| 30778 | if test "$GCC" = yes; then |
| 30779 | - 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' |
| 30780 | + 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' |
| 30781 | else |
| 30782 | 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' |
| 30783 | fi |
| 30784 | @@ -8980,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 30785 | |
| 30786 | hpux10*) |
| 30787 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 30788 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 30789 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 30790 | else |
| 30791 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 30792 | fi |
| 30793 | @@ -9004,10 +9570,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 30794 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 30795 | ;; |
| 30796 | ia64*) |
| 30797 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 30798 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 30799 | ;; |
| 30800 | *) |
| 30801 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 30802 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 30803 | ;; |
| 30804 | esac |
| 30805 | else |
| 30806 | @@ -9086,26 +9652,39 @@ fi |
| 30807 | |
| 30808 | irix5* | irix6* | nonstopux*) |
| 30809 | if test "$GCC" = yes; then |
| 30810 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 30811 | + 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' |
| 30812 | # Try to use the -exported_symbol ld option, if it does not |
| 30813 | # work, assume that -exports_file does not work either and |
| 30814 | # implicitly export all symbols. |
| 30815 | - save_LDFLAGS="$LDFLAGS" |
| 30816 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 30817 | - if test x$gcc_no_link = xyes; then |
| 30818 | + # This should be the same for all languages, so no per-tag cache variable. |
| 30819 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 30820 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 30821 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
| 30822 | + $as_echo_n "(cached) " >&6 |
| 30823 | +else |
| 30824 | + save_LDFLAGS="$LDFLAGS" |
| 30825 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 30826 | + if test x$gcc_no_link = xyes; then |
| 30827 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 30828 | fi |
| 30829 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 30830 | /* end confdefs.h. */ |
| 30831 | -int foo(void) {} |
| 30832 | +int foo (void) { return 0; } |
| 30833 | _ACEOF |
| 30834 | if ac_fn_c_try_link "$LINENO"; then : |
| 30835 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 30836 | - |
| 30837 | + lt_cv_irix_exported_symbol=yes |
| 30838 | +else |
| 30839 | + lt_cv_irix_exported_symbol=no |
| 30840 | fi |
| 30841 | rm -f core conftest.err conftest.$ac_objext \ |
| 30842 | conftest$ac_exeext conftest.$ac_ext |
| 30843 | - LDFLAGS="$save_LDFLAGS" |
| 30844 | + LDFLAGS="$save_LDFLAGS" |
| 30845 | +fi |
| 30846 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 30847 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 30848 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 30849 | + 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' |
| 30850 | + fi |
| 30851 | else |
| 30852 | 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' |
| 30853 | 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' |
| 30854 | @@ -9190,7 +9769,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 30855 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 30856 | if test "$GCC" = yes; then |
| 30857 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 30858 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 30859 | + 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' |
| 30860 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 30861 | else |
| 30862 | allow_undefined_flag=' -expect_unresolved \*' |
| 30863 | @@ -9209,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 30864 | no_undefined_flag=' -z defs' |
| 30865 | if test "$GCC" = yes; then |
| 30866 | wlarc='${wl}' |
| 30867 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 30868 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 30869 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 30870 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 30871 | + $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' |
| 30872 | else |
| 30873 | case `$CC -V 2>&1` in |
| 30874 | *"Compilers 5.0"*) |
| 30875 | @@ -9787,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 30876 | need_version=no |
| 30877 | need_lib_prefix=no |
| 30878 | |
| 30879 | - case $GCC,$host_os in |
| 30880 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 30881 | + case $GCC,$cc_basename in |
| 30882 | + yes,*) |
| 30883 | + # gcc |
| 30884 | library_names_spec='$libname.dll.a' |
| 30885 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 30886 | postinstall_cmds='base_file=`basename \${file}`~ |
| 30887 | @@ -9821,13 +10401,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 30888 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 30889 | ;; |
| 30890 | esac |
| 30891 | + dynamic_linker='Win32 ld.exe' |
| 30892 | + ;; |
| 30893 | + |
| 30894 | + *,cl*) |
| 30895 | + # Native MSVC |
| 30896 | + libname_spec='$name' |
| 30897 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 30898 | + library_names_spec='${libname}.dll.lib' |
| 30899 | + |
| 30900 | + case $build_os in |
| 30901 | + mingw*) |
| 30902 | + sys_lib_search_path_spec= |
| 30903 | + lt_save_ifs=$IFS |
| 30904 | + IFS=';' |
| 30905 | + for lt_path in $LIB |
| 30906 | + do |
| 30907 | + IFS=$lt_save_ifs |
| 30908 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 30909 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 30910 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 30911 | + done |
| 30912 | + IFS=$lt_save_ifs |
| 30913 | + # Convert to MSYS style. |
| 30914 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 30915 | + ;; |
| 30916 | + cygwin*) |
| 30917 | + # Convert to unix form, then to dos form, then back to unix form |
| 30918 | + # but this time dos style (no spaces!) so that the unix form looks |
| 30919 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 30920 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 30921 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 30922 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 30923 | + ;; |
| 30924 | + *) |
| 30925 | + sys_lib_search_path_spec="$LIB" |
| 30926 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 30927 | + # It is most probably a Windows format PATH. |
| 30928 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 30929 | + else |
| 30930 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 30931 | + fi |
| 30932 | + # FIXME: find the short name or the path components, as spaces are |
| 30933 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 30934 | + ;; |
| 30935 | + esac |
| 30936 | + |
| 30937 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 30938 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 30939 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 30940 | + dldir=$destdir/`dirname \$dlpath`~ |
| 30941 | + test -d \$dldir || mkdir -p \$dldir~ |
| 30942 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 30943 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 30944 | + dlpath=$dir/\$dldll~ |
| 30945 | + $RM \$dlpath' |
| 30946 | + shlibpath_overrides_runpath=yes |
| 30947 | + dynamic_linker='Win32 link.exe' |
| 30948 | ;; |
| 30949 | |
| 30950 | *) |
| 30951 | + # Assume MSVC wrapper |
| 30952 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 30953 | + dynamic_linker='Win32 ld.exe' |
| 30954 | ;; |
| 30955 | esac |
| 30956 | - dynamic_linker='Win32 ld.exe' |
| 30957 | # FIXME: first we should search . and the directory the executable is in |
| 30958 | shlibpath_var=PATH |
| 30959 | ;; |
| 30960 | @@ -10723,7 +11361,7 @@ else |
| 30961 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 30962 | lt_status=$lt_dlunknown |
| 30963 | cat > conftest.$ac_ext <<_LT_EOF |
| 30964 | -#line 10726 "configure" |
| 30965 | +#line $LINENO "configure" |
| 30966 | #include "confdefs.h" |
| 30967 | |
| 30968 | #if HAVE_DLFCN_H |
| 30969 | @@ -10767,10 +11405,10 @@ else |
| 30970 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 30971 | correspondingly for the symbols needed. */ |
| 30972 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 30973 | -void fnord () __attribute__((visibility("default"))); |
| 30974 | +int fnord () __attribute__((visibility("default"))); |
| 30975 | #endif |
| 30976 | |
| 30977 | -void fnord () { int i=42; } |
| 30978 | +int fnord () { return 42; } |
| 30979 | int main () |
| 30980 | { |
| 30981 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 30982 | @@ -10829,7 +11467,7 @@ else |
| 30983 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 30984 | lt_status=$lt_dlunknown |
| 30985 | cat > conftest.$ac_ext <<_LT_EOF |
| 30986 | -#line 10832 "configure" |
| 30987 | +#line $LINENO "configure" |
| 30988 | #include "confdefs.h" |
| 30989 | |
| 30990 | #if HAVE_DLFCN_H |
| 30991 | @@ -10873,10 +11511,10 @@ else |
| 30992 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 30993 | correspondingly for the symbols needed. */ |
| 30994 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 30995 | -void fnord () __attribute__((visibility("default"))); |
| 30996 | +int fnord () __attribute__((visibility("default"))); |
| 30997 | #endif |
| 30998 | |
| 30999 | -void fnord () { int i=42; } |
| 31000 | +int fnord () { return 42; } |
| 31001 | int main () |
| 31002 | { |
| 31003 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 31004 | @@ -12308,7 +12946,7 @@ CC="$CC" |
| 31005 | CXX="$CXX" |
| 31006 | GFORTRAN="$GFORTRAN" |
| 31007 | GDC="$GDC" |
| 31008 | -AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" |
| 31009 | +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" |
| 31010 | |
| 31011 | |
| 31012 | # The HP-UX ksh and POSIX shell print the target directory to stdout |
| 31013 | @@ -12346,13 +12984,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 31014 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 31015 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 31016 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 31017 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 31018 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 31019 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 31020 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 31021 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 31022 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 31023 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 31024 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 31025 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 31026 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 31027 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 31028 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 31029 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 31030 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 31031 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 31032 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 31033 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 31034 | @@ -12367,14 +13012,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 31035 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 31036 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 31037 | 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"`' |
| 31038 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 31039 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 31040 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 31041 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 31042 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 31043 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 31044 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 31045 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 31046 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 31047 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 31048 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 31049 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 31050 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 31051 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 31052 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 31053 | @@ -12407,12 +13055,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 31054 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 31055 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 31056 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 31057 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 31058 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 31059 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 31060 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 31061 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 31062 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 31063 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 31064 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 31065 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 31066 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 31067 | @@ -12467,8 +13115,13 @@ reload_flag \ |
| 31068 | OBJDUMP \ |
| 31069 | deplibs_check_method \ |
| 31070 | file_magic_cmd \ |
| 31071 | +file_magic_glob \ |
| 31072 | +want_nocaseglob \ |
| 31073 | +DLLTOOL \ |
| 31074 | +sharedlib_from_linklib_cmd \ |
| 31075 | AR \ |
| 31076 | AR_FLAGS \ |
| 31077 | +archiver_list_spec \ |
| 31078 | STRIP \ |
| 31079 | RANLIB \ |
| 31080 | CC \ |
| 31081 | @@ -12478,12 +13131,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 31082 | lt_cv_sys_global_symbol_to_cdecl \ |
| 31083 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 31084 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 31085 | +nm_file_list_spec \ |
| 31086 | lt_prog_compiler_no_builtin_flag \ |
| 31087 | -lt_prog_compiler_wl \ |
| 31088 | lt_prog_compiler_pic \ |
| 31089 | +lt_prog_compiler_wl \ |
| 31090 | lt_prog_compiler_static \ |
| 31091 | lt_cv_prog_compiler_c_o \ |
| 31092 | need_locks \ |
| 31093 | +MANIFEST_TOOL \ |
| 31094 | DSYMUTIL \ |
| 31095 | NMEDIT \ |
| 31096 | LIPO \ |
| 31097 | @@ -12499,7 +13154,6 @@ no_undefined_flag \ |
| 31098 | hardcode_libdir_flag_spec \ |
| 31099 | hardcode_libdir_flag_spec_ld \ |
| 31100 | hardcode_libdir_separator \ |
| 31101 | -fix_srcfile_path \ |
| 31102 | exclude_expsyms \ |
| 31103 | include_expsyms \ |
| 31104 | file_list_spec \ |
| 31105 | @@ -12535,6 +13189,7 @@ module_cmds \ |
| 31106 | module_expsym_cmds \ |
| 31107 | export_symbols_cmds \ |
| 31108 | prelink_cmds \ |
| 31109 | +postlink_cmds \ |
| 31110 | postinstall_cmds \ |
| 31111 | postuninstall_cmds \ |
| 31112 | finish_cmds \ |
| 31113 | @@ -13023,35 +13678,29 @@ esac ;; |
| 31114 | # Older Autoconf quotes --file arguments for eval, but not when files |
| 31115 | # are listed without --file. Let's play safe and only enable the eval |
| 31116 | # if we detect the quoting. |
| 31117 | - # TODO: see whether this extra hack can be removed once we start |
| 31118 | - # requiring Autoconf 2.70 or later. |
| 31119 | - case $CONFIG_FILES in #( |
| 31120 | - *\'*) : |
| 31121 | - eval set x "$CONFIG_FILES" ;; #( |
| 31122 | - *) : |
| 31123 | - set x $CONFIG_FILES ;; #( |
| 31124 | - *) : |
| 31125 | - ;; |
| 31126 | -esac |
| 31127 | + case $CONFIG_FILES in |
| 31128 | + *\'*) eval set x "$CONFIG_FILES" ;; |
| 31129 | + *) set x $CONFIG_FILES ;; |
| 31130 | + esac |
| 31131 | shift |
| 31132 | - # Used to flag and report bootstrapping failures. |
| 31133 | - am_rc=0 |
| 31134 | - for am_mf |
| 31135 | + for mf |
| 31136 | do |
| 31137 | # Strip MF so we end up with the name of the file. |
| 31138 | - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` |
| 31139 | - # Check whether this is an Automake generated Makefile which includes |
| 31140 | - # dependency-tracking related rules and includes. |
| 31141 | - # Grep'ing the whole file directly is not great: AIX grep has a line |
| 31142 | + mf=`echo "$mf" | sed -e 's/:.*$//'` |
| 31143 | + # Check whether this is an Automake generated Makefile or not. |
| 31144 | + # We used to match only the files named 'Makefile.in', but |
| 31145 | + # some people rename them; so instead we look at the file content. |
| 31146 | + # Grep'ing the first line is not enough: some people post-process |
| 31147 | + # each Makefile.in and add a new line on top of each file to say so. |
| 31148 | + # Grep'ing the whole file is not good either: AIX grep has a line |
| 31149 | # limit of 2048, but all sed's we know have understand at least 4000. |
| 31150 | - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ |
| 31151 | - || continue |
| 31152 | - am_dirpart=`$as_dirname -- "$am_mf" || |
| 31153 | -$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 31154 | - X"$am_mf" : 'X\(//\)[^/]' \| \ |
| 31155 | - X"$am_mf" : 'X\(//\)$' \| \ |
| 31156 | - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || |
| 31157 | -$as_echo X"$am_mf" | |
| 31158 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
| 31159 | + dirpart=`$as_dirname -- "$mf" || |
| 31160 | +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 31161 | + X"$mf" : 'X\(//\)[^/]' \| \ |
| 31162 | + X"$mf" : 'X\(//\)$' \| \ |
| 31163 | + X"$mf" : 'X\(/\)' \| . 2>/dev/null || |
| 31164 | +$as_echo X"$mf" | |
| 31165 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 31166 | s//\1/ |
| 31167 | q |
| 31168 | @@ -13069,50 +13718,53 @@ $as_echo X"$am_mf" | |
| 31169 | q |
| 31170 | } |
| 31171 | s/.*/./; q'` |
| 31172 | - am_filepart=`$as_basename -- "$am_mf" || |
| 31173 | -$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ |
| 31174 | - X"$am_mf" : 'X\(//\)$' \| \ |
| 31175 | - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || |
| 31176 | -$as_echo X/"$am_mf" | |
| 31177 | - sed '/^.*\/\([^/][^/]*\)\/*$/{ |
| 31178 | + else |
| 31179 | + continue |
| 31180 | + fi |
| 31181 | + # Extract the definition of DEPDIR, am__include, and am__quote |
| 31182 | + # from the Makefile without running 'make'. |
| 31183 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
| 31184 | + test -z "$DEPDIR" && continue |
| 31185 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` |
| 31186 | + test -z "$am__include" && continue |
| 31187 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
| 31188 | + # Find all dependency output files, they are included files with |
| 31189 | + # $(DEPDIR) in their names. We invoke sed twice because it is the |
| 31190 | + # simplest approach to changing $(DEPDIR) to its actual value in the |
| 31191 | + # expansion. |
| 31192 | + for file in `sed -n " |
| 31193 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
| 31194 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
| 31195 | + # Make sure the directory exists. |
| 31196 | + test -f "$dirpart/$file" && continue |
| 31197 | + fdir=`$as_dirname -- "$file" || |
| 31198 | +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 31199 | + X"$file" : 'X\(//\)[^/]' \| \ |
| 31200 | + X"$file" : 'X\(//\)$' \| \ |
| 31201 | + X"$file" : 'X\(/\)' \| . 2>/dev/null || |
| 31202 | +$as_echo X"$file" | |
| 31203 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 31204 | s//\1/ |
| 31205 | q |
| 31206 | } |
| 31207 | - /^X\/\(\/\/\)$/{ |
| 31208 | + /^X\(\/\/\)[^/].*/{ |
| 31209 | s//\1/ |
| 31210 | q |
| 31211 | } |
| 31212 | - /^X\/\(\/\).*/{ |
| 31213 | + /^X\(\/\/\)$/{ |
| 31214 | + s//\1/ |
| 31215 | + q |
| 31216 | + } |
| 31217 | + /^X\(\/\).*/{ |
| 31218 | s//\1/ |
| 31219 | q |
| 31220 | } |
| 31221 | s/.*/./; q'` |
| 31222 | - { echo "$as_me:$LINENO: cd "$am_dirpart" \ |
| 31223 | - && sed -e '/# am--include-marker/d' "$am_filepart" \ |
| 31224 | - | $MAKE -f - am--depfiles" >&5 |
| 31225 | - (cd "$am_dirpart" \ |
| 31226 | - && sed -e '/# am--include-marker/d' "$am_filepart" \ |
| 31227 | - | $MAKE -f - am--depfiles) >&5 2>&5 |
| 31228 | - ac_status=$? |
| 31229 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 31230 | - (exit $ac_status); } || am_rc=$? |
| 31231 | + as_dir=$dirpart/$fdir; as_fn_mkdir_p |
| 31232 | + # echo "creating $dirpart/$file" |
| 31233 | + echo '# dummy' > "$dirpart/$file" |
| 31234 | + done |
| 31235 | done |
| 31236 | - if test $am_rc -ne 0; then |
| 31237 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 31238 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 31239 | -as_fn_error $? "Something went wrong bootstrapping makefile fragments |
| 31240 | - for automatic dependency tracking. If GNU make was not used, consider |
| 31241 | - re-running the configure script with MAKE=\"gmake\" (or whatever is |
| 31242 | - necessary). You can also try re-running configure with the |
| 31243 | - '--disable-dependency-tracking' option to at least be able to build |
| 31244 | - the package (albeit without support for automatic dependency tracking). |
| 31245 | -See \`config.log' for more details" "$LINENO" 5; } |
| 31246 | - fi |
| 31247 | - { am_dirpart=; unset am_dirpart;} |
| 31248 | - { am_filepart=; unset am_filepart;} |
| 31249 | - { am_mf=; unset am_mf;} |
| 31250 | - { am_rc=; unset am_rc;} |
| 31251 | - rm -f conftest-deps.mk |
| 31252 | } |
| 31253 | ;; |
| 31254 | "libtool":C) |
| 31255 | @@ -13136,7 +13788,8 @@ See \`config.log' for more details" "$LINENO" 5; } |
| 31256 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 31257 | # |
| 31258 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 31259 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 31260 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 31261 | +# Inc. |
| 31262 | # Written by Gordon Matzigkeit, 1996 |
| 31263 | # |
| 31264 | # This file is part of GNU Libtool. |
| 31265 | @@ -13239,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL |
| 31266 | # turn newlines into spaces. |
| 31267 | NL2SP=$lt_lt_NL2SP |
| 31268 | |
| 31269 | +# convert \$build file names to \$host format. |
| 31270 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 31271 | + |
| 31272 | +# convert \$build files to toolchain format. |
| 31273 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 31274 | + |
| 31275 | # An object symbol dumper. |
| 31276 | OBJDUMP=$lt_OBJDUMP |
| 31277 | |
| 31278 | # Method to check whether dependent libraries are shared objects. |
| 31279 | deplibs_check_method=$lt_deplibs_check_method |
| 31280 | |
| 31281 | -# Command to use when deplibs_check_method == "file_magic". |
| 31282 | +# Command to use when deplibs_check_method = "file_magic". |
| 31283 | file_magic_cmd=$lt_file_magic_cmd |
| 31284 | |
| 31285 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 31286 | +file_magic_glob=$lt_file_magic_glob |
| 31287 | + |
| 31288 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 31289 | +want_nocaseglob=$lt_want_nocaseglob |
| 31290 | + |
| 31291 | +# DLL creation program. |
| 31292 | +DLLTOOL=$lt_DLLTOOL |
| 31293 | + |
| 31294 | +# Command to associate shared and link libraries. |
| 31295 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 31296 | + |
| 31297 | # The archiver. |
| 31298 | AR=$lt_AR |
| 31299 | + |
| 31300 | +# Flags to create an archive. |
| 31301 | AR_FLAGS=$lt_AR_FLAGS |
| 31302 | |
| 31303 | +# How to feed a file listing to the archiver. |
| 31304 | +archiver_list_spec=$lt_archiver_list_spec |
| 31305 | + |
| 31306 | # A symbol stripping program. |
| 31307 | STRIP=$lt_STRIP |
| 31308 | |
| 31309 | @@ -13281,6 +13957,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 31310 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 31311 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 31312 | |
| 31313 | +# Specify filename containing input files for \$NM. |
| 31314 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 31315 | + |
| 31316 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 31317 | +lt_sysroot=$lt_sysroot |
| 31318 | + |
| 31319 | # The name of the directory that contains temporary libtool files. |
| 31320 | objdir=$objdir |
| 31321 | |
| 31322 | @@ -13290,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 31323 | # Must we lock files when doing compilation? |
| 31324 | need_locks=$lt_need_locks |
| 31325 | |
| 31326 | +# Manifest tool. |
| 31327 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 31328 | + |
| 31329 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 31330 | DSYMUTIL=$lt_DSYMUTIL |
| 31331 | |
| 31332 | @@ -13404,12 +14089,12 @@ with_gcc=$GCC |
| 31333 | # Compiler flag to turn off builtin functions. |
| 31334 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 31335 | |
| 31336 | -# How to pass a linker flag through the compiler. |
| 31337 | -wl=$lt_lt_prog_compiler_wl |
| 31338 | - |
| 31339 | # Additional compiler flags for building library objects. |
| 31340 | pic_flag=$lt_lt_prog_compiler_pic |
| 31341 | |
| 31342 | +# How to pass a linker flag through the compiler. |
| 31343 | +wl=$lt_lt_prog_compiler_wl |
| 31344 | + |
| 31345 | # Compiler flag to prevent dynamic linking. |
| 31346 | link_static_flag=$lt_lt_prog_compiler_static |
| 31347 | |
| 31348 | @@ -13496,9 +14181,6 @@ inherit_rpath=$inherit_rpath |
| 31349 | # Whether libtool must link a program against all its dependency libraries. |
| 31350 | link_all_deplibs=$link_all_deplibs |
| 31351 | |
| 31352 | -# Fix the shell variable \$srcfile for the compiler. |
| 31353 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 31354 | - |
| 31355 | # Set to "yes" if exported symbols are required. |
| 31356 | always_export_symbols=$always_export_symbols |
| 31357 | |
| 31358 | @@ -13514,6 +14196,9 @@ include_expsyms=$lt_include_expsyms |
| 31359 | # Commands necessary for linking programs (against libraries) with templates. |
| 31360 | prelink_cmds=$lt_prelink_cmds |
| 31361 | |
| 31362 | +# Commands necessary for finishing linking programs. |
| 31363 | +postlink_cmds=$lt_postlink_cmds |
| 31364 | + |
| 31365 | # Specify filename containing input files. |
| 31366 | file_list_spec=$lt_file_list_spec |
| 31367 | |
| 31368 | @@ -13546,210 +14231,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 31369 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 31370 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 31371 | # is reportedly fixed, but why not run on old versions too? |
| 31372 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 31373 | - || (rm -f "$cfgfile"; exit 1) |
| 31374 | - |
| 31375 | - case $xsi_shell in |
| 31376 | - yes) |
| 31377 | - cat << \_LT_EOF >> "$cfgfile" |
| 31378 | - |
| 31379 | -# func_dirname file append nondir_replacement |
| 31380 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 31381 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 31382 | -func_dirname () |
| 31383 | -{ |
| 31384 | - case ${1} in |
| 31385 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 31386 | - * ) func_dirname_result="${3}" ;; |
| 31387 | - esac |
| 31388 | -} |
| 31389 | - |
| 31390 | -# func_basename file |
| 31391 | -func_basename () |
| 31392 | -{ |
| 31393 | - func_basename_result="${1##*/}" |
| 31394 | -} |
| 31395 | - |
| 31396 | -# func_dirname_and_basename file append nondir_replacement |
| 31397 | -# perform func_basename and func_dirname in a single function |
| 31398 | -# call: |
| 31399 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 31400 | -# add APPEND to the result, otherwise set result |
| 31401 | -# to NONDIR_REPLACEMENT. |
| 31402 | -# value returned in "$func_dirname_result" |
| 31403 | -# basename: Compute filename of FILE. |
| 31404 | -# value retuned in "$func_basename_result" |
| 31405 | -# Implementation must be kept synchronized with func_dirname |
| 31406 | -# and func_basename. For efficiency, we do not delegate to |
| 31407 | -# those functions but instead duplicate the functionality here. |
| 31408 | -func_dirname_and_basename () |
| 31409 | -{ |
| 31410 | - case ${1} in |
| 31411 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 31412 | - * ) func_dirname_result="${3}" ;; |
| 31413 | - esac |
| 31414 | - func_basename_result="${1##*/}" |
| 31415 | -} |
| 31416 | - |
| 31417 | -# func_stripname prefix suffix name |
| 31418 | -# strip PREFIX and SUFFIX off of NAME. |
| 31419 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 31420 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 31421 | -# dot (in which case that matches only a dot). |
| 31422 | -func_stripname () |
| 31423 | -{ |
| 31424 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 31425 | - # positional parameters, so assign one to ordinary parameter first. |
| 31426 | - func_stripname_result=${3} |
| 31427 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 31428 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 31429 | -} |
| 31430 | - |
| 31431 | -# func_opt_split |
| 31432 | -func_opt_split () |
| 31433 | -{ |
| 31434 | - func_opt_split_opt=${1%%=*} |
| 31435 | - func_opt_split_arg=${1#*=} |
| 31436 | -} |
| 31437 | - |
| 31438 | -# func_lo2o object |
| 31439 | -func_lo2o () |
| 31440 | -{ |
| 31441 | - case ${1} in |
| 31442 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 31443 | - *) func_lo2o_result=${1} ;; |
| 31444 | - esac |
| 31445 | -} |
| 31446 | - |
| 31447 | -# func_xform libobj-or-source |
| 31448 | -func_xform () |
| 31449 | -{ |
| 31450 | - func_xform_result=${1%.*}.lo |
| 31451 | -} |
| 31452 | - |
| 31453 | -# func_arith arithmetic-term... |
| 31454 | -func_arith () |
| 31455 | -{ |
| 31456 | - func_arith_result=$(( $* )) |
| 31457 | -} |
| 31458 | - |
| 31459 | -# func_len string |
| 31460 | -# STRING may not start with a hyphen. |
| 31461 | -func_len () |
| 31462 | -{ |
| 31463 | - func_len_result=${#1} |
| 31464 | -} |
| 31465 | - |
| 31466 | -_LT_EOF |
| 31467 | - ;; |
| 31468 | - *) # Bourne compatible functions. |
| 31469 | - cat << \_LT_EOF >> "$cfgfile" |
| 31470 | - |
| 31471 | -# func_dirname file append nondir_replacement |
| 31472 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 31473 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 31474 | -func_dirname () |
| 31475 | -{ |
| 31476 | - # Extract subdirectory from the argument. |
| 31477 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 31478 | - if test "X$func_dirname_result" = "X${1}"; then |
| 31479 | - func_dirname_result="${3}" |
| 31480 | - else |
| 31481 | - func_dirname_result="$func_dirname_result${2}" |
| 31482 | - fi |
| 31483 | -} |
| 31484 | - |
| 31485 | -# func_basename file |
| 31486 | -func_basename () |
| 31487 | -{ |
| 31488 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 31489 | -} |
| 31490 | - |
| 31491 | - |
| 31492 | -# func_stripname prefix suffix name |
| 31493 | -# strip PREFIX and SUFFIX off of NAME. |
| 31494 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 31495 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 31496 | -# dot (in which case that matches only a dot). |
| 31497 | -# func_strip_suffix prefix name |
| 31498 | -func_stripname () |
| 31499 | -{ |
| 31500 | - case ${2} in |
| 31501 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 31502 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 31503 | - esac |
| 31504 | -} |
| 31505 | - |
| 31506 | -# sed scripts: |
| 31507 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 31508 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 31509 | - |
| 31510 | -# func_opt_split |
| 31511 | -func_opt_split () |
| 31512 | -{ |
| 31513 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 31514 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 31515 | -} |
| 31516 | - |
| 31517 | -# func_lo2o object |
| 31518 | -func_lo2o () |
| 31519 | -{ |
| 31520 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 31521 | -} |
| 31522 | - |
| 31523 | -# func_xform libobj-or-source |
| 31524 | -func_xform () |
| 31525 | -{ |
| 31526 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 31527 | -} |
| 31528 | - |
| 31529 | -# func_arith arithmetic-term... |
| 31530 | -func_arith () |
| 31531 | -{ |
| 31532 | - func_arith_result=`expr "$@"` |
| 31533 | -} |
| 31534 | - |
| 31535 | -# func_len string |
| 31536 | -# STRING may not start with a hyphen. |
| 31537 | -func_len () |
| 31538 | -{ |
| 31539 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 31540 | -} |
| 31541 | - |
| 31542 | -_LT_EOF |
| 31543 | -esac |
| 31544 | - |
| 31545 | -case $lt_shell_append in |
| 31546 | - yes) |
| 31547 | - cat << \_LT_EOF >> "$cfgfile" |
| 31548 | - |
| 31549 | -# func_append var value |
| 31550 | -# Append VALUE to the end of shell variable VAR. |
| 31551 | -func_append () |
| 31552 | -{ |
| 31553 | - eval "$1+=\$2" |
| 31554 | -} |
| 31555 | -_LT_EOF |
| 31556 | - ;; |
| 31557 | - *) |
| 31558 | - cat << \_LT_EOF >> "$cfgfile" |
| 31559 | - |
| 31560 | -# func_append var value |
| 31561 | -# Append VALUE to the end of shell variable VAR. |
| 31562 | -func_append () |
| 31563 | -{ |
| 31564 | - eval "$1=\$$1\$2" |
| 31565 | -} |
| 31566 | - |
| 31567 | -_LT_EOF |
| 31568 | - ;; |
| 31569 | - esac |
| 31570 | - |
| 31571 | - |
| 31572 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 31573 | - || (rm -f "$cfgfile"; exit 1) |
| 31574 | - |
| 31575 | - mv -f "$cfgfile" "$ofile" || |
| 31576 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 31577 | + || (rm -f "$cfgfile"; exit 1) |
| 31578 | + |
| 31579 | + if test x"$xsi_shell" = xyes; then |
| 31580 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 31581 | +func_dirname ()\ |
| 31582 | +{\ |
| 31583 | +\ case ${1} in\ |
| 31584 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 31585 | +\ * ) func_dirname_result="${3}" ;;\ |
| 31586 | +\ esac\ |
| 31587 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31588 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31589 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31590 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31591 | + |
| 31592 | + |
| 31593 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 31594 | +func_basename ()\ |
| 31595 | +{\ |
| 31596 | +\ func_basename_result="${1##*/}"\ |
| 31597 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31598 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31599 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31600 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31601 | + |
| 31602 | + |
| 31603 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 31604 | +func_dirname_and_basename ()\ |
| 31605 | +{\ |
| 31606 | +\ case ${1} in\ |
| 31607 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 31608 | +\ * ) func_dirname_result="${3}" ;;\ |
| 31609 | +\ esac\ |
| 31610 | +\ func_basename_result="${1##*/}"\ |
| 31611 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31612 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31613 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31614 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31615 | + |
| 31616 | + |
| 31617 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 31618 | +func_stripname ()\ |
| 31619 | +{\ |
| 31620 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 31621 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 31622 | +\ func_stripname_result=${3}\ |
| 31623 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 31624 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 31625 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31626 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31627 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31628 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31629 | + |
| 31630 | + |
| 31631 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 31632 | +func_split_long_opt ()\ |
| 31633 | +{\ |
| 31634 | +\ func_split_long_opt_name=${1%%=*}\ |
| 31635 | +\ func_split_long_opt_arg=${1#*=}\ |
| 31636 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31637 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31638 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31639 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31640 | + |
| 31641 | + |
| 31642 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 31643 | +func_split_short_opt ()\ |
| 31644 | +{\ |
| 31645 | +\ func_split_short_opt_arg=${1#??}\ |
| 31646 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 31647 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31648 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31649 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31650 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31651 | + |
| 31652 | + |
| 31653 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 31654 | +func_lo2o ()\ |
| 31655 | +{\ |
| 31656 | +\ case ${1} in\ |
| 31657 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 31658 | +\ *) func_lo2o_result=${1} ;;\ |
| 31659 | +\ esac\ |
| 31660 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31661 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31662 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31663 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31664 | + |
| 31665 | + |
| 31666 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 31667 | +func_xform ()\ |
| 31668 | +{\ |
| 31669 | + func_xform_result=${1%.*}.lo\ |
| 31670 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31671 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31672 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31673 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31674 | + |
| 31675 | + |
| 31676 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 31677 | +func_arith ()\ |
| 31678 | +{\ |
| 31679 | + func_arith_result=$(( $* ))\ |
| 31680 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31681 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31682 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31683 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31684 | + |
| 31685 | + |
| 31686 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 31687 | +func_len ()\ |
| 31688 | +{\ |
| 31689 | + func_len_result=${#1}\ |
| 31690 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31691 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31692 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31693 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31694 | + |
| 31695 | +fi |
| 31696 | + |
| 31697 | +if test x"$lt_shell_append" = xyes; then |
| 31698 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 31699 | +func_append ()\ |
| 31700 | +{\ |
| 31701 | + eval "${1}+=\\${2}"\ |
| 31702 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31703 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31704 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31705 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31706 | + |
| 31707 | + |
| 31708 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 31709 | +func_append_quoted ()\ |
| 31710 | +{\ |
| 31711 | +\ func_quote_for_eval "${2}"\ |
| 31712 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 31713 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 31714 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31715 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31716 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 31717 | + |
| 31718 | + |
| 31719 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 31720 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 31721 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31722 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31723 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 31724 | +else |
| 31725 | + # Save a `func_append' function call even when '+=' is not available |
| 31726 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 31727 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 31728 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 31729 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 31730 | +fi |
| 31731 | + |
| 31732 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 31733 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 31734 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 31735 | +fi |
| 31736 | + |
| 31737 | + |
| 31738 | + mv -f "$cfgfile" "$ofile" || |
| 31739 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 31740 | chmod +x "$ofile" |
| 31741 | |