1From 9a0dea4d2f1f0f2c71f519e6195ef9cfacd9fda9 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Sun, 14 Feb 2016 17:04:07 +0000 4Subject: [PATCH] Use libtool 2.4 5 6get libtool sysroot support 7 8Upstream-Status: Pending 9 10Signed-off-by: Khem Raj <raj.khem@gmail.com> 11--- 12 bfd/configure | 1333 +++++++++++++----- 13 bfd/configure.ac | 2 +- 14 binutils/configure | 1331 +++++++++++++----- 15 gas/configure | 1331 +++++++++++++----- 16 gprof/configure | 1331 +++++++++++++----- 17 ld/configure | 1704 +++++++++++++++++------ 18 libbacktrace/configure | 1534 +++++++++++++++------ 19 libctf/configure | 1330 +++++++++++++----- 20 libtool.m4 | 1093 ++++++++++----- 21 ltmain.sh | 2925 +++++++++++++++++++++++++++------------- 22 ltoptions.m4 | 2 +- 23 ltversion.m4 | 12 +- 24 lt~obsolete.m4 | 2 +- 25 opcodes/configure | 1331 +++++++++++++----- 26 zlib/configure | 1331 +++++++++++++----- 27 15 files changed, 12067 insertions(+), 4525 deletions(-) 28 29diff --git a/bfd/configure b/bfd/configure 30index b23c9eebfd7..fb25d046cd2 100755 31--- a/bfd/configure 32+++ b/bfd/configure 33@@ -707,6 +707,9 @@ OTOOL 34 LIPO 35 NMEDIT 36 DSYMUTIL 37+MANIFEST_TOOL 38+ac_ct_AR 39+DLLTOOL 40 OBJDUMP 41 LN_S 42 NM 43@@ -825,6 +828,7 @@ enable_static 44 with_pic 45 enable_fast_install 46 with_gnu_ld 47+with_libtool_sysroot 48 enable_libtool_lock 49 enable_plugins 50 enable_largefile 51@@ -1509,6 +1513,8 @@ Optional Packages: 52 --with-pic try to use only PIC/non-PIC objects [default=use 53 both] 54 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 55+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 56+ (or the compiler's sysroot if not specified). 57 --with-mmap try using mmap for BFD input files if available 58 --with-separate-debug-dir=DIR 59 Look for global separate debug info in DIR 60@@ -5029,8 +5035,8 @@ esac 61 62 63 64-macro_version='2.2.7a' 65-macro_revision='1.3134' 66+macro_version='2.4' 67+macro_revision='1.3293' 68 69 70 71@@ -5070,7 +5076,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 72 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 73 $as_echo_n "checking how to print strings... " >&6; } 74 # Test print first, because it will be a builtin if present. 75-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 76+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 77 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 78 ECHO='print -r --' 79 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 80@@ -5757,8 +5763,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 81 # Try some XSI features 82 xsi_shell=no 83 ( _lt_dummy="a/b/c" 84- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 85- = c,a/b,, \ 86+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 87+ = c,a/b,b/c, \ 88 && eval 'test $(( 1 + 1 )) -eq 2 \ 89 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 90 && xsi_shell=yes 91@@ -5807,6 +5813,80 @@ esac 92 93 94 95+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 96+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 97+if ${lt_cv_to_host_file_cmd+:} false; then : 98+ $as_echo_n "(cached) " >&6 99+else 100+ case $host in 101+ *-*-mingw* ) 102+ case $build in 103+ *-*-mingw* ) # actually msys 104+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 105+ ;; 106+ *-*-cygwin* ) 107+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 108+ ;; 109+ * ) # otherwise, assume *nix 110+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 111+ ;; 112+ esac 113+ ;; 114+ *-*-cygwin* ) 115+ case $build in 116+ *-*-mingw* ) # actually msys 117+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 118+ ;; 119+ *-*-cygwin* ) 120+ lt_cv_to_host_file_cmd=func_convert_file_noop 121+ ;; 122+ * ) # otherwise, assume *nix 123+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 124+ ;; 125+ esac 126+ ;; 127+ * ) # unhandled hosts (and "normal" native builds) 128+ lt_cv_to_host_file_cmd=func_convert_file_noop 129+ ;; 130+esac 131+ 132+fi 133+ 134+to_host_file_cmd=$lt_cv_to_host_file_cmd 135+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 136+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 137+ 138+ 139+ 140+ 141+ 142+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 143+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 144+if ${lt_cv_to_tool_file_cmd+:} false; then : 145+ $as_echo_n "(cached) " >&6 146+else 147+ #assume ordinary cross tools, or native build. 148+lt_cv_to_tool_file_cmd=func_convert_file_noop 149+case $host in 150+ *-*-mingw* ) 151+ case $build in 152+ *-*-mingw* ) # actually msys 153+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 154+ ;; 155+ esac 156+ ;; 157+esac 158+ 159+fi 160+ 161+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 162+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 163+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 164+ 165+ 166+ 167+ 168+ 169 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 170 $as_echo_n "checking for $LD option to reload object files... " >&6; } 171 if ${lt_cv_ld_reload_flag+:} false; then : 172@@ -5823,6 +5903,11 @@ case $reload_flag in 173 esac 174 reload_cmds='$LD$reload_flag -o $output$reload_objs' 175 case $host_os in 176+ cygwin* | mingw* | pw32* | cegcc*) 177+ if test "$GCC" != yes; then 178+ reload_cmds=false 179+ fi 180+ ;; 181 darwin*) 182 if test "$GCC" = yes; then 183 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 184@@ -5991,7 +6076,8 @@ mingw* | pw32*) 185 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 186 lt_cv_file_magic_cmd='func_win32_libid' 187 else 188- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 189+ # Keep this pattern in sync with the one in func_win32_libid. 190+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 191 lt_cv_file_magic_cmd='$OBJDUMP -f' 192 fi 193 ;; 194@@ -6145,6 +6231,21 @@ esac 195 fi 196 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 197 $as_echo "$lt_cv_deplibs_check_method" >&6; } 198+ 199+file_magic_glob= 200+want_nocaseglob=no 201+if test "$build" = "$host"; then 202+ case $host_os in 203+ mingw* | pw32*) 204+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 205+ want_nocaseglob=yes 206+ else 207+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 208+ fi 209+ ;; 210+ esac 211+fi 212+ 213 file_magic_cmd=$lt_cv_file_magic_cmd 214 deplibs_check_method=$lt_cv_deplibs_check_method 215 test -z "$deplibs_check_method" && deplibs_check_method=unknown 216@@ -6160,6 +6261,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 217 218 219 220+ 221+ 222+ 223+ 224+ 225+ 226+ 227+ 228+ 229+ 230+if test -n "$ac_tool_prefix"; then 231+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 232+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 233+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 234+$as_echo_n "checking for $ac_word... " >&6; } 235+if ${ac_cv_prog_DLLTOOL+:} false; then : 236+ $as_echo_n "(cached) " >&6 237+else 238+ if test -n "$DLLTOOL"; then 239+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 240+else 241+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 242+for as_dir in $PATH 243+do 244+ IFS=$as_save_IFS 245+ test -z "$as_dir" && as_dir=. 246+ for ac_exec_ext in '' $ac_executable_extensions; do 247+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 248+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 249+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 250+ break 2 251+ fi 252+done 253+ done 254+IFS=$as_save_IFS 255+ 256+fi 257+fi 258+DLLTOOL=$ac_cv_prog_DLLTOOL 259+if test -n "$DLLTOOL"; then 260+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 261+$as_echo "$DLLTOOL" >&6; } 262+else 263+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 264+$as_echo "no" >&6; } 265+fi 266+ 267+ 268+fi 269+if test -z "$ac_cv_prog_DLLTOOL"; then 270+ ac_ct_DLLTOOL=$DLLTOOL 271+ # Extract the first word of "dlltool", so it can be a program name with args. 272+set dummy dlltool; ac_word=$2 273+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 274+$as_echo_n "checking for $ac_word... " >&6; } 275+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 276+ $as_echo_n "(cached) " >&6 277+else 278+ if test -n "$ac_ct_DLLTOOL"; then 279+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 280+else 281+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 282+for as_dir in $PATH 283+do 284+ IFS=$as_save_IFS 285+ test -z "$as_dir" && as_dir=. 286+ for ac_exec_ext in '' $ac_executable_extensions; do 287+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 288+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 289+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 290+ break 2 291+ fi 292+done 293+ done 294+IFS=$as_save_IFS 295+ 296+fi 297+fi 298+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 299+if test -n "$ac_ct_DLLTOOL"; then 300+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 301+$as_echo "$ac_ct_DLLTOOL" >&6; } 302+else 303+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 304+$as_echo "no" >&6; } 305+fi 306+ 307+ if test "x$ac_ct_DLLTOOL" = x; then 308+ DLLTOOL="false" 309+ else 310+ case $cross_compiling:$ac_tool_warned in 311+yes:) 312+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 313+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 314+ac_tool_warned=yes ;; 315+esac 316+ DLLTOOL=$ac_ct_DLLTOOL 317+ fi 318+else 319+ DLLTOOL="$ac_cv_prog_DLLTOOL" 320+fi 321+ 322+test -z "$DLLTOOL" && DLLTOOL=dlltool 323+ 324+ 325+ 326+ 327+ 328+ 329+ 330+ 331+ 332+ 333+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 334+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 335+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 336+ $as_echo_n "(cached) " >&6 337+else 338+ lt_cv_sharedlib_from_linklib_cmd='unknown' 339+ 340+case $host_os in 341+cygwin* | mingw* | pw32* | cegcc*) 342+ # two different shell functions defined in ltmain.sh 343+ # decide which to use based on capabilities of $DLLTOOL 344+ case `$DLLTOOL --help 2>&1` in 345+ *--identify-strict*) 346+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 347+ ;; 348+ *) 349+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 350+ ;; 351+ esac 352+ ;; 353+*) 354+ # fallback: assume linklib IS sharedlib 355+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 356+ ;; 357+esac 358+ 359+fi 360+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 361+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 362+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 363+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 364+ 365+ 366+ 367+ 368+ 369+ 370+ 371 plugin_option= 372 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 373 for plugin in $plugin_names; do 374@@ -6174,8 +6426,10 @@ for plugin in $plugin_names; do 375 done 376 377 if test -n "$ac_tool_prefix"; then 378- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 379-set dummy ${ac_tool_prefix}ar; ac_word=$2 380+ for ac_prog in ar 381+ do 382+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 383+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 384 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 385 $as_echo_n "checking for $ac_word... " >&6; } 386 if ${ac_cv_prog_AR+:} false; then : 387@@ -6191,7 +6445,7 @@ do 388 test -z "$as_dir" && as_dir=. 389 for ac_exec_ext in '' $ac_executable_extensions; do 390 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 391- ac_cv_prog_AR="${ac_tool_prefix}ar" 392+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 393 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 394 break 2 395 fi 396@@ -6211,11 +6465,15 @@ $as_echo "no" >&6; } 397 fi 398 399 400+ test -n "$AR" && break 401+ done 402 fi 403-if test -z "$ac_cv_prog_AR"; then 404+if test -z "$AR"; then 405 ac_ct_AR=$AR 406- # Extract the first word of "ar", so it can be a program name with args. 407-set dummy ar; ac_word=$2 408+ for ac_prog in ar 409+do 410+ # Extract the first word of "$ac_prog", so it can be a program name with args. 411+set dummy $ac_prog; ac_word=$2 412 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 413 $as_echo_n "checking for $ac_word... " >&6; } 414 if ${ac_cv_prog_ac_ct_AR+:} false; then : 415@@ -6231,7 +6489,7 @@ do 416 test -z "$as_dir" && as_dir=. 417 for ac_exec_ext in '' $ac_executable_extensions; do 418 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 419- ac_cv_prog_ac_ct_AR="ar" 420+ ac_cv_prog_ac_ct_AR="$ac_prog" 421 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 422 break 2 423 fi 424@@ -6250,6 +6508,10 @@ else 425 $as_echo "no" >&6; } 426 fi 427 428+ 429+ test -n "$ac_ct_AR" && break 430+done 431+ 432 if test "x$ac_ct_AR" = x; then 433 AR="false" 434 else 435@@ -6261,25 +6523,20 @@ ac_tool_warned=yes ;; 436 esac 437 AR=$ac_ct_AR 438 fi 439-else 440- AR="$ac_cv_prog_AR" 441 fi 442 443-test -z "$AR" && AR=ar 444-if test -n "$plugin_option"; then 445- if $AR --help 2>&1 | grep -q "\--plugin"; then 446- touch conftest.c 447- $AR $plugin_option rc conftest.a conftest.c 448- if test "$?" != 0; then 449- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 450+ touch conftest.c 451+ $AR $plugin_option rc conftest.a conftest.c 452+ if test "$?" != 0; then 453+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 454 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 455- else 456- AR="$AR $plugin_option" 457- fi 458- rm -f conftest.* 459+ else 460+ AR="$AR $plugin_option" 461 fi 462-fi 463-test -z "$AR_FLAGS" && AR_FLAGS=cru 464+ rm -f conftest.* 465+: ${AR=ar} 466+: ${AR_FLAGS=cru} 467+ 468 469 470 471@@ -6290,6 +6547,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 472 473 474 475+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 476+$as_echo_n "checking for archiver @FILE support... " >&6; } 477+if ${lt_cv_ar_at_file+:} false; then : 478+ $as_echo_n "(cached) " >&6 479+else 480+ lt_cv_ar_at_file=no 481+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 482+/* end confdefs.h. */ 483+ 484+int 485+main () 486+{ 487+ 488+ ; 489+ return 0; 490+} 491+_ACEOF 492+if ac_fn_c_try_compile "$LINENO"; then : 493+ echo conftest.$ac_objext > conftest.lst 494+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 495+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 496+ (eval $lt_ar_try) 2>&5 497+ ac_status=$? 498+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 499+ test $ac_status = 0; } 500+ if test "$ac_status" -eq 0; then 501+ # Ensure the archiver fails upon bogus file names. 502+ rm -f conftest.$ac_objext libconftest.a 503+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 504+ (eval $lt_ar_try) 2>&5 505+ ac_status=$? 506+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 507+ test $ac_status = 0; } 508+ if test "$ac_status" -ne 0; then 509+ lt_cv_ar_at_file=@ 510+ fi 511+ fi 512+ rm -f conftest.* libconftest.a 513+ 514+fi 515+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 516+ 517+fi 518+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 519+$as_echo "$lt_cv_ar_at_file" >&6; } 520+ 521+if test "x$lt_cv_ar_at_file" = xno; then 522+ archiver_list_spec= 523+else 524+ archiver_list_spec=$lt_cv_ar_at_file 525+fi 526+ 527+ 528+ 529+ 530+ 531+ 532 533 if test -n "$ac_tool_prefix"; then 534 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 535@@ -6630,8 +6944,8 @@ esac 536 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 537 538 # Transform an extracted symbol line into symbol name and symbol address 539-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 540-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'" 541+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 542+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'" 543 544 # Handle CRLF in mingw tool chain 545 opt_cr= 546@@ -6667,6 +6981,7 @@ for ac_symprfx in "" "_"; do 547 else 548 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 549 fi 550+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 551 552 # Check to see that the pipe works correctly. 553 pipe_works=no 554@@ -6708,6 +7023,18 @@ _LT_EOF 555 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 556 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 557 cat <<_LT_EOF > conftest.$ac_ext 558+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 559+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 560+/* DATA imports from DLLs on WIN32 con't be const, because runtime 561+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 562+# define LT_DLSYM_CONST 563+#elif defined(__osf__) 564+/* This system does not cope well with relocations in const data. */ 565+# define LT_DLSYM_CONST 566+#else 567+# define LT_DLSYM_CONST const 568+#endif 569+ 570 #ifdef __cplusplus 571 extern "C" { 572 #endif 573@@ -6719,7 +7046,7 @@ _LT_EOF 574 cat <<_LT_EOF >> conftest.$ac_ext 575 576 /* The mapping between symbol names and symbols. */ 577-const struct { 578+LT_DLSYM_CONST struct { 579 const char *name; 580 void *address; 581 } 582@@ -6745,8 +7072,8 @@ static const void *lt_preloaded_setup() { 583 _LT_EOF 584 # Now try linking the two files. 585 mv conftest.$ac_objext conftstm.$ac_objext 586- lt_save_LIBS="$LIBS" 587- lt_save_CFLAGS="$CFLAGS" 588+ lt_globsym_save_LIBS=$LIBS 589+ lt_globsym_save_CFLAGS=$CFLAGS 590 LIBS="conftstm.$ac_objext" 591 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 592 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 593@@ -6756,8 +7083,8 @@ _LT_EOF 594 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 595 pipe_works=yes 596 fi 597- LIBS="$lt_save_LIBS" 598- CFLAGS="$lt_save_CFLAGS" 599+ LIBS=$lt_globsym_save_LIBS 600+ CFLAGS=$lt_globsym_save_CFLAGS 601 else 602 echo "cannot find nm_test_func in $nlist" >&5 603 fi 604@@ -6794,6 +7121,14 @@ else 605 $as_echo "ok" >&6; } 606 fi 607 608+# Response file support. 609+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 610+ nm_file_list_spec='@' 611+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 612+ nm_file_list_spec='@' 613+fi 614+ 615+ 616 617 618 619@@ -6812,6 +7147,47 @@ fi 620 621 622 623+ 624+ 625+ 626+ 627+ 628+ 629+ 630+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 631+$as_echo_n "checking for sysroot... " >&6; } 632+ 633+# Check whether --with-libtool-sysroot was given. 634+if test "${with_libtool_sysroot+set}" = set; then : 635+ withval=$with_libtool_sysroot; 636+else 637+ with_libtool_sysroot=no 638+fi 639+ 640+ 641+lt_sysroot= 642+case ${with_libtool_sysroot} in #( 643+ yes) 644+ if test "$GCC" = yes; then 645+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 646+ fi 647+ ;; #( 648+ /*) 649+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 650+ ;; #( 651+ no|'') 652+ ;; #( 653+ *) 654+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 655+$as_echo "${with_libtool_sysroot}" >&6; } 656+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 657+ ;; 658+esac 659+ 660+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 661+$as_echo "${lt_sysroot:-no}" >&6; } 662+ 663+ 664 665 666 667@@ -7021,6 +7397,123 @@ esac 668 669 need_locks="$enable_libtool_lock" 670 671+if test -n "$ac_tool_prefix"; then 672+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 673+set dummy ${ac_tool_prefix}mt; ac_word=$2 674+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 675+$as_echo_n "checking for $ac_word... " >&6; } 676+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 677+ $as_echo_n "(cached) " >&6 678+else 679+ if test -n "$MANIFEST_TOOL"; then 680+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 681+else 682+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 683+for as_dir in $PATH 684+do 685+ IFS=$as_save_IFS 686+ test -z "$as_dir" && as_dir=. 687+ for ac_exec_ext in '' $ac_executable_extensions; do 688+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 689+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 690+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 691+ break 2 692+ fi 693+done 694+ done 695+IFS=$as_save_IFS 696+ 697+fi 698+fi 699+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 700+if test -n "$MANIFEST_TOOL"; then 701+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 702+$as_echo "$MANIFEST_TOOL" >&6; } 703+else 704+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 705+$as_echo "no" >&6; } 706+fi 707+ 708+ 709+fi 710+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 711+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 712+ # Extract the first word of "mt", so it can be a program name with args. 713+set dummy mt; ac_word=$2 714+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 715+$as_echo_n "checking for $ac_word... " >&6; } 716+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 717+ $as_echo_n "(cached) " >&6 718+else 719+ if test -n "$ac_ct_MANIFEST_TOOL"; then 720+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 721+else 722+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 723+for as_dir in $PATH 724+do 725+ IFS=$as_save_IFS 726+ test -z "$as_dir" && as_dir=. 727+ for ac_exec_ext in '' $ac_executable_extensions; do 728+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 729+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 730+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 731+ break 2 732+ fi 733+done 734+ done 735+IFS=$as_save_IFS 736+ 737+fi 738+fi 739+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 740+if test -n "$ac_ct_MANIFEST_TOOL"; then 741+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 742+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 743+else 744+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 745+$as_echo "no" >&6; } 746+fi 747+ 748+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 749+ MANIFEST_TOOL=":" 750+ else 751+ case $cross_compiling:$ac_tool_warned in 752+yes:) 753+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 754+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 755+ac_tool_warned=yes ;; 756+esac 757+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 758+ fi 759+else 760+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 761+fi 762+ 763+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 764+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 765+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 766+if ${lt_cv_path_mainfest_tool+:} false; then : 767+ $as_echo_n "(cached) " >&6 768+else 769+ lt_cv_path_mainfest_tool=no 770+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 771+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 772+ cat conftest.err >&5 773+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 774+ lt_cv_path_mainfest_tool=yes 775+ fi 776+ rm -f conftest* 777+fi 778+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 779+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 780+if test "x$lt_cv_path_mainfest_tool" != xyes; then 781+ MANIFEST_TOOL=: 782+fi 783+ 784+ 785+ 786+ 787+ 788 789 case $host_os in 790 rhapsody* | darwin*) 791@@ -7584,6 +8077,8 @@ _LT_EOF 792 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 793 echo "$AR cru libconftest.a conftest.o" >&5 794 $AR cru libconftest.a conftest.o 2>&5 795+ echo "$RANLIB libconftest.a" >&5 796+ $RANLIB libconftest.a 2>&5 797 cat > conftest.c << _LT_EOF 798 int main() { return 0;} 799 _LT_EOF 800@@ -8135,8 +8630,6 @@ fi 801 lt_prog_compiler_pic= 802 lt_prog_compiler_static= 803 804-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 805-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 806 807 if test "$GCC" = yes; then 808 lt_prog_compiler_wl='-Wl,' 809@@ -8302,6 +8795,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 810 lt_prog_compiler_pic='--shared' 811 lt_prog_compiler_static='--static' 812 ;; 813+ nagfor*) 814+ # NAG Fortran compiler 815+ lt_prog_compiler_wl='-Wl,-Wl,,' 816+ lt_prog_compiler_pic='-PIC' 817+ lt_prog_compiler_static='-Bstatic' 818+ ;; 819 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 820 # Portland Group compilers (*not* the Pentium gcc compiler, 821 # which looks to be a dead project) 822@@ -8364,7 +8863,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 823 lt_prog_compiler_pic='-KPIC' 824 lt_prog_compiler_static='-Bstatic' 825 case $cc_basename in 826- f77* | f90* | f95*) 827+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 828 lt_prog_compiler_wl='-Qoption ld ';; 829 *) 830 lt_prog_compiler_wl='-Wl,';; 831@@ -8421,13 +8920,17 @@ case $host_os in 832 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 833 ;; 834 esac 835-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 836-$as_echo "$lt_prog_compiler_pic" >&6; } 837- 838- 839- 840- 841 842+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 843+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 844+if ${lt_cv_prog_compiler_pic+:} false; then : 845+ $as_echo_n "(cached) " >&6 846+else 847+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 848+fi 849+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 850+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 851+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 852 853 # 854 # Check to make sure the PIC flag actually works. 855@@ -8488,6 +8991,11 @@ fi 856 857 858 859+ 860+ 861+ 862+ 863+ 864 # 865 # Check to make sure the static flag actually works. 866 # 867@@ -8838,7 +9346,8 @@ _LT_EOF 868 allow_undefined_flag=unsupported 869 always_export_symbols=no 870 enable_shared_with_static_runtimes=yes 871- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 872+ 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' 873+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 874 875 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 876 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 877@@ -8937,12 +9446,12 @@ _LT_EOF 878 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 879 hardcode_libdir_flag_spec= 880 hardcode_libdir_flag_spec_ld='-rpath $libdir' 881- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 882+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 883 if test "x$supports_anon_versioning" = xyes; then 884 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 885 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 886 echo "local: *; };" >> $output_objdir/$libname.ver~ 887- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 888+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 889 fi 890 ;; 891 esac 892@@ -8956,8 +9465,8 @@ _LT_EOF 893 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 894 wlarc= 895 else 896- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 897- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 898+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 899+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 900 fi 901 ;; 902 903@@ -8975,8 +9484,8 @@ _LT_EOF 904 905 _LT_EOF 906 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 907- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 908- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 909+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 910+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 911 else 912 ld_shlibs=no 913 fi 914@@ -9022,8 +9531,8 @@ _LT_EOF 915 916 *) 917 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 918- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 919- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 920+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 921+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 922 else 923 ld_shlibs=no 924 fi 925@@ -9153,7 +9662,13 @@ _LT_EOF 926 allow_undefined_flag='-berok' 927 # Determine the default libpath from the value encoded in an 928 # empty executable. 929- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 930+ if test "${lt_cv_aix_libpath+set}" = set; then 931+ aix_libpath=$lt_cv_aix_libpath 932+else 933+ if ${lt_cv_aix_libpath_+:} false; then : 934+ $as_echo_n "(cached) " >&6 935+else 936+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 937 /* end confdefs.h. */ 938 939 int 940@@ -9166,22 +9681,29 @@ main () 941 _ACEOF 942 if ac_fn_c_try_link "$LINENO"; then : 943 944-lt_aix_libpath_sed=' 945- /Import File Strings/,/^$/ { 946- /^0/ { 947- s/^0 *\(.*\)$/\1/ 948- p 949- } 950- }' 951-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 952-# Check for a 64-bit object if we didn't find anything. 953-if test -z "$aix_libpath"; then 954- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 955-fi 956+ lt_aix_libpath_sed=' 957+ /Import File Strings/,/^$/ { 958+ /^0/ { 959+ s/^0 *\([^ ]*\) *$/\1/ 960+ p 961+ } 962+ }' 963+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 964+ # Check for a 64-bit object if we didn't find anything. 965+ if test -z "$lt_cv_aix_libpath_"; then 966+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 967+ fi 968 fi 969 rm -f core conftest.err conftest.$ac_objext \ 970 conftest$ac_exeext conftest.$ac_ext 971-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 972+ if test -z "$lt_cv_aix_libpath_"; then 973+ lt_cv_aix_libpath_="/usr/lib:/lib" 974+ fi 975+ 976+fi 977+ 978+ aix_libpath=$lt_cv_aix_libpath_ 979+fi 980 981 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 982 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" 983@@ -9193,7 +9715,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 984 else 985 # Determine the default libpath from the value encoded in an 986 # empty executable. 987- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 988+ if test "${lt_cv_aix_libpath+set}" = set; then 989+ aix_libpath=$lt_cv_aix_libpath 990+else 991+ if ${lt_cv_aix_libpath_+:} false; then : 992+ $as_echo_n "(cached) " >&6 993+else 994+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 995 /* end confdefs.h. */ 996 997 int 998@@ -9206,22 +9734,29 @@ main () 999 _ACEOF 1000 if ac_fn_c_try_link "$LINENO"; then : 1001 1002-lt_aix_libpath_sed=' 1003- /Import File Strings/,/^$/ { 1004- /^0/ { 1005- s/^0 *\(.*\)$/\1/ 1006- p 1007- } 1008- }' 1009-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1010-# Check for a 64-bit object if we didn't find anything. 1011-if test -z "$aix_libpath"; then 1012- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1013-fi 1014+ lt_aix_libpath_sed=' 1015+ /Import File Strings/,/^$/ { 1016+ /^0/ { 1017+ s/^0 *\([^ ]*\) *$/\1/ 1018+ p 1019+ } 1020+ }' 1021+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1022+ # Check for a 64-bit object if we didn't find anything. 1023+ if test -z "$lt_cv_aix_libpath_"; then 1024+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 1025+ fi 1026 fi 1027 rm -f core conftest.err conftest.$ac_objext \ 1028 conftest$ac_exeext conftest.$ac_ext 1029-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1030+ if test -z "$lt_cv_aix_libpath_"; then 1031+ lt_cv_aix_libpath_="/usr/lib:/lib" 1032+ fi 1033+ 1034+fi 1035+ 1036+ aix_libpath=$lt_cv_aix_libpath_ 1037+fi 1038 1039 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 1040 # Warning - without using the other run time loading flags, 1041@@ -9266,20 +9801,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1042 # Microsoft Visual C++. 1043 # hardcode_libdir_flag_spec is actually meaningless, as there is 1044 # no search path for DLLs. 1045- hardcode_libdir_flag_spec=' ' 1046- allow_undefined_flag=unsupported 1047- # Tell ltmain to make .lib files, not .a files. 1048- libext=lib 1049- # Tell ltmain to make .dll files, not .so files. 1050- shrext_cmds=".dll" 1051- # FIXME: Setting linknames here is a bad hack. 1052- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 1053- # The linker will automatically build a .lib file if we build a DLL. 1054- old_archive_from_new_cmds='true' 1055- # FIXME: Should let the user specify the lib program. 1056- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 1057- fix_srcfile_path='`cygpath -w "$srcfile"`' 1058- enable_shared_with_static_runtimes=yes 1059+ case $cc_basename in 1060+ cl*) 1061+ # Native MSVC 1062+ hardcode_libdir_flag_spec=' ' 1063+ allow_undefined_flag=unsupported 1064+ always_export_symbols=yes 1065+ file_list_spec='@' 1066+ # Tell ltmain to make .lib files, not .a files. 1067+ libext=lib 1068+ # Tell ltmain to make .dll files, not .so files. 1069+ shrext_cmds=".dll" 1070+ # FIXME: Setting linknames here is a bad hack. 1071+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 1072+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 1073+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 1074+ else 1075+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 1076+ fi~ 1077+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 1078+ linknames=' 1079+ # The linker will not automatically build a static lib if we build a DLL. 1080+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 1081+ enable_shared_with_static_runtimes=yes 1082+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 1083+ # Don't use ranlib 1084+ old_postinstall_cmds='chmod 644 $oldlib' 1085+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 1086+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 1087+ case $lt_outputfile in 1088+ *.exe|*.EXE) ;; 1089+ *) 1090+ lt_outputfile="$lt_outputfile.exe" 1091+ lt_tool_outputfile="$lt_tool_outputfile.exe" 1092+ ;; 1093+ esac~ 1094+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 1095+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 1096+ $RM "$lt_outputfile.manifest"; 1097+ fi' 1098+ ;; 1099+ *) 1100+ # Assume MSVC wrapper 1101+ hardcode_libdir_flag_spec=' ' 1102+ allow_undefined_flag=unsupported 1103+ # Tell ltmain to make .lib files, not .a files. 1104+ libext=lib 1105+ # Tell ltmain to make .dll files, not .so files. 1106+ shrext_cmds=".dll" 1107+ # FIXME: Setting linknames here is a bad hack. 1108+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 1109+ # The linker will automatically build a .lib file if we build a DLL. 1110+ old_archive_from_new_cmds='true' 1111+ # FIXME: Should let the user specify the lib program. 1112+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 1113+ enable_shared_with_static_runtimes=yes 1114+ ;; 1115+ esac 1116 ;; 1117 1118 darwin* | rhapsody*) 1119@@ -9340,7 +9918,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1120 1121 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 1122 freebsd* | dragonfly*) 1123- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 1124+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 1125 hardcode_libdir_flag_spec='-R$libdir' 1126 hardcode_direct=yes 1127 hardcode_shlibpath_var=no 1128@@ -9348,7 +9926,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1129 1130 hpux9*) 1131 if test "$GCC" = yes; then 1132- 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' 1133+ 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' 1134 else 1135 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' 1136 fi 1137@@ -9364,7 +9942,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1138 1139 hpux10*) 1140 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 1141- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 1142+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 1143 else 1144 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 1145 fi 1146@@ -9388,10 +9966,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 1147 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1148 ;; 1149 ia64*) 1150- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 1151+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 1152 ;; 1153 *) 1154- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 1155+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 1156 ;; 1157 esac 1158 else 1159@@ -9470,23 +10048,36 @@ fi 1160 1161 irix5* | irix6* | nonstopux*) 1162 if test "$GCC" = yes; then 1163- 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' 1164+ 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' 1165 # Try to use the -exported_symbol ld option, if it does not 1166 # work, assume that -exports_file does not work either and 1167 # implicitly export all symbols. 1168- save_LDFLAGS="$LDFLAGS" 1169- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 1170- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1171+ # This should be the same for all languages, so no per-tag cache variable. 1172+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 1173+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 1174+if ${lt_cv_irix_exported_symbol+:} false; then : 1175+ $as_echo_n "(cached) " >&6 1176+else 1177+ save_LDFLAGS="$LDFLAGS" 1178+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 1179+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1180 /* end confdefs.h. */ 1181-int foo(void) {} 1182+int foo (void) { return 0; } 1183 _ACEOF 1184 if ac_fn_c_try_link "$LINENO"; then : 1185- 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' 1186- 1187+ lt_cv_irix_exported_symbol=yes 1188+else 1189+ lt_cv_irix_exported_symbol=no 1190 fi 1191 rm -f core conftest.err conftest.$ac_objext \ 1192 conftest$ac_exeext conftest.$ac_ext 1193- LDFLAGS="$save_LDFLAGS" 1194+ LDFLAGS="$save_LDFLAGS" 1195+fi 1196+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 1197+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 1198+ if test "$lt_cv_irix_exported_symbol" = yes; then 1199+ 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' 1200+ fi 1201 else 1202 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' 1203 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' 1204@@ -9571,7 +10162,7 @@ rm -f core conftest.err conftest.$ac_objext \ 1205 osf4* | osf5*) # as osf3* with the addition of -msym flag 1206 if test "$GCC" = yes; then 1207 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 1208- 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' 1209+ 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' 1210 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 1211 else 1212 allow_undefined_flag=' -expect_unresolved \*' 1213@@ -9590,9 +10181,9 @@ rm -f core conftest.err conftest.$ac_objext \ 1214 no_undefined_flag=' -z defs' 1215 if test "$GCC" = yes; then 1216 wlarc='${wl}' 1217- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1218+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 1219 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 1220- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 1221+ $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' 1222 else 1223 case `$CC -V 2>&1` in 1224 *"Compilers 5.0"*) 1225@@ -10168,8 +10759,9 @@ cygwin* | mingw* | pw32* | cegcc*) 1226 need_version=no 1227 need_lib_prefix=no 1228 1229- case $GCC,$host_os in 1230- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 1231+ case $GCC,$cc_basename in 1232+ yes,*) 1233+ # gcc 1234 library_names_spec='$libname.dll.a' 1235 # DLL is installed to $(libdir)/../bin by postinstall_cmds 1236 postinstall_cmds='base_file=`basename \${file}`~ 1237@@ -10202,13 +10794,71 @@ cygwin* | mingw* | pw32* | cegcc*) 1238 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1239 ;; 1240 esac 1241+ dynamic_linker='Win32 ld.exe' 1242+ ;; 1243+ 1244+ *,cl*) 1245+ # Native MSVC 1246+ libname_spec='$name' 1247+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 1248+ library_names_spec='${libname}.dll.lib' 1249+ 1250+ case $build_os in 1251+ mingw*) 1252+ sys_lib_search_path_spec= 1253+ lt_save_ifs=$IFS 1254+ IFS=';' 1255+ for lt_path in $LIB 1256+ do 1257+ IFS=$lt_save_ifs 1258+ # Let DOS variable expansion print the short 8.3 style file name. 1259+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 1260+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 1261+ done 1262+ IFS=$lt_save_ifs 1263+ # Convert to MSYS style. 1264+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 1265+ ;; 1266+ cygwin*) 1267+ # Convert to unix form, then to dos form, then back to unix form 1268+ # but this time dos style (no spaces!) so that the unix form looks 1269+ # like /cygdrive/c/PROGRA~1:/cygdr... 1270+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 1271+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 1272+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 1273+ ;; 1274+ *) 1275+ sys_lib_search_path_spec="$LIB" 1276+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 1277+ # It is most probably a Windows format PATH. 1278+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 1279+ else 1280+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 1281+ fi 1282+ # FIXME: find the short name or the path components, as spaces are 1283+ # common. (e.g. "Program Files" -> "PROGRA~1") 1284+ ;; 1285+ esac 1286+ 1287+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 1288+ postinstall_cmds='base_file=`basename \${file}`~ 1289+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 1290+ dldir=$destdir/`dirname \$dlpath`~ 1291+ test -d \$dldir || mkdir -p \$dldir~ 1292+ $install_prog $dir/$dlname \$dldir/$dlname' 1293+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 1294+ dlpath=$dir/\$dldll~ 1295+ $RM \$dlpath' 1296+ shlibpath_overrides_runpath=yes 1297+ dynamic_linker='Win32 link.exe' 1298 ;; 1299 1300 *) 1301+ # Assume MSVC wrapper 1302 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 1303+ dynamic_linker='Win32 ld.exe' 1304 ;; 1305 esac 1306- dynamic_linker='Win32 ld.exe' 1307 # FIXME: first we should search . and the directory the executable is in 1308 shlibpath_var=PATH 1309 ;; 1310@@ -11086,7 +11736,7 @@ else 1311 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1312 lt_status=$lt_dlunknown 1313 cat > conftest.$ac_ext <<_LT_EOF 1314-#line 11089 "configure" 1315+#line $LINENO "configure" 1316 #include "confdefs.h" 1317 1318 #if HAVE_DLFCN_H 1319@@ -11130,10 +11780,10 @@ else 1320 /* When -fvisbility=hidden is used, assume the code has been annotated 1321 correspondingly for the symbols needed. */ 1322 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1323-void fnord () __attribute__((visibility("default"))); 1324+int fnord () __attribute__((visibility("default"))); 1325 #endif 1326 1327-void fnord () { int i=42; } 1328+int fnord () { return 42; } 1329 int main () 1330 { 1331 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1332@@ -11192,7 +11842,7 @@ else 1333 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 1334 lt_status=$lt_dlunknown 1335 cat > conftest.$ac_ext <<_LT_EOF 1336-#line 11195 "configure" 1337+#line $LINENO "configure" 1338 #include "confdefs.h" 1339 1340 #if HAVE_DLFCN_H 1341@@ -11236,10 +11886,10 @@ else 1342 /* When -fvisbility=hidden is used, assume the code has been annotated 1343 correspondingly for the symbols needed. */ 1344 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 1345-void fnord () __attribute__((visibility("default"))); 1346+int fnord () __attribute__((visibility("default"))); 1347 #endif 1348 1349-void fnord () { int i=42; } 1350+int fnord () { return 42; } 1351 int main () 1352 { 1353 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 1354@@ -13224,7 +13874,7 @@ SHARED_LDFLAGS= 1355 if test "$enable_shared" = "yes"; then 1356 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1357 if test -n "$x"; then 1358- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" 1359+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" 1360 fi 1361 fi 1362 1363@@ -15879,13 +16529,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 1364 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 1365 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 1366 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 1367+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 1368+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 1369 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 1370 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 1371 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 1372 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 1373 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 1374+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 1375+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 1376+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 1377+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 1378 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 1379 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 1380+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 1381 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 1382 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 1383 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 1384@@ -15900,14 +16557,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 1385 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 1386 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 1387 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"`' 1388+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 1389+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 1390 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 1391 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 1392 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 1393-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 1394 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 1395+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 1396 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 1397 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 1398 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 1399+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 1400 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 1401 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 1402 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 1403@@ -15940,12 +16600,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 1404 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 1405 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 1406 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 1407-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 1408 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 1409 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 1410 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 1411 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 1412 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 1413+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 1414 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 1415 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 1416 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 1417@@ -16000,8 +16660,13 @@ reload_flag \ 1418 OBJDUMP \ 1419 deplibs_check_method \ 1420 file_magic_cmd \ 1421+file_magic_glob \ 1422+want_nocaseglob \ 1423+DLLTOOL \ 1424+sharedlib_from_linklib_cmd \ 1425 AR \ 1426 AR_FLAGS \ 1427+archiver_list_spec \ 1428 STRIP \ 1429 RANLIB \ 1430 CC \ 1431@@ -16011,12 +16676,14 @@ lt_cv_sys_global_symbol_pipe \ 1432 lt_cv_sys_global_symbol_to_cdecl \ 1433 lt_cv_sys_global_symbol_to_c_name_address \ 1434 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 1435+nm_file_list_spec \ 1436 lt_prog_compiler_no_builtin_flag \ 1437-lt_prog_compiler_wl \ 1438 lt_prog_compiler_pic \ 1439+lt_prog_compiler_wl \ 1440 lt_prog_compiler_static \ 1441 lt_cv_prog_compiler_c_o \ 1442 need_locks \ 1443+MANIFEST_TOOL \ 1444 DSYMUTIL \ 1445 NMEDIT \ 1446 LIPO \ 1447@@ -16032,7 +16699,6 @@ no_undefined_flag \ 1448 hardcode_libdir_flag_spec \ 1449 hardcode_libdir_flag_spec_ld \ 1450 hardcode_libdir_separator \ 1451-fix_srcfile_path \ 1452 exclude_expsyms \ 1453 include_expsyms \ 1454 file_list_spec \ 1455@@ -16068,6 +16734,7 @@ module_cmds \ 1456 module_expsym_cmds \ 1457 export_symbols_cmds \ 1458 prelink_cmds \ 1459+postlink_cmds \ 1460 postinstall_cmds \ 1461 postuninstall_cmds \ 1462 finish_cmds \ 1463@@ -16837,7 +17504,8 @@ $as_echo X"$file" | 1464 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 1465 # 1466 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 1467-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 1468+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 1469+# Inc. 1470 # Written by Gordon Matzigkeit, 1996 1471 # 1472 # This file is part of GNU Libtool. 1473@@ -16940,19 +17608,42 @@ SP2NL=$lt_lt_SP2NL 1474 # turn newlines into spaces. 1475 NL2SP=$lt_lt_NL2SP 1476 1477+# convert \$build file names to \$host format. 1478+to_host_file_cmd=$lt_cv_to_host_file_cmd 1479+ 1480+# convert \$build files to toolchain format. 1481+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 1482+ 1483 # An object symbol dumper. 1484 OBJDUMP=$lt_OBJDUMP 1485 1486 # Method to check whether dependent libraries are shared objects. 1487 deplibs_check_method=$lt_deplibs_check_method 1488 1489-# Command to use when deplibs_check_method == "file_magic". 1490+# Command to use when deplibs_check_method = "file_magic". 1491 file_magic_cmd=$lt_file_magic_cmd 1492 1493+# How to find potential files when deplibs_check_method = "file_magic". 1494+file_magic_glob=$lt_file_magic_glob 1495+ 1496+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 1497+want_nocaseglob=$lt_want_nocaseglob 1498+ 1499+# DLL creation program. 1500+DLLTOOL=$lt_DLLTOOL 1501+ 1502+# Command to associate shared and link libraries. 1503+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 1504+ 1505 # The archiver. 1506 AR=$lt_AR 1507+ 1508+# Flags to create an archive. 1509 AR_FLAGS=$lt_AR_FLAGS 1510 1511+# How to feed a file listing to the archiver. 1512+archiver_list_spec=$lt_archiver_list_spec 1513+ 1514 # A symbol stripping program. 1515 STRIP=$lt_STRIP 1516 1517@@ -16982,6 +17673,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 1518 # Transform the output of nm in a C name address pair when lib prefix is needed. 1519 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 1520 1521+# Specify filename containing input files for \$NM. 1522+nm_file_list_spec=$lt_nm_file_list_spec 1523+ 1524+# The root where to search for dependent libraries,and in which our libraries should be installed. 1525+lt_sysroot=$lt_sysroot 1526+ 1527 # The name of the directory that contains temporary libtool files. 1528 objdir=$objdir 1529 1530@@ -16991,6 +17688,9 @@ MAGIC_CMD=$MAGIC_CMD 1531 # Must we lock files when doing compilation? 1532 need_locks=$lt_need_locks 1533 1534+# Manifest tool. 1535+MANIFEST_TOOL=$lt_MANIFEST_TOOL 1536+ 1537 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 1538 DSYMUTIL=$lt_DSYMUTIL 1539 1540@@ -17105,12 +17805,12 @@ with_gcc=$GCC 1541 # Compiler flag to turn off builtin functions. 1542 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 1543 1544-# How to pass a linker flag through the compiler. 1545-wl=$lt_lt_prog_compiler_wl 1546- 1547 # Additional compiler flags for building library objects. 1548 pic_flag=$lt_lt_prog_compiler_pic 1549 1550+# How to pass a linker flag through the compiler. 1551+wl=$lt_lt_prog_compiler_wl 1552+ 1553 # Compiler flag to prevent dynamic linking. 1554 link_static_flag=$lt_lt_prog_compiler_static 1555 1556@@ -17197,9 +17897,6 @@ inherit_rpath=$inherit_rpath 1557 # Whether libtool must link a program against all its dependency libraries. 1558 link_all_deplibs=$link_all_deplibs 1559 1560-# Fix the shell variable \$srcfile for the compiler. 1561-fix_srcfile_path=$lt_fix_srcfile_path 1562- 1563 # Set to "yes" if exported symbols are required. 1564 always_export_symbols=$always_export_symbols 1565 1566@@ -17215,6 +17912,9 @@ include_expsyms=$lt_include_expsyms 1567 # Commands necessary for linking programs (against libraries) with templates. 1568 prelink_cmds=$lt_prelink_cmds 1569 1570+# Commands necessary for finishing linking programs. 1571+postlink_cmds=$lt_postlink_cmds 1572+ 1573 # Specify filename containing input files. 1574 file_list_spec=$lt_file_list_spec 1575 1576@@ -17247,210 +17947,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 1577 # if finds mixed CR/LF and LF-only lines. Since sed operates in 1578 # text mode, it properly converts lines to CR/LF. This bash problem 1579 # is reportedly fixed, but why not run on old versions too? 1580- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 1581- || (rm -f "$cfgfile"; exit 1) 1582- 1583- case $xsi_shell in 1584- yes) 1585- cat << \_LT_EOF >> "$cfgfile" 1586- 1587-# func_dirname file append nondir_replacement 1588-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 1589-# otherwise set result to NONDIR_REPLACEMENT. 1590-func_dirname () 1591-{ 1592- case ${1} in 1593- */*) func_dirname_result="${1%/*}${2}" ;; 1594- * ) func_dirname_result="${3}" ;; 1595- esac 1596-} 1597- 1598-# func_basename file 1599-func_basename () 1600-{ 1601- func_basename_result="${1##*/}" 1602-} 1603- 1604-# func_dirname_and_basename file append nondir_replacement 1605-# perform func_basename and func_dirname in a single function 1606-# call: 1607-# dirname: Compute the dirname of FILE. If nonempty, 1608-# add APPEND to the result, otherwise set result 1609-# to NONDIR_REPLACEMENT. 1610-# value returned in "$func_dirname_result" 1611-# basename: Compute filename of FILE. 1612-# value retuned in "$func_basename_result" 1613-# Implementation must be kept synchronized with func_dirname 1614-# and func_basename. For efficiency, we do not delegate to 1615-# those functions but instead duplicate the functionality here. 1616-func_dirname_and_basename () 1617-{ 1618- case ${1} in 1619- */*) func_dirname_result="${1%/*}${2}" ;; 1620- * ) func_dirname_result="${3}" ;; 1621- esac 1622- func_basename_result="${1##*/}" 1623-} 1624- 1625-# func_stripname prefix suffix name 1626-# strip PREFIX and SUFFIX off of NAME. 1627-# PREFIX and SUFFIX must not contain globbing or regex special 1628-# characters, hashes, percent signs, but SUFFIX may contain a leading 1629-# dot (in which case that matches only a dot). 1630-func_stripname () 1631-{ 1632- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 1633- # positional parameters, so assign one to ordinary parameter first. 1634- func_stripname_result=${3} 1635- func_stripname_result=${func_stripname_result#"${1}"} 1636- func_stripname_result=${func_stripname_result%"${2}"} 1637-} 1638- 1639-# func_opt_split 1640-func_opt_split () 1641-{ 1642- func_opt_split_opt=${1%%=*} 1643- func_opt_split_arg=${1#*=} 1644-} 1645- 1646-# func_lo2o object 1647-func_lo2o () 1648-{ 1649- case ${1} in 1650- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 1651- *) func_lo2o_result=${1} ;; 1652- esac 1653-} 1654- 1655-# func_xform libobj-or-source 1656-func_xform () 1657-{ 1658- func_xform_result=${1%.*}.lo 1659-} 1660- 1661-# func_arith arithmetic-term... 1662-func_arith () 1663-{ 1664- func_arith_result=$(( $* )) 1665-} 1666- 1667-# func_len string 1668-# STRING may not start with a hyphen. 1669-func_len () 1670-{ 1671- func_len_result=${#1} 1672-} 1673- 1674-_LT_EOF 1675- ;; 1676- *) # Bourne compatible functions. 1677- cat << \_LT_EOF >> "$cfgfile" 1678- 1679-# func_dirname file append nondir_replacement 1680-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 1681-# otherwise set result to NONDIR_REPLACEMENT. 1682-func_dirname () 1683-{ 1684- # Extract subdirectory from the argument. 1685- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 1686- if test "X$func_dirname_result" = "X${1}"; then 1687- func_dirname_result="${3}" 1688- else 1689- func_dirname_result="$func_dirname_result${2}" 1690- fi 1691-} 1692- 1693-# func_basename file 1694-func_basename () 1695-{ 1696- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 1697-} 1698- 1699- 1700-# func_stripname prefix suffix name 1701-# strip PREFIX and SUFFIX off of NAME. 1702-# PREFIX and SUFFIX must not contain globbing or regex special 1703-# characters, hashes, percent signs, but SUFFIX may contain a leading 1704-# dot (in which case that matches only a dot). 1705-# func_strip_suffix prefix name 1706-func_stripname () 1707-{ 1708- case ${2} in 1709- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 1710- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 1711- esac 1712-} 1713- 1714-# sed scripts: 1715-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 1716-my_sed_long_arg='1s/^-[^=]*=//' 1717- 1718-# func_opt_split 1719-func_opt_split () 1720-{ 1721- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 1722- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 1723-} 1724- 1725-# func_lo2o object 1726-func_lo2o () 1727-{ 1728- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 1729-} 1730- 1731-# func_xform libobj-or-source 1732-func_xform () 1733-{ 1734- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 1735-} 1736- 1737-# func_arith arithmetic-term... 1738-func_arith () 1739-{ 1740- func_arith_result=`expr "$@"` 1741-} 1742- 1743-# func_len string 1744-# STRING may not start with a hyphen. 1745-func_len () 1746-{ 1747- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 1748-} 1749- 1750-_LT_EOF 1751-esac 1752- 1753-case $lt_shell_append in 1754- yes) 1755- cat << \_LT_EOF >> "$cfgfile" 1756- 1757-# func_append var value 1758-# Append VALUE to the end of shell variable VAR. 1759-func_append () 1760-{ 1761- eval "$1+=\$2" 1762-} 1763-_LT_EOF 1764- ;; 1765- *) 1766- cat << \_LT_EOF >> "$cfgfile" 1767- 1768-# func_append var value 1769-# Append VALUE to the end of shell variable VAR. 1770-func_append () 1771-{ 1772- eval "$1=\$$1\$2" 1773-} 1774- 1775-_LT_EOF 1776- ;; 1777- esac 1778- 1779- 1780- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 1781- || (rm -f "$cfgfile"; exit 1) 1782- 1783- mv -f "$cfgfile" "$ofile" || 1784+ sed '$q' "$ltmain" >> "$cfgfile" \ 1785+ || (rm -f "$cfgfile"; exit 1) 1786+ 1787+ if test x"$xsi_shell" = xyes; then 1788+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 1789+func_dirname ()\ 1790+{\ 1791+\ case ${1} in\ 1792+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 1793+\ * ) func_dirname_result="${3}" ;;\ 1794+\ esac\ 1795+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 1796+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1797+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1798+test 0 -eq $? || _lt_function_replace_fail=: 1799+ 1800+ 1801+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 1802+func_basename ()\ 1803+{\ 1804+\ func_basename_result="${1##*/}"\ 1805+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 1806+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1807+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1808+test 0 -eq $? || _lt_function_replace_fail=: 1809+ 1810+ 1811+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 1812+func_dirname_and_basename ()\ 1813+{\ 1814+\ case ${1} in\ 1815+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 1816+\ * ) func_dirname_result="${3}" ;;\ 1817+\ esac\ 1818+\ func_basename_result="${1##*/}"\ 1819+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 1820+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1821+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1822+test 0 -eq $? || _lt_function_replace_fail=: 1823+ 1824+ 1825+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 1826+func_stripname ()\ 1827+{\ 1828+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 1829+\ # positional parameters, so assign one to ordinary parameter first.\ 1830+\ func_stripname_result=${3}\ 1831+\ func_stripname_result=${func_stripname_result#"${1}"}\ 1832+\ func_stripname_result=${func_stripname_result%"${2}"}\ 1833+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 1834+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1835+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1836+test 0 -eq $? || _lt_function_replace_fail=: 1837+ 1838+ 1839+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 1840+func_split_long_opt ()\ 1841+{\ 1842+\ func_split_long_opt_name=${1%%=*}\ 1843+\ func_split_long_opt_arg=${1#*=}\ 1844+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 1845+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1846+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1847+test 0 -eq $? || _lt_function_replace_fail=: 1848+ 1849+ 1850+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 1851+func_split_short_opt ()\ 1852+{\ 1853+\ func_split_short_opt_arg=${1#??}\ 1854+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 1855+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 1856+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1857+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1858+test 0 -eq $? || _lt_function_replace_fail=: 1859+ 1860+ 1861+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 1862+func_lo2o ()\ 1863+{\ 1864+\ case ${1} in\ 1865+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 1866+\ *) func_lo2o_result=${1} ;;\ 1867+\ esac\ 1868+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 1869+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1870+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1871+test 0 -eq $? || _lt_function_replace_fail=: 1872+ 1873+ 1874+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 1875+func_xform ()\ 1876+{\ 1877+ func_xform_result=${1%.*}.lo\ 1878+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 1879+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1880+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1881+test 0 -eq $? || _lt_function_replace_fail=: 1882+ 1883+ 1884+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 1885+func_arith ()\ 1886+{\ 1887+ func_arith_result=$(( $* ))\ 1888+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 1889+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1890+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1891+test 0 -eq $? || _lt_function_replace_fail=: 1892+ 1893+ 1894+ sed -e '/^func_len ()$/,/^} # func_len /c\ 1895+func_len ()\ 1896+{\ 1897+ func_len_result=${#1}\ 1898+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 1899+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1900+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1901+test 0 -eq $? || _lt_function_replace_fail=: 1902+ 1903+fi 1904+ 1905+if test x"$lt_shell_append" = xyes; then 1906+ sed -e '/^func_append ()$/,/^} # func_append /c\ 1907+func_append ()\ 1908+{\ 1909+ eval "${1}+=\\${2}"\ 1910+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 1911+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1912+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1913+test 0 -eq $? || _lt_function_replace_fail=: 1914+ 1915+ 1916+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 1917+func_append_quoted ()\ 1918+{\ 1919+\ func_quote_for_eval "${2}"\ 1920+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 1921+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 1922+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1923+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1924+test 0 -eq $? || _lt_function_replace_fail=: 1925+ 1926+ 1927+ # Save a `func_append' function call where possible by direct use of '+=' 1928+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 1929+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1930+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1931+ test 0 -eq $? || _lt_function_replace_fail=: 1932+else 1933+ # Save a `func_append' function call even when '+=' is not available 1934+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 1935+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 1936+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 1937+ test 0 -eq $? || _lt_function_replace_fail=: 1938+fi 1939+ 1940+if test x"$_lt_function_replace_fail" = x":"; then 1941+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 1942+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 1943+fi 1944+ 1945+ 1946+ mv -f "$cfgfile" "$ofile" || 1947 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 1948 chmod +x "$ofile" 1949 1950diff --git a/bfd/configure.ac b/bfd/configure.ac 1951index a9078965c40..22b5b7ea567 100644 1952--- a/bfd/configure.ac 1953+++ b/bfd/configure.ac 1954@@ -303,7 +303,7 @@ changequote(,)dnl 1955 x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` 1956 changequote([,])dnl 1957 if test -n "$x"; then 1958- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" 1959+ SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" 1960 fi 1961 fi 1962 1963diff --git a/binutils/configure b/binutils/configure 1964index 8cde216cb1f..15f3f4eb874 100755 1965--- a/binutils/configure 1966+++ b/binutils/configure 1967@@ -696,8 +696,11 @@ OTOOL 1968 LIPO 1969 NMEDIT 1970 DSYMUTIL 1971+MANIFEST_TOOL 1972 RANLIB 1973+ac_ct_AR 1974 AR 1975+DLLTOOL 1976 OBJDUMP 1977 LN_S 1978 NM 1979@@ -814,6 +817,7 @@ enable_static 1980 with_pic 1981 enable_fast_install 1982 with_gnu_ld 1983+with_libtool_sysroot 1984 enable_libtool_lock 1985 enable_plugins 1986 enable_largefile 1987@@ -1509,6 +1513,8 @@ Optional Packages: 1988 --with-pic try to use only PIC/non-PIC objects [default=use 1989 both] 1990 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1991+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 1992+ (or the compiler's sysroot if not specified). 1993 --with-debuginfod Enable debuginfo lookups with debuginfod 1994 (auto/yes/no) 1995 --with-system-zlib use installed libz 1996@@ -4883,8 +4889,8 @@ esac 1997 1998 1999 2000-macro_version='2.2.7a' 2001-macro_revision='1.3134' 2002+macro_version='2.4' 2003+macro_revision='1.3293' 2004 2005 2006 2007@@ -4924,7 +4930,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 2008 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 2009 $as_echo_n "checking how to print strings... " >&6; } 2010 # Test print first, because it will be a builtin if present. 2011-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 2012+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 2013 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 2014 ECHO='print -r --' 2015 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 2016@@ -5611,8 +5617,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 2017 # Try some XSI features 2018 xsi_shell=no 2019 ( _lt_dummy="a/b/c" 2020- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 2021- = c,a/b,, \ 2022+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 2023+ = c,a/b,b/c, \ 2024 && eval 'test $(( 1 + 1 )) -eq 2 \ 2025 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 2026 && xsi_shell=yes 2027@@ -5661,6 +5667,80 @@ esac 2028 2029 2030 2031+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 2032+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 2033+if ${lt_cv_to_host_file_cmd+:} false; then : 2034+ $as_echo_n "(cached) " >&6 2035+else 2036+ case $host in 2037+ *-*-mingw* ) 2038+ case $build in 2039+ *-*-mingw* ) # actually msys 2040+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 2041+ ;; 2042+ *-*-cygwin* ) 2043+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 2044+ ;; 2045+ * ) # otherwise, assume *nix 2046+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 2047+ ;; 2048+ esac 2049+ ;; 2050+ *-*-cygwin* ) 2051+ case $build in 2052+ *-*-mingw* ) # actually msys 2053+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 2054+ ;; 2055+ *-*-cygwin* ) 2056+ lt_cv_to_host_file_cmd=func_convert_file_noop 2057+ ;; 2058+ * ) # otherwise, assume *nix 2059+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 2060+ ;; 2061+ esac 2062+ ;; 2063+ * ) # unhandled hosts (and "normal" native builds) 2064+ lt_cv_to_host_file_cmd=func_convert_file_noop 2065+ ;; 2066+esac 2067+ 2068+fi 2069+ 2070+to_host_file_cmd=$lt_cv_to_host_file_cmd 2071+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 2072+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 2073+ 2074+ 2075+ 2076+ 2077+ 2078+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 2079+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 2080+if ${lt_cv_to_tool_file_cmd+:} false; then : 2081+ $as_echo_n "(cached) " >&6 2082+else 2083+ #assume ordinary cross tools, or native build. 2084+lt_cv_to_tool_file_cmd=func_convert_file_noop 2085+case $host in 2086+ *-*-mingw* ) 2087+ case $build in 2088+ *-*-mingw* ) # actually msys 2089+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 2090+ ;; 2091+ esac 2092+ ;; 2093+esac 2094+ 2095+fi 2096+ 2097+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 2098+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 2099+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 2100+ 2101+ 2102+ 2103+ 2104+ 2105 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 2106 $as_echo_n "checking for $LD option to reload object files... " >&6; } 2107 if ${lt_cv_ld_reload_flag+:} false; then : 2108@@ -5677,6 +5757,11 @@ case $reload_flag in 2109 esac 2110 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2111 case $host_os in 2112+ cygwin* | mingw* | pw32* | cegcc*) 2113+ if test "$GCC" != yes; then 2114+ reload_cmds=false 2115+ fi 2116+ ;; 2117 darwin*) 2118 if test "$GCC" = yes; then 2119 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 2120@@ -5845,7 +5930,8 @@ mingw* | pw32*) 2121 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 2122 lt_cv_file_magic_cmd='func_win32_libid' 2123 else 2124- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 2125+ # Keep this pattern in sync with the one in func_win32_libid. 2126+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 2127 lt_cv_file_magic_cmd='$OBJDUMP -f' 2128 fi 2129 ;; 2130@@ -5999,6 +6085,21 @@ esac 2131 fi 2132 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 2133 $as_echo "$lt_cv_deplibs_check_method" >&6; } 2134+ 2135+file_magic_glob= 2136+want_nocaseglob=no 2137+if test "$build" = "$host"; then 2138+ case $host_os in 2139+ mingw* | pw32*) 2140+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 2141+ want_nocaseglob=yes 2142+ else 2143+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 2144+ fi 2145+ ;; 2146+ esac 2147+fi 2148+ 2149 file_magic_cmd=$lt_cv_file_magic_cmd 2150 deplibs_check_method=$lt_cv_deplibs_check_method 2151 test -z "$deplibs_check_method" && deplibs_check_method=unknown 2152@@ -6014,6 +6115,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 2153 2154 2155 2156+ 2157+ 2158+ 2159+ 2160+ 2161+ 2162+ 2163+ 2164+ 2165+ 2166+if test -n "$ac_tool_prefix"; then 2167+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 2168+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 2169+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2170+$as_echo_n "checking for $ac_word... " >&6; } 2171+if ${ac_cv_prog_DLLTOOL+:} false; then : 2172+ $as_echo_n "(cached) " >&6 2173+else 2174+ if test -n "$DLLTOOL"; then 2175+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 2176+else 2177+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2178+for as_dir in $PATH 2179+do 2180+ IFS=$as_save_IFS 2181+ test -z "$as_dir" && as_dir=. 2182+ for ac_exec_ext in '' $ac_executable_extensions; do 2183+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2184+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 2185+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2186+ break 2 2187+ fi 2188+done 2189+ done 2190+IFS=$as_save_IFS 2191+ 2192+fi 2193+fi 2194+DLLTOOL=$ac_cv_prog_DLLTOOL 2195+if test -n "$DLLTOOL"; then 2196+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 2197+$as_echo "$DLLTOOL" >&6; } 2198+else 2199+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2200+$as_echo "no" >&6; } 2201+fi 2202+ 2203+ 2204+fi 2205+if test -z "$ac_cv_prog_DLLTOOL"; then 2206+ ac_ct_DLLTOOL=$DLLTOOL 2207+ # Extract the first word of "dlltool", so it can be a program name with args. 2208+set dummy dlltool; ac_word=$2 2209+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2210+$as_echo_n "checking for $ac_word... " >&6; } 2211+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 2212+ $as_echo_n "(cached) " >&6 2213+else 2214+ if test -n "$ac_ct_DLLTOOL"; then 2215+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 2216+else 2217+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2218+for as_dir in $PATH 2219+do 2220+ IFS=$as_save_IFS 2221+ test -z "$as_dir" && as_dir=. 2222+ for ac_exec_ext in '' $ac_executable_extensions; do 2223+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2224+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 2225+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2226+ break 2 2227+ fi 2228+done 2229+ done 2230+IFS=$as_save_IFS 2231+ 2232+fi 2233+fi 2234+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 2235+if test -n "$ac_ct_DLLTOOL"; then 2236+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 2237+$as_echo "$ac_ct_DLLTOOL" >&6; } 2238+else 2239+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2240+$as_echo "no" >&6; } 2241+fi 2242+ 2243+ if test "x$ac_ct_DLLTOOL" = x; then 2244+ DLLTOOL="false" 2245+ else 2246+ case $cross_compiling:$ac_tool_warned in 2247+yes:) 2248+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2249+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2250+ac_tool_warned=yes ;; 2251+esac 2252+ DLLTOOL=$ac_ct_DLLTOOL 2253+ fi 2254+else 2255+ DLLTOOL="$ac_cv_prog_DLLTOOL" 2256+fi 2257+ 2258+test -z "$DLLTOOL" && DLLTOOL=dlltool 2259+ 2260+ 2261+ 2262+ 2263+ 2264+ 2265+ 2266+ 2267+ 2268+ 2269+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 2270+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 2271+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 2272+ $as_echo_n "(cached) " >&6 2273+else 2274+ lt_cv_sharedlib_from_linklib_cmd='unknown' 2275+ 2276+case $host_os in 2277+cygwin* | mingw* | pw32* | cegcc*) 2278+ # two different shell functions defined in ltmain.sh 2279+ # decide which to use based on capabilities of $DLLTOOL 2280+ case `$DLLTOOL --help 2>&1` in 2281+ *--identify-strict*) 2282+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 2283+ ;; 2284+ *) 2285+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 2286+ ;; 2287+ esac 2288+ ;; 2289+*) 2290+ # fallback: assume linklib IS sharedlib 2291+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 2292+ ;; 2293+esac 2294+ 2295+fi 2296+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 2297+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 2298+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 2299+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 2300+ 2301+ 2302+ 2303+ 2304+ 2305+ 2306+ 2307 plugin_option= 2308 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 2309 for plugin in $plugin_names; do 2310@@ -6028,8 +6280,10 @@ for plugin in $plugin_names; do 2311 done 2312 2313 if test -n "$ac_tool_prefix"; then 2314- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 2315-set dummy ${ac_tool_prefix}ar; ac_word=$2 2316+ for ac_prog in ar 2317+ do 2318+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 2319+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2320 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2321 $as_echo_n "checking for $ac_word... " >&6; } 2322 if ${ac_cv_prog_AR+:} false; then : 2323@@ -6045,7 +6299,7 @@ do 2324 test -z "$as_dir" && as_dir=. 2325 for ac_exec_ext in '' $ac_executable_extensions; do 2326 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2327- ac_cv_prog_AR="${ac_tool_prefix}ar" 2328+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 2329 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2330 break 2 2331 fi 2332@@ -6065,11 +6319,15 @@ $as_echo "no" >&6; } 2333 fi 2334 2335 2336+ test -n "$AR" && break 2337+ done 2338 fi 2339-if test -z "$ac_cv_prog_AR"; then 2340+if test -z "$AR"; then 2341 ac_ct_AR=$AR 2342- # Extract the first word of "ar", so it can be a program name with args. 2343-set dummy ar; ac_word=$2 2344+ for ac_prog in ar 2345+do 2346+ # Extract the first word of "$ac_prog", so it can be a program name with args. 2347+set dummy $ac_prog; ac_word=$2 2348 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2349 $as_echo_n "checking for $ac_word... " >&6; } 2350 if ${ac_cv_prog_ac_ct_AR+:} false; then : 2351@@ -6085,7 +6343,7 @@ do 2352 test -z "$as_dir" && as_dir=. 2353 for ac_exec_ext in '' $ac_executable_extensions; do 2354 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2355- ac_cv_prog_ac_ct_AR="ar" 2356+ ac_cv_prog_ac_ct_AR="$ac_prog" 2357 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2358 break 2 2359 fi 2360@@ -6104,6 +6362,10 @@ else 2361 $as_echo "no" >&6; } 2362 fi 2363 2364+ 2365+ test -n "$ac_ct_AR" && break 2366+done 2367+ 2368 if test "x$ac_ct_AR" = x; then 2369 AR="false" 2370 else 2371@@ -6115,29 +6377,81 @@ ac_tool_warned=yes ;; 2372 esac 2373 AR=$ac_ct_AR 2374 fi 2375-else 2376- AR="$ac_cv_prog_AR" 2377 fi 2378 2379-test -z "$AR" && AR=ar 2380-if test -n "$plugin_option"; then 2381- if $AR --help 2>&1 | grep -q "\--plugin"; then 2382- touch conftest.c 2383- $AR $plugin_option rc conftest.a conftest.c 2384- if test "$?" != 0; then 2385- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 2386+ touch conftest.c 2387+ $AR $plugin_option rc conftest.a conftest.c 2388+ if test "$?" != 0; then 2389+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 2390 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 2391- else 2392- AR="$AR $plugin_option" 2393- fi 2394- rm -f conftest.* 2395+ else 2396+ AR="$AR $plugin_option" 2397 fi 2398-fi 2399-test -z "$AR_FLAGS" && AR_FLAGS=cru 2400+ rm -f conftest.* 2401+: ${AR=ar} 2402+: ${AR_FLAGS=cru} 2403+ 2404+ 2405+ 2406+ 2407+ 2408+ 2409+ 2410+ 2411+ 2412+ 2413+ 2414+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 2415+$as_echo_n "checking for archiver @FILE support... " >&6; } 2416+if ${lt_cv_ar_at_file+:} false; then : 2417+ $as_echo_n "(cached) " >&6 2418+else 2419+ lt_cv_ar_at_file=no 2420+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2421+/* end confdefs.h. */ 2422+ 2423+int 2424+main () 2425+{ 2426 2427+ ; 2428+ return 0; 2429+} 2430+_ACEOF 2431+if ac_fn_c_try_compile "$LINENO"; then : 2432+ echo conftest.$ac_objext > conftest.lst 2433+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 2434+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 2435+ (eval $lt_ar_try) 2>&5 2436+ ac_status=$? 2437+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2438+ test $ac_status = 0; } 2439+ if test "$ac_status" -eq 0; then 2440+ # Ensure the archiver fails upon bogus file names. 2441+ rm -f conftest.$ac_objext libconftest.a 2442+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 2443+ (eval $lt_ar_try) 2>&5 2444+ ac_status=$? 2445+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2446+ test $ac_status = 0; } 2447+ if test "$ac_status" -ne 0; then 2448+ lt_cv_ar_at_file=@ 2449+ fi 2450+ fi 2451+ rm -f conftest.* libconftest.a 2452 2453+fi 2454+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 2455 2456+fi 2457+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 2458+$as_echo "$lt_cv_ar_at_file" >&6; } 2459 2460+if test "x$lt_cv_ar_at_file" = xno; then 2461+ archiver_list_spec= 2462+else 2463+ archiver_list_spec=$lt_cv_ar_at_file 2464+fi 2465 2466 2467 2468@@ -6484,8 +6798,8 @@ esac 2469 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 2470 2471 # Transform an extracted symbol line into symbol name and symbol address 2472-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 2473-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'" 2474+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 2475+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'" 2476 2477 # Handle CRLF in mingw tool chain 2478 opt_cr= 2479@@ -6521,6 +6835,7 @@ for ac_symprfx in "" "_"; do 2480 else 2481 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 2482 fi 2483+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 2484 2485 # Check to see that the pipe works correctly. 2486 pipe_works=no 2487@@ -6562,6 +6877,18 @@ _LT_EOF 2488 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 2489 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 2490 cat <<_LT_EOF > conftest.$ac_ext 2491+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 2492+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 2493+/* DATA imports from DLLs on WIN32 con't be const, because runtime 2494+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 2495+# define LT_DLSYM_CONST 2496+#elif defined(__osf__) 2497+/* This system does not cope well with relocations in const data. */ 2498+# define LT_DLSYM_CONST 2499+#else 2500+# define LT_DLSYM_CONST const 2501+#endif 2502+ 2503 #ifdef __cplusplus 2504 extern "C" { 2505 #endif 2506@@ -6573,7 +6900,7 @@ _LT_EOF 2507 cat <<_LT_EOF >> conftest.$ac_ext 2508 2509 /* The mapping between symbol names and symbols. */ 2510-const struct { 2511+LT_DLSYM_CONST struct { 2512 const char *name; 2513 void *address; 2514 } 2515@@ -6599,8 +6926,8 @@ static const void *lt_preloaded_setup() { 2516 _LT_EOF 2517 # Now try linking the two files. 2518 mv conftest.$ac_objext conftstm.$ac_objext 2519- lt_save_LIBS="$LIBS" 2520- lt_save_CFLAGS="$CFLAGS" 2521+ lt_globsym_save_LIBS=$LIBS 2522+ lt_globsym_save_CFLAGS=$CFLAGS 2523 LIBS="conftstm.$ac_objext" 2524 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 2525 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 2526@@ -6610,8 +6937,8 @@ _LT_EOF 2527 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 2528 pipe_works=yes 2529 fi 2530- LIBS="$lt_save_LIBS" 2531- CFLAGS="$lt_save_CFLAGS" 2532+ LIBS=$lt_globsym_save_LIBS 2533+ CFLAGS=$lt_globsym_save_CFLAGS 2534 else 2535 echo "cannot find nm_test_func in $nlist" >&5 2536 fi 2537@@ -6648,6 +6975,19 @@ else 2538 $as_echo "ok" >&6; } 2539 fi 2540 2541+# Response file support. 2542+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 2543+ nm_file_list_spec='@' 2544+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 2545+ nm_file_list_spec='@' 2546+fi 2547+ 2548+ 2549+ 2550+ 2551+ 2552+ 2553+ 2554 2555 2556 2557@@ -6664,6 +7004,42 @@ fi 2558 2559 2560 2561+ 2562+ 2563+ 2564+ 2565+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 2566+$as_echo_n "checking for sysroot... " >&6; } 2567+ 2568+# Check whether --with-libtool-sysroot was given. 2569+if test "${with_libtool_sysroot+set}" = set; then : 2570+ withval=$with_libtool_sysroot; 2571+else 2572+ with_libtool_sysroot=no 2573+fi 2574+ 2575+ 2576+lt_sysroot= 2577+case ${with_libtool_sysroot} in #( 2578+ yes) 2579+ if test "$GCC" = yes; then 2580+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 2581+ fi 2582+ ;; #( 2583+ /*) 2584+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 2585+ ;; #( 2586+ no|'') 2587+ ;; #( 2588+ *) 2589+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 2590+$as_echo "${with_libtool_sysroot}" >&6; } 2591+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 2592+ ;; 2593+esac 2594+ 2595+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 2596+$as_echo "${lt_sysroot:-no}" >&6; } 2597 2598 2599 2600@@ -6875,6 +7251,123 @@ esac 2601 2602 need_locks="$enable_libtool_lock" 2603 2604+if test -n "$ac_tool_prefix"; then 2605+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 2606+set dummy ${ac_tool_prefix}mt; ac_word=$2 2607+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2608+$as_echo_n "checking for $ac_word... " >&6; } 2609+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 2610+ $as_echo_n "(cached) " >&6 2611+else 2612+ if test -n "$MANIFEST_TOOL"; then 2613+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 2614+else 2615+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2616+for as_dir in $PATH 2617+do 2618+ IFS=$as_save_IFS 2619+ test -z "$as_dir" && as_dir=. 2620+ for ac_exec_ext in '' $ac_executable_extensions; do 2621+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2622+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 2623+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2624+ break 2 2625+ fi 2626+done 2627+ done 2628+IFS=$as_save_IFS 2629+ 2630+fi 2631+fi 2632+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 2633+if test -n "$MANIFEST_TOOL"; then 2634+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 2635+$as_echo "$MANIFEST_TOOL" >&6; } 2636+else 2637+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2638+$as_echo "no" >&6; } 2639+fi 2640+ 2641+ 2642+fi 2643+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 2644+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 2645+ # Extract the first word of "mt", so it can be a program name with args. 2646+set dummy mt; ac_word=$2 2647+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2648+$as_echo_n "checking for $ac_word... " >&6; } 2649+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 2650+ $as_echo_n "(cached) " >&6 2651+else 2652+ if test -n "$ac_ct_MANIFEST_TOOL"; then 2653+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 2654+else 2655+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2656+for as_dir in $PATH 2657+do 2658+ IFS=$as_save_IFS 2659+ test -z "$as_dir" && as_dir=. 2660+ for ac_exec_ext in '' $ac_executable_extensions; do 2661+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 2662+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 2663+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2664+ break 2 2665+ fi 2666+done 2667+ done 2668+IFS=$as_save_IFS 2669+ 2670+fi 2671+fi 2672+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 2673+if test -n "$ac_ct_MANIFEST_TOOL"; then 2674+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 2675+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 2676+else 2677+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2678+$as_echo "no" >&6; } 2679+fi 2680+ 2681+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 2682+ MANIFEST_TOOL=":" 2683+ else 2684+ case $cross_compiling:$ac_tool_warned in 2685+yes:) 2686+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2687+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2688+ac_tool_warned=yes ;; 2689+esac 2690+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 2691+ fi 2692+else 2693+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 2694+fi 2695+ 2696+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 2697+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 2698+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 2699+if ${lt_cv_path_mainfest_tool+:} false; then : 2700+ $as_echo_n "(cached) " >&6 2701+else 2702+ lt_cv_path_mainfest_tool=no 2703+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 2704+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 2705+ cat conftest.err >&5 2706+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 2707+ lt_cv_path_mainfest_tool=yes 2708+ fi 2709+ rm -f conftest* 2710+fi 2711+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 2712+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 2713+if test "x$lt_cv_path_mainfest_tool" != xyes; then 2714+ MANIFEST_TOOL=: 2715+fi 2716+ 2717+ 2718+ 2719+ 2720+ 2721 2722 case $host_os in 2723 rhapsody* | darwin*) 2724@@ -7438,6 +7931,8 @@ _LT_EOF 2725 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 2726 echo "$AR cru libconftest.a conftest.o" >&5 2727 $AR cru libconftest.a conftest.o 2>&5 2728+ echo "$RANLIB libconftest.a" >&5 2729+ $RANLIB libconftest.a 2>&5 2730 cat > conftest.c << _LT_EOF 2731 int main() { return 0;} 2732 _LT_EOF 2733@@ -8020,8 +8515,6 @@ fi 2734 lt_prog_compiler_pic= 2735 lt_prog_compiler_static= 2736 2737-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 2738-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2739 2740 if test "$GCC" = yes; then 2741 lt_prog_compiler_wl='-Wl,' 2742@@ -8187,6 +8680,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2743 lt_prog_compiler_pic='--shared' 2744 lt_prog_compiler_static='--static' 2745 ;; 2746+ nagfor*) 2747+ # NAG Fortran compiler 2748+ lt_prog_compiler_wl='-Wl,-Wl,,' 2749+ lt_prog_compiler_pic='-PIC' 2750+ lt_prog_compiler_static='-Bstatic' 2751+ ;; 2752 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 2753 # Portland Group compilers (*not* the Pentium gcc compiler, 2754 # which looks to be a dead project) 2755@@ -8249,7 +8748,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2756 lt_prog_compiler_pic='-KPIC' 2757 lt_prog_compiler_static='-Bstatic' 2758 case $cc_basename in 2759- f77* | f90* | f95*) 2760+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 2761 lt_prog_compiler_wl='-Qoption ld ';; 2762 *) 2763 lt_prog_compiler_wl='-Wl,';; 2764@@ -8306,13 +8805,17 @@ case $host_os in 2765 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 2766 ;; 2767 esac 2768-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 2769-$as_echo "$lt_prog_compiler_pic" >&6; } 2770- 2771- 2772- 2773- 2774 2775+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 2776+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 2777+if ${lt_cv_prog_compiler_pic+:} false; then : 2778+ $as_echo_n "(cached) " >&6 2779+else 2780+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 2781+fi 2782+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 2783+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 2784+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 2785 2786 # 2787 # Check to make sure the PIC flag actually works. 2788@@ -8373,6 +8876,11 @@ fi 2789 2790 2791 2792+ 2793+ 2794+ 2795+ 2796+ 2797 # 2798 # Check to make sure the static flag actually works. 2799 # 2800@@ -8723,7 +9231,8 @@ _LT_EOF 2801 allow_undefined_flag=unsupported 2802 always_export_symbols=no 2803 enable_shared_with_static_runtimes=yes 2804- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 2805+ 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' 2806+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 2807 2808 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 2809 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 2810@@ -8822,12 +9331,12 @@ _LT_EOF 2811 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 2812 hardcode_libdir_flag_spec= 2813 hardcode_libdir_flag_spec_ld='-rpath $libdir' 2814- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 2815+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 2816 if test "x$supports_anon_versioning" = xyes; then 2817 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 2818 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 2819 echo "local: *; };" >> $output_objdir/$libname.ver~ 2820- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 2821+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 2822 fi 2823 ;; 2824 esac 2825@@ -8841,8 +9350,8 @@ _LT_EOF 2826 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 2827 wlarc= 2828 else 2829- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2830- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2831+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2832+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2833 fi 2834 ;; 2835 2836@@ -8860,8 +9369,8 @@ _LT_EOF 2837 2838 _LT_EOF 2839 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2840- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2841- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2842+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2843+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2844 else 2845 ld_shlibs=no 2846 fi 2847@@ -8907,8 +9416,8 @@ _LT_EOF 2848 2849 *) 2850 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 2851- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2852- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2853+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 2854+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 2855 else 2856 ld_shlibs=no 2857 fi 2858@@ -9038,7 +9547,13 @@ _LT_EOF 2859 allow_undefined_flag='-berok' 2860 # Determine the default libpath from the value encoded in an 2861 # empty executable. 2862- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2863+ if test "${lt_cv_aix_libpath+set}" = set; then 2864+ aix_libpath=$lt_cv_aix_libpath 2865+else 2866+ if ${lt_cv_aix_libpath_+:} false; then : 2867+ $as_echo_n "(cached) " >&6 2868+else 2869+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2870 /* end confdefs.h. */ 2871 2872 int 2873@@ -9051,22 +9566,29 @@ main () 2874 _ACEOF 2875 if ac_fn_c_try_link "$LINENO"; then : 2876 2877-lt_aix_libpath_sed=' 2878- /Import File Strings/,/^$/ { 2879- /^0/ { 2880- s/^0 *\(.*\)$/\1/ 2881- p 2882- } 2883- }' 2884-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2885-# Check for a 64-bit object if we didn't find anything. 2886-if test -z "$aix_libpath"; then 2887- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2888-fi 2889+ lt_aix_libpath_sed=' 2890+ /Import File Strings/,/^$/ { 2891+ /^0/ { 2892+ s/^0 *\([^ ]*\) *$/\1/ 2893+ p 2894+ } 2895+ }' 2896+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2897+ # Check for a 64-bit object if we didn't find anything. 2898+ if test -z "$lt_cv_aix_libpath_"; then 2899+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2900+ fi 2901 fi 2902 rm -f core conftest.err conftest.$ac_objext \ 2903 conftest$ac_exeext conftest.$ac_ext 2904-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2905+ if test -z "$lt_cv_aix_libpath_"; then 2906+ lt_cv_aix_libpath_="/usr/lib:/lib" 2907+ fi 2908+ 2909+fi 2910+ 2911+ aix_libpath=$lt_cv_aix_libpath_ 2912+fi 2913 2914 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2915 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" 2916@@ -9078,7 +9600,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2917 else 2918 # Determine the default libpath from the value encoded in an 2919 # empty executable. 2920- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2921+ if test "${lt_cv_aix_libpath+set}" = set; then 2922+ aix_libpath=$lt_cv_aix_libpath 2923+else 2924+ if ${lt_cv_aix_libpath_+:} false; then : 2925+ $as_echo_n "(cached) " >&6 2926+else 2927+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2928 /* end confdefs.h. */ 2929 2930 int 2931@@ -9091,22 +9619,29 @@ main () 2932 _ACEOF 2933 if ac_fn_c_try_link "$LINENO"; then : 2934 2935-lt_aix_libpath_sed=' 2936- /Import File Strings/,/^$/ { 2937- /^0/ { 2938- s/^0 *\(.*\)$/\1/ 2939- p 2940- } 2941- }' 2942-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2943-# Check for a 64-bit object if we didn't find anything. 2944-if test -z "$aix_libpath"; then 2945- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2946-fi 2947+ lt_aix_libpath_sed=' 2948+ /Import File Strings/,/^$/ { 2949+ /^0/ { 2950+ s/^0 *\([^ ]*\) *$/\1/ 2951+ p 2952+ } 2953+ }' 2954+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2955+ # Check for a 64-bit object if we didn't find anything. 2956+ if test -z "$lt_cv_aix_libpath_"; then 2957+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 2958+ fi 2959 fi 2960 rm -f core conftest.err conftest.$ac_objext \ 2961 conftest$ac_exeext conftest.$ac_ext 2962-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2963+ if test -z "$lt_cv_aix_libpath_"; then 2964+ lt_cv_aix_libpath_="/usr/lib:/lib" 2965+ fi 2966+ 2967+fi 2968+ 2969+ aix_libpath=$lt_cv_aix_libpath_ 2970+fi 2971 2972 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 2973 # Warning - without using the other run time loading flags, 2974@@ -9151,20 +9686,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 2975 # Microsoft Visual C++. 2976 # hardcode_libdir_flag_spec is actually meaningless, as there is 2977 # no search path for DLLs. 2978- hardcode_libdir_flag_spec=' ' 2979- allow_undefined_flag=unsupported 2980- # Tell ltmain to make .lib files, not .a files. 2981- libext=lib 2982- # Tell ltmain to make .dll files, not .so files. 2983- shrext_cmds=".dll" 2984- # FIXME: Setting linknames here is a bad hack. 2985- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 2986- # The linker will automatically build a .lib file if we build a DLL. 2987- old_archive_from_new_cmds='true' 2988- # FIXME: Should let the user specify the lib program. 2989- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 2990- fix_srcfile_path='`cygpath -w "$srcfile"`' 2991- enable_shared_with_static_runtimes=yes 2992+ case $cc_basename in 2993+ cl*) 2994+ # Native MSVC 2995+ hardcode_libdir_flag_spec=' ' 2996+ allow_undefined_flag=unsupported 2997+ always_export_symbols=yes 2998+ file_list_spec='@' 2999+ # Tell ltmain to make .lib files, not .a files. 3000+ libext=lib 3001+ # Tell ltmain to make .dll files, not .so files. 3002+ shrext_cmds=".dll" 3003+ # FIXME: Setting linknames here is a bad hack. 3004+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 3005+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 3006+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 3007+ else 3008+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 3009+ fi~ 3010+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 3011+ linknames=' 3012+ # The linker will not automatically build a static lib if we build a DLL. 3013+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 3014+ enable_shared_with_static_runtimes=yes 3015+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 3016+ # Don't use ranlib 3017+ old_postinstall_cmds='chmod 644 $oldlib' 3018+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 3019+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 3020+ case $lt_outputfile in 3021+ *.exe|*.EXE) ;; 3022+ *) 3023+ lt_outputfile="$lt_outputfile.exe" 3024+ lt_tool_outputfile="$lt_tool_outputfile.exe" 3025+ ;; 3026+ esac~ 3027+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 3028+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 3029+ $RM "$lt_outputfile.manifest"; 3030+ fi' 3031+ ;; 3032+ *) 3033+ # Assume MSVC wrapper 3034+ hardcode_libdir_flag_spec=' ' 3035+ allow_undefined_flag=unsupported 3036+ # Tell ltmain to make .lib files, not .a files. 3037+ libext=lib 3038+ # Tell ltmain to make .dll files, not .so files. 3039+ shrext_cmds=".dll" 3040+ # FIXME: Setting linknames here is a bad hack. 3041+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 3042+ # The linker will automatically build a .lib file if we build a DLL. 3043+ old_archive_from_new_cmds='true' 3044+ # FIXME: Should let the user specify the lib program. 3045+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 3046+ enable_shared_with_static_runtimes=yes 3047+ ;; 3048+ esac 3049 ;; 3050 3051 darwin* | rhapsody*) 3052@@ -9225,7 +9803,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3053 3054 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 3055 freebsd* | dragonfly*) 3056- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 3057+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 3058 hardcode_libdir_flag_spec='-R$libdir' 3059 hardcode_direct=yes 3060 hardcode_shlibpath_var=no 3061@@ -9233,7 +9811,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3062 3063 hpux9*) 3064 if test "$GCC" = yes; then 3065- 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' 3066+ 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' 3067 else 3068 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' 3069 fi 3070@@ -9249,7 +9827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3071 3072 hpux10*) 3073 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 3074- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 3075+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 3076 else 3077 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 3078 fi 3079@@ -9273,10 +9851,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 3080 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3081 ;; 3082 ia64*) 3083- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 3084+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 3085 ;; 3086 *) 3087- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 3088+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 3089 ;; 3090 esac 3091 else 3092@@ -9355,23 +9933,36 @@ fi 3093 3094 irix5* | irix6* | nonstopux*) 3095 if test "$GCC" = yes; then 3096- 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' 3097+ 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' 3098 # Try to use the -exported_symbol ld option, if it does not 3099 # work, assume that -exports_file does not work either and 3100 # implicitly export all symbols. 3101- save_LDFLAGS="$LDFLAGS" 3102- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 3103- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3104+ # This should be the same for all languages, so no per-tag cache variable. 3105+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 3106+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 3107+if ${lt_cv_irix_exported_symbol+:} false; then : 3108+ $as_echo_n "(cached) " >&6 3109+else 3110+ save_LDFLAGS="$LDFLAGS" 3111+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 3112+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3113 /* end confdefs.h. */ 3114-int foo(void) {} 3115+int foo (void) { return 0; } 3116 _ACEOF 3117 if ac_fn_c_try_link "$LINENO"; then : 3118- 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' 3119- 3120+ lt_cv_irix_exported_symbol=yes 3121+else 3122+ lt_cv_irix_exported_symbol=no 3123 fi 3124 rm -f core conftest.err conftest.$ac_objext \ 3125 conftest$ac_exeext conftest.$ac_ext 3126- LDFLAGS="$save_LDFLAGS" 3127+ LDFLAGS="$save_LDFLAGS" 3128+fi 3129+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 3130+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 3131+ if test "$lt_cv_irix_exported_symbol" = yes; then 3132+ 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' 3133+ fi 3134 else 3135 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' 3136 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' 3137@@ -9456,7 +10047,7 @@ rm -f core conftest.err conftest.$ac_objext \ 3138 osf4* | osf5*) # as osf3* with the addition of -msym flag 3139 if test "$GCC" = yes; then 3140 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 3141- 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' 3142+ 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' 3143 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 3144 else 3145 allow_undefined_flag=' -expect_unresolved \*' 3146@@ -9475,9 +10066,9 @@ rm -f core conftest.err conftest.$ac_objext \ 3147 no_undefined_flag=' -z defs' 3148 if test "$GCC" = yes; then 3149 wlarc='${wl}' 3150- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3151+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 3152 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 3153- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 3154+ $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' 3155 else 3156 case `$CC -V 2>&1` in 3157 *"Compilers 5.0"*) 3158@@ -10053,8 +10644,9 @@ cygwin* | mingw* | pw32* | cegcc*) 3159 need_version=no 3160 need_lib_prefix=no 3161 3162- case $GCC,$host_os in 3163- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 3164+ case $GCC,$cc_basename in 3165+ yes,*) 3166+ # gcc 3167 library_names_spec='$libname.dll.a' 3168 # DLL is installed to $(libdir)/../bin by postinstall_cmds 3169 postinstall_cmds='base_file=`basename \${file}`~ 3170@@ -10087,13 +10679,71 @@ cygwin* | mingw* | pw32* | cegcc*) 3171 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3172 ;; 3173 esac 3174+ dynamic_linker='Win32 ld.exe' 3175+ ;; 3176+ 3177+ *,cl*) 3178+ # Native MSVC 3179+ libname_spec='$name' 3180+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 3181+ library_names_spec='${libname}.dll.lib' 3182+ 3183+ case $build_os in 3184+ mingw*) 3185+ sys_lib_search_path_spec= 3186+ lt_save_ifs=$IFS 3187+ IFS=';' 3188+ for lt_path in $LIB 3189+ do 3190+ IFS=$lt_save_ifs 3191+ # Let DOS variable expansion print the short 8.3 style file name. 3192+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 3193+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 3194+ done 3195+ IFS=$lt_save_ifs 3196+ # Convert to MSYS style. 3197+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 3198+ ;; 3199+ cygwin*) 3200+ # Convert to unix form, then to dos form, then back to unix form 3201+ # but this time dos style (no spaces!) so that the unix form looks 3202+ # like /cygdrive/c/PROGRA~1:/cygdr... 3203+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 3204+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 3205+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 3206+ ;; 3207+ *) 3208+ sys_lib_search_path_spec="$LIB" 3209+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 3210+ # It is most probably a Windows format PATH. 3211+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 3212+ else 3213+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 3214+ fi 3215+ # FIXME: find the short name or the path components, as spaces are 3216+ # common. (e.g. "Program Files" -> "PROGRA~1") 3217+ ;; 3218+ esac 3219+ 3220+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 3221+ postinstall_cmds='base_file=`basename \${file}`~ 3222+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 3223+ dldir=$destdir/`dirname \$dlpath`~ 3224+ test -d \$dldir || mkdir -p \$dldir~ 3225+ $install_prog $dir/$dlname \$dldir/$dlname' 3226+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 3227+ dlpath=$dir/\$dldll~ 3228+ $RM \$dlpath' 3229+ shlibpath_overrides_runpath=yes 3230+ dynamic_linker='Win32 link.exe' 3231 ;; 3232 3233 *) 3234+ # Assume MSVC wrapper 3235 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 3236+ dynamic_linker='Win32 ld.exe' 3237 ;; 3238 esac 3239- dynamic_linker='Win32 ld.exe' 3240 # FIXME: first we should search . and the directory the executable is in 3241 shlibpath_var=PATH 3242 ;; 3243@@ -10971,7 +11621,7 @@ else 3244 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3245 lt_status=$lt_dlunknown 3246 cat > conftest.$ac_ext <<_LT_EOF 3247-#line 10974 "configure" 3248+#line $LINENO "configure" 3249 #include "confdefs.h" 3250 3251 #if HAVE_DLFCN_H 3252@@ -11015,10 +11665,10 @@ else 3253 /* When -fvisbility=hidden is used, assume the code has been annotated 3254 correspondingly for the symbols needed. */ 3255 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3256-void fnord () __attribute__((visibility("default"))); 3257+int fnord () __attribute__((visibility("default"))); 3258 #endif 3259 3260-void fnord () { int i=42; } 3261+int fnord () { return 42; } 3262 int main () 3263 { 3264 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3265@@ -11077,7 +11727,7 @@ else 3266 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 3267 lt_status=$lt_dlunknown 3268 cat > conftest.$ac_ext <<_LT_EOF 3269-#line 11080 "configure" 3270+#line $LINENO "configure" 3271 #include "confdefs.h" 3272 3273 #if HAVE_DLFCN_H 3274@@ -11121,10 +11771,10 @@ else 3275 /* When -fvisbility=hidden is used, assume the code has been annotated 3276 correspondingly for the symbols needed. */ 3277 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 3278-void fnord () __attribute__((visibility("default"))); 3279+int fnord () __attribute__((visibility("default"))); 3280 #endif 3281 3282-void fnord () { int i=42; } 3283+int fnord () { return 42; } 3284 int main () 3285 { 3286 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 3287@@ -15505,13 +16155,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 3288 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 3289 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 3290 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 3291+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 3292+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 3293 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 3294 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 3295 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 3296 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 3297 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 3298+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 3299+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 3300+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 3301+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 3302 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 3303 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 3304+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 3305 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 3306 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 3307 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 3308@@ -15526,14 +16183,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 3309 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 3310 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 3311 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"`' 3312+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 3313+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 3314 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 3315 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 3316 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 3317-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 3318 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 3319+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 3320 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 3321 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 3322 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 3323+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 3324 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 3325 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 3326 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 3327@@ -15566,12 +16226,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 3328 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 3329 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 3330 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 3331-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 3332 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 3333 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 3334 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 3335 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 3336 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 3337+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 3338 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 3339 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 3340 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 3341@@ -15626,8 +16286,13 @@ reload_flag \ 3342 OBJDUMP \ 3343 deplibs_check_method \ 3344 file_magic_cmd \ 3345+file_magic_glob \ 3346+want_nocaseglob \ 3347+DLLTOOL \ 3348+sharedlib_from_linklib_cmd \ 3349 AR \ 3350 AR_FLAGS \ 3351+archiver_list_spec \ 3352 STRIP \ 3353 RANLIB \ 3354 CC \ 3355@@ -15637,12 +16302,14 @@ lt_cv_sys_global_symbol_pipe \ 3356 lt_cv_sys_global_symbol_to_cdecl \ 3357 lt_cv_sys_global_symbol_to_c_name_address \ 3358 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 3359+nm_file_list_spec \ 3360 lt_prog_compiler_no_builtin_flag \ 3361-lt_prog_compiler_wl \ 3362 lt_prog_compiler_pic \ 3363+lt_prog_compiler_wl \ 3364 lt_prog_compiler_static \ 3365 lt_cv_prog_compiler_c_o \ 3366 need_locks \ 3367+MANIFEST_TOOL \ 3368 DSYMUTIL \ 3369 NMEDIT \ 3370 LIPO \ 3371@@ -15658,7 +16325,6 @@ no_undefined_flag \ 3372 hardcode_libdir_flag_spec \ 3373 hardcode_libdir_flag_spec_ld \ 3374 hardcode_libdir_separator \ 3375-fix_srcfile_path \ 3376 exclude_expsyms \ 3377 include_expsyms \ 3378 file_list_spec \ 3379@@ -15694,6 +16360,7 @@ module_cmds \ 3380 module_expsym_cmds \ 3381 export_symbols_cmds \ 3382 prelink_cmds \ 3383+postlink_cmds \ 3384 postinstall_cmds \ 3385 postuninstall_cmds \ 3386 finish_cmds \ 3387@@ -16459,7 +17126,8 @@ $as_echo X"$file" | 3388 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 3389 # 3390 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 3391-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 3392+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 3393+# Inc. 3394 # Written by Gordon Matzigkeit, 1996 3395 # 3396 # This file is part of GNU Libtool. 3397@@ -16562,19 +17230,42 @@ SP2NL=$lt_lt_SP2NL 3398 # turn newlines into spaces. 3399 NL2SP=$lt_lt_NL2SP 3400 3401+# convert \$build file names to \$host format. 3402+to_host_file_cmd=$lt_cv_to_host_file_cmd 3403+ 3404+# convert \$build files to toolchain format. 3405+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 3406+ 3407 # An object symbol dumper. 3408 OBJDUMP=$lt_OBJDUMP 3409 3410 # Method to check whether dependent libraries are shared objects. 3411 deplibs_check_method=$lt_deplibs_check_method 3412 3413-# Command to use when deplibs_check_method == "file_magic". 3414+# Command to use when deplibs_check_method = "file_magic". 3415 file_magic_cmd=$lt_file_magic_cmd 3416 3417+# How to find potential files when deplibs_check_method = "file_magic". 3418+file_magic_glob=$lt_file_magic_glob 3419+ 3420+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 3421+want_nocaseglob=$lt_want_nocaseglob 3422+ 3423+# DLL creation program. 3424+DLLTOOL=$lt_DLLTOOL 3425+ 3426+# Command to associate shared and link libraries. 3427+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 3428+ 3429 # The archiver. 3430 AR=$lt_AR 3431+ 3432+# Flags to create an archive. 3433 AR_FLAGS=$lt_AR_FLAGS 3434 3435+# How to feed a file listing to the archiver. 3436+archiver_list_spec=$lt_archiver_list_spec 3437+ 3438 # A symbol stripping program. 3439 STRIP=$lt_STRIP 3440 3441@@ -16604,6 +17295,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 3442 # Transform the output of nm in a C name address pair when lib prefix is needed. 3443 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 3444 3445+# Specify filename containing input files for \$NM. 3446+nm_file_list_spec=$lt_nm_file_list_spec 3447+ 3448+# The root where to search for dependent libraries,and in which our libraries should be installed. 3449+lt_sysroot=$lt_sysroot 3450+ 3451 # The name of the directory that contains temporary libtool files. 3452 objdir=$objdir 3453 3454@@ -16613,6 +17310,9 @@ MAGIC_CMD=$MAGIC_CMD 3455 # Must we lock files when doing compilation? 3456 need_locks=$lt_need_locks 3457 3458+# Manifest tool. 3459+MANIFEST_TOOL=$lt_MANIFEST_TOOL 3460+ 3461 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 3462 DSYMUTIL=$lt_DSYMUTIL 3463 3464@@ -16727,12 +17427,12 @@ with_gcc=$GCC 3465 # Compiler flag to turn off builtin functions. 3466 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 3467 3468-# How to pass a linker flag through the compiler. 3469-wl=$lt_lt_prog_compiler_wl 3470- 3471 # Additional compiler flags for building library objects. 3472 pic_flag=$lt_lt_prog_compiler_pic 3473 3474+# How to pass a linker flag through the compiler. 3475+wl=$lt_lt_prog_compiler_wl 3476+ 3477 # Compiler flag to prevent dynamic linking. 3478 link_static_flag=$lt_lt_prog_compiler_static 3479 3480@@ -16819,9 +17519,6 @@ inherit_rpath=$inherit_rpath 3481 # Whether libtool must link a program against all its dependency libraries. 3482 link_all_deplibs=$link_all_deplibs 3483 3484-# Fix the shell variable \$srcfile for the compiler. 3485-fix_srcfile_path=$lt_fix_srcfile_path 3486- 3487 # Set to "yes" if exported symbols are required. 3488 always_export_symbols=$always_export_symbols 3489 3490@@ -16837,6 +17534,9 @@ include_expsyms=$lt_include_expsyms 3491 # Commands necessary for linking programs (against libraries) with templates. 3492 prelink_cmds=$lt_prelink_cmds 3493 3494+# Commands necessary for finishing linking programs. 3495+postlink_cmds=$lt_postlink_cmds 3496+ 3497 # Specify filename containing input files. 3498 file_list_spec=$lt_file_list_spec 3499 3500@@ -16869,210 +17569,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 3501 # if finds mixed CR/LF and LF-only lines. Since sed operates in 3502 # text mode, it properly converts lines to CR/LF. This bash problem 3503 # is reportedly fixed, but why not run on old versions too? 3504- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 3505- || (rm -f "$cfgfile"; exit 1) 3506- 3507- case $xsi_shell in 3508- yes) 3509- cat << \_LT_EOF >> "$cfgfile" 3510- 3511-# func_dirname file append nondir_replacement 3512-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 3513-# otherwise set result to NONDIR_REPLACEMENT. 3514-func_dirname () 3515-{ 3516- case ${1} in 3517- */*) func_dirname_result="${1%/*}${2}" ;; 3518- * ) func_dirname_result="${3}" ;; 3519- esac 3520-} 3521- 3522-# func_basename file 3523-func_basename () 3524-{ 3525- func_basename_result="${1##*/}" 3526-} 3527- 3528-# func_dirname_and_basename file append nondir_replacement 3529-# perform func_basename and func_dirname in a single function 3530-# call: 3531-# dirname: Compute the dirname of FILE. If nonempty, 3532-# add APPEND to the result, otherwise set result 3533-# to NONDIR_REPLACEMENT. 3534-# value returned in "$func_dirname_result" 3535-# basename: Compute filename of FILE. 3536-# value retuned in "$func_basename_result" 3537-# Implementation must be kept synchronized with func_dirname 3538-# and func_basename. For efficiency, we do not delegate to 3539-# those functions but instead duplicate the functionality here. 3540-func_dirname_and_basename () 3541-{ 3542- case ${1} in 3543- */*) func_dirname_result="${1%/*}${2}" ;; 3544- * ) func_dirname_result="${3}" ;; 3545- esac 3546- func_basename_result="${1##*/}" 3547-} 3548- 3549-# func_stripname prefix suffix name 3550-# strip PREFIX and SUFFIX off of NAME. 3551-# PREFIX and SUFFIX must not contain globbing or regex special 3552-# characters, hashes, percent signs, but SUFFIX may contain a leading 3553-# dot (in which case that matches only a dot). 3554-func_stripname () 3555-{ 3556- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 3557- # positional parameters, so assign one to ordinary parameter first. 3558- func_stripname_result=${3} 3559- func_stripname_result=${func_stripname_result#"${1}"} 3560- func_stripname_result=${func_stripname_result%"${2}"} 3561-} 3562- 3563-# func_opt_split 3564-func_opt_split () 3565-{ 3566- func_opt_split_opt=${1%%=*} 3567- func_opt_split_arg=${1#*=} 3568-} 3569- 3570-# func_lo2o object 3571-func_lo2o () 3572-{ 3573- case ${1} in 3574- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 3575- *) func_lo2o_result=${1} ;; 3576- esac 3577-} 3578- 3579-# func_xform libobj-or-source 3580-func_xform () 3581-{ 3582- func_xform_result=${1%.*}.lo 3583-} 3584- 3585-# func_arith arithmetic-term... 3586-func_arith () 3587-{ 3588- func_arith_result=$(( $* )) 3589-} 3590- 3591-# func_len string 3592-# STRING may not start with a hyphen. 3593-func_len () 3594-{ 3595- func_len_result=${#1} 3596-} 3597- 3598-_LT_EOF 3599- ;; 3600- *) # Bourne compatible functions. 3601- cat << \_LT_EOF >> "$cfgfile" 3602- 3603-# func_dirname file append nondir_replacement 3604-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 3605-# otherwise set result to NONDIR_REPLACEMENT. 3606-func_dirname () 3607-{ 3608- # Extract subdirectory from the argument. 3609- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 3610- if test "X$func_dirname_result" = "X${1}"; then 3611- func_dirname_result="${3}" 3612- else 3613- func_dirname_result="$func_dirname_result${2}" 3614- fi 3615-} 3616- 3617-# func_basename file 3618-func_basename () 3619-{ 3620- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 3621-} 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_strip_suffix prefix name 3630-func_stripname () 3631-{ 3632- case ${2} in 3633- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 3634- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 3635- esac 3636-} 3637- 3638-# sed scripts: 3639-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 3640-my_sed_long_arg='1s/^-[^=]*=//' 3641- 3642-# func_opt_split 3643-func_opt_split () 3644-{ 3645- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 3646- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 3647-} 3648- 3649-# func_lo2o object 3650-func_lo2o () 3651-{ 3652- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 3653-} 3654- 3655-# func_xform libobj-or-source 3656-func_xform () 3657-{ 3658- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 3659-} 3660- 3661-# func_arith arithmetic-term... 3662-func_arith () 3663-{ 3664- func_arith_result=`expr "$@"` 3665-} 3666- 3667-# func_len string 3668-# STRING may not start with a hyphen. 3669-func_len () 3670-{ 3671- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 3672-} 3673- 3674-_LT_EOF 3675-esac 3676- 3677-case $lt_shell_append in 3678- yes) 3679- cat << \_LT_EOF >> "$cfgfile" 3680- 3681-# func_append var value 3682-# Append VALUE to the end of shell variable VAR. 3683-func_append () 3684-{ 3685- eval "$1+=\$2" 3686-} 3687-_LT_EOF 3688- ;; 3689- *) 3690- cat << \_LT_EOF >> "$cfgfile" 3691- 3692-# func_append var value 3693-# Append VALUE to the end of shell variable VAR. 3694-func_append () 3695-{ 3696- eval "$1=\$$1\$2" 3697-} 3698- 3699-_LT_EOF 3700- ;; 3701- esac 3702- 3703- 3704- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 3705- || (rm -f "$cfgfile"; exit 1) 3706- 3707- mv -f "$cfgfile" "$ofile" || 3708+ sed '$q' "$ltmain" >> "$cfgfile" \ 3709+ || (rm -f "$cfgfile"; exit 1) 3710+ 3711+ if test x"$xsi_shell" = xyes; then 3712+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 3713+func_dirname ()\ 3714+{\ 3715+\ case ${1} in\ 3716+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 3717+\ * ) func_dirname_result="${3}" ;;\ 3718+\ esac\ 3719+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 3720+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3721+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3722+test 0 -eq $? || _lt_function_replace_fail=: 3723+ 3724+ 3725+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 3726+func_basename ()\ 3727+{\ 3728+\ func_basename_result="${1##*/}"\ 3729+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 3730+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3731+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3732+test 0 -eq $? || _lt_function_replace_fail=: 3733+ 3734+ 3735+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 3736+func_dirname_and_basename ()\ 3737+{\ 3738+\ case ${1} in\ 3739+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 3740+\ * ) func_dirname_result="${3}" ;;\ 3741+\ esac\ 3742+\ func_basename_result="${1##*/}"\ 3743+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 3744+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3745+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3746+test 0 -eq $? || _lt_function_replace_fail=: 3747+ 3748+ 3749+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 3750+func_stripname ()\ 3751+{\ 3752+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 3753+\ # positional parameters, so assign one to ordinary parameter first.\ 3754+\ func_stripname_result=${3}\ 3755+\ func_stripname_result=${func_stripname_result#"${1}"}\ 3756+\ func_stripname_result=${func_stripname_result%"${2}"}\ 3757+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 3758+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3759+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3760+test 0 -eq $? || _lt_function_replace_fail=: 3761+ 3762+ 3763+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 3764+func_split_long_opt ()\ 3765+{\ 3766+\ func_split_long_opt_name=${1%%=*}\ 3767+\ func_split_long_opt_arg=${1#*=}\ 3768+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 3769+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3770+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3771+test 0 -eq $? || _lt_function_replace_fail=: 3772+ 3773+ 3774+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 3775+func_split_short_opt ()\ 3776+{\ 3777+\ func_split_short_opt_arg=${1#??}\ 3778+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 3779+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 3780+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3781+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3782+test 0 -eq $? || _lt_function_replace_fail=: 3783+ 3784+ 3785+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 3786+func_lo2o ()\ 3787+{\ 3788+\ case ${1} in\ 3789+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 3790+\ *) func_lo2o_result=${1} ;;\ 3791+\ esac\ 3792+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 3793+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3794+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3795+test 0 -eq $? || _lt_function_replace_fail=: 3796+ 3797+ 3798+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 3799+func_xform ()\ 3800+{\ 3801+ func_xform_result=${1%.*}.lo\ 3802+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 3803+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3804+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3805+test 0 -eq $? || _lt_function_replace_fail=: 3806+ 3807+ 3808+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 3809+func_arith ()\ 3810+{\ 3811+ func_arith_result=$(( $* ))\ 3812+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 3813+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3814+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3815+test 0 -eq $? || _lt_function_replace_fail=: 3816+ 3817+ 3818+ sed -e '/^func_len ()$/,/^} # func_len /c\ 3819+func_len ()\ 3820+{\ 3821+ func_len_result=${#1}\ 3822+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 3823+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3824+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3825+test 0 -eq $? || _lt_function_replace_fail=: 3826+ 3827+fi 3828+ 3829+if test x"$lt_shell_append" = xyes; then 3830+ sed -e '/^func_append ()$/,/^} # func_append /c\ 3831+func_append ()\ 3832+{\ 3833+ eval "${1}+=\\${2}"\ 3834+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 3835+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3836+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3837+test 0 -eq $? || _lt_function_replace_fail=: 3838+ 3839+ 3840+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 3841+func_append_quoted ()\ 3842+{\ 3843+\ func_quote_for_eval "${2}"\ 3844+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 3845+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 3846+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3847+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3848+test 0 -eq $? || _lt_function_replace_fail=: 3849+ 3850+ 3851+ # Save a `func_append' function call where possible by direct use of '+=' 3852+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 3853+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3854+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3855+ test 0 -eq $? || _lt_function_replace_fail=: 3856+else 3857+ # Save a `func_append' function call even when '+=' is not available 3858+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 3859+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 3860+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 3861+ test 0 -eq $? || _lt_function_replace_fail=: 3862+fi 3863+ 3864+if test x"$_lt_function_replace_fail" = x":"; then 3865+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 3866+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 3867+fi 3868+ 3869+ 3870+ mv -f "$cfgfile" "$ofile" || 3871 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 3872 chmod +x "$ofile" 3873 3874diff --git a/gas/configure b/gas/configure 3875index dc6a6682aa4..10364bd81da 100755 3876--- a/gas/configure 3877+++ b/gas/configure 3878@@ -681,8 +681,11 @@ OTOOL 3879 LIPO 3880 NMEDIT 3881 DSYMUTIL 3882+MANIFEST_TOOL 3883 RANLIB 3884+ac_ct_AR 3885 AR 3886+DLLTOOL 3887 OBJDUMP 3888 LN_S 3889 NM 3890@@ -799,6 +802,7 @@ enable_static 3891 with_pic 3892 enable_fast_install 3893 with_gnu_ld 3894+with_libtool_sysroot 3895 enable_libtool_lock 3896 enable_plugins 3897 enable_largefile 3898@@ -1490,6 +1494,8 @@ Optional Packages: 3899 --with-pic try to use only PIC/non-PIC objects [default=use 3900 both] 3901 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 3902+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 3903+ (or the compiler's sysroot if not specified). 3904 --with-cpu=CPU default cpu variant is CPU (currently only supported 3905 on ARC) 3906 --with-system-zlib use installed libz 3907@@ -4608,8 +4614,8 @@ esac 3908 3909 3910 3911-macro_version='2.2.7a' 3912-macro_revision='1.3134' 3913+macro_version='2.4' 3914+macro_revision='1.3293' 3915 3916 3917 3918@@ -4649,7 +4655,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 3919 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 3920 $as_echo_n "checking how to print strings... " >&6; } 3921 # Test print first, because it will be a builtin if present. 3922-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 3923+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 3924 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 3925 ECHO='print -r --' 3926 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 3927@@ -5336,8 +5342,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 3928 # Try some XSI features 3929 xsi_shell=no 3930 ( _lt_dummy="a/b/c" 3931- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 3932- = c,a/b,, \ 3933+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 3934+ = c,a/b,b/c, \ 3935 && eval 'test $(( 1 + 1 )) -eq 2 \ 3936 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 3937 && xsi_shell=yes 3938@@ -5386,6 +5392,80 @@ esac 3939 3940 3941 3942+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 3943+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 3944+if ${lt_cv_to_host_file_cmd+:} false; then : 3945+ $as_echo_n "(cached) " >&6 3946+else 3947+ case $host in 3948+ *-*-mingw* ) 3949+ case $build in 3950+ *-*-mingw* ) # actually msys 3951+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 3952+ ;; 3953+ *-*-cygwin* ) 3954+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 3955+ ;; 3956+ * ) # otherwise, assume *nix 3957+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 3958+ ;; 3959+ esac 3960+ ;; 3961+ *-*-cygwin* ) 3962+ case $build in 3963+ *-*-mingw* ) # actually msys 3964+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 3965+ ;; 3966+ *-*-cygwin* ) 3967+ lt_cv_to_host_file_cmd=func_convert_file_noop 3968+ ;; 3969+ * ) # otherwise, assume *nix 3970+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 3971+ ;; 3972+ esac 3973+ ;; 3974+ * ) # unhandled hosts (and "normal" native builds) 3975+ lt_cv_to_host_file_cmd=func_convert_file_noop 3976+ ;; 3977+esac 3978+ 3979+fi 3980+ 3981+to_host_file_cmd=$lt_cv_to_host_file_cmd 3982+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 3983+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 3984+ 3985+ 3986+ 3987+ 3988+ 3989+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 3990+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 3991+if ${lt_cv_to_tool_file_cmd+:} false; then : 3992+ $as_echo_n "(cached) " >&6 3993+else 3994+ #assume ordinary cross tools, or native build. 3995+lt_cv_to_tool_file_cmd=func_convert_file_noop 3996+case $host in 3997+ *-*-mingw* ) 3998+ case $build in 3999+ *-*-mingw* ) # actually msys 4000+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 4001+ ;; 4002+ esac 4003+ ;; 4004+esac 4005+ 4006+fi 4007+ 4008+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 4009+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 4010+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 4011+ 4012+ 4013+ 4014+ 4015+ 4016 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 4017 $as_echo_n "checking for $LD option to reload object files... " >&6; } 4018 if ${lt_cv_ld_reload_flag+:} false; then : 4019@@ -5402,6 +5482,11 @@ case $reload_flag in 4020 esac 4021 reload_cmds='$LD$reload_flag -o $output$reload_objs' 4022 case $host_os in 4023+ cygwin* | mingw* | pw32* | cegcc*) 4024+ if test "$GCC" != yes; then 4025+ reload_cmds=false 4026+ fi 4027+ ;; 4028 darwin*) 4029 if test "$GCC" = yes; then 4030 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 4031@@ -5570,7 +5655,8 @@ mingw* | pw32*) 4032 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 4033 lt_cv_file_magic_cmd='func_win32_libid' 4034 else 4035- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 4036+ # Keep this pattern in sync with the one in func_win32_libid. 4037+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 4038 lt_cv_file_magic_cmd='$OBJDUMP -f' 4039 fi 4040 ;; 4041@@ -5724,6 +5810,21 @@ esac 4042 fi 4043 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 4044 $as_echo "$lt_cv_deplibs_check_method" >&6; } 4045+ 4046+file_magic_glob= 4047+want_nocaseglob=no 4048+if test "$build" = "$host"; then 4049+ case $host_os in 4050+ mingw* | pw32*) 4051+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 4052+ want_nocaseglob=yes 4053+ else 4054+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 4055+ fi 4056+ ;; 4057+ esac 4058+fi 4059+ 4060 file_magic_cmd=$lt_cv_file_magic_cmd 4061 deplibs_check_method=$lt_cv_deplibs_check_method 4062 test -z "$deplibs_check_method" && deplibs_check_method=unknown 4063@@ -5739,6 +5840,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 4064 4065 4066 4067+ 4068+ 4069+ 4070+ 4071+ 4072+ 4073+ 4074+ 4075+ 4076+ 4077+if test -n "$ac_tool_prefix"; then 4078+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 4079+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 4080+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4081+$as_echo_n "checking for $ac_word... " >&6; } 4082+if ${ac_cv_prog_DLLTOOL+:} false; then : 4083+ $as_echo_n "(cached) " >&6 4084+else 4085+ if test -n "$DLLTOOL"; then 4086+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 4087+else 4088+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 4089+for as_dir in $PATH 4090+do 4091+ IFS=$as_save_IFS 4092+ test -z "$as_dir" && as_dir=. 4093+ for ac_exec_ext in '' $ac_executable_extensions; do 4094+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4095+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 4096+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4097+ break 2 4098+ fi 4099+done 4100+ done 4101+IFS=$as_save_IFS 4102+ 4103+fi 4104+fi 4105+DLLTOOL=$ac_cv_prog_DLLTOOL 4106+if test -n "$DLLTOOL"; then 4107+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 4108+$as_echo "$DLLTOOL" >&6; } 4109+else 4110+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4111+$as_echo "no" >&6; } 4112+fi 4113+ 4114+ 4115+fi 4116+if test -z "$ac_cv_prog_DLLTOOL"; then 4117+ ac_ct_DLLTOOL=$DLLTOOL 4118+ # Extract the first word of "dlltool", so it can be a program name with args. 4119+set dummy dlltool; ac_word=$2 4120+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4121+$as_echo_n "checking for $ac_word... " >&6; } 4122+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 4123+ $as_echo_n "(cached) " >&6 4124+else 4125+ if test -n "$ac_ct_DLLTOOL"; then 4126+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 4127+else 4128+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 4129+for as_dir in $PATH 4130+do 4131+ IFS=$as_save_IFS 4132+ test -z "$as_dir" && as_dir=. 4133+ for ac_exec_ext in '' $ac_executable_extensions; do 4134+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4135+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 4136+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4137+ break 2 4138+ fi 4139+done 4140+ done 4141+IFS=$as_save_IFS 4142+ 4143+fi 4144+fi 4145+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 4146+if test -n "$ac_ct_DLLTOOL"; then 4147+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 4148+$as_echo "$ac_ct_DLLTOOL" >&6; } 4149+else 4150+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4151+$as_echo "no" >&6; } 4152+fi 4153+ 4154+ if test "x$ac_ct_DLLTOOL" = x; then 4155+ DLLTOOL="false" 4156+ else 4157+ case $cross_compiling:$ac_tool_warned in 4158+yes:) 4159+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 4160+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 4161+ac_tool_warned=yes ;; 4162+esac 4163+ DLLTOOL=$ac_ct_DLLTOOL 4164+ fi 4165+else 4166+ DLLTOOL="$ac_cv_prog_DLLTOOL" 4167+fi 4168+ 4169+test -z "$DLLTOOL" && DLLTOOL=dlltool 4170+ 4171+ 4172+ 4173+ 4174+ 4175+ 4176+ 4177+ 4178+ 4179+ 4180+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 4181+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 4182+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 4183+ $as_echo_n "(cached) " >&6 4184+else 4185+ lt_cv_sharedlib_from_linklib_cmd='unknown' 4186+ 4187+case $host_os in 4188+cygwin* | mingw* | pw32* | cegcc*) 4189+ # two different shell functions defined in ltmain.sh 4190+ # decide which to use based on capabilities of $DLLTOOL 4191+ case `$DLLTOOL --help 2>&1` in 4192+ *--identify-strict*) 4193+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 4194+ ;; 4195+ *) 4196+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 4197+ ;; 4198+ esac 4199+ ;; 4200+*) 4201+ # fallback: assume linklib IS sharedlib 4202+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 4203+ ;; 4204+esac 4205+ 4206+fi 4207+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 4208+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 4209+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 4210+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 4211+ 4212+ 4213+ 4214+ 4215+ 4216+ 4217+ 4218 plugin_option= 4219 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 4220 for plugin in $plugin_names; do 4221@@ -5753,8 +6005,10 @@ for plugin in $plugin_names; do 4222 done 4223 4224 if test -n "$ac_tool_prefix"; then 4225- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 4226-set dummy ${ac_tool_prefix}ar; ac_word=$2 4227+ for ac_prog in ar 4228+ do 4229+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 4230+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 4231 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4232 $as_echo_n "checking for $ac_word... " >&6; } 4233 if ${ac_cv_prog_AR+:} false; then : 4234@@ -5770,7 +6024,7 @@ do 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_AR="${ac_tool_prefix}ar" 4239+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 4240 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4241 break 2 4242 fi 4243@@ -5790,11 +6044,15 @@ $as_echo "no" >&6; } 4244 fi 4245 4246 4247+ test -n "$AR" && break 4248+ done 4249 fi 4250-if test -z "$ac_cv_prog_AR"; then 4251+if test -z "$AR"; then 4252 ac_ct_AR=$AR 4253- # Extract the first word of "ar", so it can be a program name with args. 4254-set dummy ar; ac_word=$2 4255+ for ac_prog in ar 4256+do 4257+ # Extract the first word of "$ac_prog", so it can be a program name with args. 4258+set dummy $ac_prog; ac_word=$2 4259 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4260 $as_echo_n "checking for $ac_word... " >&6; } 4261 if ${ac_cv_prog_ac_ct_AR+:} false; then : 4262@@ -5810,7 +6068,7 @@ do 4263 test -z "$as_dir" && as_dir=. 4264 for ac_exec_ext in '' $ac_executable_extensions; do 4265 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4266- ac_cv_prog_ac_ct_AR="ar" 4267+ ac_cv_prog_ac_ct_AR="$ac_prog" 4268 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4269 break 2 4270 fi 4271@@ -5829,6 +6087,10 @@ else 4272 $as_echo "no" >&6; } 4273 fi 4274 4275+ 4276+ test -n "$ac_ct_AR" && break 4277+done 4278+ 4279 if test "x$ac_ct_AR" = x; then 4280 AR="false" 4281 else 4282@@ -5840,29 +6102,81 @@ ac_tool_warned=yes ;; 4283 esac 4284 AR=$ac_ct_AR 4285 fi 4286-else 4287- AR="$ac_cv_prog_AR" 4288 fi 4289 4290-test -z "$AR" && AR=ar 4291-if test -n "$plugin_option"; then 4292- if $AR --help 2>&1 | grep -q "\--plugin"; then 4293- touch conftest.c 4294- $AR $plugin_option rc conftest.a conftest.c 4295- if test "$?" != 0; then 4296- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 4297+ touch conftest.c 4298+ $AR $plugin_option rc conftest.a conftest.c 4299+ if test "$?" != 0; then 4300+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 4301 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 4302- else 4303- AR="$AR $plugin_option" 4304- fi 4305- rm -f conftest.* 4306+ else 4307+ AR="$AR $plugin_option" 4308 fi 4309-fi 4310-test -z "$AR_FLAGS" && AR_FLAGS=cru 4311+ rm -f conftest.* 4312+: ${AR=ar} 4313+: ${AR_FLAGS=cru} 4314+ 4315+ 4316+ 4317+ 4318+ 4319+ 4320+ 4321+ 4322+ 4323+ 4324+ 4325+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 4326+$as_echo_n "checking for archiver @FILE support... " >&6; } 4327+if ${lt_cv_ar_at_file+:} false; then : 4328+ $as_echo_n "(cached) " >&6 4329+else 4330+ lt_cv_ar_at_file=no 4331+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4332+/* end confdefs.h. */ 4333+ 4334+int 4335+main () 4336+{ 4337 4338+ ; 4339+ return 0; 4340+} 4341+_ACEOF 4342+if ac_fn_c_try_compile "$LINENO"; then : 4343+ echo conftest.$ac_objext > conftest.lst 4344+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 4345+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 4346+ (eval $lt_ar_try) 2>&5 4347+ ac_status=$? 4348+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4349+ test $ac_status = 0; } 4350+ if test "$ac_status" -eq 0; then 4351+ # Ensure the archiver fails upon bogus file names. 4352+ rm -f conftest.$ac_objext libconftest.a 4353+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 4354+ (eval $lt_ar_try) 2>&5 4355+ ac_status=$? 4356+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4357+ test $ac_status = 0; } 4358+ if test "$ac_status" -ne 0; then 4359+ lt_cv_ar_at_file=@ 4360+ fi 4361+ fi 4362+ rm -f conftest.* libconftest.a 4363 4364+fi 4365+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4366 4367+fi 4368+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 4369+$as_echo "$lt_cv_ar_at_file" >&6; } 4370 4371+if test "x$lt_cv_ar_at_file" = xno; then 4372+ archiver_list_spec= 4373+else 4374+ archiver_list_spec=$lt_cv_ar_at_file 4375+fi 4376 4377 4378 4379@@ -6209,8 +6523,8 @@ esac 4380 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 4381 4382 # Transform an extracted symbol line into symbol name and symbol address 4383-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 4384-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'" 4385+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 4386+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'" 4387 4388 # Handle CRLF in mingw tool chain 4389 opt_cr= 4390@@ -6246,6 +6560,7 @@ for ac_symprfx in "" "_"; do 4391 else 4392 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 4393 fi 4394+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 4395 4396 # Check to see that the pipe works correctly. 4397 pipe_works=no 4398@@ -6287,6 +6602,18 @@ _LT_EOF 4399 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 4400 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 4401 cat <<_LT_EOF > conftest.$ac_ext 4402+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 4403+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 4404+/* DATA imports from DLLs on WIN32 con't be const, because runtime 4405+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 4406+# define LT_DLSYM_CONST 4407+#elif defined(__osf__) 4408+/* This system does not cope well with relocations in const data. */ 4409+# define LT_DLSYM_CONST 4410+#else 4411+# define LT_DLSYM_CONST const 4412+#endif 4413+ 4414 #ifdef __cplusplus 4415 extern "C" { 4416 #endif 4417@@ -6298,7 +6625,7 @@ _LT_EOF 4418 cat <<_LT_EOF >> conftest.$ac_ext 4419 4420 /* The mapping between symbol names and symbols. */ 4421-const struct { 4422+LT_DLSYM_CONST struct { 4423 const char *name; 4424 void *address; 4425 } 4426@@ -6324,8 +6651,8 @@ static const void *lt_preloaded_setup() { 4427 _LT_EOF 4428 # Now try linking the two files. 4429 mv conftest.$ac_objext conftstm.$ac_objext 4430- lt_save_LIBS="$LIBS" 4431- lt_save_CFLAGS="$CFLAGS" 4432+ lt_globsym_save_LIBS=$LIBS 4433+ lt_globsym_save_CFLAGS=$CFLAGS 4434 LIBS="conftstm.$ac_objext" 4435 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 4436 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 4437@@ -6335,8 +6662,8 @@ _LT_EOF 4438 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 4439 pipe_works=yes 4440 fi 4441- LIBS="$lt_save_LIBS" 4442- CFLAGS="$lt_save_CFLAGS" 4443+ LIBS=$lt_globsym_save_LIBS 4444+ CFLAGS=$lt_globsym_save_CFLAGS 4445 else 4446 echo "cannot find nm_test_func in $nlist" >&5 4447 fi 4448@@ -6373,6 +6700,19 @@ else 4449 $as_echo "ok" >&6; } 4450 fi 4451 4452+# Response file support. 4453+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 4454+ nm_file_list_spec='@' 4455+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 4456+ nm_file_list_spec='@' 4457+fi 4458+ 4459+ 4460+ 4461+ 4462+ 4463+ 4464+ 4465 4466 4467 4468@@ -6389,6 +6729,42 @@ fi 4469 4470 4471 4472+ 4473+ 4474+ 4475+ 4476+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 4477+$as_echo_n "checking for sysroot... " >&6; } 4478+ 4479+# Check whether --with-libtool-sysroot was given. 4480+if test "${with_libtool_sysroot+set}" = set; then : 4481+ withval=$with_libtool_sysroot; 4482+else 4483+ with_libtool_sysroot=no 4484+fi 4485+ 4486+ 4487+lt_sysroot= 4488+case ${with_libtool_sysroot} in #( 4489+ yes) 4490+ if test "$GCC" = yes; then 4491+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 4492+ fi 4493+ ;; #( 4494+ /*) 4495+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 4496+ ;; #( 4497+ no|'') 4498+ ;; #( 4499+ *) 4500+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 4501+$as_echo "${with_libtool_sysroot}" >&6; } 4502+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 4503+ ;; 4504+esac 4505+ 4506+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 4507+$as_echo "${lt_sysroot:-no}" >&6; } 4508 4509 4510 4511@@ -6600,6 +6976,123 @@ esac 4512 4513 need_locks="$enable_libtool_lock" 4514 4515+if test -n "$ac_tool_prefix"; then 4516+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 4517+set dummy ${ac_tool_prefix}mt; ac_word=$2 4518+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4519+$as_echo_n "checking for $ac_word... " >&6; } 4520+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 4521+ $as_echo_n "(cached) " >&6 4522+else 4523+ if test -n "$MANIFEST_TOOL"; then 4524+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 4525+else 4526+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 4527+for as_dir in $PATH 4528+do 4529+ IFS=$as_save_IFS 4530+ test -z "$as_dir" && as_dir=. 4531+ for ac_exec_ext in '' $ac_executable_extensions; do 4532+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4533+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 4534+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4535+ break 2 4536+ fi 4537+done 4538+ done 4539+IFS=$as_save_IFS 4540+ 4541+fi 4542+fi 4543+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 4544+if test -n "$MANIFEST_TOOL"; then 4545+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 4546+$as_echo "$MANIFEST_TOOL" >&6; } 4547+else 4548+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4549+$as_echo "no" >&6; } 4550+fi 4551+ 4552+ 4553+fi 4554+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 4555+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 4556+ # Extract the first word of "mt", so it can be a program name with args. 4557+set dummy mt; ac_word=$2 4558+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4559+$as_echo_n "checking for $ac_word... " >&6; } 4560+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 4561+ $as_echo_n "(cached) " >&6 4562+else 4563+ if test -n "$ac_ct_MANIFEST_TOOL"; then 4564+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 4565+else 4566+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 4567+for as_dir in $PATH 4568+do 4569+ IFS=$as_save_IFS 4570+ test -z "$as_dir" && as_dir=. 4571+ for ac_exec_ext in '' $ac_executable_extensions; do 4572+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4573+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 4574+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 4575+ break 2 4576+ fi 4577+done 4578+ done 4579+IFS=$as_save_IFS 4580+ 4581+fi 4582+fi 4583+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 4584+if test -n "$ac_ct_MANIFEST_TOOL"; then 4585+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 4586+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 4587+else 4588+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4589+$as_echo "no" >&6; } 4590+fi 4591+ 4592+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 4593+ MANIFEST_TOOL=":" 4594+ else 4595+ case $cross_compiling:$ac_tool_warned in 4596+yes:) 4597+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 4598+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 4599+ac_tool_warned=yes ;; 4600+esac 4601+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 4602+ fi 4603+else 4604+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 4605+fi 4606+ 4607+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 4608+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 4609+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 4610+if ${lt_cv_path_mainfest_tool+:} false; then : 4611+ $as_echo_n "(cached) " >&6 4612+else 4613+ lt_cv_path_mainfest_tool=no 4614+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 4615+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 4616+ cat conftest.err >&5 4617+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 4618+ lt_cv_path_mainfest_tool=yes 4619+ fi 4620+ rm -f conftest* 4621+fi 4622+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 4623+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 4624+if test "x$lt_cv_path_mainfest_tool" != xyes; then 4625+ MANIFEST_TOOL=: 4626+fi 4627+ 4628+ 4629+ 4630+ 4631+ 4632 4633 case $host_os in 4634 rhapsody* | darwin*) 4635@@ -7163,6 +7656,8 @@ _LT_EOF 4636 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 4637 echo "$AR cru libconftest.a conftest.o" >&5 4638 $AR cru libconftest.a conftest.o 2>&5 4639+ echo "$RANLIB libconftest.a" >&5 4640+ $RANLIB libconftest.a 2>&5 4641 cat > conftest.c << _LT_EOF 4642 int main() { return 0;} 4643 _LT_EOF 4644@@ -7745,8 +8240,6 @@ fi 4645 lt_prog_compiler_pic= 4646 lt_prog_compiler_static= 4647 4648-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 4649-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4650 4651 if test "$GCC" = yes; then 4652 lt_prog_compiler_wl='-Wl,' 4653@@ -7912,6 +8405,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4654 lt_prog_compiler_pic='--shared' 4655 lt_prog_compiler_static='--static' 4656 ;; 4657+ nagfor*) 4658+ # NAG Fortran compiler 4659+ lt_prog_compiler_wl='-Wl,-Wl,,' 4660+ lt_prog_compiler_pic='-PIC' 4661+ lt_prog_compiler_static='-Bstatic' 4662+ ;; 4663 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 4664 # Portland Group compilers (*not* the Pentium gcc compiler, 4665 # which looks to be a dead project) 4666@@ -7974,7 +8473,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4667 lt_prog_compiler_pic='-KPIC' 4668 lt_prog_compiler_static='-Bstatic' 4669 case $cc_basename in 4670- f77* | f90* | f95*) 4671+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 4672 lt_prog_compiler_wl='-Qoption ld ';; 4673 *) 4674 lt_prog_compiler_wl='-Wl,';; 4675@@ -8031,13 +8530,17 @@ case $host_os in 4676 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 4677 ;; 4678 esac 4679-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 4680-$as_echo "$lt_prog_compiler_pic" >&6; } 4681- 4682- 4683- 4684- 4685 4686+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 4687+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 4688+if ${lt_cv_prog_compiler_pic+:} false; then : 4689+ $as_echo_n "(cached) " >&6 4690+else 4691+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 4692+fi 4693+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 4694+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 4695+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 4696 4697 # 4698 # Check to make sure the PIC flag actually works. 4699@@ -8098,6 +8601,11 @@ fi 4700 4701 4702 4703+ 4704+ 4705+ 4706+ 4707+ 4708 # 4709 # Check to make sure the static flag actually works. 4710 # 4711@@ -8448,7 +8956,8 @@ _LT_EOF 4712 allow_undefined_flag=unsupported 4713 always_export_symbols=no 4714 enable_shared_with_static_runtimes=yes 4715- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 4716+ 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' 4717+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 4718 4719 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 4720 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 4721@@ -8547,12 +9056,12 @@ _LT_EOF 4722 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 4723 hardcode_libdir_flag_spec= 4724 hardcode_libdir_flag_spec_ld='-rpath $libdir' 4725- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 4726+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 4727 if test "x$supports_anon_versioning" = xyes; then 4728 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 4729 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 4730 echo "local: *; };" >> $output_objdir/$libname.ver~ 4731- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 4732+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 4733 fi 4734 ;; 4735 esac 4736@@ -8566,8 +9075,8 @@ _LT_EOF 4737 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4738 wlarc= 4739 else 4740- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4741- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4742+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4743+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4744 fi 4745 ;; 4746 4747@@ -8585,8 +9094,8 @@ _LT_EOF 4748 4749 _LT_EOF 4750 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4751- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4752- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4753+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4754+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4755 else 4756 ld_shlibs=no 4757 fi 4758@@ -8632,8 +9141,8 @@ _LT_EOF 4759 4760 *) 4761 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 4762- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4763- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4764+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4765+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4766 else 4767 ld_shlibs=no 4768 fi 4769@@ -8763,7 +9272,13 @@ _LT_EOF 4770 allow_undefined_flag='-berok' 4771 # Determine the default libpath from the value encoded in an 4772 # empty executable. 4773- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4774+ if test "${lt_cv_aix_libpath+set}" = set; then 4775+ aix_libpath=$lt_cv_aix_libpath 4776+else 4777+ if ${lt_cv_aix_libpath_+:} false; then : 4778+ $as_echo_n "(cached) " >&6 4779+else 4780+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4781 /* end confdefs.h. */ 4782 4783 int 4784@@ -8776,22 +9291,29 @@ main () 4785 _ACEOF 4786 if ac_fn_c_try_link "$LINENO"; then : 4787 4788-lt_aix_libpath_sed=' 4789- /Import File Strings/,/^$/ { 4790- /^0/ { 4791- s/^0 *\(.*\)$/\1/ 4792- p 4793- } 4794- }' 4795-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4796-# Check for a 64-bit object if we didn't find anything. 4797-if test -z "$aix_libpath"; then 4798- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4799-fi 4800+ lt_aix_libpath_sed=' 4801+ /Import File Strings/,/^$/ { 4802+ /^0/ { 4803+ s/^0 *\([^ ]*\) *$/\1/ 4804+ p 4805+ } 4806+ }' 4807+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4808+ # Check for a 64-bit object if we didn't find anything. 4809+ if test -z "$lt_cv_aix_libpath_"; then 4810+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4811+ fi 4812 fi 4813 rm -f core conftest.err conftest.$ac_objext \ 4814 conftest$ac_exeext conftest.$ac_ext 4815-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4816+ if test -z "$lt_cv_aix_libpath_"; then 4817+ lt_cv_aix_libpath_="/usr/lib:/lib" 4818+ fi 4819+ 4820+fi 4821+ 4822+ aix_libpath=$lt_cv_aix_libpath_ 4823+fi 4824 4825 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4826 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" 4827@@ -8803,7 +9325,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4828 else 4829 # Determine the default libpath from the value encoded in an 4830 # empty executable. 4831- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4832+ if test "${lt_cv_aix_libpath+set}" = set; then 4833+ aix_libpath=$lt_cv_aix_libpath 4834+else 4835+ if ${lt_cv_aix_libpath_+:} false; then : 4836+ $as_echo_n "(cached) " >&6 4837+else 4838+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4839 /* end confdefs.h. */ 4840 4841 int 4842@@ -8816,22 +9344,29 @@ main () 4843 _ACEOF 4844 if ac_fn_c_try_link "$LINENO"; then : 4845 4846-lt_aix_libpath_sed=' 4847- /Import File Strings/,/^$/ { 4848- /^0/ { 4849- s/^0 *\(.*\)$/\1/ 4850- p 4851- } 4852- }' 4853-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4854-# Check for a 64-bit object if we didn't find anything. 4855-if test -z "$aix_libpath"; then 4856- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4857-fi 4858+ lt_aix_libpath_sed=' 4859+ /Import File Strings/,/^$/ { 4860+ /^0/ { 4861+ s/^0 *\([^ ]*\) *$/\1/ 4862+ p 4863+ } 4864+ }' 4865+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4866+ # Check for a 64-bit object if we didn't find anything. 4867+ if test -z "$lt_cv_aix_libpath_"; then 4868+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 4869+ fi 4870 fi 4871 rm -f core conftest.err conftest.$ac_objext \ 4872 conftest$ac_exeext conftest.$ac_ext 4873-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4874+ if test -z "$lt_cv_aix_libpath_"; then 4875+ lt_cv_aix_libpath_="/usr/lib:/lib" 4876+ fi 4877+ 4878+fi 4879+ 4880+ aix_libpath=$lt_cv_aix_libpath_ 4881+fi 4882 4883 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 4884 # Warning - without using the other run time loading flags, 4885@@ -8876,20 +9411,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4886 # Microsoft Visual C++. 4887 # hardcode_libdir_flag_spec is actually meaningless, as there is 4888 # no search path for DLLs. 4889- hardcode_libdir_flag_spec=' ' 4890- allow_undefined_flag=unsupported 4891- # Tell ltmain to make .lib files, not .a files. 4892- libext=lib 4893- # Tell ltmain to make .dll files, not .so files. 4894- shrext_cmds=".dll" 4895- # FIXME: Setting linknames here is a bad hack. 4896- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 4897- # The linker will automatically build a .lib file if we build a DLL. 4898- old_archive_from_new_cmds='true' 4899- # FIXME: Should let the user specify the lib program. 4900- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 4901- fix_srcfile_path='`cygpath -w "$srcfile"`' 4902- enable_shared_with_static_runtimes=yes 4903+ case $cc_basename in 4904+ cl*) 4905+ # Native MSVC 4906+ hardcode_libdir_flag_spec=' ' 4907+ allow_undefined_flag=unsupported 4908+ always_export_symbols=yes 4909+ file_list_spec='@' 4910+ # Tell ltmain to make .lib files, not .a files. 4911+ libext=lib 4912+ # Tell ltmain to make .dll files, not .so files. 4913+ shrext_cmds=".dll" 4914+ # FIXME: Setting linknames here is a bad hack. 4915+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 4916+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 4917+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 4918+ else 4919+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 4920+ fi~ 4921+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 4922+ linknames=' 4923+ # The linker will not automatically build a static lib if we build a DLL. 4924+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 4925+ enable_shared_with_static_runtimes=yes 4926+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 4927+ # Don't use ranlib 4928+ old_postinstall_cmds='chmod 644 $oldlib' 4929+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 4930+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 4931+ case $lt_outputfile in 4932+ *.exe|*.EXE) ;; 4933+ *) 4934+ lt_outputfile="$lt_outputfile.exe" 4935+ lt_tool_outputfile="$lt_tool_outputfile.exe" 4936+ ;; 4937+ esac~ 4938+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 4939+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 4940+ $RM "$lt_outputfile.manifest"; 4941+ fi' 4942+ ;; 4943+ *) 4944+ # Assume MSVC wrapper 4945+ hardcode_libdir_flag_spec=' ' 4946+ allow_undefined_flag=unsupported 4947+ # Tell ltmain to make .lib files, not .a files. 4948+ libext=lib 4949+ # Tell ltmain to make .dll files, not .so files. 4950+ shrext_cmds=".dll" 4951+ # FIXME: Setting linknames here is a bad hack. 4952+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 4953+ # The linker will automatically build a .lib file if we build a DLL. 4954+ old_archive_from_new_cmds='true' 4955+ # FIXME: Should let the user specify the lib program. 4956+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 4957+ enable_shared_with_static_runtimes=yes 4958+ ;; 4959+ esac 4960 ;; 4961 4962 darwin* | rhapsody*) 4963@@ -8950,7 +9528,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4964 4965 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 4966 freebsd* | dragonfly*) 4967- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 4968+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 4969 hardcode_libdir_flag_spec='-R$libdir' 4970 hardcode_direct=yes 4971 hardcode_shlibpath_var=no 4972@@ -8958,7 +9536,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4973 4974 hpux9*) 4975 if test "$GCC" = yes; then 4976- 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' 4977+ 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' 4978 else 4979 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' 4980 fi 4981@@ -8974,7 +9552,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4982 4983 hpux10*) 4984 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 4985- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 4986+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 4987 else 4988 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 4989 fi 4990@@ -8998,10 +9576,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 4991 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4992 ;; 4993 ia64*) 4994- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 4995+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 4996 ;; 4997 *) 4998- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 4999+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 5000 ;; 5001 esac 5002 else 5003@@ -9080,23 +9658,36 @@ fi 5004 5005 irix5* | irix6* | nonstopux*) 5006 if test "$GCC" = yes; then 5007- 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' 5008+ 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' 5009 # Try to use the -exported_symbol ld option, if it does not 5010 # work, assume that -exports_file does not work either and 5011 # implicitly export all symbols. 5012- save_LDFLAGS="$LDFLAGS" 5013- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 5014- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5015+ # This should be the same for all languages, so no per-tag cache variable. 5016+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 5017+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 5018+if ${lt_cv_irix_exported_symbol+:} false; then : 5019+ $as_echo_n "(cached) " >&6 5020+else 5021+ save_LDFLAGS="$LDFLAGS" 5022+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 5023+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5024 /* end confdefs.h. */ 5025-int foo(void) {} 5026+int foo (void) { return 0; } 5027 _ACEOF 5028 if ac_fn_c_try_link "$LINENO"; then : 5029- 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' 5030- 5031+ lt_cv_irix_exported_symbol=yes 5032+else 5033+ lt_cv_irix_exported_symbol=no 5034 fi 5035 rm -f core conftest.err conftest.$ac_objext \ 5036 conftest$ac_exeext conftest.$ac_ext 5037- LDFLAGS="$save_LDFLAGS" 5038+ LDFLAGS="$save_LDFLAGS" 5039+fi 5040+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 5041+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 5042+ if test "$lt_cv_irix_exported_symbol" = yes; then 5043+ 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' 5044+ fi 5045 else 5046 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' 5047 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' 5048@@ -9181,7 +9772,7 @@ rm -f core conftest.err conftest.$ac_objext \ 5049 osf4* | osf5*) # as osf3* with the addition of -msym flag 5050 if test "$GCC" = yes; then 5051 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 5052- 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' 5053+ 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' 5054 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 5055 else 5056 allow_undefined_flag=' -expect_unresolved \*' 5057@@ -9200,9 +9791,9 @@ rm -f core conftest.err conftest.$ac_objext \ 5058 no_undefined_flag=' -z defs' 5059 if test "$GCC" = yes; then 5060 wlarc='${wl}' 5061- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5062+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5063 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 5064- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 5065+ $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' 5066 else 5067 case `$CC -V 2>&1` in 5068 *"Compilers 5.0"*) 5069@@ -9778,8 +10369,9 @@ cygwin* | mingw* | pw32* | cegcc*) 5070 need_version=no 5071 need_lib_prefix=no 5072 5073- case $GCC,$host_os in 5074- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 5075+ case $GCC,$cc_basename in 5076+ yes,*) 5077+ # gcc 5078 library_names_spec='$libname.dll.a' 5079 # DLL is installed to $(libdir)/../bin by postinstall_cmds 5080 postinstall_cmds='base_file=`basename \${file}`~ 5081@@ -9812,13 +10404,71 @@ cygwin* | mingw* | pw32* | cegcc*) 5082 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5083 ;; 5084 esac 5085+ dynamic_linker='Win32 ld.exe' 5086+ ;; 5087+ 5088+ *,cl*) 5089+ # Native MSVC 5090+ libname_spec='$name' 5091+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 5092+ library_names_spec='${libname}.dll.lib' 5093+ 5094+ case $build_os in 5095+ mingw*) 5096+ sys_lib_search_path_spec= 5097+ lt_save_ifs=$IFS 5098+ IFS=';' 5099+ for lt_path in $LIB 5100+ do 5101+ IFS=$lt_save_ifs 5102+ # Let DOS variable expansion print the short 8.3 style file name. 5103+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 5104+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 5105+ done 5106+ IFS=$lt_save_ifs 5107+ # Convert to MSYS style. 5108+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 5109+ ;; 5110+ cygwin*) 5111+ # Convert to unix form, then to dos form, then back to unix form 5112+ # but this time dos style (no spaces!) so that the unix form looks 5113+ # like /cygdrive/c/PROGRA~1:/cygdr... 5114+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 5115+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 5116+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 5117+ ;; 5118+ *) 5119+ sys_lib_search_path_spec="$LIB" 5120+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 5121+ # It is most probably a Windows format PATH. 5122+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 5123+ else 5124+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 5125+ fi 5126+ # FIXME: find the short name or the path components, as spaces are 5127+ # common. (e.g. "Program Files" -> "PROGRA~1") 5128+ ;; 5129+ esac 5130+ 5131+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 5132+ postinstall_cmds='base_file=`basename \${file}`~ 5133+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 5134+ dldir=$destdir/`dirname \$dlpath`~ 5135+ test -d \$dldir || mkdir -p \$dldir~ 5136+ $install_prog $dir/$dlname \$dldir/$dlname' 5137+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 5138+ dlpath=$dir/\$dldll~ 5139+ $RM \$dlpath' 5140+ shlibpath_overrides_runpath=yes 5141+ dynamic_linker='Win32 link.exe' 5142 ;; 5143 5144 *) 5145+ # Assume MSVC wrapper 5146 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 5147+ dynamic_linker='Win32 ld.exe' 5148 ;; 5149 esac 5150- dynamic_linker='Win32 ld.exe' 5151 # FIXME: first we should search . and the directory the executable is in 5152 shlibpath_var=PATH 5153 ;; 5154@@ -10696,7 +11346,7 @@ else 5155 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5156 lt_status=$lt_dlunknown 5157 cat > conftest.$ac_ext <<_LT_EOF 5158-#line 10699 "configure" 5159+#line $LINENO "configure" 5160 #include "confdefs.h" 5161 5162 #if HAVE_DLFCN_H 5163@@ -10740,10 +11390,10 @@ else 5164 /* When -fvisbility=hidden is used, assume the code has been annotated 5165 correspondingly for the symbols needed. */ 5166 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5167-void fnord () __attribute__((visibility("default"))); 5168+int fnord () __attribute__((visibility("default"))); 5169 #endif 5170 5171-void fnord () { int i=42; } 5172+int fnord () { return 42; } 5173 int main () 5174 { 5175 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5176@@ -10802,7 +11452,7 @@ else 5177 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 5178 lt_status=$lt_dlunknown 5179 cat > conftest.$ac_ext <<_LT_EOF 5180-#line 10805 "configure" 5181+#line $LINENO "configure" 5182 #include "confdefs.h" 5183 5184 #if HAVE_DLFCN_H 5185@@ -10846,10 +11496,10 @@ else 5186 /* When -fvisbility=hidden is used, assume the code has been annotated 5187 correspondingly for the symbols needed. */ 5188 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 5189-void fnord () __attribute__((visibility("default"))); 5190+int fnord () __attribute__((visibility("default"))); 5191 #endif 5192 5193-void fnord () { int i=42; } 5194+int fnord () { return 42; } 5195 int main () 5196 { 5197 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 5198@@ -14832,13 +15482,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 5199 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 5200 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 5201 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 5202+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 5203+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 5204 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 5205 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 5206 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 5207 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 5208 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 5209+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 5210+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 5211+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 5212+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 5213 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 5214 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 5215+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 5216 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 5217 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 5218 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 5219@@ -14853,14 +15510,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 5220 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 5221 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 5222 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"`' 5223+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 5224+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 5225 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 5226 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 5227 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 5228-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 5229 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 5230+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 5231 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 5232 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 5233 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 5234+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 5235 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 5236 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 5237 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 5238@@ -14893,12 +15553,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 5239 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 5240 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 5241 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 5242-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 5243 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 5244 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 5245 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 5246 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 5247 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 5248+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 5249 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 5250 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 5251 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 5252@@ -14953,8 +15613,13 @@ reload_flag \ 5253 OBJDUMP \ 5254 deplibs_check_method \ 5255 file_magic_cmd \ 5256+file_magic_glob \ 5257+want_nocaseglob \ 5258+DLLTOOL \ 5259+sharedlib_from_linklib_cmd \ 5260 AR \ 5261 AR_FLAGS \ 5262+archiver_list_spec \ 5263 STRIP \ 5264 RANLIB \ 5265 CC \ 5266@@ -14964,12 +15629,14 @@ lt_cv_sys_global_symbol_pipe \ 5267 lt_cv_sys_global_symbol_to_cdecl \ 5268 lt_cv_sys_global_symbol_to_c_name_address \ 5269 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 5270+nm_file_list_spec \ 5271 lt_prog_compiler_no_builtin_flag \ 5272-lt_prog_compiler_wl \ 5273 lt_prog_compiler_pic \ 5274+lt_prog_compiler_wl \ 5275 lt_prog_compiler_static \ 5276 lt_cv_prog_compiler_c_o \ 5277 need_locks \ 5278+MANIFEST_TOOL \ 5279 DSYMUTIL \ 5280 NMEDIT \ 5281 LIPO \ 5282@@ -14985,7 +15652,6 @@ no_undefined_flag \ 5283 hardcode_libdir_flag_spec \ 5284 hardcode_libdir_flag_spec_ld \ 5285 hardcode_libdir_separator \ 5286-fix_srcfile_path \ 5287 exclude_expsyms \ 5288 include_expsyms \ 5289 file_list_spec \ 5290@@ -15021,6 +15687,7 @@ module_cmds \ 5291 module_expsym_cmds \ 5292 export_symbols_cmds \ 5293 prelink_cmds \ 5294+postlink_cmds \ 5295 postinstall_cmds \ 5296 postuninstall_cmds \ 5297 finish_cmds \ 5298@@ -15793,7 +16460,8 @@ $as_echo X"$file" | 5299 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 5300 # 5301 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 5302-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 5303+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 5304+# Inc. 5305 # Written by Gordon Matzigkeit, 1996 5306 # 5307 # This file is part of GNU Libtool. 5308@@ -15896,19 +16564,42 @@ SP2NL=$lt_lt_SP2NL 5309 # turn newlines into spaces. 5310 NL2SP=$lt_lt_NL2SP 5311 5312+# convert \$build file names to \$host format. 5313+to_host_file_cmd=$lt_cv_to_host_file_cmd 5314+ 5315+# convert \$build files to toolchain format. 5316+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 5317+ 5318 # An object symbol dumper. 5319 OBJDUMP=$lt_OBJDUMP 5320 5321 # Method to check whether dependent libraries are shared objects. 5322 deplibs_check_method=$lt_deplibs_check_method 5323 5324-# Command to use when deplibs_check_method == "file_magic". 5325+# Command to use when deplibs_check_method = "file_magic". 5326 file_magic_cmd=$lt_file_magic_cmd 5327 5328+# How to find potential files when deplibs_check_method = "file_magic". 5329+file_magic_glob=$lt_file_magic_glob 5330+ 5331+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 5332+want_nocaseglob=$lt_want_nocaseglob 5333+ 5334+# DLL creation program. 5335+DLLTOOL=$lt_DLLTOOL 5336+ 5337+# Command to associate shared and link libraries. 5338+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 5339+ 5340 # The archiver. 5341 AR=$lt_AR 5342+ 5343+# Flags to create an archive. 5344 AR_FLAGS=$lt_AR_FLAGS 5345 5346+# How to feed a file listing to the archiver. 5347+archiver_list_spec=$lt_archiver_list_spec 5348+ 5349 # A symbol stripping program. 5350 STRIP=$lt_STRIP 5351 5352@@ -15938,6 +16629,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 5353 # Transform the output of nm in a C name address pair when lib prefix is needed. 5354 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 5355 5356+# Specify filename containing input files for \$NM. 5357+nm_file_list_spec=$lt_nm_file_list_spec 5358+ 5359+# The root where to search for dependent libraries,and in which our libraries should be installed. 5360+lt_sysroot=$lt_sysroot 5361+ 5362 # The name of the directory that contains temporary libtool files. 5363 objdir=$objdir 5364 5365@@ -15947,6 +16644,9 @@ MAGIC_CMD=$MAGIC_CMD 5366 # Must we lock files when doing compilation? 5367 need_locks=$lt_need_locks 5368 5369+# Manifest tool. 5370+MANIFEST_TOOL=$lt_MANIFEST_TOOL 5371+ 5372 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 5373 DSYMUTIL=$lt_DSYMUTIL 5374 5375@@ -16061,12 +16761,12 @@ with_gcc=$GCC 5376 # Compiler flag to turn off builtin functions. 5377 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 5378 5379-# How to pass a linker flag through the compiler. 5380-wl=$lt_lt_prog_compiler_wl 5381- 5382 # Additional compiler flags for building library objects. 5383 pic_flag=$lt_lt_prog_compiler_pic 5384 5385+# How to pass a linker flag through the compiler. 5386+wl=$lt_lt_prog_compiler_wl 5387+ 5388 # Compiler flag to prevent dynamic linking. 5389 link_static_flag=$lt_lt_prog_compiler_static 5390 5391@@ -16153,9 +16853,6 @@ inherit_rpath=$inherit_rpath 5392 # Whether libtool must link a program against all its dependency libraries. 5393 link_all_deplibs=$link_all_deplibs 5394 5395-# Fix the shell variable \$srcfile for the compiler. 5396-fix_srcfile_path=$lt_fix_srcfile_path 5397- 5398 # Set to "yes" if exported symbols are required. 5399 always_export_symbols=$always_export_symbols 5400 5401@@ -16171,6 +16868,9 @@ include_expsyms=$lt_include_expsyms 5402 # Commands necessary for linking programs (against libraries) with templates. 5403 prelink_cmds=$lt_prelink_cmds 5404 5405+# Commands necessary for finishing linking programs. 5406+postlink_cmds=$lt_postlink_cmds 5407+ 5408 # Specify filename containing input files. 5409 file_list_spec=$lt_file_list_spec 5410 5411@@ -16203,210 +16903,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 5412 # if finds mixed CR/LF and LF-only lines. Since sed operates in 5413 # text mode, it properly converts lines to CR/LF. This bash problem 5414 # is reportedly fixed, but why not run on old versions too? 5415- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 5416- || (rm -f "$cfgfile"; exit 1) 5417- 5418- case $xsi_shell in 5419- yes) 5420- cat << \_LT_EOF >> "$cfgfile" 5421- 5422-# func_dirname file append nondir_replacement 5423-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 5424-# otherwise set result to NONDIR_REPLACEMENT. 5425-func_dirname () 5426-{ 5427- case ${1} in 5428- */*) func_dirname_result="${1%/*}${2}" ;; 5429- * ) func_dirname_result="${3}" ;; 5430- esac 5431-} 5432- 5433-# func_basename file 5434-func_basename () 5435-{ 5436- func_basename_result="${1##*/}" 5437-} 5438- 5439-# func_dirname_and_basename file append nondir_replacement 5440-# perform func_basename and func_dirname in a single function 5441-# call: 5442-# dirname: Compute the dirname of FILE. If nonempty, 5443-# add APPEND to the result, otherwise set result 5444-# to NONDIR_REPLACEMENT. 5445-# value returned in "$func_dirname_result" 5446-# basename: Compute filename of FILE. 5447-# value retuned in "$func_basename_result" 5448-# Implementation must be kept synchronized with func_dirname 5449-# and func_basename. For efficiency, we do not delegate to 5450-# those functions but instead duplicate the functionality here. 5451-func_dirname_and_basename () 5452-{ 5453- case ${1} in 5454- */*) func_dirname_result="${1%/*}${2}" ;; 5455- * ) func_dirname_result="${3}" ;; 5456- esac 5457- func_basename_result="${1##*/}" 5458-} 5459- 5460-# func_stripname prefix suffix name 5461-# strip PREFIX and SUFFIX off of NAME. 5462-# PREFIX and SUFFIX must not contain globbing or regex special 5463-# characters, hashes, percent signs, but SUFFIX may contain a leading 5464-# dot (in which case that matches only a dot). 5465-func_stripname () 5466-{ 5467- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 5468- # positional parameters, so assign one to ordinary parameter first. 5469- func_stripname_result=${3} 5470- func_stripname_result=${func_stripname_result#"${1}"} 5471- func_stripname_result=${func_stripname_result%"${2}"} 5472-} 5473- 5474-# func_opt_split 5475-func_opt_split () 5476-{ 5477- func_opt_split_opt=${1%%=*} 5478- func_opt_split_arg=${1#*=} 5479-} 5480- 5481-# func_lo2o object 5482-func_lo2o () 5483-{ 5484- case ${1} in 5485- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 5486- *) func_lo2o_result=${1} ;; 5487- esac 5488-} 5489- 5490-# func_xform libobj-or-source 5491-func_xform () 5492-{ 5493- func_xform_result=${1%.*}.lo 5494-} 5495- 5496-# func_arith arithmetic-term... 5497-func_arith () 5498-{ 5499- func_arith_result=$(( $* )) 5500-} 5501- 5502-# func_len string 5503-# STRING may not start with a hyphen. 5504-func_len () 5505-{ 5506- func_len_result=${#1} 5507-} 5508- 5509-_LT_EOF 5510- ;; 5511- *) # Bourne compatible functions. 5512- cat << \_LT_EOF >> "$cfgfile" 5513- 5514-# func_dirname file append nondir_replacement 5515-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 5516-# otherwise set result to NONDIR_REPLACEMENT. 5517-func_dirname () 5518-{ 5519- # Extract subdirectory from the argument. 5520- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 5521- if test "X$func_dirname_result" = "X${1}"; then 5522- func_dirname_result="${3}" 5523- else 5524- func_dirname_result="$func_dirname_result${2}" 5525- fi 5526-} 5527- 5528-# func_basename file 5529-func_basename () 5530-{ 5531- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 5532-} 5533- 5534- 5535-# func_stripname prefix suffix name 5536-# strip PREFIX and SUFFIX off of NAME. 5537-# PREFIX and SUFFIX must not contain globbing or regex special 5538-# characters, hashes, percent signs, but SUFFIX may contain a leading 5539-# dot (in which case that matches only a dot). 5540-# func_strip_suffix prefix name 5541-func_stripname () 5542-{ 5543- case ${2} in 5544- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 5545- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 5546- esac 5547-} 5548- 5549-# sed scripts: 5550-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 5551-my_sed_long_arg='1s/^-[^=]*=//' 5552- 5553-# func_opt_split 5554-func_opt_split () 5555-{ 5556- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 5557- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 5558-} 5559- 5560-# func_lo2o object 5561-func_lo2o () 5562-{ 5563- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 5564-} 5565- 5566-# func_xform libobj-or-source 5567-func_xform () 5568-{ 5569- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 5570-} 5571- 5572-# func_arith arithmetic-term... 5573-func_arith () 5574-{ 5575- func_arith_result=`expr "$@"` 5576-} 5577- 5578-# func_len string 5579-# STRING may not start with a hyphen. 5580-func_len () 5581-{ 5582- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 5583-} 5584- 5585-_LT_EOF 5586-esac 5587- 5588-case $lt_shell_append in 5589- yes) 5590- cat << \_LT_EOF >> "$cfgfile" 5591- 5592-# func_append var value 5593-# Append VALUE to the end of shell variable VAR. 5594-func_append () 5595-{ 5596- eval "$1+=\$2" 5597-} 5598-_LT_EOF 5599- ;; 5600- *) 5601- cat << \_LT_EOF >> "$cfgfile" 5602- 5603-# func_append var value 5604-# Append VALUE to the end of shell variable VAR. 5605-func_append () 5606-{ 5607- eval "$1=\$$1\$2" 5608-} 5609- 5610-_LT_EOF 5611- ;; 5612- esac 5613- 5614- 5615- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 5616- || (rm -f "$cfgfile"; exit 1) 5617- 5618- mv -f "$cfgfile" "$ofile" || 5619+ sed '$q' "$ltmain" >> "$cfgfile" \ 5620+ || (rm -f "$cfgfile"; exit 1) 5621+ 5622+ if test x"$xsi_shell" = xyes; then 5623+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 5624+func_dirname ()\ 5625+{\ 5626+\ case ${1} in\ 5627+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 5628+\ * ) func_dirname_result="${3}" ;;\ 5629+\ esac\ 5630+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 5631+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5632+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5633+test 0 -eq $? || _lt_function_replace_fail=: 5634+ 5635+ 5636+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 5637+func_basename ()\ 5638+{\ 5639+\ func_basename_result="${1##*/}"\ 5640+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 5641+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5642+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5643+test 0 -eq $? || _lt_function_replace_fail=: 5644+ 5645+ 5646+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 5647+func_dirname_and_basename ()\ 5648+{\ 5649+\ case ${1} in\ 5650+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 5651+\ * ) func_dirname_result="${3}" ;;\ 5652+\ esac\ 5653+\ func_basename_result="${1##*/}"\ 5654+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 5655+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5656+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5657+test 0 -eq $? || _lt_function_replace_fail=: 5658+ 5659+ 5660+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 5661+func_stripname ()\ 5662+{\ 5663+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 5664+\ # positional parameters, so assign one to ordinary parameter first.\ 5665+\ func_stripname_result=${3}\ 5666+\ func_stripname_result=${func_stripname_result#"${1}"}\ 5667+\ func_stripname_result=${func_stripname_result%"${2}"}\ 5668+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 5669+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5670+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5671+test 0 -eq $? || _lt_function_replace_fail=: 5672+ 5673+ 5674+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 5675+func_split_long_opt ()\ 5676+{\ 5677+\ func_split_long_opt_name=${1%%=*}\ 5678+\ func_split_long_opt_arg=${1#*=}\ 5679+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 5680+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5681+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5682+test 0 -eq $? || _lt_function_replace_fail=: 5683+ 5684+ 5685+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 5686+func_split_short_opt ()\ 5687+{\ 5688+\ func_split_short_opt_arg=${1#??}\ 5689+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 5690+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 5691+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5692+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5693+test 0 -eq $? || _lt_function_replace_fail=: 5694+ 5695+ 5696+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 5697+func_lo2o ()\ 5698+{\ 5699+\ case ${1} in\ 5700+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 5701+\ *) func_lo2o_result=${1} ;;\ 5702+\ esac\ 5703+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 5704+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5705+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5706+test 0 -eq $? || _lt_function_replace_fail=: 5707+ 5708+ 5709+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 5710+func_xform ()\ 5711+{\ 5712+ func_xform_result=${1%.*}.lo\ 5713+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 5714+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5715+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5716+test 0 -eq $? || _lt_function_replace_fail=: 5717+ 5718+ 5719+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 5720+func_arith ()\ 5721+{\ 5722+ func_arith_result=$(( $* ))\ 5723+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 5724+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5725+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5726+test 0 -eq $? || _lt_function_replace_fail=: 5727+ 5728+ 5729+ sed -e '/^func_len ()$/,/^} # func_len /c\ 5730+func_len ()\ 5731+{\ 5732+ func_len_result=${#1}\ 5733+} # Extended-shell func_len 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+fi 5739+ 5740+if test x"$lt_shell_append" = xyes; then 5741+ sed -e '/^func_append ()$/,/^} # func_append /c\ 5742+func_append ()\ 5743+{\ 5744+ eval "${1}+=\\${2}"\ 5745+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 5746+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5747+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5748+test 0 -eq $? || _lt_function_replace_fail=: 5749+ 5750+ 5751+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 5752+func_append_quoted ()\ 5753+{\ 5754+\ func_quote_for_eval "${2}"\ 5755+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 5756+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 5757+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5758+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5759+test 0 -eq $? || _lt_function_replace_fail=: 5760+ 5761+ 5762+ # Save a `func_append' function call where possible by direct use of '+=' 5763+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 5764+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5765+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5766+ test 0 -eq $? || _lt_function_replace_fail=: 5767+else 5768+ # Save a `func_append' function call even when '+=' is not available 5769+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 5770+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 5771+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 5772+ test 0 -eq $? || _lt_function_replace_fail=: 5773+fi 5774+ 5775+if test x"$_lt_function_replace_fail" = x":"; then 5776+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 5777+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 5778+fi 5779+ 5780+ 5781+ mv -f "$cfgfile" "$ofile" || 5782 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 5783 chmod +x "$ofile" 5784 5785diff --git a/gprof/configure b/gprof/configure 5786index a7f788f0411..e7703613024 100755 5787--- a/gprof/configure 5788+++ b/gprof/configure 5789@@ -663,8 +663,11 @@ OTOOL 5790 LIPO 5791 NMEDIT 5792 DSYMUTIL 5793+MANIFEST_TOOL 5794 RANLIB 5795+ac_ct_AR 5796 AR 5797+DLLTOOL 5798 OBJDUMP 5799 LN_S 5800 NM 5801@@ -781,6 +784,7 @@ enable_static 5802 with_pic 5803 enable_fast_install 5804 with_gnu_ld 5805+with_libtool_sysroot 5806 enable_libtool_lock 5807 enable_plugins 5808 enable_largefile 5809@@ -1443,6 +1447,8 @@ Optional Packages: 5810 --with-pic try to use only PIC/non-PIC objects [default=use 5811 both] 5812 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 5813+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 5814+ (or the compiler's sysroot if not specified). 5815 5816 Some influential environment variables: 5817 CC C compiler command 5818@@ -4510,8 +4516,8 @@ esac 5819 5820 5821 5822-macro_version='2.2.7a' 5823-macro_revision='1.3134' 5824+macro_version='2.4' 5825+macro_revision='1.3293' 5826 5827 5828 5829@@ -4551,7 +4557,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 5830 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 5831 $as_echo_n "checking how to print strings... " >&6; } 5832 # Test print first, because it will be a builtin if present. 5833-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 5834+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 5835 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 5836 ECHO='print -r --' 5837 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 5838@@ -5238,8 +5244,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 5839 # Try some XSI features 5840 xsi_shell=no 5841 ( _lt_dummy="a/b/c" 5842- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 5843- = c,a/b,, \ 5844+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 5845+ = c,a/b,b/c, \ 5846 && eval 'test $(( 1 + 1 )) -eq 2 \ 5847 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 5848 && xsi_shell=yes 5849@@ -5288,6 +5294,80 @@ esac 5850 5851 5852 5853+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 5854+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 5855+if ${lt_cv_to_host_file_cmd+:} false; then : 5856+ $as_echo_n "(cached) " >&6 5857+else 5858+ case $host in 5859+ *-*-mingw* ) 5860+ case $build in 5861+ *-*-mingw* ) # actually msys 5862+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 5863+ ;; 5864+ *-*-cygwin* ) 5865+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 5866+ ;; 5867+ * ) # otherwise, assume *nix 5868+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 5869+ ;; 5870+ esac 5871+ ;; 5872+ *-*-cygwin* ) 5873+ case $build in 5874+ *-*-mingw* ) # actually msys 5875+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 5876+ ;; 5877+ *-*-cygwin* ) 5878+ lt_cv_to_host_file_cmd=func_convert_file_noop 5879+ ;; 5880+ * ) # otherwise, assume *nix 5881+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 5882+ ;; 5883+ esac 5884+ ;; 5885+ * ) # unhandled hosts (and "normal" native builds) 5886+ lt_cv_to_host_file_cmd=func_convert_file_noop 5887+ ;; 5888+esac 5889+ 5890+fi 5891+ 5892+to_host_file_cmd=$lt_cv_to_host_file_cmd 5893+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 5894+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 5895+ 5896+ 5897+ 5898+ 5899+ 5900+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 5901+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 5902+if ${lt_cv_to_tool_file_cmd+:} false; then : 5903+ $as_echo_n "(cached) " >&6 5904+else 5905+ #assume ordinary cross tools, or native build. 5906+lt_cv_to_tool_file_cmd=func_convert_file_noop 5907+case $host in 5908+ *-*-mingw* ) 5909+ case $build in 5910+ *-*-mingw* ) # actually msys 5911+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 5912+ ;; 5913+ esac 5914+ ;; 5915+esac 5916+ 5917+fi 5918+ 5919+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 5920+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 5921+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 5922+ 5923+ 5924+ 5925+ 5926+ 5927 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 5928 $as_echo_n "checking for $LD option to reload object files... " >&6; } 5929 if ${lt_cv_ld_reload_flag+:} false; then : 5930@@ -5304,6 +5384,11 @@ case $reload_flag in 5931 esac 5932 reload_cmds='$LD$reload_flag -o $output$reload_objs' 5933 case $host_os in 5934+ cygwin* | mingw* | pw32* | cegcc*) 5935+ if test "$GCC" != yes; then 5936+ reload_cmds=false 5937+ fi 5938+ ;; 5939 darwin*) 5940 if test "$GCC" = yes; then 5941 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 5942@@ -5472,7 +5557,8 @@ mingw* | pw32*) 5943 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 5944 lt_cv_file_magic_cmd='func_win32_libid' 5945 else 5946- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 5947+ # Keep this pattern in sync with the one in func_win32_libid. 5948+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 5949 lt_cv_file_magic_cmd='$OBJDUMP -f' 5950 fi 5951 ;; 5952@@ -5626,6 +5712,21 @@ esac 5953 fi 5954 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5955 $as_echo "$lt_cv_deplibs_check_method" >&6; } 5956+ 5957+file_magic_glob= 5958+want_nocaseglob=no 5959+if test "$build" = "$host"; then 5960+ case $host_os in 5961+ mingw* | pw32*) 5962+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 5963+ want_nocaseglob=yes 5964+ else 5965+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 5966+ fi 5967+ ;; 5968+ esac 5969+fi 5970+ 5971 file_magic_cmd=$lt_cv_file_magic_cmd 5972 deplibs_check_method=$lt_cv_deplibs_check_method 5973 test -z "$deplibs_check_method" && deplibs_check_method=unknown 5974@@ -5641,6 +5742,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 5975 5976 5977 5978+ 5979+ 5980+ 5981+ 5982+ 5983+ 5984+ 5985+ 5986+ 5987+ 5988+if test -n "$ac_tool_prefix"; then 5989+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 5990+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 5991+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 5992+$as_echo_n "checking for $ac_word... " >&6; } 5993+if ${ac_cv_prog_DLLTOOL+:} false; then : 5994+ $as_echo_n "(cached) " >&6 5995+else 5996+ if test -n "$DLLTOOL"; then 5997+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 5998+else 5999+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6000+for as_dir in $PATH 6001+do 6002+ IFS=$as_save_IFS 6003+ test -z "$as_dir" && as_dir=. 6004+ for ac_exec_ext in '' $ac_executable_extensions; do 6005+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6006+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 6007+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6008+ break 2 6009+ fi 6010+done 6011+ done 6012+IFS=$as_save_IFS 6013+ 6014+fi 6015+fi 6016+DLLTOOL=$ac_cv_prog_DLLTOOL 6017+if test -n "$DLLTOOL"; then 6018+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 6019+$as_echo "$DLLTOOL" >&6; } 6020+else 6021+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6022+$as_echo "no" >&6; } 6023+fi 6024+ 6025+ 6026+fi 6027+if test -z "$ac_cv_prog_DLLTOOL"; then 6028+ ac_ct_DLLTOOL=$DLLTOOL 6029+ # Extract the first word of "dlltool", so it can be a program name with args. 6030+set dummy dlltool; ac_word=$2 6031+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6032+$as_echo_n "checking for $ac_word... " >&6; } 6033+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 6034+ $as_echo_n "(cached) " >&6 6035+else 6036+ if test -n "$ac_ct_DLLTOOL"; then 6037+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 6038+else 6039+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6040+for as_dir in $PATH 6041+do 6042+ IFS=$as_save_IFS 6043+ test -z "$as_dir" && as_dir=. 6044+ for ac_exec_ext in '' $ac_executable_extensions; do 6045+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6046+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 6047+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6048+ break 2 6049+ fi 6050+done 6051+ done 6052+IFS=$as_save_IFS 6053+ 6054+fi 6055+fi 6056+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 6057+if test -n "$ac_ct_DLLTOOL"; then 6058+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 6059+$as_echo "$ac_ct_DLLTOOL" >&6; } 6060+else 6061+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6062+$as_echo "no" >&6; } 6063+fi 6064+ 6065+ if test "x$ac_ct_DLLTOOL" = x; then 6066+ DLLTOOL="false" 6067+ else 6068+ case $cross_compiling:$ac_tool_warned in 6069+yes:) 6070+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 6071+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 6072+ac_tool_warned=yes ;; 6073+esac 6074+ DLLTOOL=$ac_ct_DLLTOOL 6075+ fi 6076+else 6077+ DLLTOOL="$ac_cv_prog_DLLTOOL" 6078+fi 6079+ 6080+test -z "$DLLTOOL" && DLLTOOL=dlltool 6081+ 6082+ 6083+ 6084+ 6085+ 6086+ 6087+ 6088+ 6089+ 6090+ 6091+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 6092+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 6093+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 6094+ $as_echo_n "(cached) " >&6 6095+else 6096+ lt_cv_sharedlib_from_linklib_cmd='unknown' 6097+ 6098+case $host_os in 6099+cygwin* | mingw* | pw32* | cegcc*) 6100+ # two different shell functions defined in ltmain.sh 6101+ # decide which to use based on capabilities of $DLLTOOL 6102+ case `$DLLTOOL --help 2>&1` in 6103+ *--identify-strict*) 6104+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 6105+ ;; 6106+ *) 6107+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 6108+ ;; 6109+ esac 6110+ ;; 6111+*) 6112+ # fallback: assume linklib IS sharedlib 6113+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 6114+ ;; 6115+esac 6116+ 6117+fi 6118+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 6119+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 6120+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 6121+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 6122+ 6123+ 6124+ 6125+ 6126+ 6127+ 6128+ 6129 plugin_option= 6130 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 6131 for plugin in $plugin_names; do 6132@@ -5655,8 +5907,10 @@ for plugin in $plugin_names; do 6133 done 6134 6135 if test -n "$ac_tool_prefix"; then 6136- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 6137-set dummy ${ac_tool_prefix}ar; ac_word=$2 6138+ for ac_prog in ar 6139+ do 6140+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 6141+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 6142 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6143 $as_echo_n "checking for $ac_word... " >&6; } 6144 if ${ac_cv_prog_AR+:} false; then : 6145@@ -5672,7 +5926,7 @@ do 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_AR="${ac_tool_prefix}ar" 6150+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 6151 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6152 break 2 6153 fi 6154@@ -5692,11 +5946,15 @@ $as_echo "no" >&6; } 6155 fi 6156 6157 6158+ test -n "$AR" && break 6159+ done 6160 fi 6161-if test -z "$ac_cv_prog_AR"; then 6162+if test -z "$AR"; then 6163 ac_ct_AR=$AR 6164- # Extract the first word of "ar", so it can be a program name with args. 6165-set dummy ar; ac_word=$2 6166+ for ac_prog in ar 6167+do 6168+ # Extract the first word of "$ac_prog", so it can be a program name with args. 6169+set dummy $ac_prog; ac_word=$2 6170 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6171 $as_echo_n "checking for $ac_word... " >&6; } 6172 if ${ac_cv_prog_ac_ct_AR+:} false; then : 6173@@ -5712,7 +5970,7 @@ do 6174 test -z "$as_dir" && as_dir=. 6175 for ac_exec_ext in '' $ac_executable_extensions; do 6176 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6177- ac_cv_prog_ac_ct_AR="ar" 6178+ ac_cv_prog_ac_ct_AR="$ac_prog" 6179 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6180 break 2 6181 fi 6182@@ -5731,6 +5989,10 @@ else 6183 $as_echo "no" >&6; } 6184 fi 6185 6186+ 6187+ test -n "$ac_ct_AR" && break 6188+done 6189+ 6190 if test "x$ac_ct_AR" = x; then 6191 AR="false" 6192 else 6193@@ -5742,25 +6004,19 @@ ac_tool_warned=yes ;; 6194 esac 6195 AR=$ac_ct_AR 6196 fi 6197-else 6198- AR="$ac_cv_prog_AR" 6199 fi 6200 6201-test -z "$AR" && AR=ar 6202-if test -n "$plugin_option"; then 6203- if $AR --help 2>&1 | grep -q "\--plugin"; then 6204- touch conftest.c 6205- $AR $plugin_option rc conftest.a conftest.c 6206- if test "$?" != 0; then 6207- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 6208+ touch conftest.c 6209+ $AR $plugin_option rc conftest.a conftest.c 6210+ if test "$?" != 0; then 6211+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 6212 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 6213- else 6214- AR="$AR $plugin_option" 6215- fi 6216- rm -f conftest.* 6217+ else 6218+ AR="$AR $plugin_option" 6219 fi 6220-fi 6221-test -z "$AR_FLAGS" && AR_FLAGS=cru 6222+ rm -f conftest.* 6223+: ${AR=ar} 6224+: ${AR_FLAGS=cru} 6225 6226 6227 6228@@ -5772,6 +6028,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 6229 6230 6231 6232+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 6233+$as_echo_n "checking for archiver @FILE support... " >&6; } 6234+if ${lt_cv_ar_at_file+:} false; then : 6235+ $as_echo_n "(cached) " >&6 6236+else 6237+ lt_cv_ar_at_file=no 6238+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6239+/* end confdefs.h. */ 6240+ 6241+int 6242+main () 6243+{ 6244+ 6245+ ; 6246+ return 0; 6247+} 6248+_ACEOF 6249+if ac_fn_c_try_compile "$LINENO"; then : 6250+ echo conftest.$ac_objext > conftest.lst 6251+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 6252+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 6253+ (eval $lt_ar_try) 2>&5 6254+ ac_status=$? 6255+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 6256+ test $ac_status = 0; } 6257+ if test "$ac_status" -eq 0; then 6258+ # Ensure the archiver fails upon bogus file names. 6259+ rm -f conftest.$ac_objext libconftest.a 6260+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 6261+ (eval $lt_ar_try) 2>&5 6262+ ac_status=$? 6263+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 6264+ test $ac_status = 0; } 6265+ if test "$ac_status" -ne 0; then 6266+ lt_cv_ar_at_file=@ 6267+ fi 6268+ fi 6269+ rm -f conftest.* libconftest.a 6270+ 6271+fi 6272+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6273+ 6274+fi 6275+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 6276+$as_echo "$lt_cv_ar_at_file" >&6; } 6277+ 6278+if test "x$lt_cv_ar_at_file" = xno; then 6279+ archiver_list_spec= 6280+else 6281+ archiver_list_spec=$lt_cv_ar_at_file 6282+fi 6283+ 6284+ 6285+ 6286+ 6287+ 6288+ 6289+ 6290 if test -n "$ac_tool_prefix"; then 6291 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 6292 set dummy ${ac_tool_prefix}strip; ac_word=$2 6293@@ -6111,8 +6425,8 @@ esac 6294 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 6295 6296 # Transform an extracted symbol line into symbol name and symbol address 6297-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 6298-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'" 6299+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 6300+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'" 6301 6302 # Handle CRLF in mingw tool chain 6303 opt_cr= 6304@@ -6148,6 +6462,7 @@ for ac_symprfx in "" "_"; do 6305 else 6306 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 6307 fi 6308+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 6309 6310 # Check to see that the pipe works correctly. 6311 pipe_works=no 6312@@ -6189,6 +6504,18 @@ _LT_EOF 6313 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 6314 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 6315 cat <<_LT_EOF > conftest.$ac_ext 6316+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 6317+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 6318+/* DATA imports from DLLs on WIN32 con't be const, because runtime 6319+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 6320+# define LT_DLSYM_CONST 6321+#elif defined(__osf__) 6322+/* This system does not cope well with relocations in const data. */ 6323+# define LT_DLSYM_CONST 6324+#else 6325+# define LT_DLSYM_CONST const 6326+#endif 6327+ 6328 #ifdef __cplusplus 6329 extern "C" { 6330 #endif 6331@@ -6200,7 +6527,7 @@ _LT_EOF 6332 cat <<_LT_EOF >> conftest.$ac_ext 6333 6334 /* The mapping between symbol names and symbols. */ 6335-const struct { 6336+LT_DLSYM_CONST struct { 6337 const char *name; 6338 void *address; 6339 } 6340@@ -6226,8 +6553,8 @@ static const void *lt_preloaded_setup() { 6341 _LT_EOF 6342 # Now try linking the two files. 6343 mv conftest.$ac_objext conftstm.$ac_objext 6344- lt_save_LIBS="$LIBS" 6345- lt_save_CFLAGS="$CFLAGS" 6346+ lt_globsym_save_LIBS=$LIBS 6347+ lt_globsym_save_CFLAGS=$CFLAGS 6348 LIBS="conftstm.$ac_objext" 6349 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 6350 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 6351@@ -6237,8 +6564,8 @@ _LT_EOF 6352 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 6353 pipe_works=yes 6354 fi 6355- LIBS="$lt_save_LIBS" 6356- CFLAGS="$lt_save_CFLAGS" 6357+ LIBS=$lt_globsym_save_LIBS 6358+ CFLAGS=$lt_globsym_save_CFLAGS 6359 else 6360 echo "cannot find nm_test_func in $nlist" >&5 6361 fi 6362@@ -6275,6 +6602,18 @@ else 6363 $as_echo "ok" >&6; } 6364 fi 6365 6366+# Response file support. 6367+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 6368+ nm_file_list_spec='@' 6369+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 6370+ nm_file_list_spec='@' 6371+fi 6372+ 6373+ 6374+ 6375+ 6376+ 6377+ 6378 6379 6380 6381@@ -6291,6 +6630,43 @@ fi 6382 6383 6384 6385+ 6386+ 6387+ 6388+ 6389+ 6390+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 6391+$as_echo_n "checking for sysroot... " >&6; } 6392+ 6393+# Check whether --with-libtool-sysroot was given. 6394+if test "${with_libtool_sysroot+set}" = set; then : 6395+ withval=$with_libtool_sysroot; 6396+else 6397+ with_libtool_sysroot=no 6398+fi 6399+ 6400+ 6401+lt_sysroot= 6402+case ${with_libtool_sysroot} in #( 6403+ yes) 6404+ if test "$GCC" = yes; then 6405+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 6406+ fi 6407+ ;; #( 6408+ /*) 6409+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 6410+ ;; #( 6411+ no|'') 6412+ ;; #( 6413+ *) 6414+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 6415+$as_echo "${with_libtool_sysroot}" >&6; } 6416+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 6417+ ;; 6418+esac 6419+ 6420+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 6421+$as_echo "${lt_sysroot:-no}" >&6; } 6422 6423 6424 6425@@ -6502,6 +6878,123 @@ esac 6426 6427 need_locks="$enable_libtool_lock" 6428 6429+if test -n "$ac_tool_prefix"; then 6430+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 6431+set dummy ${ac_tool_prefix}mt; ac_word=$2 6432+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6433+$as_echo_n "checking for $ac_word... " >&6; } 6434+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 6435+ $as_echo_n "(cached) " >&6 6436+else 6437+ if test -n "$MANIFEST_TOOL"; then 6438+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 6439+else 6440+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6441+for as_dir in $PATH 6442+do 6443+ IFS=$as_save_IFS 6444+ test -z "$as_dir" && as_dir=. 6445+ for ac_exec_ext in '' $ac_executable_extensions; do 6446+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6447+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 6448+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6449+ break 2 6450+ fi 6451+done 6452+ done 6453+IFS=$as_save_IFS 6454+ 6455+fi 6456+fi 6457+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 6458+if test -n "$MANIFEST_TOOL"; then 6459+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 6460+$as_echo "$MANIFEST_TOOL" >&6; } 6461+else 6462+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6463+$as_echo "no" >&6; } 6464+fi 6465+ 6466+ 6467+fi 6468+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 6469+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 6470+ # Extract the first word of "mt", so it can be a program name with args. 6471+set dummy mt; ac_word=$2 6472+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6473+$as_echo_n "checking for $ac_word... " >&6; } 6474+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 6475+ $as_echo_n "(cached) " >&6 6476+else 6477+ if test -n "$ac_ct_MANIFEST_TOOL"; then 6478+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 6479+else 6480+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6481+for as_dir in $PATH 6482+do 6483+ IFS=$as_save_IFS 6484+ test -z "$as_dir" && as_dir=. 6485+ for ac_exec_ext in '' $ac_executable_extensions; do 6486+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6487+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 6488+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6489+ break 2 6490+ fi 6491+done 6492+ done 6493+IFS=$as_save_IFS 6494+ 6495+fi 6496+fi 6497+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 6498+if test -n "$ac_ct_MANIFEST_TOOL"; then 6499+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 6500+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 6501+else 6502+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6503+$as_echo "no" >&6; } 6504+fi 6505+ 6506+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 6507+ MANIFEST_TOOL=":" 6508+ else 6509+ case $cross_compiling:$ac_tool_warned in 6510+yes:) 6511+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 6512+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 6513+ac_tool_warned=yes ;; 6514+esac 6515+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 6516+ fi 6517+else 6518+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 6519+fi 6520+ 6521+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 6522+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 6523+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 6524+if ${lt_cv_path_mainfest_tool+:} false; then : 6525+ $as_echo_n "(cached) " >&6 6526+else 6527+ lt_cv_path_mainfest_tool=no 6528+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 6529+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 6530+ cat conftest.err >&5 6531+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 6532+ lt_cv_path_mainfest_tool=yes 6533+ fi 6534+ rm -f conftest* 6535+fi 6536+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 6537+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 6538+if test "x$lt_cv_path_mainfest_tool" != xyes; then 6539+ MANIFEST_TOOL=: 6540+fi 6541+ 6542+ 6543+ 6544+ 6545+ 6546 6547 case $host_os in 6548 rhapsody* | darwin*) 6549@@ -7065,6 +7558,8 @@ _LT_EOF 6550 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 6551 echo "$AR cru libconftest.a conftest.o" >&5 6552 $AR cru libconftest.a conftest.o 2>&5 6553+ echo "$RANLIB libconftest.a" >&5 6554+ $RANLIB libconftest.a 2>&5 6555 cat > conftest.c << _LT_EOF 6556 int main() { return 0;} 6557 _LT_EOF 6558@@ -7647,8 +8142,6 @@ fi 6559 lt_prog_compiler_pic= 6560 lt_prog_compiler_static= 6561 6562-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 6563-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6564 6565 if test "$GCC" = yes; then 6566 lt_prog_compiler_wl='-Wl,' 6567@@ -7814,6 +8307,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6568 lt_prog_compiler_pic='--shared' 6569 lt_prog_compiler_static='--static' 6570 ;; 6571+ nagfor*) 6572+ # NAG Fortran compiler 6573+ lt_prog_compiler_wl='-Wl,-Wl,,' 6574+ lt_prog_compiler_pic='-PIC' 6575+ lt_prog_compiler_static='-Bstatic' 6576+ ;; 6577 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 6578 # Portland Group compilers (*not* the Pentium gcc compiler, 6579 # which looks to be a dead project) 6580@@ -7876,7 +8375,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6581 lt_prog_compiler_pic='-KPIC' 6582 lt_prog_compiler_static='-Bstatic' 6583 case $cc_basename in 6584- f77* | f90* | f95*) 6585+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 6586 lt_prog_compiler_wl='-Qoption ld ';; 6587 *) 6588 lt_prog_compiler_wl='-Wl,';; 6589@@ -7933,13 +8432,17 @@ case $host_os in 6590 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 6591 ;; 6592 esac 6593-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 6594-$as_echo "$lt_prog_compiler_pic" >&6; } 6595- 6596- 6597- 6598- 6599 6600+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 6601+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 6602+if ${lt_cv_prog_compiler_pic+:} false; then : 6603+ $as_echo_n "(cached) " >&6 6604+else 6605+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 6606+fi 6607+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 6608+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 6609+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 6610 6611 # 6612 # Check to make sure the PIC flag actually works. 6613@@ -8000,6 +8503,11 @@ fi 6614 6615 6616 6617+ 6618+ 6619+ 6620+ 6621+ 6622 # 6623 # Check to make sure the static flag actually works. 6624 # 6625@@ -8350,7 +8858,8 @@ _LT_EOF 6626 allow_undefined_flag=unsupported 6627 always_export_symbols=no 6628 enable_shared_with_static_runtimes=yes 6629- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 6630+ 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' 6631+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 6632 6633 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 6634 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 6635@@ -8449,12 +8958,12 @@ _LT_EOF 6636 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 6637 hardcode_libdir_flag_spec= 6638 hardcode_libdir_flag_spec_ld='-rpath $libdir' 6639- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 6640+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 6641 if test "x$supports_anon_versioning" = xyes; then 6642 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 6643 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 6644 echo "local: *; };" >> $output_objdir/$libname.ver~ 6645- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 6646+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 6647 fi 6648 ;; 6649 esac 6650@@ -8468,8 +8977,8 @@ _LT_EOF 6651 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 6652 wlarc= 6653 else 6654- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6655- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6656+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6657+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6658 fi 6659 ;; 6660 6661@@ -8487,8 +8996,8 @@ _LT_EOF 6662 6663 _LT_EOF 6664 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6665- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6666- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6667+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6668+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6669 else 6670 ld_shlibs=no 6671 fi 6672@@ -8534,8 +9043,8 @@ _LT_EOF 6673 6674 *) 6675 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 6676- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6677- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6678+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6679+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 6680 else 6681 ld_shlibs=no 6682 fi 6683@@ -8665,7 +9174,13 @@ _LT_EOF 6684 allow_undefined_flag='-berok' 6685 # Determine the default libpath from the value encoded in an 6686 # empty executable. 6687- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6688+ if test "${lt_cv_aix_libpath+set}" = set; then 6689+ aix_libpath=$lt_cv_aix_libpath 6690+else 6691+ if ${lt_cv_aix_libpath_+:} false; then : 6692+ $as_echo_n "(cached) " >&6 6693+else 6694+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6695 /* end confdefs.h. */ 6696 6697 int 6698@@ -8678,22 +9193,29 @@ main () 6699 _ACEOF 6700 if ac_fn_c_try_link "$LINENO"; then : 6701 6702-lt_aix_libpath_sed=' 6703- /Import File Strings/,/^$/ { 6704- /^0/ { 6705- s/^0 *\(.*\)$/\1/ 6706- p 6707- } 6708- }' 6709-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6710-# Check for a 64-bit object if we didn't find anything. 6711-if test -z "$aix_libpath"; then 6712- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6713-fi 6714+ lt_aix_libpath_sed=' 6715+ /Import File Strings/,/^$/ { 6716+ /^0/ { 6717+ s/^0 *\([^ ]*\) *$/\1/ 6718+ p 6719+ } 6720+ }' 6721+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6722+ # Check for a 64-bit object if we didn't find anything. 6723+ if test -z "$lt_cv_aix_libpath_"; then 6724+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6725+ fi 6726 fi 6727 rm -f core conftest.err conftest.$ac_objext \ 6728 conftest$ac_exeext conftest.$ac_ext 6729-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6730+ if test -z "$lt_cv_aix_libpath_"; then 6731+ lt_cv_aix_libpath_="/usr/lib:/lib" 6732+ fi 6733+ 6734+fi 6735+ 6736+ aix_libpath=$lt_cv_aix_libpath_ 6737+fi 6738 6739 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6740 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" 6741@@ -8705,7 +9227,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6742 else 6743 # Determine the default libpath from the value encoded in an 6744 # empty executable. 6745- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6746+ if test "${lt_cv_aix_libpath+set}" = set; then 6747+ aix_libpath=$lt_cv_aix_libpath 6748+else 6749+ if ${lt_cv_aix_libpath_+:} false; then : 6750+ $as_echo_n "(cached) " >&6 6751+else 6752+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6753 /* end confdefs.h. */ 6754 6755 int 6756@@ -8718,22 +9246,29 @@ main () 6757 _ACEOF 6758 if ac_fn_c_try_link "$LINENO"; then : 6759 6760-lt_aix_libpath_sed=' 6761- /Import File Strings/,/^$/ { 6762- /^0/ { 6763- s/^0 *\(.*\)$/\1/ 6764- p 6765- } 6766- }' 6767-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6768-# Check for a 64-bit object if we didn't find anything. 6769-if test -z "$aix_libpath"; then 6770- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6771-fi 6772+ lt_aix_libpath_sed=' 6773+ /Import File Strings/,/^$/ { 6774+ /^0/ { 6775+ s/^0 *\([^ ]*\) *$/\1/ 6776+ p 6777+ } 6778+ }' 6779+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6780+ # Check for a 64-bit object if we didn't find anything. 6781+ if test -z "$lt_cv_aix_libpath_"; then 6782+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 6783+ fi 6784 fi 6785 rm -f core conftest.err conftest.$ac_objext \ 6786 conftest$ac_exeext conftest.$ac_ext 6787-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6788+ if test -z "$lt_cv_aix_libpath_"; then 6789+ lt_cv_aix_libpath_="/usr/lib:/lib" 6790+ fi 6791+ 6792+fi 6793+ 6794+ aix_libpath=$lt_cv_aix_libpath_ 6795+fi 6796 6797 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 6798 # Warning - without using the other run time loading flags, 6799@@ -8778,20 +9313,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6800 # Microsoft Visual C++. 6801 # hardcode_libdir_flag_spec is actually meaningless, as there is 6802 # no search path for DLLs. 6803- hardcode_libdir_flag_spec=' ' 6804- allow_undefined_flag=unsupported 6805- # Tell ltmain to make .lib files, not .a files. 6806- libext=lib 6807- # Tell ltmain to make .dll files, not .so files. 6808- shrext_cmds=".dll" 6809- # FIXME: Setting linknames here is a bad hack. 6810- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 6811- # The linker will automatically build a .lib file if we build a DLL. 6812- old_archive_from_new_cmds='true' 6813- # FIXME: Should let the user specify the lib program. 6814- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 6815- fix_srcfile_path='`cygpath -w "$srcfile"`' 6816- enable_shared_with_static_runtimes=yes 6817+ case $cc_basename in 6818+ cl*) 6819+ # Native MSVC 6820+ hardcode_libdir_flag_spec=' ' 6821+ allow_undefined_flag=unsupported 6822+ always_export_symbols=yes 6823+ file_list_spec='@' 6824+ # Tell ltmain to make .lib files, not .a files. 6825+ libext=lib 6826+ # Tell ltmain to make .dll files, not .so files. 6827+ shrext_cmds=".dll" 6828+ # FIXME: Setting linknames here is a bad hack. 6829+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 6830+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 6831+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 6832+ else 6833+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 6834+ fi~ 6835+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 6836+ linknames=' 6837+ # The linker will not automatically build a static lib if we build a DLL. 6838+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 6839+ enable_shared_with_static_runtimes=yes 6840+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 6841+ # Don't use ranlib 6842+ old_postinstall_cmds='chmod 644 $oldlib' 6843+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 6844+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 6845+ case $lt_outputfile in 6846+ *.exe|*.EXE) ;; 6847+ *) 6848+ lt_outputfile="$lt_outputfile.exe" 6849+ lt_tool_outputfile="$lt_tool_outputfile.exe" 6850+ ;; 6851+ esac~ 6852+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 6853+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 6854+ $RM "$lt_outputfile.manifest"; 6855+ fi' 6856+ ;; 6857+ *) 6858+ # Assume MSVC wrapper 6859+ hardcode_libdir_flag_spec=' ' 6860+ allow_undefined_flag=unsupported 6861+ # Tell ltmain to make .lib files, not .a files. 6862+ libext=lib 6863+ # Tell ltmain to make .dll files, not .so files. 6864+ shrext_cmds=".dll" 6865+ # FIXME: Setting linknames here is a bad hack. 6866+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 6867+ # The linker will automatically build a .lib file if we build a DLL. 6868+ old_archive_from_new_cmds='true' 6869+ # FIXME: Should let the user specify the lib program. 6870+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 6871+ enable_shared_with_static_runtimes=yes 6872+ ;; 6873+ esac 6874 ;; 6875 6876 darwin* | rhapsody*) 6877@@ -8852,7 +9430,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6878 6879 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 6880 freebsd* | dragonfly*) 6881- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 6882+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 6883 hardcode_libdir_flag_spec='-R$libdir' 6884 hardcode_direct=yes 6885 hardcode_shlibpath_var=no 6886@@ -8860,7 +9438,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6887 6888 hpux9*) 6889 if test "$GCC" = yes; then 6890- 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' 6891+ 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' 6892 else 6893 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' 6894 fi 6895@@ -8876,7 +9454,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6896 6897 hpux10*) 6898 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 6899- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 6900+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 6901 else 6902 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 6903 fi 6904@@ -8900,10 +9478,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 6905 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6906 ;; 6907 ia64*) 6908- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 6909+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 6910 ;; 6911 *) 6912- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 6913+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 6914 ;; 6915 esac 6916 else 6917@@ -8982,23 +9560,36 @@ fi 6918 6919 irix5* | irix6* | nonstopux*) 6920 if test "$GCC" = yes; then 6921- 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' 6922+ 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' 6923 # Try to use the -exported_symbol ld option, if it does not 6924 # work, assume that -exports_file does not work either and 6925 # implicitly export all symbols. 6926- save_LDFLAGS="$LDFLAGS" 6927- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 6928- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6929+ # This should be the same for all languages, so no per-tag cache variable. 6930+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 6931+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 6932+if ${lt_cv_irix_exported_symbol+:} false; then : 6933+ $as_echo_n "(cached) " >&6 6934+else 6935+ save_LDFLAGS="$LDFLAGS" 6936+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 6937+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6938 /* end confdefs.h. */ 6939-int foo(void) {} 6940+int foo (void) { return 0; } 6941 _ACEOF 6942 if ac_fn_c_try_link "$LINENO"; then : 6943- 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' 6944- 6945+ lt_cv_irix_exported_symbol=yes 6946+else 6947+ lt_cv_irix_exported_symbol=no 6948 fi 6949 rm -f core conftest.err conftest.$ac_objext \ 6950 conftest$ac_exeext conftest.$ac_ext 6951- LDFLAGS="$save_LDFLAGS" 6952+ LDFLAGS="$save_LDFLAGS" 6953+fi 6954+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 6955+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 6956+ if test "$lt_cv_irix_exported_symbol" = yes; then 6957+ 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' 6958+ fi 6959 else 6960 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' 6961 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' 6962@@ -9083,7 +9674,7 @@ rm -f core conftest.err conftest.$ac_objext \ 6963 osf4* | osf5*) # as osf3* with the addition of -msym flag 6964 if test "$GCC" = yes; then 6965 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 6966- 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' 6967+ 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' 6968 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 6969 else 6970 allow_undefined_flag=' -expect_unresolved \*' 6971@@ -9102,9 +9693,9 @@ rm -f core conftest.err conftest.$ac_objext \ 6972 no_undefined_flag=' -z defs' 6973 if test "$GCC" = yes; then 6974 wlarc='${wl}' 6975- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6976+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 6977 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 6978- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 6979+ $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' 6980 else 6981 case `$CC -V 2>&1` in 6982 *"Compilers 5.0"*) 6983@@ -9680,8 +10271,9 @@ cygwin* | mingw* | pw32* | cegcc*) 6984 need_version=no 6985 need_lib_prefix=no 6986 6987- case $GCC,$host_os in 6988- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 6989+ case $GCC,$cc_basename in 6990+ yes,*) 6991+ # gcc 6992 library_names_spec='$libname.dll.a' 6993 # DLL is installed to $(libdir)/../bin by postinstall_cmds 6994 postinstall_cmds='base_file=`basename \${file}`~ 6995@@ -9714,13 +10306,71 @@ cygwin* | mingw* | pw32* | cegcc*) 6996 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 6997 ;; 6998 esac 6999+ dynamic_linker='Win32 ld.exe' 7000+ ;; 7001+ 7002+ *,cl*) 7003+ # Native MSVC 7004+ libname_spec='$name' 7005+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 7006+ library_names_spec='${libname}.dll.lib' 7007+ 7008+ case $build_os in 7009+ mingw*) 7010+ sys_lib_search_path_spec= 7011+ lt_save_ifs=$IFS 7012+ IFS=';' 7013+ for lt_path in $LIB 7014+ do 7015+ IFS=$lt_save_ifs 7016+ # Let DOS variable expansion print the short 8.3 style file name. 7017+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 7018+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 7019+ done 7020+ IFS=$lt_save_ifs 7021+ # Convert to MSYS style. 7022+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 7023+ ;; 7024+ cygwin*) 7025+ # Convert to unix form, then to dos form, then back to unix form 7026+ # but this time dos style (no spaces!) so that the unix form looks 7027+ # like /cygdrive/c/PROGRA~1:/cygdr... 7028+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 7029+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 7030+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 7031+ ;; 7032+ *) 7033+ sys_lib_search_path_spec="$LIB" 7034+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 7035+ # It is most probably a Windows format PATH. 7036+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 7037+ else 7038+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 7039+ fi 7040+ # FIXME: find the short name or the path components, as spaces are 7041+ # common. (e.g. "Program Files" -> "PROGRA~1") 7042+ ;; 7043+ esac 7044+ 7045+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 7046+ postinstall_cmds='base_file=`basename \${file}`~ 7047+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 7048+ dldir=$destdir/`dirname \$dlpath`~ 7049+ test -d \$dldir || mkdir -p \$dldir~ 7050+ $install_prog $dir/$dlname \$dldir/$dlname' 7051+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 7052+ dlpath=$dir/\$dldll~ 7053+ $RM \$dlpath' 7054+ shlibpath_overrides_runpath=yes 7055+ dynamic_linker='Win32 link.exe' 7056 ;; 7057 7058 *) 7059+ # Assume MSVC wrapper 7060 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 7061+ dynamic_linker='Win32 ld.exe' 7062 ;; 7063 esac 7064- dynamic_linker='Win32 ld.exe' 7065 # FIXME: first we should search . and the directory the executable is in 7066 shlibpath_var=PATH 7067 ;; 7068@@ -10598,7 +11248,7 @@ else 7069 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7070 lt_status=$lt_dlunknown 7071 cat > conftest.$ac_ext <<_LT_EOF 7072-#line 10601 "configure" 7073+#line $LINENO "configure" 7074 #include "confdefs.h" 7075 7076 #if HAVE_DLFCN_H 7077@@ -10642,10 +11292,10 @@ else 7078 /* When -fvisbility=hidden is used, assume the code has been annotated 7079 correspondingly for the symbols needed. */ 7080 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7081-void fnord () __attribute__((visibility("default"))); 7082+int fnord () __attribute__((visibility("default"))); 7083 #endif 7084 7085-void fnord () { int i=42; } 7086+int fnord () { return 42; } 7087 int main () 7088 { 7089 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7090@@ -10704,7 +11354,7 @@ else 7091 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 7092 lt_status=$lt_dlunknown 7093 cat > conftest.$ac_ext <<_LT_EOF 7094-#line 10707 "configure" 7095+#line $LINENO "configure" 7096 #include "confdefs.h" 7097 7098 #if HAVE_DLFCN_H 7099@@ -10748,10 +11398,10 @@ else 7100 /* When -fvisbility=hidden is used, assume the code has been annotated 7101 correspondingly for the symbols needed. */ 7102 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 7103-void fnord () __attribute__((visibility("default"))); 7104+int fnord () __attribute__((visibility("default"))); 7105 #endif 7106 7107-void fnord () { int i=42; } 7108+int fnord () { return 42; } 7109 int main () 7110 { 7111 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 7112@@ -12771,13 +13421,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 7113 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 7114 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 7115 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 7116+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 7117+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 7118 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 7119 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 7120 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 7121 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 7122 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 7123+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 7124+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 7125+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 7126+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 7127 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 7128 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 7129+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 7130 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 7131 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 7132 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 7133@@ -12792,14 +13449,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 7134 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 7135 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 7136 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"`' 7137+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 7138+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 7139 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 7140 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 7141 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 7142-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 7143 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 7144+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 7145 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 7146 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 7147 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 7148+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 7149 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 7150 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 7151 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 7152@@ -12832,12 +13492,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 7153 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 7154 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 7155 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 7156-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 7157 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 7158 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 7159 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 7160 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 7161 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 7162+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 7163 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 7164 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 7165 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 7166@@ -12892,8 +13552,13 @@ reload_flag \ 7167 OBJDUMP \ 7168 deplibs_check_method \ 7169 file_magic_cmd \ 7170+file_magic_glob \ 7171+want_nocaseglob \ 7172+DLLTOOL \ 7173+sharedlib_from_linklib_cmd \ 7174 AR \ 7175 AR_FLAGS \ 7176+archiver_list_spec \ 7177 STRIP \ 7178 RANLIB \ 7179 CC \ 7180@@ -12903,12 +13568,14 @@ lt_cv_sys_global_symbol_pipe \ 7181 lt_cv_sys_global_symbol_to_cdecl \ 7182 lt_cv_sys_global_symbol_to_c_name_address \ 7183 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 7184+nm_file_list_spec \ 7185 lt_prog_compiler_no_builtin_flag \ 7186-lt_prog_compiler_wl \ 7187 lt_prog_compiler_pic \ 7188+lt_prog_compiler_wl \ 7189 lt_prog_compiler_static \ 7190 lt_cv_prog_compiler_c_o \ 7191 need_locks \ 7192+MANIFEST_TOOL \ 7193 DSYMUTIL \ 7194 NMEDIT \ 7195 LIPO \ 7196@@ -12924,7 +13591,6 @@ no_undefined_flag \ 7197 hardcode_libdir_flag_spec \ 7198 hardcode_libdir_flag_spec_ld \ 7199 hardcode_libdir_separator \ 7200-fix_srcfile_path \ 7201 exclude_expsyms \ 7202 include_expsyms \ 7203 file_list_spec \ 7204@@ -12960,6 +13626,7 @@ module_cmds \ 7205 module_expsym_cmds \ 7206 export_symbols_cmds \ 7207 prelink_cmds \ 7208+postlink_cmds \ 7209 postinstall_cmds \ 7210 postuninstall_cmds \ 7211 finish_cmds \ 7212@@ -13725,7 +14392,8 @@ $as_echo X"$file" | 7213 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 7214 # 7215 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 7216-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 7217+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 7218+# Inc. 7219 # Written by Gordon Matzigkeit, 1996 7220 # 7221 # This file is part of GNU Libtool. 7222@@ -13828,19 +14496,42 @@ SP2NL=$lt_lt_SP2NL 7223 # turn newlines into spaces. 7224 NL2SP=$lt_lt_NL2SP 7225 7226+# convert \$build file names to \$host format. 7227+to_host_file_cmd=$lt_cv_to_host_file_cmd 7228+ 7229+# convert \$build files to toolchain format. 7230+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 7231+ 7232 # An object symbol dumper. 7233 OBJDUMP=$lt_OBJDUMP 7234 7235 # Method to check whether dependent libraries are shared objects. 7236 deplibs_check_method=$lt_deplibs_check_method 7237 7238-# Command to use when deplibs_check_method == "file_magic". 7239+# Command to use when deplibs_check_method = "file_magic". 7240 file_magic_cmd=$lt_file_magic_cmd 7241 7242+# How to find potential files when deplibs_check_method = "file_magic". 7243+file_magic_glob=$lt_file_magic_glob 7244+ 7245+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 7246+want_nocaseglob=$lt_want_nocaseglob 7247+ 7248+# DLL creation program. 7249+DLLTOOL=$lt_DLLTOOL 7250+ 7251+# Command to associate shared and link libraries. 7252+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 7253+ 7254 # The archiver. 7255 AR=$lt_AR 7256+ 7257+# Flags to create an archive. 7258 AR_FLAGS=$lt_AR_FLAGS 7259 7260+# How to feed a file listing to the archiver. 7261+archiver_list_spec=$lt_archiver_list_spec 7262+ 7263 # A symbol stripping program. 7264 STRIP=$lt_STRIP 7265 7266@@ -13870,6 +14561,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 7267 # Transform the output of nm in a C name address pair when lib prefix is needed. 7268 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 7269 7270+# Specify filename containing input files for \$NM. 7271+nm_file_list_spec=$lt_nm_file_list_spec 7272+ 7273+# The root where to search for dependent libraries,and in which our libraries should be installed. 7274+lt_sysroot=$lt_sysroot 7275+ 7276 # The name of the directory that contains temporary libtool files. 7277 objdir=$objdir 7278 7279@@ -13879,6 +14576,9 @@ MAGIC_CMD=$MAGIC_CMD 7280 # Must we lock files when doing compilation? 7281 need_locks=$lt_need_locks 7282 7283+# Manifest tool. 7284+MANIFEST_TOOL=$lt_MANIFEST_TOOL 7285+ 7286 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 7287 DSYMUTIL=$lt_DSYMUTIL 7288 7289@@ -13993,12 +14693,12 @@ with_gcc=$GCC 7290 # Compiler flag to turn off builtin functions. 7291 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 7292 7293-# How to pass a linker flag through the compiler. 7294-wl=$lt_lt_prog_compiler_wl 7295- 7296 # Additional compiler flags for building library objects. 7297 pic_flag=$lt_lt_prog_compiler_pic 7298 7299+# How to pass a linker flag through the compiler. 7300+wl=$lt_lt_prog_compiler_wl 7301+ 7302 # Compiler flag to prevent dynamic linking. 7303 link_static_flag=$lt_lt_prog_compiler_static 7304 7305@@ -14085,9 +14785,6 @@ inherit_rpath=$inherit_rpath 7306 # Whether libtool must link a program against all its dependency libraries. 7307 link_all_deplibs=$link_all_deplibs 7308 7309-# Fix the shell variable \$srcfile for the compiler. 7310-fix_srcfile_path=$lt_fix_srcfile_path 7311- 7312 # Set to "yes" if exported symbols are required. 7313 always_export_symbols=$always_export_symbols 7314 7315@@ -14103,6 +14800,9 @@ include_expsyms=$lt_include_expsyms 7316 # Commands necessary for linking programs (against libraries) with templates. 7317 prelink_cmds=$lt_prelink_cmds 7318 7319+# Commands necessary for finishing linking programs. 7320+postlink_cmds=$lt_postlink_cmds 7321+ 7322 # Specify filename containing input files. 7323 file_list_spec=$lt_file_list_spec 7324 7325@@ -14135,210 +14835,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 7326 # if finds mixed CR/LF and LF-only lines. Since sed operates in 7327 # text mode, it properly converts lines to CR/LF. This bash problem 7328 # is reportedly fixed, but why not run on old versions too? 7329- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 7330- || (rm -f "$cfgfile"; exit 1) 7331- 7332- case $xsi_shell in 7333- yes) 7334- cat << \_LT_EOF >> "$cfgfile" 7335- 7336-# func_dirname file append nondir_replacement 7337-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 7338-# otherwise set result to NONDIR_REPLACEMENT. 7339-func_dirname () 7340-{ 7341- case ${1} in 7342- */*) func_dirname_result="${1%/*}${2}" ;; 7343- * ) func_dirname_result="${3}" ;; 7344- esac 7345-} 7346- 7347-# func_basename file 7348-func_basename () 7349-{ 7350- func_basename_result="${1##*/}" 7351-} 7352- 7353-# func_dirname_and_basename file append nondir_replacement 7354-# perform func_basename and func_dirname in a single function 7355-# call: 7356-# dirname: Compute the dirname of FILE. If nonempty, 7357-# add APPEND to the result, otherwise set result 7358-# to NONDIR_REPLACEMENT. 7359-# value returned in "$func_dirname_result" 7360-# basename: Compute filename of FILE. 7361-# value retuned in "$func_basename_result" 7362-# Implementation must be kept synchronized with func_dirname 7363-# and func_basename. For efficiency, we do not delegate to 7364-# those functions but instead duplicate the functionality here. 7365-func_dirname_and_basename () 7366-{ 7367- case ${1} in 7368- */*) func_dirname_result="${1%/*}${2}" ;; 7369- * ) func_dirname_result="${3}" ;; 7370- esac 7371- func_basename_result="${1##*/}" 7372-} 7373- 7374-# func_stripname prefix suffix name 7375-# strip PREFIX and SUFFIX off of NAME. 7376-# PREFIX and SUFFIX must not contain globbing or regex special 7377-# characters, hashes, percent signs, but SUFFIX may contain a leading 7378-# dot (in which case that matches only a dot). 7379-func_stripname () 7380-{ 7381- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 7382- # positional parameters, so assign one to ordinary parameter first. 7383- func_stripname_result=${3} 7384- func_stripname_result=${func_stripname_result#"${1}"} 7385- func_stripname_result=${func_stripname_result%"${2}"} 7386-} 7387- 7388-# func_opt_split 7389-func_opt_split () 7390-{ 7391- func_opt_split_opt=${1%%=*} 7392- func_opt_split_arg=${1#*=} 7393-} 7394- 7395-# func_lo2o object 7396-func_lo2o () 7397-{ 7398- case ${1} in 7399- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 7400- *) func_lo2o_result=${1} ;; 7401- esac 7402-} 7403- 7404-# func_xform libobj-or-source 7405-func_xform () 7406-{ 7407- func_xform_result=${1%.*}.lo 7408-} 7409- 7410-# func_arith arithmetic-term... 7411-func_arith () 7412-{ 7413- func_arith_result=$(( $* )) 7414-} 7415- 7416-# func_len string 7417-# STRING may not start with a hyphen. 7418-func_len () 7419-{ 7420- func_len_result=${#1} 7421-} 7422- 7423-_LT_EOF 7424- ;; 7425- *) # Bourne compatible functions. 7426- cat << \_LT_EOF >> "$cfgfile" 7427- 7428-# func_dirname file append nondir_replacement 7429-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 7430-# otherwise set result to NONDIR_REPLACEMENT. 7431-func_dirname () 7432-{ 7433- # Extract subdirectory from the argument. 7434- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 7435- if test "X$func_dirname_result" = "X${1}"; then 7436- func_dirname_result="${3}" 7437- else 7438- func_dirname_result="$func_dirname_result${2}" 7439- fi 7440-} 7441- 7442-# func_basename file 7443-func_basename () 7444-{ 7445- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 7446-} 7447- 7448- 7449-# func_stripname prefix suffix name 7450-# strip PREFIX and SUFFIX off of NAME. 7451-# PREFIX and SUFFIX must not contain globbing or regex special 7452-# characters, hashes, percent signs, but SUFFIX may contain a leading 7453-# dot (in which case that matches only a dot). 7454-# func_strip_suffix prefix name 7455-func_stripname () 7456-{ 7457- case ${2} in 7458- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 7459- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 7460- esac 7461-} 7462- 7463-# sed scripts: 7464-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 7465-my_sed_long_arg='1s/^-[^=]*=//' 7466- 7467-# func_opt_split 7468-func_opt_split () 7469-{ 7470- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 7471- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 7472-} 7473- 7474-# func_lo2o object 7475-func_lo2o () 7476-{ 7477- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 7478-} 7479- 7480-# func_xform libobj-or-source 7481-func_xform () 7482-{ 7483- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 7484-} 7485- 7486-# func_arith arithmetic-term... 7487-func_arith () 7488-{ 7489- func_arith_result=`expr "$@"` 7490-} 7491- 7492-# func_len string 7493-# STRING may not start with a hyphen. 7494-func_len () 7495-{ 7496- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 7497-} 7498- 7499-_LT_EOF 7500-esac 7501- 7502-case $lt_shell_append in 7503- yes) 7504- cat << \_LT_EOF >> "$cfgfile" 7505- 7506-# func_append var value 7507-# Append VALUE to the end of shell variable VAR. 7508-func_append () 7509-{ 7510- eval "$1+=\$2" 7511-} 7512-_LT_EOF 7513- ;; 7514- *) 7515- cat << \_LT_EOF >> "$cfgfile" 7516- 7517-# func_append var value 7518-# Append VALUE to the end of shell variable VAR. 7519-func_append () 7520-{ 7521- eval "$1=\$$1\$2" 7522-} 7523- 7524-_LT_EOF 7525- ;; 7526- esac 7527- 7528- 7529- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 7530- || (rm -f "$cfgfile"; exit 1) 7531- 7532- mv -f "$cfgfile" "$ofile" || 7533+ sed '$q' "$ltmain" >> "$cfgfile" \ 7534+ || (rm -f "$cfgfile"; exit 1) 7535+ 7536+ if test x"$xsi_shell" = xyes; then 7537+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 7538+func_dirname ()\ 7539+{\ 7540+\ case ${1} in\ 7541+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 7542+\ * ) func_dirname_result="${3}" ;;\ 7543+\ esac\ 7544+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 7545+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7546+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7547+test 0 -eq $? || _lt_function_replace_fail=: 7548+ 7549+ 7550+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 7551+func_basename ()\ 7552+{\ 7553+\ func_basename_result="${1##*/}"\ 7554+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 7555+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7556+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7557+test 0 -eq $? || _lt_function_replace_fail=: 7558+ 7559+ 7560+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 7561+func_dirname_and_basename ()\ 7562+{\ 7563+\ case ${1} in\ 7564+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 7565+\ * ) func_dirname_result="${3}" ;;\ 7566+\ esac\ 7567+\ func_basename_result="${1##*/}"\ 7568+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 7569+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7570+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7571+test 0 -eq $? || _lt_function_replace_fail=: 7572+ 7573+ 7574+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 7575+func_stripname ()\ 7576+{\ 7577+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 7578+\ # positional parameters, so assign one to ordinary parameter first.\ 7579+\ func_stripname_result=${3}\ 7580+\ func_stripname_result=${func_stripname_result#"${1}"}\ 7581+\ func_stripname_result=${func_stripname_result%"${2}"}\ 7582+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 7583+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7584+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7585+test 0 -eq $? || _lt_function_replace_fail=: 7586+ 7587+ 7588+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 7589+func_split_long_opt ()\ 7590+{\ 7591+\ func_split_long_opt_name=${1%%=*}\ 7592+\ func_split_long_opt_arg=${1#*=}\ 7593+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 7594+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7595+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7596+test 0 -eq $? || _lt_function_replace_fail=: 7597+ 7598+ 7599+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 7600+func_split_short_opt ()\ 7601+{\ 7602+\ func_split_short_opt_arg=${1#??}\ 7603+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 7604+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 7605+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7606+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7607+test 0 -eq $? || _lt_function_replace_fail=: 7608+ 7609+ 7610+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 7611+func_lo2o ()\ 7612+{\ 7613+\ case ${1} in\ 7614+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 7615+\ *) func_lo2o_result=${1} ;;\ 7616+\ esac\ 7617+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 7618+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7619+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7620+test 0 -eq $? || _lt_function_replace_fail=: 7621+ 7622+ 7623+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 7624+func_xform ()\ 7625+{\ 7626+ func_xform_result=${1%.*}.lo\ 7627+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 7628+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7629+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7630+test 0 -eq $? || _lt_function_replace_fail=: 7631+ 7632+ 7633+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 7634+func_arith ()\ 7635+{\ 7636+ func_arith_result=$(( $* ))\ 7637+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 7638+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7639+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7640+test 0 -eq $? || _lt_function_replace_fail=: 7641+ 7642+ 7643+ sed -e '/^func_len ()$/,/^} # func_len /c\ 7644+func_len ()\ 7645+{\ 7646+ func_len_result=${#1}\ 7647+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 7648+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7649+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7650+test 0 -eq $? || _lt_function_replace_fail=: 7651+ 7652+fi 7653+ 7654+if test x"$lt_shell_append" = xyes; then 7655+ sed -e '/^func_append ()$/,/^} # func_append /c\ 7656+func_append ()\ 7657+{\ 7658+ eval "${1}+=\\${2}"\ 7659+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 7660+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7661+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7662+test 0 -eq $? || _lt_function_replace_fail=: 7663+ 7664+ 7665+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 7666+func_append_quoted ()\ 7667+{\ 7668+\ func_quote_for_eval "${2}"\ 7669+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 7670+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 7671+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7672+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7673+test 0 -eq $? || _lt_function_replace_fail=: 7674+ 7675+ 7676+ # Save a `func_append' function call where possible by direct use of '+=' 7677+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 7678+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7679+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7680+ test 0 -eq $? || _lt_function_replace_fail=: 7681+else 7682+ # Save a `func_append' function call even when '+=' is not available 7683+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 7684+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 7685+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 7686+ test 0 -eq $? || _lt_function_replace_fail=: 7687+fi 7688+ 7689+if test x"$_lt_function_replace_fail" = x":"; then 7690+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 7691+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 7692+fi 7693+ 7694+ 7695+ mv -f "$cfgfile" "$ofile" || 7696 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 7697 chmod +x "$ofile" 7698 7699diff --git a/ld/configure b/ld/configure 7700index 1f9ec8ec580..4a35108ce7c 100755 7701--- a/ld/configure 7702+++ b/ld/configure 7703@@ -695,8 +695,11 @@ OTOOL 7704 LIPO 7705 NMEDIT 7706 DSYMUTIL 7707+MANIFEST_TOOL 7708 RANLIB 7709+ac_ct_AR 7710 AR 7711+DLLTOOL 7712 OBJDUMP 7713 LN_S 7714 NM 7715@@ -823,6 +826,7 @@ enable_static 7716 with_pic 7717 enable_fast_install 7718 with_gnu_ld 7719+with_libtool_sysroot 7720 enable_libtool_lock 7721 enable_plugins 7722 enable_largefile 7723@@ -1530,6 +1534,8 @@ Optional Packages: 7724 --with-pic try to use only PIC/non-PIC objects [default=use 7725 both] 7726 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 7727+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 7728+ (or the compiler's sysroot if not specified). 7729 --with-lib-path=dir1:dir2... set default LIB_PATH 7730 --with-sysroot=DIR Search for usr/lib et al within DIR. 7731 --with-system-zlib use installed libz 7732@@ -5368,8 +5374,8 @@ esac 7733 7734 7735 7736-macro_version='2.2.7a' 7737-macro_revision='1.3134' 7738+macro_version='2.4' 7739+macro_revision='1.3293' 7740 7741 7742 7743@@ -5409,7 +5415,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 7744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 7745 $as_echo_n "checking how to print strings... " >&6; } 7746 # Test print first, because it will be a builtin if present. 7747-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 7748+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 7749 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 7750 ECHO='print -r --' 7751 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 7752@@ -6096,8 +6102,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 7753 # Try some XSI features 7754 xsi_shell=no 7755 ( _lt_dummy="a/b/c" 7756- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 7757- = c,a/b,, \ 7758+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 7759+ = c,a/b,b/c, \ 7760 && eval 'test $(( 1 + 1 )) -eq 2 \ 7761 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 7762 && xsi_shell=yes 7763@@ -6146,6 +6152,80 @@ esac 7764 7765 7766 7767+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 7768+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 7769+if ${lt_cv_to_host_file_cmd+:} false; then : 7770+ $as_echo_n "(cached) " >&6 7771+else 7772+ case $host in 7773+ *-*-mingw* ) 7774+ case $build in 7775+ *-*-mingw* ) # actually msys 7776+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 7777+ ;; 7778+ *-*-cygwin* ) 7779+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 7780+ ;; 7781+ * ) # otherwise, assume *nix 7782+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 7783+ ;; 7784+ esac 7785+ ;; 7786+ *-*-cygwin* ) 7787+ case $build in 7788+ *-*-mingw* ) # actually msys 7789+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 7790+ ;; 7791+ *-*-cygwin* ) 7792+ lt_cv_to_host_file_cmd=func_convert_file_noop 7793+ ;; 7794+ * ) # otherwise, assume *nix 7795+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 7796+ ;; 7797+ esac 7798+ ;; 7799+ * ) # unhandled hosts (and "normal" native builds) 7800+ lt_cv_to_host_file_cmd=func_convert_file_noop 7801+ ;; 7802+esac 7803+ 7804+fi 7805+ 7806+to_host_file_cmd=$lt_cv_to_host_file_cmd 7807+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 7808+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 7809+ 7810+ 7811+ 7812+ 7813+ 7814+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 7815+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 7816+if ${lt_cv_to_tool_file_cmd+:} false; then : 7817+ $as_echo_n "(cached) " >&6 7818+else 7819+ #assume ordinary cross tools, or native build. 7820+lt_cv_to_tool_file_cmd=func_convert_file_noop 7821+case $host in 7822+ *-*-mingw* ) 7823+ case $build in 7824+ *-*-mingw* ) # actually msys 7825+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 7826+ ;; 7827+ esac 7828+ ;; 7829+esac 7830+ 7831+fi 7832+ 7833+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 7834+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 7835+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 7836+ 7837+ 7838+ 7839+ 7840+ 7841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 7842 $as_echo_n "checking for $LD option to reload object files... " >&6; } 7843 if ${lt_cv_ld_reload_flag+:} false; then : 7844@@ -6162,6 +6242,11 @@ case $reload_flag in 7845 esac 7846 reload_cmds='$LD$reload_flag -o $output$reload_objs' 7847 case $host_os in 7848+ cygwin* | mingw* | pw32* | cegcc*) 7849+ if test "$GCC" != yes; then 7850+ reload_cmds=false 7851+ fi 7852+ ;; 7853 darwin*) 7854 if test "$GCC" = yes; then 7855 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 7856@@ -6330,7 +6415,8 @@ mingw* | pw32*) 7857 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 7858 lt_cv_file_magic_cmd='func_win32_libid' 7859 else 7860- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 7861+ # Keep this pattern in sync with the one in func_win32_libid. 7862+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 7863 lt_cv_file_magic_cmd='$OBJDUMP -f' 7864 fi 7865 ;; 7866@@ -6484,6 +6570,21 @@ esac 7867 fi 7868 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 7869 $as_echo "$lt_cv_deplibs_check_method" >&6; } 7870+ 7871+file_magic_glob= 7872+want_nocaseglob=no 7873+if test "$build" = "$host"; then 7874+ case $host_os in 7875+ mingw* | pw32*) 7876+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 7877+ want_nocaseglob=yes 7878+ else 7879+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 7880+ fi 7881+ ;; 7882+ esac 7883+fi 7884+ 7885 file_magic_cmd=$lt_cv_file_magic_cmd 7886 deplibs_check_method=$lt_cv_deplibs_check_method 7887 test -z "$deplibs_check_method" && deplibs_check_method=unknown 7888@@ -6499,6 +6600,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 7889 7890 7891 7892+ 7893+ 7894+ 7895+ 7896+ 7897+ 7898+ 7899+ 7900+ 7901+ 7902+if test -n "$ac_tool_prefix"; then 7903+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 7904+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 7905+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7906+$as_echo_n "checking for $ac_word... " >&6; } 7907+if ${ac_cv_prog_DLLTOOL+:} false; then : 7908+ $as_echo_n "(cached) " >&6 7909+else 7910+ if test -n "$DLLTOOL"; then 7911+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 7912+else 7913+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7914+for as_dir in $PATH 7915+do 7916+ IFS=$as_save_IFS 7917+ test -z "$as_dir" && as_dir=. 7918+ for ac_exec_ext in '' $ac_executable_extensions; do 7919+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7920+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 7921+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 7922+ break 2 7923+ fi 7924+done 7925+ done 7926+IFS=$as_save_IFS 7927+ 7928+fi 7929+fi 7930+DLLTOOL=$ac_cv_prog_DLLTOOL 7931+if test -n "$DLLTOOL"; then 7932+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 7933+$as_echo "$DLLTOOL" >&6; } 7934+else 7935+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7936+$as_echo "no" >&6; } 7937+fi 7938+ 7939+ 7940+fi 7941+if test -z "$ac_cv_prog_DLLTOOL"; then 7942+ ac_ct_DLLTOOL=$DLLTOOL 7943+ # Extract the first word of "dlltool", so it can be a program name with args. 7944+set dummy dlltool; ac_word=$2 7945+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7946+$as_echo_n "checking for $ac_word... " >&6; } 7947+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 7948+ $as_echo_n "(cached) " >&6 7949+else 7950+ if test -n "$ac_ct_DLLTOOL"; then 7951+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 7952+else 7953+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7954+for as_dir in $PATH 7955+do 7956+ IFS=$as_save_IFS 7957+ test -z "$as_dir" && as_dir=. 7958+ for ac_exec_ext in '' $ac_executable_extensions; do 7959+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7960+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 7961+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 7962+ break 2 7963+ fi 7964+done 7965+ done 7966+IFS=$as_save_IFS 7967+ 7968+fi 7969+fi 7970+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 7971+if test -n "$ac_ct_DLLTOOL"; then 7972+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 7973+$as_echo "$ac_ct_DLLTOOL" >&6; } 7974+else 7975+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7976+$as_echo "no" >&6; } 7977+fi 7978+ 7979+ if test "x$ac_ct_DLLTOOL" = x; then 7980+ DLLTOOL="false" 7981+ else 7982+ case $cross_compiling:$ac_tool_warned in 7983+yes:) 7984+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 7985+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 7986+ac_tool_warned=yes ;; 7987+esac 7988+ DLLTOOL=$ac_ct_DLLTOOL 7989+ fi 7990+else 7991+ DLLTOOL="$ac_cv_prog_DLLTOOL" 7992+fi 7993+ 7994+test -z "$DLLTOOL" && DLLTOOL=dlltool 7995+ 7996+ 7997+ 7998+ 7999+ 8000+ 8001+ 8002+ 8003+ 8004+ 8005+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 8006+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 8007+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 8008+ $as_echo_n "(cached) " >&6 8009+else 8010+ lt_cv_sharedlib_from_linklib_cmd='unknown' 8011+ 8012+case $host_os in 8013+cygwin* | mingw* | pw32* | cegcc*) 8014+ # two different shell functions defined in ltmain.sh 8015+ # decide which to use based on capabilities of $DLLTOOL 8016+ case `$DLLTOOL --help 2>&1` in 8017+ *--identify-strict*) 8018+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 8019+ ;; 8020+ *) 8021+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 8022+ ;; 8023+ esac 8024+ ;; 8025+*) 8026+ # fallback: assume linklib IS sharedlib 8027+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 8028+ ;; 8029+esac 8030+ 8031+fi 8032+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 8033+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 8034+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 8035+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 8036+ 8037+ 8038+ 8039+ 8040+ 8041+ 8042+ 8043 plugin_option= 8044 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 8045 for plugin in $plugin_names; do 8046@@ -6513,8 +6765,10 @@ for plugin in $plugin_names; do 8047 done 8048 8049 if test -n "$ac_tool_prefix"; then 8050- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 8051-set dummy ${ac_tool_prefix}ar; ac_word=$2 8052+ for ac_prog in ar 8053+ do 8054+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 8055+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8056 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8057 $as_echo_n "checking for $ac_word... " >&6; } 8058 if ${ac_cv_prog_AR+:} false; then : 8059@@ -6530,7 +6784,7 @@ do 8060 test -z "$as_dir" && as_dir=. 8061 for ac_exec_ext in '' $ac_executable_extensions; do 8062 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8063- ac_cv_prog_AR="${ac_tool_prefix}ar" 8064+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 8065 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8066 break 2 8067 fi 8068@@ -6550,11 +6804,15 @@ $as_echo "no" >&6; } 8069 fi 8070 8071 8072+ test -n "$AR" && break 8073+ done 8074 fi 8075-if test -z "$ac_cv_prog_AR"; then 8076+if test -z "$AR"; then 8077 ac_ct_AR=$AR 8078- # Extract the first word of "ar", so it can be a program name with args. 8079-set dummy ar; ac_word=$2 8080+ for ac_prog in ar 8081+do 8082+ # Extract the first word of "$ac_prog", so it can be a program name with args. 8083+set dummy $ac_prog; ac_word=$2 8084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8085 $as_echo_n "checking for $ac_word... " >&6; } 8086 if ${ac_cv_prog_ac_ct_AR+:} false; then : 8087@@ -6570,7 +6828,7 @@ do 8088 test -z "$as_dir" && as_dir=. 8089 for ac_exec_ext in '' $ac_executable_extensions; do 8090 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8091- ac_cv_prog_ac_ct_AR="ar" 8092+ ac_cv_prog_ac_ct_AR="$ac_prog" 8093 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8094 break 2 8095 fi 8096@@ -6589,6 +6847,10 @@ else 8097 $as_echo "no" >&6; } 8098 fi 8099 8100+ 8101+ test -n "$ac_ct_AR" && break 8102+done 8103+ 8104 if test "x$ac_ct_AR" = x; then 8105 AR="false" 8106 else 8107@@ -6600,25 +6862,19 @@ ac_tool_warned=yes ;; 8108 esac 8109 AR=$ac_ct_AR 8110 fi 8111-else 8112- AR="$ac_cv_prog_AR" 8113 fi 8114 8115-test -z "$AR" && AR=ar 8116-if test -n "$plugin_option"; then 8117- if $AR --help 2>&1 | grep -q "\--plugin"; then 8118- touch conftest.c 8119- $AR $plugin_option rc conftest.a conftest.c 8120- if test "$?" != 0; then 8121- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 8122+ touch conftest.c 8123+ $AR $plugin_option rc conftest.a conftest.c 8124+ if test "$?" != 0; then 8125+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 8126 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 8127- else 8128- AR="$AR $plugin_option" 8129- fi 8130- rm -f conftest.* 8131+ else 8132+ AR="$AR $plugin_option" 8133 fi 8134-fi 8135-test -z "$AR_FLAGS" && AR_FLAGS=cru 8136+ rm -f conftest.* 8137+: ${AR=ar} 8138+: ${AR_FLAGS=cru} 8139 8140 8141 8142@@ -6630,6 +6886,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 8143 8144 8145 8146+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 8147+$as_echo_n "checking for archiver @FILE support... " >&6; } 8148+if ${lt_cv_ar_at_file+:} false; then : 8149+ $as_echo_n "(cached) " >&6 8150+else 8151+ lt_cv_ar_at_file=no 8152+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8153+/* end confdefs.h. */ 8154+ 8155+int 8156+main () 8157+{ 8158+ 8159+ ; 8160+ return 0; 8161+} 8162+_ACEOF 8163+if ac_fn_c_try_compile "$LINENO"; then : 8164+ echo conftest.$ac_objext > conftest.lst 8165+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 8166+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 8167+ (eval $lt_ar_try) 2>&5 8168+ ac_status=$? 8169+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 8170+ test $ac_status = 0; } 8171+ if test "$ac_status" -eq 0; then 8172+ # Ensure the archiver fails upon bogus file names. 8173+ rm -f conftest.$ac_objext libconftest.a 8174+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 8175+ (eval $lt_ar_try) 2>&5 8176+ ac_status=$? 8177+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 8178+ test $ac_status = 0; } 8179+ if test "$ac_status" -ne 0; then 8180+ lt_cv_ar_at_file=@ 8181+ fi 8182+ fi 8183+ rm -f conftest.* libconftest.a 8184+ 8185+fi 8186+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 8187+ 8188+fi 8189+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 8190+$as_echo "$lt_cv_ar_at_file" >&6; } 8191+ 8192+if test "x$lt_cv_ar_at_file" = xno; then 8193+ archiver_list_spec= 8194+else 8195+ archiver_list_spec=$lt_cv_ar_at_file 8196+fi 8197+ 8198+ 8199+ 8200+ 8201+ 8202+ 8203+ 8204 if test -n "$ac_tool_prefix"; then 8205 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 8206 set dummy ${ac_tool_prefix}strip; ac_word=$2 8207@@ -6969,8 +7283,8 @@ esac 8208 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 8209 8210 # Transform an extracted symbol line into symbol name and symbol address 8211-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 8212-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'" 8213+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 8214+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'" 8215 8216 # Handle CRLF in mingw tool chain 8217 opt_cr= 8218@@ -7006,6 +7320,7 @@ for ac_symprfx in "" "_"; do 8219 else 8220 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 8221 fi 8222+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 8223 8224 # Check to see that the pipe works correctly. 8225 pipe_works=no 8226@@ -7047,6 +7362,18 @@ _LT_EOF 8227 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 8228 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 8229 cat <<_LT_EOF > conftest.$ac_ext 8230+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 8231+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 8232+/* DATA imports from DLLs on WIN32 con't be const, because runtime 8233+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 8234+# define LT_DLSYM_CONST 8235+#elif defined(__osf__) 8236+/* This system does not cope well with relocations in const data. */ 8237+# define LT_DLSYM_CONST 8238+#else 8239+# define LT_DLSYM_CONST const 8240+#endif 8241+ 8242 #ifdef __cplusplus 8243 extern "C" { 8244 #endif 8245@@ -7058,7 +7385,7 @@ _LT_EOF 8246 cat <<_LT_EOF >> conftest.$ac_ext 8247 8248 /* The mapping between symbol names and symbols. */ 8249-const struct { 8250+LT_DLSYM_CONST struct { 8251 const char *name; 8252 void *address; 8253 } 8254@@ -7084,8 +7411,8 @@ static const void *lt_preloaded_setup() { 8255 _LT_EOF 8256 # Now try linking the two files. 8257 mv conftest.$ac_objext conftstm.$ac_objext 8258- lt_save_LIBS="$LIBS" 8259- lt_save_CFLAGS="$CFLAGS" 8260+ lt_globsym_save_LIBS=$LIBS 8261+ lt_globsym_save_CFLAGS=$CFLAGS 8262 LIBS="conftstm.$ac_objext" 8263 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 8264 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 8265@@ -7095,8 +7422,8 @@ _LT_EOF 8266 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 8267 pipe_works=yes 8268 fi 8269- LIBS="$lt_save_LIBS" 8270- CFLAGS="$lt_save_CFLAGS" 8271+ LIBS=$lt_globsym_save_LIBS 8272+ CFLAGS=$lt_globsym_save_CFLAGS 8273 else 8274 echo "cannot find nm_test_func in $nlist" >&5 8275 fi 8276@@ -7133,6 +7460,17 @@ else 8277 $as_echo "ok" >&6; } 8278 fi 8279 8280+# Response file support. 8281+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 8282+ nm_file_list_spec='@' 8283+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 8284+ nm_file_list_spec='@' 8285+fi 8286+ 8287+ 8288+ 8289+ 8290+ 8291 8292 8293 8294@@ -7149,6 +7487,44 @@ fi 8295 8296 8297 8298+ 8299+ 8300+ 8301+ 8302+ 8303+ 8304+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 8305+$as_echo_n "checking for sysroot... " >&6; } 8306+ 8307+# Check whether --with-libtool-sysroot was given. 8308+if test "${with_libtool_sysroot+set}" = set; then : 8309+ withval=$with_libtool_sysroot; 8310+else 8311+ with_libtool_sysroot=no 8312+fi 8313+ 8314+ 8315+lt_sysroot= 8316+case ${with_libtool_sysroot} in #( 8317+ yes) 8318+ if test "$GCC" = yes; then 8319+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 8320+ fi 8321+ ;; #( 8322+ /*) 8323+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 8324+ ;; #( 8325+ no|'') 8326+ ;; #( 8327+ *) 8328+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 8329+$as_echo "${with_libtool_sysroot}" >&6; } 8330+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 8331+ ;; 8332+esac 8333+ 8334+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 8335+$as_echo "${lt_sysroot:-no}" >&6; } 8336 8337 8338 8339@@ -7360,6 +7736,123 @@ esac 8340 8341 need_locks="$enable_libtool_lock" 8342 8343+if test -n "$ac_tool_prefix"; then 8344+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 8345+set dummy ${ac_tool_prefix}mt; ac_word=$2 8346+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8347+$as_echo_n "checking for $ac_word... " >&6; } 8348+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 8349+ $as_echo_n "(cached) " >&6 8350+else 8351+ if test -n "$MANIFEST_TOOL"; then 8352+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 8353+else 8354+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8355+for as_dir in $PATH 8356+do 8357+ IFS=$as_save_IFS 8358+ test -z "$as_dir" && as_dir=. 8359+ for ac_exec_ext in '' $ac_executable_extensions; do 8360+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8361+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 8362+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8363+ break 2 8364+ fi 8365+done 8366+ done 8367+IFS=$as_save_IFS 8368+ 8369+fi 8370+fi 8371+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 8372+if test -n "$MANIFEST_TOOL"; then 8373+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 8374+$as_echo "$MANIFEST_TOOL" >&6; } 8375+else 8376+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8377+$as_echo "no" >&6; } 8378+fi 8379+ 8380+ 8381+fi 8382+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 8383+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 8384+ # Extract the first word of "mt", so it can be a program name with args. 8385+set dummy mt; ac_word=$2 8386+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8387+$as_echo_n "checking for $ac_word... " >&6; } 8388+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 8389+ $as_echo_n "(cached) " >&6 8390+else 8391+ if test -n "$ac_ct_MANIFEST_TOOL"; then 8392+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 8393+else 8394+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8395+for as_dir in $PATH 8396+do 8397+ IFS=$as_save_IFS 8398+ test -z "$as_dir" && as_dir=. 8399+ for ac_exec_ext in '' $ac_executable_extensions; do 8400+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8401+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 8402+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8403+ break 2 8404+ fi 8405+done 8406+ done 8407+IFS=$as_save_IFS 8408+ 8409+fi 8410+fi 8411+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 8412+if test -n "$ac_ct_MANIFEST_TOOL"; then 8413+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 8414+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 8415+else 8416+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8417+$as_echo "no" >&6; } 8418+fi 8419+ 8420+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 8421+ MANIFEST_TOOL=":" 8422+ else 8423+ case $cross_compiling:$ac_tool_warned in 8424+yes:) 8425+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 8426+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 8427+ac_tool_warned=yes ;; 8428+esac 8429+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 8430+ fi 8431+else 8432+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 8433+fi 8434+ 8435+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 8436+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 8437+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 8438+if ${lt_cv_path_mainfest_tool+:} false; then : 8439+ $as_echo_n "(cached) " >&6 8440+else 8441+ lt_cv_path_mainfest_tool=no 8442+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 8443+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 8444+ cat conftest.err >&5 8445+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 8446+ lt_cv_path_mainfest_tool=yes 8447+ fi 8448+ rm -f conftest* 8449+fi 8450+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 8451+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 8452+if test "x$lt_cv_path_mainfest_tool" != xyes; then 8453+ MANIFEST_TOOL=: 8454+fi 8455+ 8456+ 8457+ 8458+ 8459+ 8460 8461 case $host_os in 8462 rhapsody* | darwin*) 8463@@ -7923,6 +8416,8 @@ _LT_EOF 8464 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 8465 echo "$AR cru libconftest.a conftest.o" >&5 8466 $AR cru libconftest.a conftest.o 2>&5 8467+ echo "$RANLIB libconftest.a" >&5 8468+ $RANLIB libconftest.a 2>&5 8469 cat > conftest.c << _LT_EOF 8470 int main() { return 0;} 8471 _LT_EOF 8472@@ -7991,6 +8486,16 @@ done 8473 8474 8475 8476+func_stripname_cnf () 8477+{ 8478+ case ${2} in 8479+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 8480+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 8481+ esac 8482+} # func_stripname_cnf 8483+ 8484+ 8485+ 8486 8487 8488 # Set options 8489@@ -8506,8 +9011,6 @@ fi 8490 lt_prog_compiler_pic= 8491 lt_prog_compiler_static= 8492 8493-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 8494-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8495 8496 if test "$GCC" = yes; then 8497 lt_prog_compiler_wl='-Wl,' 8498@@ -8673,6 +9176,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8499 lt_prog_compiler_pic='--shared' 8500 lt_prog_compiler_static='--static' 8501 ;; 8502+ nagfor*) 8503+ # NAG Fortran compiler 8504+ lt_prog_compiler_wl='-Wl,-Wl,,' 8505+ lt_prog_compiler_pic='-PIC' 8506+ lt_prog_compiler_static='-Bstatic' 8507+ ;; 8508 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 8509 # Portland Group compilers (*not* the Pentium gcc compiler, 8510 # which looks to be a dead project) 8511@@ -8735,7 +9244,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8512 lt_prog_compiler_pic='-KPIC' 8513 lt_prog_compiler_static='-Bstatic' 8514 case $cc_basename in 8515- f77* | f90* | f95*) 8516+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 8517 lt_prog_compiler_wl='-Qoption ld ';; 8518 *) 8519 lt_prog_compiler_wl='-Wl,';; 8520@@ -8792,13 +9301,17 @@ case $host_os in 8521 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 8522 ;; 8523 esac 8524-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 8525-$as_echo "$lt_prog_compiler_pic" >&6; } 8526- 8527- 8528- 8529- 8530 8531+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 8532+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 8533+if ${lt_cv_prog_compiler_pic+:} false; then : 8534+ $as_echo_n "(cached) " >&6 8535+else 8536+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 8537+fi 8538+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 8539+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 8540+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 8541 8542 # 8543 # Check to make sure the PIC flag actually works. 8544@@ -8859,6 +9372,11 @@ fi 8545 8546 8547 8548+ 8549+ 8550+ 8551+ 8552+ 8553 # 8554 # Check to make sure the static flag actually works. 8555 # 8556@@ -9209,7 +9727,8 @@ _LT_EOF 8557 allow_undefined_flag=unsupported 8558 always_export_symbols=no 8559 enable_shared_with_static_runtimes=yes 8560- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 8561+ 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' 8562+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 8563 8564 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 8565 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 8566@@ -9308,12 +9827,12 @@ _LT_EOF 8567 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 8568 hardcode_libdir_flag_spec= 8569 hardcode_libdir_flag_spec_ld='-rpath $libdir' 8570- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 8571+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 8572 if test "x$supports_anon_versioning" = xyes; then 8573 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 8574 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 8575 echo "local: *; };" >> $output_objdir/$libname.ver~ 8576- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 8577+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 8578 fi 8579 ;; 8580 esac 8581@@ -9327,8 +9846,8 @@ _LT_EOF 8582 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 8583 wlarc= 8584 else 8585- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8586- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8587+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8588+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8589 fi 8590 ;; 8591 8592@@ -9346,8 +9865,8 @@ _LT_EOF 8593 8594 _LT_EOF 8595 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8596- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8597- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8598+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8599+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8600 else 8601 ld_shlibs=no 8602 fi 8603@@ -9393,8 +9912,8 @@ _LT_EOF 8604 8605 *) 8606 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 8607- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8608- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8609+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 8610+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 8611 else 8612 ld_shlibs=no 8613 fi 8614@@ -9524,7 +10043,13 @@ _LT_EOF 8615 allow_undefined_flag='-berok' 8616 # Determine the default libpath from the value encoded in an 8617 # empty executable. 8618- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8619+ if test "${lt_cv_aix_libpath+set}" = set; then 8620+ aix_libpath=$lt_cv_aix_libpath 8621+else 8622+ if ${lt_cv_aix_libpath_+:} false; then : 8623+ $as_echo_n "(cached) " >&6 8624+else 8625+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8626 /* end confdefs.h. */ 8627 8628 int 8629@@ -9537,22 +10062,29 @@ main () 8630 _ACEOF 8631 if ac_fn_c_try_link "$LINENO"; then : 8632 8633-lt_aix_libpath_sed=' 8634- /Import File Strings/,/^$/ { 8635- /^0/ { 8636- s/^0 *\(.*\)$/\1/ 8637- p 8638- } 8639- }' 8640-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8641-# Check for a 64-bit object if we didn't find anything. 8642-if test -z "$aix_libpath"; then 8643- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8644-fi 8645+ lt_aix_libpath_sed=' 8646+ /Import File Strings/,/^$/ { 8647+ /^0/ { 8648+ s/^0 *\([^ ]*\) *$/\1/ 8649+ p 8650+ } 8651+ }' 8652+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8653+ # Check for a 64-bit object if we didn't find anything. 8654+ if test -z "$lt_cv_aix_libpath_"; then 8655+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8656+ fi 8657 fi 8658 rm -f core conftest.err conftest.$ac_objext \ 8659 conftest$ac_exeext conftest.$ac_ext 8660-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8661+ if test -z "$lt_cv_aix_libpath_"; then 8662+ lt_cv_aix_libpath_="/usr/lib:/lib" 8663+ fi 8664+ 8665+fi 8666+ 8667+ aix_libpath=$lt_cv_aix_libpath_ 8668+fi 8669 8670 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8671 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" 8672@@ -9564,7 +10096,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8673 else 8674 # Determine the default libpath from the value encoded in an 8675 # empty executable. 8676- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8677+ if test "${lt_cv_aix_libpath+set}" = set; then 8678+ aix_libpath=$lt_cv_aix_libpath 8679+else 8680+ if ${lt_cv_aix_libpath_+:} false; then : 8681+ $as_echo_n "(cached) " >&6 8682+else 8683+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8684 /* end confdefs.h. */ 8685 8686 int 8687@@ -9577,22 +10115,29 @@ main () 8688 _ACEOF 8689 if ac_fn_c_try_link "$LINENO"; then : 8690 8691-lt_aix_libpath_sed=' 8692- /Import File Strings/,/^$/ { 8693- /^0/ { 8694- s/^0 *\(.*\)$/\1/ 8695- p 8696- } 8697- }' 8698-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8699-# Check for a 64-bit object if we didn't find anything. 8700-if test -z "$aix_libpath"; then 8701- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8702-fi 8703+ lt_aix_libpath_sed=' 8704+ /Import File Strings/,/^$/ { 8705+ /^0/ { 8706+ s/^0 *\([^ ]*\) *$/\1/ 8707+ p 8708+ } 8709+ }' 8710+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8711+ # Check for a 64-bit object if we didn't find anything. 8712+ if test -z "$lt_cv_aix_libpath_"; then 8713+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 8714+ fi 8715 fi 8716 rm -f core conftest.err conftest.$ac_objext \ 8717 conftest$ac_exeext conftest.$ac_ext 8718-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8719+ if test -z "$lt_cv_aix_libpath_"; then 8720+ lt_cv_aix_libpath_="/usr/lib:/lib" 8721+ fi 8722+ 8723+fi 8724+ 8725+ aix_libpath=$lt_cv_aix_libpath_ 8726+fi 8727 8728 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 8729 # Warning - without using the other run time loading flags, 8730@@ -9636,21 +10181,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8731 # When not using gcc, we currently assume that we are using 8732 # Microsoft Visual C++. 8733 # hardcode_libdir_flag_spec is actually meaningless, as there is 8734- # no search path for DLLs. 8735- hardcode_libdir_flag_spec=' ' 8736- allow_undefined_flag=unsupported 8737- # Tell ltmain to make .lib files, not .a files. 8738- libext=lib 8739- # Tell ltmain to make .dll files, not .so files. 8740- shrext_cmds=".dll" 8741- # FIXME: Setting linknames here is a bad hack. 8742- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 8743- # The linker will automatically build a .lib file if we build a DLL. 8744- old_archive_from_new_cmds='true' 8745- # FIXME: Should let the user specify the lib program. 8746- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 8747- fix_srcfile_path='`cygpath -w "$srcfile"`' 8748- enable_shared_with_static_runtimes=yes 8749+ # no search path for DLLs. 8750+ case $cc_basename in 8751+ cl*) 8752+ # Native MSVC 8753+ hardcode_libdir_flag_spec=' ' 8754+ allow_undefined_flag=unsupported 8755+ always_export_symbols=yes 8756+ file_list_spec='@' 8757+ # Tell ltmain to make .lib files, not .a files. 8758+ libext=lib 8759+ # Tell ltmain to make .dll files, not .so files. 8760+ shrext_cmds=".dll" 8761+ # FIXME: Setting linknames here is a bad hack. 8762+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 8763+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 8764+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 8765+ else 8766+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 8767+ fi~ 8768+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 8769+ linknames=' 8770+ # The linker will not automatically build a static lib if we build a DLL. 8771+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 8772+ enable_shared_with_static_runtimes=yes 8773+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 8774+ # Don't use ranlib 8775+ old_postinstall_cmds='chmod 644 $oldlib' 8776+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 8777+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 8778+ case $lt_outputfile in 8779+ *.exe|*.EXE) ;; 8780+ *) 8781+ lt_outputfile="$lt_outputfile.exe" 8782+ lt_tool_outputfile="$lt_tool_outputfile.exe" 8783+ ;; 8784+ esac~ 8785+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 8786+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 8787+ $RM "$lt_outputfile.manifest"; 8788+ fi' 8789+ ;; 8790+ *) 8791+ # Assume MSVC wrapper 8792+ hardcode_libdir_flag_spec=' ' 8793+ allow_undefined_flag=unsupported 8794+ # Tell ltmain to make .lib files, not .a files. 8795+ libext=lib 8796+ # Tell ltmain to make .dll files, not .so files. 8797+ shrext_cmds=".dll" 8798+ # FIXME: Setting linknames here is a bad hack. 8799+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 8800+ # The linker will automatically build a .lib file if we build a DLL. 8801+ old_archive_from_new_cmds='true' 8802+ # FIXME: Should let the user specify the lib program. 8803+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 8804+ enable_shared_with_static_runtimes=yes 8805+ ;; 8806+ esac 8807 ;; 8808 8809 darwin* | rhapsody*) 8810@@ -9711,7 +10299,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8811 8812 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 8813 freebsd* | dragonfly*) 8814- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 8815+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 8816 hardcode_libdir_flag_spec='-R$libdir' 8817 hardcode_direct=yes 8818 hardcode_shlibpath_var=no 8819@@ -9719,7 +10307,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8820 8821 hpux9*) 8822 if test "$GCC" = yes; then 8823- 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' 8824+ 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' 8825 else 8826 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' 8827 fi 8828@@ -9735,7 +10323,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8829 8830 hpux10*) 8831 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 8832- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 8833+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 8834 else 8835 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 8836 fi 8837@@ -9759,10 +10347,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 8838 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8839 ;; 8840 ia64*) 8841- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 8842+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 8843 ;; 8844 *) 8845- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 8846+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 8847 ;; 8848 esac 8849 else 8850@@ -9841,23 +10429,36 @@ fi 8851 8852 irix5* | irix6* | nonstopux*) 8853 if test "$GCC" = yes; then 8854- 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' 8855+ 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' 8856 # Try to use the -exported_symbol ld option, if it does not 8857 # work, assume that -exports_file does not work either and 8858 # implicitly export all symbols. 8859- save_LDFLAGS="$LDFLAGS" 8860- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 8861- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8862+ # This should be the same for all languages, so no per-tag cache variable. 8863+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 8864+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 8865+if ${lt_cv_irix_exported_symbol+:} false; then : 8866+ $as_echo_n "(cached) " >&6 8867+else 8868+ save_LDFLAGS="$LDFLAGS" 8869+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 8870+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8871 /* end confdefs.h. */ 8872-int foo(void) {} 8873+int foo (void) { return 0; } 8874 _ACEOF 8875 if ac_fn_c_try_link "$LINENO"; then : 8876- 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' 8877- 8878+ lt_cv_irix_exported_symbol=yes 8879+else 8880+ lt_cv_irix_exported_symbol=no 8881 fi 8882 rm -f core conftest.err conftest.$ac_objext \ 8883 conftest$ac_exeext conftest.$ac_ext 8884- LDFLAGS="$save_LDFLAGS" 8885+ LDFLAGS="$save_LDFLAGS" 8886+fi 8887+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 8888+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 8889+ if test "$lt_cv_irix_exported_symbol" = yes; then 8890+ 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' 8891+ fi 8892 else 8893 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' 8894 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' 8895@@ -9942,7 +10543,7 @@ rm -f core conftest.err conftest.$ac_objext \ 8896 osf4* | osf5*) # as osf3* with the addition of -msym flag 8897 if test "$GCC" = yes; then 8898 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 8899- 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' 8900+ 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' 8901 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 8902 else 8903 allow_undefined_flag=' -expect_unresolved \*' 8904@@ -9961,9 +10562,9 @@ rm -f core conftest.err conftest.$ac_objext \ 8905 no_undefined_flag=' -z defs' 8906 if test "$GCC" = yes; then 8907 wlarc='${wl}' 8908- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8909+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 8910 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 8911- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 8912+ $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' 8913 else 8914 case `$CC -V 2>&1` in 8915 *"Compilers 5.0"*) 8916@@ -10539,8 +11140,9 @@ cygwin* | mingw* | pw32* | cegcc*) 8917 need_version=no 8918 need_lib_prefix=no 8919 8920- case $GCC,$host_os in 8921- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 8922+ case $GCC,$cc_basename in 8923+ yes,*) 8924+ # gcc 8925 library_names_spec='$libname.dll.a' 8926 # DLL is installed to $(libdir)/../bin by postinstall_cmds 8927 postinstall_cmds='base_file=`basename \${file}`~ 8928@@ -10573,13 +11175,71 @@ cygwin* | mingw* | pw32* | cegcc*) 8929 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8930 ;; 8931 esac 8932+ dynamic_linker='Win32 ld.exe' 8933+ ;; 8934+ 8935+ *,cl*) 8936+ # Native MSVC 8937+ libname_spec='$name' 8938+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 8939+ library_names_spec='${libname}.dll.lib' 8940+ 8941+ case $build_os in 8942+ mingw*) 8943+ sys_lib_search_path_spec= 8944+ lt_save_ifs=$IFS 8945+ IFS=';' 8946+ for lt_path in $LIB 8947+ do 8948+ IFS=$lt_save_ifs 8949+ # Let DOS variable expansion print the short 8.3 style file name. 8950+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 8951+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 8952+ done 8953+ IFS=$lt_save_ifs 8954+ # Convert to MSYS style. 8955+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 8956+ ;; 8957+ cygwin*) 8958+ # Convert to unix form, then to dos form, then back to unix form 8959+ # but this time dos style (no spaces!) so that the unix form looks 8960+ # like /cygdrive/c/PROGRA~1:/cygdr... 8961+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 8962+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 8963+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 8964+ ;; 8965+ *) 8966+ sys_lib_search_path_spec="$LIB" 8967+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 8968+ # It is most probably a Windows format PATH. 8969+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 8970+ else 8971+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 8972+ fi 8973+ # FIXME: find the short name or the path components, as spaces are 8974+ # common. (e.g. "Program Files" -> "PROGRA~1") 8975+ ;; 8976+ esac 8977+ 8978+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 8979+ postinstall_cmds='base_file=`basename \${file}`~ 8980+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 8981+ dldir=$destdir/`dirname \$dlpath`~ 8982+ test -d \$dldir || mkdir -p \$dldir~ 8983+ $install_prog $dir/$dlname \$dldir/$dlname' 8984+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 8985+ dlpath=$dir/\$dldll~ 8986+ $RM \$dlpath' 8987+ shlibpath_overrides_runpath=yes 8988+ dynamic_linker='Win32 link.exe' 8989 ;; 8990 8991 *) 8992+ # Assume MSVC wrapper 8993 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 8994+ dynamic_linker='Win32 ld.exe' 8995 ;; 8996 esac 8997- dynamic_linker='Win32 ld.exe' 8998 # FIXME: first we should search . and the directory the executable is in 8999 shlibpath_var=PATH 9000 ;; 9001@@ -11457,7 +12117,7 @@ else 9002 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9003 lt_status=$lt_dlunknown 9004 cat > conftest.$ac_ext <<_LT_EOF 9005-#line 11457 "configure" 9006+#line $LINENO "configure" 9007 #include "confdefs.h" 9008 9009 #if HAVE_DLFCN_H 9010@@ -11501,10 +12161,10 @@ else 9011 /* When -fvisbility=hidden is used, assume the code has been annotated 9012 correspondingly for the symbols needed. */ 9013 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9014-void fnord () __attribute__((visibility("default"))); 9015+int fnord () __attribute__((visibility("default"))); 9016 #endif 9017 9018-void fnord () { int i=42; } 9019+int fnord () { return 42; } 9020 int main () 9021 { 9022 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9023@@ -11563,7 +12223,7 @@ else 9024 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9025 lt_status=$lt_dlunknown 9026 cat > conftest.$ac_ext <<_LT_EOF 9027-#line 11563 "configure" 9028+#line $LINENO "configure" 9029 #include "confdefs.h" 9030 9031 #if HAVE_DLFCN_H 9032@@ -11607,10 +12267,10 @@ else 9033 /* When -fvisbility=hidden is used, assume the code has been annotated 9034 correspondingly for the symbols needed. */ 9035 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 9036-void fnord () __attribute__((visibility("default"))); 9037+int fnord () __attribute__((visibility("default"))); 9038 #endif 9039 9040-void fnord () { int i=42; } 9041+int fnord () { return 42; } 9042 int main () 9043 { 9044 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 9045@@ -12002,6 +12662,7 @@ $RM -r conftest* 9046 9047 # Allow CC to be a program name with arguments. 9048 lt_save_CC=$CC 9049+ lt_save_CFLAGS=$CFLAGS 9050 lt_save_LD=$LD 9051 lt_save_GCC=$GCC 9052 GCC=$GXX 9053@@ -12019,6 +12680,7 @@ $RM -r conftest* 9054 fi 9055 test -z "${LDCXX+set}" || LD=$LDCXX 9056 CC=${CXX-"c++"} 9057+ CFLAGS=$CXXFLAGS 9058 compiler=$CC 9059 compiler_CXX=$CC 9060 for cc_temp in $compiler""; do 9061@@ -12301,7 +12963,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9062 allow_undefined_flag_CXX='-berok' 9063 # Determine the default libpath from the value encoded in an empty 9064 # executable. 9065- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9066+ if test "${lt_cv_aix_libpath+set}" = set; then 9067+ aix_libpath=$lt_cv_aix_libpath 9068+else 9069+ if ${lt_cv_aix_libpath__CXX+:} false; then : 9070+ $as_echo_n "(cached) " >&6 9071+else 9072+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9073 /* end confdefs.h. */ 9074 9075 int 9076@@ -12314,22 +12982,29 @@ main () 9077 _ACEOF 9078 if ac_fn_cxx_try_link "$LINENO"; then : 9079 9080-lt_aix_libpath_sed=' 9081- /Import File Strings/,/^$/ { 9082- /^0/ { 9083- s/^0 *\(.*\)$/\1/ 9084- p 9085- } 9086- }' 9087-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9088-# Check for a 64-bit object if we didn't find anything. 9089-if test -z "$aix_libpath"; then 9090- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9091-fi 9092+ lt_aix_libpath_sed=' 9093+ /Import File Strings/,/^$/ { 9094+ /^0/ { 9095+ s/^0 *\([^ ]*\) *$/\1/ 9096+ p 9097+ } 9098+ }' 9099+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9100+ # Check for a 64-bit object if we didn't find anything. 9101+ if test -z "$lt_cv_aix_libpath__CXX"; then 9102+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9103+ fi 9104 fi 9105 rm -f core conftest.err conftest.$ac_objext \ 9106 conftest$ac_exeext conftest.$ac_ext 9107-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9108+ if test -z "$lt_cv_aix_libpath__CXX"; then 9109+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" 9110+ fi 9111+ 9112+fi 9113+ 9114+ aix_libpath=$lt_cv_aix_libpath__CXX 9115+fi 9116 9117 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9118 9119@@ -12342,7 +13017,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9120 else 9121 # Determine the default libpath from the value encoded in an 9122 # empty executable. 9123- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9124+ if test "${lt_cv_aix_libpath+set}" = set; then 9125+ aix_libpath=$lt_cv_aix_libpath 9126+else 9127+ if ${lt_cv_aix_libpath__CXX+:} false; then : 9128+ $as_echo_n "(cached) " >&6 9129+else 9130+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9131 /* end confdefs.h. */ 9132 9133 int 9134@@ -12355,22 +13036,29 @@ main () 9135 _ACEOF 9136 if ac_fn_cxx_try_link "$LINENO"; then : 9137 9138-lt_aix_libpath_sed=' 9139- /Import File Strings/,/^$/ { 9140- /^0/ { 9141- s/^0 *\(.*\)$/\1/ 9142- p 9143- } 9144- }' 9145-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9146-# Check for a 64-bit object if we didn't find anything. 9147-if test -z "$aix_libpath"; then 9148- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9149-fi 9150+ lt_aix_libpath_sed=' 9151+ /Import File Strings/,/^$/ { 9152+ /^0/ { 9153+ s/^0 *\([^ ]*\) *$/\1/ 9154+ p 9155+ } 9156+ }' 9157+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9158+ # Check for a 64-bit object if we didn't find anything. 9159+ if test -z "$lt_cv_aix_libpath__CXX"; then 9160+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 9161+ fi 9162 fi 9163 rm -f core conftest.err conftest.$ac_objext \ 9164 conftest$ac_exeext conftest.$ac_ext 9165-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9166+ if test -z "$lt_cv_aix_libpath__CXX"; then 9167+ lt_cv_aix_libpath__CXX="/usr/lib:/lib" 9168+ fi 9169+ 9170+fi 9171+ 9172+ aix_libpath=$lt_cv_aix_libpath__CXX 9173+fi 9174 9175 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" 9176 # Warning - without using the other run time loading flags, 9177@@ -12413,29 +13101,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9178 ;; 9179 9180 cygwin* | mingw* | pw32* | cegcc*) 9181- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 9182- # as there is no search path for DLLs. 9183- hardcode_libdir_flag_spec_CXX='-L$libdir' 9184- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' 9185- allow_undefined_flag_CXX=unsupported 9186- always_export_symbols_CXX=no 9187- enable_shared_with_static_runtimes_CXX=yes 9188- 9189- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 9190- 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' 9191- # If the export-symbols file already is a .def file (1st line 9192- # is EXPORTS), use it as is; otherwise, prepend... 9193- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 9194- cp $export_symbols $output_objdir/$soname.def; 9195- else 9196- echo EXPORTS > $output_objdir/$soname.def; 9197- cat $export_symbols >> $output_objdir/$soname.def; 9198- fi~ 9199- $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' 9200- else 9201- ld_shlibs_CXX=no 9202- fi 9203- ;; 9204+ case $GXX,$cc_basename in 9205+ ,cl* | no,cl*) 9206+ # Native MSVC 9207+ # hardcode_libdir_flag_spec is actually meaningless, as there is 9208+ # no search path for DLLs. 9209+ hardcode_libdir_flag_spec_CXX=' ' 9210+ allow_undefined_flag_CXX=unsupported 9211+ always_export_symbols_CXX=yes 9212+ file_list_spec_CXX='@' 9213+ # Tell ltmain to make .lib files, not .a files. 9214+ libext=lib 9215+ # Tell ltmain to make .dll files, not .so files. 9216+ shrext_cmds=".dll" 9217+ # FIXME: Setting linknames here is a bad hack. 9218+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 9219+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 9220+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 9221+ else 9222+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 9223+ fi~ 9224+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 9225+ linknames=' 9226+ # The linker will not automatically build a static lib if we build a DLL. 9227+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' 9228+ enable_shared_with_static_runtimes_CXX=yes 9229+ # Don't use ranlib 9230+ old_postinstall_cmds_CXX='chmod 644 $oldlib' 9231+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ 9232+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 9233+ case $lt_outputfile in 9234+ *.exe|*.EXE) ;; 9235+ *) 9236+ lt_outputfile="$lt_outputfile.exe" 9237+ lt_tool_outputfile="$lt_tool_outputfile.exe" 9238+ ;; 9239+ esac~ 9240+ func_to_tool_file "$lt_outputfile"~ 9241+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 9242+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 9243+ $RM "$lt_outputfile.manifest"; 9244+ fi' 9245+ ;; 9246+ *) 9247+ # g++ 9248+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, 9249+ # as there is no search path for DLLs. 9250+ hardcode_libdir_flag_spec_CXX='-L$libdir' 9251+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' 9252+ allow_undefined_flag_CXX=unsupported 9253+ always_export_symbols_CXX=no 9254+ enable_shared_with_static_runtimes_CXX=yes 9255+ 9256+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 9257+ 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' 9258+ # If the export-symbols file already is a .def file (1st line 9259+ # is EXPORTS), use it as is; otherwise, prepend... 9260+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 9261+ cp $export_symbols $output_objdir/$soname.def; 9262+ else 9263+ echo EXPORTS > $output_objdir/$soname.def; 9264+ cat $export_symbols >> $output_objdir/$soname.def; 9265+ fi~ 9266+ $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' 9267+ else 9268+ ld_shlibs_CXX=no 9269+ fi 9270+ ;; 9271+ esac 9272+ ;; 9273 darwin* | rhapsody*) 9274 9275 9276@@ -12541,7 +13275,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9277 ;; 9278 *) 9279 if test "$GXX" = yes; then 9280- 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' 9281+ 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' 9282 else 9283 # FIXME: insert proper C++ library support 9284 ld_shlibs_CXX=no 9285@@ -12612,10 +13346,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9286 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9287 ;; 9288 ia64*) 9289- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9290+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 9291 ;; 9292 *) 9293- 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' 9294+ 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' 9295 ;; 9296 esac 9297 fi 9298@@ -12656,9 +13390,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9299 *) 9300 if test "$GXX" = yes; then 9301 if test "$with_gnu_ld" = no; then 9302- 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' 9303+ 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' 9304 else 9305- 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' 9306+ 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' 9307 fi 9308 fi 9309 link_all_deplibs_CXX=yes 9310@@ -12728,20 +13462,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9311 prelink_cmds_CXX='tpldir=Template.dir~ 9312 rm -rf $tpldir~ 9313 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 9314- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' 9315+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' 9316 old_archive_cmds_CXX='tpldir=Template.dir~ 9317 rm -rf $tpldir~ 9318 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ 9319- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ 9320+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ 9321 $RANLIB $oldlib' 9322 archive_cmds_CXX='tpldir=Template.dir~ 9323 rm -rf $tpldir~ 9324 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 9325- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9326+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9327 archive_expsym_cmds_CXX='tpldir=Template.dir~ 9328 rm -rf $tpldir~ 9329 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 9330- $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' 9331+ $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' 9332 ;; 9333 *) # Version 6 and above use weak symbols 9334 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 9335@@ -12936,7 +13670,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9336 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' 9337 ;; 9338 *) 9339- 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' 9340+ 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' 9341 ;; 9342 esac 9343 9344@@ -12982,7 +13716,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9345 9346 solaris*) 9347 case $cc_basename in 9348- CC*) 9349+ CC* | sunCC*) 9350 # Sun C++ 4.2, 5.x and Centerline C++ 9351 archive_cmds_need_lc_CXX=yes 9352 no_undefined_flag_CXX=' -zdefs' 9353@@ -13023,9 +13757,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 9354 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 9355 no_undefined_flag_CXX=' ${wl}-z ${wl}defs' 9356 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 9357- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 9358+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 9359 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 9360- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 9361+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 9362 9363 # Commands to make compiler produce verbose output that lists 9364 # what "hidden" libraries, object files and flags are used when 9365@@ -13160,6 +13894,13 @@ private: 9366 }; 9367 _LT_EOF 9368 9369+ 9370+_lt_libdeps_save_CFLAGS=$CFLAGS 9371+case "$CC $CFLAGS " in #( 9372+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; 9373+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; 9374+esac 9375+ 9376 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9377 (eval $ac_compile) 2>&5 9378 ac_status=$? 9379@@ -13173,7 +13914,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9380 pre_test_object_deps_done=no 9381 9382 for p in `eval "$output_verbose_link_cmd"`; do 9383- case $p in 9384+ case ${prev}${p} in 9385 9386 -L* | -R* | -l*) 9387 # Some compilers place space between "-{L,R}" and the path. 9388@@ -13182,13 +13923,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9389 test $p = "-R"; then 9390 prev=$p 9391 continue 9392- else 9393- prev= 9394 fi 9395 9396+ # Expand the sysroot to ease extracting the directories later. 9397+ if test -z "$prev"; then 9398+ case $p in 9399+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; 9400+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; 9401+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; 9402+ esac 9403+ fi 9404+ case $p in 9405+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; 9406+ esac 9407 if test "$pre_test_object_deps_done" = no; then 9408- case $p in 9409- -L* | -R*) 9410+ case ${prev} in 9411+ -L | -R) 9412 # Internal compiler library paths should come after those 9413 # provided the user. The postdeps already come after the 9414 # user supplied libs so there is no need to process them. 9415@@ -13208,8 +13958,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9416 postdeps_CXX="${postdeps_CXX} ${prev}${p}" 9417 fi 9418 fi 9419+ prev= 9420 ;; 9421 9422+ *.lto.$objext) ;; # Ignore GCC LTO objects 9423 *.$objext) 9424 # This assumes that the test object file only shows up 9425 # once in the compiler output. 9426@@ -13245,6 +13997,7 @@ else 9427 fi 9428 9429 $RM -f confest.$objext 9430+CFLAGS=$_lt_libdeps_save_CFLAGS 9431 9432 # PORTME: override above test on systems where it is broken 9433 case $host_os in 9434@@ -13280,7 +14033,7 @@ linux*) 9435 9436 solaris*) 9437 case $cc_basename in 9438- CC*) 9439+ CC* | sunCC*) 9440 # The more standards-conforming stlport4 library is 9441 # incompatible with the Cstd library. Avoid specifying 9442 # it if it's in CXXFLAGS. Ignore libCrun as 9443@@ -13345,8 +14098,6 @@ fi 9444 lt_prog_compiler_pic_CXX= 9445 lt_prog_compiler_static_CXX= 9446 9447-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 9448-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9449 9450 # C++ specific cases for pic, static, wl, etc. 9451 if test "$GXX" = yes; then 9452@@ -13451,6 +14202,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9453 ;; 9454 esac 9455 ;; 9456+ mingw* | cygwin* | os2* | pw32* | cegcc*) 9457+ # This hack is so that the source file can tell whether it is being 9458+ # built for inclusion in a dll (and should export symbols for example). 9459+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' 9460+ ;; 9461 dgux*) 9462 case $cc_basename in 9463 ec++*) 9464@@ -13603,7 +14359,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9465 ;; 9466 solaris*) 9467 case $cc_basename in 9468- CC*) 9469+ CC* | sunCC*) 9470 # Sun C++ 4.2, 5.x and Centerline C++ 9471 lt_prog_compiler_pic_CXX='-KPIC' 9472 lt_prog_compiler_static_CXX='-Bstatic' 9473@@ -13668,10 +14424,17 @@ case $host_os in 9474 lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" 9475 ;; 9476 esac 9477-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 9478-$as_echo "$lt_prog_compiler_pic_CXX" >&6; } 9479- 9480 9481+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 9482+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 9483+if ${lt_cv_prog_compiler_pic_CXX+:} false; then : 9484+ $as_echo_n "(cached) " >&6 9485+else 9486+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX 9487+fi 9488+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 9489+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } 9490+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX 9491 9492 # 9493 # Check to make sure the PIC flag actually works. 9494@@ -13729,6 +14492,8 @@ fi 9495 9496 9497 9498+ 9499+ 9500 # 9501 # Check to make sure the static flag actually works. 9502 # 9503@@ -13906,6 +14671,7 @@ fi 9504 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } 9505 9506 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9507+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 9508 case $host_os in 9509 aix[4-9]*) 9510 # If we're using GNU nm, then we don't want the "-C" option. 9511@@ -13920,15 +14686,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 9512 ;; 9513 pw32*) 9514 export_symbols_cmds_CXX="$ltdll_cmds" 9515- ;; 9516+ ;; 9517 cygwin* | mingw* | cegcc*) 9518- 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' 9519- ;; 9520+ case $cc_basename in 9521+ cl*) ;; 9522+ *) 9523+ 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' 9524+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 9525+ ;; 9526+ esac 9527+ ;; 9528 *) 9529 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 9530- ;; 9531+ ;; 9532 esac 9533- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 9534 9535 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 9536 $as_echo "$ld_shlibs_CXX" >&6; } 9537@@ -14191,8 +14962,9 @@ cygwin* | mingw* | pw32* | cegcc*) 9538 need_version=no 9539 need_lib_prefix=no 9540 9541- case $GCC,$host_os in 9542- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 9543+ case $GCC,$cc_basename in 9544+ yes,*) 9545+ # gcc 9546 library_names_spec='$libname.dll.a' 9547 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9548 postinstall_cmds='base_file=`basename \${file}`~ 9549@@ -14224,13 +14996,71 @@ cygwin* | mingw* | pw32* | cegcc*) 9550 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9551 ;; 9552 esac 9553+ dynamic_linker='Win32 ld.exe' 9554+ ;; 9555+ 9556+ *,cl*) 9557+ # Native MSVC 9558+ libname_spec='$name' 9559+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9560+ library_names_spec='${libname}.dll.lib' 9561+ 9562+ case $build_os in 9563+ mingw*) 9564+ sys_lib_search_path_spec= 9565+ lt_save_ifs=$IFS 9566+ IFS=';' 9567+ for lt_path in $LIB 9568+ do 9569+ IFS=$lt_save_ifs 9570+ # Let DOS variable expansion print the short 8.3 style file name. 9571+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 9572+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 9573+ done 9574+ IFS=$lt_save_ifs 9575+ # Convert to MSYS style. 9576+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 9577+ ;; 9578+ cygwin*) 9579+ # Convert to unix form, then to dos form, then back to unix form 9580+ # but this time dos style (no spaces!) so that the unix form looks 9581+ # like /cygdrive/c/PROGRA~1:/cygdr... 9582+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 9583+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 9584+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 9585+ ;; 9586+ *) 9587+ sys_lib_search_path_spec="$LIB" 9588+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 9589+ # It is most probably a Windows format PATH. 9590+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 9591+ else 9592+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 9593+ fi 9594+ # FIXME: find the short name or the path components, as spaces are 9595+ # common. (e.g. "Program Files" -> "PROGRA~1") 9596+ ;; 9597+ esac 9598+ 9599+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 9600+ postinstall_cmds='base_file=`basename \${file}`~ 9601+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 9602+ dldir=$destdir/`dirname \$dlpath`~ 9603+ test -d \$dldir || mkdir -p \$dldir~ 9604+ $install_prog $dir/$dlname \$dldir/$dlname' 9605+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 9606+ dlpath=$dir/\$dldll~ 9607+ $RM \$dlpath' 9608+ shlibpath_overrides_runpath=yes 9609+ dynamic_linker='Win32 link.exe' 9610 ;; 9611 9612 *) 9613+ # Assume MSVC wrapper 9614 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 9615+ dynamic_linker='Win32 ld.exe' 9616 ;; 9617 esac 9618- dynamic_linker='Win32 ld.exe' 9619 # FIXME: first we should search . and the directory the executable is in 9620 shlibpath_var=PATH 9621 ;; 9622@@ -14770,6 +15600,7 @@ fi 9623 fi # test -n "$compiler" 9624 9625 CC=$lt_save_CC 9626+ CFLAGS=$lt_save_CFLAGS 9627 LDCXX=$LD 9628 LD=$lt_save_LD 9629 GCC=$lt_save_GCC 9630@@ -17830,13 +18661,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 9631 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 9632 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 9633 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 9634+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 9635+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 9636 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 9637 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 9638 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 9639 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 9640 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 9641+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 9642+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 9643+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 9644+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 9645 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 9646 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 9647+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 9648 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 9649 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 9650 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 9651@@ -17851,14 +18689,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 9652 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 9653 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 9654 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"`' 9655+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 9656+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 9657 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 9658 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 9659 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 9660-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 9661 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 9662+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 9663 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 9664 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 9665 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 9666+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 9667 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 9668 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 9669 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 9670@@ -17891,12 +18732,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 9671 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 9672 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 9673 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 9674-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 9675 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 9676 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 9677 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 9678 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 9679 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 9680+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 9681 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 9682 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 9683 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 9684@@ -17935,8 +18776,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote 9685 compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' 9686 GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' 9687 lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' 9688-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' 9689 lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' 9690+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' 9691 lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' 9692 lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' 9693 archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' 9694@@ -17963,12 +18804,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ 9695 hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' 9696 inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' 9697 link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' 9698-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' 9699 always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' 9700 export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' 9701 exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' 9702 include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' 9703 prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' 9704+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' 9705 file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' 9706 hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' 9707 compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' 9708@@ -18006,8 +18847,13 @@ reload_flag \ 9709 OBJDUMP \ 9710 deplibs_check_method \ 9711 file_magic_cmd \ 9712+file_magic_glob \ 9713+want_nocaseglob \ 9714+DLLTOOL \ 9715+sharedlib_from_linklib_cmd \ 9716 AR \ 9717 AR_FLAGS \ 9718+archiver_list_spec \ 9719 STRIP \ 9720 RANLIB \ 9721 CC \ 9722@@ -18017,12 +18863,14 @@ lt_cv_sys_global_symbol_pipe \ 9723 lt_cv_sys_global_symbol_to_cdecl \ 9724 lt_cv_sys_global_symbol_to_c_name_address \ 9725 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 9726+nm_file_list_spec \ 9727 lt_prog_compiler_no_builtin_flag \ 9728-lt_prog_compiler_wl \ 9729 lt_prog_compiler_pic \ 9730+lt_prog_compiler_wl \ 9731 lt_prog_compiler_static \ 9732 lt_cv_prog_compiler_c_o \ 9733 need_locks \ 9734+MANIFEST_TOOL \ 9735 DSYMUTIL \ 9736 NMEDIT \ 9737 LIPO \ 9738@@ -18038,7 +18886,6 @@ no_undefined_flag \ 9739 hardcode_libdir_flag_spec \ 9740 hardcode_libdir_flag_spec_ld \ 9741 hardcode_libdir_separator \ 9742-fix_srcfile_path \ 9743 exclude_expsyms \ 9744 include_expsyms \ 9745 file_list_spec \ 9746@@ -18060,8 +18907,8 @@ LD_CXX \ 9747 reload_flag_CXX \ 9748 compiler_CXX \ 9749 lt_prog_compiler_no_builtin_flag_CXX \ 9750-lt_prog_compiler_wl_CXX \ 9751 lt_prog_compiler_pic_CXX \ 9752+lt_prog_compiler_wl_CXX \ 9753 lt_prog_compiler_static_CXX \ 9754 lt_cv_prog_compiler_c_o_CXX \ 9755 export_dynamic_flag_spec_CXX \ 9756@@ -18073,7 +18920,6 @@ no_undefined_flag_CXX \ 9757 hardcode_libdir_flag_spec_CXX \ 9758 hardcode_libdir_flag_spec_ld_CXX \ 9759 hardcode_libdir_separator_CXX \ 9760-fix_srcfile_path_CXX \ 9761 exclude_expsyms_CXX \ 9762 include_expsyms_CXX \ 9763 file_list_spec_CXX \ 9764@@ -18107,6 +18953,7 @@ module_cmds \ 9765 module_expsym_cmds \ 9766 export_symbols_cmds \ 9767 prelink_cmds \ 9768+postlink_cmds \ 9769 postinstall_cmds \ 9770 postuninstall_cmds \ 9771 finish_cmds \ 9772@@ -18121,7 +18968,8 @@ archive_expsym_cmds_CXX \ 9773 module_cmds_CXX \ 9774 module_expsym_cmds_CXX \ 9775 export_symbols_cmds_CXX \ 9776-prelink_cmds_CXX; do 9777+prelink_cmds_CXX \ 9778+postlink_cmds_CXX; do 9779 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 9780 *[\\\\\\\`\\"\\\$]*) 9781 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 9782@@ -18886,7 +19734,8 @@ $as_echo X"$file" | 9783 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 9784 # 9785 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 9786-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 9787+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 9788+# Inc. 9789 # Written by Gordon Matzigkeit, 1996 9790 # 9791 # This file is part of GNU Libtool. 9792@@ -18989,19 +19838,42 @@ SP2NL=$lt_lt_SP2NL 9793 # turn newlines into spaces. 9794 NL2SP=$lt_lt_NL2SP 9795 9796+# convert \$build file names to \$host format. 9797+to_host_file_cmd=$lt_cv_to_host_file_cmd 9798+ 9799+# convert \$build files to toolchain format. 9800+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 9801+ 9802 # An object symbol dumper. 9803 OBJDUMP=$lt_OBJDUMP 9804 9805 # Method to check whether dependent libraries are shared objects. 9806 deplibs_check_method=$lt_deplibs_check_method 9807 9808-# Command to use when deplibs_check_method == "file_magic". 9809+# Command to use when deplibs_check_method = "file_magic". 9810 file_magic_cmd=$lt_file_magic_cmd 9811 9812+# How to find potential files when deplibs_check_method = "file_magic". 9813+file_magic_glob=$lt_file_magic_glob 9814+ 9815+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 9816+want_nocaseglob=$lt_want_nocaseglob 9817+ 9818+# DLL creation program. 9819+DLLTOOL=$lt_DLLTOOL 9820+ 9821+# Command to associate shared and link libraries. 9822+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 9823+ 9824 # The archiver. 9825 AR=$lt_AR 9826+ 9827+# Flags to create an archive. 9828 AR_FLAGS=$lt_AR_FLAGS 9829 9830+# How to feed a file listing to the archiver. 9831+archiver_list_spec=$lt_archiver_list_spec 9832+ 9833 # A symbol stripping program. 9834 STRIP=$lt_STRIP 9835 9836@@ -19031,6 +19903,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 9837 # Transform the output of nm in a C name address pair when lib prefix is needed. 9838 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 9839 9840+# Specify filename containing input files for \$NM. 9841+nm_file_list_spec=$lt_nm_file_list_spec 9842+ 9843+# The root where to search for dependent libraries,and in which our libraries should be installed. 9844+lt_sysroot=$lt_sysroot 9845+ 9846 # The name of the directory that contains temporary libtool files. 9847 objdir=$objdir 9848 9849@@ -19040,6 +19918,9 @@ MAGIC_CMD=$MAGIC_CMD 9850 # Must we lock files when doing compilation? 9851 need_locks=$lt_need_locks 9852 9853+# Manifest tool. 9854+MANIFEST_TOOL=$lt_MANIFEST_TOOL 9855+ 9856 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 9857 DSYMUTIL=$lt_DSYMUTIL 9858 9859@@ -19154,12 +20035,12 @@ with_gcc=$GCC 9860 # Compiler flag to turn off builtin functions. 9861 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 9862 9863-# How to pass a linker flag through the compiler. 9864-wl=$lt_lt_prog_compiler_wl 9865- 9866 # Additional compiler flags for building library objects. 9867 pic_flag=$lt_lt_prog_compiler_pic 9868 9869+# How to pass a linker flag through the compiler. 9870+wl=$lt_lt_prog_compiler_wl 9871+ 9872 # Compiler flag to prevent dynamic linking. 9873 link_static_flag=$lt_lt_prog_compiler_static 9874 9875@@ -19246,9 +20127,6 @@ inherit_rpath=$inherit_rpath 9876 # Whether libtool must link a program against all its dependency libraries. 9877 link_all_deplibs=$link_all_deplibs 9878 9879-# Fix the shell variable \$srcfile for the compiler. 9880-fix_srcfile_path=$lt_fix_srcfile_path 9881- 9882 # Set to "yes" if exported symbols are required. 9883 always_export_symbols=$always_export_symbols 9884 9885@@ -19264,6 +20142,9 @@ include_expsyms=$lt_include_expsyms 9886 # Commands necessary for linking programs (against libraries) with templates. 9887 prelink_cmds=$lt_prelink_cmds 9888 9889+# Commands necessary for finishing linking programs. 9890+postlink_cmds=$lt_postlink_cmds 9891+ 9892 # Specify filename containing input files. 9893 file_list_spec=$lt_file_list_spec 9894 9895@@ -19310,210 +20191,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 9896 # if finds mixed CR/LF and LF-only lines. Since sed operates in 9897 # text mode, it properly converts lines to CR/LF. This bash problem 9898 # is reportedly fixed, but why not run on old versions too? 9899- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 9900- || (rm -f "$cfgfile"; exit 1) 9901- 9902- case $xsi_shell in 9903- yes) 9904- cat << \_LT_EOF >> "$cfgfile" 9905- 9906-# func_dirname file append nondir_replacement 9907-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 9908-# otherwise set result to NONDIR_REPLACEMENT. 9909-func_dirname () 9910-{ 9911- case ${1} in 9912- */*) func_dirname_result="${1%/*}${2}" ;; 9913- * ) func_dirname_result="${3}" ;; 9914- esac 9915-} 9916- 9917-# func_basename file 9918-func_basename () 9919-{ 9920- func_basename_result="${1##*/}" 9921-} 9922- 9923-# func_dirname_and_basename file append nondir_replacement 9924-# perform func_basename and func_dirname in a single function 9925-# call: 9926-# dirname: Compute the dirname of FILE. If nonempty, 9927-# add APPEND to the result, otherwise set result 9928-# to NONDIR_REPLACEMENT. 9929-# value returned in "$func_dirname_result" 9930-# basename: Compute filename of FILE. 9931-# value retuned in "$func_basename_result" 9932-# Implementation must be kept synchronized with func_dirname 9933-# and func_basename. For efficiency, we do not delegate to 9934-# those functions but instead duplicate the functionality here. 9935-func_dirname_and_basename () 9936-{ 9937- case ${1} in 9938- */*) func_dirname_result="${1%/*}${2}" ;; 9939- * ) func_dirname_result="${3}" ;; 9940- esac 9941- func_basename_result="${1##*/}" 9942-} 9943- 9944-# func_stripname prefix suffix name 9945-# strip PREFIX and SUFFIX off of NAME. 9946-# PREFIX and SUFFIX must not contain globbing or regex special 9947-# characters, hashes, percent signs, but SUFFIX may contain a leading 9948-# dot (in which case that matches only a dot). 9949-func_stripname () 9950-{ 9951- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 9952- # positional parameters, so assign one to ordinary parameter first. 9953- func_stripname_result=${3} 9954- func_stripname_result=${func_stripname_result#"${1}"} 9955- func_stripname_result=${func_stripname_result%"${2}"} 9956-} 9957- 9958-# func_opt_split 9959-func_opt_split () 9960-{ 9961- func_opt_split_opt=${1%%=*} 9962- func_opt_split_arg=${1#*=} 9963-} 9964- 9965-# func_lo2o object 9966-func_lo2o () 9967-{ 9968- case ${1} in 9969- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 9970- *) func_lo2o_result=${1} ;; 9971- esac 9972-} 9973- 9974-# func_xform libobj-or-source 9975-func_xform () 9976-{ 9977- func_xform_result=${1%.*}.lo 9978-} 9979- 9980-# func_arith arithmetic-term... 9981-func_arith () 9982-{ 9983- func_arith_result=$(( $* )) 9984-} 9985- 9986-# func_len string 9987-# STRING may not start with a hyphen. 9988-func_len () 9989-{ 9990- func_len_result=${#1} 9991-} 9992- 9993-_LT_EOF 9994- ;; 9995- *) # Bourne compatible functions. 9996- cat << \_LT_EOF >> "$cfgfile" 9997- 9998-# func_dirname file append nondir_replacement 9999-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 10000-# otherwise set result to NONDIR_REPLACEMENT. 10001-func_dirname () 10002-{ 10003- # Extract subdirectory from the argument. 10004- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 10005- if test "X$func_dirname_result" = "X${1}"; then 10006- func_dirname_result="${3}" 10007- else 10008- func_dirname_result="$func_dirname_result${2}" 10009- fi 10010-} 10011- 10012-# func_basename file 10013-func_basename () 10014-{ 10015- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 10016-} 10017- 10018- 10019-# func_stripname prefix suffix name 10020-# strip PREFIX and SUFFIX off of NAME. 10021-# PREFIX and SUFFIX must not contain globbing or regex special 10022-# characters, hashes, percent signs, but SUFFIX may contain a leading 10023-# dot (in which case that matches only a dot). 10024-# func_strip_suffix prefix name 10025-func_stripname () 10026-{ 10027- case ${2} in 10028- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 10029- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 10030- esac 10031-} 10032- 10033-# sed scripts: 10034-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 10035-my_sed_long_arg='1s/^-[^=]*=//' 10036- 10037-# func_opt_split 10038-func_opt_split () 10039-{ 10040- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 10041- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 10042-} 10043- 10044-# func_lo2o object 10045-func_lo2o () 10046-{ 10047- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 10048-} 10049- 10050-# func_xform libobj-or-source 10051-func_xform () 10052-{ 10053- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 10054-} 10055- 10056-# func_arith arithmetic-term... 10057-func_arith () 10058-{ 10059- func_arith_result=`expr "$@"` 10060-} 10061- 10062-# func_len string 10063-# STRING may not start with a hyphen. 10064-func_len () 10065-{ 10066- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 10067-} 10068- 10069-_LT_EOF 10070-esac 10071- 10072-case $lt_shell_append in 10073- yes) 10074- cat << \_LT_EOF >> "$cfgfile" 10075- 10076-# func_append var value 10077-# Append VALUE to the end of shell variable VAR. 10078-func_append () 10079-{ 10080- eval "$1+=\$2" 10081-} 10082-_LT_EOF 10083- ;; 10084- *) 10085- cat << \_LT_EOF >> "$cfgfile" 10086- 10087-# func_append var value 10088-# Append VALUE to the end of shell variable VAR. 10089-func_append () 10090-{ 10091- eval "$1=\$$1\$2" 10092-} 10093- 10094-_LT_EOF 10095- ;; 10096- esac 10097- 10098- 10099- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 10100- || (rm -f "$cfgfile"; exit 1) 10101- 10102- mv -f "$cfgfile" "$ofile" || 10103+ sed '$q' "$ltmain" >> "$cfgfile" \ 10104+ || (rm -f "$cfgfile"; exit 1) 10105+ 10106+ if test x"$xsi_shell" = xyes; then 10107+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 10108+func_dirname ()\ 10109+{\ 10110+\ case ${1} in\ 10111+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 10112+\ * ) func_dirname_result="${3}" ;;\ 10113+\ esac\ 10114+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 10115+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10116+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10117+test 0 -eq $? || _lt_function_replace_fail=: 10118+ 10119+ 10120+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 10121+func_basename ()\ 10122+{\ 10123+\ func_basename_result="${1##*/}"\ 10124+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 10125+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10126+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10127+test 0 -eq $? || _lt_function_replace_fail=: 10128+ 10129+ 10130+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 10131+func_dirname_and_basename ()\ 10132+{\ 10133+\ case ${1} in\ 10134+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 10135+\ * ) func_dirname_result="${3}" ;;\ 10136+\ esac\ 10137+\ func_basename_result="${1##*/}"\ 10138+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 10139+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10140+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10141+test 0 -eq $? || _lt_function_replace_fail=: 10142+ 10143+ 10144+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 10145+func_stripname ()\ 10146+{\ 10147+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 10148+\ # positional parameters, so assign one to ordinary parameter first.\ 10149+\ func_stripname_result=${3}\ 10150+\ func_stripname_result=${func_stripname_result#"${1}"}\ 10151+\ func_stripname_result=${func_stripname_result%"${2}"}\ 10152+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 10153+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10154+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10155+test 0 -eq $? || _lt_function_replace_fail=: 10156+ 10157+ 10158+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 10159+func_split_long_opt ()\ 10160+{\ 10161+\ func_split_long_opt_name=${1%%=*}\ 10162+\ func_split_long_opt_arg=${1#*=}\ 10163+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 10164+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10165+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10166+test 0 -eq $? || _lt_function_replace_fail=: 10167+ 10168+ 10169+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 10170+func_split_short_opt ()\ 10171+{\ 10172+\ func_split_short_opt_arg=${1#??}\ 10173+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 10174+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 10175+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10176+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10177+test 0 -eq $? || _lt_function_replace_fail=: 10178+ 10179+ 10180+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 10181+func_lo2o ()\ 10182+{\ 10183+\ case ${1} in\ 10184+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 10185+\ *) func_lo2o_result=${1} ;;\ 10186+\ esac\ 10187+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 10188+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10189+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10190+test 0 -eq $? || _lt_function_replace_fail=: 10191+ 10192+ 10193+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 10194+func_xform ()\ 10195+{\ 10196+ func_xform_result=${1%.*}.lo\ 10197+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 10198+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10199+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10200+test 0 -eq $? || _lt_function_replace_fail=: 10201+ 10202+ 10203+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 10204+func_arith ()\ 10205+{\ 10206+ func_arith_result=$(( $* ))\ 10207+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 10208+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10209+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10210+test 0 -eq $? || _lt_function_replace_fail=: 10211+ 10212+ 10213+ sed -e '/^func_len ()$/,/^} # func_len /c\ 10214+func_len ()\ 10215+{\ 10216+ func_len_result=${#1}\ 10217+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 10218+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10219+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10220+test 0 -eq $? || _lt_function_replace_fail=: 10221+ 10222+fi 10223+ 10224+if test x"$lt_shell_append" = xyes; then 10225+ sed -e '/^func_append ()$/,/^} # func_append /c\ 10226+func_append ()\ 10227+{\ 10228+ eval "${1}+=\\${2}"\ 10229+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 10230+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10231+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10232+test 0 -eq $? || _lt_function_replace_fail=: 10233+ 10234+ 10235+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 10236+func_append_quoted ()\ 10237+{\ 10238+\ func_quote_for_eval "${2}"\ 10239+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 10240+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 10241+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10242+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10243+test 0 -eq $? || _lt_function_replace_fail=: 10244+ 10245+ 10246+ # Save a `func_append' function call where possible by direct use of '+=' 10247+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 10248+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10249+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10250+ test 0 -eq $? || _lt_function_replace_fail=: 10251+else 10252+ # Save a `func_append' function call even when '+=' is not available 10253+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 10254+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 10255+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 10256+ test 0 -eq $? || _lt_function_replace_fail=: 10257+fi 10258+ 10259+if test x"$_lt_function_replace_fail" = x":"; then 10260+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 10261+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 10262+fi 10263+ 10264+ 10265+ mv -f "$cfgfile" "$ofile" || 10266 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 10267 chmod +x "$ofile" 10268 10269@@ -19541,12 +20381,12 @@ with_gcc=$GCC_CXX 10270 # Compiler flag to turn off builtin functions. 10271 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX 10272 10273-# How to pass a linker flag through the compiler. 10274-wl=$lt_lt_prog_compiler_wl_CXX 10275- 10276 # Additional compiler flags for building library objects. 10277 pic_flag=$lt_lt_prog_compiler_pic_CXX 10278 10279+# How to pass a linker flag through the compiler. 10280+wl=$lt_lt_prog_compiler_wl_CXX 10281+ 10282 # Compiler flag to prevent dynamic linking. 10283 link_static_flag=$lt_lt_prog_compiler_static_CXX 10284 10285@@ -19633,9 +20473,6 @@ inherit_rpath=$inherit_rpath_CXX 10286 # Whether libtool must link a program against all its dependency libraries. 10287 link_all_deplibs=$link_all_deplibs_CXX 10288 10289-# Fix the shell variable \$srcfile for the compiler. 10290-fix_srcfile_path=$lt_fix_srcfile_path_CXX 10291- 10292 # Set to "yes" if exported symbols are required. 10293 always_export_symbols=$always_export_symbols_CXX 10294 10295@@ -19651,6 +20488,9 @@ include_expsyms=$lt_include_expsyms_CXX 10296 # Commands necessary for linking programs (against libraries) with templates. 10297 prelink_cmds=$lt_prelink_cmds_CXX 10298 10299+# Commands necessary for finishing linking programs. 10300+postlink_cmds=$lt_postlink_cmds_CXX 10301+ 10302 # Specify filename containing input files. 10303 file_list_spec=$lt_file_list_spec_CXX 10304 10305diff --git a/libbacktrace/configure b/libbacktrace/configure 10306index a2f33c0f35d..90667680701 100755 10307--- a/libbacktrace/configure 10308+++ b/libbacktrace/configure 10309@@ -680,7 +680,10 @@ OTOOL 10310 LIPO 10311 NMEDIT 10312 DSYMUTIL 10313+MANIFEST_TOOL 10314+ac_ct_AR 10315 AR 10316+DLLTOOL 10317 OBJDUMP 10318 LN_S 10319 NM 10320@@ -798,6 +801,7 @@ enable_static 10321 with_pic 10322 enable_fast_install 10323 with_gnu_ld 10324+with_libtool_sysroot 10325 enable_libtool_lock 10326 enable_largefile 10327 enable_cet 10328@@ -1458,6 +1462,8 @@ Optional Packages: 10329 --with-pic try to use only PIC/non-PIC objects [default=use 10330 both] 10331 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 10332+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 10333+ (or the compiler's sysroot if not specified). 10334 --with-system-libunwind use installed libunwind 10335 10336 Some influential environment variables: 10337@@ -5446,8 +5452,8 @@ esac 10338 10339 10340 10341-macro_version='2.2.7a' 10342-macro_revision='1.3134' 10343+macro_version='2.4' 10344+macro_revision='1.3293' 10345 10346 10347 10348@@ -5487,7 +5493,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 10349 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 10350 $as_echo_n "checking how to print strings... " >&6; } 10351 # Test print first, because it will be a builtin if present. 10352-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 10353+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 10354 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 10355 ECHO='print -r --' 10356 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 10357@@ -5818,48 +5824,49 @@ if ${lt_cv_path_NM+:} false; then : 10358 $as_echo_n "(cached) " >&6 10359 else 10360 if test -n "$NM"; then 10361- # Let the user override the test. 10362- lt_cv_path_NM="$NM" 10363-else 10364- lt_nm_to_check="${ac_tool_prefix}nm" 10365- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 10366- lt_nm_to_check="$lt_nm_to_check nm" 10367- fi 10368- for lt_tmp_nm in $lt_nm_to_check; do 10369- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR 10370- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do 10371- IFS="$lt_save_ifs" 10372- test -z "$ac_dir" && ac_dir=. 10373- tmp_nm="$ac_dir/$lt_tmp_nm" 10374- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then 10375- # Check to see if the nm accepts a BSD-compat flag. 10376- # Adding the `sed 1q' prevents false positives on HP-UX, which says: 10377- # nm: unknown option "B" ignored 10378- # Tru64's nm complains that /dev/null is an invalid object file 10379- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in 10380- */dev/null* | *'Invalid file or object type'*) 10381- lt_cv_path_NM="$tmp_nm -B" 10382- break 10383- ;; 10384- *) 10385- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in 10386- */dev/null*) 10387- lt_cv_path_NM="$tmp_nm -p" 10388- break 10389- ;; 10390- *) 10391- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but 10392- continue # so that we can try to find one that supports BSD flags 10393- ;; 10394- esac 10395- ;; 10396- esac 10397- fi 10398- done 10399- IFS="$lt_save_ifs" 10400- done 10401- : ${lt_cv_path_NM=no} 10402-fi 10403+ # Let the user override the nm to test. 10404+ lt_nm_to_check="$NM" 10405+ else 10406+ lt_nm_to_check="${ac_tool_prefix}nm" 10407+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 10408+ lt_nm_to_check="$lt_nm_to_check nm" 10409+ fi 10410+ fi 10411+ for lt_tmp_nm in $lt_nm_to_check; do 10412+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR 10413+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do 10414+ IFS="$lt_save_ifs" 10415+ test -z "$ac_dir" && ac_dir=. 10416+ case "$lt_tmp_nm" in 10417+ */*|*\\*) tmp_nm="$lt_tmp_nm";; 10418+ *) tmp_nm="$ac_dir/$lt_tmp_nm";; 10419+ esac 10420+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then 10421+ # Check to see if the nm accepts a BSD-compat flag. 10422+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: 10423+ # nm: unknown option "B" ignored 10424+ case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in 10425+ *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B" 10426+ break 10427+ ;; 10428+ *) 10429+ case `"$tmp_nm" -p "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in 10430+ *$tmp_nm*) 10431+ lt_cv_path_NM="$tmp_nm -p" 10432+ break 10433+ ;; 10434+ *) 10435+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but 10436+ continue # so that we can try to find one that supports BSD flags 10437+ ;; 10438+ esac 10439+ ;; 10440+ esac 10441+ fi 10442+ done 10443+ IFS="$lt_save_ifs" 10444+ done 10445+ : ${lt_cv_path_NM=no} 10446 fi 10447 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 10448 $as_echo "$lt_cv_path_NM" >&6; } 10449@@ -6173,8 +6180,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 10450 # Try some XSI features 10451 xsi_shell=no 10452 ( _lt_dummy="a/b/c" 10453- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 10454- = c,a/b,, \ 10455+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 10456+ = c,a/b,b/c, \ 10457 && eval 'test $(( 1 + 1 )) -eq 2 \ 10458 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 10459 && xsi_shell=yes 10460@@ -6223,6 +6230,80 @@ esac 10461 10462 10463 10464+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 10465+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 10466+if ${lt_cv_to_host_file_cmd+:} false; then : 10467+ $as_echo_n "(cached) " >&6 10468+else 10469+ case $host in 10470+ *-*-mingw* ) 10471+ case $build in 10472+ *-*-mingw* ) # actually msys 10473+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 10474+ ;; 10475+ *-*-cygwin* ) 10476+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 10477+ ;; 10478+ * ) # otherwise, assume *nix 10479+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 10480+ ;; 10481+ esac 10482+ ;; 10483+ *-*-cygwin* ) 10484+ case $build in 10485+ *-*-mingw* ) # actually msys 10486+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 10487+ ;; 10488+ *-*-cygwin* ) 10489+ lt_cv_to_host_file_cmd=func_convert_file_noop 10490+ ;; 10491+ * ) # otherwise, assume *nix 10492+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 10493+ ;; 10494+ esac 10495+ ;; 10496+ * ) # unhandled hosts (and "normal" native builds) 10497+ lt_cv_to_host_file_cmd=func_convert_file_noop 10498+ ;; 10499+esac 10500+ 10501+fi 10502+ 10503+to_host_file_cmd=$lt_cv_to_host_file_cmd 10504+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 10505+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 10506+ 10507+ 10508+ 10509+ 10510+ 10511+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 10512+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 10513+if ${lt_cv_to_tool_file_cmd+:} false; then : 10514+ $as_echo_n "(cached) " >&6 10515+else 10516+ #assume ordinary cross tools, or native build. 10517+lt_cv_to_tool_file_cmd=func_convert_file_noop 10518+case $host in 10519+ *-*-mingw* ) 10520+ case $build in 10521+ *-*-mingw* ) # actually msys 10522+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 10523+ ;; 10524+ esac 10525+ ;; 10526+esac 10527+ 10528+fi 10529+ 10530+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 10531+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 10532+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 10533+ 10534+ 10535+ 10536+ 10537+ 10538 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 10539 $as_echo_n "checking for $LD option to reload object files... " >&6; } 10540 if ${lt_cv_ld_reload_flag+:} false; then : 10541@@ -6239,6 +6320,11 @@ case $reload_flag in 10542 esac 10543 reload_cmds='$LD$reload_flag -o $output$reload_objs' 10544 case $host_os in 10545+ cygwin* | mingw* | pw32* | cegcc*) 10546+ if test "$GCC" != yes; then 10547+ reload_cmds=false 10548+ fi 10549+ ;; 10550 darwin*) 10551 if test "$GCC" = yes; then 10552 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 10553@@ -6407,7 +6493,8 @@ mingw* | pw32*) 10554 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 10555 lt_cv_file_magic_cmd='func_win32_libid' 10556 else 10557- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 10558+ # Keep this pattern in sync with the one in func_win32_libid. 10559+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 10560 lt_cv_file_magic_cmd='$OBJDUMP -f' 10561 fi 10562 ;; 10563@@ -6480,7 +6567,7 @@ irix5* | irix6* | nonstopux*) 10564 ;; 10565 10566 # This must be Linux ELF. 10567-linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi) 10568+linux* | k*bsd*-gnu | kopensolaris*-gnu) 10569 lt_cv_deplibs_check_method=pass_all 10570 ;; 10571 10572@@ -6561,6 +6648,21 @@ esac 10573 fi 10574 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 10575 $as_echo "$lt_cv_deplibs_check_method" >&6; } 10576+ 10577+file_magic_glob= 10578+want_nocaseglob=no 10579+if test "$build" = "$host"; then 10580+ case $host_os in 10581+ mingw* | pw32*) 10582+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 10583+ want_nocaseglob=yes 10584+ else 10585+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 10586+ fi 10587+ ;; 10588+ esac 10589+fi 10590+ 10591 file_magic_cmd=$lt_cv_file_magic_cmd 10592 deplibs_check_method=$lt_cv_deplibs_check_method 10593 test -z "$deplibs_check_method" && deplibs_check_method=unknown 10594@@ -6574,11 +6676,177 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 10595 10596 10597 10598+ 10599+ 10600+ 10601+ 10602+ 10603+ 10604+ 10605+ 10606+ 10607+ 10608 10609 10610 if test -n "$ac_tool_prefix"; then 10611- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 10612-set dummy ${ac_tool_prefix}ar; ac_word=$2 10613+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 10614+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 10615+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10616+$as_echo_n "checking for $ac_word... " >&6; } 10617+if ${ac_cv_prog_DLLTOOL+:} false; then : 10618+ $as_echo_n "(cached) " >&6 10619+else 10620+ if test -n "$DLLTOOL"; then 10621+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 10622+else 10623+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 10624+for as_dir in $PATH 10625+do 10626+ IFS=$as_save_IFS 10627+ test -z "$as_dir" && as_dir=. 10628+ for ac_exec_ext in '' $ac_executable_extensions; do 10629+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10630+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 10631+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10632+ break 2 10633+ fi 10634+done 10635+ done 10636+IFS=$as_save_IFS 10637+ 10638+fi 10639+fi 10640+DLLTOOL=$ac_cv_prog_DLLTOOL 10641+if test -n "$DLLTOOL"; then 10642+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 10643+$as_echo "$DLLTOOL" >&6; } 10644+else 10645+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10646+$as_echo "no" >&6; } 10647+fi 10648+ 10649+ 10650+fi 10651+if test -z "$ac_cv_prog_DLLTOOL"; then 10652+ ac_ct_DLLTOOL=$DLLTOOL 10653+ # Extract the first word of "dlltool", so it can be a program name with args. 10654+set dummy dlltool; ac_word=$2 10655+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10656+$as_echo_n "checking for $ac_word... " >&6; } 10657+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 10658+ $as_echo_n "(cached) " >&6 10659+else 10660+ if test -n "$ac_ct_DLLTOOL"; then 10661+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 10662+else 10663+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 10664+for as_dir in $PATH 10665+do 10666+ IFS=$as_save_IFS 10667+ test -z "$as_dir" && as_dir=. 10668+ for ac_exec_ext in '' $ac_executable_extensions; do 10669+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10670+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 10671+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10672+ break 2 10673+ fi 10674+done 10675+ done 10676+IFS=$as_save_IFS 10677+ 10678+fi 10679+fi 10680+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 10681+if test -n "$ac_ct_DLLTOOL"; then 10682+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 10683+$as_echo "$ac_ct_DLLTOOL" >&6; } 10684+else 10685+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10686+$as_echo "no" >&6; } 10687+fi 10688+ 10689+ if test "x$ac_ct_DLLTOOL" = x; then 10690+ DLLTOOL="false" 10691+ else 10692+ case $cross_compiling:$ac_tool_warned in 10693+yes:) 10694+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 10695+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 10696+ac_tool_warned=yes ;; 10697+esac 10698+ DLLTOOL=$ac_ct_DLLTOOL 10699+ fi 10700+else 10701+ DLLTOOL="$ac_cv_prog_DLLTOOL" 10702+fi 10703+ 10704+test -z "$DLLTOOL" && DLLTOOL=dlltool 10705+ 10706+ 10707+ 10708+ 10709+ 10710+ 10711+ 10712+ 10713+ 10714+ 10715+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 10716+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 10717+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 10718+ $as_echo_n "(cached) " >&6 10719+else 10720+ lt_cv_sharedlib_from_linklib_cmd='unknown' 10721+ 10722+case $host_os in 10723+cygwin* | mingw* | pw32* | cegcc*) 10724+ # two different shell functions defined in ltmain.sh 10725+ # decide which to use based on capabilities of $DLLTOOL 10726+ case `$DLLTOOL --help 2>&1` in 10727+ *--identify-strict*) 10728+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 10729+ ;; 10730+ *) 10731+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 10732+ ;; 10733+ esac 10734+ ;; 10735+*) 10736+ # fallback: assume linklib IS sharedlib 10737+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 10738+ ;; 10739+esac 10740+ 10741+fi 10742+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 10743+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 10744+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 10745+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 10746+ 10747+ 10748+ 10749+ 10750+ 10751+ 10752+ 10753+plugin_option= 10754+plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 10755+for plugin in $plugin_names; do 10756+ plugin_so=`${CC} ${CFLAGS} --print-prog-name $plugin` 10757+ if test x$plugin_so = x$plugin; then 10758+ plugin_so=`${CC} ${CFLAGS} --print-file-name $plugin` 10759+ fi 10760+ if test x$plugin_so != x$plugin; then 10761+ plugin_option="--plugin $plugin_so" 10762+ break 10763+ fi 10764+done 10765+ 10766+if test -n "$ac_tool_prefix"; then 10767+ for ac_prog in ar 10768+ do 10769+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 10770+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 10771 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10772 $as_echo_n "checking for $ac_word... " >&6; } 10773 if ${ac_cv_prog_AR+:} false; then : 10774@@ -6594,7 +6862,7 @@ do 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_AR="${ac_tool_prefix}ar" 10779+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 10780 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10781 break 2 10782 fi 10783@@ -6614,11 +6882,15 @@ $as_echo "no" >&6; } 10784 fi 10785 10786 10787+ test -n "$AR" && break 10788+ done 10789 fi 10790-if test -z "$ac_cv_prog_AR"; then 10791+if test -z "$AR"; then 10792 ac_ct_AR=$AR 10793- # Extract the first word of "ar", so it can be a program name with args. 10794-set dummy ar; ac_word=$2 10795+ for ac_prog in ar 10796+do 10797+ # Extract the first word of "$ac_prog", so it can be a program name with args. 10798+set dummy $ac_prog; ac_word=$2 10799 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10800 $as_echo_n "checking for $ac_word... " >&6; } 10801 if ${ac_cv_prog_ac_ct_AR+:} false; then : 10802@@ -6634,7 +6906,7 @@ do 10803 test -z "$as_dir" && as_dir=. 10804 for ac_exec_ext in '' $ac_executable_extensions; do 10805 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 10806- ac_cv_prog_ac_ct_AR="ar" 10807+ ac_cv_prog_ac_ct_AR="$ac_prog" 10808 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 10809 break 2 10810 fi 10811@@ -6653,6 +6925,10 @@ else 10812 $as_echo "no" >&6; } 10813 fi 10814 10815+ 10816+ test -n "$ac_ct_AR" && break 10817+done 10818+ 10819 if test "x$ac_ct_AR" = x; then 10820 AR="false" 10821 else 10822@@ -6664,12 +6940,21 @@ ac_tool_warned=yes ;; 10823 esac 10824 AR=$ac_ct_AR 10825 fi 10826-else 10827- AR="$ac_cv_prog_AR" 10828 fi 10829 10830-test -z "$AR" && AR=ar 10831-test -z "$AR_FLAGS" && AR_FLAGS=cru 10832+ touch conftest.c 10833+ $AR $plugin_option rc conftest.a conftest.c 10834+ if test "$?" != 0; then 10835+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 10836+$as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 10837+ else 10838+ AR="$AR $plugin_option" 10839+ fi 10840+ rm -f conftest.* 10841+: ${AR=ar} 10842+: ${AR_FLAGS=cru} 10843+ 10844+ 10845 10846 10847 10848@@ -6679,6 +6964,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 10849 10850 10851 10852+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 10853+$as_echo_n "checking for archiver @FILE support... " >&6; } 10854+if ${lt_cv_ar_at_file+:} false; then : 10855+ $as_echo_n "(cached) " >&6 10856+else 10857+ lt_cv_ar_at_file=no 10858+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 10859+/* end confdefs.h. */ 10860+ 10861+int 10862+main () 10863+{ 10864+ 10865+ ; 10866+ return 0; 10867+} 10868+_ACEOF 10869+if ac_fn_c_try_compile "$LINENO"; then : 10870+ echo conftest.$ac_objext > conftest.lst 10871+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 10872+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 10873+ (eval $lt_ar_try) 2>&5 10874+ ac_status=$? 10875+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 10876+ test $ac_status = 0; } 10877+ if test "$ac_status" -eq 0; then 10878+ # Ensure the archiver fails upon bogus file names. 10879+ rm -f conftest.$ac_objext libconftest.a 10880+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 10881+ (eval $lt_ar_try) 2>&5 10882+ ac_status=$? 10883+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 10884+ test $ac_status = 0; } 10885+ if test "$ac_status" -ne 0; then 10886+ lt_cv_ar_at_file=@ 10887+ fi 10888+ fi 10889+ rm -f conftest.* libconftest.a 10890+ 10891+fi 10892+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 10893+ 10894+fi 10895+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 10896+$as_echo "$lt_cv_ar_at_file" >&6; } 10897+ 10898+if test "x$lt_cv_ar_at_file" = xno; then 10899+ archiver_list_spec= 10900+else 10901+ archiver_list_spec=$lt_cv_ar_at_file 10902+fi 10903+ 10904+ 10905+ 10906+ 10907+ 10908 10909 10910 if test -n "$ac_tool_prefix"; then 10911@@ -6873,6 +7214,11 @@ else 10912 fi 10913 10914 test -z "$RANLIB" && RANLIB=: 10915+if test -n "$plugin_option" && test "$RANLIB" != ":"; then 10916+ if $RANLIB --help 2>&1 | grep -q "\--plugin"; then 10917+ RANLIB="$RANLIB $plugin_option" 10918+ fi 10919+fi 10920 10921 10922 10923@@ -6987,7 +7333,7 @@ osf*) 10924 symcode='[BCDEGQRST]' 10925 ;; 10926 solaris*) 10927- symcode='[BDRT]' 10928+ symcode='[BCDRT]' 10929 ;; 10930 sco3.2v5*) 10931 symcode='[DT]' 10932@@ -7015,8 +7361,8 @@ esac 10933 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 10934 10935 # Transform an extracted symbol line into symbol name and symbol address 10936-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 10937-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'" 10938+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 10939+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'" 10940 10941 # Handle CRLF in mingw tool chain 10942 opt_cr= 10943@@ -7052,6 +7398,7 @@ for ac_symprfx in "" "_"; do 10944 else 10945 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 10946 fi 10947+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 10948 10949 # Check to see that the pipe works correctly. 10950 pipe_works=no 10951@@ -7093,6 +7440,18 @@ _LT_EOF 10952 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 10953 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 10954 cat <<_LT_EOF > conftest.$ac_ext 10955+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 10956+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 10957+/* DATA imports from DLLs on WIN32 con't be const, because runtime 10958+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 10959+# define LT_DLSYM_CONST 10960+#elif defined(__osf__) 10961+/* This system does not cope well with relocations in const data. */ 10962+# define LT_DLSYM_CONST 10963+#else 10964+# define LT_DLSYM_CONST const 10965+#endif 10966+ 10967 #ifdef __cplusplus 10968 extern "C" { 10969 #endif 10970@@ -7104,7 +7463,7 @@ _LT_EOF 10971 cat <<_LT_EOF >> conftest.$ac_ext 10972 10973 /* The mapping between symbol names and symbols. */ 10974-const struct { 10975+LT_DLSYM_CONST struct { 10976 const char *name; 10977 void *address; 10978 } 10979@@ -7130,8 +7489,8 @@ static const void *lt_preloaded_setup() { 10980 _LT_EOF 10981 # Now try linking the two files. 10982 mv conftest.$ac_objext conftstm.$ac_objext 10983- lt_save_LIBS="$LIBS" 10984- lt_save_CFLAGS="$CFLAGS" 10985+ lt_globsym_save_LIBS=$LIBS 10986+ lt_globsym_save_CFLAGS=$CFLAGS 10987 LIBS="conftstm.$ac_objext" 10988 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 10989 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 10990@@ -7141,8 +7500,8 @@ _LT_EOF 10991 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 10992 pipe_works=yes 10993 fi 10994- LIBS="$lt_save_LIBS" 10995- CFLAGS="$lt_save_CFLAGS" 10996+ LIBS=$lt_globsym_save_LIBS 10997+ CFLAGS=$lt_globsym_save_CFLAGS 10998 else 10999 echo "cannot find nm_test_func in $nlist" >&5 11000 fi 11001@@ -7179,6 +7538,17 @@ else 11002 $as_echo "ok" >&6; } 11003 fi 11004 11005+# Response file support. 11006+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 11007+ nm_file_list_spec='@' 11008+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 11009+ nm_file_list_spec='@' 11010+fi 11011+ 11012+ 11013+ 11014+ 11015+ 11016 11017 11018 11019@@ -7195,6 +7565,44 @@ fi 11020 11021 11022 11023+ 11024+ 11025+ 11026+ 11027+ 11028+ 11029+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 11030+$as_echo_n "checking for sysroot... " >&6; } 11031+ 11032+# Check whether --with-libtool-sysroot was given. 11033+if test "${with_libtool_sysroot+set}" = set; then : 11034+ withval=$with_libtool_sysroot; 11035+else 11036+ with_libtool_sysroot=no 11037+fi 11038+ 11039+ 11040+lt_sysroot= 11041+case ${with_libtool_sysroot} in #( 11042+ yes) 11043+ if test "$GCC" = yes; then 11044+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 11045+ fi 11046+ ;; #( 11047+ /*) 11048+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 11049+ ;; #( 11050+ no|'') 11051+ ;; #( 11052+ *) 11053+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 11054+$as_echo "${with_libtool_sysroot}" >&6; } 11055+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 11056+ ;; 11057+esac 11058+ 11059+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 11060+$as_echo "${lt_sysroot:-no}" >&6; } 11061 11062 11063 11064@@ -7372,39 +7780,156 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ 11065 ac_compiler_gnu=$ac_cv_c_compiler_gnu 11066 11067 fi 11068-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 11069-$as_echo "$lt_cv_cc_needs_belf" >&6; } 11070- if test x"$lt_cv_cc_needs_belf" != x"yes"; then 11071- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf 11072- CFLAGS="$SAVE_CFLAGS" 11073+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 11074+$as_echo "$lt_cv_cc_needs_belf" >&6; } 11075+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then 11076+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf 11077+ CFLAGS="$SAVE_CFLAGS" 11078+ fi 11079+ ;; 11080+sparc*-*solaris*) 11081+ # Find out which ABI we are using. 11082+ echo 'int i;' > conftest.$ac_ext 11083+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 11084+ (eval $ac_compile) 2>&5 11085+ ac_status=$? 11086+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 11087+ test $ac_status = 0; }; then 11088+ case `/usr/bin/file conftest.o` in 11089+ *64-bit*) 11090+ case $lt_cv_prog_gnu_ld in 11091+ yes*) LD="${LD-ld} -m elf64_sparc" ;; 11092+ *) 11093+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then 11094+ LD="${LD-ld} -64" 11095+ fi 11096+ ;; 11097+ esac 11098+ ;; 11099+ esac 11100+ fi 11101+ rm -rf conftest* 11102+ ;; 11103+esac 11104+ 11105+need_locks="$enable_libtool_lock" 11106+ 11107+if test -n "$ac_tool_prefix"; then 11108+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 11109+set dummy ${ac_tool_prefix}mt; ac_word=$2 11110+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11111+$as_echo_n "checking for $ac_word... " >&6; } 11112+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 11113+ $as_echo_n "(cached) " >&6 11114+else 11115+ if test -n "$MANIFEST_TOOL"; then 11116+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 11117+else 11118+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 11119+for as_dir in $PATH 11120+do 11121+ IFS=$as_save_IFS 11122+ test -z "$as_dir" && as_dir=. 11123+ for ac_exec_ext in '' $ac_executable_extensions; do 11124+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 11125+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 11126+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 11127+ break 2 11128+ fi 11129+done 11130+ done 11131+IFS=$as_save_IFS 11132+ 11133+fi 11134+fi 11135+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 11136+if test -n "$MANIFEST_TOOL"; then 11137+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 11138+$as_echo "$MANIFEST_TOOL" >&6; } 11139+else 11140+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11141+$as_echo "no" >&6; } 11142+fi 11143+ 11144+ 11145+fi 11146+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 11147+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 11148+ # Extract the first word of "mt", so it can be a program name with args. 11149+set dummy mt; ac_word=$2 11150+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11151+$as_echo_n "checking for $ac_word... " >&6; } 11152+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 11153+ $as_echo_n "(cached) " >&6 11154+else 11155+ if test -n "$ac_ct_MANIFEST_TOOL"; then 11156+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 11157+else 11158+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 11159+for as_dir in $PATH 11160+do 11161+ IFS=$as_save_IFS 11162+ test -z "$as_dir" && as_dir=. 11163+ for ac_exec_ext in '' $ac_executable_extensions; do 11164+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 11165+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 11166+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 11167+ break 2 11168+ fi 11169+done 11170+ done 11171+IFS=$as_save_IFS 11172+ 11173+fi 11174+fi 11175+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 11176+if test -n "$ac_ct_MANIFEST_TOOL"; then 11177+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 11178+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 11179+else 11180+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11181+$as_echo "no" >&6; } 11182+fi 11183+ 11184+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 11185+ MANIFEST_TOOL=":" 11186+ else 11187+ case $cross_compiling:$ac_tool_warned in 11188+yes:) 11189+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 11190+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 11191+ac_tool_warned=yes ;; 11192+esac 11193+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 11194 fi 11195- ;; 11196-sparc*-*solaris*) 11197- # Find out which ABI we are using. 11198- echo 'int i;' > conftest.$ac_ext 11199- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 11200- (eval $ac_compile) 2>&5 11201- ac_status=$? 11202- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 11203- test $ac_status = 0; }; then 11204- case `/usr/bin/file conftest.o` in 11205- *64-bit*) 11206- case $lt_cv_prog_gnu_ld in 11207- yes*) LD="${LD-ld} -m elf64_sparc" ;; 11208- *) 11209- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then 11210- LD="${LD-ld} -64" 11211- fi 11212- ;; 11213- esac 11214- ;; 11215- esac 11216+else 11217+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 11218+fi 11219+ 11220+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 11221+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 11222+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 11223+if ${lt_cv_path_mainfest_tool+:} false; then : 11224+ $as_echo_n "(cached) " >&6 11225+else 11226+ lt_cv_path_mainfest_tool=no 11227+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 11228+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 11229+ cat conftest.err >&5 11230+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 11231+ lt_cv_path_mainfest_tool=yes 11232 fi 11233- rm -rf conftest* 11234- ;; 11235-esac 11236+ rm -f conftest* 11237+fi 11238+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 11239+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 11240+if test "x$lt_cv_path_mainfest_tool" != xyes; then 11241+ MANIFEST_TOOL=: 11242+fi 11243+ 11244+ 11245+ 11246 11247-need_locks="$enable_libtool_lock" 11248 11249 11250 case $host_os in 11251@@ -7969,6 +8494,8 @@ _LT_EOF 11252 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 11253 echo "$AR cru libconftest.a conftest.o" >&5 11254 $AR cru libconftest.a conftest.o 2>&5 11255+ echo "$RANLIB libconftest.a" >&5 11256+ $RANLIB libconftest.a 2>&5 11257 cat > conftest.c << _LT_EOF 11258 int main() { return 0;} 11259 _LT_EOF 11260@@ -7986,25 +8513,23 @@ _LT_EOF 11261 fi 11262 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 11263 $as_echo "$lt_cv_ld_force_load" >&6; } 11264- # Allow for Darwin 4-7 (macOS 10.0-10.3) although these are not expect to 11265- # build without first building modern cctools / linker. 11266- case $host_cpu-$host_os in 11267- *-rhapsody* | *-darwin1.[012]) 11268+ case $host_os in 11269+ rhapsody* | darwin1.[012]) 11270 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 11271- *-darwin1.*) 11272+ darwin1.*) 11273 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 11274- *-darwin*) 11275- # darwin 5.x (macOS 10.1) onwards we only need to adjust when the 11276- # deployment target is forced to an earlier version. 11277- case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in 11278- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) 11279- ;; 11280+ darwin*) # darwin 5.x on 11281+ # if running on 10.5 or later, the deployment target defaults 11282+ # to the OS version, if on x86, and 10.4, the deployment 11283+ # target defaults to 10.4. Don't you love it? 11284+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 11285+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) 11286+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 11287 10.[012][,.]*) 11288- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' 11289- ;; 11290- *) 11291- ;; 11292- esac 11293+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 11294+ 10.*) 11295+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 11296+ esac 11297 ;; 11298 esac 11299 if test "$lt_cv_apple_cc_single_mod" = "yes"; then 11300@@ -8553,8 +9078,6 @@ fi 11301 lt_prog_compiler_pic= 11302 lt_prog_compiler_static= 11303 11304-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 11305-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11306 11307 if test "$GCC" = yes; then 11308 lt_prog_compiler_wl='-Wl,' 11309@@ -8720,6 +9243,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11310 lt_prog_compiler_pic='--shared' 11311 lt_prog_compiler_static='--static' 11312 ;; 11313+ nagfor*) 11314+ # NAG Fortran compiler 11315+ lt_prog_compiler_wl='-Wl,-Wl,,' 11316+ lt_prog_compiler_pic='-PIC' 11317+ lt_prog_compiler_static='-Bstatic' 11318+ ;; 11319 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 11320 # Portland Group compilers (*not* the Pentium gcc compiler, 11321 # which looks to be a dead project) 11322@@ -8782,7 +9311,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11323 lt_prog_compiler_pic='-KPIC' 11324 lt_prog_compiler_static='-Bstatic' 11325 case $cc_basename in 11326- f77* | f90* | f95*) 11327+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 11328 lt_prog_compiler_wl='-Qoption ld ';; 11329 *) 11330 lt_prog_compiler_wl='-Wl,';; 11331@@ -8839,13 +9368,17 @@ case $host_os in 11332 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 11333 ;; 11334 esac 11335-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 11336-$as_echo "$lt_prog_compiler_pic" >&6; } 11337- 11338- 11339- 11340- 11341 11342+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 11343+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 11344+if ${lt_cv_prog_compiler_pic+:} false; then : 11345+ $as_echo_n "(cached) " >&6 11346+else 11347+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 11348+fi 11349+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 11350+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 11351+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 11352 11353 # 11354 # Check to make sure the PIC flag actually works. 11355@@ -8906,6 +9439,11 @@ fi 11356 11357 11358 11359+ 11360+ 11361+ 11362+ 11363+ 11364 # 11365 # Check to make sure the static flag actually works. 11366 # 11367@@ -9256,7 +9794,8 @@ _LT_EOF 11368 allow_undefined_flag=unsupported 11369 always_export_symbols=no 11370 enable_shared_with_static_runtimes=yes 11371- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 11372+ 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' 11373+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 11374 11375 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 11376 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 11377@@ -9294,7 +9833,7 @@ _LT_EOF 11378 archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' 11379 ;; 11380 11381- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi) 11382+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) 11383 tmp_diet=no 11384 if test "$host_os" = linux-dietlibc; then 11385 case $cc_basename in 11386@@ -9355,12 +9894,12 @@ _LT_EOF 11387 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 11388 hardcode_libdir_flag_spec= 11389 hardcode_libdir_flag_spec_ld='-rpath $libdir' 11390- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 11391+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 11392 if test "x$supports_anon_versioning" = xyes; then 11393 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 11394 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 11395 echo "local: *; };" >> $output_objdir/$libname.ver~ 11396- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 11397+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 11398 fi 11399 ;; 11400 esac 11401@@ -9374,8 +9913,8 @@ _LT_EOF 11402 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 11403 wlarc= 11404 else 11405- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11406- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11407+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11408+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11409 fi 11410 ;; 11411 11412@@ -9393,8 +9932,8 @@ _LT_EOF 11413 11414 _LT_EOF 11415 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11416- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11417- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11418+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11419+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11420 else 11421 ld_shlibs=no 11422 fi 11423@@ -9440,8 +9979,8 @@ _LT_EOF 11424 11425 *) 11426 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 11427- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11428- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11429+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 11430+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 11431 else 11432 ld_shlibs=no 11433 fi 11434@@ -9571,7 +10110,13 @@ _LT_EOF 11435 allow_undefined_flag='-berok' 11436 # Determine the default libpath from the value encoded in an 11437 # empty executable. 11438- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11439+ if test "${lt_cv_aix_libpath+set}" = set; then 11440+ aix_libpath=$lt_cv_aix_libpath 11441+else 11442+ if ${lt_cv_aix_libpath_+:} false; then : 11443+ $as_echo_n "(cached) " >&6 11444+else 11445+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11446 /* end confdefs.h. */ 11447 11448 int 11449@@ -9584,22 +10129,29 @@ main () 11450 _ACEOF 11451 if ac_fn_c_try_link "$LINENO"; then : 11452 11453-lt_aix_libpath_sed=' 11454- /Import File Strings/,/^$/ { 11455- /^0/ { 11456- s/^0 *\(.*\)$/\1/ 11457- p 11458- } 11459- }' 11460-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11461-# Check for a 64-bit object if we didn't find anything. 11462-if test -z "$aix_libpath"; then 11463- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11464-fi 11465+ lt_aix_libpath_sed=' 11466+ /Import File Strings/,/^$/ { 11467+ /^0/ { 11468+ s/^0 *\([^ ]*\) *$/\1/ 11469+ p 11470+ } 11471+ }' 11472+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11473+ # Check for a 64-bit object if we didn't find anything. 11474+ if test -z "$lt_cv_aix_libpath_"; then 11475+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11476+ fi 11477 fi 11478 rm -f core conftest.err conftest.$ac_objext \ 11479 conftest$ac_exeext conftest.$ac_ext 11480-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11481+ if test -z "$lt_cv_aix_libpath_"; then 11482+ lt_cv_aix_libpath_="/usr/lib:/lib" 11483+ fi 11484+ 11485+fi 11486+ 11487+ aix_libpath=$lt_cv_aix_libpath_ 11488+fi 11489 11490 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11491 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" 11492@@ -9611,7 +10163,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11493 else 11494 # Determine the default libpath from the value encoded in an 11495 # empty executable. 11496- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11497+ if test "${lt_cv_aix_libpath+set}" = set; then 11498+ aix_libpath=$lt_cv_aix_libpath 11499+else 11500+ if ${lt_cv_aix_libpath_+:} false; then : 11501+ $as_echo_n "(cached) " >&6 11502+else 11503+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11504 /* end confdefs.h. */ 11505 11506 int 11507@@ -9624,22 +10182,29 @@ main () 11508 _ACEOF 11509 if ac_fn_c_try_link "$LINENO"; then : 11510 11511-lt_aix_libpath_sed=' 11512- /Import File Strings/,/^$/ { 11513- /^0/ { 11514- s/^0 *\(.*\)$/\1/ 11515- p 11516- } 11517- }' 11518-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11519-# Check for a 64-bit object if we didn't find anything. 11520-if test -z "$aix_libpath"; then 11521- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11522-fi 11523+ lt_aix_libpath_sed=' 11524+ /Import File Strings/,/^$/ { 11525+ /^0/ { 11526+ s/^0 *\([^ ]*\) *$/\1/ 11527+ p 11528+ } 11529+ }' 11530+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11531+ # Check for a 64-bit object if we didn't find anything. 11532+ if test -z "$lt_cv_aix_libpath_"; then 11533+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 11534+ fi 11535 fi 11536 rm -f core conftest.err conftest.$ac_objext \ 11537 conftest$ac_exeext conftest.$ac_ext 11538-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11539+ if test -z "$lt_cv_aix_libpath_"; then 11540+ lt_cv_aix_libpath_="/usr/lib:/lib" 11541+ fi 11542+ 11543+fi 11544+ 11545+ aix_libpath=$lt_cv_aix_libpath_ 11546+fi 11547 11548 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 11549 # Warning - without using the other run time loading flags, 11550@@ -9684,20 +10249,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11551 # Microsoft Visual C++. 11552 # hardcode_libdir_flag_spec is actually meaningless, as there is 11553 # no search path for DLLs. 11554- hardcode_libdir_flag_spec=' ' 11555- allow_undefined_flag=unsupported 11556- # Tell ltmain to make .lib files, not .a files. 11557- libext=lib 11558- # Tell ltmain to make .dll files, not .so files. 11559- shrext_cmds=".dll" 11560- # FIXME: Setting linknames here is a bad hack. 11561- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 11562- # The linker will automatically build a .lib file if we build a DLL. 11563- old_archive_from_new_cmds='true' 11564- # FIXME: Should let the user specify the lib program. 11565- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 11566- fix_srcfile_path='`cygpath -w "$srcfile"`' 11567- enable_shared_with_static_runtimes=yes 11568+ case $cc_basename in 11569+ cl*) 11570+ # Native MSVC 11571+ hardcode_libdir_flag_spec=' ' 11572+ allow_undefined_flag=unsupported 11573+ always_export_symbols=yes 11574+ file_list_spec='@' 11575+ # Tell ltmain to make .lib files, not .a files. 11576+ libext=lib 11577+ # Tell ltmain to make .dll files, not .so files. 11578+ shrext_cmds=".dll" 11579+ # FIXME: Setting linknames here is a bad hack. 11580+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 11581+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 11582+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 11583+ else 11584+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 11585+ fi~ 11586+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 11587+ linknames=' 11588+ # The linker will not automatically build a static lib if we build a DLL. 11589+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 11590+ enable_shared_with_static_runtimes=yes 11591+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 11592+ # Don't use ranlib 11593+ old_postinstall_cmds='chmod 644 $oldlib' 11594+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 11595+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 11596+ case $lt_outputfile in 11597+ *.exe|*.EXE) ;; 11598+ *) 11599+ lt_outputfile="$lt_outputfile.exe" 11600+ lt_tool_outputfile="$lt_tool_outputfile.exe" 11601+ ;; 11602+ esac~ 11603+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 11604+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 11605+ $RM "$lt_outputfile.manifest"; 11606+ fi' 11607+ ;; 11608+ *) 11609+ # Assume MSVC wrapper 11610+ hardcode_libdir_flag_spec=' ' 11611+ allow_undefined_flag=unsupported 11612+ # Tell ltmain to make .lib files, not .a files. 11613+ libext=lib 11614+ # Tell ltmain to make .dll files, not .so files. 11615+ shrext_cmds=".dll" 11616+ # FIXME: Setting linknames here is a bad hack. 11617+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 11618+ # The linker will automatically build a .lib file if we build a DLL. 11619+ old_archive_from_new_cmds='true' 11620+ # FIXME: Should let the user specify the lib program. 11621+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 11622+ enable_shared_with_static_runtimes=yes 11623+ ;; 11624+ esac 11625 ;; 11626 11627 darwin* | rhapsody*) 11628@@ -9758,7 +10366,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11629 11630 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 11631 freebsd* | dragonfly*) 11632- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 11633+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 11634 hardcode_libdir_flag_spec='-R$libdir' 11635 hardcode_direct=yes 11636 hardcode_shlibpath_var=no 11637@@ -9766,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11638 11639 hpux9*) 11640 if test "$GCC" = yes; then 11641- 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' 11642+ 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' 11643 else 11644 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' 11645 fi 11646@@ -9782,7 +10390,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11647 11648 hpux10*) 11649 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 11650- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 11651+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 11652 else 11653 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 11654 fi 11655@@ -9803,19 +10411,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 11656 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 11657 case $host_cpu in 11658 hppa*64*) 11659- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 11660+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11661 ;; 11662 ia64*) 11663- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 11664+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 11665 ;; 11666 *) 11667- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 11668+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 11669 ;; 11670 esac 11671 else 11672 case $host_cpu in 11673 hppa*64*) 11674- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 11675+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11676 ;; 11677 ia64*) 11678 archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 11679@@ -9888,23 +10496,36 @@ fi 11680 11681 irix5* | irix6* | nonstopux*) 11682 if test "$GCC" = yes; then 11683- 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' 11684+ 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' 11685 # Try to use the -exported_symbol ld option, if it does not 11686 # work, assume that -exports_file does not work either and 11687 # implicitly export all symbols. 11688- save_LDFLAGS="$LDFLAGS" 11689- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 11690- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11691+ # This should be the same for all languages, so no per-tag cache variable. 11692+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 11693+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 11694+if ${lt_cv_irix_exported_symbol+:} false; then : 11695+ $as_echo_n "(cached) " >&6 11696+else 11697+ save_LDFLAGS="$LDFLAGS" 11698+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 11699+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11700 /* end confdefs.h. */ 11701-int foo(void) {} 11702+int foo (void) { return 0; } 11703 _ACEOF 11704 if ac_fn_c_try_link "$LINENO"; then : 11705- 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' 11706- 11707+ lt_cv_irix_exported_symbol=yes 11708+else 11709+ lt_cv_irix_exported_symbol=no 11710 fi 11711 rm -f core conftest.err conftest.$ac_objext \ 11712 conftest$ac_exeext conftest.$ac_ext 11713- LDFLAGS="$save_LDFLAGS" 11714+ LDFLAGS="$save_LDFLAGS" 11715+fi 11716+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 11717+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 11718+ if test "$lt_cv_irix_exported_symbol" = yes; then 11719+ 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' 11720+ fi 11721 else 11722 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' 11723 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' 11724@@ -9989,7 +10610,7 @@ rm -f core conftest.err conftest.$ac_objext \ 11725 osf4* | osf5*) # as osf3* with the addition of -msym flag 11726 if test "$GCC" = yes; then 11727 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 11728- 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' 11729+ 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' 11730 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 11731 else 11732 allow_undefined_flag=' -expect_unresolved \*' 11733@@ -10008,9 +10629,9 @@ rm -f core conftest.err conftest.$ac_objext \ 11734 no_undefined_flag=' -z defs' 11735 if test "$GCC" = yes; then 11736 wlarc='${wl}' 11737- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11738+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 11739 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 11740- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 11741+ $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' 11742 else 11743 case `$CC -V 2>&1` in 11744 *"Compilers 5.0"*) 11745@@ -10586,8 +11207,9 @@ cygwin* | mingw* | pw32* | cegcc*) 11746 need_version=no 11747 need_lib_prefix=no 11748 11749- case $GCC,$host_os in 11750- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 11751+ case $GCC,$cc_basename in 11752+ yes,*) 11753+ # gcc 11754 library_names_spec='$libname.dll.a' 11755 # DLL is installed to $(libdir)/../bin by postinstall_cmds 11756 postinstall_cmds='base_file=`basename \${file}`~ 11757@@ -10620,13 +11242,71 @@ cygwin* | mingw* | pw32* | cegcc*) 11758 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 11759 ;; 11760 esac 11761+ dynamic_linker='Win32 ld.exe' 11762+ ;; 11763+ 11764+ *,cl*) 11765+ # Native MSVC 11766+ libname_spec='$name' 11767+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 11768+ library_names_spec='${libname}.dll.lib' 11769+ 11770+ case $build_os in 11771+ mingw*) 11772+ sys_lib_search_path_spec= 11773+ lt_save_ifs=$IFS 11774+ IFS=';' 11775+ for lt_path in $LIB 11776+ do 11777+ IFS=$lt_save_ifs 11778+ # Let DOS variable expansion print the short 8.3 style file name. 11779+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 11780+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 11781+ done 11782+ IFS=$lt_save_ifs 11783+ # Convert to MSYS style. 11784+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 11785+ ;; 11786+ cygwin*) 11787+ # Convert to unix form, then to dos form, then back to unix form 11788+ # but this time dos style (no spaces!) so that the unix form looks 11789+ # like /cygdrive/c/PROGRA~1:/cygdr... 11790+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 11791+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 11792+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 11793+ ;; 11794+ *) 11795+ sys_lib_search_path_spec="$LIB" 11796+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 11797+ # It is most probably a Windows format PATH. 11798+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 11799+ else 11800+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 11801+ fi 11802+ # FIXME: find the short name or the path components, as spaces are 11803+ # common. (e.g. "Program Files" -> "PROGRA~1") 11804+ ;; 11805+ esac 11806+ 11807+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 11808+ postinstall_cmds='base_file=`basename \${file}`~ 11809+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 11810+ dldir=$destdir/`dirname \$dlpath`~ 11811+ test -d \$dldir || mkdir -p \$dldir~ 11812+ $install_prog $dir/$dlname \$dldir/$dlname' 11813+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 11814+ dlpath=$dir/\$dldll~ 11815+ $RM \$dlpath' 11816+ shlibpath_overrides_runpath=yes 11817+ dynamic_linker='Win32 link.exe' 11818 ;; 11819 11820 *) 11821+ # Assume MSVC wrapper 11822 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 11823+ dynamic_linker='Win32 ld.exe' 11824 ;; 11825 esac 11826- dynamic_linker='Win32 ld.exe' 11827 # FIXME: first we should search . and the directory the executable is in 11828 shlibpath_var=PATH 11829 ;; 11830@@ -10708,7 +11388,7 @@ haiku*) 11831 soname_spec='${libname}${release}${shared_ext}$major' 11832 shlibpath_var=LIBRARY_PATH 11833 shlibpath_overrides_runpath=yes 11834- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' 11835+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' 11836 hardcode_into_libs=yes 11837 ;; 11838 11839@@ -10815,12 +11495,7 @@ linux*oldld* | linux*aout* | linux*coff*) 11840 ;; 11841 11842 # This must be Linux ELF. 11843- 11844-# uclinux* changes (here and below) have been submitted to the libtool 11845-# project, but have not yet been accepted: they are GCC-local changes 11846-# for the time being. (See 11847-# https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html) 11848-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi) 11849+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) 11850 version_type=linux 11851 need_lib_prefix=no 11852 need_version=no 11853@@ -11509,7 +12184,7 @@ else 11854 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11855 lt_status=$lt_dlunknown 11856 cat > conftest.$ac_ext <<_LT_EOF 11857-#line 11512 "configure" 11858+#line $LINENO "configure" 11859 #include "confdefs.h" 11860 11861 #if HAVE_DLFCN_H 11862@@ -11553,10 +12228,10 @@ else 11863 /* When -fvisbility=hidden is used, assume the code has been annotated 11864 correspondingly for the symbols needed. */ 11865 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11866-void fnord () __attribute__((visibility("default"))); 11867+int fnord () __attribute__((visibility("default"))); 11868 #endif 11869 11870-void fnord () { int i=42; } 11871+int fnord () { return 42; } 11872 int main () 11873 { 11874 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11875@@ -11615,7 +12290,7 @@ else 11876 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11877 lt_status=$lt_dlunknown 11878 cat > conftest.$ac_ext <<_LT_EOF 11879-#line 11618 "configure" 11880+#line $LINENO "configure" 11881 #include "confdefs.h" 11882 11883 #if HAVE_DLFCN_H 11884@@ -11659,10 +12334,10 @@ else 11885 /* When -fvisbility=hidden is used, assume the code has been annotated 11886 correspondingly for the symbols needed. */ 11887 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 11888-void fnord () __attribute__((visibility("default"))); 11889+int fnord () __attribute__((visibility("default"))); 11890 #endif 11891 11892-void fnord () { int i=42; } 11893+int fnord () { return 42; } 11894 int main () 11895 { 11896 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 11897@@ -14948,13 +15623,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 11898 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 11899 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 11900 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 11901+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 11902+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 11903 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 11904 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 11905 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 11906 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 11907 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 11908+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 11909+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 11910+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 11911+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 11912 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 11913 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 11914+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 11915 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 11916 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 11917 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 11918@@ -14969,14 +15651,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 11919 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 11920 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 11921 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"`' 11922+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 11923+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 11924 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 11925 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 11926 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 11927-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 11928 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 11929+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 11930 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 11931 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 11932 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 11933+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 11934 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 11935 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 11936 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 11937@@ -15009,12 +15694,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 11938 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 11939 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 11940 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 11941-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 11942 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 11943 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 11944 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 11945 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 11946 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 11947+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 11948 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 11949 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 11950 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 11951@@ -15069,8 +15754,13 @@ reload_flag \ 11952 OBJDUMP \ 11953 deplibs_check_method \ 11954 file_magic_cmd \ 11955+file_magic_glob \ 11956+want_nocaseglob \ 11957+DLLTOOL \ 11958+sharedlib_from_linklib_cmd \ 11959 AR \ 11960 AR_FLAGS \ 11961+archiver_list_spec \ 11962 STRIP \ 11963 RANLIB \ 11964 CC \ 11965@@ -15080,12 +15770,14 @@ lt_cv_sys_global_symbol_pipe \ 11966 lt_cv_sys_global_symbol_to_cdecl \ 11967 lt_cv_sys_global_symbol_to_c_name_address \ 11968 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 11969+nm_file_list_spec \ 11970 lt_prog_compiler_no_builtin_flag \ 11971-lt_prog_compiler_wl \ 11972 lt_prog_compiler_pic \ 11973+lt_prog_compiler_wl \ 11974 lt_prog_compiler_static \ 11975 lt_cv_prog_compiler_c_o \ 11976 need_locks \ 11977+MANIFEST_TOOL \ 11978 DSYMUTIL \ 11979 NMEDIT \ 11980 LIPO \ 11981@@ -15101,7 +15793,6 @@ no_undefined_flag \ 11982 hardcode_libdir_flag_spec \ 11983 hardcode_libdir_flag_spec_ld \ 11984 hardcode_libdir_separator \ 11985-fix_srcfile_path \ 11986 exclude_expsyms \ 11987 include_expsyms \ 11988 file_list_spec \ 11989@@ -15137,6 +15828,7 @@ module_cmds \ 11990 module_expsym_cmds \ 11991 export_symbols_cmds \ 11992 prelink_cmds \ 11993+postlink_cmds \ 11994 postinstall_cmds \ 11995 postuninstall_cmds \ 11996 finish_cmds \ 11997@@ -15835,7 +16527,8 @@ esac ;; 11998 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 11999 # 12000 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 12001-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 12002+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 12003+# Inc. 12004 # Written by Gordon Matzigkeit, 1996 12005 # 12006 # This file is part of GNU Libtool. 12007@@ -15938,19 +16631,42 @@ SP2NL=$lt_lt_SP2NL 12008 # turn newlines into spaces. 12009 NL2SP=$lt_lt_NL2SP 12010 12011+# convert \$build file names to \$host format. 12012+to_host_file_cmd=$lt_cv_to_host_file_cmd 12013+ 12014+# convert \$build files to toolchain format. 12015+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 12016+ 12017 # An object symbol dumper. 12018 OBJDUMP=$lt_OBJDUMP 12019 12020 # Method to check whether dependent libraries are shared objects. 12021 deplibs_check_method=$lt_deplibs_check_method 12022 12023-# Command to use when deplibs_check_method == "file_magic". 12024+# Command to use when deplibs_check_method = "file_magic". 12025 file_magic_cmd=$lt_file_magic_cmd 12026 12027+# How to find potential files when deplibs_check_method = "file_magic". 12028+file_magic_glob=$lt_file_magic_glob 12029+ 12030+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 12031+want_nocaseglob=$lt_want_nocaseglob 12032+ 12033+# DLL creation program. 12034+DLLTOOL=$lt_DLLTOOL 12035+ 12036+# Command to associate shared and link libraries. 12037+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 12038+ 12039 # The archiver. 12040 AR=$lt_AR 12041+ 12042+# Flags to create an archive. 12043 AR_FLAGS=$lt_AR_FLAGS 12044 12045+# How to feed a file listing to the archiver. 12046+archiver_list_spec=$lt_archiver_list_spec 12047+ 12048 # A symbol stripping program. 12049 STRIP=$lt_STRIP 12050 12051@@ -15980,6 +16696,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 12052 # Transform the output of nm in a C name address pair when lib prefix is needed. 12053 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 12054 12055+# Specify filename containing input files for \$NM. 12056+nm_file_list_spec=$lt_nm_file_list_spec 12057+ 12058+# The root where to search for dependent libraries,and in which our libraries should be installed. 12059+lt_sysroot=$lt_sysroot 12060+ 12061 # The name of the directory that contains temporary libtool files. 12062 objdir=$objdir 12063 12064@@ -15989,6 +16711,9 @@ MAGIC_CMD=$MAGIC_CMD 12065 # Must we lock files when doing compilation? 12066 need_locks=$lt_need_locks 12067 12068+# Manifest tool. 12069+MANIFEST_TOOL=$lt_MANIFEST_TOOL 12070+ 12071 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 12072 DSYMUTIL=$lt_DSYMUTIL 12073 12074@@ -16103,12 +16828,12 @@ with_gcc=$GCC 12075 # Compiler flag to turn off builtin functions. 12076 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 12077 12078-# How to pass a linker flag through the compiler. 12079-wl=$lt_lt_prog_compiler_wl 12080- 12081 # Additional compiler flags for building library objects. 12082 pic_flag=$lt_lt_prog_compiler_pic 12083 12084+# How to pass a linker flag through the compiler. 12085+wl=$lt_lt_prog_compiler_wl 12086+ 12087 # Compiler flag to prevent dynamic linking. 12088 link_static_flag=$lt_lt_prog_compiler_static 12089 12090@@ -16195,9 +16920,6 @@ inherit_rpath=$inherit_rpath 12091 # Whether libtool must link a program against all its dependency libraries. 12092 link_all_deplibs=$link_all_deplibs 12093 12094-# Fix the shell variable \$srcfile for the compiler. 12095-fix_srcfile_path=$lt_fix_srcfile_path 12096- 12097 # Set to "yes" if exported symbols are required. 12098 always_export_symbols=$always_export_symbols 12099 12100@@ -16213,6 +16935,9 @@ include_expsyms=$lt_include_expsyms 12101 # Commands necessary for linking programs (against libraries) with templates. 12102 prelink_cmds=$lt_prelink_cmds 12103 12104+# Commands necessary for finishing linking programs. 12105+postlink_cmds=$lt_postlink_cmds 12106+ 12107 # Specify filename containing input files. 12108 file_list_spec=$lt_file_list_spec 12109 12110@@ -16245,210 +16970,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 12111 # if finds mixed CR/LF and LF-only lines. Since sed operates in 12112 # text mode, it properly converts lines to CR/LF. This bash problem 12113 # is reportedly fixed, but why not run on old versions too? 12114- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 12115- || (rm -f "$cfgfile"; exit 1) 12116- 12117- case $xsi_shell in 12118- yes) 12119- cat << \_LT_EOF >> "$cfgfile" 12120- 12121-# func_dirname file append nondir_replacement 12122-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 12123-# otherwise set result to NONDIR_REPLACEMENT. 12124-func_dirname () 12125-{ 12126- case ${1} in 12127- */*) func_dirname_result="${1%/*}${2}" ;; 12128- * ) func_dirname_result="${3}" ;; 12129- esac 12130-} 12131- 12132-# func_basename file 12133-func_basename () 12134-{ 12135- func_basename_result="${1##*/}" 12136-} 12137- 12138-# func_dirname_and_basename file append nondir_replacement 12139-# perform func_basename and func_dirname in a single function 12140-# call: 12141-# dirname: Compute the dirname of FILE. If nonempty, 12142-# add APPEND to the result, otherwise set result 12143-# to NONDIR_REPLACEMENT. 12144-# value returned in "$func_dirname_result" 12145-# basename: Compute filename of FILE. 12146-# value retuned in "$func_basename_result" 12147-# Implementation must be kept synchronized with func_dirname 12148-# and func_basename. For efficiency, we do not delegate to 12149-# those functions but instead duplicate the functionality here. 12150-func_dirname_and_basename () 12151-{ 12152- case ${1} in 12153- */*) func_dirname_result="${1%/*}${2}" ;; 12154- * ) func_dirname_result="${3}" ;; 12155- esac 12156- func_basename_result="${1##*/}" 12157-} 12158- 12159-# func_stripname prefix suffix name 12160-# strip PREFIX and SUFFIX off of NAME. 12161-# PREFIX and SUFFIX must not contain globbing or regex special 12162-# characters, hashes, percent signs, but SUFFIX may contain a leading 12163-# dot (in which case that matches only a dot). 12164-func_stripname () 12165-{ 12166- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 12167- # positional parameters, so assign one to ordinary parameter first. 12168- func_stripname_result=${3} 12169- func_stripname_result=${func_stripname_result#"${1}"} 12170- func_stripname_result=${func_stripname_result%"${2}"} 12171-} 12172- 12173-# func_opt_split 12174-func_opt_split () 12175-{ 12176- func_opt_split_opt=${1%%=*} 12177- func_opt_split_arg=${1#*=} 12178-} 12179- 12180-# func_lo2o object 12181-func_lo2o () 12182-{ 12183- case ${1} in 12184- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 12185- *) func_lo2o_result=${1} ;; 12186- esac 12187-} 12188- 12189-# func_xform libobj-or-source 12190-func_xform () 12191-{ 12192- func_xform_result=${1%.*}.lo 12193-} 12194- 12195-# func_arith arithmetic-term... 12196-func_arith () 12197-{ 12198- func_arith_result=$(( $* )) 12199-} 12200- 12201-# func_len string 12202-# STRING may not start with a hyphen. 12203-func_len () 12204-{ 12205- func_len_result=${#1} 12206-} 12207- 12208-_LT_EOF 12209- ;; 12210- *) # Bourne compatible functions. 12211- cat << \_LT_EOF >> "$cfgfile" 12212- 12213-# func_dirname file append nondir_replacement 12214-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 12215-# otherwise set result to NONDIR_REPLACEMENT. 12216-func_dirname () 12217-{ 12218- # Extract subdirectory from the argument. 12219- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 12220- if test "X$func_dirname_result" = "X${1}"; then 12221- func_dirname_result="${3}" 12222- else 12223- func_dirname_result="$func_dirname_result${2}" 12224- fi 12225-} 12226- 12227-# func_basename file 12228-func_basename () 12229-{ 12230- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 12231-} 12232- 12233- 12234-# func_stripname prefix suffix name 12235-# strip PREFIX and SUFFIX off of NAME. 12236-# PREFIX and SUFFIX must not contain globbing or regex special 12237-# characters, hashes, percent signs, but SUFFIX may contain a leading 12238-# dot (in which case that matches only a dot). 12239-# func_strip_suffix prefix name 12240-func_stripname () 12241-{ 12242- case ${2} in 12243- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 12244- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 12245- esac 12246-} 12247- 12248-# sed scripts: 12249-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 12250-my_sed_long_arg='1s/^-[^=]*=//' 12251- 12252-# func_opt_split 12253-func_opt_split () 12254-{ 12255- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 12256- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 12257-} 12258- 12259-# func_lo2o object 12260-func_lo2o () 12261-{ 12262- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 12263-} 12264- 12265-# func_xform libobj-or-source 12266-func_xform () 12267-{ 12268- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 12269-} 12270- 12271-# func_arith arithmetic-term... 12272-func_arith () 12273-{ 12274- func_arith_result=`expr "$@"` 12275-} 12276- 12277-# func_len string 12278-# STRING may not start with a hyphen. 12279-func_len () 12280-{ 12281- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 12282-} 12283- 12284-_LT_EOF 12285-esac 12286- 12287-case $lt_shell_append in 12288- yes) 12289- cat << \_LT_EOF >> "$cfgfile" 12290- 12291-# func_append var value 12292-# Append VALUE to the end of shell variable VAR. 12293-func_append () 12294-{ 12295- eval "$1+=\$2" 12296-} 12297-_LT_EOF 12298- ;; 12299- *) 12300- cat << \_LT_EOF >> "$cfgfile" 12301- 12302-# func_append var value 12303-# Append VALUE to the end of shell variable VAR. 12304-func_append () 12305-{ 12306- eval "$1=\$$1\$2" 12307-} 12308- 12309-_LT_EOF 12310- ;; 12311- esac 12312- 12313- 12314- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 12315- || (rm -f "$cfgfile"; exit 1) 12316- 12317- mv -f "$cfgfile" "$ofile" || 12318+ sed '$q' "$ltmain" >> "$cfgfile" \ 12319+ || (rm -f "$cfgfile"; exit 1) 12320+ 12321+ if test x"$xsi_shell" = xyes; then 12322+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 12323+func_dirname ()\ 12324+{\ 12325+\ case ${1} in\ 12326+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 12327+\ * ) func_dirname_result="${3}" ;;\ 12328+\ esac\ 12329+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 12330+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12331+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12332+test 0 -eq $? || _lt_function_replace_fail=: 12333+ 12334+ 12335+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 12336+func_basename ()\ 12337+{\ 12338+\ func_basename_result="${1##*/}"\ 12339+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 12340+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12341+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12342+test 0 -eq $? || _lt_function_replace_fail=: 12343+ 12344+ 12345+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 12346+func_dirname_and_basename ()\ 12347+{\ 12348+\ case ${1} in\ 12349+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 12350+\ * ) func_dirname_result="${3}" ;;\ 12351+\ esac\ 12352+\ func_basename_result="${1##*/}"\ 12353+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 12354+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12355+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12356+test 0 -eq $? || _lt_function_replace_fail=: 12357+ 12358+ 12359+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 12360+func_stripname ()\ 12361+{\ 12362+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 12363+\ # positional parameters, so assign one to ordinary parameter first.\ 12364+\ func_stripname_result=${3}\ 12365+\ func_stripname_result=${func_stripname_result#"${1}"}\ 12366+\ func_stripname_result=${func_stripname_result%"${2}"}\ 12367+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 12368+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12369+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12370+test 0 -eq $? || _lt_function_replace_fail=: 12371+ 12372+ 12373+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 12374+func_split_long_opt ()\ 12375+{\ 12376+\ func_split_long_opt_name=${1%%=*}\ 12377+\ func_split_long_opt_arg=${1#*=}\ 12378+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 12379+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12380+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12381+test 0 -eq $? || _lt_function_replace_fail=: 12382+ 12383+ 12384+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 12385+func_split_short_opt ()\ 12386+{\ 12387+\ func_split_short_opt_arg=${1#??}\ 12388+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 12389+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 12390+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12391+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12392+test 0 -eq $? || _lt_function_replace_fail=: 12393+ 12394+ 12395+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 12396+func_lo2o ()\ 12397+{\ 12398+\ case ${1} in\ 12399+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 12400+\ *) func_lo2o_result=${1} ;;\ 12401+\ esac\ 12402+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 12403+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12404+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12405+test 0 -eq $? || _lt_function_replace_fail=: 12406+ 12407+ 12408+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 12409+func_xform ()\ 12410+{\ 12411+ func_xform_result=${1%.*}.lo\ 12412+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 12413+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12414+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12415+test 0 -eq $? || _lt_function_replace_fail=: 12416+ 12417+ 12418+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 12419+func_arith ()\ 12420+{\ 12421+ func_arith_result=$(( $* ))\ 12422+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 12423+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12424+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12425+test 0 -eq $? || _lt_function_replace_fail=: 12426+ 12427+ 12428+ sed -e '/^func_len ()$/,/^} # func_len /c\ 12429+func_len ()\ 12430+{\ 12431+ func_len_result=${#1}\ 12432+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 12433+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12434+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12435+test 0 -eq $? || _lt_function_replace_fail=: 12436+ 12437+fi 12438+ 12439+if test x"$lt_shell_append" = xyes; then 12440+ sed -e '/^func_append ()$/,/^} # func_append /c\ 12441+func_append ()\ 12442+{\ 12443+ eval "${1}+=\\${2}"\ 12444+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 12445+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12446+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12447+test 0 -eq $? || _lt_function_replace_fail=: 12448+ 12449+ 12450+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 12451+func_append_quoted ()\ 12452+{\ 12453+\ func_quote_for_eval "${2}"\ 12454+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 12455+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 12456+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12457+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12458+test 0 -eq $? || _lt_function_replace_fail=: 12459+ 12460+ 12461+ # Save a `func_append' function call where possible by direct use of '+=' 12462+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 12463+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12464+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12465+ test 0 -eq $? || _lt_function_replace_fail=: 12466+else 12467+ # Save a `func_append' function call even when '+=' is not available 12468+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 12469+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 12470+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 12471+ test 0 -eq $? || _lt_function_replace_fail=: 12472+fi 12473+ 12474+if test x"$_lt_function_replace_fail" = x":"; then 12475+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 12476+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 12477+fi 12478+ 12479+ 12480+ mv -f "$cfgfile" "$ofile" || 12481 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 12482 chmod +x "$ofile" 12483 12484diff --git a/libctf/configure b/libctf/configure 12485index de10fef84a1..1b0ee0d32c6 100755 12486--- a/libctf/configure 12487+++ b/libctf/configure 12488@@ -669,6 +669,8 @@ OTOOL 12489 LIPO 12490 NMEDIT 12491 DSYMUTIL 12492+MANIFEST_TOOL 12493+DLLTOOL 12494 OBJDUMP 12495 LN_S 12496 NM 12497@@ -801,6 +803,7 @@ enable_static 12498 with_pic 12499 enable_fast_install 12500 with_gnu_ld 12501+with_libtool_sysroot 12502 enable_libtool_lock 12503 enable_largefile 12504 enable_werror_always 12505@@ -1475,6 +1478,8 @@ Optional Packages: 12506 --with-pic try to use only PIC/non-PIC objects [default=use 12507 both] 12508 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 12509+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 12510+ (or the compiler's sysroot if not specified). 12511 --with-system-zlib use installed libz 12512 12513 Some influential environment variables: 12514@@ -5583,8 +5588,8 @@ esac 12515 12516 12517 12518-macro_version='2.2.7a' 12519-macro_revision='1.3134' 12520+macro_version='2.4' 12521+macro_revision='1.3293' 12522 12523 12524 12525@@ -5624,7 +5629,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 12526 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 12527 $as_echo_n "checking how to print strings... " >&6; } 12528 # Test print first, because it will be a builtin if present. 12529-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 12530+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 12531 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 12532 ECHO='print -r --' 12533 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 12534@@ -6311,8 +6316,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 12535 # Try some XSI features 12536 xsi_shell=no 12537 ( _lt_dummy="a/b/c" 12538- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 12539- = c,a/b,, \ 12540+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 12541+ = c,a/b,b/c, \ 12542 && eval 'test $(( 1 + 1 )) -eq 2 \ 12543 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 12544 && xsi_shell=yes 12545@@ -6361,6 +6366,80 @@ esac 12546 12547 12548 12549+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 12550+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 12551+if ${lt_cv_to_host_file_cmd+:} false; then : 12552+ $as_echo_n "(cached) " >&6 12553+else 12554+ case $host in 12555+ *-*-mingw* ) 12556+ case $build in 12557+ *-*-mingw* ) # actually msys 12558+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 12559+ ;; 12560+ *-*-cygwin* ) 12561+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 12562+ ;; 12563+ * ) # otherwise, assume *nix 12564+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 12565+ ;; 12566+ esac 12567+ ;; 12568+ *-*-cygwin* ) 12569+ case $build in 12570+ *-*-mingw* ) # actually msys 12571+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 12572+ ;; 12573+ *-*-cygwin* ) 12574+ lt_cv_to_host_file_cmd=func_convert_file_noop 12575+ ;; 12576+ * ) # otherwise, assume *nix 12577+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 12578+ ;; 12579+ esac 12580+ ;; 12581+ * ) # unhandled hosts (and "normal" native builds) 12582+ lt_cv_to_host_file_cmd=func_convert_file_noop 12583+ ;; 12584+esac 12585+ 12586+fi 12587+ 12588+to_host_file_cmd=$lt_cv_to_host_file_cmd 12589+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 12590+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 12591+ 12592+ 12593+ 12594+ 12595+ 12596+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 12597+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 12598+if ${lt_cv_to_tool_file_cmd+:} false; then : 12599+ $as_echo_n "(cached) " >&6 12600+else 12601+ #assume ordinary cross tools, or native build. 12602+lt_cv_to_tool_file_cmd=func_convert_file_noop 12603+case $host in 12604+ *-*-mingw* ) 12605+ case $build in 12606+ *-*-mingw* ) # actually msys 12607+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 12608+ ;; 12609+ esac 12610+ ;; 12611+esac 12612+ 12613+fi 12614+ 12615+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 12616+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 12617+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 12618+ 12619+ 12620+ 12621+ 12622+ 12623 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 12624 $as_echo_n "checking for $LD option to reload object files... " >&6; } 12625 if ${lt_cv_ld_reload_flag+:} false; then : 12626@@ -6377,6 +6456,11 @@ case $reload_flag in 12627 esac 12628 reload_cmds='$LD$reload_flag -o $output$reload_objs' 12629 case $host_os in 12630+ cygwin* | mingw* | pw32* | cegcc*) 12631+ if test "$GCC" != yes; then 12632+ reload_cmds=false 12633+ fi 12634+ ;; 12635 darwin*) 12636 if test "$GCC" = yes; then 12637 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 12638@@ -6545,7 +6629,8 @@ mingw* | pw32*) 12639 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 12640 lt_cv_file_magic_cmd='func_win32_libid' 12641 else 12642- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 12643+ # Keep this pattern in sync with the one in func_win32_libid. 12644+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 12645 lt_cv_file_magic_cmd='$OBJDUMP -f' 12646 fi 12647 ;; 12648@@ -6699,6 +6784,21 @@ esac 12649 fi 12650 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 12651 $as_echo "$lt_cv_deplibs_check_method" >&6; } 12652+ 12653+file_magic_glob= 12654+want_nocaseglob=no 12655+if test "$build" = "$host"; then 12656+ case $host_os in 12657+ mingw* | pw32*) 12658+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 12659+ want_nocaseglob=yes 12660+ else 12661+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 12662+ fi 12663+ ;; 12664+ esac 12665+fi 12666+ 12667 file_magic_cmd=$lt_cv_file_magic_cmd 12668 deplibs_check_method=$lt_cv_deplibs_check_method 12669 test -z "$deplibs_check_method" && deplibs_check_method=unknown 12670@@ -6714,6 +6814,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 12671 12672 12673 12674+ 12675+ 12676+ 12677+ 12678+ 12679+ 12680+ 12681+ 12682+ 12683+ 12684+if test -n "$ac_tool_prefix"; then 12685+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 12686+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 12687+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 12688+$as_echo_n "checking for $ac_word... " >&6; } 12689+if ${ac_cv_prog_DLLTOOL+:} false; then : 12690+ $as_echo_n "(cached) " >&6 12691+else 12692+ if test -n "$DLLTOOL"; then 12693+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 12694+else 12695+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 12696+for as_dir in $PATH 12697+do 12698+ IFS=$as_save_IFS 12699+ test -z "$as_dir" && as_dir=. 12700+ for ac_exec_ext in '' $ac_executable_extensions; do 12701+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 12702+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 12703+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 12704+ break 2 12705+ fi 12706+done 12707+ done 12708+IFS=$as_save_IFS 12709+ 12710+fi 12711+fi 12712+DLLTOOL=$ac_cv_prog_DLLTOOL 12713+if test -n "$DLLTOOL"; then 12714+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 12715+$as_echo "$DLLTOOL" >&6; } 12716+else 12717+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 12718+$as_echo "no" >&6; } 12719+fi 12720+ 12721+ 12722+fi 12723+if test -z "$ac_cv_prog_DLLTOOL"; then 12724+ ac_ct_DLLTOOL=$DLLTOOL 12725+ # Extract the first word of "dlltool", so it can be a program name with args. 12726+set dummy dlltool; ac_word=$2 12727+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 12728+$as_echo_n "checking for $ac_word... " >&6; } 12729+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 12730+ $as_echo_n "(cached) " >&6 12731+else 12732+ if test -n "$ac_ct_DLLTOOL"; then 12733+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 12734+else 12735+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 12736+for as_dir in $PATH 12737+do 12738+ IFS=$as_save_IFS 12739+ test -z "$as_dir" && as_dir=. 12740+ for ac_exec_ext in '' $ac_executable_extensions; do 12741+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 12742+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 12743+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 12744+ break 2 12745+ fi 12746+done 12747+ done 12748+IFS=$as_save_IFS 12749+ 12750+fi 12751+fi 12752+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 12753+if test -n "$ac_ct_DLLTOOL"; then 12754+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 12755+$as_echo "$ac_ct_DLLTOOL" >&6; } 12756+else 12757+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 12758+$as_echo "no" >&6; } 12759+fi 12760+ 12761+ if test "x$ac_ct_DLLTOOL" = x; then 12762+ DLLTOOL="false" 12763+ else 12764+ case $cross_compiling:$ac_tool_warned in 12765+yes:) 12766+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 12767+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 12768+ac_tool_warned=yes ;; 12769+esac 12770+ DLLTOOL=$ac_ct_DLLTOOL 12771+ fi 12772+else 12773+ DLLTOOL="$ac_cv_prog_DLLTOOL" 12774+fi 12775+ 12776+test -z "$DLLTOOL" && DLLTOOL=dlltool 12777+ 12778+ 12779+ 12780+ 12781+ 12782+ 12783+ 12784+ 12785+ 12786+ 12787+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 12788+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 12789+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 12790+ $as_echo_n "(cached) " >&6 12791+else 12792+ lt_cv_sharedlib_from_linklib_cmd='unknown' 12793+ 12794+case $host_os in 12795+cygwin* | mingw* | pw32* | cegcc*) 12796+ # two different shell functions defined in ltmain.sh 12797+ # decide which to use based on capabilities of $DLLTOOL 12798+ case `$DLLTOOL --help 2>&1` in 12799+ *--identify-strict*) 12800+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 12801+ ;; 12802+ *) 12803+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 12804+ ;; 12805+ esac 12806+ ;; 12807+*) 12808+ # fallback: assume linklib IS sharedlib 12809+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 12810+ ;; 12811+esac 12812+ 12813+fi 12814+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 12815+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 12816+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 12817+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 12818+ 12819+ 12820+ 12821+ 12822+ 12823+ 12824+ 12825 plugin_option= 12826 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 12827 for plugin in $plugin_names; do 12828@@ -6728,8 +6979,10 @@ for plugin in $plugin_names; do 12829 done 12830 12831 if test -n "$ac_tool_prefix"; then 12832- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 12833-set dummy ${ac_tool_prefix}ar; ac_word=$2 12834+ for ac_prog in ar 12835+ do 12836+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 12837+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 12838 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 12839 $as_echo_n "checking for $ac_word... " >&6; } 12840 if ${ac_cv_prog_AR+:} false; then : 12841@@ -6745,7 +6998,7 @@ do 12842 test -z "$as_dir" && as_dir=. 12843 for ac_exec_ext in '' $ac_executable_extensions; do 12844 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 12845- ac_cv_prog_AR="${ac_tool_prefix}ar" 12846+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 12847 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 12848 break 2 12849 fi 12850@@ -6765,11 +7018,15 @@ $as_echo "no" >&6; } 12851 fi 12852 12853 12854+ test -n "$AR" && break 12855+ done 12856 fi 12857-if test -z "$ac_cv_prog_AR"; then 12858+if test -z "$AR"; then 12859 ac_ct_AR=$AR 12860- # Extract the first word of "ar", so it can be a program name with args. 12861-set dummy ar; ac_word=$2 12862+ for ac_prog in ar 12863+do 12864+ # Extract the first word of "$ac_prog", so it can be a program name with args. 12865+set dummy $ac_prog; ac_word=$2 12866 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 12867 $as_echo_n "checking for $ac_word... " >&6; } 12868 if ${ac_cv_prog_ac_ct_AR+:} false; then : 12869@@ -6785,7 +7042,7 @@ do 12870 test -z "$as_dir" && as_dir=. 12871 for ac_exec_ext in '' $ac_executable_extensions; do 12872 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 12873- ac_cv_prog_ac_ct_AR="ar" 12874+ ac_cv_prog_ac_ct_AR="$ac_prog" 12875 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 12876 break 2 12877 fi 12878@@ -6804,6 +7061,10 @@ else 12879 $as_echo "no" >&6; } 12880 fi 12881 12882+ 12883+ test -n "$ac_ct_AR" && break 12884+done 12885+ 12886 if test "x$ac_ct_AR" = x; then 12887 AR="false" 12888 else 12889@@ -6815,25 +7076,19 @@ ac_tool_warned=yes ;; 12890 esac 12891 AR=$ac_ct_AR 12892 fi 12893-else 12894- AR="$ac_cv_prog_AR" 12895 fi 12896 12897-test -z "$AR" && AR=ar 12898-if test -n "$plugin_option"; then 12899- if $AR --help 2>&1 | grep -q "\--plugin"; then 12900- touch conftest.c 12901- $AR $plugin_option rc conftest.a conftest.c 12902- if test "$?" != 0; then 12903- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 12904+ touch conftest.c 12905+ $AR $plugin_option rc conftest.a conftest.c 12906+ if test "$?" != 0; then 12907+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 12908 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 12909- else 12910- AR="$AR $plugin_option" 12911- fi 12912- rm -f conftest.* 12913+ else 12914+ AR="$AR $plugin_option" 12915 fi 12916-fi 12917-test -z "$AR_FLAGS" && AR_FLAGS=cru 12918+ rm -f conftest.* 12919+: ${AR=ar} 12920+: ${AR_FLAGS=cru} 12921 12922 12923 12924@@ -6845,6 +7100,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 12925 12926 12927 12928+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 12929+$as_echo_n "checking for archiver @FILE support... " >&6; } 12930+if ${lt_cv_ar_at_file+:} false; then : 12931+ $as_echo_n "(cached) " >&6 12932+else 12933+ lt_cv_ar_at_file=no 12934+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 12935+/* end confdefs.h. */ 12936+ 12937+int 12938+main () 12939+{ 12940+ 12941+ ; 12942+ return 0; 12943+} 12944+_ACEOF 12945+if ac_fn_c_try_compile "$LINENO"; then : 12946+ echo conftest.$ac_objext > conftest.lst 12947+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 12948+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 12949+ (eval $lt_ar_try) 2>&5 12950+ ac_status=$? 12951+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 12952+ test $ac_status = 0; } 12953+ if test "$ac_status" -eq 0; then 12954+ # Ensure the archiver fails upon bogus file names. 12955+ rm -f conftest.$ac_objext libconftest.a 12956+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 12957+ (eval $lt_ar_try) 2>&5 12958+ ac_status=$? 12959+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 12960+ test $ac_status = 0; } 12961+ if test "$ac_status" -ne 0; then 12962+ lt_cv_ar_at_file=@ 12963+ fi 12964+ fi 12965+ rm -f conftest.* libconftest.a 12966+ 12967+fi 12968+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 12969+ 12970+fi 12971+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 12972+$as_echo "$lt_cv_ar_at_file" >&6; } 12973+ 12974+if test "x$lt_cv_ar_at_file" = xno; then 12975+ archiver_list_spec= 12976+else 12977+ archiver_list_spec=$lt_cv_ar_at_file 12978+fi 12979+ 12980+ 12981+ 12982+ 12983+ 12984+ 12985+ 12986 if test -n "$ac_tool_prefix"; then 12987 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 12988 set dummy ${ac_tool_prefix}strip; ac_word=$2 12989@@ -7184,8 +7497,8 @@ esac 12990 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 12991 12992 # Transform an extracted symbol line into symbol name and symbol address 12993-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 12994-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'" 12995+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 12996+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'" 12997 12998 # Handle CRLF in mingw tool chain 12999 opt_cr= 13000@@ -7221,6 +7534,7 @@ for ac_symprfx in "" "_"; do 13001 else 13002 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 13003 fi 13004+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 13005 13006 # Check to see that the pipe works correctly. 13007 pipe_works=no 13008@@ -7262,6 +7576,18 @@ _LT_EOF 13009 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 13010 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 13011 cat <<_LT_EOF > conftest.$ac_ext 13012+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 13013+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 13014+/* DATA imports from DLLs on WIN32 con't be const, because runtime 13015+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 13016+# define LT_DLSYM_CONST 13017+#elif defined(__osf__) 13018+/* This system does not cope well with relocations in const data. */ 13019+# define LT_DLSYM_CONST 13020+#else 13021+# define LT_DLSYM_CONST const 13022+#endif 13023+ 13024 #ifdef __cplusplus 13025 extern "C" { 13026 #endif 13027@@ -7273,7 +7599,7 @@ _LT_EOF 13028 cat <<_LT_EOF >> conftest.$ac_ext 13029 13030 /* The mapping between symbol names and symbols. */ 13031-const struct { 13032+LT_DLSYM_CONST struct { 13033 const char *name; 13034 void *address; 13035 } 13036@@ -7299,8 +7625,8 @@ static const void *lt_preloaded_setup() { 13037 _LT_EOF 13038 # Now try linking the two files. 13039 mv conftest.$ac_objext conftstm.$ac_objext 13040- lt_save_LIBS="$LIBS" 13041- lt_save_CFLAGS="$CFLAGS" 13042+ lt_globsym_save_LIBS=$LIBS 13043+ lt_globsym_save_CFLAGS=$CFLAGS 13044 LIBS="conftstm.$ac_objext" 13045 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 13046 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 13047@@ -7310,8 +7636,8 @@ _LT_EOF 13048 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 13049 pipe_works=yes 13050 fi 13051- LIBS="$lt_save_LIBS" 13052- CFLAGS="$lt_save_CFLAGS" 13053+ LIBS=$lt_globsym_save_LIBS 13054+ CFLAGS=$lt_globsym_save_CFLAGS 13055 else 13056 echo "cannot find nm_test_func in $nlist" >&5 13057 fi 13058@@ -7348,6 +7674,14 @@ else 13059 $as_echo "ok" >&6; } 13060 fi 13061 13062+# Response file support. 13063+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 13064+ nm_file_list_spec='@' 13065+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 13066+ nm_file_list_spec='@' 13067+fi 13068+ 13069+ 13070 13071 13072 13073@@ -7366,6 +7700,47 @@ fi 13074 13075 13076 13077+ 13078+ 13079+ 13080+ 13081+ 13082+ 13083+ 13084+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 13085+$as_echo_n "checking for sysroot... " >&6; } 13086+ 13087+# Check whether --with-libtool-sysroot was given. 13088+if test "${with_libtool_sysroot+set}" = set; then : 13089+ withval=$with_libtool_sysroot; 13090+else 13091+ with_libtool_sysroot=no 13092+fi 13093+ 13094+ 13095+lt_sysroot= 13096+case ${with_libtool_sysroot} in #( 13097+ yes) 13098+ if test "$GCC" = yes; then 13099+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 13100+ fi 13101+ ;; #( 13102+ /*) 13103+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 13104+ ;; #( 13105+ no|'') 13106+ ;; #( 13107+ *) 13108+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 13109+$as_echo "${with_libtool_sysroot}" >&6; } 13110+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 13111+ ;; 13112+esac 13113+ 13114+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 13115+$as_echo "${lt_sysroot:-no}" >&6; } 13116+ 13117+ 13118 13119 13120 13121@@ -7575,6 +7950,123 @@ esac 13122 13123 need_locks="$enable_libtool_lock" 13124 13125+if test -n "$ac_tool_prefix"; then 13126+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 13127+set dummy ${ac_tool_prefix}mt; ac_word=$2 13128+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13129+$as_echo_n "checking for $ac_word... " >&6; } 13130+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 13131+ $as_echo_n "(cached) " >&6 13132+else 13133+ if test -n "$MANIFEST_TOOL"; then 13134+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 13135+else 13136+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13137+for as_dir in $PATH 13138+do 13139+ IFS=$as_save_IFS 13140+ test -z "$as_dir" && as_dir=. 13141+ for ac_exec_ext in '' $ac_executable_extensions; do 13142+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13143+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 13144+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13145+ break 2 13146+ fi 13147+done 13148+ done 13149+IFS=$as_save_IFS 13150+ 13151+fi 13152+fi 13153+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 13154+if test -n "$MANIFEST_TOOL"; then 13155+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 13156+$as_echo "$MANIFEST_TOOL" >&6; } 13157+else 13158+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13159+$as_echo "no" >&6; } 13160+fi 13161+ 13162+ 13163+fi 13164+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 13165+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 13166+ # Extract the first word of "mt", so it can be a program name with args. 13167+set dummy mt; ac_word=$2 13168+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13169+$as_echo_n "checking for $ac_word... " >&6; } 13170+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 13171+ $as_echo_n "(cached) " >&6 13172+else 13173+ if test -n "$ac_ct_MANIFEST_TOOL"; then 13174+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 13175+else 13176+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13177+for as_dir in $PATH 13178+do 13179+ IFS=$as_save_IFS 13180+ test -z "$as_dir" && as_dir=. 13181+ for ac_exec_ext in '' $ac_executable_extensions; do 13182+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13183+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 13184+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13185+ break 2 13186+ fi 13187+done 13188+ done 13189+IFS=$as_save_IFS 13190+ 13191+fi 13192+fi 13193+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 13194+if test -n "$ac_ct_MANIFEST_TOOL"; then 13195+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 13196+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 13197+else 13198+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13199+$as_echo "no" >&6; } 13200+fi 13201+ 13202+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 13203+ MANIFEST_TOOL=":" 13204+ else 13205+ case $cross_compiling:$ac_tool_warned in 13206+yes:) 13207+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 13208+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 13209+ac_tool_warned=yes ;; 13210+esac 13211+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 13212+ fi 13213+else 13214+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 13215+fi 13216+ 13217+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 13218+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 13219+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 13220+if ${lt_cv_path_mainfest_tool+:} false; then : 13221+ $as_echo_n "(cached) " >&6 13222+else 13223+ lt_cv_path_mainfest_tool=no 13224+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 13225+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 13226+ cat conftest.err >&5 13227+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 13228+ lt_cv_path_mainfest_tool=yes 13229+ fi 13230+ rm -f conftest* 13231+fi 13232+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 13233+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 13234+if test "x$lt_cv_path_mainfest_tool" != xyes; then 13235+ MANIFEST_TOOL=: 13236+fi 13237+ 13238+ 13239+ 13240+ 13241+ 13242 13243 case $host_os in 13244 rhapsody* | darwin*) 13245@@ -8138,6 +8630,8 @@ _LT_EOF 13246 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 13247 echo "$AR cru libconftest.a conftest.o" >&5 13248 $AR cru libconftest.a conftest.o 2>&5 13249+ echo "$RANLIB libconftest.a" >&5 13250+ $RANLIB libconftest.a 2>&5 13251 cat > conftest.c << _LT_EOF 13252 int main() { return 0;} 13253 _LT_EOF 13254@@ -8690,8 +9184,6 @@ fi 13255 lt_prog_compiler_pic= 13256 lt_prog_compiler_static= 13257 13258-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 13259-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13260 13261 if test "$GCC" = yes; then 13262 lt_prog_compiler_wl='-Wl,' 13263@@ -8857,6 +9349,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13264 lt_prog_compiler_pic='--shared' 13265 lt_prog_compiler_static='--static' 13266 ;; 13267+ nagfor*) 13268+ # NAG Fortran compiler 13269+ lt_prog_compiler_wl='-Wl,-Wl,,' 13270+ lt_prog_compiler_pic='-PIC' 13271+ lt_prog_compiler_static='-Bstatic' 13272+ ;; 13273 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 13274 # Portland Group compilers (*not* the Pentium gcc compiler, 13275 # which looks to be a dead project) 13276@@ -8919,7 +9417,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13277 lt_prog_compiler_pic='-KPIC' 13278 lt_prog_compiler_static='-Bstatic' 13279 case $cc_basename in 13280- f77* | f90* | f95*) 13281+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 13282 lt_prog_compiler_wl='-Qoption ld ';; 13283 *) 13284 lt_prog_compiler_wl='-Wl,';; 13285@@ -8976,13 +9474,17 @@ case $host_os in 13286 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 13287 ;; 13288 esac 13289-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 13290-$as_echo "$lt_prog_compiler_pic" >&6; } 13291- 13292- 13293- 13294- 13295 13296+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 13297+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 13298+if ${lt_cv_prog_compiler_pic+:} false; then : 13299+ $as_echo_n "(cached) " >&6 13300+else 13301+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 13302+fi 13303+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 13304+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 13305+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 13306 13307 # 13308 # Check to make sure the PIC flag actually works. 13309@@ -9043,6 +9545,11 @@ fi 13310 13311 13312 13313+ 13314+ 13315+ 13316+ 13317+ 13318 # 13319 # Check to make sure the static flag actually works. 13320 # 13321@@ -9393,7 +9900,8 @@ _LT_EOF 13322 allow_undefined_flag=unsupported 13323 always_export_symbols=no 13324 enable_shared_with_static_runtimes=yes 13325- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 13326+ 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' 13327+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 13328 13329 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 13330 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 13331@@ -9492,12 +10000,12 @@ _LT_EOF 13332 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 13333 hardcode_libdir_flag_spec= 13334 hardcode_libdir_flag_spec_ld='-rpath $libdir' 13335- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 13336+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 13337 if test "x$supports_anon_versioning" = xyes; then 13338 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 13339 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 13340 echo "local: *; };" >> $output_objdir/$libname.ver~ 13341- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 13342+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 13343 fi 13344 ;; 13345 esac 13346@@ -9511,8 +10019,8 @@ _LT_EOF 13347 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 13348 wlarc= 13349 else 13350- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 13351- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 13352+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 13353+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 13354 fi 13355 ;; 13356 13357@@ -9530,8 +10038,8 @@ _LT_EOF 13358 13359 _LT_EOF 13360 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 13361- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 13362- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 13363+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 13364+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 13365 else 13366 ld_shlibs=no 13367 fi 13368@@ -9577,8 +10085,8 @@ _LT_EOF 13369 13370 *) 13371 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 13372- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 13373- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 13374+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 13375+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 13376 else 13377 ld_shlibs=no 13378 fi 13379@@ -9708,7 +10216,13 @@ _LT_EOF 13380 allow_undefined_flag='-berok' 13381 # Determine the default libpath from the value encoded in an 13382 # empty executable. 13383- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13384+ if test "${lt_cv_aix_libpath+set}" = set; then 13385+ aix_libpath=$lt_cv_aix_libpath 13386+else 13387+ if ${lt_cv_aix_libpath_+:} false; then : 13388+ $as_echo_n "(cached) " >&6 13389+else 13390+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13391 /* end confdefs.h. */ 13392 13393 int 13394@@ -9721,22 +10235,29 @@ main () 13395 _ACEOF 13396 if ac_fn_c_try_link "$LINENO"; then : 13397 13398-lt_aix_libpath_sed=' 13399- /Import File Strings/,/^$/ { 13400- /^0/ { 13401- s/^0 *\(.*\)$/\1/ 13402- p 13403- } 13404- }' 13405-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 13406-# Check for a 64-bit object if we didn't find anything. 13407-if test -z "$aix_libpath"; then 13408- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 13409-fi 13410+ lt_aix_libpath_sed=' 13411+ /Import File Strings/,/^$/ { 13412+ /^0/ { 13413+ s/^0 *\([^ ]*\) *$/\1/ 13414+ p 13415+ } 13416+ }' 13417+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 13418+ # Check for a 64-bit object if we didn't find anything. 13419+ if test -z "$lt_cv_aix_libpath_"; then 13420+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 13421+ fi 13422 fi 13423 rm -f core conftest.err conftest.$ac_objext \ 13424 conftest$ac_exeext conftest.$ac_ext 13425-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13426+ if test -z "$lt_cv_aix_libpath_"; then 13427+ lt_cv_aix_libpath_="/usr/lib:/lib" 13428+ fi 13429+ 13430+fi 13431+ 13432+ aix_libpath=$lt_cv_aix_libpath_ 13433+fi 13434 13435 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 13436 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" 13437@@ -9748,7 +10269,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13438 else 13439 # Determine the default libpath from the value encoded in an 13440 # empty executable. 13441- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13442+ if test "${lt_cv_aix_libpath+set}" = set; then 13443+ aix_libpath=$lt_cv_aix_libpath 13444+else 13445+ if ${lt_cv_aix_libpath_+:} false; then : 13446+ $as_echo_n "(cached) " >&6 13447+else 13448+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13449 /* end confdefs.h. */ 13450 13451 int 13452@@ -9761,22 +10288,29 @@ main () 13453 _ACEOF 13454 if ac_fn_c_try_link "$LINENO"; then : 13455 13456-lt_aix_libpath_sed=' 13457- /Import File Strings/,/^$/ { 13458- /^0/ { 13459- s/^0 *\(.*\)$/\1/ 13460- p 13461- } 13462- }' 13463-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 13464-# Check for a 64-bit object if we didn't find anything. 13465-if test -z "$aix_libpath"; then 13466- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 13467-fi 13468+ lt_aix_libpath_sed=' 13469+ /Import File Strings/,/^$/ { 13470+ /^0/ { 13471+ s/^0 *\([^ ]*\) *$/\1/ 13472+ p 13473+ } 13474+ }' 13475+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 13476+ # Check for a 64-bit object if we didn't find anything. 13477+ if test -z "$lt_cv_aix_libpath_"; then 13478+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 13479+ fi 13480 fi 13481 rm -f core conftest.err conftest.$ac_objext \ 13482 conftest$ac_exeext conftest.$ac_ext 13483-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13484+ if test -z "$lt_cv_aix_libpath_"; then 13485+ lt_cv_aix_libpath_="/usr/lib:/lib" 13486+ fi 13487+ 13488+fi 13489+ 13490+ aix_libpath=$lt_cv_aix_libpath_ 13491+fi 13492 13493 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 13494 # Warning - without using the other run time loading flags, 13495@@ -9821,20 +10355,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13496 # Microsoft Visual C++. 13497 # hardcode_libdir_flag_spec is actually meaningless, as there is 13498 # no search path for DLLs. 13499- hardcode_libdir_flag_spec=' ' 13500- allow_undefined_flag=unsupported 13501- # Tell ltmain to make .lib files, not .a files. 13502- libext=lib 13503- # Tell ltmain to make .dll files, not .so files. 13504- shrext_cmds=".dll" 13505- # FIXME: Setting linknames here is a bad hack. 13506- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 13507- # The linker will automatically build a .lib file if we build a DLL. 13508- old_archive_from_new_cmds='true' 13509- # FIXME: Should let the user specify the lib program. 13510- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 13511- fix_srcfile_path='`cygpath -w "$srcfile"`' 13512- enable_shared_with_static_runtimes=yes 13513+ case $cc_basename in 13514+ cl*) 13515+ # Native MSVC 13516+ hardcode_libdir_flag_spec=' ' 13517+ allow_undefined_flag=unsupported 13518+ always_export_symbols=yes 13519+ file_list_spec='@' 13520+ # Tell ltmain to make .lib files, not .a files. 13521+ libext=lib 13522+ # Tell ltmain to make .dll files, not .so files. 13523+ shrext_cmds=".dll" 13524+ # FIXME: Setting linknames here is a bad hack. 13525+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 13526+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 13527+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 13528+ else 13529+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 13530+ fi~ 13531+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 13532+ linknames=' 13533+ # The linker will not automatically build a static lib if we build a DLL. 13534+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 13535+ enable_shared_with_static_runtimes=yes 13536+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 13537+ # Don't use ranlib 13538+ old_postinstall_cmds='chmod 644 $oldlib' 13539+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 13540+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 13541+ case $lt_outputfile in 13542+ *.exe|*.EXE) ;; 13543+ *) 13544+ lt_outputfile="$lt_outputfile.exe" 13545+ lt_tool_outputfile="$lt_tool_outputfile.exe" 13546+ ;; 13547+ esac~ 13548+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 13549+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 13550+ $RM "$lt_outputfile.manifest"; 13551+ fi' 13552+ ;; 13553+ *) 13554+ # Assume MSVC wrapper 13555+ hardcode_libdir_flag_spec=' ' 13556+ allow_undefined_flag=unsupported 13557+ # Tell ltmain to make .lib files, not .a files. 13558+ libext=lib 13559+ # Tell ltmain to make .dll files, not .so files. 13560+ shrext_cmds=".dll" 13561+ # FIXME: Setting linknames here is a bad hack. 13562+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 13563+ # The linker will automatically build a .lib file if we build a DLL. 13564+ old_archive_from_new_cmds='true' 13565+ # FIXME: Should let the user specify the lib program. 13566+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 13567+ enable_shared_with_static_runtimes=yes 13568+ ;; 13569+ esac 13570 ;; 13571 13572 darwin* | rhapsody*) 13573@@ -9895,7 +10472,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13574 13575 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 13576 freebsd* | dragonfly*) 13577- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 13578+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 13579 hardcode_libdir_flag_spec='-R$libdir' 13580 hardcode_direct=yes 13581 hardcode_shlibpath_var=no 13582@@ -9903,7 +10480,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13583 13584 hpux9*) 13585 if test "$GCC" = yes; then 13586- 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' 13587+ 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' 13588 else 13589 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' 13590 fi 13591@@ -9919,7 +10496,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13592 13593 hpux10*) 13594 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 13595- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 13596+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 13597 else 13598 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 13599 fi 13600@@ -9943,10 +10520,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 13601 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 13602 ;; 13603 ia64*) 13604- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 13605+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 13606 ;; 13607 *) 13608- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 13609+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 13610 ;; 13611 esac 13612 else 13613@@ -10025,23 +10602,36 @@ fi 13614 13615 irix5* | irix6* | nonstopux*) 13616 if test "$GCC" = yes; then 13617- 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' 13618+ 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' 13619 # Try to use the -exported_symbol ld option, if it does not 13620 # work, assume that -exports_file does not work either and 13621 # implicitly export all symbols. 13622- save_LDFLAGS="$LDFLAGS" 13623- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 13624- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13625+ # This should be the same for all languages, so no per-tag cache variable. 13626+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 13627+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 13628+if ${lt_cv_irix_exported_symbol+:} false; then : 13629+ $as_echo_n "(cached) " >&6 13630+else 13631+ save_LDFLAGS="$LDFLAGS" 13632+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 13633+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13634 /* end confdefs.h. */ 13635-int foo(void) {} 13636+int foo (void) { return 0; } 13637 _ACEOF 13638 if ac_fn_c_try_link "$LINENO"; then : 13639- 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' 13640- 13641+ lt_cv_irix_exported_symbol=yes 13642+else 13643+ lt_cv_irix_exported_symbol=no 13644 fi 13645 rm -f core conftest.err conftest.$ac_objext \ 13646 conftest$ac_exeext conftest.$ac_ext 13647- LDFLAGS="$save_LDFLAGS" 13648+ LDFLAGS="$save_LDFLAGS" 13649+fi 13650+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 13651+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 13652+ if test "$lt_cv_irix_exported_symbol" = yes; then 13653+ 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' 13654+ fi 13655 else 13656 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' 13657 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' 13658@@ -10126,7 +10716,7 @@ rm -f core conftest.err conftest.$ac_objext \ 13659 osf4* | osf5*) # as osf3* with the addition of -msym flag 13660 if test "$GCC" = yes; then 13661 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 13662- 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' 13663+ 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' 13664 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 13665 else 13666 allow_undefined_flag=' -expect_unresolved \*' 13667@@ -10145,9 +10735,9 @@ rm -f core conftest.err conftest.$ac_objext \ 13668 no_undefined_flag=' -z defs' 13669 if test "$GCC" = yes; then 13670 wlarc='${wl}' 13671- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 13672+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 13673 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 13674- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 13675+ $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' 13676 else 13677 case `$CC -V 2>&1` in 13678 *"Compilers 5.0"*) 13679@@ -10723,8 +11313,9 @@ cygwin* | mingw* | pw32* | cegcc*) 13680 need_version=no 13681 need_lib_prefix=no 13682 13683- case $GCC,$host_os in 13684- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 13685+ case $GCC,$cc_basename in 13686+ yes,*) 13687+ # gcc 13688 library_names_spec='$libname.dll.a' 13689 # DLL is installed to $(libdir)/../bin by postinstall_cmds 13690 postinstall_cmds='base_file=`basename \${file}`~ 13691@@ -10757,13 +11348,71 @@ cygwin* | mingw* | pw32* | cegcc*) 13692 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 13693 ;; 13694 esac 13695+ dynamic_linker='Win32 ld.exe' 13696+ ;; 13697+ 13698+ *,cl*) 13699+ # Native MSVC 13700+ libname_spec='$name' 13701+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 13702+ library_names_spec='${libname}.dll.lib' 13703+ 13704+ case $build_os in 13705+ mingw*) 13706+ sys_lib_search_path_spec= 13707+ lt_save_ifs=$IFS 13708+ IFS=';' 13709+ for lt_path in $LIB 13710+ do 13711+ IFS=$lt_save_ifs 13712+ # Let DOS variable expansion print the short 8.3 style file name. 13713+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 13714+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 13715+ done 13716+ IFS=$lt_save_ifs 13717+ # Convert to MSYS style. 13718+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 13719+ ;; 13720+ cygwin*) 13721+ # Convert to unix form, then to dos form, then back to unix form 13722+ # but this time dos style (no spaces!) so that the unix form looks 13723+ # like /cygdrive/c/PROGRA~1:/cygdr... 13724+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 13725+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 13726+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 13727+ ;; 13728+ *) 13729+ sys_lib_search_path_spec="$LIB" 13730+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 13731+ # It is most probably a Windows format PATH. 13732+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 13733+ else 13734+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 13735+ fi 13736+ # FIXME: find the short name or the path components, as spaces are 13737+ # common. (e.g. "Program Files" -> "PROGRA~1") 13738+ ;; 13739+ esac 13740+ 13741+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 13742+ postinstall_cmds='base_file=`basename \${file}`~ 13743+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 13744+ dldir=$destdir/`dirname \$dlpath`~ 13745+ test -d \$dldir || mkdir -p \$dldir~ 13746+ $install_prog $dir/$dlname \$dldir/$dlname' 13747+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 13748+ dlpath=$dir/\$dldll~ 13749+ $RM \$dlpath' 13750+ shlibpath_overrides_runpath=yes 13751+ dynamic_linker='Win32 link.exe' 13752 ;; 13753 13754 *) 13755+ # Assume MSVC wrapper 13756 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 13757+ dynamic_linker='Win32 ld.exe' 13758 ;; 13759 esac 13760- dynamic_linker='Win32 ld.exe' 13761 # FIXME: first we should search . and the directory the executable is in 13762 shlibpath_var=PATH 13763 ;; 13764@@ -11641,7 +12290,7 @@ else 13765 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 13766 lt_status=$lt_dlunknown 13767 cat > conftest.$ac_ext <<_LT_EOF 13768-#line 11644 "configure" 13769+#line $LINENO "configure" 13770 #include "confdefs.h" 13771 13772 #if HAVE_DLFCN_H 13773@@ -11685,10 +12334,10 @@ else 13774 /* When -fvisbility=hidden is used, assume the code has been annotated 13775 correspondingly for the symbols needed. */ 13776 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 13777-void fnord () __attribute__((visibility("default"))); 13778+int fnord () __attribute__((visibility("default"))); 13779 #endif 13780 13781-void fnord () { int i=42; } 13782+int fnord () { return 42; } 13783 int main () 13784 { 13785 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 13786@@ -11747,7 +12396,7 @@ else 13787 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 13788 lt_status=$lt_dlunknown 13789 cat > conftest.$ac_ext <<_LT_EOF 13790-#line 11750 "configure" 13791+#line $LINENO "configure" 13792 #include "confdefs.h" 13793 13794 #if HAVE_DLFCN_H 13795@@ -11791,10 +12440,10 @@ else 13796 /* When -fvisbility=hidden is used, assume the code has been annotated 13797 correspondingly for the symbols needed. */ 13798 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 13799-void fnord () __attribute__((visibility("default"))); 13800+int fnord () __attribute__((visibility("default"))); 13801 #endif 13802 13803-void fnord () { int i=42; } 13804+int fnord () { return 42; } 13805 int main () 13806 { 13807 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 13808@@ -14479,13 +15128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 13809 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 13810 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 13811 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 13812+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 13813+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 13814 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 13815 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 13816 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 13817 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 13818 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 13819+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 13820+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 13821+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 13822+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 13823 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 13824 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 13825+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 13826 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 13827 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 13828 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 13829@@ -14500,14 +15156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 13830 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 13831 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 13832 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"`' 13833+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 13834+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 13835 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 13836 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 13837 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 13838-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 13839 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 13840+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 13841 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 13842 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 13843 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 13844+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 13845 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 13846 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 13847 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 13848@@ -14540,12 +15199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 13849 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 13850 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 13851 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 13852-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 13853 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 13854 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 13855 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 13856 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 13857 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 13858+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 13859 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 13860 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 13861 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 13862@@ -14600,8 +15259,13 @@ reload_flag \ 13863 OBJDUMP \ 13864 deplibs_check_method \ 13865 file_magic_cmd \ 13866+file_magic_glob \ 13867+want_nocaseglob \ 13868+DLLTOOL \ 13869+sharedlib_from_linklib_cmd \ 13870 AR \ 13871 AR_FLAGS \ 13872+archiver_list_spec \ 13873 STRIP \ 13874 RANLIB \ 13875 CC \ 13876@@ -14611,12 +15275,14 @@ lt_cv_sys_global_symbol_pipe \ 13877 lt_cv_sys_global_symbol_to_cdecl \ 13878 lt_cv_sys_global_symbol_to_c_name_address \ 13879 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 13880+nm_file_list_spec \ 13881 lt_prog_compiler_no_builtin_flag \ 13882-lt_prog_compiler_wl \ 13883 lt_prog_compiler_pic \ 13884+lt_prog_compiler_wl \ 13885 lt_prog_compiler_static \ 13886 lt_cv_prog_compiler_c_o \ 13887 need_locks \ 13888+MANIFEST_TOOL \ 13889 DSYMUTIL \ 13890 NMEDIT \ 13891 LIPO \ 13892@@ -14632,7 +15298,6 @@ no_undefined_flag \ 13893 hardcode_libdir_flag_spec \ 13894 hardcode_libdir_flag_spec_ld \ 13895 hardcode_libdir_separator \ 13896-fix_srcfile_path \ 13897 exclude_expsyms \ 13898 include_expsyms \ 13899 file_list_spec \ 13900@@ -14668,6 +15333,7 @@ module_cmds \ 13901 module_expsym_cmds \ 13902 export_symbols_cmds \ 13903 prelink_cmds \ 13904+postlink_cmds \ 13905 postinstall_cmds \ 13906 postuninstall_cmds \ 13907 finish_cmds \ 13908@@ -15424,7 +16090,8 @@ $as_echo X"$file" | 13909 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 13910 # 13911 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 13912-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 13913+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 13914+# Inc. 13915 # Written by Gordon Matzigkeit, 1996 13916 # 13917 # This file is part of GNU Libtool. 13918@@ -15527,19 +16194,42 @@ SP2NL=$lt_lt_SP2NL 13919 # turn newlines into spaces. 13920 NL2SP=$lt_lt_NL2SP 13921 13922+# convert \$build file names to \$host format. 13923+to_host_file_cmd=$lt_cv_to_host_file_cmd 13924+ 13925+# convert \$build files to toolchain format. 13926+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 13927+ 13928 # An object symbol dumper. 13929 OBJDUMP=$lt_OBJDUMP 13930 13931 # Method to check whether dependent libraries are shared objects. 13932 deplibs_check_method=$lt_deplibs_check_method 13933 13934-# Command to use when deplibs_check_method == "file_magic". 13935+# Command to use when deplibs_check_method = "file_magic". 13936 file_magic_cmd=$lt_file_magic_cmd 13937 13938+# How to find potential files when deplibs_check_method = "file_magic". 13939+file_magic_glob=$lt_file_magic_glob 13940+ 13941+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 13942+want_nocaseglob=$lt_want_nocaseglob 13943+ 13944+# DLL creation program. 13945+DLLTOOL=$lt_DLLTOOL 13946+ 13947+# Command to associate shared and link libraries. 13948+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 13949+ 13950 # The archiver. 13951 AR=$lt_AR 13952+ 13953+# Flags to create an archive. 13954 AR_FLAGS=$lt_AR_FLAGS 13955 13956+# How to feed a file listing to the archiver. 13957+archiver_list_spec=$lt_archiver_list_spec 13958+ 13959 # A symbol stripping program. 13960 STRIP=$lt_STRIP 13961 13962@@ -15569,6 +16259,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 13963 # Transform the output of nm in a C name address pair when lib prefix is needed. 13964 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 13965 13966+# Specify filename containing input files for \$NM. 13967+nm_file_list_spec=$lt_nm_file_list_spec 13968+ 13969+# The root where to search for dependent libraries,and in which our libraries should be installed. 13970+lt_sysroot=$lt_sysroot 13971+ 13972 # The name of the directory that contains temporary libtool files. 13973 objdir=$objdir 13974 13975@@ -15578,6 +16274,9 @@ MAGIC_CMD=$MAGIC_CMD 13976 # Must we lock files when doing compilation? 13977 need_locks=$lt_need_locks 13978 13979+# Manifest tool. 13980+MANIFEST_TOOL=$lt_MANIFEST_TOOL 13981+ 13982 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 13983 DSYMUTIL=$lt_DSYMUTIL 13984 13985@@ -15692,12 +16391,12 @@ with_gcc=$GCC 13986 # Compiler flag to turn off builtin functions. 13987 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 13988 13989-# How to pass a linker flag through the compiler. 13990-wl=$lt_lt_prog_compiler_wl 13991- 13992 # Additional compiler flags for building library objects. 13993 pic_flag=$lt_lt_prog_compiler_pic 13994 13995+# How to pass a linker flag through the compiler. 13996+wl=$lt_lt_prog_compiler_wl 13997+ 13998 # Compiler flag to prevent dynamic linking. 13999 link_static_flag=$lt_lt_prog_compiler_static 14000 14001@@ -15784,9 +16483,6 @@ inherit_rpath=$inherit_rpath 14002 # Whether libtool must link a program against all its dependency libraries. 14003 link_all_deplibs=$link_all_deplibs 14004 14005-# Fix the shell variable \$srcfile for the compiler. 14006-fix_srcfile_path=$lt_fix_srcfile_path 14007- 14008 # Set to "yes" if exported symbols are required. 14009 always_export_symbols=$always_export_symbols 14010 14011@@ -15802,6 +16498,9 @@ include_expsyms=$lt_include_expsyms 14012 # Commands necessary for linking programs (against libraries) with templates. 14013 prelink_cmds=$lt_prelink_cmds 14014 14015+# Commands necessary for finishing linking programs. 14016+postlink_cmds=$lt_postlink_cmds 14017+ 14018 # Specify filename containing input files. 14019 file_list_spec=$lt_file_list_spec 14020 14021@@ -15834,210 +16533,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 14022 # if finds mixed CR/LF and LF-only lines. Since sed operates in 14023 # text mode, it properly converts lines to CR/LF. This bash problem 14024 # is reportedly fixed, but why not run on old versions too? 14025- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 14026- || (rm -f "$cfgfile"; exit 1) 14027- 14028- case $xsi_shell in 14029- yes) 14030- cat << \_LT_EOF >> "$cfgfile" 14031- 14032-# func_dirname file append nondir_replacement 14033-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 14034-# otherwise set result to NONDIR_REPLACEMENT. 14035-func_dirname () 14036-{ 14037- case ${1} in 14038- */*) func_dirname_result="${1%/*}${2}" ;; 14039- * ) func_dirname_result="${3}" ;; 14040- esac 14041-} 14042- 14043-# func_basename file 14044-func_basename () 14045-{ 14046- func_basename_result="${1##*/}" 14047-} 14048- 14049-# func_dirname_and_basename file append nondir_replacement 14050-# perform func_basename and func_dirname in a single function 14051-# call: 14052-# dirname: Compute the dirname of FILE. If nonempty, 14053-# add APPEND to the result, otherwise set result 14054-# to NONDIR_REPLACEMENT. 14055-# value returned in "$func_dirname_result" 14056-# basename: Compute filename of FILE. 14057-# value retuned in "$func_basename_result" 14058-# Implementation must be kept synchronized with func_dirname 14059-# and func_basename. For efficiency, we do not delegate to 14060-# those functions but instead duplicate the functionality here. 14061-func_dirname_and_basename () 14062-{ 14063- case ${1} in 14064- */*) func_dirname_result="${1%/*}${2}" ;; 14065- * ) func_dirname_result="${3}" ;; 14066- esac 14067- func_basename_result="${1##*/}" 14068-} 14069- 14070-# func_stripname prefix suffix name 14071-# strip PREFIX and SUFFIX off of NAME. 14072-# PREFIX and SUFFIX must not contain globbing or regex special 14073-# characters, hashes, percent signs, but SUFFIX may contain a leading 14074-# dot (in which case that matches only a dot). 14075-func_stripname () 14076-{ 14077- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 14078- # positional parameters, so assign one to ordinary parameter first. 14079- func_stripname_result=${3} 14080- func_stripname_result=${func_stripname_result#"${1}"} 14081- func_stripname_result=${func_stripname_result%"${2}"} 14082-} 14083- 14084-# func_opt_split 14085-func_opt_split () 14086-{ 14087- func_opt_split_opt=${1%%=*} 14088- func_opt_split_arg=${1#*=} 14089-} 14090- 14091-# func_lo2o object 14092-func_lo2o () 14093-{ 14094- case ${1} in 14095- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 14096- *) func_lo2o_result=${1} ;; 14097- esac 14098-} 14099- 14100-# func_xform libobj-or-source 14101-func_xform () 14102-{ 14103- func_xform_result=${1%.*}.lo 14104-} 14105- 14106-# func_arith arithmetic-term... 14107-func_arith () 14108-{ 14109- func_arith_result=$(( $* )) 14110-} 14111- 14112-# func_len string 14113-# STRING may not start with a hyphen. 14114-func_len () 14115-{ 14116- func_len_result=${#1} 14117-} 14118- 14119-_LT_EOF 14120- ;; 14121- *) # Bourne compatible functions. 14122- cat << \_LT_EOF >> "$cfgfile" 14123- 14124-# func_dirname file append nondir_replacement 14125-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 14126-# otherwise set result to NONDIR_REPLACEMENT. 14127-func_dirname () 14128-{ 14129- # Extract subdirectory from the argument. 14130- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 14131- if test "X$func_dirname_result" = "X${1}"; then 14132- func_dirname_result="${3}" 14133- else 14134- func_dirname_result="$func_dirname_result${2}" 14135- fi 14136-} 14137- 14138-# func_basename file 14139-func_basename () 14140-{ 14141- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 14142-} 14143- 14144- 14145-# func_stripname prefix suffix name 14146-# strip PREFIX and SUFFIX off of NAME. 14147-# PREFIX and SUFFIX must not contain globbing or regex special 14148-# characters, hashes, percent signs, but SUFFIX may contain a leading 14149-# dot (in which case that matches only a dot). 14150-# func_strip_suffix prefix name 14151-func_stripname () 14152-{ 14153- case ${2} in 14154- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 14155- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 14156- esac 14157-} 14158- 14159-# sed scripts: 14160-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 14161-my_sed_long_arg='1s/^-[^=]*=//' 14162- 14163-# func_opt_split 14164-func_opt_split () 14165-{ 14166- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 14167- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 14168-} 14169- 14170-# func_lo2o object 14171-func_lo2o () 14172-{ 14173- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 14174-} 14175- 14176-# func_xform libobj-or-source 14177-func_xform () 14178-{ 14179- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 14180-} 14181- 14182-# func_arith arithmetic-term... 14183-func_arith () 14184-{ 14185- func_arith_result=`expr "$@"` 14186-} 14187- 14188-# func_len string 14189-# STRING may not start with a hyphen. 14190-func_len () 14191-{ 14192- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 14193-} 14194- 14195-_LT_EOF 14196-esac 14197- 14198-case $lt_shell_append in 14199- yes) 14200- cat << \_LT_EOF >> "$cfgfile" 14201- 14202-# func_append var value 14203-# Append VALUE to the end of shell variable VAR. 14204-func_append () 14205-{ 14206- eval "$1+=\$2" 14207-} 14208-_LT_EOF 14209- ;; 14210- *) 14211- cat << \_LT_EOF >> "$cfgfile" 14212- 14213-# func_append var value 14214-# Append VALUE to the end of shell variable VAR. 14215-func_append () 14216-{ 14217- eval "$1=\$$1\$2" 14218-} 14219- 14220-_LT_EOF 14221- ;; 14222- esac 14223- 14224- 14225- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 14226- || (rm -f "$cfgfile"; exit 1) 14227- 14228- mv -f "$cfgfile" "$ofile" || 14229+ sed '$q' "$ltmain" >> "$cfgfile" \ 14230+ || (rm -f "$cfgfile"; exit 1) 14231+ 14232+ if test x"$xsi_shell" = xyes; then 14233+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 14234+func_dirname ()\ 14235+{\ 14236+\ case ${1} in\ 14237+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 14238+\ * ) func_dirname_result="${3}" ;;\ 14239+\ esac\ 14240+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 14241+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14242+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14243+test 0 -eq $? || _lt_function_replace_fail=: 14244+ 14245+ 14246+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 14247+func_basename ()\ 14248+{\ 14249+\ func_basename_result="${1##*/}"\ 14250+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 14251+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14252+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14253+test 0 -eq $? || _lt_function_replace_fail=: 14254+ 14255+ 14256+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 14257+func_dirname_and_basename ()\ 14258+{\ 14259+\ case ${1} in\ 14260+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 14261+\ * ) func_dirname_result="${3}" ;;\ 14262+\ esac\ 14263+\ func_basename_result="${1##*/}"\ 14264+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 14265+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14266+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14267+test 0 -eq $? || _lt_function_replace_fail=: 14268+ 14269+ 14270+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 14271+func_stripname ()\ 14272+{\ 14273+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 14274+\ # positional parameters, so assign one to ordinary parameter first.\ 14275+\ func_stripname_result=${3}\ 14276+\ func_stripname_result=${func_stripname_result#"${1}"}\ 14277+\ func_stripname_result=${func_stripname_result%"${2}"}\ 14278+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 14279+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14280+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14281+test 0 -eq $? || _lt_function_replace_fail=: 14282+ 14283+ 14284+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 14285+func_split_long_opt ()\ 14286+{\ 14287+\ func_split_long_opt_name=${1%%=*}\ 14288+\ func_split_long_opt_arg=${1#*=}\ 14289+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 14290+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14291+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14292+test 0 -eq $? || _lt_function_replace_fail=: 14293+ 14294+ 14295+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 14296+func_split_short_opt ()\ 14297+{\ 14298+\ func_split_short_opt_arg=${1#??}\ 14299+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 14300+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 14301+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14302+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14303+test 0 -eq $? || _lt_function_replace_fail=: 14304+ 14305+ 14306+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 14307+func_lo2o ()\ 14308+{\ 14309+\ case ${1} in\ 14310+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 14311+\ *) func_lo2o_result=${1} ;;\ 14312+\ esac\ 14313+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 14314+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14315+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14316+test 0 -eq $? || _lt_function_replace_fail=: 14317+ 14318+ 14319+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 14320+func_xform ()\ 14321+{\ 14322+ func_xform_result=${1%.*}.lo\ 14323+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 14324+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14325+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14326+test 0 -eq $? || _lt_function_replace_fail=: 14327+ 14328+ 14329+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 14330+func_arith ()\ 14331+{\ 14332+ func_arith_result=$(( $* ))\ 14333+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 14334+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14335+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14336+test 0 -eq $? || _lt_function_replace_fail=: 14337+ 14338+ 14339+ sed -e '/^func_len ()$/,/^} # func_len /c\ 14340+func_len ()\ 14341+{\ 14342+ func_len_result=${#1}\ 14343+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 14344+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14345+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14346+test 0 -eq $? || _lt_function_replace_fail=: 14347+ 14348+fi 14349+ 14350+if test x"$lt_shell_append" = xyes; then 14351+ sed -e '/^func_append ()$/,/^} # func_append /c\ 14352+func_append ()\ 14353+{\ 14354+ eval "${1}+=\\${2}"\ 14355+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 14356+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14357+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14358+test 0 -eq $? || _lt_function_replace_fail=: 14359+ 14360+ 14361+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 14362+func_append_quoted ()\ 14363+{\ 14364+\ func_quote_for_eval "${2}"\ 14365+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 14366+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 14367+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14368+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14369+test 0 -eq $? || _lt_function_replace_fail=: 14370+ 14371+ 14372+ # Save a `func_append' function call where possible by direct use of '+=' 14373+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 14374+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14375+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14376+ test 0 -eq $? || _lt_function_replace_fail=: 14377+else 14378+ # Save a `func_append' function call even when '+=' is not available 14379+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 14380+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 14381+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 14382+ test 0 -eq $? || _lt_function_replace_fail=: 14383+fi 14384+ 14385+if test x"$_lt_function_replace_fail" = x":"; then 14386+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 14387+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 14388+fi 14389+ 14390+ 14391+ mv -f "$cfgfile" "$ofile" || 14392 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 14393 chmod +x "$ofile" 14394 14395diff --git a/libtool.m4 b/libtool.m4 14396index a216bb14e99..e37c45ac0b1 100644 14397--- a/libtool.m4 14398+++ b/libtool.m4 14399@@ -1,7 +1,8 @@ 14400 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- 14401 # 14402 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 14403-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 14404+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 14405+# Inc. 14406 # Written by Gordon Matzigkeit, 1996 14407 # 14408 # This file is free software; the Free Software Foundation gives 14409@@ -10,7 +11,8 @@ 14410 14411 m4_define([_LT_COPYING], [dnl 14412 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 14413-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 14414+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 14415+# Inc. 14416 # Written by Gordon Matzigkeit, 1996 14417 # 14418 # This file is part of GNU Libtool. 14419@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl 14420 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 14421 ]) 14422 14423-# serial 56 LT_INIT 14424+# serial 57 LT_INIT 14425 14426 14427 # LT_PREREQ(VERSION) 14428@@ -166,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl 14429 dnl 14430 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 14431 m4_require([_LT_CHECK_SHELL_FEATURES])dnl 14432+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl 14433 m4_require([_LT_CMD_RELOAD])dnl 14434 m4_require([_LT_CHECK_MAGIC_METHOD])dnl 14435+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl 14436 m4_require([_LT_CMD_OLD_ARCHIVE])dnl 14437 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl 14438+m4_require([_LT_WITH_SYSROOT])dnl 14439 14440 _LT_CONFIG_LIBTOOL_INIT([ 14441 # See if we are running on zsh, and set the options which allow our 14442@@ -632,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl 14443 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) 14444 configured by $[0], generated by m4_PACKAGE_STRING. 14445 14446-Copyright (C) 2009 Free Software Foundation, Inc. 14447+Copyright (C) 2010 Free Software Foundation, Inc. 14448 This config.lt script is free software; the Free Software Foundation 14449 gives unlimited permision to copy, distribute and modify it." 14450 14451@@ -746,15 +751,12 @@ _LT_EOF 14452 # if finds mixed CR/LF and LF-only lines. Since sed operates in 14453 # text mode, it properly converts lines to CR/LF. This bash problem 14454 # is reportedly fixed, but why not run on old versions too? 14455- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 14456- || (rm -f "$cfgfile"; exit 1) 14457+ sed '$q' "$ltmain" >> "$cfgfile" \ 14458+ || (rm -f "$cfgfile"; exit 1) 14459 14460- _LT_PROG_XSI_SHELLFNS 14461+ _LT_PROG_REPLACE_SHELLFNS 14462 14463- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 14464- || (rm -f "$cfgfile"; exit 1) 14465- 14466- mv -f "$cfgfile" "$ofile" || 14467+ mv -f "$cfgfile" "$ofile" || 14468 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 14469 chmod +x "$ofile" 14470 ], 14471@@ -980,6 +982,8 @@ _LT_EOF 14472 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD 14473 echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD 14474 $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD 14475+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD 14476+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD 14477 cat > conftest.c << _LT_EOF 14478 int main() { return 0;} 14479 _LT_EOF 14480@@ -1069,30 +1073,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], 14481 fi 14482 ]) 14483 14484-# _LT_SYS_MODULE_PATH_AIX 14485-# ----------------------- 14486+# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) 14487+# ---------------------------------- 14488 # Links a minimal program and checks the executable 14489 # for the system default hardcoded library path. In most cases, 14490 # this is /usr/lib:/lib, but when the MPI compilers are used 14491 # the location of the communication and MPI libs are included too. 14492 # If we don't find anything, use the default library path according 14493 # to the aix ld manual. 14494+# Store the results from the different compilers for each TAGNAME. 14495+# Allow to override them for all tags through lt_cv_aix_libpath. 14496 m4_defun([_LT_SYS_MODULE_PATH_AIX], 14497 [m4_require([_LT_DECL_SED])dnl 14498-AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ 14499-lt_aix_libpath_sed=' 14500- /Import File Strings/,/^$/ { 14501- /^0/ { 14502- s/^0 *\(.*\)$/\1/ 14503- p 14504- } 14505- }' 14506-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14507-# Check for a 64-bit object if we didn't find anything. 14508-if test -z "$aix_libpath"; then 14509- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14510-fi],[]) 14511-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 14512+if test "${lt_cv_aix_libpath+set}" = set; then 14513+ aix_libpath=$lt_cv_aix_libpath 14514+else 14515+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], 14516+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ 14517+ lt_aix_libpath_sed='[ 14518+ /Import File Strings/,/^$/ { 14519+ /^0/ { 14520+ s/^0 *\([^ ]*\) *$/\1/ 14521+ p 14522+ } 14523+ }]' 14524+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14525+ # Check for a 64-bit object if we didn't find anything. 14526+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then 14527+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 14528+ fi],[]) 14529+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then 14530+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" 14531+ fi 14532+ ]) 14533+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) 14534+fi 14535 ])# _LT_SYS_MODULE_PATH_AIX 14536 14537 14538@@ -1117,7 +1132,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 14539 14540 AC_MSG_CHECKING([how to print strings]) 14541 # Test print first, because it will be a builtin if present. 14542-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 14543+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 14544 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 14545 ECHO='print -r --' 14546 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 14547@@ -1161,6 +1176,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) 14548 ])# _LT_PROG_ECHO_BACKSLASH 14549 14550 14551+# _LT_WITH_SYSROOT 14552+# ---------------- 14553+AC_DEFUN([_LT_WITH_SYSROOT], 14554+[AC_MSG_CHECKING([for sysroot]) 14555+AC_ARG_WITH([libtool-sysroot], 14556+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR 14557+ (or the compiler's sysroot if not specified).], 14558+[], [with_libtool_sysroot=no]) 14559+ 14560+dnl lt_sysroot will always be passed unquoted. We quote it here 14561+dnl in case the user passed a directory name. 14562+lt_sysroot= 14563+case ${with_libtool_sysroot} in #( 14564+ yes) 14565+ if test "$GCC" = yes; then 14566+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 14567+ fi 14568+ ;; #( 14569+ /*) 14570+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 14571+ ;; #( 14572+ no|'') 14573+ ;; #( 14574+ *) 14575+ AC_MSG_RESULT([${with_libtool_sysroot}]) 14576+ AC_MSG_ERROR([The sysroot must be an absolute path.]) 14577+ ;; 14578+esac 14579+ 14580+ AC_MSG_RESULT([${lt_sysroot:-no}]) 14581+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl 14582+[dependent libraries, and in which our libraries should be installed.])]) 14583+ 14584 # _LT_ENABLE_LOCK 14585 # --------------- 14586 m4_defun([_LT_ENABLE_LOCK], 14587@@ -1320,6 +1368,51 @@ need_locks="$enable_libtool_lock" 14588 ])# _LT_ENABLE_LOCK 14589 14590 14591+# _LT_PROG_AR 14592+# ----------- 14593+m4_defun([_LT_PROG_AR], 14594+[AC_CHECK_TOOLS(AR, [ar], false) 14595+ touch conftest.c 14596+ $AR $plugin_option rc conftest.a conftest.c 14597+ if test "$?" != 0; then 14598+ AC_MSG_WARN([Failed: $AR $plugin_option rc]) 14599+ else 14600+ AR="$AR $plugin_option" 14601+ fi 14602+ rm -f conftest.* 14603+: ${AR=ar} 14604+: ${AR_FLAGS=cru} 14605+_LT_DECL([], [AR], [1], [The archiver]) 14606+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) 14607+ 14608+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], 14609+ [lt_cv_ar_at_file=no 14610+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], 14611+ [echo conftest.$ac_objext > conftest.lst 14612+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' 14613+ AC_TRY_EVAL([lt_ar_try]) 14614+ if test "$ac_status" -eq 0; then 14615+ # Ensure the archiver fails upon bogus file names. 14616+ rm -f conftest.$ac_objext libconftest.a 14617+ AC_TRY_EVAL([lt_ar_try]) 14618+ if test "$ac_status" -ne 0; then 14619+ lt_cv_ar_at_file=@ 14620+ fi 14621+ fi 14622+ rm -f conftest.* libconftest.a 14623+ ]) 14624+ ]) 14625+ 14626+if test "x$lt_cv_ar_at_file" = xno; then 14627+ archiver_list_spec= 14628+else 14629+ archiver_list_spec=$lt_cv_ar_at_file 14630+fi 14631+_LT_DECL([], [archiver_list_spec], [1], 14632+ [How to feed a file listing to the archiver]) 14633+])# _LT_PROG_AR 14634+ 14635+ 14636 # _LT_CMD_OLD_ARCHIVE 14637 # ------------------- 14638 m4_defun([_LT_CMD_OLD_ARCHIVE], 14639@@ -1336,23 +1429,7 @@ for plugin in $plugin_names; do 14640 fi 14641 done 14642 14643-AC_CHECK_TOOL(AR, ar, false) 14644-test -z "$AR" && AR=ar 14645-if test -n "$plugin_option"; then 14646- if $AR --help 2>&1 | grep -q "\--plugin"; then 14647- touch conftest.c 14648- $AR $plugin_option rc conftest.a conftest.c 14649- if test "$?" != 0; then 14650- AC_MSG_WARN([Failed: $AR $plugin_option rc]) 14651- else 14652- AR="$AR $plugin_option" 14653- fi 14654- rm -f conftest.* 14655- fi 14656-fi 14657-test -z "$AR_FLAGS" && AR_FLAGS=cru 14658-_LT_DECL([], [AR], [1], [The archiver]) 14659-_LT_DECL([], [AR_FLAGS], [1]) 14660+_LT_PROG_AR 14661 14662 AC_CHECK_TOOL(STRIP, strip, :) 14663 test -z "$STRIP" && STRIP=: 14664@@ -1653,7 +1730,7 @@ else 14665 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 14666 lt_status=$lt_dlunknown 14667 cat > conftest.$ac_ext <<_LT_EOF 14668-[#line __oline__ "configure" 14669+[#line $LINENO "configure" 14670 #include "confdefs.h" 14671 14672 #if HAVE_DLFCN_H 14673@@ -1697,10 +1774,10 @@ else 14674 /* When -fvisbility=hidden is used, assume the code has been annotated 14675 correspondingly for the symbols needed. */ 14676 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 14677-void fnord () __attribute__((visibility("default"))); 14678+int fnord () __attribute__((visibility("default"))); 14679 #endif 14680 14681-void fnord () { int i=42; } 14682+int fnord () { return 42; } 14683 int main () 14684 { 14685 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 14686@@ -2240,8 +2317,9 @@ cygwin* | mingw* | pw32* | cegcc*) 14687 need_version=no 14688 need_lib_prefix=no 14689 14690- case $GCC,$host_os in 14691- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 14692+ case $GCC,$cc_basename in 14693+ yes,*) 14694+ # gcc 14695 library_names_spec='$libname.dll.a' 14696 # DLL is installed to $(libdir)/../bin by postinstall_cmds 14697 postinstall_cmds='base_file=`basename \${file}`~ 14698@@ -2274,13 +2352,71 @@ m4_if([$1], [],[ 14699 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 14700 ;; 14701 esac 14702+ dynamic_linker='Win32 ld.exe' 14703+ ;; 14704+ 14705+ *,cl*) 14706+ # Native MSVC 14707+ libname_spec='$name' 14708+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 14709+ library_names_spec='${libname}.dll.lib' 14710+ 14711+ case $build_os in 14712+ mingw*) 14713+ sys_lib_search_path_spec= 14714+ lt_save_ifs=$IFS 14715+ IFS=';' 14716+ for lt_path in $LIB 14717+ do 14718+ IFS=$lt_save_ifs 14719+ # Let DOS variable expansion print the short 8.3 style file name. 14720+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 14721+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 14722+ done 14723+ IFS=$lt_save_ifs 14724+ # Convert to MSYS style. 14725+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` 14726+ ;; 14727+ cygwin*) 14728+ # Convert to unix form, then to dos form, then back to unix form 14729+ # but this time dos style (no spaces!) so that the unix form looks 14730+ # like /cygdrive/c/PROGRA~1:/cygdr... 14731+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 14732+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 14733+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 14734+ ;; 14735+ *) 14736+ sys_lib_search_path_spec="$LIB" 14737+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then 14738+ # It is most probably a Windows format PATH. 14739+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 14740+ else 14741+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 14742+ fi 14743+ # FIXME: find the short name or the path components, as spaces are 14744+ # common. (e.g. "Program Files" -> "PROGRA~1") 14745+ ;; 14746+ esac 14747+ 14748+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 14749+ postinstall_cmds='base_file=`basename \${file}`~ 14750+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 14751+ dldir=$destdir/`dirname \$dlpath`~ 14752+ test -d \$dldir || mkdir -p \$dldir~ 14753+ $install_prog $dir/$dlname \$dldir/$dlname' 14754+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 14755+ dlpath=$dir/\$dldll~ 14756+ $RM \$dlpath' 14757+ shlibpath_overrides_runpath=yes 14758+ dynamic_linker='Win32 link.exe' 14759 ;; 14760 14761 *) 14762+ # Assume MSVC wrapper 14763 library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' 14764+ dynamic_linker='Win32 ld.exe' 14765 ;; 14766 esac 14767- dynamic_linker='Win32 ld.exe' 14768 # FIXME: first we should search . and the directory the executable is in 14769 shlibpath_var=PATH 14770 ;; 14771@@ -2970,6 +3106,11 @@ case $reload_flag in 14772 esac 14773 reload_cmds='$LD$reload_flag -o $output$reload_objs' 14774 case $host_os in 14775+ cygwin* | mingw* | pw32* | cegcc*) 14776+ if test "$GCC" != yes; then 14777+ reload_cmds=false 14778+ fi 14779+ ;; 14780 darwin*) 14781 if test "$GCC" = yes; then 14782 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 14783@@ -3036,7 +3177,8 @@ mingw* | pw32*) 14784 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 14785 lt_cv_file_magic_cmd='func_win32_libid' 14786 else 14787- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 14788+ # Keep this pattern in sync with the one in func_win32_libid. 14789+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 14790 lt_cv_file_magic_cmd='$OBJDUMP -f' 14791 fi 14792 ;; 14793@@ -3187,6 +3329,21 @@ tpf*) 14794 ;; 14795 esac 14796 ]) 14797+ 14798+file_magic_glob= 14799+want_nocaseglob=no 14800+if test "$build" = "$host"; then 14801+ case $host_os in 14802+ mingw* | pw32*) 14803+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 14804+ want_nocaseglob=yes 14805+ else 14806+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` 14807+ fi 14808+ ;; 14809+ esac 14810+fi 14811+ 14812 file_magic_cmd=$lt_cv_file_magic_cmd 14813 deplibs_check_method=$lt_cv_deplibs_check_method 14814 test -z "$deplibs_check_method" && deplibs_check_method=unknown 14815@@ -3194,7 +3351,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 14816 _LT_DECL([], [deplibs_check_method], [1], 14817 [Method to check whether dependent libraries are shared objects]) 14818 _LT_DECL([], [file_magic_cmd], [1], 14819- [Command to use when deplibs_check_method == "file_magic"]) 14820+ [Command to use when deplibs_check_method = "file_magic"]) 14821+_LT_DECL([], [file_magic_glob], [1], 14822+ [How to find potential files when deplibs_check_method = "file_magic"]) 14823+_LT_DECL([], [want_nocaseglob], [1], 14824+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) 14825 ])# _LT_CHECK_MAGIC_METHOD 14826 14827 14828@@ -3299,6 +3460,67 @@ dnl aclocal-1.4 backwards compatibility: 14829 dnl AC_DEFUN([AM_PROG_NM], []) 14830 dnl AC_DEFUN([AC_PROG_NM], []) 14831 14832+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB 14833+# -------------------------------- 14834+# how to determine the name of the shared library 14835+# associated with a specific link library. 14836+# -- PORTME fill in with the dynamic library characteristics 14837+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], 14838+[m4_require([_LT_DECL_EGREP]) 14839+m4_require([_LT_DECL_OBJDUMP]) 14840+m4_require([_LT_DECL_DLLTOOL]) 14841+AC_CACHE_CHECK([how to associate runtime and link libraries], 14842+lt_cv_sharedlib_from_linklib_cmd, 14843+[lt_cv_sharedlib_from_linklib_cmd='unknown' 14844+ 14845+case $host_os in 14846+cygwin* | mingw* | pw32* | cegcc*) 14847+ # two different shell functions defined in ltmain.sh 14848+ # decide which to use based on capabilities of $DLLTOOL 14849+ case `$DLLTOOL --help 2>&1` in 14850+ *--identify-strict*) 14851+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 14852+ ;; 14853+ *) 14854+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 14855+ ;; 14856+ esac 14857+ ;; 14858+*) 14859+ # fallback: assume linklib IS sharedlib 14860+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 14861+ ;; 14862+esac 14863+]) 14864+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 14865+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 14866+ 14867+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], 14868+ [Command to associate shared and link libraries]) 14869+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB 14870+ 14871+ 14872+# _LT_PATH_MANIFEST_TOOL 14873+# ---------------------- 14874+# locate the manifest tool 14875+m4_defun([_LT_PATH_MANIFEST_TOOL], 14876+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) 14877+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 14878+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], 14879+ [lt_cv_path_mainfest_tool=no 14880+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD 14881+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 14882+ cat conftest.err >&AS_MESSAGE_LOG_FD 14883+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 14884+ lt_cv_path_mainfest_tool=yes 14885+ fi 14886+ rm -f conftest*]) 14887+if test "x$lt_cv_path_mainfest_tool" != xyes; then 14888+ MANIFEST_TOOL=: 14889+fi 14890+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl 14891+])# _LT_PATH_MANIFEST_TOOL 14892+ 14893 14894 # LT_LIB_M 14895 # -------- 14896@@ -3425,8 +3647,8 @@ esac 14897 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 14898 14899 # Transform an extracted symbol line into symbol name and symbol address 14900-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" 14901-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'" 14902+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" 14903+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'" 14904 14905 # Handle CRLF in mingw tool chain 14906 opt_cr= 14907@@ -3462,6 +3684,7 @@ for ac_symprfx in "" "_"; do 14908 else 14909 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 14910 fi 14911+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 14912 14913 # Check to see that the pipe works correctly. 14914 pipe_works=no 14915@@ -3495,6 +3718,18 @@ _LT_EOF 14916 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 14917 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 14918 cat <<_LT_EOF > conftest.$ac_ext 14919+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 14920+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 14921+/* DATA imports from DLLs on WIN32 con't be const, because runtime 14922+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 14923+# define LT@&t@_DLSYM_CONST 14924+#elif defined(__osf__) 14925+/* This system does not cope well with relocations in const data. */ 14926+# define LT@&t@_DLSYM_CONST 14927+#else 14928+# define LT@&t@_DLSYM_CONST const 14929+#endif 14930+ 14931 #ifdef __cplusplus 14932 extern "C" { 14933 #endif 14934@@ -3506,7 +3741,7 @@ _LT_EOF 14935 cat <<_LT_EOF >> conftest.$ac_ext 14936 14937 /* The mapping between symbol names and symbols. */ 14938-const struct { 14939+LT@&t@_DLSYM_CONST struct { 14940 const char *name; 14941 void *address; 14942 } 14943@@ -3532,15 +3767,15 @@ static const void *lt_preloaded_setup() { 14944 _LT_EOF 14945 # Now try linking the two files. 14946 mv conftest.$ac_objext conftstm.$ac_objext 14947- lt_save_LIBS="$LIBS" 14948- lt_save_CFLAGS="$CFLAGS" 14949+ lt_globsym_save_LIBS=$LIBS 14950+ lt_globsym_save_CFLAGS=$CFLAGS 14951 LIBS="conftstm.$ac_objext" 14952 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" 14953 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then 14954 pipe_works=yes 14955 fi 14956- LIBS="$lt_save_LIBS" 14957- CFLAGS="$lt_save_CFLAGS" 14958+ LIBS=$lt_globsym_save_LIBS 14959+ CFLAGS=$lt_globsym_save_CFLAGS 14960 else 14961 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD 14962 fi 14963@@ -3573,6 +3808,13 @@ else 14964 AC_MSG_RESULT(ok) 14965 fi 14966 14967+# Response file support. 14968+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 14969+ nm_file_list_spec='@' 14970+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then 14971+ nm_file_list_spec='@' 14972+fi 14973+ 14974 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], 14975 [Take the output of nm and produce a listing of raw symbols and C names]) 14976 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], 14977@@ -3583,6 +3825,8 @@ _LT_DECL([global_symbol_to_c_name_address], 14978 _LT_DECL([global_symbol_to_c_name_address_lib_prefix], 14979 [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], 14980 [Transform the output of nm in a C name address pair when lib prefix is needed]) 14981+_LT_DECL([], [nm_file_list_spec], [1], 14982+ [Specify filename containing input files for $NM]) 14983 ]) # _LT_CMD_GLOBAL_SYMBOLS 14984 14985 14986@@ -3594,7 +3838,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= 14987 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 14988 _LT_TAGVAR(lt_prog_compiler_static, $1)= 14989 14990-AC_MSG_CHECKING([for $compiler option to produce PIC]) 14991 m4_if([$1], [CXX], [ 14992 # C++ specific cases for pic, static, wl, etc. 14993 if test "$GXX" = yes; then 14994@@ -3700,6 +3943,12 @@ m4_if([$1], [CXX], [ 14995 ;; 14996 esac 14997 ;; 14998+ mingw* | cygwin* | os2* | pw32* | cegcc*) 14999+ # This hack is so that the source file can tell whether it is being 15000+ # built for inclusion in a dll (and should export symbols for example). 15001+ m4_if([$1], [GCJ], [], 15002+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 15003+ ;; 15004 dgux*) 15005 case $cc_basename in 15006 ec++*) 15007@@ -3852,7 +4101,7 @@ m4_if([$1], [CXX], [ 15008 ;; 15009 solaris*) 15010 case $cc_basename in 15011- CC*) 15012+ CC* | sunCC*) 15013 # Sun C++ 4.2, 5.x and Centerline C++ 15014 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 15015 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 15016@@ -4075,6 +4324,12 @@ m4_if([$1], [CXX], [ 15017 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' 15018 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' 15019 ;; 15020+ nagfor*) 15021+ # NAG Fortran compiler 15022+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' 15023+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' 15024+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 15025+ ;; 15026 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 15027 # Portland Group compilers (*not* the Pentium gcc compiler, 15028 # which looks to be a dead project) 15029@@ -4137,7 +4392,7 @@ m4_if([$1], [CXX], [ 15030 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 15031 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' 15032 case $cc_basename in 15033- f77* | f90* | f95*) 15034+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 15035 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; 15036 *) 15037 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; 15038@@ -4194,9 +4449,11 @@ case $host_os in 15039 _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" 15040 ;; 15041 esac 15042-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) 15043-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], 15044- [How to pass a linker flag through the compiler]) 15045+ 15046+AC_CACHE_CHECK([for $compiler option to produce PIC], 15047+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], 15048+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) 15049+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) 15050 15051 # 15052 # Check to make sure the PIC flag actually works. 15053@@ -4215,6 +4472,8 @@ fi 15054 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], 15055 [Additional compiler flags for building library objects]) 15056 15057+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], 15058+ [How to pass a linker flag through the compiler]) 15059 # 15060 # Check to make sure the static flag actually works. 15061 # 15062@@ -4235,6 +4494,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], 15063 m4_defun([_LT_LINKER_SHLIBS], 15064 [AC_REQUIRE([LT_PATH_LD])dnl 15065 AC_REQUIRE([LT_PATH_NM])dnl 15066+m4_require([_LT_PATH_MANIFEST_TOOL])dnl 15067 m4_require([_LT_FILEUTILS_DEFAULTS])dnl 15068 m4_require([_LT_DECL_EGREP])dnl 15069 m4_require([_LT_DECL_SED])dnl 15070@@ -4243,6 +4503,7 @@ m4_require([_LT_TAG_COMPILER])dnl 15071 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) 15072 m4_if([$1], [CXX], [ 15073 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 15074+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 15075 case $host_os in 15076 aix[[4-9]]*) 15077 # If we're using GNU nm, then we don't want the "-C" option. 15078@@ -4257,15 +4518,20 @@ m4_if([$1], [CXX], [ 15079 ;; 15080 pw32*) 15081 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 15082- ;; 15083+ ;; 15084 cygwin* | mingw* | cegcc*) 15085- _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' 15086- ;; 15087+ case $cc_basename in 15088+ cl*) ;; 15089+ *) 15090+ _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' 15091+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] 15092+ ;; 15093+ esac 15094+ ;; 15095 *) 15096 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 15097- ;; 15098+ ;; 15099 esac 15100- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 15101 ], [ 15102 runpath_var= 15103 _LT_TAGVAR(allow_undefined_flag, $1)= 15104@@ -4433,7 +4699,8 @@ _LT_EOF 15105 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 15106 _LT_TAGVAR(always_export_symbols, $1)=no 15107 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 15108- _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' 15109+ _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' 15110+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] 15111 15112 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 15113 _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' 15114@@ -4532,12 +4799,12 @@ _LT_EOF 15115 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' 15116 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= 15117 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' 15118- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 15119+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 15120 if test "x$supports_anon_versioning" = xyes; then 15121 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ 15122 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 15123 echo "local: *; };" >> $output_objdir/$libname.ver~ 15124- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 15125+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 15126 fi 15127 ;; 15128 esac 15129@@ -4551,8 +4818,8 @@ _LT_EOF 15130 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 15131 wlarc= 15132 else 15133- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 15134- _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' 15135+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 15136+ _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' 15137 fi 15138 ;; 15139 15140@@ -4570,8 +4837,8 @@ _LT_EOF 15141 15142 _LT_EOF 15143 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 15144- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 15145- _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' 15146+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 15147+ _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' 15148 else 15149 _LT_TAGVAR(ld_shlibs, $1)=no 15150 fi 15151@@ -4617,8 +4884,8 @@ _LT_EOF 15152 15153 *) 15154 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 15155- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 15156- _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' 15157+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 15158+ _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' 15159 else 15160 _LT_TAGVAR(ld_shlibs, $1)=no 15161 fi 15162@@ -4748,7 +5015,7 @@ _LT_EOF 15163 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 15164 # Determine the default libpath from the value encoded in an 15165 # empty executable. 15166- _LT_SYS_MODULE_PATH_AIX 15167+ _LT_SYS_MODULE_PATH_AIX([$1]) 15168 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 15169 _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" 15170 else 15171@@ -4759,7 +5026,7 @@ _LT_EOF 15172 else 15173 # Determine the default libpath from the value encoded in an 15174 # empty executable. 15175- _LT_SYS_MODULE_PATH_AIX 15176+ _LT_SYS_MODULE_PATH_AIX([$1]) 15177 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 15178 # Warning - without using the other run time loading flags, 15179 # -berok will link without error, but may produce a broken library. 15180@@ -4803,20 +5070,63 @@ _LT_EOF 15181 # Microsoft Visual C++. 15182 # hardcode_libdir_flag_spec is actually meaningless, as there is 15183 # no search path for DLLs. 15184- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 15185- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 15186- # Tell ltmain to make .lib files, not .a files. 15187- libext=lib 15188- # Tell ltmain to make .dll files, not .so files. 15189- shrext_cmds=".dll" 15190- # FIXME: Setting linknames here is a bad hack. 15191- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 15192- # The linker will automatically build a .lib file if we build a DLL. 15193- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' 15194- # FIXME: Should let the user specify the lib program. 15195- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' 15196- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' 15197- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 15198+ case $cc_basename in 15199+ cl*) 15200+ # Native MSVC 15201+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 15202+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 15203+ _LT_TAGVAR(always_export_symbols, $1)=yes 15204+ _LT_TAGVAR(file_list_spec, $1)='@' 15205+ # Tell ltmain to make .lib files, not .a files. 15206+ libext=lib 15207+ # Tell ltmain to make .dll files, not .so files. 15208+ shrext_cmds=".dll" 15209+ # FIXME: Setting linknames here is a bad hack. 15210+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 15211+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 15212+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 15213+ else 15214+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 15215+ fi~ 15216+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 15217+ linknames=' 15218+ # The linker will not automatically build a static lib if we build a DLL. 15219+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' 15220+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 15221+ _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' 15222+ # Don't use ranlib 15223+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' 15224+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ 15225+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 15226+ case $lt_outputfile in 15227+ *.exe|*.EXE) ;; 15228+ *) 15229+ lt_outputfile="$lt_outputfile.exe" 15230+ lt_tool_outputfile="$lt_tool_outputfile.exe" 15231+ ;; 15232+ esac~ 15233+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 15234+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 15235+ $RM "$lt_outputfile.manifest"; 15236+ fi' 15237+ ;; 15238+ *) 15239+ # Assume MSVC wrapper 15240+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 15241+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 15242+ # Tell ltmain to make .lib files, not .a files. 15243+ libext=lib 15244+ # Tell ltmain to make .dll files, not .so files. 15245+ shrext_cmds=".dll" 15246+ # FIXME: Setting linknames here is a bad hack. 15247+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 15248+ # The linker will automatically build a .lib file if we build a DLL. 15249+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' 15250+ # FIXME: Should let the user specify the lib program. 15251+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' 15252+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 15253+ ;; 15254+ esac 15255 ;; 15256 15257 darwin* | rhapsody*) 15258@@ -4850,7 +5160,7 @@ _LT_EOF 15259 15260 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 15261 freebsd* | dragonfly*) 15262- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 15263+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 15264 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 15265 _LT_TAGVAR(hardcode_direct, $1)=yes 15266 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 15267@@ -4858,7 +5168,7 @@ _LT_EOF 15268 15269 hpux9*) 15270 if test "$GCC" = yes; then 15271- _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' 15272+ _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' 15273 else 15274 _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' 15275 fi 15276@@ -4874,7 +5184,7 @@ _LT_EOF 15277 15278 hpux10*) 15279 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 15280- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 15281+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 15282 else 15283 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 15284 fi 15285@@ -4898,10 +5208,10 @@ _LT_EOF 15286 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 15287 ;; 15288 ia64*) 15289- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 15290+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 15291 ;; 15292 *) 15293- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 15294+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 15295 ;; 15296 esac 15297 else 15298@@ -4948,16 +5258,31 @@ _LT_EOF 15299 15300 irix5* | irix6* | nonstopux*) 15301 if test "$GCC" = yes; then 15302- _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' 15303+ _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' 15304 # Try to use the -exported_symbol ld option, if it does not 15305 # work, assume that -exports_file does not work either and 15306 # implicitly export all symbols. 15307- save_LDFLAGS="$LDFLAGS" 15308- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 15309- AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], 15310- _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' 15311- ) 15312- LDFLAGS="$save_LDFLAGS" 15313+ # This should be the same for all languages, so no per-tag cache variable. 15314+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], 15315+ [lt_cv_irix_exported_symbol], 15316+ [save_LDFLAGS="$LDFLAGS" 15317+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 15318+ AC_LINK_IFELSE( 15319+ [AC_LANG_SOURCE( 15320+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], 15321+ [C++], [[int foo (void) { return 0; }]], 15322+ [Fortran 77], [[ 15323+ subroutine foo 15324+ end]], 15325+ [Fortran], [[ 15326+ subroutine foo 15327+ end]])])], 15328+ [lt_cv_irix_exported_symbol=yes], 15329+ [lt_cv_irix_exported_symbol=no]) 15330+ LDFLAGS="$save_LDFLAGS"]) 15331+ if test "$lt_cv_irix_exported_symbol" = yes; then 15332+ _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' 15333+ fi 15334 else 15335 _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' 15336 _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' 15337@@ -5042,7 +5367,7 @@ _LT_EOF 15338 osf4* | osf5*) # as osf3* with the addition of -msym flag 15339 if test "$GCC" = yes; then 15340 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' 15341- _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' 15342+ _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' 15343 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 15344 else 15345 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' 15346@@ -5061,9 +5386,9 @@ _LT_EOF 15347 _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' 15348 if test "$GCC" = yes; then 15349 wlarc='${wl}' 15350- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 15351+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 15352 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 15353- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 15354+ $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' 15355 else 15356 case `$CC -V 2>&1` in 15357 *"Compilers 5.0"*) 15358@@ -5335,8 +5660,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], 15359 to runtime path list]) 15360 _LT_TAGDECL([], [link_all_deplibs], [0], 15361 [Whether libtool must link a program against all its dependency libraries]) 15362-_LT_TAGDECL([], [fix_srcfile_path], [1], 15363- [Fix the shell variable $srcfile for the compiler]) 15364 _LT_TAGDECL([], [always_export_symbols], [0], 15365 [Set to "yes" if exported symbols are required]) 15366 _LT_TAGDECL([], [export_symbols_cmds], [2], 15367@@ -5347,6 +5670,8 @@ _LT_TAGDECL([], [include_expsyms], [1], 15368 [Symbols that must always be exported]) 15369 _LT_TAGDECL([], [prelink_cmds], [2], 15370 [Commands necessary for linking programs (against libraries) with templates]) 15371+_LT_TAGDECL([], [postlink_cmds], [2], 15372+ [Commands necessary for finishing linking programs]) 15373 _LT_TAGDECL([], [file_list_spec], [1], 15374 [Specify filename containing input files]) 15375 dnl FIXME: Not yet implemented 15376@@ -5448,6 +5773,7 @@ CC="$lt_save_CC" 15377 m4_defun([_LT_LANG_CXX_CONFIG], 15378 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 15379 m4_require([_LT_DECL_EGREP])dnl 15380+m4_require([_LT_PATH_MANIFEST_TOOL])dnl 15381 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 15382 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 15383 (test "X$CXX" != "Xg++"))) ; then 15384@@ -5509,6 +5835,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15385 15386 # Allow CC to be a program name with arguments. 15387 lt_save_CC=$CC 15388+ lt_save_CFLAGS=$CFLAGS 15389 lt_save_LD=$LD 15390 lt_save_GCC=$GCC 15391 GCC=$GXX 15392@@ -5526,6 +5853,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15393 fi 15394 test -z "${LDCXX+set}" || LD=$LDCXX 15395 CC=${CXX-"c++"} 15396+ CFLAGS=$CXXFLAGS 15397 compiler=$CC 15398 _LT_TAGVAR(compiler, $1)=$CC 15399 _LT_CC_BASENAME([$compiler]) 15400@@ -5689,7 +6017,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15401 _LT_TAGVAR(allow_undefined_flag, $1)='-berok' 15402 # Determine the default libpath from the value encoded in an empty 15403 # executable. 15404- _LT_SYS_MODULE_PATH_AIX 15405+ _LT_SYS_MODULE_PATH_AIX([$1]) 15406 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 15407 15408 _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" 15409@@ -5701,7 +6029,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15410 else 15411 # Determine the default libpath from the value encoded in an 15412 # empty executable. 15413- _LT_SYS_MODULE_PATH_AIX 15414+ _LT_SYS_MODULE_PATH_AIX([$1]) 15415 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" 15416 # Warning - without using the other run time loading flags, 15417 # -berok will link without error, but may produce a broken library. 15418@@ -5743,29 +6071,75 @@ if test "$_lt_caught_CXX_error" != yes; then 15419 ;; 15420 15421 cygwin* | mingw* | pw32* | cegcc*) 15422- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 15423- # as there is no search path for DLLs. 15424- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 15425- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' 15426- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 15427- _LT_TAGVAR(always_export_symbols, $1)=no 15428- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 15429- 15430- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 15431- _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' 15432- # If the export-symbols file already is a .def file (1st line 15433- # is EXPORTS), use it as is; otherwise, prepend... 15434- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 15435- cp $export_symbols $output_objdir/$soname.def; 15436- else 15437- echo EXPORTS > $output_objdir/$soname.def; 15438- cat $export_symbols >> $output_objdir/$soname.def; 15439- fi~ 15440- $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' 15441- else 15442- _LT_TAGVAR(ld_shlibs, $1)=no 15443- fi 15444- ;; 15445+ case $GXX,$cc_basename in 15446+ ,cl* | no,cl*) 15447+ # Native MSVC 15448+ # hardcode_libdir_flag_spec is actually meaningless, as there is 15449+ # no search path for DLLs. 15450+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' 15451+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 15452+ _LT_TAGVAR(always_export_symbols, $1)=yes 15453+ _LT_TAGVAR(file_list_spec, $1)='@' 15454+ # Tell ltmain to make .lib files, not .a files. 15455+ libext=lib 15456+ # Tell ltmain to make .dll files, not .so files. 15457+ shrext_cmds=".dll" 15458+ # FIXME: Setting linknames here is a bad hack. 15459+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 15460+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 15461+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 15462+ else 15463+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 15464+ fi~ 15465+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 15466+ linknames=' 15467+ # The linker will not automatically build a static lib if we build a DLL. 15468+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' 15469+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 15470+ # Don't use ranlib 15471+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' 15472+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ 15473+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 15474+ case $lt_outputfile in 15475+ *.exe|*.EXE) ;; 15476+ *) 15477+ lt_outputfile="$lt_outputfile.exe" 15478+ lt_tool_outputfile="$lt_tool_outputfile.exe" 15479+ ;; 15480+ esac~ 15481+ func_to_tool_file "$lt_outputfile"~ 15482+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 15483+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 15484+ $RM "$lt_outputfile.manifest"; 15485+ fi' 15486+ ;; 15487+ *) 15488+ # g++ 15489+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 15490+ # as there is no search path for DLLs. 15491+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 15492+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' 15493+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported 15494+ _LT_TAGVAR(always_export_symbols, $1)=no 15495+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes 15496+ 15497+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 15498+ _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' 15499+ # If the export-symbols file already is a .def file (1st line 15500+ # is EXPORTS), use it as is; otherwise, prepend... 15501+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 15502+ cp $export_symbols $output_objdir/$soname.def; 15503+ else 15504+ echo EXPORTS > $output_objdir/$soname.def; 15505+ cat $export_symbols >> $output_objdir/$soname.def; 15506+ fi~ 15507+ $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' 15508+ else 15509+ _LT_TAGVAR(ld_shlibs, $1)=no 15510+ fi 15511+ ;; 15512+ esac 15513+ ;; 15514 darwin* | rhapsody*) 15515 _LT_DARWIN_LINKER_FEATURES($1) 15516 ;; 15517@@ -5840,7 +6214,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15518 ;; 15519 *) 15520 if test "$GXX" = yes; then 15521- _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' 15522+ _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' 15523 else 15524 # FIXME: insert proper C++ library support 15525 _LT_TAGVAR(ld_shlibs, $1)=no 15526@@ -5911,10 +6285,10 @@ if test "$_lt_caught_CXX_error" != yes; then 15527 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' 15528 ;; 15529 ia64*) 15530- _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' 15531+ _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' 15532 ;; 15533 *) 15534- _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' 15535+ _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' 15536 ;; 15537 esac 15538 fi 15539@@ -5955,9 +6329,9 @@ if test "$_lt_caught_CXX_error" != yes; then 15540 *) 15541 if test "$GXX" = yes; then 15542 if test "$with_gnu_ld" = no; then 15543- _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' 15544+ _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' 15545 else 15546- _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' 15547+ _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' 15548 fi 15549 fi 15550 _LT_TAGVAR(link_all_deplibs, $1)=yes 15551@@ -6027,20 +6401,20 @@ if test "$_lt_caught_CXX_error" != yes; then 15552 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ 15553 rm -rf $tpldir~ 15554 $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ 15555- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' 15556+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' 15557 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ 15558 rm -rf $tpldir~ 15559 $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ 15560- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ 15561+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ 15562 $RANLIB $oldlib' 15563 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ 15564 rm -rf $tpldir~ 15565 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 15566- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 15567+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 15568 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ 15569 rm -rf $tpldir~ 15570 $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ 15571- $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' 15572+ $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' 15573 ;; 15574 *) # Version 6 and above use weak symbols 15575 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' 15576@@ -6235,7 +6609,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15577 _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' 15578 ;; 15579 *) 15580- _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' 15581+ _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' 15582 ;; 15583 esac 15584 15585@@ -6281,7 +6655,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15586 15587 solaris*) 15588 case $cc_basename in 15589- CC*) 15590+ CC* | sunCC*) 15591 # Sun C++ 4.2, 5.x and Centerline C++ 15592 _LT_TAGVAR(archive_cmds_need_lc,$1)=yes 15593 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' 15594@@ -6322,9 +6696,9 @@ if test "$_lt_caught_CXX_error" != yes; then 15595 if test "$GXX" = yes && test "$with_gnu_ld" = no; then 15596 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' 15597 if $CC --version | $GREP -v '^2\.7' > /dev/null; then 15598- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' 15599+ _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' 15600 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 15601- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 15602+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' 15603 15604 # Commands to make compiler produce verbose output that lists 15605 # what "hidden" libraries, object files and flags are used when 15606@@ -6453,6 +6827,7 @@ if test "$_lt_caught_CXX_error" != yes; then 15607 fi # test -n "$compiler" 15608 15609 CC=$lt_save_CC 15610+ CFLAGS=$lt_save_CFLAGS 15611 LDCXX=$LD 15612 LD=$lt_save_LD 15613 GCC=$lt_save_GCC 15614@@ -6467,6 +6842,29 @@ AC_LANG_POP 15615 ])# _LT_LANG_CXX_CONFIG 15616 15617 15618+# _LT_FUNC_STRIPNAME_CNF 15619+# ---------------------- 15620+# func_stripname_cnf prefix suffix name 15621+# strip PREFIX and SUFFIX off of NAME. 15622+# PREFIX and SUFFIX must not contain globbing or regex special 15623+# characters, hashes, percent signs, but SUFFIX may contain a leading 15624+# dot (in which case that matches only a dot). 15625+# 15626+# This function is identical to the (non-XSI) version of func_stripname, 15627+# except this one can be used by m4 code that may be executed by configure, 15628+# rather than the libtool script. 15629+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl 15630+AC_REQUIRE([_LT_DECL_SED]) 15631+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) 15632+func_stripname_cnf () 15633+{ 15634+ case ${2} in 15635+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 15636+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 15637+ esac 15638+} # func_stripname_cnf 15639+])# _LT_FUNC_STRIPNAME_CNF 15640+ 15641 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) 15642 # --------------------------------- 15643 # Figure out "hidden" library dependencies from verbose 15644@@ -6475,6 +6873,7 @@ AC_LANG_POP 15645 # objects, libraries and library flags. 15646 m4_defun([_LT_SYS_HIDDEN_LIBDEPS], 15647 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl 15648+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl 15649 # Dependencies to place before and after the object being linked: 15650 _LT_TAGVAR(predep_objects, $1)= 15651 _LT_TAGVAR(postdep_objects, $1)= 15652@@ -6525,6 +6924,13 @@ public class foo { 15653 }; 15654 _LT_EOF 15655 ]) 15656+ 15657+_lt_libdeps_save_CFLAGS=$CFLAGS 15658+case "$CC $CFLAGS " in #( 15659+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; 15660+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; 15661+esac 15662+ 15663 dnl Parse the compiler output and extract the necessary 15664 dnl objects, libraries and library flags. 15665 if AC_TRY_EVAL(ac_compile); then 15666@@ -6536,7 +6942,7 @@ if AC_TRY_EVAL(ac_compile); then 15667 pre_test_object_deps_done=no 15668 15669 for p in `eval "$output_verbose_link_cmd"`; do 15670- case $p in 15671+ case ${prev}${p} in 15672 15673 -L* | -R* | -l*) 15674 # Some compilers place space between "-{L,R}" and the path. 15675@@ -6545,13 +6951,22 @@ if AC_TRY_EVAL(ac_compile); then 15676 test $p = "-R"; then 15677 prev=$p 15678 continue 15679- else 15680- prev= 15681 fi 15682 15683+ # Expand the sysroot to ease extracting the directories later. 15684+ if test -z "$prev"; then 15685+ case $p in 15686+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; 15687+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; 15688+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; 15689+ esac 15690+ fi 15691+ case $p in 15692+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; 15693+ esac 15694 if test "$pre_test_object_deps_done" = no; then 15695- case $p in 15696- -L* | -R*) 15697+ case ${prev} in 15698+ -L | -R) 15699 # Internal compiler library paths should come after those 15700 # provided the user. The postdeps already come after the 15701 # user supplied libs so there is no need to process them. 15702@@ -6571,8 +6986,10 @@ if AC_TRY_EVAL(ac_compile); then 15703 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" 15704 fi 15705 fi 15706+ prev= 15707 ;; 15708 15709+ *.lto.$objext) ;; # Ignore GCC LTO objects 15710 *.$objext) 15711 # This assumes that the test object file only shows up 15712 # once in the compiler output. 15713@@ -6608,6 +7025,7 @@ else 15714 fi 15715 15716 $RM -f confest.$objext 15717+CFLAGS=$_lt_libdeps_save_CFLAGS 15718 15719 # PORTME: override above test on systems where it is broken 15720 m4_if([$1], [CXX], 15721@@ -6644,7 +7062,7 @@ linux*) 15722 15723 solaris*) 15724 case $cc_basename in 15725- CC*) 15726+ CC* | sunCC*) 15727 # The more standards-conforming stlport4 library is 15728 # incompatible with the Cstd library. Avoid specifying 15729 # it if it's in CXXFLAGS. Ignore libCrun as 15730@@ -6757,7 +7175,9 @@ if test "$_lt_disable_F77" != yes; then 15731 # Allow CC to be a program name with arguments. 15732 lt_save_CC="$CC" 15733 lt_save_GCC=$GCC 15734+ lt_save_CFLAGS=$CFLAGS 15735 CC=${F77-"f77"} 15736+ CFLAGS=$FFLAGS 15737 compiler=$CC 15738 _LT_TAGVAR(compiler, $1)=$CC 15739 _LT_CC_BASENAME([$compiler]) 15740@@ -6811,6 +7231,7 @@ if test "$_lt_disable_F77" != yes; then 15741 15742 GCC=$lt_save_GCC 15743 CC="$lt_save_CC" 15744+ CFLAGS="$lt_save_CFLAGS" 15745 fi # test "$_lt_disable_F77" != yes 15746 15747 AC_LANG_POP 15748@@ -6887,7 +7308,9 @@ if test "$_lt_disable_FC" != yes; then 15749 # Allow CC to be a program name with arguments. 15750 lt_save_CC="$CC" 15751 lt_save_GCC=$GCC 15752+ lt_save_CFLAGS=$CFLAGS 15753 CC=${FC-"f95"} 15754+ CFLAGS=$FCFLAGS 15755 compiler=$CC 15756 GCC=$ac_cv_fc_compiler_gnu 15757 15758@@ -6943,7 +7366,8 @@ if test "$_lt_disable_FC" != yes; then 15759 fi # test -n "$compiler" 15760 15761 GCC=$lt_save_GCC 15762- CC="$lt_save_CC" 15763+ CC=$lt_save_CC 15764+ CFLAGS=$lt_save_CFLAGS 15765 fi # test "$_lt_disable_FC" != yes 15766 15767 AC_LANG_POP 15768@@ -6980,10 +7404,12 @@ _LT_COMPILER_BOILERPLATE 15769 _LT_LINKER_BOILERPLATE 15770 15771 # Allow CC to be a program name with arguments. 15772-lt_save_CC="$CC" 15773+lt_save_CC=$CC 15774+lt_save_CFLAGS=$CFLAGS 15775 lt_save_GCC=$GCC 15776 GCC=yes 15777 CC=${GCJ-"gcj"} 15778+CFLAGS=$GCJFLAGS 15779 compiler=$CC 15780 _LT_TAGVAR(compiler, $1)=$CC 15781 _LT_TAGVAR(LD, $1)="$LD" 15782@@ -7014,7 +7440,8 @@ fi 15783 AC_LANG_RESTORE 15784 15785 GCC=$lt_save_GCC 15786-CC="$lt_save_CC" 15787+CC=$lt_save_CC 15788+CFLAGS=$lt_save_CFLAGS 15789 ])# _LT_LANG_GCJ_CONFIG 15790 15791 15792@@ -7049,9 +7476,11 @@ _LT_LINKER_BOILERPLATE 15793 15794 # Allow CC to be a program name with arguments. 15795 lt_save_CC="$CC" 15796+lt_save_CFLAGS=$CFLAGS 15797 lt_save_GCC=$GCC 15798 GCC= 15799 CC=${RC-"windres"} 15800+CFLAGS= 15801 compiler=$CC 15802 _LT_TAGVAR(compiler, $1)=$CC 15803 _LT_CC_BASENAME([$compiler]) 15804@@ -7064,7 +7493,8 @@ fi 15805 15806 GCC=$lt_save_GCC 15807 AC_LANG_RESTORE 15808-CC="$lt_save_CC" 15809+CC=$lt_save_CC 15810+CFLAGS=$lt_save_CFLAGS 15811 ])# _LT_LANG_RC_CONFIG 15812 15813 15814@@ -7123,6 +7553,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) 15815 AC_SUBST([OBJDUMP]) 15816 ]) 15817 15818+# _LT_DECL_DLLTOOL 15819+# ---------------- 15820+# Ensure DLLTOOL variable is set. 15821+m4_defun([_LT_DECL_DLLTOOL], 15822+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) 15823+test -z "$DLLTOOL" && DLLTOOL=dlltool 15824+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) 15825+AC_SUBST([DLLTOOL]) 15826+]) 15827 15828 # _LT_DECL_SED 15829 # ------------ 15830@@ -7216,8 +7655,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], 15831 # Try some XSI features 15832 xsi_shell=no 15833 ( _lt_dummy="a/b/c" 15834- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 15835- = c,a/b,, \ 15836+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 15837+ = c,a/b,b/c, \ 15838 && eval 'test $(( 1 + 1 )) -eq 2 \ 15839 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 15840 && xsi_shell=yes 15841@@ -7256,206 +7695,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl 15842 ])# _LT_CHECK_SHELL_FEATURES 15843 15844 15845-# _LT_PROG_XSI_SHELLFNS 15846-# --------------------- 15847-# Bourne and XSI compatible variants of some useful shell functions. 15848-m4_defun([_LT_PROG_XSI_SHELLFNS], 15849-[case $xsi_shell in 15850- yes) 15851- cat << \_LT_EOF >> "$cfgfile" 15852- 15853-# func_dirname file append nondir_replacement 15854-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 15855-# otherwise set result to NONDIR_REPLACEMENT. 15856-func_dirname () 15857-{ 15858- case ${1} in 15859- */*) func_dirname_result="${1%/*}${2}" ;; 15860- * ) func_dirname_result="${3}" ;; 15861- esac 15862-} 15863- 15864-# func_basename file 15865-func_basename () 15866-{ 15867- func_basename_result="${1##*/}" 15868-} 15869- 15870-# func_dirname_and_basename file append nondir_replacement 15871-# perform func_basename and func_dirname in a single function 15872-# call: 15873-# dirname: Compute the dirname of FILE. If nonempty, 15874-# add APPEND to the result, otherwise set result 15875-# to NONDIR_REPLACEMENT. 15876-# value returned in "$func_dirname_result" 15877-# basename: Compute filename of FILE. 15878-# value retuned in "$func_basename_result" 15879-# Implementation must be kept synchronized with func_dirname 15880-# and func_basename. For efficiency, we do not delegate to 15881-# those functions but instead duplicate the functionality here. 15882-func_dirname_and_basename () 15883-{ 15884- case ${1} in 15885- */*) func_dirname_result="${1%/*}${2}" ;; 15886- * ) func_dirname_result="${3}" ;; 15887- esac 15888- func_basename_result="${1##*/}" 15889-} 15890- 15891-# func_stripname prefix suffix name 15892-# strip PREFIX and SUFFIX off of NAME. 15893-# PREFIX and SUFFIX must not contain globbing or regex special 15894-# characters, hashes, percent signs, but SUFFIX may contain a leading 15895-# dot (in which case that matches only a dot). 15896-func_stripname () 15897-{ 15898- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 15899- # positional parameters, so assign one to ordinary parameter first. 15900- func_stripname_result=${3} 15901- func_stripname_result=${func_stripname_result#"${1}"} 15902- func_stripname_result=${func_stripname_result%"${2}"} 15903-} 15904- 15905-# func_opt_split 15906-func_opt_split () 15907-{ 15908- func_opt_split_opt=${1%%=*} 15909- func_opt_split_arg=${1#*=} 15910-} 15911- 15912-# func_lo2o object 15913-func_lo2o () 15914-{ 15915- case ${1} in 15916- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 15917- *) func_lo2o_result=${1} ;; 15918- esac 15919-} 15920- 15921-# func_xform libobj-or-source 15922-func_xform () 15923-{ 15924- func_xform_result=${1%.*}.lo 15925-} 15926- 15927-# func_arith arithmetic-term... 15928-func_arith () 15929-{ 15930- func_arith_result=$(( $[*] )) 15931-} 15932- 15933-# func_len string 15934-# STRING may not start with a hyphen. 15935-func_len () 15936-{ 15937- func_len_result=${#1} 15938-} 15939+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) 15940+# ------------------------------------------------------ 15941+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and 15942+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. 15943+m4_defun([_LT_PROG_FUNCTION_REPLACE], 15944+[dnl { 15945+sed -e '/^$1 ()$/,/^} # $1 /c\ 15946+$1 ()\ 15947+{\ 15948+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) 15949+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ 15950+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 15951+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 15952+test 0 -eq $? || _lt_function_replace_fail=: 15953+]) 15954 15955-_LT_EOF 15956- ;; 15957- *) # Bourne compatible functions. 15958- cat << \_LT_EOF >> "$cfgfile" 15959 15960-# func_dirname file append nondir_replacement 15961-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 15962-# otherwise set result to NONDIR_REPLACEMENT. 15963-func_dirname () 15964-{ 15965- # Extract subdirectory from the argument. 15966- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 15967- if test "X$func_dirname_result" = "X${1}"; then 15968- func_dirname_result="${3}" 15969- else 15970- func_dirname_result="$func_dirname_result${2}" 15971- fi 15972-} 15973+# _LT_PROG_REPLACE_SHELLFNS 15974+# ------------------------- 15975+# Replace existing portable implementations of several shell functions with 15976+# equivalent extended shell implementations where those features are available.. 15977+m4_defun([_LT_PROG_REPLACE_SHELLFNS], 15978+[if test x"$xsi_shell" = xyes; then 15979+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl 15980+ case ${1} in 15981+ */*) func_dirname_result="${1%/*}${2}" ;; 15982+ * ) func_dirname_result="${3}" ;; 15983+ esac]) 15984+ 15985+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl 15986+ func_basename_result="${1##*/}"]) 15987+ 15988+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl 15989+ case ${1} in 15990+ */*) func_dirname_result="${1%/*}${2}" ;; 15991+ * ) func_dirname_result="${3}" ;; 15992+ esac 15993+ func_basename_result="${1##*/}"]) 15994 15995-# func_basename file 15996-func_basename () 15997-{ 15998- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 15999-} 16000+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl 16001+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 16002+ # positional parameters, so assign one to ordinary parameter first. 16003+ func_stripname_result=${3} 16004+ func_stripname_result=${func_stripname_result#"${1}"} 16005+ func_stripname_result=${func_stripname_result%"${2}"}]) 16006 16007-dnl func_dirname_and_basename 16008-dnl A portable version of this function is already defined in general.m4sh 16009-dnl so there is no need for it here. 16010+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl 16011+ func_split_long_opt_name=${1%%=*} 16012+ func_split_long_opt_arg=${1#*=}]) 16013 16014-# func_stripname prefix suffix name 16015-# strip PREFIX and SUFFIX off of NAME. 16016-# PREFIX and SUFFIX must not contain globbing or regex special 16017-# characters, hashes, percent signs, but SUFFIX may contain a leading 16018-# dot (in which case that matches only a dot). 16019-# func_strip_suffix prefix name 16020-func_stripname () 16021-{ 16022- case ${2} in 16023- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 16024- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 16025- esac 16026-} 16027+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl 16028+ func_split_short_opt_arg=${1#??} 16029+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) 16030 16031-# sed scripts: 16032-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' 16033-my_sed_long_arg='1s/^-[[^=]]*=//' 16034+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl 16035+ case ${1} in 16036+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 16037+ *) func_lo2o_result=${1} ;; 16038+ esac]) 16039 16040-# func_opt_split 16041-func_opt_split () 16042-{ 16043- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 16044- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 16045-} 16046+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) 16047 16048-# func_lo2o object 16049-func_lo2o () 16050-{ 16051- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 16052-} 16053+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) 16054 16055-# func_xform libobj-or-source 16056-func_xform () 16057-{ 16058- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` 16059-} 16060+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) 16061+fi 16062 16063-# func_arith arithmetic-term... 16064-func_arith () 16065-{ 16066- func_arith_result=`expr "$[@]"` 16067-} 16068+if test x"$lt_shell_append" = xyes; then 16069+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) 16070 16071-# func_len string 16072-# STRING may not start with a hyphen. 16073-func_len () 16074-{ 16075- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` 16076-} 16077+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl 16078+ func_quote_for_eval "${2}" 16079+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ 16080+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) 16081 16082-_LT_EOF 16083-esac 16084+ # Save a `func_append' function call where possible by direct use of '+=' 16085+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 16086+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 16087+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 16088+ test 0 -eq $? || _lt_function_replace_fail=: 16089+else 16090+ # Save a `func_append' function call even when '+=' is not available 16091+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 16092+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 16093+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 16094+ test 0 -eq $? || _lt_function_replace_fail=: 16095+fi 16096 16097-case $lt_shell_append in 16098- yes) 16099- cat << \_LT_EOF >> "$cfgfile" 16100+if test x"$_lt_function_replace_fail" = x":"; then 16101+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) 16102+fi 16103+]) 16104 16105-# func_append var value 16106-# Append VALUE to the end of shell variable VAR. 16107-func_append () 16108-{ 16109- eval "$[1]+=\$[2]" 16110-} 16111-_LT_EOF 16112+# _LT_PATH_CONVERSION_FUNCTIONS 16113+# ----------------------------- 16114+# Determine which file name conversion functions should be used by 16115+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed 16116+# for certain cross-compile configurations and native mingw. 16117+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], 16118+[AC_REQUIRE([AC_CANONICAL_HOST])dnl 16119+AC_REQUIRE([AC_CANONICAL_BUILD])dnl 16120+AC_MSG_CHECKING([how to convert $build file names to $host format]) 16121+AC_CACHE_VAL(lt_cv_to_host_file_cmd, 16122+[case $host in 16123+ *-*-mingw* ) 16124+ case $build in 16125+ *-*-mingw* ) # actually msys 16126+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 16127+ ;; 16128+ *-*-cygwin* ) 16129+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 16130+ ;; 16131+ * ) # otherwise, assume *nix 16132+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 16133+ ;; 16134+ esac 16135 ;; 16136- *) 16137- cat << \_LT_EOF >> "$cfgfile" 16138- 16139-# func_append var value 16140-# Append VALUE to the end of shell variable VAR. 16141-func_append () 16142-{ 16143- eval "$[1]=\$$[1]\$[2]" 16144-} 16145- 16146-_LT_EOF 16147+ *-*-cygwin* ) 16148+ case $build in 16149+ *-*-mingw* ) # actually msys 16150+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 16151+ ;; 16152+ *-*-cygwin* ) 16153+ lt_cv_to_host_file_cmd=func_convert_file_noop 16154+ ;; 16155+ * ) # otherwise, assume *nix 16156+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 16157+ ;; 16158+ esac 16159 ;; 16160- esac 16161+ * ) # unhandled hosts (and "normal" native builds) 16162+ lt_cv_to_host_file_cmd=func_convert_file_noop 16163+ ;; 16164+esac 16165+]) 16166+to_host_file_cmd=$lt_cv_to_host_file_cmd 16167+AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) 16168+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], 16169+ [0], [convert $build file names to $host format])dnl 16170+ 16171+AC_MSG_CHECKING([how to convert $build file names to toolchain format]) 16172+AC_CACHE_VAL(lt_cv_to_tool_file_cmd, 16173+[#assume ordinary cross tools, or native build. 16174+lt_cv_to_tool_file_cmd=func_convert_file_noop 16175+case $host in 16176+ *-*-mingw* ) 16177+ case $build in 16178+ *-*-mingw* ) # actually msys 16179+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 16180+ ;; 16181+ esac 16182+ ;; 16183+esac 16184 ]) 16185+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 16186+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) 16187+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], 16188+ [0], [convert $build files to toolchain format])dnl 16189+])# _LT_PATH_CONVERSION_FUNCTIONS 16190diff --git a/ltmain.sh b/ltmain.sh 16191index 9503ec85d70..70e856e0659 100644 16192--- a/ltmain.sh 16193+++ b/ltmain.sh 16194@@ -1,10 +1,9 @@ 16195-# Generated from ltmain.m4sh. 16196 16197-# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a 16198+# libtool (GNU libtool) 2.4 16199 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 16200 16201 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 16202-# 2007, 2008, 2009 Free Software Foundation, Inc. 16203+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 16204 # This is free software; see the source for copying conditions. There is NO 16205 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 16206 16207@@ -38,7 +37,6 @@ 16208 # -n, --dry-run display commands without modifying any files 16209 # --features display basic configuration information and exit 16210 # --mode=MODE use operation mode MODE 16211-# --no-finish let install mode avoid finish commands 16212 # --preserve-dup-deps don't remove duplicate dependency libraries 16213 # --quiet, --silent don't print informational messages 16214 # --no-quiet, --no-silent 16215@@ -71,17 +69,19 @@ 16216 # compiler: $LTCC 16217 # compiler flags: $LTCFLAGS 16218 # linker: $LD (gnu? $with_gnu_ld) 16219-# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a 16220+# $progname: (GNU libtool) 2.4 16221 # automake: $automake_version 16222 # autoconf: $autoconf_version 16223 # 16224 # Report bugs to <bug-libtool@gnu.org>. 16225+# GNU libtool home page: <http://www.gnu.org/software/libtool/>. 16226+# General help using GNU software: <http://www.gnu.org/gethelp/>. 16227 16228 PROGRAM=libtool 16229 PACKAGE=libtool 16230-VERSION=2.2.7a 16231-TIMESTAMP=" 1.3134 2009-11-29" 16232-package_revision=1.3134 16233+VERSION=2.4 16234+TIMESTAMP="" 16235+package_revision=1.3293 16236 16237 # Be Bourne compatible 16238 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 16239@@ -106,9 +106,6 @@ _LTECHO_EOF' 16240 } 16241 16242 # NLS nuisances: We save the old values to restore during execute mode. 16243-# Only set LANG and LC_ALL to C if already set. 16244-# These must not be set unconditionally because not all systems understand 16245-# e.g. LANG=C (notably SCO). 16246 lt_user_locale= 16247 lt_safe_locale= 16248 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 16249@@ -121,15 +118,13 @@ do 16250 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" 16251 fi" 16252 done 16253+LC_ALL=C 16254+LANGUAGE=C 16255+export LANGUAGE LC_ALL 16256 16257 $lt_unset CDPATH 16258 16259 16260- 16261- 16262- 16263- 16264- 16265 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh 16266 # is ksh but when the shell is invoked as "sh" and the current value of 16267 # the _XPG environment variable is not equal to 1 (one), the special 16268@@ -140,7 +135,7 @@ progpath="$0" 16269 16270 16271 : ${CP="cp -f"} 16272-: ${ECHO=$as_echo} 16273+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} 16274 : ${EGREP="/bin/grep -E"} 16275 : ${FGREP="/bin/grep -F"} 16276 : ${GREP="/bin/grep"} 16277@@ -149,7 +144,7 @@ progpath="$0" 16278 : ${MKDIR="mkdir"} 16279 : ${MV="mv -f"} 16280 : ${RM="rm -f"} 16281-: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} 16282+: ${SED="/bin/sed"} 16283 : ${SHELL="${CONFIG_SHELL-/bin/sh}"} 16284 : ${Xsed="$SED -e 1s/^X//"} 16285 16286@@ -169,6 +164,27 @@ IFS=" $lt_nl" 16287 dirname="s,/[^/]*$,," 16288 basename="s,^.*/,," 16289 16290+# func_dirname file append nondir_replacement 16291+# Compute the dirname of FILE. If nonempty, add APPEND to the result, 16292+# otherwise set result to NONDIR_REPLACEMENT. 16293+func_dirname () 16294+{ 16295+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 16296+ if test "X$func_dirname_result" = "X${1}"; then 16297+ func_dirname_result="${3}" 16298+ else 16299+ func_dirname_result="$func_dirname_result${2}" 16300+ fi 16301+} # func_dirname may be replaced by extended shell implementation 16302+ 16303+ 16304+# func_basename file 16305+func_basename () 16306+{ 16307+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` 16308+} # func_basename may be replaced by extended shell implementation 16309+ 16310+ 16311 # func_dirname_and_basename file append nondir_replacement 16312 # perform func_basename and func_dirname in a single function 16313 # call: 16314@@ -183,17 +199,31 @@ basename="s,^.*/,," 16315 # those functions but instead duplicate the functionality here. 16316 func_dirname_and_basename () 16317 { 16318- # Extract subdirectory from the argument. 16319- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` 16320- if test "X$func_dirname_result" = "X${1}"; then 16321- func_dirname_result="${3}" 16322- else 16323- func_dirname_result="$func_dirname_result${2}" 16324- fi 16325- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` 16326-} 16327+ # Extract subdirectory from the argument. 16328+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` 16329+ if test "X$func_dirname_result" = "X${1}"; then 16330+ func_dirname_result="${3}" 16331+ else 16332+ func_dirname_result="$func_dirname_result${2}" 16333+ fi 16334+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` 16335+} # func_dirname_and_basename may be replaced by extended shell implementation 16336+ 16337+ 16338+# func_stripname prefix suffix name 16339+# strip PREFIX and SUFFIX off of NAME. 16340+# PREFIX and SUFFIX must not contain globbing or regex special 16341+# characters, hashes, percent signs, but SUFFIX may contain a leading 16342+# dot (in which case that matches only a dot). 16343+# func_strip_suffix prefix name 16344+func_stripname () 16345+{ 16346+ case ${2} in 16347+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 16348+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 16349+ esac 16350+} # func_stripname may be replaced by extended shell implementation 16351 16352-# Generated shell functions inserted here. 16353 16354 # These SED scripts presuppose an absolute path with a trailing slash. 16355 pathcar='s,^/\([^/]*\).*$,\1,' 16356@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' 16357 # Same as above, but do not quote variable references. 16358 double_quote_subst='s/\(["`\\]\)/\\\1/g' 16359 16360+# Sed substitution that turns a string into a regex matching for the 16361+# string literally. 16362+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' 16363+ 16364+# Sed substitution that converts a w32 file name or path 16365+# which contains forward slashes, into one that contains 16366+# (escaped) backslashes. A very naive implementation. 16367+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' 16368+ 16369 # Re-`\' parameter expansions in output of double_quote_subst that were 16370 # `\'-ed in input to the same. If an odd number of `\' preceded a '$' 16371 # in input to double_quote_subst, that '$' was protected from expansion. 16372@@ -404,7 +443,7 @@ opt_warning=: 16373 # name if it has been set yet. 16374 func_echo () 16375 { 16376- $ECHO "$progname${mode+: }$mode: $*" 16377+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" 16378 } 16379 16380 # func_verbose arg... 16381@@ -430,14 +469,14 @@ func_echo_all () 16382 # Echo program name prefixed message to standard error. 16383 func_error () 16384 { 16385- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 16386+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 16387 } 16388 16389 # func_warning arg... 16390 # Echo program name prefixed warning message to standard error. 16391 func_warning () 16392 { 16393- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 16394+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 16395 16396 # bash bug again: 16397 : 16398@@ -656,19 +695,35 @@ func_show_eval_locale () 16399 fi 16400 } 16401 16402- 16403- 16404+# func_tr_sh 16405+# Turn $1 into a string suitable for a shell variable name. 16406+# Result is stored in $func_tr_sh_result. All characters 16407+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, 16408+# if $1 begins with a digit, a '_' is prepended as well. 16409+func_tr_sh () 16410+{ 16411+ case $1 in 16412+ [0-9]* | *[!a-zA-Z0-9_]*) 16413+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` 16414+ ;; 16415+ * ) 16416+ func_tr_sh_result=$1 16417+ ;; 16418+ esac 16419+} 16420 16421 16422 # func_version 16423 # Echo version message to standard output and exit. 16424 func_version () 16425 { 16426+ $opt_debug 16427+ 16428 $SED -n '/(C)/!b go 16429 :more 16430 /\./!{ 16431 N 16432- s/\n# // 16433+ s/\n# / / 16434 b more 16435 } 16436 :go 16437@@ -685,7 +740,9 @@ func_version () 16438 # Echo short help message to standard output and exit. 16439 func_usage () 16440 { 16441- $SED -n '/^# Usage:/,/^# *-h/ { 16442+ $opt_debug 16443+ 16444+ $SED -n '/^# Usage:/,/^# *.*--help/ { 16445 s/^# // 16446 s/^# *$// 16447 s/\$progname/'$progname'/ 16448@@ -701,7 +758,10 @@ func_usage () 16449 # unless 'noexit' is passed as argument. 16450 func_help () 16451 { 16452+ $opt_debug 16453+ 16454 $SED -n '/^# Usage:/,/# Report bugs to/ { 16455+ :print 16456 s/^# // 16457 s/^# *$// 16458 s*\$progname*'$progname'* 16459@@ -714,7 +774,11 @@ func_help () 16460 s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ 16461 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ 16462 p 16463- }' < "$progpath" 16464+ d 16465+ } 16466+ /^# .* home page:/b print 16467+ /^# General help using/b print 16468+ ' < "$progpath" 16469 ret=$? 16470 if test -z "$1"; then 16471 exit $ret 16472@@ -726,12 +790,39 @@ func_help () 16473 # exit_cmd. 16474 func_missing_arg () 16475 { 16476- func_error "missing argument for $1" 16477+ $opt_debug 16478+ 16479+ func_error "missing argument for $1." 16480 exit_cmd=exit 16481 } 16482 16483-exit_cmd=: 16484 16485+# func_split_short_opt shortopt 16486+# Set func_split_short_opt_name and func_split_short_opt_arg shell 16487+# variables after splitting SHORTOPT after the 2nd character. 16488+func_split_short_opt () 16489+{ 16490+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' 16491+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' 16492+ 16493+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` 16494+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` 16495+} # func_split_short_opt may be replaced by extended shell implementation 16496+ 16497+ 16498+# func_split_long_opt longopt 16499+# Set func_split_long_opt_name and func_split_long_opt_arg shell 16500+# variables after splitting LONGOPT at the `=' sign. 16501+func_split_long_opt () 16502+{ 16503+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' 16504+ my_sed_long_arg='1s/^--[^=]*=//' 16505+ 16506+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` 16507+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` 16508+} # func_split_long_opt may be replaced by extended shell implementation 16509+ 16510+exit_cmd=: 16511 16512 16513 16514@@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" 16515 magic_exe="%%%MAGIC EXE variable%%%" 16516 16517 # Global variables. 16518-# $mode is unset 16519 nonopt= 16520-execute_dlfiles= 16521 preserve_args= 16522 lo2o="s/\\.lo\$/.${objext}/" 16523 o2lo="s/\\.${objext}\$/.lo/" 16524 extracted_archives= 16525 extracted_serial=0 16526 16527-opt_dry_run=false 16528-opt_finish=: 16529-opt_duplicate_deps=false 16530-opt_silent=false 16531-opt_debug=: 16532- 16533 # If this variable is set in any of the actions, the command in it 16534 # will be execed at the end. This prevents here-documents from being 16535 # left over by shells. 16536 exec_cmd= 16537 16538+# func_append var value 16539+# Append VALUE to the end of shell variable VAR. 16540+func_append () 16541+{ 16542+ eval "${1}=\$${1}\${2}" 16543+} # func_append may be replaced by extended shell implementation 16544+ 16545+# func_append_quoted var value 16546+# Quote VALUE and append to the end of shell variable VAR, separated 16547+# by a space. 16548+func_append_quoted () 16549+{ 16550+ func_quote_for_eval "${2}" 16551+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" 16552+} # func_append_quoted may be replaced by extended shell implementation 16553+ 16554+ 16555+# func_arith arithmetic-term... 16556+func_arith () 16557+{ 16558+ func_arith_result=`expr "${@}"` 16559+} # func_arith may be replaced by extended shell implementation 16560+ 16561+ 16562+# func_len string 16563+# STRING may not start with a hyphen. 16564+func_len () 16565+{ 16566+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` 16567+} # func_len may be replaced by extended shell implementation 16568+ 16569+ 16570+# func_lo2o object 16571+func_lo2o () 16572+{ 16573+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 16574+} # func_lo2o may be replaced by extended shell implementation 16575+ 16576+ 16577+# func_xform libobj-or-source 16578+func_xform () 16579+{ 16580+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 16581+} # func_xform may be replaced by extended shell implementation 16582+ 16583+ 16584 # func_fatal_configuration arg... 16585 # Echo program name prefixed message to standard error, followed by 16586 # a configuration failure hint, and exit. 16587@@ -850,130 +979,204 @@ func_enable_tag () 16588 esac 16589 } 16590 16591-# Parse options once, thoroughly. This comes as soon as possible in 16592-# the script to make things like `libtool --version' happen quickly. 16593+# func_check_version_match 16594+# Ensure that we are using m4 macros, and libtool script from the same 16595+# release of libtool. 16596+func_check_version_match () 16597 { 16598+ if test "$package_revision" != "$macro_revision"; then 16599+ if test "$VERSION" != "$macro_version"; then 16600+ if test -z "$macro_version"; then 16601+ cat >&2 <<_LT_EOF 16602+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the 16603+$progname: definition of this LT_INIT comes from an older release. 16604+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION 16605+$progname: and run autoconf again. 16606+_LT_EOF 16607+ else 16608+ cat >&2 <<_LT_EOF 16609+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the 16610+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. 16611+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION 16612+$progname: and run autoconf again. 16613+_LT_EOF 16614+ fi 16615+ else 16616+ cat >&2 <<_LT_EOF 16617+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, 16618+$progname: but the definition of this LT_INIT comes from revision $macro_revision. 16619+$progname: You should recreate aclocal.m4 with macros from revision $package_revision 16620+$progname: of $PACKAGE $VERSION and run autoconf again. 16621+_LT_EOF 16622+ fi 16623 16624- # Shorthand for --mode=foo, only valid as the first argument 16625- case $1 in 16626- clean|clea|cle|cl) 16627- shift; set dummy --mode clean ${1+"$@"}; shift 16628- ;; 16629- compile|compil|compi|comp|com|co|c) 16630- shift; set dummy --mode compile ${1+"$@"}; shift 16631- ;; 16632- execute|execut|execu|exec|exe|ex|e) 16633- shift; set dummy --mode execute ${1+"$@"}; shift 16634- ;; 16635- finish|finis|fini|fin|fi|f) 16636- shift; set dummy --mode finish ${1+"$@"}; shift 16637- ;; 16638- install|instal|insta|inst|ins|in|i) 16639- shift; set dummy --mode install ${1+"$@"}; shift 16640- ;; 16641- link|lin|li|l) 16642- shift; set dummy --mode link ${1+"$@"}; shift 16643- ;; 16644- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) 16645- shift; set dummy --mode uninstall ${1+"$@"}; shift 16646- ;; 16647- esac 16648+ exit $EXIT_MISMATCH 16649+ fi 16650+} 16651+ 16652+ 16653+# Shorthand for --mode=foo, only valid as the first argument 16654+case $1 in 16655+clean|clea|cle|cl) 16656+ shift; set dummy --mode clean ${1+"$@"}; shift 16657+ ;; 16658+compile|compil|compi|comp|com|co|c) 16659+ shift; set dummy --mode compile ${1+"$@"}; shift 16660+ ;; 16661+execute|execut|execu|exec|exe|ex|e) 16662+ shift; set dummy --mode execute ${1+"$@"}; shift 16663+ ;; 16664+finish|finis|fini|fin|fi|f) 16665+ shift; set dummy --mode finish ${1+"$@"}; shift 16666+ ;; 16667+install|instal|insta|inst|ins|in|i) 16668+ shift; set dummy --mode install ${1+"$@"}; shift 16669+ ;; 16670+link|lin|li|l) 16671+ shift; set dummy --mode link ${1+"$@"}; shift 16672+ ;; 16673+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) 16674+ shift; set dummy --mode uninstall ${1+"$@"}; shift 16675+ ;; 16676+esac 16677 16678- # Parse non-mode specific arguments: 16679- while test "$#" -gt 0; do 16680+ 16681+ 16682+# Option defaults: 16683+opt_debug=: 16684+opt_dry_run=false 16685+opt_config=false 16686+opt_preserve_dup_deps=false 16687+opt_features=false 16688+opt_finish=false 16689+opt_help=false 16690+opt_help_all=false 16691+opt_silent=: 16692+opt_verbose=: 16693+opt_silent=false 16694+opt_verbose=false 16695+ 16696+ 16697+# Parse options once, thoroughly. This comes as soon as possible in the 16698+# script to make things like `--version' happen as quickly as we can. 16699+{ 16700+ # this just eases exit handling 16701+ while test $# -gt 0; do 16702 opt="$1" 16703 shift 16704- 16705 case $opt in 16706- --config) func_config ;; 16707- 16708- --debug) preserve_args="$preserve_args $opt" 16709+ --debug|-x) opt_debug='set -x' 16710 func_echo "enabling shell trace mode" 16711- opt_debug='set -x' 16712 $opt_debug 16713 ;; 16714- 16715- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break 16716- execute_dlfiles="$execute_dlfiles $1" 16717- shift 16718+ --dry-run|--dryrun|-n) 16719+ opt_dry_run=: 16720 ;; 16721- 16722- --dry-run | -n) opt_dry_run=: ;; 16723- --features) func_features ;; 16724- --finish) mode="finish" ;; 16725- --no-finish) opt_finish=false ;; 16726- 16727- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break 16728- case $1 in 16729- # Valid mode arguments: 16730- clean) ;; 16731- compile) ;; 16732- execute) ;; 16733- finish) ;; 16734- install) ;; 16735- link) ;; 16736- relink) ;; 16737- uninstall) ;; 16738- 16739- # Catch anything else as an error 16740- *) func_error "invalid argument for $opt" 16741- exit_cmd=exit 16742- break 16743- ;; 16744- esac 16745- 16746- mode="$1" 16747+ --config) 16748+ opt_config=: 16749+func_config 16750+ ;; 16751+ --dlopen|-dlopen) 16752+ optarg="$1" 16753+ opt_dlopen="${opt_dlopen+$opt_dlopen 16754+}$optarg" 16755 shift 16756 ;; 16757- 16758 --preserve-dup-deps) 16759- opt_duplicate_deps=: ;; 16760- 16761- --quiet|--silent) preserve_args="$preserve_args $opt" 16762- opt_silent=: 16763- opt_verbose=false 16764+ opt_preserve_dup_deps=: 16765 ;; 16766- 16767- --no-quiet|--no-silent) 16768- preserve_args="$preserve_args $opt" 16769- opt_silent=false 16770+ --features) 16771+ opt_features=: 16772+func_features 16773 ;; 16774- 16775- --verbose| -v) preserve_args="$preserve_args $opt" 16776+ --finish) 16777+ opt_finish=: 16778+set dummy --mode finish ${1+"$@"}; shift 16779+ ;; 16780+ --help) 16781+ opt_help=: 16782+ ;; 16783+ --help-all) 16784+ opt_help_all=: 16785+opt_help=': help-all' 16786+ ;; 16787+ --mode) 16788+ test $# = 0 && func_missing_arg $opt && break 16789+ optarg="$1" 16790+ opt_mode="$optarg" 16791+case $optarg in 16792+ # Valid mode arguments: 16793+ clean|compile|execute|finish|install|link|relink|uninstall) ;; 16794+ 16795+ # Catch anything else as an error 16796+ *) func_error "invalid argument for $opt" 16797+ exit_cmd=exit 16798+ break 16799+ ;; 16800+esac 16801+ shift 16802+ ;; 16803+ --no-silent|--no-quiet) 16804 opt_silent=false 16805- opt_verbose=: 16806+func_append preserve_args " $opt" 16807 ;; 16808- 16809- --no-verbose) preserve_args="$preserve_args $opt" 16810+ --no-verbose) 16811 opt_verbose=false 16812+func_append preserve_args " $opt" 16813 ;; 16814- 16815- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break 16816- preserve_args="$preserve_args $opt $1" 16817- func_enable_tag "$1" # tagname is set here 16818+ --silent|--quiet) 16819+ opt_silent=: 16820+func_append preserve_args " $opt" 16821+ opt_verbose=false 16822+ ;; 16823+ --verbose|-v) 16824+ opt_verbose=: 16825+func_append preserve_args " $opt" 16826+opt_silent=false 16827+ ;; 16828+ --tag) 16829+ test $# = 0 && func_missing_arg $opt && break 16830+ optarg="$1" 16831+ opt_tag="$optarg" 16832+func_append preserve_args " $opt $optarg" 16833+func_enable_tag "$optarg" 16834 shift 16835 ;; 16836 16837+ -\?|-h) func_usage ;; 16838+ --help) func_help ;; 16839+ --version) func_version ;; 16840+ 16841 # Separate optargs to long options: 16842- -dlopen=*|--mode=*|--tag=*) 16843- func_opt_split "$opt" 16844- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} 16845+ --*=*) 16846+ func_split_long_opt "$opt" 16847+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} 16848 shift 16849 ;; 16850 16851- -\?|-h) func_usage ;; 16852- --help) opt_help=: ;; 16853- --help-all) opt_help=': help-all' ;; 16854- --version) func_version ;; 16855- 16856- -*) func_fatal_help "unrecognized option \`$opt'" ;; 16857- 16858- *) nonopt="$opt" 16859- break 16860+ # Separate non-argument short options: 16861+ -\?*|-h*|-n*|-v*) 16862+ func_split_short_opt "$opt" 16863+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} 16864+ shift 16865 ;; 16866+ 16867+ --) break ;; 16868+ -*) func_fatal_help "unrecognized option \`$opt'" ;; 16869+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; 16870 esac 16871 done 16872 16873+ # Validate options: 16874+ 16875+ # save first non-option argument 16876+ if test "$#" -gt 0; then 16877+ nonopt="$opt" 16878+ shift 16879+ fi 16880+ 16881+ # preserve --debug 16882+ test "$opt_debug" = : || func_append preserve_args " --debug" 16883 16884 case $host in 16885 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) 16886@@ -981,82 +1184,44 @@ func_enable_tag () 16887 opt_duplicate_compiler_generated_deps=: 16888 ;; 16889 *) 16890- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps 16891+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps 16892 ;; 16893 esac 16894 16895- # Having warned about all mis-specified options, bail out if 16896- # anything was wrong. 16897- $exit_cmd $EXIT_FAILURE 16898-} 16899+ $opt_help || { 16900+ # Sanity checks first: 16901+ func_check_version_match 16902 16903-# func_check_version_match 16904-# Ensure that we are using m4 macros, and libtool script from the same 16905-# release of libtool. 16906-func_check_version_match () 16907-{ 16908- if test "$package_revision" != "$macro_revision"; then 16909- if test "$VERSION" != "$macro_version"; then 16910- if test -z "$macro_version"; then 16911- cat >&2 <<_LT_EOF 16912-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the 16913-$progname: definition of this LT_INIT comes from an older release. 16914-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION 16915-$progname: and run autoconf again. 16916-_LT_EOF 16917- else 16918- cat >&2 <<_LT_EOF 16919-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the 16920-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. 16921-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION 16922-$progname: and run autoconf again. 16923-_LT_EOF 16924- fi 16925- else 16926- cat >&2 <<_LT_EOF 16927-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, 16928-$progname: but the definition of this LT_INIT comes from revision $macro_revision. 16929-$progname: You should recreate aclocal.m4 with macros from revision $package_revision 16930-$progname: of $PACKAGE $VERSION and run autoconf again. 16931-_LT_EOF 16932+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then 16933+ func_fatal_configuration "not configured to build any kind of library" 16934 fi 16935 16936- exit $EXIT_MISMATCH 16937- fi 16938-} 16939- 16940+ # Darwin sucks 16941+ eval std_shrext=\"$shrext_cmds\" 16942 16943-## ----------- ## 16944-## Main. ## 16945-## ----------- ## 16946- 16947-$opt_help || { 16948- # Sanity checks first: 16949- func_check_version_match 16950- 16951- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then 16952- func_fatal_configuration "not configured to build any kind of library" 16953- fi 16954+ # Only execute mode is allowed to have -dlopen flags. 16955+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then 16956+ func_error "unrecognized option \`-dlopen'" 16957+ $ECHO "$help" 1>&2 16958+ exit $EXIT_FAILURE 16959+ fi 16960 16961- test -z "$mode" && func_fatal_error "error: you must specify a MODE." 16962+ # Change the help message to a mode-specific one. 16963+ generic_help="$help" 16964+ help="Try \`$progname --help --mode=$opt_mode' for more information." 16965+ } 16966 16967 16968- # Darwin sucks 16969- eval "std_shrext=\"$shrext_cmds\"" 16970+ # Bail if the options were screwed 16971+ $exit_cmd $EXIT_FAILURE 16972+} 16973 16974 16975- # Only execute mode is allowed to have -dlopen flags. 16976- if test -n "$execute_dlfiles" && test "$mode" != execute; then 16977- func_error "unrecognized option \`-dlopen'" 16978- $ECHO "$help" 1>&2 16979- exit $EXIT_FAILURE 16980- fi 16981 16982- # Change the help message to a mode-specific one. 16983- generic_help="$help" 16984- help="Try \`$progname --help --mode=$mode' for more information." 16985-} 16986 16987+## ----------- ## 16988+## Main. ## 16989+## ----------- ## 16990 16991 # func_lalib_p file 16992 # True iff FILE is a libtool `.la' library or `.lo' object file. 16993@@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () 16994 # temporary ltwrapper_script. 16995 func_ltwrapper_scriptname () 16996 { 16997- func_ltwrapper_scriptname_result="" 16998- if func_ltwrapper_executable_p "$1"; then 16999- func_dirname_and_basename "$1" "" "." 17000- func_stripname '' '.exe' "$func_basename_result" 17001- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" 17002- fi 17003+ func_dirname_and_basename "$1" "" "." 17004+ func_stripname '' '.exe' "$func_basename_result" 17005+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" 17006 } 17007 17008 # func_ltwrapper_p file 17009@@ -1149,7 +1311,7 @@ func_execute_cmds () 17010 save_ifs=$IFS; IFS='~' 17011 for cmd in $1; do 17012 IFS=$save_ifs 17013- eval "cmd=\"$cmd\"" 17014+ eval cmd=\"$cmd\" 17015 func_show_eval "$cmd" "${2-:}" 17016 done 17017 IFS=$save_ifs 17018@@ -1172,6 +1334,37 @@ func_source () 17019 } 17020 17021 17022+# func_resolve_sysroot PATH 17023+# Replace a leading = in PATH with a sysroot. Store the result into 17024+# func_resolve_sysroot_result 17025+func_resolve_sysroot () 17026+{ 17027+ func_resolve_sysroot_result=$1 17028+ case $func_resolve_sysroot_result in 17029+ =*) 17030+ func_stripname '=' '' "$func_resolve_sysroot_result" 17031+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result 17032+ ;; 17033+ esac 17034+} 17035+ 17036+# func_replace_sysroot PATH 17037+# If PATH begins with the sysroot, replace it with = and 17038+# store the result into func_replace_sysroot_result. 17039+func_replace_sysroot () 17040+{ 17041+ case "$lt_sysroot:$1" in 17042+ ?*:"$lt_sysroot"*) 17043+ func_stripname "$lt_sysroot" '' "$1" 17044+ func_replace_sysroot_result="=$func_stripname_result" 17045+ ;; 17046+ *) 17047+ # Including no sysroot. 17048+ func_replace_sysroot_result=$1 17049+ ;; 17050+ esac 17051+} 17052+ 17053 # func_infer_tag arg 17054 # Infer tagged configuration to use if any are available and 17055 # if one wasn't chosen via the "--tag" command line option. 17056@@ -1184,8 +1377,7 @@ func_infer_tag () 17057 if test -n "$available_tags" && test -z "$tagname"; then 17058 CC_quoted= 17059 for arg in $CC; do 17060- func_quote_for_eval "$arg" 17061- CC_quoted="$CC_quoted $func_quote_for_eval_result" 17062+ func_append_quoted CC_quoted "$arg" 17063 done 17064 CC_expanded=`func_echo_all $CC` 17065 CC_quoted_expanded=`func_echo_all $CC_quoted` 17066@@ -1204,8 +1396,7 @@ func_infer_tag () 17067 CC_quoted= 17068 for arg in $CC; do 17069 # Double-quote args containing other shell metacharacters. 17070- func_quote_for_eval "$arg" 17071- CC_quoted="$CC_quoted $func_quote_for_eval_result" 17072+ func_append_quoted CC_quoted "$arg" 17073 done 17074 CC_expanded=`func_echo_all $CC` 17075 CC_quoted_expanded=`func_echo_all $CC_quoted` 17076@@ -1274,6 +1465,486 @@ EOF 17077 } 17078 } 17079 17080+ 17081+################################################## 17082+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # 17083+################################################## 17084+ 17085+# func_convert_core_file_wine_to_w32 ARG 17086+# Helper function used by file name conversion functions when $build is *nix, 17087+# and $host is mingw, cygwin, or some other w32 environment. Relies on a 17088+# correctly configured wine environment available, with the winepath program 17089+# in $build's $PATH. 17090+# 17091+# ARG is the $build file name to be converted to w32 format. 17092+# Result is available in $func_convert_core_file_wine_to_w32_result, and will 17093+# be empty on error (or when ARG is empty) 17094+func_convert_core_file_wine_to_w32 () 17095+{ 17096+ $opt_debug 17097+ func_convert_core_file_wine_to_w32_result="$1" 17098+ if test -n "$1"; then 17099+ # Unfortunately, winepath does not exit with a non-zero error code, so we 17100+ # are forced to check the contents of stdout. On the other hand, if the 17101+ # command is not found, the shell will set an exit code of 127 and print 17102+ # *an error message* to stdout. So we must check for both error code of 17103+ # zero AND non-empty stdout, which explains the odd construction: 17104+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` 17105+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then 17106+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | 17107+ $SED -e "$lt_sed_naive_backslashify"` 17108+ else 17109+ func_convert_core_file_wine_to_w32_result= 17110+ fi 17111+ fi 17112+} 17113+# end: func_convert_core_file_wine_to_w32 17114+ 17115+ 17116+# func_convert_core_path_wine_to_w32 ARG 17117+# Helper function used by path conversion functions when $build is *nix, and 17118+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly 17119+# configured wine environment available, with the winepath program in $build's 17120+# $PATH. Assumes ARG has no leading or trailing path separator characters. 17121+# 17122+# ARG is path to be converted from $build format to win32. 17123+# Result is available in $func_convert_core_path_wine_to_w32_result. 17124+# Unconvertible file (directory) names in ARG are skipped; if no directory names 17125+# are convertible, then the result may be empty. 17126+func_convert_core_path_wine_to_w32 () 17127+{ 17128+ $opt_debug 17129+ # unfortunately, winepath doesn't convert paths, only file names 17130+ func_convert_core_path_wine_to_w32_result="" 17131+ if test -n "$1"; then 17132+ oldIFS=$IFS 17133+ IFS=: 17134+ for func_convert_core_path_wine_to_w32_f in $1; do 17135+ IFS=$oldIFS 17136+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" 17137+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then 17138+ if test -z "$func_convert_core_path_wine_to_w32_result"; then 17139+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" 17140+ else 17141+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" 17142+ fi 17143+ fi 17144+ done 17145+ IFS=$oldIFS 17146+ fi 17147+} 17148+# end: func_convert_core_path_wine_to_w32 17149+ 17150+ 17151+# func_cygpath ARGS... 17152+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when 17153+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) 17154+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or 17155+# (2), returns the Cygwin file name or path in func_cygpath_result (input 17156+# file name or path is assumed to be in w32 format, as previously converted 17157+# from $build's *nix or MSYS format). In case (3), returns the w32 file name 17158+# or path in func_cygpath_result (input file name or path is assumed to be in 17159+# Cygwin format). Returns an empty string on error. 17160+# 17161+# ARGS are passed to cygpath, with the last one being the file name or path to 17162+# be converted. 17163+# 17164+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH 17165+# environment variable; do not put it in $PATH. 17166+func_cygpath () 17167+{ 17168+ $opt_debug 17169+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then 17170+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` 17171+ if test "$?" -ne 0; then 17172+ # on failure, ensure result is empty 17173+ func_cygpath_result= 17174+ fi 17175+ else 17176+ func_cygpath_result= 17177+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" 17178+ fi 17179+} 17180+#end: func_cygpath 17181+ 17182+ 17183+# func_convert_core_msys_to_w32 ARG 17184+# Convert file name or path ARG from MSYS format to w32 format. Return 17185+# result in func_convert_core_msys_to_w32_result. 17186+func_convert_core_msys_to_w32 () 17187+{ 17188+ $opt_debug 17189+ # awkward: cmd appends spaces to result 17190+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | 17191+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` 17192+} 17193+#end: func_convert_core_msys_to_w32 17194+ 17195+ 17196+# func_convert_file_check ARG1 ARG2 17197+# Verify that ARG1 (a file name in $build format) was converted to $host 17198+# format in ARG2. Otherwise, emit an error message, but continue (resetting 17199+# func_to_host_file_result to ARG1). 17200+func_convert_file_check () 17201+{ 17202+ $opt_debug 17203+ if test -z "$2" && test -n "$1" ; then 17204+ func_error "Could not determine host file name corresponding to" 17205+ func_error " \`$1'" 17206+ func_error "Continuing, but uninstalled executables may not work." 17207+ # Fallback: 17208+ func_to_host_file_result="$1" 17209+ fi 17210+} 17211+# end func_convert_file_check 17212+ 17213+ 17214+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH 17215+# Verify that FROM_PATH (a path in $build format) was converted to $host 17216+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting 17217+# func_to_host_file_result to a simplistic fallback value (see below). 17218+func_convert_path_check () 17219+{ 17220+ $opt_debug 17221+ if test -z "$4" && test -n "$3"; then 17222+ func_error "Could not determine the host path corresponding to" 17223+ func_error " \`$3'" 17224+ func_error "Continuing, but uninstalled executables may not work." 17225+ # Fallback. This is a deliberately simplistic "conversion" and 17226+ # should not be "improved". See libtool.info. 17227+ if test "x$1" != "x$2"; then 17228+ lt_replace_pathsep_chars="s|$1|$2|g" 17229+ func_to_host_path_result=`echo "$3" | 17230+ $SED -e "$lt_replace_pathsep_chars"` 17231+ else 17232+ func_to_host_path_result="$3" 17233+ fi 17234+ fi 17235+} 17236+# end func_convert_path_check 17237+ 17238+ 17239+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG 17240+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT 17241+# and appending REPL if ORIG matches BACKPAT. 17242+func_convert_path_front_back_pathsep () 17243+{ 17244+ $opt_debug 17245+ case $4 in 17246+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" 17247+ ;; 17248+ esac 17249+ case $4 in 17250+ $2 ) func_append func_to_host_path_result "$3" 17251+ ;; 17252+ esac 17253+} 17254+# end func_convert_path_front_back_pathsep 17255+ 17256+ 17257+################################################## 17258+# $build to $host FILE NAME CONVERSION FUNCTIONS # 17259+################################################## 17260+# invoked via `$to_host_file_cmd ARG' 17261+# 17262+# In each case, ARG is the path to be converted from $build to $host format. 17263+# Result will be available in $func_to_host_file_result. 17264+ 17265+ 17266+# func_to_host_file ARG 17267+# Converts the file name ARG from $build format to $host format. Return result 17268+# in func_to_host_file_result. 17269+func_to_host_file () 17270+{ 17271+ $opt_debug 17272+ $to_host_file_cmd "$1" 17273+} 17274+# end func_to_host_file 17275+ 17276+ 17277+# func_to_tool_file ARG LAZY 17278+# converts the file name ARG from $build format to toolchain format. Return 17279+# result in func_to_tool_file_result. If the conversion in use is listed 17280+# in (the comma separated) LAZY, no conversion takes place. 17281+func_to_tool_file () 17282+{ 17283+ $opt_debug 17284+ case ,$2, in 17285+ *,"$to_tool_file_cmd",*) 17286+ func_to_tool_file_result=$1 17287+ ;; 17288+ *) 17289+ $to_tool_file_cmd "$1" 17290+ func_to_tool_file_result=$func_to_host_file_result 17291+ ;; 17292+ esac 17293+} 17294+# end func_to_tool_file 17295+ 17296+ 17297+# func_convert_file_noop ARG 17298+# Copy ARG to func_to_host_file_result. 17299+func_convert_file_noop () 17300+{ 17301+ func_to_host_file_result="$1" 17302+} 17303+# end func_convert_file_noop 17304+ 17305+ 17306+# func_convert_file_msys_to_w32 ARG 17307+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic 17308+# conversion to w32 is not available inside the cwrapper. Returns result in 17309+# func_to_host_file_result. 17310+func_convert_file_msys_to_w32 () 17311+{ 17312+ $opt_debug 17313+ func_to_host_file_result="$1" 17314+ if test -n "$1"; then 17315+ func_convert_core_msys_to_w32 "$1" 17316+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" 17317+ fi 17318+ func_convert_file_check "$1" "$func_to_host_file_result" 17319+} 17320+# end func_convert_file_msys_to_w32 17321+ 17322+ 17323+# func_convert_file_cygwin_to_w32 ARG 17324+# Convert file name ARG from Cygwin to w32 format. Returns result in 17325+# func_to_host_file_result. 17326+func_convert_file_cygwin_to_w32 () 17327+{ 17328+ $opt_debug 17329+ func_to_host_file_result="$1" 17330+ if test -n "$1"; then 17331+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use 17332+ # LT_CYGPATH in this case. 17333+ func_to_host_file_result=`cygpath -m "$1"` 17334+ fi 17335+ func_convert_file_check "$1" "$func_to_host_file_result" 17336+} 17337+# end func_convert_file_cygwin_to_w32 17338+ 17339+ 17340+# func_convert_file_nix_to_w32 ARG 17341+# Convert file name ARG from *nix to w32 format. Requires a wine environment 17342+# and a working winepath. Returns result in func_to_host_file_result. 17343+func_convert_file_nix_to_w32 () 17344+{ 17345+ $opt_debug 17346+ func_to_host_file_result="$1" 17347+ if test -n "$1"; then 17348+ func_convert_core_file_wine_to_w32 "$1" 17349+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" 17350+ fi 17351+ func_convert_file_check "$1" "$func_to_host_file_result" 17352+} 17353+# end func_convert_file_nix_to_w32 17354+ 17355+ 17356+# func_convert_file_msys_to_cygwin ARG 17357+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. 17358+# Returns result in func_to_host_file_result. 17359+func_convert_file_msys_to_cygwin () 17360+{ 17361+ $opt_debug 17362+ func_to_host_file_result="$1" 17363+ if test -n "$1"; then 17364+ func_convert_core_msys_to_w32 "$1" 17365+ func_cygpath -u "$func_convert_core_msys_to_w32_result" 17366+ func_to_host_file_result="$func_cygpath_result" 17367+ fi 17368+ func_convert_file_check "$1" "$func_to_host_file_result" 17369+} 17370+# end func_convert_file_msys_to_cygwin 17371+ 17372+ 17373+# func_convert_file_nix_to_cygwin ARG 17374+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed 17375+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result 17376+# in func_to_host_file_result. 17377+func_convert_file_nix_to_cygwin () 17378+{ 17379+ $opt_debug 17380+ func_to_host_file_result="$1" 17381+ if test -n "$1"; then 17382+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. 17383+ func_convert_core_file_wine_to_w32 "$1" 17384+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" 17385+ func_to_host_file_result="$func_cygpath_result" 17386+ fi 17387+ func_convert_file_check "$1" "$func_to_host_file_result" 17388+} 17389+# end func_convert_file_nix_to_cygwin 17390+ 17391+ 17392+############################################# 17393+# $build to $host PATH CONVERSION FUNCTIONS # 17394+############################################# 17395+# invoked via `$to_host_path_cmd ARG' 17396+# 17397+# In each case, ARG is the path to be converted from $build to $host format. 17398+# The result will be available in $func_to_host_path_result. 17399+# 17400+# Path separators are also converted from $build format to $host format. If 17401+# ARG begins or ends with a path separator character, it is preserved (but 17402+# converted to $host format) on output. 17403+# 17404+# All path conversion functions are named using the following convention: 17405+# file name conversion function : func_convert_file_X_to_Y () 17406+# path conversion function : func_convert_path_X_to_Y () 17407+# where, for any given $build/$host combination the 'X_to_Y' value is the 17408+# same. If conversion functions are added for new $build/$host combinations, 17409+# the two new functions must follow this pattern, or func_init_to_host_path_cmd 17410+# will break. 17411+ 17412+ 17413+# func_init_to_host_path_cmd 17414+# Ensures that function "pointer" variable $to_host_path_cmd is set to the 17415+# appropriate value, based on the value of $to_host_file_cmd. 17416+to_host_path_cmd= 17417+func_init_to_host_path_cmd () 17418+{ 17419+ $opt_debug 17420+ if test -z "$to_host_path_cmd"; then 17421+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" 17422+ to_host_path_cmd="func_convert_path_${func_stripname_result}" 17423+ fi 17424+} 17425+ 17426+ 17427+# func_to_host_path ARG 17428+# Converts the path ARG from $build format to $host format. Return result 17429+# in func_to_host_path_result. 17430+func_to_host_path () 17431+{ 17432+ $opt_debug 17433+ func_init_to_host_path_cmd 17434+ $to_host_path_cmd "$1" 17435+} 17436+# end func_to_host_path 17437+ 17438+ 17439+# func_convert_path_noop ARG 17440+# Copy ARG to func_to_host_path_result. 17441+func_convert_path_noop () 17442+{ 17443+ func_to_host_path_result="$1" 17444+} 17445+# end func_convert_path_noop 17446+ 17447+ 17448+# func_convert_path_msys_to_w32 ARG 17449+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic 17450+# conversion to w32 is not available inside the cwrapper. Returns result in 17451+# func_to_host_path_result. 17452+func_convert_path_msys_to_w32 () 17453+{ 17454+ $opt_debug 17455+ func_to_host_path_result="$1" 17456+ if test -n "$1"; then 17457+ # Remove leading and trailing path separator characters from ARG. MSYS 17458+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; 17459+ # and winepath ignores them completely. 17460+ func_stripname : : "$1" 17461+ func_to_host_path_tmp1=$func_stripname_result 17462+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" 17463+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" 17464+ func_convert_path_check : ";" \ 17465+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 17466+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" 17467+ fi 17468+} 17469+# end func_convert_path_msys_to_w32 17470+ 17471+ 17472+# func_convert_path_cygwin_to_w32 ARG 17473+# Convert path ARG from Cygwin to w32 format. Returns result in 17474+# func_to_host_file_result. 17475+func_convert_path_cygwin_to_w32 () 17476+{ 17477+ $opt_debug 17478+ func_to_host_path_result="$1" 17479+ if test -n "$1"; then 17480+ # See func_convert_path_msys_to_w32: 17481+ func_stripname : : "$1" 17482+ func_to_host_path_tmp1=$func_stripname_result 17483+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` 17484+ func_convert_path_check : ";" \ 17485+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 17486+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" 17487+ fi 17488+} 17489+# end func_convert_path_cygwin_to_w32 17490+ 17491+ 17492+# func_convert_path_nix_to_w32 ARG 17493+# Convert path ARG from *nix to w32 format. Requires a wine environment and 17494+# a working winepath. Returns result in func_to_host_file_result. 17495+func_convert_path_nix_to_w32 () 17496+{ 17497+ $opt_debug 17498+ func_to_host_path_result="$1" 17499+ if test -n "$1"; then 17500+ # See func_convert_path_msys_to_w32: 17501+ func_stripname : : "$1" 17502+ func_to_host_path_tmp1=$func_stripname_result 17503+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" 17504+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" 17505+ func_convert_path_check : ";" \ 17506+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 17507+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" 17508+ fi 17509+} 17510+# end func_convert_path_nix_to_w32 17511+ 17512+ 17513+# func_convert_path_msys_to_cygwin ARG 17514+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. 17515+# Returns result in func_to_host_file_result. 17516+func_convert_path_msys_to_cygwin () 17517+{ 17518+ $opt_debug 17519+ func_to_host_path_result="$1" 17520+ if test -n "$1"; then 17521+ # See func_convert_path_msys_to_w32: 17522+ func_stripname : : "$1" 17523+ func_to_host_path_tmp1=$func_stripname_result 17524+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" 17525+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" 17526+ func_to_host_path_result="$func_cygpath_result" 17527+ func_convert_path_check : : \ 17528+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 17529+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" 17530+ fi 17531+} 17532+# end func_convert_path_msys_to_cygwin 17533+ 17534+ 17535+# func_convert_path_nix_to_cygwin ARG 17536+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a 17537+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in 17538+# func_to_host_file_result. 17539+func_convert_path_nix_to_cygwin () 17540+{ 17541+ $opt_debug 17542+ func_to_host_path_result="$1" 17543+ if test -n "$1"; then 17544+ # Remove leading and trailing path separator characters from 17545+ # ARG. msys behavior is inconsistent here, cygpath turns them 17546+ # into '.;' and ';.', and winepath ignores them completely. 17547+ func_stripname : : "$1" 17548+ func_to_host_path_tmp1=$func_stripname_result 17549+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" 17550+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" 17551+ func_to_host_path_result="$func_cygpath_result" 17552+ func_convert_path_check : : \ 17553+ "$func_to_host_path_tmp1" "$func_to_host_path_result" 17554+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" 17555+ fi 17556+} 17557+# end func_convert_path_nix_to_cygwin 17558+ 17559+ 17560 # func_mode_compile arg... 17561 func_mode_compile () 17562 { 17563@@ -1314,12 +1985,12 @@ func_mode_compile () 17564 ;; 17565 17566 -pie | -fpie | -fPIE) 17567- pie_flag="$pie_flag $arg" 17568+ func_append pie_flag " $arg" 17569 continue 17570 ;; 17571 17572 -shared | -static | -prefer-pic | -prefer-non-pic) 17573- later="$later $arg" 17574+ func_append later " $arg" 17575 continue 17576 ;; 17577 17578@@ -1340,15 +2011,14 @@ func_mode_compile () 17579 save_ifs="$IFS"; IFS=',' 17580 for arg in $args; do 17581 IFS="$save_ifs" 17582- func_quote_for_eval "$arg" 17583- lastarg="$lastarg $func_quote_for_eval_result" 17584+ func_append_quoted lastarg "$arg" 17585 done 17586 IFS="$save_ifs" 17587 func_stripname ' ' '' "$lastarg" 17588 lastarg=$func_stripname_result 17589 17590 # Add the arguments to base_compile. 17591- base_compile="$base_compile $lastarg" 17592+ func_append base_compile " $lastarg" 17593 continue 17594 ;; 17595 17596@@ -1364,8 +2034,7 @@ func_mode_compile () 17597 esac # case $arg_mode 17598 17599 # Aesthetically quote the previous argument. 17600- func_quote_for_eval "$lastarg" 17601- base_compile="$base_compile $func_quote_for_eval_result" 17602+ func_append_quoted base_compile "$lastarg" 17603 done # for arg 17604 17605 case $arg_mode in 17606@@ -1496,17 +2165,16 @@ compiler." 17607 $opt_dry_run || $RM $removelist 17608 exit $EXIT_FAILURE 17609 fi 17610- removelist="$removelist $output_obj" 17611+ func_append removelist " $output_obj" 17612 $ECHO "$srcfile" > "$lockfile" 17613 fi 17614 17615 $opt_dry_run || $RM $removelist 17616- removelist="$removelist $lockfile" 17617+ func_append removelist " $lockfile" 17618 trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 17619 17620- if test -n "$fix_srcfile_path"; then 17621- eval "srcfile=\"$fix_srcfile_path\"" 17622- fi 17623+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 17624+ srcfile=$func_to_tool_file_result 17625 func_quote_for_eval "$srcfile" 17626 qsrcfile=$func_quote_for_eval_result 17627 17628@@ -1526,7 +2194,7 @@ compiler." 17629 17630 if test -z "$output_obj"; then 17631 # Place PIC objects in $objdir 17632- command="$command -o $lobj" 17633+ func_append command " -o $lobj" 17634 fi 17635 17636 func_show_eval_locale "$command" \ 17637@@ -1573,11 +2241,11 @@ compiler." 17638 command="$base_compile $qsrcfile $pic_flag" 17639 fi 17640 if test "$compiler_c_o" = yes; then 17641- command="$command -o $obj" 17642+ func_append command " -o $obj" 17643 fi 17644 17645 # Suppress compiler output if we already did a PIC compilation. 17646- command="$command$suppress_output" 17647+ func_append command "$suppress_output" 17648 func_show_eval_locale "$command" \ 17649 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 17650 17651@@ -1622,13 +2290,13 @@ compiler." 17652 } 17653 17654 $opt_help || { 17655- test "$mode" = compile && func_mode_compile ${1+"$@"} 17656+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} 17657 } 17658 17659 func_mode_help () 17660 { 17661 # We need to display help for each of the modes. 17662- case $mode in 17663+ case $opt_mode in 17664 "") 17665 # Generic help is extracted from the usage comments 17666 # at the start of this file. 17667@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: 17668 17669 -o OUTPUT-FILE set the output file name to OUTPUT-FILE 17670 -no-suppress do not suppress compiler output for multiple passes 17671- -prefer-pic try to building PIC objects only 17672- -prefer-non-pic try to building non-PIC objects only 17673+ -prefer-pic try to build PIC objects only 17674+ -prefer-non-pic try to build non-PIC objects only 17675 -shared do not build a \`.o' file suitable for static linking 17676 -static only build a \`.o' file suitable for static linking 17677 -Wc,FLAG pass FLAG directly to the compiler 17678@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." 17679 ;; 17680 17681 *) 17682- func_fatal_help "invalid operation mode \`$mode'" 17683+ func_fatal_help "invalid operation mode \`$opt_mode'" 17684 ;; 17685 esac 17686 17687@@ -1819,13 +2487,13 @@ if $opt_help; then 17688 else 17689 { 17690 func_help noexit 17691- for mode in compile link execute install finish uninstall clean; do 17692+ for opt_mode in compile link execute install finish uninstall clean; do 17693 func_mode_help 17694 done 17695 } | sed -n '1p; 2,$s/^Usage:/ or: /p' 17696 { 17697 func_help noexit 17698- for mode in compile link execute install finish uninstall clean; do 17699+ for opt_mode in compile link execute install finish uninstall clean; do 17700 echo 17701 func_mode_help 17702 done 17703@@ -1854,13 +2522,16 @@ func_mode_execute () 17704 func_fatal_help "you must specify a COMMAND" 17705 17706 # Handle -dlopen flags immediately. 17707- for file in $execute_dlfiles; do 17708+ for file in $opt_dlopen; do 17709 test -f "$file" \ 17710 || func_fatal_help "\`$file' is not a file" 17711 17712 dir= 17713 case $file in 17714 *.la) 17715+ func_resolve_sysroot "$file" 17716+ file=$func_resolve_sysroot_result 17717+ 17718 # Check to see that this really is a libtool archive. 17719 func_lalib_unsafe_p "$file" \ 17720 || func_fatal_help "\`$lib' is not a valid libtool archive" 17721@@ -1882,7 +2553,7 @@ func_mode_execute () 17722 dir="$func_dirname_result" 17723 17724 if test -f "$dir/$objdir/$dlname"; then 17725- dir="$dir/$objdir" 17726+ func_append dir "/$objdir" 17727 else 17728 if test ! -f "$dir/$dlname"; then 17729 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 17730@@ -1907,10 +2578,10 @@ func_mode_execute () 17731 test -n "$absdir" && dir="$absdir" 17732 17733 # Now add the directory to shlibpath_var. 17734- if eval test -z \"\$$shlibpath_var\"; then 17735- eval $shlibpath_var=\$dir 17736+ if eval "test -z \"\$$shlibpath_var\""; then 17737+ eval "$shlibpath_var=\"\$dir\"" 17738 else 17739- eval $shlibpath_var=\$dir:\$$shlibpath_var 17740+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" 17741 fi 17742 done 17743 17744@@ -1939,8 +2610,7 @@ func_mode_execute () 17745 ;; 17746 esac 17747 # Quote arguments (to preserve shell metacharacters). 17748- func_quote_for_eval "$file" 17749- args="$args $func_quote_for_eval_result" 17750+ func_append_quoted args "$file" 17751 done 17752 17753 if test "X$opt_dry_run" = Xfalse; then 17754@@ -1972,22 +2642,59 @@ func_mode_execute () 17755 fi 17756 } 17757 17758-test "$mode" = execute && func_mode_execute ${1+"$@"} 17759+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} 17760 17761 17762 # func_mode_finish arg... 17763 func_mode_finish () 17764 { 17765 $opt_debug 17766- libdirs="$nonopt" 17767+ libs= 17768+ libdirs= 17769 admincmds= 17770 17771- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then 17772- for dir 17773- do 17774- libdirs="$libdirs $dir" 17775- done 17776+ for opt in "$nonopt" ${1+"$@"} 17777+ do 17778+ if test -d "$opt"; then 17779+ func_append libdirs " $opt" 17780 17781+ elif test -f "$opt"; then 17782+ if func_lalib_unsafe_p "$opt"; then 17783+ func_append libs " $opt" 17784+ else 17785+ func_warning "\`$opt' is not a valid libtool archive" 17786+ fi 17787+ 17788+ else 17789+ func_fatal_error "invalid argument \`$opt'" 17790+ fi 17791+ done 17792+ 17793+ if test -n "$libs"; then 17794+ if test -n "$lt_sysroot"; then 17795+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` 17796+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" 17797+ else 17798+ sysroot_cmd= 17799+ fi 17800+ 17801+ # Remove sysroot references 17802+ if $opt_dry_run; then 17803+ for lib in $libs; do 17804+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" 17805+ done 17806+ else 17807+ tmpdir=`func_mktempdir` 17808+ for lib in $libs; do 17809+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ 17810+ > $tmpdir/tmp-la 17811+ mv -f $tmpdir/tmp-la $lib 17812+ done 17813+ ${RM}r "$tmpdir" 17814+ fi 17815+ fi 17816+ 17817+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then 17818 for libdir in $libdirs; do 17819 if test -n "$finish_cmds"; then 17820 # Do each command in the finish commands. 17821@@ -1997,7 +2704,7 @@ func_mode_finish () 17822 if test -n "$finish_eval"; then 17823 # Do the single finish_eval. 17824 eval cmds=\"$finish_eval\" 17825- $opt_dry_run || eval "$cmds" || admincmds="$admincmds 17826+ $opt_dry_run || eval "$cmds" || func_append admincmds " 17827 $cmds" 17828 fi 17829 done 17830@@ -2006,53 +2713,55 @@ func_mode_finish () 17831 # Exit here if they wanted silent mode. 17832 $opt_silent && exit $EXIT_SUCCESS 17833 17834- echo "----------------------------------------------------------------------" 17835- echo "Libraries have been installed in:" 17836- for libdir in $libdirs; do 17837- $ECHO " $libdir" 17838- done 17839- echo 17840- echo "If you ever happen to want to link against installed libraries" 17841- echo "in a given directory, LIBDIR, you must either use libtool, and" 17842- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" 17843- echo "flag during linking and do at least one of the following:" 17844- if test -n "$shlibpath_var"; then 17845- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" 17846- echo " during execution" 17847- fi 17848- if test -n "$runpath_var"; then 17849- echo " - add LIBDIR to the \`$runpath_var' environment variable" 17850- echo " during linking" 17851- fi 17852- if test -n "$hardcode_libdir_flag_spec"; then 17853- libdir=LIBDIR 17854- eval "flag=\"$hardcode_libdir_flag_spec\"" 17855+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then 17856+ echo "----------------------------------------------------------------------" 17857+ echo "Libraries have been installed in:" 17858+ for libdir in $libdirs; do 17859+ $ECHO " $libdir" 17860+ done 17861+ echo 17862+ echo "If you ever happen to want to link against installed libraries" 17863+ echo "in a given directory, LIBDIR, you must either use libtool, and" 17864+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" 17865+ echo "flag during linking and do at least one of the following:" 17866+ if test -n "$shlibpath_var"; then 17867+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" 17868+ echo " during execution" 17869+ fi 17870+ if test -n "$runpath_var"; then 17871+ echo " - add LIBDIR to the \`$runpath_var' environment variable" 17872+ echo " during linking" 17873+ fi 17874+ if test -n "$hardcode_libdir_flag_spec"; then 17875+ libdir=LIBDIR 17876+ eval flag=\"$hardcode_libdir_flag_spec\" 17877 17878- $ECHO " - use the \`$flag' linker flag" 17879- fi 17880- if test -n "$admincmds"; then 17881- $ECHO " - have your system administrator run these commands:$admincmds" 17882- fi 17883- if test -f /etc/ld.so.conf; then 17884- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" 17885- fi 17886- echo 17887+ $ECHO " - use the \`$flag' linker flag" 17888+ fi 17889+ if test -n "$admincmds"; then 17890+ $ECHO " - have your system administrator run these commands:$admincmds" 17891+ fi 17892+ if test -f /etc/ld.so.conf; then 17893+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" 17894+ fi 17895+ echo 17896 17897- echo "See any operating system documentation about shared libraries for" 17898- case $host in 17899- solaris2.[6789]|solaris2.1[0-9]) 17900- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" 17901- echo "pages." 17902- ;; 17903- *) 17904- echo "more information, such as the ld(1) and ld.so(8) manual pages." 17905- ;; 17906- esac 17907- echo "----------------------------------------------------------------------" 17908+ echo "See any operating system documentation about shared libraries for" 17909+ case $host in 17910+ solaris2.[6789]|solaris2.1[0-9]) 17911+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" 17912+ echo "pages." 17913+ ;; 17914+ *) 17915+ echo "more information, such as the ld(1) and ld.so(8) manual pages." 17916+ ;; 17917+ esac 17918+ echo "----------------------------------------------------------------------" 17919+ fi 17920 exit $EXIT_SUCCESS 17921 } 17922 17923-test "$mode" = finish && func_mode_finish ${1+"$@"} 17924+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} 17925 17926 17927 # func_mode_install arg... 17928@@ -2077,7 +2786,7 @@ func_mode_install () 17929 # The real first argument should be the name of the installation program. 17930 # Aesthetically quote it. 17931 func_quote_for_eval "$arg" 17932- install_prog="$install_prog$func_quote_for_eval_result" 17933+ func_append install_prog "$func_quote_for_eval_result" 17934 install_shared_prog=$install_prog 17935 case " $install_prog " in 17936 *[\\\ /]cp\ *) install_cp=: ;; 17937@@ -2097,7 +2806,7 @@ func_mode_install () 17938 do 17939 arg2= 17940 if test -n "$dest"; then 17941- files="$files $dest" 17942+ func_append files " $dest" 17943 dest=$arg 17944 continue 17945 fi 17946@@ -2135,11 +2844,11 @@ func_mode_install () 17947 17948 # Aesthetically quote the argument. 17949 func_quote_for_eval "$arg" 17950- install_prog="$install_prog $func_quote_for_eval_result" 17951+ func_append install_prog " $func_quote_for_eval_result" 17952 if test -n "$arg2"; then 17953 func_quote_for_eval "$arg2" 17954 fi 17955- install_shared_prog="$install_shared_prog $func_quote_for_eval_result" 17956+ func_append install_shared_prog " $func_quote_for_eval_result" 17957 done 17958 17959 test -z "$install_prog" && \ 17960@@ -2151,7 +2860,7 @@ func_mode_install () 17961 if test -n "$install_override_mode" && $no_mode; then 17962 if $install_cp; then :; else 17963 func_quote_for_eval "$install_override_mode" 17964- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" 17965+ func_append install_shared_prog " -m $func_quote_for_eval_result" 17966 fi 17967 fi 17968 17969@@ -2209,10 +2918,13 @@ func_mode_install () 17970 case $file in 17971 *.$libext) 17972 # Do the static libraries later. 17973- staticlibs="$staticlibs $file" 17974+ func_append staticlibs " $file" 17975 ;; 17976 17977 *.la) 17978+ func_resolve_sysroot "$file" 17979+ file=$func_resolve_sysroot_result 17980+ 17981 # Check to see that this really is a libtool archive. 17982 func_lalib_unsafe_p "$file" \ 17983 || func_fatal_help "\`$file' is not a valid libtool archive" 17984@@ -2226,23 +2938,30 @@ func_mode_install () 17985 if test "X$destdir" = "X$libdir"; then 17986 case "$current_libdirs " in 17987 *" $libdir "*) ;; 17988- *) current_libdirs="$current_libdirs $libdir" ;; 17989+ *) func_append current_libdirs " $libdir" ;; 17990 esac 17991 else 17992 # Note the libdir as a future libdir. 17993 case "$future_libdirs " in 17994 *" $libdir "*) ;; 17995- *) future_libdirs="$future_libdirs $libdir" ;; 17996+ *) func_append future_libdirs " $libdir" ;; 17997 esac 17998 fi 17999 18000 func_dirname "$file" "/" "" 18001 dir="$func_dirname_result" 18002- dir="$dir$objdir" 18003+ func_append dir "$objdir" 18004 18005 if test -n "$relink_command"; then 18006+ # Strip any trailing slash from the destination. 18007+ func_stripname '' '/' "$libdir" 18008+ destlibdir=$func_stripname_result 18009+ 18010+ func_stripname '' '/' "$destdir" 18011+ s_destdir=$func_stripname_result 18012+ 18013 # Determine the prefix the user has applied to our future dir. 18014- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` 18015+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` 18016 18017 # Don't allow the user to place us outside of our expected 18018 # location b/c this prevents finding dependent libraries that 18019@@ -2315,7 +3034,7 @@ func_mode_install () 18020 func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' 18021 18022 # Maybe install the static library, too. 18023- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" 18024+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" 18025 ;; 18026 18027 *.lo) 18028@@ -2503,7 +3222,7 @@ func_mode_install () 18029 test -n "$future_libdirs" && \ 18030 func_warning "remember to run \`$progname --finish$future_libdirs'" 18031 18032- if test -n "$current_libdirs" && $opt_finish; then 18033+ if test -n "$current_libdirs"; then 18034 # Maybe just do a dry run. 18035 $opt_dry_run && current_libdirs=" -n$current_libdirs" 18036 exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' 18037@@ -2512,7 +3231,7 @@ func_mode_install () 18038 fi 18039 } 18040 18041-test "$mode" = install && func_mode_install ${1+"$@"} 18042+test "$opt_mode" = install && func_mode_install ${1+"$@"} 18043 18044 18045 # func_generate_dlsyms outputname originator pic_p 18046@@ -2559,6 +3278,18 @@ extern \"C\" { 18047 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" 18048 #endif 18049 18050+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 18051+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 18052+/* DATA imports from DLLs on WIN32 con't be const, because runtime 18053+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 18054+# define LT_DLSYM_CONST 18055+#elif defined(__osf__) 18056+/* This system does not cope well with relocations in const data. */ 18057+# define LT_DLSYM_CONST 18058+#else 18059+# define LT_DLSYM_CONST const 18060+#endif 18061+ 18062 /* External symbol declarations for the compiler. */\ 18063 " 18064 18065@@ -2570,21 +3301,22 @@ extern \"C\" { 18066 # Add our own program objects to the symbol list. 18067 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` 18068 for progfile in $progfiles; do 18069- func_verbose "extracting global C symbols from \`$progfile'" 18070- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" 18071+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 18072+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" 18073+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" 18074 done 18075 18076 if test -n "$exclude_expsyms"; then 18077 $opt_dry_run || { 18078- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T 18079- $MV "$nlist"T "$nlist" 18080+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' 18081+ eval '$MV "$nlist"T "$nlist"' 18082 } 18083 fi 18084 18085 if test -n "$export_symbols_regex"; then 18086 $opt_dry_run || { 18087- $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T 18088- $MV "$nlist"T "$nlist" 18089+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' 18090+ eval '$MV "$nlist"T "$nlist"' 18091 } 18092 fi 18093 18094@@ -2593,23 +3325,23 @@ extern \"C\" { 18095 export_symbols="$output_objdir/$outputname.exp" 18096 $opt_dry_run || { 18097 $RM $export_symbols 18098- ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" 18099+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' 18100 case $host in 18101 *cygwin* | *mingw* | *cegcc* ) 18102- echo EXPORTS > "$output_objdir/$outputname.def" 18103- cat "$export_symbols" >> "$output_objdir/$outputname.def" 18104+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 18105+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' 18106 ;; 18107 esac 18108 } 18109 else 18110 $opt_dry_run || { 18111- ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" 18112- $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T 18113- $MV "$nlist"T "$nlist" 18114+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' 18115+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' 18116+ eval '$MV "$nlist"T "$nlist"' 18117 case $host in 18118 *cygwin* | *mingw* | *cegcc* ) 18119- echo EXPORTS > "$output_objdir/$outputname.def" 18120- cat "$nlist" >> "$output_objdir/$outputname.def" 18121+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 18122+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' 18123 ;; 18124 esac 18125 } 18126@@ -2620,10 +3352,52 @@ extern \"C\" { 18127 func_verbose "extracting global C symbols from \`$dlprefile'" 18128 func_basename "$dlprefile" 18129 name="$func_basename_result" 18130- $opt_dry_run || { 18131- $ECHO ": $name " >> "$nlist" 18132- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" 18133- } 18134+ case $host in 18135+ *cygwin* | *mingw* | *cegcc* ) 18136+ # if an import library, we need to obtain dlname 18137+ if func_win32_import_lib_p "$dlprefile"; then 18138+ func_tr_sh "$dlprefile" 18139+ eval "curr_lafile=\$libfile_$func_tr_sh_result" 18140+ dlprefile_dlbasename="" 18141+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then 18142+ # Use subshell, to avoid clobbering current variable values 18143+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` 18144+ if test -n "$dlprefile_dlname" ; then 18145+ func_basename "$dlprefile_dlname" 18146+ dlprefile_dlbasename="$func_basename_result" 18147+ else 18148+ # no lafile. user explicitly requested -dlpreopen <import library>. 18149+ $sharedlib_from_linklib_cmd "$dlprefile" 18150+ dlprefile_dlbasename=$sharedlib_from_linklib_result 18151+ fi 18152+ fi 18153+ $opt_dry_run || { 18154+ if test -n "$dlprefile_dlbasename" ; then 18155+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' 18156+ else 18157+ func_warning "Could not compute DLL name from $name" 18158+ eval '$ECHO ": $name " >> "$nlist"' 18159+ fi 18160+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 18161+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | 18162+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" 18163+ } 18164+ else # not an import lib 18165+ $opt_dry_run || { 18166+ eval '$ECHO ": $name " >> "$nlist"' 18167+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 18168+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" 18169+ } 18170+ fi 18171+ ;; 18172+ *) 18173+ $opt_dry_run || { 18174+ eval '$ECHO ": $name " >> "$nlist"' 18175+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 18176+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" 18177+ } 18178+ ;; 18179+ esac 18180 done 18181 18182 $opt_dry_run || { 18183@@ -2661,26 +3435,9 @@ typedef struct { 18184 const char *name; 18185 void *address; 18186 } lt_dlsymlist; 18187-" 18188- case $host in 18189- *cygwin* | *mingw* | *cegcc* ) 18190- echo >> "$output_objdir/$my_dlsyms" "\ 18191-/* DATA imports from DLLs on WIN32 con't be const, because 18192- runtime relocations are performed -- see ld's documentation 18193- on pseudo-relocs. */" 18194- lt_dlsym_const= ;; 18195- *osf5*) 18196- echo >> "$output_objdir/$my_dlsyms" "\ 18197-/* This system does not cope well with relocations in const data */" 18198- lt_dlsym_const= ;; 18199- *) 18200- lt_dlsym_const=const ;; 18201- esac 18202- 18203- echo >> "$output_objdir/$my_dlsyms" "\ 18204-extern $lt_dlsym_const lt_dlsymlist 18205+extern LT_DLSYM_CONST lt_dlsymlist 18206 lt_${my_prefix}_LTX_preloaded_symbols[]; 18207-$lt_dlsym_const lt_dlsymlist 18208+LT_DLSYM_CONST lt_dlsymlist 18209 lt_${my_prefix}_LTX_preloaded_symbols[] = 18210 {\ 18211 { \"$my_originator\", (void *) 0 }," 18212@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { 18213 for arg in $LTCFLAGS; do 18214 case $arg in 18215 -pie | -fpie | -fPIE) ;; 18216- *) symtab_cflags="$symtab_cflags $arg" ;; 18217+ *) func_append symtab_cflags " $arg" ;; 18218 esac 18219 done 18220 18221@@ -2796,9 +3553,11 @@ func_win32_libid () 18222 win32_libid_type="x86 archive import" 18223 ;; 18224 *ar\ archive*) # could be an import, or static 18225- if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | 18226- $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then 18227- win32_nmres=`$NM -f posix -A "$1" | 18228+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. 18229+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | 18230+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then 18231+ func_to_tool_file "$1" func_convert_file_msys_to_w32 18232+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | 18233 $SED -n -e ' 18234 1,100{ 18235 / I /{ 18236@@ -2827,6 +3586,131 @@ func_win32_libid () 18237 $ECHO "$win32_libid_type" 18238 } 18239 18240+# func_cygming_dll_for_implib ARG 18241+# 18242+# Platform-specific function to extract the 18243+# name of the DLL associated with the specified 18244+# import library ARG. 18245+# Invoked by eval'ing the libtool variable 18246+# $sharedlib_from_linklib_cmd 18247+# Result is available in the variable 18248+# $sharedlib_from_linklib_result 18249+func_cygming_dll_for_implib () 18250+{ 18251+ $opt_debug 18252+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` 18253+} 18254+ 18255+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs 18256+# 18257+# The is the core of a fallback implementation of a 18258+# platform-specific function to extract the name of the 18259+# DLL associated with the specified import library LIBNAME. 18260+# 18261+# SECTION_NAME is either .idata$6 or .idata$7, depending 18262+# on the platform and compiler that created the implib. 18263+# 18264+# Echos the name of the DLL associated with the 18265+# specified import library. 18266+func_cygming_dll_for_implib_fallback_core () 18267+{ 18268+ $opt_debug 18269+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` 18270+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | 18271+ $SED '/^Contents of section '"$match_literal"':/{ 18272+ # Place marker at beginning of archive member dllname section 18273+ s/.*/====MARK====/ 18274+ p 18275+ d 18276+ } 18277+ # These lines can sometimes be longer than 43 characters, but 18278+ # are always uninteresting 18279+ /:[ ]*file format pe[i]\{,1\}-/d 18280+ /^In archive [^:]*:/d 18281+ # Ensure marker is printed 18282+ /^====MARK====/p 18283+ # Remove all lines with less than 43 characters 18284+ /^.\{43\}/!d 18285+ # From remaining lines, remove first 43 characters 18286+ s/^.\{43\}//' | 18287+ $SED -n ' 18288+ # Join marker and all lines until next marker into a single line 18289+ /^====MARK====/ b para 18290+ H 18291+ $ b para 18292+ b 18293+ :para 18294+ x 18295+ s/\n//g 18296+ # Remove the marker 18297+ s/^====MARK====// 18298+ # Remove trailing dots and whitespace 18299+ s/[\. \t]*$// 18300+ # Print 18301+ /./p' | 18302+ # we now have a list, one entry per line, of the stringified 18303+ # contents of the appropriate section of all members of the 18304+ # archive which possess that section. Heuristic: eliminate 18305+ # all those which have a first or second character that is 18306+ # a '.' (that is, objdump's representation of an unprintable 18307+ # character.) This should work for all archives with less than 18308+ # 0x302f exports -- but will fail for DLLs whose name actually 18309+ # begins with a literal '.' or a single character followed by 18310+ # a '.'. 18311+ # 18312+ # Of those that remain, print the first one. 18313+ $SED -e '/^\./d;/^.\./d;q' 18314+} 18315+ 18316+# func_cygming_gnu_implib_p ARG 18317+# This predicate returns with zero status (TRUE) if 18318+# ARG is a GNU/binutils-style import library. Returns 18319+# with nonzero status (FALSE) otherwise. 18320+func_cygming_gnu_implib_p () 18321+{ 18322+ $opt_debug 18323+ func_to_tool_file "$1" func_convert_file_msys_to_w32 18324+ 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)$'` 18325+ test -n "$func_cygming_gnu_implib_tmp" 18326+} 18327+ 18328+# func_cygming_ms_implib_p ARG 18329+# This predicate returns with zero status (TRUE) if 18330+# ARG is an MS-style import library. Returns 18331+# with nonzero status (FALSE) otherwise. 18332+func_cygming_ms_implib_p () 18333+{ 18334+ $opt_debug 18335+ func_to_tool_file "$1" func_convert_file_msys_to_w32 18336+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` 18337+ test -n "$func_cygming_ms_implib_tmp" 18338+} 18339+ 18340+# func_cygming_dll_for_implib_fallback ARG 18341+# Platform-specific function to extract the 18342+# name of the DLL associated with the specified 18343+# import library ARG. 18344+# 18345+# This fallback implementation is for use when $DLLTOOL 18346+# does not support the --identify-strict option. 18347+# Invoked by eval'ing the libtool variable 18348+# $sharedlib_from_linklib_cmd 18349+# Result is available in the variable 18350+# $sharedlib_from_linklib_result 18351+func_cygming_dll_for_implib_fallback () 18352+{ 18353+ $opt_debug 18354+ if func_cygming_gnu_implib_p "$1" ; then 18355+ # binutils import library 18356+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` 18357+ elif func_cygming_ms_implib_p "$1" ; then 18358+ # ms-generated import library 18359+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` 18360+ else 18361+ # unknown 18362+ sharedlib_from_linklib_result="" 18363+ fi 18364+} 18365 18366 18367 # func_extract_an_archive dir oldlib 18368@@ -2917,7 +3801,7 @@ func_extract_archives () 18369 darwin_file= 18370 darwin_files= 18371 for darwin_file in $darwin_filelist; do 18372- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` 18373+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` 18374 $LIPO -create -output "$darwin_file" $darwin_files 18375 done # $darwin_filelist 18376 $RM -rf unfat-$$ 18377@@ -2932,7 +3816,7 @@ func_extract_archives () 18378 func_extract_an_archive "$my_xdir" "$my_xabs" 18379 ;; 18380 esac 18381- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` 18382+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` 18383 done 18384 18385 func_extract_archives_result="$my_oldobjs" 18386@@ -3014,7 +3898,110 @@ func_fallback_echo () 18387 _LTECHO_EOF' 18388 } 18389 ECHO=\"$qECHO\" 18390- fi\ 18391+ fi 18392+ 18393+# Very basic option parsing. These options are (a) specific to 18394+# the libtool wrapper, (b) are identical between the wrapper 18395+# /script/ and the wrapper /executable/ which is used only on 18396+# windows platforms, and (c) all begin with the string "--lt-" 18397+# (application programs are unlikely to have options which match 18398+# this pattern). 18399+# 18400+# There are only two supported options: --lt-debug and 18401+# --lt-dump-script. There is, deliberately, no --lt-help. 18402+# 18403+# The first argument to this parsing function should be the 18404+# script's $0 value, followed by "$@". 18405+lt_option_debug= 18406+func_parse_lt_options () 18407+{ 18408+ lt_script_arg0=\$0 18409+ shift 18410+ for lt_opt 18411+ do 18412+ case \"\$lt_opt\" in 18413+ --lt-debug) lt_option_debug=1 ;; 18414+ --lt-dump-script) 18415+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` 18416+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. 18417+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` 18418+ cat \"\$lt_dump_D/\$lt_dump_F\" 18419+ exit 0 18420+ ;; 18421+ --lt-*) 18422+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 18423+ exit 1 18424+ ;; 18425+ esac 18426+ done 18427+ 18428+ # Print the debug banner immediately: 18429+ if test -n \"\$lt_option_debug\"; then 18430+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 18431+ fi 18432+} 18433+ 18434+# Used when --lt-debug. Prints its arguments to stdout 18435+# (redirection is the responsibility of the caller) 18436+func_lt_dump_args () 18437+{ 18438+ lt_dump_args_N=1; 18439+ for lt_arg 18440+ do 18441+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" 18442+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` 18443+ done 18444+} 18445+ 18446+# Core function for launching the target application 18447+func_exec_program_core () 18448+{ 18449+" 18450+ case $host in 18451+ # Backslashes separate directories on plain windows 18452+ *-*-mingw | *-*-os2* | *-cegcc*) 18453+ $ECHO "\ 18454+ if test -n \"\$lt_option_debug\"; then 18455+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 18456+ func_lt_dump_args \${1+\"\$@\"} 1>&2 18457+ fi 18458+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} 18459+" 18460+ ;; 18461+ 18462+ *) 18463+ $ECHO "\ 18464+ if test -n \"\$lt_option_debug\"; then 18465+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 18466+ func_lt_dump_args \${1+\"\$@\"} 1>&2 18467+ fi 18468+ exec \"\$progdir/\$program\" \${1+\"\$@\"} 18469+" 18470+ ;; 18471+ esac 18472+ $ECHO "\ 18473+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 18474+ exit 1 18475+} 18476+ 18477+# A function to encapsulate launching the target application 18478+# Strips options in the --lt-* namespace from \$@ and 18479+# launches target application with the remaining arguments. 18480+func_exec_program () 18481+{ 18482+ for lt_wr_arg 18483+ do 18484+ case \$lt_wr_arg in 18485+ --lt-*) ;; 18486+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; 18487+ esac 18488+ shift 18489+ done 18490+ func_exec_program_core \${1+\"\$@\"} 18491+} 18492+ 18493+ # Parse options 18494+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} 18495 18496 # Find the directory that this script lives in. 18497 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` 18498@@ -3078,7 +4065,7 @@ _LTECHO_EOF' 18499 18500 # relink executable if necessary 18501 if test -n \"\$relink_command\"; then 18502- if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : 18503+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : 18504 else 18505 $ECHO \"\$relink_command_output\" >&2 18506 $RM \"\$progdir/\$file\" 18507@@ -3102,6 +4089,18 @@ _LTECHO_EOF' 18508 18509 if test -f \"\$progdir/\$program\"; then" 18510 18511+ # fixup the dll searchpath if we need to. 18512+ # 18513+ # Fix the DLL searchpath if we need to. Do this before prepending 18514+ # to shlibpath, because on Windows, both are PATH and uninstalled 18515+ # libraries must come first. 18516+ if test -n "$dllsearchpath"; then 18517+ $ECHO "\ 18518+ # Add the dll search path components to the executable PATH 18519+ PATH=$dllsearchpath:\$PATH 18520+" 18521+ fi 18522+ 18523 # Export our shlibpath_var if we have one. 18524 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then 18525 $ECHO "\ 18526@@ -3116,35 +4115,10 @@ _LTECHO_EOF' 18527 " 18528 fi 18529 18530- # fixup the dll searchpath if we need to. 18531- if test -n "$dllsearchpath"; then 18532- $ECHO "\ 18533- # Add the dll search path components to the executable PATH 18534- PATH=$dllsearchpath:\$PATH 18535-" 18536- fi 18537- 18538 $ECHO "\ 18539 if test \"\$libtool_execute_magic\" != \"$magic\"; then 18540 # Run the actual program with our arguments. 18541-" 18542- case $host in 18543- # Backslashes separate directories on plain windows 18544- *-*-mingw | *-*-os2* | *-cegcc*) 18545- $ECHO "\ 18546- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} 18547-" 18548- ;; 18549- 18550- *) 18551- $ECHO "\ 18552- exec \"\$progdir/\$program\" \${1+\"\$@\"} 18553-" 18554- ;; 18555- esac 18556- $ECHO "\ 18557- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 18558- exit 1 18559+ func_exec_program \${1+\"\$@\"} 18560 fi 18561 else 18562 # The program doesn't exist. 18563@@ -3158,166 +4132,6 @@ fi\ 18564 } 18565 18566 18567-# func_to_host_path arg 18568-# 18569-# Convert paths to host format when used with build tools. 18570-# Intended for use with "native" mingw (where libtool itself 18571-# is running under the msys shell), or in the following cross- 18572-# build environments: 18573-# $build $host 18574-# mingw (msys) mingw [e.g. native] 18575-# cygwin mingw 18576-# *nix + wine mingw 18577-# where wine is equipped with the `winepath' executable. 18578-# In the native mingw case, the (msys) shell automatically 18579-# converts paths for any non-msys applications it launches, 18580-# but that facility isn't available from inside the cwrapper. 18581-# Similar accommodations are necessary for $host mingw and 18582-# $build cygwin. Calling this function does no harm for other 18583-# $host/$build combinations not listed above. 18584-# 18585-# ARG is the path (on $build) that should be converted to 18586-# the proper representation for $host. The result is stored 18587-# in $func_to_host_path_result. 18588-func_to_host_path () 18589-{ 18590- func_to_host_path_result="$1" 18591- if test -n "$1"; then 18592- case $host in 18593- *mingw* ) 18594- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' 18595- case $build in 18596- *mingw* ) # actually, msys 18597- # awkward: cmd appends spaces to result 18598- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | 18599- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` 18600- ;; 18601- *cygwin* ) 18602- func_to_host_path_result=`cygpath -w "$1" | 18603- $SED -e "$lt_sed_naive_backslashify"` 18604- ;; 18605- * ) 18606- # Unfortunately, winepath does not exit with a non-zero 18607- # error code, so we are forced to check the contents of 18608- # stdout. On the other hand, if the command is not 18609- # found, the shell will set an exit code of 127 and print 18610- # *an error message* to stdout. So we must check for both 18611- # error code of zero AND non-empty stdout, which explains 18612- # the odd construction: 18613- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` 18614- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then 18615- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | 18616- $SED -e "$lt_sed_naive_backslashify"` 18617- else 18618- # Allow warning below. 18619- func_to_host_path_result= 18620- fi 18621- ;; 18622- esac 18623- if test -z "$func_to_host_path_result" ; then 18624- func_error "Could not determine host path corresponding to" 18625- func_error " \`$1'" 18626- func_error "Continuing, but uninstalled executables may not work." 18627- # Fallback: 18628- func_to_host_path_result="$1" 18629- fi 18630- ;; 18631- esac 18632- fi 18633-} 18634-# end: func_to_host_path 18635- 18636-# func_to_host_pathlist arg 18637-# 18638-# Convert pathlists to host format when used with build tools. 18639-# See func_to_host_path(), above. This function supports the 18640-# following $build/$host combinations (but does no harm for 18641-# combinations not listed here): 18642-# $build $host 18643-# mingw (msys) mingw [e.g. native] 18644-# cygwin mingw 18645-# *nix + wine mingw 18646-# 18647-# Path separators are also converted from $build format to 18648-# $host format. If ARG begins or ends with a path separator 18649-# character, it is preserved (but converted to $host format) 18650-# on output. 18651-# 18652-# ARG is a pathlist (on $build) that should be converted to 18653-# the proper representation on $host. The result is stored 18654-# in $func_to_host_pathlist_result. 18655-func_to_host_pathlist () 18656-{ 18657- func_to_host_pathlist_result="$1" 18658- if test -n "$1"; then 18659- case $host in 18660- *mingw* ) 18661- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' 18662- # Remove leading and trailing path separator characters from 18663- # ARG. msys behavior is inconsistent here, cygpath turns them 18664- # into '.;' and ';.', and winepath ignores them completely. 18665- func_stripname : : "$1" 18666- func_to_host_pathlist_tmp1=$func_stripname_result 18667- case $build in 18668- *mingw* ) # Actually, msys. 18669- # Awkward: cmd appends spaces to result. 18670- func_to_host_pathlist_result=` 18671- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | 18672- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` 18673- ;; 18674- *cygwin* ) 18675- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | 18676- $SED -e "$lt_sed_naive_backslashify"` 18677- ;; 18678- * ) 18679- # unfortunately, winepath doesn't convert pathlists 18680- func_to_host_pathlist_result="" 18681- func_to_host_pathlist_oldIFS=$IFS 18682- IFS=: 18683- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do 18684- IFS=$func_to_host_pathlist_oldIFS 18685- if test -n "$func_to_host_pathlist_f" ; then 18686- func_to_host_path "$func_to_host_pathlist_f" 18687- if test -n "$func_to_host_path_result" ; then 18688- if test -z "$func_to_host_pathlist_result" ; then 18689- func_to_host_pathlist_result="$func_to_host_path_result" 18690- else 18691- func_append func_to_host_pathlist_result ";$func_to_host_path_result" 18692- fi 18693- fi 18694- fi 18695- done 18696- IFS=$func_to_host_pathlist_oldIFS 18697- ;; 18698- esac 18699- if test -z "$func_to_host_pathlist_result"; then 18700- func_error "Could not determine the host path(s) corresponding to" 18701- func_error " \`$1'" 18702- func_error "Continuing, but uninstalled executables may not work." 18703- # Fallback. This may break if $1 contains DOS-style drive 18704- # specifications. The fix is not to complicate the expression 18705- # below, but for the user to provide a working wine installation 18706- # with winepath so that path translation in the cross-to-mingw 18707- # case works properly. 18708- lt_replace_pathsep_nix_to_dos="s|:|;|g" 18709- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ 18710- $SED -e "$lt_replace_pathsep_nix_to_dos"` 18711- fi 18712- # Now, add the leading and trailing path separators back 18713- case "$1" in 18714- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" 18715- ;; 18716- esac 18717- case "$1" in 18718- *: ) func_append func_to_host_pathlist_result ";" 18719- ;; 18720- esac 18721- ;; 18722- esac 18723- fi 18724-} 18725-# end: func_to_host_pathlist 18726- 18727 # func_emit_cwrapperexe_src 18728 # emit the source code for a wrapper executable on stdout 18729 # Must ONLY be called from within func_mode_link because 18730@@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () 18731 18732 This wrapper executable should never be moved out of the build directory. 18733 If it is, it will not operate correctly. 18734- 18735- Currently, it simply execs the wrapper *script* "$SHELL $output", 18736- but could eventually absorb all of the scripts functionality and 18737- exec $objdir/$outputname directly. 18738 */ 18739 EOF 18740 cat <<"EOF" 18741@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); 18742 if (stale) { free ((void *) stale); stale = 0; } \ 18743 } while (0) 18744 18745-#undef LTWRAPPER_DEBUGPRINTF 18746-#if defined LT_DEBUGWRAPPER 18747-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args 18748-static void 18749-ltwrapper_debugprintf (const char *fmt, ...) 18750-{ 18751- va_list args; 18752- va_start (args, fmt); 18753- (void) vfprintf (stderr, fmt, args); 18754- va_end (args); 18755-} 18756+#if defined(LT_DEBUGWRAPPER) 18757+static int lt_debug = 1; 18758 #else 18759-# define LTWRAPPER_DEBUGPRINTF(args) 18760+static int lt_debug = 0; 18761 #endif 18762 18763-const char *program_name = NULL; 18764+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ 18765 18766 void *xmalloc (size_t num); 18767 char *xstrdup (const char *string); 18768@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); 18769 int make_executable (const char *path); 18770 int check_executable (const char *path); 18771 char *strendzap (char *str, const char *pat); 18772-void lt_fatal (const char *message, ...); 18773+void lt_debugprintf (const char *file, int line, const char *fmt, ...); 18774+void lt_fatal (const char *file, int line, const char *message, ...); 18775+static const char *nonnull (const char *s); 18776+static const char *nonempty (const char *s); 18777 void lt_setenv (const char *name, const char *value); 18778 char *lt_extend_str (const char *orig_value, const char *add, int to_end); 18779 void lt_update_exe_path (const char *name, const char *value); 18780@@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); 18781 EOF 18782 18783 cat <<EOF 18784-const char * MAGIC_EXE = "$magic_exe"; 18785+volatile const char * MAGIC_EXE = "$magic_exe"; 18786 const char * LIB_PATH_VARNAME = "$shlibpath_var"; 18787 EOF 18788 18789 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then 18790- func_to_host_pathlist "$temp_rpath" 18791+ func_to_host_path "$temp_rpath" 18792 cat <<EOF 18793-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; 18794+const char * LIB_PATH_VALUE = "$func_to_host_path_result"; 18795 EOF 18796 else 18797 cat <<"EOF" 18798@@ -3513,10 +4317,10 @@ EOF 18799 fi 18800 18801 if test -n "$dllsearchpath"; then 18802- func_to_host_pathlist "$dllsearchpath:" 18803+ func_to_host_path "$dllsearchpath:" 18804 cat <<EOF 18805 const char * EXE_PATH_VARNAME = "PATH"; 18806-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; 18807+const char * EXE_PATH_VALUE = "$func_to_host_path_result"; 18808 EOF 18809 else 18810 cat <<"EOF" 18811@@ -3539,12 +4343,10 @@ EOF 18812 cat <<"EOF" 18813 18814 #define LTWRAPPER_OPTION_PREFIX "--lt-" 18815-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 18816 18817-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; 18818 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; 18819- 18820 static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; 18821+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; 18822 18823 int 18824 main (int argc, char *argv[]) 18825@@ -3561,10 +4363,13 @@ main (int argc, char *argv[]) 18826 int i; 18827 18828 program_name = (char *) xstrdup (base_name (argv[0])); 18829- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); 18830- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); 18831+ newargz = XMALLOC (char *, argc + 1); 18832 18833- /* very simple arg parsing; don't want to rely on getopt */ 18834+ /* very simple arg parsing; don't want to rely on getopt 18835+ * also, copy all non cwrapper options to newargz, except 18836+ * argz[0], which is handled differently 18837+ */ 18838+ newargc=0; 18839 for (i = 1; i < argc; i++) 18840 { 18841 if (strcmp (argv[i], dumpscript_opt) == 0) 18842@@ -3581,21 +4386,54 @@ EOF 18843 lt_dump_script (stdout); 18844 return 0; 18845 } 18846+ if (strcmp (argv[i], debug_opt) == 0) 18847+ { 18848+ lt_debug = 1; 18849+ continue; 18850+ } 18851+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0) 18852+ { 18853+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX 18854+ namespace, but it is not one of the ones we know about and 18855+ have already dealt with, above (inluding dump-script), then 18856+ report an error. Otherwise, targets might begin to believe 18857+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX 18858+ namespace. The first time any user complains about this, we'll 18859+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option 18860+ or a configure.ac-settable value. 18861+ */ 18862+ lt_fatal (__FILE__, __LINE__, 18863+ "unrecognized %s option: '%s'", 18864+ ltwrapper_option_prefix, argv[i]); 18865+ } 18866+ /* otherwise ... */ 18867+ newargz[++newargc] = xstrdup (argv[i]); 18868 } 18869+ newargz[++newargc] = NULL; 18870+ 18871+EOF 18872+ cat <<EOF 18873+ /* The GNU banner must be the first non-error debug message */ 18874+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); 18875+EOF 18876+ cat <<"EOF" 18877+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); 18878+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); 18879 18880- newargz = XMALLOC (char *, argc + 1); 18881 tmp_pathspec = find_executable (argv[0]); 18882 if (tmp_pathspec == NULL) 18883- lt_fatal ("Couldn't find %s", argv[0]); 18884- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", 18885- tmp_pathspec)); 18886+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); 18887+ lt_debugprintf (__FILE__, __LINE__, 18888+ "(main) found exe (before symlink chase) at: %s\n", 18889+ tmp_pathspec); 18890 18891 actual_cwrapper_path = chase_symlinks (tmp_pathspec); 18892- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", 18893- actual_cwrapper_path)); 18894+ lt_debugprintf (__FILE__, __LINE__, 18895+ "(main) found exe (after symlink chase) at: %s\n", 18896+ actual_cwrapper_path); 18897 XFREE (tmp_pathspec); 18898 18899- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); 18900+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); 18901 strendzap (actual_cwrapper_path, actual_cwrapper_name); 18902 18903 /* wrapper name transforms */ 18904@@ -3613,8 +4451,9 @@ EOF 18905 target_name = tmp_pathspec; 18906 tmp_pathspec = 0; 18907 18908- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", 18909- target_name)); 18910+ lt_debugprintf (__FILE__, __LINE__, 18911+ "(main) libtool target name: %s\n", 18912+ target_name); 18913 EOF 18914 18915 cat <<EOF 18916@@ -3664,35 +4503,19 @@ EOF 18917 18918 lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ 18919 lt_setenv ("DUALCASE", "1"); /* for MSK sh */ 18920- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); 18921+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must 18922+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) 18923+ because on Windows, both *_VARNAMEs are PATH but uninstalled 18924+ libraries must come first. */ 18925 lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); 18926+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); 18927 18928- newargc=0; 18929- for (i = 1; i < argc; i++) 18930- { 18931- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) 18932- { 18933- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX 18934- namespace, but it is not one of the ones we know about and 18935- have already dealt with, above (inluding dump-script), then 18936- report an error. Otherwise, targets might begin to believe 18937- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX 18938- namespace. The first time any user complains about this, we'll 18939- need to make LTWRAPPER_OPTION_PREFIX a configure-time option 18940- or a configure.ac-settable value. 18941- */ 18942- lt_fatal ("Unrecognized option in %s namespace: '%s'", 18943- ltwrapper_option_prefix, argv[i]); 18944- } 18945- /* otherwise ... */ 18946- newargz[++newargc] = xstrdup (argv[i]); 18947- } 18948- newargz[++newargc] = NULL; 18949- 18950- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); 18951+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", 18952+ nonnull (lt_argv_zero)); 18953 for (i = 0; i < newargc; i++) 18954 { 18955- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); 18956+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", 18957+ i, nonnull (newargz[i])); 18958 } 18959 18960 EOF 18961@@ -3706,7 +4529,9 @@ EOF 18962 if (rval == -1) 18963 { 18964 /* failed to start process */ 18965- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); 18966+ lt_debugprintf (__FILE__, __LINE__, 18967+ "(main) failed to launch target \"%s\": %s\n", 18968+ lt_argv_zero, nonnull (strerror (errno))); 18969 return 127; 18970 } 18971 return rval; 18972@@ -3728,7 +4553,7 @@ xmalloc (size_t num) 18973 { 18974 void *p = (void *) malloc (num); 18975 if (!p) 18976- lt_fatal ("Memory exhausted"); 18977+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); 18978 18979 return p; 18980 } 18981@@ -3762,8 +4587,8 @@ check_executable (const char *path) 18982 { 18983 struct stat st; 18984 18985- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", 18986- path ? (*path ? path : "EMPTY!") : "NULL!")); 18987+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", 18988+ nonempty (path)); 18989 if ((!path) || (!*path)) 18990 return 0; 18991 18992@@ -3780,8 +4605,8 @@ make_executable (const char *path) 18993 int rval = 0; 18994 struct stat st; 18995 18996- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", 18997- path ? (*path ? path : "EMPTY!") : "NULL!")); 18998+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", 18999+ nonempty (path)); 19000 if ((!path) || (!*path)) 19001 return 0; 19002 19003@@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) 19004 int tmp_len; 19005 char *concat_name; 19006 19007- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", 19008- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); 19009+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", 19010+ nonempty (wrapper)); 19011 19012 if ((wrapper == NULL) || (*wrapper == '\0')) 19013 return NULL; 19014@@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) 19015 { 19016 /* empty path: current directory */ 19017 if (getcwd (tmp, LT_PATHMAX) == NULL) 19018- lt_fatal ("getcwd failed"); 19019+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", 19020+ nonnull (strerror (errno))); 19021 tmp_len = strlen (tmp); 19022 concat_name = 19023 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); 19024@@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) 19025 } 19026 /* Relative path | not found in path: prepend cwd */ 19027 if (getcwd (tmp, LT_PATHMAX) == NULL) 19028- lt_fatal ("getcwd failed"); 19029+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", 19030+ nonnull (strerror (errno))); 19031 tmp_len = strlen (tmp); 19032 concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); 19033 memcpy (concat_name, tmp, tmp_len); 19034@@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) 19035 int has_symlinks = 0; 19036 while (strlen (tmp_pathspec) && !has_symlinks) 19037 { 19038- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", 19039- tmp_pathspec)); 19040+ lt_debugprintf (__FILE__, __LINE__, 19041+ "checking path component for symlinks: %s\n", 19042+ tmp_pathspec); 19043 if (lstat (tmp_pathspec, &s) == 0) 19044 { 19045 if (S_ISLNK (s.st_mode) != 0) 19046@@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) 19047 } 19048 else 19049 { 19050- char *errstr = strerror (errno); 19051- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); 19052+ lt_fatal (__FILE__, __LINE__, 19053+ "error accessing file \"%s\": %s", 19054+ tmp_pathspec, nonnull (strerror (errno))); 19055 } 19056 } 19057 XFREE (tmp_pathspec); 19058@@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) 19059 tmp_pathspec = realpath (pathspec, buf); 19060 if (tmp_pathspec == 0) 19061 { 19062- lt_fatal ("Could not follow symlinks for %s", pathspec); 19063+ lt_fatal (__FILE__, __LINE__, 19064+ "could not follow symlinks for %s", pathspec); 19065 } 19066 return xstrdup (tmp_pathspec); 19067 #endif 19068@@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) 19069 return str; 19070 } 19071 19072+void 19073+lt_debugprintf (const char *file, int line, const char *fmt, ...) 19074+{ 19075+ va_list args; 19076+ if (lt_debug) 19077+ { 19078+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); 19079+ va_start (args, fmt); 19080+ (void) vfprintf (stderr, fmt, args); 19081+ va_end (args); 19082+ } 19083+} 19084+ 19085 static void 19086-lt_error_core (int exit_status, const char *mode, 19087+lt_error_core (int exit_status, const char *file, 19088+ int line, const char *mode, 19089 const char *message, va_list ap) 19090 { 19091- fprintf (stderr, "%s: %s: ", program_name, mode); 19092+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); 19093 vfprintf (stderr, message, ap); 19094 fprintf (stderr, ".\n"); 19095 19096@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, 19097 } 19098 19099 void 19100-lt_fatal (const char *message, ...) 19101+lt_fatal (const char *file, int line, const char *message, ...) 19102 { 19103 va_list ap; 19104 va_start (ap, message); 19105- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); 19106+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); 19107 va_end (ap); 19108 } 19109 19110+static const char * 19111+nonnull (const char *s) 19112+{ 19113+ return s ? s : "(null)"; 19114+} 19115+ 19116+static const char * 19117+nonempty (const char *s) 19118+{ 19119+ return (s && !*s) ? "(empty)" : nonnull (s); 19120+} 19121+ 19122 void 19123 lt_setenv (const char *name, const char *value) 19124 { 19125- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", 19126- (name ? name : "<NULL>"), 19127- (value ? value : "<NULL>"))); 19128+ lt_debugprintf (__FILE__, __LINE__, 19129+ "(lt_setenv) setting '%s' to '%s'\n", 19130+ nonnull (name), nonnull (value)); 19131 { 19132 #ifdef HAVE_SETENV 19133 /* always make a copy, for consistency with !HAVE_SETENV */ 19134@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) 19135 void 19136 lt_update_exe_path (const char *name, const char *value) 19137 { 19138- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", 19139- (name ? name : "<NULL>"), 19140- (value ? value : "<NULL>"))); 19141+ lt_debugprintf (__FILE__, __LINE__, 19142+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", 19143+ nonnull (name), nonnull (value)); 19144 19145 if (name && *name && value && *value) 19146 { 19147@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) 19148 void 19149 lt_update_lib_path (const char *name, const char *value) 19150 { 19151- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", 19152- (name ? name : "<NULL>"), 19153- (value ? value : "<NULL>"))); 19154+ lt_debugprintf (__FILE__, __LINE__, 19155+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", 19156+ nonnull (name), nonnull (value)); 19157 19158 if (name && *name && value && *value) 19159 { 19160@@ -4222,7 +5078,7 @@ EOF 19161 func_win32_import_lib_p () 19162 { 19163 $opt_debug 19164- case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in 19165+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in 19166 *import*) : ;; 19167 *) false ;; 19168 esac 19169@@ -4401,9 +5257,9 @@ func_mode_link () 19170 ;; 19171 *) 19172 if test "$prev" = dlfiles; then 19173- dlfiles="$dlfiles $arg" 19174+ func_append dlfiles " $arg" 19175 else 19176- dlprefiles="$dlprefiles $arg" 19177+ func_append dlprefiles " $arg" 19178 fi 19179 prev= 19180 continue 19181@@ -4427,7 +5283,7 @@ func_mode_link () 19182 *-*-darwin*) 19183 case "$deplibs " in 19184 *" $qarg.ltframework "*) ;; 19185- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later 19186+ *) func_append deplibs " $qarg.ltframework" # this is fixed later 19187 ;; 19188 esac 19189 ;; 19190@@ -4446,7 +5302,7 @@ func_mode_link () 19191 moreargs= 19192 for fil in `cat "$save_arg"` 19193 do 19194-# moreargs="$moreargs $fil" 19195+# func_append moreargs " $fil" 19196 arg=$fil 19197 # A libtool-controlled object. 19198 19199@@ -4475,7 +5331,7 @@ func_mode_link () 19200 19201 if test "$prev" = dlfiles; then 19202 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then 19203- dlfiles="$dlfiles $pic_object" 19204+ func_append dlfiles " $pic_object" 19205 prev= 19206 continue 19207 else 19208@@ -4487,7 +5343,7 @@ func_mode_link () 19209 # CHECK ME: I think I busted this. -Ossama 19210 if test "$prev" = dlprefiles; then 19211 # Preload the old-style object. 19212- dlprefiles="$dlprefiles $pic_object" 19213+ func_append dlprefiles " $pic_object" 19214 prev= 19215 fi 19216 19217@@ -4557,12 +5413,12 @@ func_mode_link () 19218 if test "$prev" = rpath; then 19219 case "$rpath " in 19220 *" $arg "*) ;; 19221- *) rpath="$rpath $arg" ;; 19222+ *) func_append rpath " $arg" ;; 19223 esac 19224 else 19225 case "$xrpath " in 19226 *" $arg "*) ;; 19227- *) xrpath="$xrpath $arg" ;; 19228+ *) func_append xrpath " $arg" ;; 19229 esac 19230 fi 19231 prev= 19232@@ -4574,28 +5430,28 @@ func_mode_link () 19233 continue 19234 ;; 19235 weak) 19236- weak_libs="$weak_libs $arg" 19237+ func_append weak_libs " $arg" 19238 prev= 19239 continue 19240 ;; 19241 xcclinker) 19242- linker_flags="$linker_flags $qarg" 19243- compiler_flags="$compiler_flags $qarg" 19244+ func_append linker_flags " $qarg" 19245+ func_append compiler_flags " $qarg" 19246 prev= 19247 func_append compile_command " $qarg" 19248 func_append finalize_command " $qarg" 19249 continue 19250 ;; 19251 xcompiler) 19252- compiler_flags="$compiler_flags $qarg" 19253+ func_append compiler_flags " $qarg" 19254 prev= 19255 func_append compile_command " $qarg" 19256 func_append finalize_command " $qarg" 19257 continue 19258 ;; 19259 xlinker) 19260- linker_flags="$linker_flags $qarg" 19261- compiler_flags="$compiler_flags $wl$qarg" 19262+ func_append linker_flags " $qarg" 19263+ func_append compiler_flags " $wl$qarg" 19264 prev= 19265 func_append compile_command " $wl$qarg" 19266 func_append finalize_command " $wl$qarg" 19267@@ -4686,15 +5542,16 @@ func_mode_link () 19268 ;; 19269 19270 -L*) 19271- func_stripname '-L' '' "$arg" 19272- dir=$func_stripname_result 19273- if test -z "$dir"; then 19274+ func_stripname "-L" '' "$arg" 19275+ if test -z "$func_stripname_result"; then 19276 if test "$#" -gt 0; then 19277 func_fatal_error "require no space between \`-L' and \`$1'" 19278 else 19279 func_fatal_error "need path for \`-L' option" 19280 fi 19281 fi 19282+ func_resolve_sysroot "$func_stripname_result" 19283+ dir=$func_resolve_sysroot_result 19284 # We need an absolute path. 19285 case $dir in 19286 [\\/]* | [A-Za-z]:[\\/]*) ;; 19287@@ -4706,10 +5563,16 @@ func_mode_link () 19288 ;; 19289 esac 19290 case "$deplibs " in 19291- *" -L$dir "*) ;; 19292+ *" -L$dir "* | *" $arg "*) 19293+ # Will only happen for absolute or sysroot arguments 19294+ ;; 19295 *) 19296- deplibs="$deplibs -L$dir" 19297- lib_search_path="$lib_search_path $dir" 19298+ # Preserve sysroot, but never include relative directories 19299+ case $dir in 19300+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; 19301+ *) func_append deplibs " -L$dir" ;; 19302+ esac 19303+ func_append lib_search_path " $dir" 19304 ;; 19305 esac 19306 case $host in 19307@@ -4718,12 +5581,12 @@ func_mode_link () 19308 case :$dllsearchpath: in 19309 *":$dir:"*) ;; 19310 ::) dllsearchpath=$dir;; 19311- *) dllsearchpath="$dllsearchpath:$dir";; 19312+ *) func_append dllsearchpath ":$dir";; 19313 esac 19314 case :$dllsearchpath: in 19315 *":$testbindir:"*) ;; 19316 ::) dllsearchpath=$testbindir;; 19317- *) dllsearchpath="$dllsearchpath:$testbindir";; 19318+ *) func_append dllsearchpath ":$testbindir";; 19319 esac 19320 ;; 19321 esac 19322@@ -4747,7 +5610,7 @@ func_mode_link () 19323 ;; 19324 *-*-rhapsody* | *-*-darwin1.[012]) 19325 # Rhapsody C and math libraries are in the System framework 19326- deplibs="$deplibs System.ltframework" 19327+ func_append deplibs " System.ltframework" 19328 continue 19329 ;; 19330 *-*-sco3.2v5* | *-*-sco5v6*) 19331@@ -4758,9 +5621,6 @@ func_mode_link () 19332 # Compiler inserts libc in the correct place for threads to work 19333 test "X$arg" = "X-lc" && continue 19334 ;; 19335- *-*-linux*) 19336- test "X$arg" = "X-lc" && continue 19337- ;; 19338 esac 19339 elif test "X$arg" = "X-lc_r"; then 19340 case $host in 19341@@ -4770,7 +5630,7 @@ func_mode_link () 19342 ;; 19343 esac 19344 fi 19345- deplibs="$deplibs $arg" 19346+ func_append deplibs " $arg" 19347 continue 19348 ;; 19349 19350@@ -4782,8 +5642,8 @@ func_mode_link () 19351 # Tru64 UNIX uses -model [arg] to determine the layout of C++ 19352 # classes, name mangling, and exception handling. 19353 # Darwin uses the -arch flag to determine output architecture. 19354- -model|-arch|-isysroot) 19355- compiler_flags="$compiler_flags $arg" 19356+ -model|-arch|-isysroot|--sysroot) 19357+ func_append compiler_flags " $arg" 19358 func_append compile_command " $arg" 19359 func_append finalize_command " $arg" 19360 prev=xcompiler 19361@@ -4791,12 +5651,12 @@ func_mode_link () 19362 ;; 19363 19364 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) 19365- compiler_flags="$compiler_flags $arg" 19366+ func_append compiler_flags " $arg" 19367 func_append compile_command " $arg" 19368 func_append finalize_command " $arg" 19369 case "$new_inherited_linker_flags " in 19370 *" $arg "*) ;; 19371- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; 19372+ * ) func_append new_inherited_linker_flags " $arg" ;; 19373 esac 19374 continue 19375 ;; 19376@@ -4863,13 +5723,17 @@ func_mode_link () 19377 # We need an absolute path. 19378 case $dir in 19379 [\\/]* | [A-Za-z]:[\\/]*) ;; 19380+ =*) 19381+ func_stripname '=' '' "$dir" 19382+ dir=$lt_sysroot$func_stripname_result 19383+ ;; 19384 *) 19385 func_fatal_error "only absolute run-paths are allowed" 19386 ;; 19387 esac 19388 case "$xrpath " in 19389 *" $dir "*) ;; 19390- *) xrpath="$xrpath $dir" ;; 19391+ *) func_append xrpath " $dir" ;; 19392 esac 19393 continue 19394 ;; 19395@@ -4922,8 +5786,8 @@ func_mode_link () 19396 for flag in $args; do 19397 IFS="$save_ifs" 19398 func_quote_for_eval "$flag" 19399- arg="$arg $func_quote_for_eval_result" 19400- compiler_flags="$compiler_flags $func_quote_for_eval_result" 19401+ func_append arg " $func_quote_for_eval_result" 19402+ func_append compiler_flags " $func_quote_for_eval_result" 19403 done 19404 IFS="$save_ifs" 19405 func_stripname ' ' '' "$arg" 19406@@ -4938,9 +5802,9 @@ func_mode_link () 19407 for flag in $args; do 19408 IFS="$save_ifs" 19409 func_quote_for_eval "$flag" 19410- arg="$arg $wl$func_quote_for_eval_result" 19411- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" 19412- linker_flags="$linker_flags $func_quote_for_eval_result" 19413+ func_append arg " $wl$func_quote_for_eval_result" 19414+ func_append compiler_flags " $wl$func_quote_for_eval_result" 19415+ func_append linker_flags " $func_quote_for_eval_result" 19416 done 19417 IFS="$save_ifs" 19418 func_stripname ' ' '' "$arg" 19419@@ -4968,24 +5832,27 @@ func_mode_link () 19420 arg="$func_quote_for_eval_result" 19421 ;; 19422 19423- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler 19424- # -r[0-9][0-9]* specifies the processor on the SGI compiler 19425- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler 19426- # +DA*, +DD* enable 64-bit mode on the HP compiler 19427- # -q* pass through compiler args for the IBM compiler 19428- # -m*, -t[45]*, -txscale* pass through architecture-specific 19429- # compiler args for GCC 19430- # -F/path gives path to uninstalled frameworks, gcc on darwin 19431- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC 19432- # @file GCC response files 19433- # -tp=* Portland pgcc target processor selection 19434+ # Flags to be passed through unchanged, with rationale: 19435+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler 19436+ # -r[0-9][0-9]* specify processor for the SGI compiler 19437+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler 19438+ # +DA*, +DD* enable 64-bit mode for the HP compiler 19439+ # -q* compiler args for the IBM compiler 19440+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC 19441+ # -F/path path to uninstalled frameworks, gcc on darwin 19442+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC 19443+ # @file GCC response files 19444+ # -tp=* Portland pgcc target processor selection 19445+ # --sysroot=* for sysroot support 19446+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization 19447 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ 19448- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) 19449+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ 19450+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) 19451 func_quote_for_eval "$arg" 19452 arg="$func_quote_for_eval_result" 19453 func_append compile_command " $arg" 19454 func_append finalize_command " $arg" 19455- compiler_flags="$compiler_flags $arg" 19456+ func_append compiler_flags " $arg" 19457 continue 19458 ;; 19459 19460@@ -4997,7 +5864,7 @@ func_mode_link () 19461 19462 *.$objext) 19463 # A standard object. 19464- objs="$objs $arg" 19465+ func_append objs " $arg" 19466 ;; 19467 19468 *.lo) 19469@@ -5028,7 +5895,7 @@ func_mode_link () 19470 19471 if test "$prev" = dlfiles; then 19472 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then 19473- dlfiles="$dlfiles $pic_object" 19474+ func_append dlfiles " $pic_object" 19475 prev= 19476 continue 19477 else 19478@@ -5040,7 +5907,7 @@ func_mode_link () 19479 # CHECK ME: I think I busted this. -Ossama 19480 if test "$prev" = dlprefiles; then 19481 # Preload the old-style object. 19482- dlprefiles="$dlprefiles $pic_object" 19483+ func_append dlprefiles " $pic_object" 19484 prev= 19485 fi 19486 19487@@ -5085,24 +5952,25 @@ func_mode_link () 19488 19489 *.$libext) 19490 # An archive. 19491- deplibs="$deplibs $arg" 19492- old_deplibs="$old_deplibs $arg" 19493+ func_append deplibs " $arg" 19494+ func_append old_deplibs " $arg" 19495 continue 19496 ;; 19497 19498 *.la) 19499 # A libtool-controlled library. 19500 19501+ func_resolve_sysroot "$arg" 19502 if test "$prev" = dlfiles; then 19503 # This library was specified with -dlopen. 19504- dlfiles="$dlfiles $arg" 19505+ func_append dlfiles " $func_resolve_sysroot_result" 19506 prev= 19507 elif test "$prev" = dlprefiles; then 19508 # The library was specified with -dlpreopen. 19509- dlprefiles="$dlprefiles $arg" 19510+ func_append dlprefiles " $func_resolve_sysroot_result" 19511 prev= 19512 else 19513- deplibs="$deplibs $arg" 19514+ func_append deplibs " $func_resolve_sysroot_result" 19515 fi 19516 continue 19517 ;; 19518@@ -5127,7 +5995,7 @@ func_mode_link () 19519 func_fatal_help "the \`$prevarg' option requires an argument" 19520 19521 if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then 19522- eval "arg=\"$export_dynamic_flag_spec\"" 19523+ eval arg=\"$export_dynamic_flag_spec\" 19524 func_append compile_command " $arg" 19525 func_append finalize_command " $arg" 19526 fi 19527@@ -5144,11 +6012,13 @@ func_mode_link () 19528 else 19529 shlib_search_path= 19530 fi 19531- eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" 19532- eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" 19533+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" 19534+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" 19535 19536 func_dirname "$output" "/" "" 19537 output_objdir="$func_dirname_result$objdir" 19538+ func_to_tool_file "$output_objdir/" 19539+ tool_output_objdir=$func_to_tool_file_result 19540 # Create the object directory. 19541 func_mkdir_p "$output_objdir" 19542 19543@@ -5169,12 +6039,12 @@ func_mode_link () 19544 # Find all interdependent deplibs by searching for libraries 19545 # that are linked more than once (e.g. -la -lb -la) 19546 for deplib in $deplibs; do 19547- if $opt_duplicate_deps ; then 19548+ if $opt_preserve_dup_deps ; then 19549 case "$libs " in 19550- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; 19551+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; 19552 esac 19553 fi 19554- libs="$libs $deplib" 19555+ func_append libs " $deplib" 19556 done 19557 19558 if test "$linkmode" = lib; then 19559@@ -5187,9 +6057,9 @@ func_mode_link () 19560 if $opt_duplicate_compiler_generated_deps; then 19561 for pre_post_dep in $predeps $postdeps; do 19562 case "$pre_post_deps " in 19563- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; 19564+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; 19565 esac 19566- pre_post_deps="$pre_post_deps $pre_post_dep" 19567+ func_append pre_post_deps " $pre_post_dep" 19568 done 19569 fi 19570 pre_post_deps= 19571@@ -5256,8 +6126,9 @@ func_mode_link () 19572 for lib in $dlprefiles; do 19573 # Ignore non-libtool-libs 19574 dependency_libs= 19575+ func_resolve_sysroot "$lib" 19576 case $lib in 19577- *.la) func_source "$lib" ;; 19578+ *.la) func_source "$func_resolve_sysroot_result" ;; 19579 esac 19580 19581 # Collect preopened libtool deplibs, except any this library 19582@@ -5267,7 +6138,7 @@ func_mode_link () 19583 deplib_base=$func_basename_result 19584 case " $weak_libs " in 19585 *" $deplib_base "*) ;; 19586- *) deplibs="$deplibs $deplib" ;; 19587+ *) func_append deplibs " $deplib" ;; 19588 esac 19589 done 19590 done 19591@@ -5288,11 +6159,11 @@ func_mode_link () 19592 compile_deplibs="$deplib $compile_deplibs" 19593 finalize_deplibs="$deplib $finalize_deplibs" 19594 else 19595- compiler_flags="$compiler_flags $deplib" 19596+ func_append compiler_flags " $deplib" 19597 if test "$linkmode" = lib ; then 19598 case "$new_inherited_linker_flags " in 19599 *" $deplib "*) ;; 19600- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; 19601+ * ) func_append new_inherited_linker_flags " $deplib" ;; 19602 esac 19603 fi 19604 fi 19605@@ -5377,7 +6248,7 @@ func_mode_link () 19606 if test "$linkmode" = lib ; then 19607 case "$new_inherited_linker_flags " in 19608 *" $deplib "*) ;; 19609- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; 19610+ * ) func_append new_inherited_linker_flags " $deplib" ;; 19611 esac 19612 fi 19613 fi 19614@@ -5390,7 +6261,8 @@ func_mode_link () 19615 test "$pass" = conv && continue 19616 newdependency_libs="$deplib $newdependency_libs" 19617 func_stripname '-L' '' "$deplib" 19618- newlib_search_path="$newlib_search_path $func_stripname_result" 19619+ func_resolve_sysroot "$func_stripname_result" 19620+ func_append newlib_search_path " $func_resolve_sysroot_result" 19621 ;; 19622 prog) 19623 if test "$pass" = conv; then 19624@@ -5404,7 +6276,8 @@ func_mode_link () 19625 finalize_deplibs="$deplib $finalize_deplibs" 19626 fi 19627 func_stripname '-L' '' "$deplib" 19628- newlib_search_path="$newlib_search_path $func_stripname_result" 19629+ func_resolve_sysroot "$func_stripname_result" 19630+ func_append newlib_search_path " $func_resolve_sysroot_result" 19631 ;; 19632 *) 19633 func_warning "\`-L' is ignored for archives/objects" 19634@@ -5415,17 +6288,21 @@ func_mode_link () 19635 -R*) 19636 if test "$pass" = link; then 19637 func_stripname '-R' '' "$deplib" 19638- dir=$func_stripname_result 19639+ func_resolve_sysroot "$func_stripname_result" 19640+ dir=$func_resolve_sysroot_result 19641 # Make sure the xrpath contains only unique directories. 19642 case "$xrpath " in 19643 *" $dir "*) ;; 19644- *) xrpath="$xrpath $dir" ;; 19645+ *) func_append xrpath " $dir" ;; 19646 esac 19647 fi 19648 deplibs="$deplib $deplibs" 19649 continue 19650 ;; 19651- *.la) lib="$deplib" ;; 19652+ *.la) 19653+ func_resolve_sysroot "$deplib" 19654+ lib=$func_resolve_sysroot_result 19655+ ;; 19656 *.$libext) 19657 if test "$pass" = conv; then 19658 deplibs="$deplib $deplibs" 19659@@ -5488,11 +6365,11 @@ func_mode_link () 19660 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then 19661 # If there is no dlopen support or we're linking statically, 19662 # we need to preload. 19663- newdlprefiles="$newdlprefiles $deplib" 19664+ func_append newdlprefiles " $deplib" 19665 compile_deplibs="$deplib $compile_deplibs" 19666 finalize_deplibs="$deplib $finalize_deplibs" 19667 else 19668- newdlfiles="$newdlfiles $deplib" 19669+ func_append newdlfiles " $deplib" 19670 fi 19671 fi 19672 continue 19673@@ -5538,7 +6415,7 @@ func_mode_link () 19674 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do 19675 case " $new_inherited_linker_flags " in 19676 *" $tmp_inherited_linker_flag "*) ;; 19677- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; 19678+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; 19679 esac 19680 done 19681 fi 19682@@ -5546,8 +6423,8 @@ func_mode_link () 19683 if test "$linkmode,$pass" = "lib,link" || 19684 test "$linkmode,$pass" = "prog,scan" || 19685 { test "$linkmode" != prog && test "$linkmode" != lib; }; then 19686- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" 19687- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" 19688+ test -n "$dlopen" && func_append dlfiles " $dlopen" 19689+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" 19690 fi 19691 19692 if test "$pass" = conv; then 19693@@ -5558,20 +6435,20 @@ func_mode_link () 19694 func_fatal_error "cannot find name of link library for \`$lib'" 19695 fi 19696 # It is a libtool convenience library, so add in its objects. 19697- convenience="$convenience $ladir/$objdir/$old_library" 19698- old_convenience="$old_convenience $ladir/$objdir/$old_library" 19699+ func_append convenience " $ladir/$objdir/$old_library" 19700+ func_append old_convenience " $ladir/$objdir/$old_library" 19701 elif test "$linkmode" != prog && test "$linkmode" != lib; then 19702 func_fatal_error "\`$lib' is not a convenience library" 19703 fi 19704 tmp_libs= 19705 for deplib in $dependency_libs; do 19706 deplibs="$deplib $deplibs" 19707- if $opt_duplicate_deps ; then 19708+ if $opt_preserve_dup_deps ; then 19709 case "$tmp_libs " in 19710- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; 19711+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; 19712 esac 19713 fi 19714- tmp_libs="$tmp_libs $deplib" 19715+ func_append tmp_libs " $deplib" 19716 done 19717 continue 19718 fi # $pass = conv 19719@@ -5579,9 +6456,15 @@ func_mode_link () 19720 19721 # Get the name of the library we link against. 19722 linklib= 19723- for l in $old_library $library_names; do 19724- linklib="$l" 19725- done 19726+ if test -n "$old_library" && 19727+ { test "$prefer_static_libs" = yes || 19728+ test "$prefer_static_libs,$installed" = "built,no"; }; then 19729+ linklib=$old_library 19730+ else 19731+ for l in $old_library $library_names; do 19732+ linklib="$l" 19733+ done 19734+ fi 19735 if test -z "$linklib"; then 19736 func_fatal_error "cannot find name of link library for \`$lib'" 19737 fi 19738@@ -5598,9 +6481,9 @@ func_mode_link () 19739 # statically, we need to preload. We also need to preload any 19740 # dependent libraries so libltdl's deplib preloader doesn't 19741 # bomb out in the load deplibs phase. 19742- dlprefiles="$dlprefiles $lib $dependency_libs" 19743+ func_append dlprefiles " $lib $dependency_libs" 19744 else 19745- newdlfiles="$newdlfiles $lib" 19746+ func_append newdlfiles " $lib" 19747 fi 19748 continue 19749 fi # $pass = dlopen 19750@@ -5622,14 +6505,14 @@ func_mode_link () 19751 19752 # Find the relevant object directory and library name. 19753 if test "X$installed" = Xyes; then 19754- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then 19755+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then 19756 func_warning "library \`$lib' was moved." 19757 dir="$ladir" 19758 absdir="$abs_ladir" 19759 libdir="$abs_ladir" 19760 else 19761- dir="$libdir" 19762- absdir="$libdir" 19763+ dir="$lt_sysroot$libdir" 19764+ absdir="$lt_sysroot$libdir" 19765 fi 19766 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes 19767 else 19768@@ -5637,12 +6520,12 @@ func_mode_link () 19769 dir="$ladir" 19770 absdir="$abs_ladir" 19771 # Remove this search path later 19772- notinst_path="$notinst_path $abs_ladir" 19773+ func_append notinst_path " $abs_ladir" 19774 else 19775 dir="$ladir/$objdir" 19776 absdir="$abs_ladir/$objdir" 19777 # Remove this search path later 19778- notinst_path="$notinst_path $abs_ladir" 19779+ func_append notinst_path " $abs_ladir" 19780 fi 19781 fi # $installed = yes 19782 func_stripname 'lib' '.la' "$laname" 19783@@ -5653,20 +6536,46 @@ func_mode_link () 19784 if test -z "$libdir" && test "$linkmode" = prog; then 19785 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" 19786 fi 19787- # Prefer using a static library (so that no silly _DYNAMIC symbols 19788- # are required to link). 19789- if test -n "$old_library"; then 19790- newdlprefiles="$newdlprefiles $dir/$old_library" 19791- # Keep a list of preopened convenience libraries to check 19792- # that they are being used correctly in the link pass. 19793- test -z "$libdir" && \ 19794- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" 19795- # Otherwise, use the dlname, so that lt_dlopen finds it. 19796- elif test -n "$dlname"; then 19797- newdlprefiles="$newdlprefiles $dir/$dlname" 19798- else 19799- newdlprefiles="$newdlprefiles $dir/$linklib" 19800- fi 19801+ case "$host" in 19802+ # special handling for platforms with PE-DLLs. 19803+ *cygwin* | *mingw* | *cegcc* ) 19804+ # Linker will automatically link against shared library if both 19805+ # static and shared are present. Therefore, ensure we extract 19806+ # symbols from the import library if a shared library is present 19807+ # (otherwise, the dlopen module name will be incorrect). We do 19808+ # this by putting the import library name into $newdlprefiles. 19809+ # We recover the dlopen module name by 'saving' the la file 19810+ # name in a special purpose variable, and (later) extracting the 19811+ # dlname from the la file. 19812+ if test -n "$dlname"; then 19813+ func_tr_sh "$dir/$linklib" 19814+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" 19815+ func_append newdlprefiles " $dir/$linklib" 19816+ else 19817+ func_append newdlprefiles " $dir/$old_library" 19818+ # Keep a list of preopened convenience libraries to check 19819+ # that they are being used correctly in the link pass. 19820+ test -z "$libdir" && \ 19821+ func_append dlpreconveniencelibs " $dir/$old_library" 19822+ fi 19823+ ;; 19824+ * ) 19825+ # Prefer using a static library (so that no silly _DYNAMIC symbols 19826+ # are required to link). 19827+ if test -n "$old_library"; then 19828+ func_append newdlprefiles " $dir/$old_library" 19829+ # Keep a list of preopened convenience libraries to check 19830+ # that they are being used correctly in the link pass. 19831+ test -z "$libdir" && \ 19832+ func_append dlpreconveniencelibs " $dir/$old_library" 19833+ # Otherwise, use the dlname, so that lt_dlopen finds it. 19834+ elif test -n "$dlname"; then 19835+ func_append newdlprefiles " $dir/$dlname" 19836+ else 19837+ func_append newdlprefiles " $dir/$linklib" 19838+ fi 19839+ ;; 19840+ esac 19841 fi # $pass = dlpreopen 19842 19843 if test -z "$libdir"; then 19844@@ -5684,7 +6593,7 @@ func_mode_link () 19845 19846 19847 if test "$linkmode" = prog && test "$pass" != link; then 19848- newlib_search_path="$newlib_search_path $ladir" 19849+ func_append newlib_search_path " $ladir" 19850 deplibs="$lib $deplibs" 19851 19852 linkalldeplibs=no 19853@@ -5697,7 +6606,8 @@ func_mode_link () 19854 for deplib in $dependency_libs; do 19855 case $deplib in 19856 -L*) func_stripname '-L' '' "$deplib" 19857- newlib_search_path="$newlib_search_path $func_stripname_result" 19858+ func_resolve_sysroot "$func_stripname_result" 19859+ func_append newlib_search_path " $func_resolve_sysroot_result" 19860 ;; 19861 esac 19862 # Need to link against all dependency_libs? 19863@@ -5708,12 +6618,12 @@ func_mode_link () 19864 # or/and link against static libraries 19865 newdependency_libs="$deplib $newdependency_libs" 19866 fi 19867- if $opt_duplicate_deps ; then 19868+ if $opt_preserve_dup_deps ; then 19869 case "$tmp_libs " in 19870- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; 19871+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; 19872 esac 19873 fi 19874- tmp_libs="$tmp_libs $deplib" 19875+ func_append tmp_libs " $deplib" 19876 done # for deplib 19877 continue 19878 fi # $linkmode = prog... 19879@@ -5728,7 +6638,7 @@ func_mode_link () 19880 # Make sure the rpath contains only unique directories. 19881 case "$temp_rpath:" in 19882 *"$absdir:"*) ;; 19883- *) temp_rpath="$temp_rpath$absdir:" ;; 19884+ *) func_append temp_rpath "$absdir:" ;; 19885 esac 19886 fi 19887 19888@@ -5740,7 +6650,7 @@ func_mode_link () 19889 *) 19890 case "$compile_rpath " in 19891 *" $absdir "*) ;; 19892- *) compile_rpath="$compile_rpath $absdir" 19893+ *) func_append compile_rpath " $absdir" ;; 19894 esac 19895 ;; 19896 esac 19897@@ -5749,7 +6659,7 @@ func_mode_link () 19898 *) 19899 case "$finalize_rpath " in 19900 *" $libdir "*) ;; 19901- *) finalize_rpath="$finalize_rpath $libdir" 19902+ *) func_append finalize_rpath " $libdir" ;; 19903 esac 19904 ;; 19905 esac 19906@@ -5774,12 +6684,12 @@ func_mode_link () 19907 case $host in 19908 *cygwin* | *mingw* | *cegcc*) 19909 # No point in relinking DLLs because paths are not encoded 19910- notinst_deplibs="$notinst_deplibs $lib" 19911+ func_append notinst_deplibs " $lib" 19912 need_relink=no 19913 ;; 19914 *) 19915 if test "$installed" = no; then 19916- notinst_deplibs="$notinst_deplibs $lib" 19917+ func_append notinst_deplibs " $lib" 19918 need_relink=yes 19919 fi 19920 ;; 19921@@ -5814,7 +6724,7 @@ func_mode_link () 19922 *) 19923 case "$compile_rpath " in 19924 *" $absdir "*) ;; 19925- *) compile_rpath="$compile_rpath $absdir" 19926+ *) func_append compile_rpath " $absdir" ;; 19927 esac 19928 ;; 19929 esac 19930@@ -5823,7 +6733,7 @@ func_mode_link () 19931 *) 19932 case "$finalize_rpath " in 19933 *" $libdir "*) ;; 19934- *) finalize_rpath="$finalize_rpath $libdir" 19935+ *) func_append finalize_rpath " $libdir" ;; 19936 esac 19937 ;; 19938 esac 19939@@ -5835,7 +6745,7 @@ func_mode_link () 19940 shift 19941 realname="$1" 19942 shift 19943- eval "libname=\"$libname_spec\"" 19944+ libname=`eval "\\$ECHO \"$libname_spec\""` 19945 # use dlname if we got it. it's perfectly good, no? 19946 if test -n "$dlname"; then 19947 soname="$dlname" 19948@@ -5848,7 +6758,7 @@ func_mode_link () 19949 versuffix="-$major" 19950 ;; 19951 esac 19952- eval "soname=\"$soname_spec\"" 19953+ eval soname=\"$soname_spec\" 19954 else 19955 soname="$realname" 19956 fi 19957@@ -5877,7 +6787,7 @@ func_mode_link () 19958 linklib=$newlib 19959 fi # test -n "$old_archive_from_expsyms_cmds" 19960 19961- if test "$linkmode" = prog || test "$mode" != relink; then 19962+ if test "$linkmode" = prog || test "$opt_mode" != relink; then 19963 add_shlibpath= 19964 add_dir= 19965 add= 19966@@ -5933,7 +6843,7 @@ func_mode_link () 19967 if test -n "$inst_prefix_dir"; then 19968 case $libdir in 19969 [\\/]*) 19970- add_dir="$add_dir -L$inst_prefix_dir$libdir" 19971+ func_append add_dir " -L$inst_prefix_dir$libdir" 19972 ;; 19973 esac 19974 fi 19975@@ -5955,7 +6865,7 @@ func_mode_link () 19976 if test -n "$add_shlibpath"; then 19977 case :$compile_shlibpath: in 19978 *":$add_shlibpath:"*) ;; 19979- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; 19980+ *) func_append compile_shlibpath "$add_shlibpath:" ;; 19981 esac 19982 fi 19983 if test "$linkmode" = prog; then 19984@@ -5969,13 +6879,13 @@ func_mode_link () 19985 test "$hardcode_shlibpath_var" = yes; then 19986 case :$finalize_shlibpath: in 19987 *":$libdir:"*) ;; 19988- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; 19989+ *) func_append finalize_shlibpath "$libdir:" ;; 19990 esac 19991 fi 19992 fi 19993 fi 19994 19995- if test "$linkmode" = prog || test "$mode" = relink; then 19996+ if test "$linkmode" = prog || test "$opt_mode" = relink; then 19997 add_shlibpath= 19998 add_dir= 19999 add= 20000@@ -5989,7 +6899,7 @@ func_mode_link () 20001 elif test "$hardcode_shlibpath_var" = yes; then 20002 case :$finalize_shlibpath: in 20003 *":$libdir:"*) ;; 20004- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; 20005+ *) func_append finalize_shlibpath "$libdir:" ;; 20006 esac 20007 add="-l$name" 20008 elif test "$hardcode_automatic" = yes; then 20009@@ -6001,12 +6911,12 @@ func_mode_link () 20010 fi 20011 else 20012 # We cannot seem to hardcode it, guess we'll fake it. 20013- add_dir="-L$libdir" 20014+ add_dir="-L$lt_sysroot$libdir" 20015 # Try looking first in the location we're being installed to. 20016 if test -n "$inst_prefix_dir"; then 20017 case $libdir in 20018 [\\/]*) 20019- add_dir="$add_dir -L$inst_prefix_dir$libdir" 20020+ func_append add_dir " -L$inst_prefix_dir$libdir" 20021 ;; 20022 esac 20023 fi 20024@@ -6083,27 +6993,33 @@ func_mode_link () 20025 temp_xrpath=$func_stripname_result 20026 case " $xrpath " in 20027 *" $temp_xrpath "*) ;; 20028- *) xrpath="$xrpath $temp_xrpath";; 20029+ *) func_append xrpath " $temp_xrpath";; 20030 esac;; 20031- *) temp_deplibs="$temp_deplibs $libdir";; 20032+ *) func_append temp_deplibs " $libdir";; 20033 esac 20034 done 20035 dependency_libs="$temp_deplibs" 20036 fi 20037 20038- newlib_search_path="$newlib_search_path $absdir" 20039+ func_append newlib_search_path " $absdir" 20040 # Link against this library 20041 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" 20042 # ... and its dependency_libs 20043 tmp_libs= 20044 for deplib in $dependency_libs; do 20045 newdependency_libs="$deplib $newdependency_libs" 20046- if $opt_duplicate_deps ; then 20047+ case $deplib in 20048+ -L*) func_stripname '-L' '' "$deplib" 20049+ func_resolve_sysroot "$func_stripname_result";; 20050+ *) func_resolve_sysroot "$deplib" ;; 20051+ esac 20052+ if $opt_preserve_dup_deps ; then 20053 case "$tmp_libs " in 20054- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; 20055+ *" $func_resolve_sysroot_result "*) 20056+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; 20057 esac 20058 fi 20059- tmp_libs="$tmp_libs $deplib" 20060+ func_append tmp_libs " $func_resolve_sysroot_result" 20061 done 20062 20063 if test "$link_all_deplibs" != no; then 20064@@ -6113,8 +7029,10 @@ func_mode_link () 20065 case $deplib in 20066 -L*) path="$deplib" ;; 20067 *.la) 20068+ func_resolve_sysroot "$deplib" 20069+ deplib=$func_resolve_sysroot_result 20070 func_dirname "$deplib" "" "." 20071- dir="$func_dirname_result" 20072+ dir=$func_dirname_result 20073 # We need an absolute path. 20074 case $dir in 20075 [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; 20076@@ -6130,7 +7048,7 @@ func_mode_link () 20077 case $host in 20078 *-*-darwin*) 20079 depdepl= 20080- deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` 20081+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` 20082 if test -n "$deplibrary_names" ; then 20083 for tmp in $deplibrary_names ; do 20084 depdepl=$tmp 20085@@ -6141,8 +7059,8 @@ func_mode_link () 20086 if test -z "$darwin_install_name"; then 20087 darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` 20088 fi 20089- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" 20090- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" 20091+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" 20092+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" 20093 path= 20094 fi 20095 fi 20096@@ -6152,7 +7070,7 @@ func_mode_link () 20097 ;; 20098 esac 20099 else 20100- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 20101+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 20102 test -z "$libdir" && \ 20103 func_fatal_error "\`$deplib' is not a valid libtool archive" 20104 test "$absdir" != "$libdir" && \ 20105@@ -6192,7 +7110,7 @@ func_mode_link () 20106 for dir in $newlib_search_path; do 20107 case "$lib_search_path " in 20108 *" $dir "*) ;; 20109- *) lib_search_path="$lib_search_path $dir" ;; 20110+ *) func_append lib_search_path " $dir" ;; 20111 esac 20112 done 20113 newlib_search_path= 20114@@ -6205,7 +7123,7 @@ func_mode_link () 20115 fi 20116 for var in $vars dependency_libs; do 20117 # Add libraries to $var in reverse order 20118- eval tmp_libs=\$$var 20119+ eval tmp_libs=\"\$$var\" 20120 new_libs= 20121 for deplib in $tmp_libs; do 20122 # FIXME: Pedantically, this is the right thing to do, so 20123@@ -6250,13 +7168,13 @@ func_mode_link () 20124 -L*) 20125 case " $tmp_libs " in 20126 *" $deplib "*) ;; 20127- *) tmp_libs="$tmp_libs $deplib" ;; 20128+ *) func_append tmp_libs " $deplib" ;; 20129 esac 20130 ;; 20131- *) tmp_libs="$tmp_libs $deplib" ;; 20132+ *) func_append tmp_libs " $deplib" ;; 20133 esac 20134 done 20135- eval $var=\$tmp_libs 20136+ eval $var=\"$tmp_libs\" 20137 done # for var 20138 fi 20139 # Last step: remove runtime libs from dependency_libs 20140@@ -6269,7 +7187,7 @@ func_mode_link () 20141 ;; 20142 esac 20143 if test -n "$i" ; then 20144- tmp_libs="$tmp_libs $i" 20145+ func_append tmp_libs " $i" 20146 fi 20147 done 20148 dependency_libs=$tmp_libs 20149@@ -6310,7 +7228,7 @@ func_mode_link () 20150 # Now set the variables for building old libraries. 20151 build_libtool_libs=no 20152 oldlibs="$output" 20153- objs="$objs$old_deplibs" 20154+ func_append objs "$old_deplibs" 20155 ;; 20156 20157 lib) 20158@@ -6319,8 +7237,8 @@ func_mode_link () 20159 lib*) 20160 func_stripname 'lib' '.la' "$outputname" 20161 name=$func_stripname_result 20162- eval "shared_ext=\"$shrext_cmds\"" 20163- eval "libname=\"$libname_spec\"" 20164+ eval shared_ext=\"$shrext_cmds\" 20165+ eval libname=\"$libname_spec\" 20166 ;; 20167 *) 20168 test "$module" = no && \ 20169@@ -6330,8 +7248,8 @@ func_mode_link () 20170 # Add the "lib" prefix for modules if required 20171 func_stripname '' '.la' "$outputname" 20172 name=$func_stripname_result 20173- eval "shared_ext=\"$shrext_cmds\"" 20174- eval "libname=\"$libname_spec\"" 20175+ eval shared_ext=\"$shrext_cmds\" 20176+ eval libname=\"$libname_spec\" 20177 else 20178 func_stripname '' '.la' "$outputname" 20179 libname=$func_stripname_result 20180@@ -6346,7 +7264,7 @@ func_mode_link () 20181 echo 20182 $ECHO "*** Warning: Linking the shared library $output against the non-libtool" 20183 $ECHO "*** objects $objs is not portable!" 20184- libobjs="$libobjs $objs" 20185+ func_append libobjs " $objs" 20186 fi 20187 fi 20188 20189@@ -6544,7 +7462,7 @@ func_mode_link () 20190 done 20191 20192 # Make executables depend on our current version. 20193- verstring="$verstring:${current}.0" 20194+ func_append verstring ":${current}.0" 20195 ;; 20196 20197 qnx) 20198@@ -6612,10 +7530,10 @@ func_mode_link () 20199 fi 20200 20201 func_generate_dlsyms "$libname" "$libname" "yes" 20202- libobjs="$libobjs $symfileobj" 20203+ func_append libobjs " $symfileobj" 20204 test "X$libobjs" = "X " && libobjs= 20205 20206- if test "$mode" != relink; then 20207+ if test "$opt_mode" != relink; then 20208 # Remove our outputs, but don't remove object files since they 20209 # may have been created when compiling PIC objects. 20210 removelist= 20211@@ -6631,7 +7549,7 @@ func_mode_link () 20212 continue 20213 fi 20214 fi 20215- removelist="$removelist $p" 20216+ func_append removelist " $p" 20217 ;; 20218 *) ;; 20219 esac 20220@@ -6642,7 +7560,7 @@ func_mode_link () 20221 20222 # Now set the variables for building old libraries. 20223 if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then 20224- oldlibs="$oldlibs $output_objdir/$libname.$libext" 20225+ func_append oldlibs " $output_objdir/$libname.$libext" 20226 20227 # Transform .lo files to .o files. 20228 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` 20229@@ -6659,10 +7577,11 @@ func_mode_link () 20230 # If the user specified any rpath flags, then add them. 20231 temp_xrpath= 20232 for libdir in $xrpath; do 20233- temp_xrpath="$temp_xrpath -R$libdir" 20234+ func_replace_sysroot "$libdir" 20235+ func_append temp_xrpath " -R$func_replace_sysroot_result" 20236 case "$finalize_rpath " in 20237 *" $libdir "*) ;; 20238- *) finalize_rpath="$finalize_rpath $libdir" ;; 20239+ *) func_append finalize_rpath " $libdir" ;; 20240 esac 20241 done 20242 if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then 20243@@ -6676,7 +7595,7 @@ func_mode_link () 20244 for lib in $old_dlfiles; do 20245 case " $dlprefiles $dlfiles " in 20246 *" $lib "*) ;; 20247- *) dlfiles="$dlfiles $lib" ;; 20248+ *) func_append dlfiles " $lib" ;; 20249 esac 20250 done 20251 20252@@ -6686,7 +7605,7 @@ func_mode_link () 20253 for lib in $old_dlprefiles; do 20254 case "$dlprefiles " in 20255 *" $lib "*) ;; 20256- *) dlprefiles="$dlprefiles $lib" ;; 20257+ *) func_append dlprefiles " $lib" ;; 20258 esac 20259 done 20260 20261@@ -6698,7 +7617,7 @@ func_mode_link () 20262 ;; 20263 *-*-rhapsody* | *-*-darwin1.[012]) 20264 # Rhapsody C library is in the System framework 20265- deplibs="$deplibs System.ltframework" 20266+ func_append deplibs " System.ltframework" 20267 ;; 20268 *-*-netbsd*) 20269 # Don't link with libc until the a.out ld.so is fixed. 20270@@ -6715,7 +7634,7 @@ func_mode_link () 20271 *) 20272 # Add libc to deplibs on all other systems if necessary. 20273 if test "$build_libtool_need_lc" = "yes"; then 20274- deplibs="$deplibs -lc" 20275+ func_append deplibs " -lc" 20276 fi 20277 ;; 20278 esac 20279@@ -6764,18 +7683,18 @@ EOF 20280 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 20281 case " $predeps $postdeps " in 20282 *" $i "*) 20283- newdeplibs="$newdeplibs $i" 20284+ func_append newdeplibs " $i" 20285 i="" 20286 ;; 20287 esac 20288 fi 20289 if test -n "$i" ; then 20290- eval "libname=\"$libname_spec\"" 20291- eval "deplib_matches=\"$library_names_spec\"" 20292+ libname=`eval "\\$ECHO \"$libname_spec\""` 20293+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` 20294 set dummy $deplib_matches; shift 20295 deplib_match=$1 20296 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then 20297- newdeplibs="$newdeplibs $i" 20298+ func_append newdeplibs " $i" 20299 else 20300 droppeddeps=yes 20301 echo 20302@@ -6789,7 +7708,7 @@ EOF 20303 fi 20304 ;; 20305 *) 20306- newdeplibs="$newdeplibs $i" 20307+ func_append newdeplibs " $i" 20308 ;; 20309 esac 20310 done 20311@@ -6807,18 +7726,18 @@ EOF 20312 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 20313 case " $predeps $postdeps " in 20314 *" $i "*) 20315- newdeplibs="$newdeplibs $i" 20316+ func_append newdeplibs " $i" 20317 i="" 20318 ;; 20319 esac 20320 fi 20321 if test -n "$i" ; then 20322- eval "libname=\"$libname_spec\"" 20323- eval "deplib_matches=\"$library_names_spec\"" 20324+ libname=`eval "\\$ECHO \"$libname_spec\""` 20325+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` 20326 set dummy $deplib_matches; shift 20327 deplib_match=$1 20328 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then 20329- newdeplibs="$newdeplibs $i" 20330+ func_append newdeplibs " $i" 20331 else 20332 droppeddeps=yes 20333 echo 20334@@ -6840,7 +7759,7 @@ EOF 20335 fi 20336 ;; 20337 *) 20338- newdeplibs="$newdeplibs $i" 20339+ func_append newdeplibs " $i" 20340 ;; 20341 esac 20342 done 20343@@ -6857,15 +7776,27 @@ EOF 20344 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 20345 case " $predeps $postdeps " in 20346 *" $a_deplib "*) 20347- newdeplibs="$newdeplibs $a_deplib" 20348+ func_append newdeplibs " $a_deplib" 20349 a_deplib="" 20350 ;; 20351 esac 20352 fi 20353 if test -n "$a_deplib" ; then 20354- eval "libname=\"$libname_spec\"" 20355+ libname=`eval "\\$ECHO \"$libname_spec\""` 20356+ if test -n "$file_magic_glob"; then 20357+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` 20358+ else 20359+ libnameglob=$libname 20360+ fi 20361+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` 20362 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do 20363- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` 20364+ if test "$want_nocaseglob" = yes; then 20365+ shopt -s nocaseglob 20366+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` 20367+ $nocaseglob 20368+ else 20369+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` 20370+ fi 20371 for potent_lib in $potential_libs; do 20372 # Follow soft links. 20373 if ls -lLd "$potent_lib" 2>/dev/null | 20374@@ -6885,10 +7816,10 @@ EOF 20375 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; 20376 esac 20377 done 20378- if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | 20379+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | 20380 $SED -e 10q | 20381 $EGREP "$file_magic_regex" > /dev/null; then 20382- newdeplibs="$newdeplibs $a_deplib" 20383+ func_append newdeplibs " $a_deplib" 20384 a_deplib="" 20385 break 2 20386 fi 20387@@ -6913,7 +7844,7 @@ EOF 20388 ;; 20389 *) 20390 # Add a -L argument. 20391- newdeplibs="$newdeplibs $a_deplib" 20392+ func_append newdeplibs " $a_deplib" 20393 ;; 20394 esac 20395 done # Gone through all deplibs. 20396@@ -6929,20 +7860,20 @@ EOF 20397 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 20398 case " $predeps $postdeps " in 20399 *" $a_deplib "*) 20400- newdeplibs="$newdeplibs $a_deplib" 20401+ func_append newdeplibs " $a_deplib" 20402 a_deplib="" 20403 ;; 20404 esac 20405 fi 20406 if test -n "$a_deplib" ; then 20407- eval "libname=\"$libname_spec\"" 20408+ libname=`eval "\\$ECHO \"$libname_spec\""` 20409 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do 20410 potential_libs=`ls $i/$libname[.-]* 2>/dev/null` 20411 for potent_lib in $potential_libs; do 20412 potlib="$potent_lib" # see symlink-check above in file_magic test 20413 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ 20414 $EGREP "$match_pattern_regex" > /dev/null; then 20415- newdeplibs="$newdeplibs $a_deplib" 20416+ func_append newdeplibs " $a_deplib" 20417 a_deplib="" 20418 break 2 20419 fi 20420@@ -6967,7 +7898,7 @@ EOF 20421 ;; 20422 *) 20423 # Add a -L argument. 20424- newdeplibs="$newdeplibs $a_deplib" 20425+ func_append newdeplibs " $a_deplib" 20426 ;; 20427 esac 20428 done # Gone through all deplibs. 20429@@ -7071,7 +8002,7 @@ EOF 20430 *) 20431 case " $deplibs " in 20432 *" -L$path/$objdir "*) 20433- new_libs="$new_libs -L$path/$objdir" ;; 20434+ func_append new_libs " -L$path/$objdir" ;; 20435 esac 20436 ;; 20437 esac 20438@@ -7081,10 +8012,10 @@ EOF 20439 -L*) 20440 case " $new_libs " in 20441 *" $deplib "*) ;; 20442- *) new_libs="$new_libs $deplib" ;; 20443+ *) func_append new_libs " $deplib" ;; 20444 esac 20445 ;; 20446- *) new_libs="$new_libs $deplib" ;; 20447+ *) func_append new_libs " $deplib" ;; 20448 esac 20449 done 20450 deplibs="$new_libs" 20451@@ -7101,10 +8032,12 @@ EOF 20452 hardcode_libdirs= 20453 dep_rpath= 20454 rpath="$finalize_rpath" 20455- test "$mode" != relink && rpath="$compile_rpath$rpath" 20456+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" 20457 for libdir in $rpath; do 20458 if test -n "$hardcode_libdir_flag_spec"; then 20459 if test -n "$hardcode_libdir_separator"; then 20460+ func_replace_sysroot "$libdir" 20461+ libdir=$func_replace_sysroot_result 20462 if test -z "$hardcode_libdirs"; then 20463 hardcode_libdirs="$libdir" 20464 else 20465@@ -7113,18 +8046,18 @@ EOF 20466 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 20467 ;; 20468 *) 20469- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" 20470+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" 20471 ;; 20472 esac 20473 fi 20474 else 20475- eval "flag=\"$hardcode_libdir_flag_spec\"" 20476- dep_rpath="$dep_rpath $flag" 20477+ eval flag=\"$hardcode_libdir_flag_spec\" 20478+ func_append dep_rpath " $flag" 20479 fi 20480 elif test -n "$runpath_var"; then 20481 case "$perm_rpath " in 20482 *" $libdir "*) ;; 20483- *) perm_rpath="$perm_rpath $libdir" ;; 20484+ *) func_apped perm_rpath " $libdir" ;; 20485 esac 20486 fi 20487 done 20488@@ -7133,40 +8066,38 @@ EOF 20489 test -n "$hardcode_libdirs"; then 20490 libdir="$hardcode_libdirs" 20491 if test -n "$hardcode_libdir_flag_spec_ld"; then 20492- eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" 20493+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" 20494 else 20495- eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" 20496+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" 20497 fi 20498 fi 20499 if test -n "$runpath_var" && test -n "$perm_rpath"; then 20500 # We should set the runpath_var. 20501 rpath= 20502 for dir in $perm_rpath; do 20503- rpath="$rpath$dir:" 20504+ func_append rpath "$dir:" 20505 done 20506- eval $runpath_var=\$rpath\$$runpath_var 20507- export $runpath_var 20508+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" 20509 fi 20510 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" 20511 fi 20512 20513 shlibpath="$finalize_shlibpath" 20514- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" 20515+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" 20516 if test -n "$shlibpath"; then 20517- eval $shlibpath_var=\$shlibpath\$$shlibpath_var 20518- export $shlibpath_var 20519+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" 20520 fi 20521 20522 # Get the real and link names of the library. 20523- eval "shared_ext=\"$shrext_cmds\"" 20524- eval "library_names=\"$library_names_spec\"" 20525+ eval shared_ext=\"$shrext_cmds\" 20526+ eval library_names=\"$library_names_spec\" 20527 set dummy $library_names 20528 shift 20529 realname="$1" 20530 shift 20531 20532 if test -n "$soname_spec"; then 20533- eval "soname=\"$soname_spec\"" 20534+ eval soname=\"$soname_spec\" 20535 else 20536 soname="$realname" 20537 fi 20538@@ -7178,7 +8109,7 @@ EOF 20539 linknames= 20540 for link 20541 do 20542- linknames="$linknames $link" 20543+ func_append linknames " $link" 20544 done 20545 20546 # Use standard objects if they are pic 20547@@ -7189,7 +8120,7 @@ EOF 20548 if test -n "$export_symbols" && test -n "$include_expsyms"; then 20549 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" 20550 export_symbols="$output_objdir/$libname.uexp" 20551- delfiles="$delfiles $export_symbols" 20552+ func_append delfiles " $export_symbols" 20553 fi 20554 20555 orig_export_symbols= 20556@@ -7220,13 +8151,45 @@ EOF 20557 $opt_dry_run || $RM $export_symbols 20558 cmds=$export_symbols_cmds 20559 save_ifs="$IFS"; IFS='~' 20560- for cmd in $cmds; do 20561+ for cmd1 in $cmds; do 20562 IFS="$save_ifs" 20563- eval "cmd=\"$cmd\"" 20564- func_len " $cmd" 20565- len=$func_len_result 20566- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then 20567+ # Take the normal branch if the nm_file_list_spec branch 20568+ # doesn't work or if tool conversion is not needed. 20569+ case $nm_file_list_spec~$to_tool_file_cmd in 20570+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) 20571+ try_normal_branch=yes 20572+ eval cmd=\"$cmd1\" 20573+ func_len " $cmd" 20574+ len=$func_len_result 20575+ ;; 20576+ *) 20577+ try_normal_branch=no 20578+ ;; 20579+ esac 20580+ if test "$try_normal_branch" = yes \ 20581+ && { test "$len" -lt "$max_cmd_len" \ 20582+ || test "$max_cmd_len" -le -1; } 20583+ then 20584+ func_show_eval "$cmd" 'exit $?' 20585+ skipped_export=false 20586+ elif test -n "$nm_file_list_spec"; then 20587+ func_basename "$output" 20588+ output_la=$func_basename_result 20589+ save_libobjs=$libobjs 20590+ save_output=$output 20591+ output=${output_objdir}/${output_la}.nm 20592+ func_to_tool_file "$output" 20593+ libobjs=$nm_file_list_spec$func_to_tool_file_result 20594+ func_append delfiles " $output" 20595+ func_verbose "creating $NM input file list: $output" 20596+ for obj in $save_libobjs; do 20597+ func_to_tool_file "$obj" 20598+ $ECHO "$func_to_tool_file_result" 20599+ done > "$output" 20600+ eval cmd=\"$cmd1\" 20601 func_show_eval "$cmd" 'exit $?' 20602+ output=$save_output 20603+ libobjs=$save_libobjs 20604 skipped_export=false 20605 else 20606 # The command line is too long to execute in one step. 20607@@ -7248,7 +8211,7 @@ EOF 20608 if test -n "$export_symbols" && test -n "$include_expsyms"; then 20609 tmp_export_symbols="$export_symbols" 20610 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" 20611- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" 20612+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' 20613 fi 20614 20615 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then 20616@@ -7260,7 +8223,7 @@ EOF 20617 # global variables. join(1) would be nice here, but unfortunately 20618 # isn't a blessed tool. 20619 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter 20620- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" 20621+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" 20622 export_symbols=$output_objdir/$libname.def 20623 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols 20624 fi 20625@@ -7270,7 +8233,7 @@ EOF 20626 case " $convenience " in 20627 *" $test_deplib "*) ;; 20628 *) 20629- tmp_deplibs="$tmp_deplibs $test_deplib" 20630+ func_append tmp_deplibs " $test_deplib" 20631 ;; 20632 esac 20633 done 20634@@ -7286,43 +8249,43 @@ EOF 20635 fi 20636 if test -n "$whole_archive_flag_spec"; then 20637 save_libobjs=$libobjs 20638- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" 20639+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" 20640 test "X$libobjs" = "X " && libobjs= 20641 else 20642 gentop="$output_objdir/${outputname}x" 20643- generated="$generated $gentop" 20644+ func_append generated " $gentop" 20645 20646 func_extract_archives $gentop $convenience 20647- libobjs="$libobjs $func_extract_archives_result" 20648+ func_append libobjs " $func_extract_archives_result" 20649 test "X$libobjs" = "X " && libobjs= 20650 fi 20651 fi 20652 20653 if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then 20654- eval "flag=\"$thread_safe_flag_spec\"" 20655- linker_flags="$linker_flags $flag" 20656+ eval flag=\"$thread_safe_flag_spec\" 20657+ func_append linker_flags " $flag" 20658 fi 20659 20660 # Make a backup of the uninstalled library when relinking 20661- if test "$mode" = relink; then 20662- $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? 20663+ if test "$opt_mode" = relink; then 20664+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? 20665 fi 20666 20667 # Do each of the archive commands. 20668 if test "$module" = yes && test -n "$module_cmds" ; then 20669 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then 20670- eval "test_cmds=\"$module_expsym_cmds\"" 20671+ eval test_cmds=\"$module_expsym_cmds\" 20672 cmds=$module_expsym_cmds 20673 else 20674- eval "test_cmds=\"$module_cmds\"" 20675+ eval test_cmds=\"$module_cmds\" 20676 cmds=$module_cmds 20677 fi 20678 else 20679 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then 20680- eval "test_cmds=\"$archive_expsym_cmds\"" 20681+ eval test_cmds=\"$archive_expsym_cmds\" 20682 cmds=$archive_expsym_cmds 20683 else 20684- eval "test_cmds=\"$archive_cmds\"" 20685+ eval test_cmds=\"$archive_cmds\" 20686 cmds=$archive_cmds 20687 fi 20688 fi 20689@@ -7366,10 +8329,13 @@ EOF 20690 echo 'INPUT (' > $output 20691 for obj in $save_libobjs 20692 do 20693- $ECHO "$obj" >> $output 20694+ func_to_tool_file "$obj" 20695+ $ECHO "$func_to_tool_file_result" >> $output 20696 done 20697 echo ')' >> $output 20698- delfiles="$delfiles $output" 20699+ func_append delfiles " $output" 20700+ func_to_tool_file "$output" 20701+ output=$func_to_tool_file_result 20702 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then 20703 output=${output_objdir}/${output_la}.lnk 20704 func_verbose "creating linker input file list: $output" 20705@@ -7383,15 +8349,17 @@ EOF 20706 fi 20707 for obj 20708 do 20709- $ECHO "$obj" >> $output 20710+ func_to_tool_file "$obj" 20711+ $ECHO "$func_to_tool_file_result" >> $output 20712 done 20713- delfiles="$delfiles $output" 20714- output=$firstobj\"$file_list_spec$output\" 20715+ func_append delfiles " $output" 20716+ func_to_tool_file "$output" 20717+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" 20718 else 20719 if test -n "$save_libobjs"; then 20720 func_verbose "creating reloadable object files..." 20721 output=$output_objdir/$output_la-${k}.$objext 20722- eval "test_cmds=\"$reload_cmds\"" 20723+ eval test_cmds=\"$reload_cmds\" 20724 func_len " $test_cmds" 20725 len0=$func_len_result 20726 len=$len0 20727@@ -7411,12 +8379,12 @@ EOF 20728 if test "$k" -eq 1 ; then 20729 # The first file doesn't have a previous command to add. 20730 reload_objs=$objlist 20731- eval "concat_cmds=\"$reload_cmds\"" 20732+ eval concat_cmds=\"$reload_cmds\" 20733 else 20734 # All subsequent reloadable object files will link in 20735 # the last one created. 20736 reload_objs="$objlist $last_robj" 20737- eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" 20738+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" 20739 fi 20740 last_robj=$output_objdir/$output_la-${k}.$objext 20741 func_arith $k + 1 20742@@ -7433,11 +8401,11 @@ EOF 20743 # files will link in the last one created. 20744 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 20745 reload_objs="$objlist $last_robj" 20746- eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" 20747+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" 20748 if test -n "$last_robj"; then 20749- eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" 20750+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" 20751 fi 20752- delfiles="$delfiles $output" 20753+ func_append delfiles " $output" 20754 20755 else 20756 output= 20757@@ -7450,9 +8418,9 @@ EOF 20758 libobjs=$output 20759 # Append the command to create the export file. 20760 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 20761- eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" 20762+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" 20763 if test -n "$last_robj"; then 20764- eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" 20765+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" 20766 fi 20767 fi 20768 20769@@ -7471,7 +8439,7 @@ EOF 20770 lt_exit=$? 20771 20772 # Restore the uninstalled library and exit 20773- if test "$mode" = relink; then 20774+ if test "$opt_mode" = relink; then 20775 ( cd "$output_objdir" && \ 20776 $RM "${realname}T" && \ 20777 $MV "${realname}U" "$realname" ) 20778@@ -7492,7 +8460,7 @@ EOF 20779 if test -n "$export_symbols" && test -n "$include_expsyms"; then 20780 tmp_export_symbols="$export_symbols" 20781 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" 20782- $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" 20783+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' 20784 fi 20785 20786 if test -n "$orig_export_symbols"; then 20787@@ -7504,7 +8472,7 @@ EOF 20788 # global variables. join(1) would be nice here, but unfortunately 20789 # isn't a blessed tool. 20790 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter 20791- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" 20792+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" 20793 export_symbols=$output_objdir/$libname.def 20794 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols 20795 fi 20796@@ -7515,7 +8483,7 @@ EOF 20797 output=$save_output 20798 20799 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then 20800- eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" 20801+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" 20802 test "X$libobjs" = "X " && libobjs= 20803 fi 20804 # Expand the library linking commands again to reset the 20805@@ -7539,23 +8507,23 @@ EOF 20806 20807 if test -n "$delfiles"; then 20808 # Append the command to remove temporary files to $cmds. 20809- eval "cmds=\"\$cmds~\$RM $delfiles\"" 20810+ eval cmds=\"\$cmds~\$RM $delfiles\" 20811 fi 20812 20813 # Add any objects from preloaded convenience libraries 20814 if test -n "$dlprefiles"; then 20815 gentop="$output_objdir/${outputname}x" 20816- generated="$generated $gentop" 20817+ func_append generated " $gentop" 20818 20819 func_extract_archives $gentop $dlprefiles 20820- libobjs="$libobjs $func_extract_archives_result" 20821+ func_append libobjs " $func_extract_archives_result" 20822 test "X$libobjs" = "X " && libobjs= 20823 fi 20824 20825 save_ifs="$IFS"; IFS='~' 20826 for cmd in $cmds; do 20827 IFS="$save_ifs" 20828- eval "cmd=\"$cmd\"" 20829+ eval cmd=\"$cmd\" 20830 $opt_silent || { 20831 func_quote_for_expand "$cmd" 20832 eval "func_echo $func_quote_for_expand_result" 20833@@ -7564,7 +8532,7 @@ EOF 20834 lt_exit=$? 20835 20836 # Restore the uninstalled library and exit 20837- if test "$mode" = relink; then 20838+ if test "$opt_mode" = relink; then 20839 ( cd "$output_objdir" && \ 20840 $RM "${realname}T" && \ 20841 $MV "${realname}U" "$realname" ) 20842@@ -7576,8 +8544,8 @@ EOF 20843 IFS="$save_ifs" 20844 20845 # Restore the uninstalled library and exit 20846- if test "$mode" = relink; then 20847- $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? 20848+ if test "$opt_mode" = relink; then 20849+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? 20850 20851 if test -n "$convenience"; then 20852 if test -z "$whole_archive_flag_spec"; then 20853@@ -7656,17 +8624,20 @@ EOF 20854 20855 if test -n "$convenience"; then 20856 if test -n "$whole_archive_flag_spec"; then 20857- eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" 20858+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" 20859 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` 20860 else 20861 gentop="$output_objdir/${obj}x" 20862- generated="$generated $gentop" 20863+ func_append generated " $gentop" 20864 20865 func_extract_archives $gentop $convenience 20866 reload_conv_objs="$reload_objs $func_extract_archives_result" 20867 fi 20868 fi 20869 20870+ # If we're not building shared, we need to use non_pic_objs 20871+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" 20872+ 20873 # Create the old-style object. 20874 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test 20875 20876@@ -7690,7 +8661,7 @@ EOF 20877 # Create an invalid libtool object if no PIC, so that we don't 20878 # accidentally link it into a program. 20879 # $show "echo timestamp > $libobj" 20880- # $opt_dry_run || echo timestamp > $libobj || exit $? 20881+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? 20882 exit $EXIT_SUCCESS 20883 fi 20884 20885@@ -7740,8 +8711,8 @@ EOF 20886 if test "$tagname" = CXX ; then 20887 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 20888 10.[0123]) 20889- compile_command="$compile_command ${wl}-bind_at_load" 20890- finalize_command="$finalize_command ${wl}-bind_at_load" 20891+ func_append compile_command " ${wl}-bind_at_load" 20892+ func_append finalize_command " ${wl}-bind_at_load" 20893 ;; 20894 esac 20895 fi 20896@@ -7761,7 +8732,7 @@ EOF 20897 *) 20898 case " $compile_deplibs " in 20899 *" -L$path/$objdir "*) 20900- new_libs="$new_libs -L$path/$objdir" ;; 20901+ func_append new_libs " -L$path/$objdir" ;; 20902 esac 20903 ;; 20904 esac 20905@@ -7771,17 +8742,17 @@ EOF 20906 -L*) 20907 case " $new_libs " in 20908 *" $deplib "*) ;; 20909- *) new_libs="$new_libs $deplib" ;; 20910+ *) func_append new_libs " $deplib" ;; 20911 esac 20912 ;; 20913- *) new_libs="$new_libs $deplib" ;; 20914+ *) func_append new_libs " $deplib" ;; 20915 esac 20916 done 20917 compile_deplibs="$new_libs" 20918 20919 20920- compile_command="$compile_command $compile_deplibs" 20921- finalize_command="$finalize_command $finalize_deplibs" 20922+ func_append compile_command " $compile_deplibs" 20923+ func_append finalize_command " $finalize_deplibs" 20924 20925 if test -n "$rpath$xrpath"; then 20926 # If the user specified any rpath flags, then add them. 20927@@ -7789,7 +8760,7 @@ EOF 20928 # This is the magic to use -rpath. 20929 case "$finalize_rpath " in 20930 *" $libdir "*) ;; 20931- *) finalize_rpath="$finalize_rpath $libdir" ;; 20932+ *) func_append finalize_rpath " $libdir" ;; 20933 esac 20934 done 20935 fi 20936@@ -7808,18 +8779,18 @@ EOF 20937 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 20938 ;; 20939 *) 20940- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" 20941+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" 20942 ;; 20943 esac 20944 fi 20945 else 20946- eval "flag=\"$hardcode_libdir_flag_spec\"" 20947- rpath="$rpath $flag" 20948+ eval flag=\"$hardcode_libdir_flag_spec\" 20949+ func_append rpath " $flag" 20950 fi 20951 elif test -n "$runpath_var"; then 20952 case "$perm_rpath " in 20953 *" $libdir "*) ;; 20954- *) perm_rpath="$perm_rpath $libdir" ;; 20955+ *) func_append perm_rpath " $libdir" ;; 20956 esac 20957 fi 20958 case $host in 20959@@ -7828,12 +8799,12 @@ EOF 20960 case :$dllsearchpath: in 20961 *":$libdir:"*) ;; 20962 ::) dllsearchpath=$libdir;; 20963- *) dllsearchpath="$dllsearchpath:$libdir";; 20964+ *) func_append dllsearchpath ":$libdir";; 20965 esac 20966 case :$dllsearchpath: in 20967 *":$testbindir:"*) ;; 20968 ::) dllsearchpath=$testbindir;; 20969- *) dllsearchpath="$dllsearchpath:$testbindir";; 20970+ *) func_append dllsearchpath ":$testbindir";; 20971 esac 20972 ;; 20973 esac 20974@@ -7842,7 +8813,7 @@ EOF 20975 if test -n "$hardcode_libdir_separator" && 20976 test -n "$hardcode_libdirs"; then 20977 libdir="$hardcode_libdirs" 20978- eval "rpath=\" $hardcode_libdir_flag_spec\"" 20979+ eval rpath=\" $hardcode_libdir_flag_spec\" 20980 fi 20981 compile_rpath="$rpath" 20982 20983@@ -7859,18 +8830,18 @@ EOF 20984 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) 20985 ;; 20986 *) 20987- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" 20988+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" 20989 ;; 20990 esac 20991 fi 20992 else 20993- eval "flag=\"$hardcode_libdir_flag_spec\"" 20994- rpath="$rpath $flag" 20995+ eval flag=\"$hardcode_libdir_flag_spec\" 20996+ func_append rpath " $flag" 20997 fi 20998 elif test -n "$runpath_var"; then 20999 case "$finalize_perm_rpath " in 21000 *" $libdir "*) ;; 21001- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; 21002+ *) func_append finalize_perm_rpath " $libdir" ;; 21003 esac 21004 fi 21005 done 21006@@ -7878,7 +8849,7 @@ EOF 21007 if test -n "$hardcode_libdir_separator" && 21008 test -n "$hardcode_libdirs"; then 21009 libdir="$hardcode_libdirs" 21010- eval "rpath=\" $hardcode_libdir_flag_spec\"" 21011+ eval rpath=\" $hardcode_libdir_flag_spec\" 21012 fi 21013 finalize_rpath="$rpath" 21014 21015@@ -7921,6 +8892,12 @@ EOF 21016 exit_status=0 21017 func_show_eval "$link_command" 'exit_status=$?' 21018 21019+ if test -n "$postlink_cmds"; then 21020+ func_to_tool_file "$output" 21021+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` 21022+ func_execute_cmds "$postlink_cmds" 'exit $?' 21023+ fi 21024+ 21025 # Delete the generated files. 21026 if test -f "$output_objdir/${outputname}S.${objext}"; then 21027 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' 21028@@ -7943,7 +8920,7 @@ EOF 21029 # We should set the runpath_var. 21030 rpath= 21031 for dir in $perm_rpath; do 21032- rpath="$rpath$dir:" 21033+ func_append rpath "$dir:" 21034 done 21035 compile_var="$runpath_var=\"$rpath\$$runpath_var\" " 21036 fi 21037@@ -7951,7 +8928,7 @@ EOF 21038 # We should set the runpath_var. 21039 rpath= 21040 for dir in $finalize_perm_rpath; do 21041- rpath="$rpath$dir:" 21042+ func_append rpath "$dir:" 21043 done 21044 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " 21045 fi 21046@@ -7966,6 +8943,13 @@ EOF 21047 $opt_dry_run || $RM $output 21048 # Link the executable and exit 21049 func_show_eval "$link_command" 'exit $?' 21050+ 21051+ if test -n "$postlink_cmds"; then 21052+ func_to_tool_file "$output" 21053+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` 21054+ func_execute_cmds "$postlink_cmds" 'exit $?' 21055+ fi 21056+ 21057 exit $EXIT_SUCCESS 21058 fi 21059 21060@@ -7999,6 +8983,12 @@ EOF 21061 21062 func_show_eval "$link_command" 'exit $?' 21063 21064+ if test -n "$postlink_cmds"; then 21065+ func_to_tool_file "$output_objdir/$outputname" 21066+ 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'` 21067+ func_execute_cmds "$postlink_cmds" 'exit $?' 21068+ fi 21069+ 21070 # Now create the wrapper script. 21071 func_verbose "creating $output" 21072 21073@@ -8096,7 +9086,7 @@ EOF 21074 else 21075 oldobjs="$old_deplibs $non_pic_objects" 21076 if test "$preload" = yes && test -f "$symfileobj"; then 21077- oldobjs="$oldobjs $symfileobj" 21078+ func_append oldobjs " $symfileobj" 21079 fi 21080 fi 21081 addlibs="$old_convenience" 21082@@ -8104,10 +9094,10 @@ EOF 21083 21084 if test -n "$addlibs"; then 21085 gentop="$output_objdir/${outputname}x" 21086- generated="$generated $gentop" 21087+ func_append generated " $gentop" 21088 21089 func_extract_archives $gentop $addlibs 21090- oldobjs="$oldobjs $func_extract_archives_result" 21091+ func_append oldobjs " $func_extract_archives_result" 21092 fi 21093 21094 # Do each command in the archive commands. 21095@@ -8118,10 +9108,10 @@ EOF 21096 # Add any objects from preloaded convenience libraries 21097 if test -n "$dlprefiles"; then 21098 gentop="$output_objdir/${outputname}x" 21099- generated="$generated $gentop" 21100+ func_append generated " $gentop" 21101 21102 func_extract_archives $gentop $dlprefiles 21103- oldobjs="$oldobjs $func_extract_archives_result" 21104+ func_append oldobjs " $func_extract_archives_result" 21105 fi 21106 21107 # POSIX demands no paths to be encoded in archives. We have 21108@@ -8139,7 +9129,7 @@ EOF 21109 else 21110 echo "copying selected object files to avoid basename conflicts..." 21111 gentop="$output_objdir/${outputname}x" 21112- generated="$generated $gentop" 21113+ func_append generated " $gentop" 21114 func_mkdir_p "$gentop" 21115 save_oldobjs=$oldobjs 21116 oldobjs= 21117@@ -8163,18 +9153,28 @@ EOF 21118 esac 21119 done 21120 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" 21121- oldobjs="$oldobjs $gentop/$newobj" 21122+ func_append oldobjs " $gentop/$newobj" 21123 ;; 21124- *) oldobjs="$oldobjs $obj" ;; 21125+ *) func_append oldobjs " $obj" ;; 21126 esac 21127 done 21128 fi 21129- eval "cmds=\"$old_archive_cmds\"" 21130+ eval cmds=\"$old_archive_cmds\" 21131 21132 func_len " $cmds" 21133 len=$func_len_result 21134 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then 21135 cmds=$old_archive_cmds 21136+ elif test -n "$archiver_list_spec"; then 21137+ func_verbose "using command file archive linking..." 21138+ for obj in $oldobjs 21139+ do 21140+ func_to_tool_file "$obj" 21141+ $ECHO "$func_to_tool_file_result" 21142+ done > $output_objdir/$libname.libcmd 21143+ func_to_tool_file "$output_objdir/$libname.libcmd" 21144+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" 21145+ cmds=$old_archive_cmds 21146 else 21147 # the command line is too long to link in one step, link in parts 21148 func_verbose "using piecewise archive linking..." 21149@@ -8189,7 +9189,7 @@ EOF 21150 do 21151 last_oldobj=$obj 21152 done 21153- eval "test_cmds=\"$old_archive_cmds\"" 21154+ eval test_cmds=\"$old_archive_cmds\" 21155 func_len " $test_cmds" 21156 len0=$func_len_result 21157 len=$len0 21158@@ -8208,7 +9208,7 @@ EOF 21159 RANLIB=$save_RANLIB 21160 fi 21161 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 21162- eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" 21163+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" 21164 objlist= 21165 len=$len0 21166 fi 21167@@ -8216,9 +9216,9 @@ EOF 21168 RANLIB=$save_RANLIB 21169 oldobjs=$objlist 21170 if test "X$oldobjs" = "X" ; then 21171- eval "cmds=\"\$concat_cmds\"" 21172+ eval cmds=\"\$concat_cmds\" 21173 else 21174- eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" 21175+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" 21176 fi 21177 fi 21178 fi 21179@@ -8268,12 +9268,23 @@ EOF 21180 *.la) 21181 func_basename "$deplib" 21182 name="$func_basename_result" 21183- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 21184+ func_resolve_sysroot "$deplib" 21185+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` 21186 test -z "$libdir" && \ 21187 func_fatal_error "\`$deplib' is not a valid libtool archive" 21188- newdependency_libs="$newdependency_libs $libdir/$name" 21189+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" 21190+ ;; 21191+ -L*) 21192+ func_stripname -L '' "$deplib" 21193+ func_replace_sysroot "$func_stripname_result" 21194+ func_append newdependency_libs " -L$func_replace_sysroot_result" 21195 ;; 21196- *) newdependency_libs="$newdependency_libs $deplib" ;; 21197+ -R*) 21198+ func_stripname -R '' "$deplib" 21199+ func_replace_sysroot "$func_stripname_result" 21200+ func_append newdependency_libs " -R$func_replace_sysroot_result" 21201+ ;; 21202+ *) func_append newdependency_libs " $deplib" ;; 21203 esac 21204 done 21205 dependency_libs="$newdependency_libs" 21206@@ -8284,12 +9295,14 @@ EOF 21207 *.la) 21208 func_basename "$lib" 21209 name="$func_basename_result" 21210- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` 21211+ func_resolve_sysroot "$lib" 21212+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` 21213+ 21214 test -z "$libdir" && \ 21215 func_fatal_error "\`$lib' is not a valid libtool archive" 21216- newdlfiles="$newdlfiles $libdir/$name" 21217+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" 21218 ;; 21219- *) newdlfiles="$newdlfiles $lib" ;; 21220+ *) func_append newdlfiles " $lib" ;; 21221 esac 21222 done 21223 dlfiles="$newdlfiles" 21224@@ -8303,10 +9316,11 @@ EOF 21225 # the library: 21226 func_basename "$lib" 21227 name="$func_basename_result" 21228- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` 21229+ func_resolve_sysroot "$lib" 21230+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` 21231 test -z "$libdir" && \ 21232 func_fatal_error "\`$lib' is not a valid libtool archive" 21233- newdlprefiles="$newdlprefiles $libdir/$name" 21234+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" 21235 ;; 21236 esac 21237 done 21238@@ -8318,7 +9332,7 @@ EOF 21239 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; 21240 *) abs=`pwd`"/$lib" ;; 21241 esac 21242- newdlfiles="$newdlfiles $abs" 21243+ func_append newdlfiles " $abs" 21244 done 21245 dlfiles="$newdlfiles" 21246 newdlprefiles= 21247@@ -8327,7 +9341,7 @@ EOF 21248 [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; 21249 *) abs=`pwd`"/$lib" ;; 21250 esac 21251- newdlprefiles="$newdlprefiles $abs" 21252+ func_append newdlprefiles " $abs" 21253 done 21254 dlprefiles="$newdlprefiles" 21255 fi 21256@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" 21257 exit $EXIT_SUCCESS 21258 } 21259 21260-{ test "$mode" = link || test "$mode" = relink; } && 21261+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && 21262 func_mode_link ${1+"$@"} 21263 21264 21265@@ -8432,9 +9446,9 @@ func_mode_uninstall () 21266 for arg 21267 do 21268 case $arg in 21269- -f) RM="$RM $arg"; rmforce=yes ;; 21270- -*) RM="$RM $arg" ;; 21271- *) files="$files $arg" ;; 21272+ -f) func_append RM " $arg"; rmforce=yes ;; 21273+ -*) func_append RM " $arg" ;; 21274+ *) func_append files " $arg" ;; 21275 esac 21276 done 21277 21278@@ -8443,24 +9457,23 @@ func_mode_uninstall () 21279 21280 rmdirs= 21281 21282- origobjdir="$objdir" 21283 for file in $files; do 21284 func_dirname "$file" "" "." 21285 dir="$func_dirname_result" 21286 if test "X$dir" = X.; then 21287- objdir="$origobjdir" 21288+ odir="$objdir" 21289 else 21290- objdir="$dir/$origobjdir" 21291+ odir="$dir/$objdir" 21292 fi 21293 func_basename "$file" 21294 name="$func_basename_result" 21295- test "$mode" = uninstall && objdir="$dir" 21296+ test "$opt_mode" = uninstall && odir="$dir" 21297 21298- # Remember objdir for removal later, being careful to avoid duplicates 21299- if test "$mode" = clean; then 21300+ # Remember odir for removal later, being careful to avoid duplicates 21301+ if test "$opt_mode" = clean; then 21302 case " $rmdirs " in 21303- *" $objdir "*) ;; 21304- *) rmdirs="$rmdirs $objdir" ;; 21305+ *" $odir "*) ;; 21306+ *) func_append rmdirs " $odir" ;; 21307 esac 21308 fi 21309 21310@@ -8486,18 +9499,17 @@ func_mode_uninstall () 21311 21312 # Delete the libtool libraries and symlinks. 21313 for n in $library_names; do 21314- rmfiles="$rmfiles $objdir/$n" 21315+ func_append rmfiles " $odir/$n" 21316 done 21317- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" 21318+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" 21319 21320- case "$mode" in 21321+ case "$opt_mode" in 21322 clean) 21323- case " $library_names " in 21324- # " " in the beginning catches empty $dlname 21325+ case " $library_names " in 21326 *" $dlname "*) ;; 21327- *) rmfiles="$rmfiles $objdir/$dlname" ;; 21328+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; 21329 esac 21330- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" 21331+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" 21332 ;; 21333 uninstall) 21334 if test -n "$library_names"; then 21335@@ -8525,19 +9537,19 @@ func_mode_uninstall () 21336 # Add PIC object to the list of files to remove. 21337 if test -n "$pic_object" && 21338 test "$pic_object" != none; then 21339- rmfiles="$rmfiles $dir/$pic_object" 21340+ func_append rmfiles " $dir/$pic_object" 21341 fi 21342 21343 # Add non-PIC object to the list of files to remove. 21344 if test -n "$non_pic_object" && 21345 test "$non_pic_object" != none; then 21346- rmfiles="$rmfiles $dir/$non_pic_object" 21347+ func_append rmfiles " $dir/$non_pic_object" 21348 fi 21349 fi 21350 ;; 21351 21352 *) 21353- if test "$mode" = clean ; then 21354+ if test "$opt_mode" = clean ; then 21355 noexename=$name 21356 case $file in 21357 *.exe) 21358@@ -8547,7 +9559,7 @@ func_mode_uninstall () 21359 noexename=$func_stripname_result 21360 # $file with .exe has already been added to rmfiles, 21361 # add $file without .exe 21362- rmfiles="$rmfiles $file" 21363+ func_append rmfiles " $file" 21364 ;; 21365 esac 21366 # Do a test to see if this is a libtool program. 21367@@ -8556,7 +9568,7 @@ func_mode_uninstall () 21368 func_ltwrapper_scriptname "$file" 21369 relink_command= 21370 func_source $func_ltwrapper_scriptname_result 21371- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" 21372+ func_append rmfiles " $func_ltwrapper_scriptname_result" 21373 else 21374 relink_command= 21375 func_source $dir/$noexename 21376@@ -8564,12 +9576,12 @@ func_mode_uninstall () 21377 21378 # note $name still contains .exe if it was in $file originally 21379 # as does the version of $file that was added into $rmfiles 21380- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" 21381+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" 21382 if test "$fast_install" = yes && test -n "$relink_command"; then 21383- rmfiles="$rmfiles $objdir/lt-$name" 21384+ func_append rmfiles " $odir/lt-$name" 21385 fi 21386 if test "X$noexename" != "X$name" ; then 21387- rmfiles="$rmfiles $objdir/lt-${noexename}.c" 21388+ func_append rmfiles " $odir/lt-${noexename}.c" 21389 fi 21390 fi 21391 fi 21392@@ -8577,7 +9589,6 @@ func_mode_uninstall () 21393 esac 21394 func_show_eval "$RM $rmfiles" 'exit_status=1' 21395 done 21396- objdir="$origobjdir" 21397 21398 # Try to remove the ${objdir}s in the directories where we deleted files 21399 for dir in $rmdirs; do 21400@@ -8589,16 +9600,16 @@ func_mode_uninstall () 21401 exit $exit_status 21402 } 21403 21404-{ test "$mode" = uninstall || test "$mode" = clean; } && 21405+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && 21406 func_mode_uninstall ${1+"$@"} 21407 21408-test -z "$mode" && { 21409+test -z "$opt_mode" && { 21410 help="$generic_help" 21411 func_fatal_help "you must specify a MODE" 21412 } 21413 21414 test -z "$exec_cmd" && \ 21415- func_fatal_help "invalid operation mode \`$mode'" 21416+ func_fatal_help "invalid operation mode \`$opt_mode'" 21417 21418 if test -n "$exec_cmd"; then 21419 eval exec "$exec_cmd" 21420diff --git a/ltoptions.m4 b/ltoptions.m4 21421index 5ef12ced2a8..17cfd51c0b3 100644 21422--- a/ltoptions.m4 21423+++ b/ltoptions.m4 21424@@ -8,7 +8,7 @@ 21425 # unlimited permission to copy and/or distribute it, with or without 21426 # modifications, as long as this notice is preserved. 21427 21428-# serial 6 ltoptions.m4 21429+# serial 7 ltoptions.m4 21430 21431 # This is to help aclocal find these macros, as it can't see m4_define. 21432 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) 21433diff --git a/ltversion.m4 b/ltversion.m4 21434index bf87f77132d..9c7b5d41185 100644 21435--- a/ltversion.m4 21436+++ b/ltversion.m4 21437@@ -7,17 +7,17 @@ 21438 # unlimited permission to copy and/or distribute it, with or without 21439 # modifications, as long as this notice is preserved. 21440 21441-# Generated from ltversion.in. 21442+# @configure_input@ 21443 21444-# serial 3134 ltversion.m4 21445+# serial 3293 ltversion.m4 21446 # This file is part of GNU Libtool 21447 21448-m4_define([LT_PACKAGE_VERSION], [2.2.7a]) 21449-m4_define([LT_PACKAGE_REVISION], [1.3134]) 21450+m4_define([LT_PACKAGE_VERSION], [2.4]) 21451+m4_define([LT_PACKAGE_REVISION], [1.3293]) 21452 21453 AC_DEFUN([LTVERSION_VERSION], 21454-[macro_version='2.2.7a' 21455-macro_revision='1.3134' 21456+[macro_version='2.4' 21457+macro_revision='1.3293' 21458 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) 21459 _LT_DECL(, macro_revision, 0) 21460 ]) 21461diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 21462index bf92b5e0790..c573da90c5c 100644 21463--- a/lt~obsolete.m4 21464+++ b/lt~obsolete.m4 21465@@ -7,7 +7,7 @@ 21466 # unlimited permission to copy and/or distribute it, with or without 21467 # modifications, as long as this notice is preserved. 21468 21469-# serial 4 lt~obsolete.m4 21470+# serial 5 lt~obsolete.m4 21471 21472 # These exist entirely to fool aclocal when bootstrapping libtool. 21473 # 21474diff --git a/opcodes/configure b/opcodes/configure 21475index 6690a502b2f..badcc0776df 100755 21476--- a/opcodes/configure 21477+++ b/opcodes/configure 21478@@ -682,6 +682,9 @@ OTOOL 21479 LIPO 21480 NMEDIT 21481 DSYMUTIL 21482+MANIFEST_TOOL 21483+ac_ct_AR 21484+DLLTOOL 21485 OBJDUMP 21486 LN_S 21487 NM 21488@@ -800,6 +803,7 @@ enable_static 21489 with_pic 21490 enable_fast_install 21491 with_gnu_ld 21492+with_libtool_sysroot 21493 enable_libtool_lock 21494 enable_checking 21495 enable_targets 21496@@ -1468,6 +1472,8 @@ Optional Packages: 21497 --with-pic try to use only PIC/non-PIC objects [default=use 21498 both] 21499 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 21500+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 21501+ (or the compiler's sysroot if not specified). 21502 21503 Some influential environment variables: 21504 CC C compiler command 21505@@ -4977,8 +4983,8 @@ esac 21506 21507 21508 21509-macro_version='2.2.7a' 21510-macro_revision='1.3134' 21511+macro_version='2.4' 21512+macro_revision='1.3293' 21513 21514 21515 21516@@ -5018,7 +5024,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 21517 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 21518 $as_echo_n "checking how to print strings... " >&6; } 21519 # Test print first, because it will be a builtin if present. 21520-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 21521+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 21522 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 21523 ECHO='print -r --' 21524 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 21525@@ -5705,8 +5711,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 21526 # Try some XSI features 21527 xsi_shell=no 21528 ( _lt_dummy="a/b/c" 21529- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 21530- = c,a/b,, \ 21531+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 21532+ = c,a/b,b/c, \ 21533 && eval 'test $(( 1 + 1 )) -eq 2 \ 21534 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 21535 && xsi_shell=yes 21536@@ -5755,6 +5761,80 @@ esac 21537 21538 21539 21540+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 21541+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 21542+if ${lt_cv_to_host_file_cmd+:} false; then : 21543+ $as_echo_n "(cached) " >&6 21544+else 21545+ case $host in 21546+ *-*-mingw* ) 21547+ case $build in 21548+ *-*-mingw* ) # actually msys 21549+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 21550+ ;; 21551+ *-*-cygwin* ) 21552+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 21553+ ;; 21554+ * ) # otherwise, assume *nix 21555+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 21556+ ;; 21557+ esac 21558+ ;; 21559+ *-*-cygwin* ) 21560+ case $build in 21561+ *-*-mingw* ) # actually msys 21562+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 21563+ ;; 21564+ *-*-cygwin* ) 21565+ lt_cv_to_host_file_cmd=func_convert_file_noop 21566+ ;; 21567+ * ) # otherwise, assume *nix 21568+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 21569+ ;; 21570+ esac 21571+ ;; 21572+ * ) # unhandled hosts (and "normal" native builds) 21573+ lt_cv_to_host_file_cmd=func_convert_file_noop 21574+ ;; 21575+esac 21576+ 21577+fi 21578+ 21579+to_host_file_cmd=$lt_cv_to_host_file_cmd 21580+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 21581+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 21582+ 21583+ 21584+ 21585+ 21586+ 21587+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 21588+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 21589+if ${lt_cv_to_tool_file_cmd+:} false; then : 21590+ $as_echo_n "(cached) " >&6 21591+else 21592+ #assume ordinary cross tools, or native build. 21593+lt_cv_to_tool_file_cmd=func_convert_file_noop 21594+case $host in 21595+ *-*-mingw* ) 21596+ case $build in 21597+ *-*-mingw* ) # actually msys 21598+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 21599+ ;; 21600+ esac 21601+ ;; 21602+esac 21603+ 21604+fi 21605+ 21606+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 21607+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 21608+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 21609+ 21610+ 21611+ 21612+ 21613+ 21614 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 21615 $as_echo_n "checking for $LD option to reload object files... " >&6; } 21616 if ${lt_cv_ld_reload_flag+:} false; then : 21617@@ -5771,6 +5851,11 @@ case $reload_flag in 21618 esac 21619 reload_cmds='$LD$reload_flag -o $output$reload_objs' 21620 case $host_os in 21621+ cygwin* | mingw* | pw32* | cegcc*) 21622+ if test "$GCC" != yes; then 21623+ reload_cmds=false 21624+ fi 21625+ ;; 21626 darwin*) 21627 if test "$GCC" = yes; then 21628 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 21629@@ -5939,7 +6024,8 @@ mingw* | pw32*) 21630 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 21631 lt_cv_file_magic_cmd='func_win32_libid' 21632 else 21633- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 21634+ # Keep this pattern in sync with the one in func_win32_libid. 21635+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 21636 lt_cv_file_magic_cmd='$OBJDUMP -f' 21637 fi 21638 ;; 21639@@ -6093,6 +6179,21 @@ esac 21640 fi 21641 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 21642 $as_echo "$lt_cv_deplibs_check_method" >&6; } 21643+ 21644+file_magic_glob= 21645+want_nocaseglob=no 21646+if test "$build" = "$host"; then 21647+ case $host_os in 21648+ mingw* | pw32*) 21649+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 21650+ want_nocaseglob=yes 21651+ else 21652+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 21653+ fi 21654+ ;; 21655+ esac 21656+fi 21657+ 21658 file_magic_cmd=$lt_cv_file_magic_cmd 21659 deplibs_check_method=$lt_cv_deplibs_check_method 21660 test -z "$deplibs_check_method" && deplibs_check_method=unknown 21661@@ -6108,6 +6209,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 21662 21663 21664 21665+ 21666+ 21667+ 21668+ 21669+ 21670+ 21671+ 21672+ 21673+ 21674+ 21675+if test -n "$ac_tool_prefix"; then 21676+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 21677+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 21678+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21679+$as_echo_n "checking for $ac_word... " >&6; } 21680+if ${ac_cv_prog_DLLTOOL+:} false; then : 21681+ $as_echo_n "(cached) " >&6 21682+else 21683+ if test -n "$DLLTOOL"; then 21684+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 21685+else 21686+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 21687+for as_dir in $PATH 21688+do 21689+ IFS=$as_save_IFS 21690+ test -z "$as_dir" && as_dir=. 21691+ for ac_exec_ext in '' $ac_executable_extensions; do 21692+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21693+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 21694+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21695+ break 2 21696+ fi 21697+done 21698+ done 21699+IFS=$as_save_IFS 21700+ 21701+fi 21702+fi 21703+DLLTOOL=$ac_cv_prog_DLLTOOL 21704+if test -n "$DLLTOOL"; then 21705+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 21706+$as_echo "$DLLTOOL" >&6; } 21707+else 21708+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 21709+$as_echo "no" >&6; } 21710+fi 21711+ 21712+ 21713+fi 21714+if test -z "$ac_cv_prog_DLLTOOL"; then 21715+ ac_ct_DLLTOOL=$DLLTOOL 21716+ # Extract the first word of "dlltool", so it can be a program name with args. 21717+set dummy dlltool; ac_word=$2 21718+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21719+$as_echo_n "checking for $ac_word... " >&6; } 21720+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 21721+ $as_echo_n "(cached) " >&6 21722+else 21723+ if test -n "$ac_ct_DLLTOOL"; then 21724+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 21725+else 21726+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 21727+for as_dir in $PATH 21728+do 21729+ IFS=$as_save_IFS 21730+ test -z "$as_dir" && as_dir=. 21731+ for ac_exec_ext in '' $ac_executable_extensions; do 21732+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21733+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 21734+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21735+ break 2 21736+ fi 21737+done 21738+ done 21739+IFS=$as_save_IFS 21740+ 21741+fi 21742+fi 21743+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 21744+if test -n "$ac_ct_DLLTOOL"; then 21745+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 21746+$as_echo "$ac_ct_DLLTOOL" >&6; } 21747+else 21748+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 21749+$as_echo "no" >&6; } 21750+fi 21751+ 21752+ if test "x$ac_ct_DLLTOOL" = x; then 21753+ DLLTOOL="false" 21754+ else 21755+ case $cross_compiling:$ac_tool_warned in 21756+yes:) 21757+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 21758+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 21759+ac_tool_warned=yes ;; 21760+esac 21761+ DLLTOOL=$ac_ct_DLLTOOL 21762+ fi 21763+else 21764+ DLLTOOL="$ac_cv_prog_DLLTOOL" 21765+fi 21766+ 21767+test -z "$DLLTOOL" && DLLTOOL=dlltool 21768+ 21769+ 21770+ 21771+ 21772+ 21773+ 21774+ 21775+ 21776+ 21777+ 21778+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 21779+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 21780+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 21781+ $as_echo_n "(cached) " >&6 21782+else 21783+ lt_cv_sharedlib_from_linklib_cmd='unknown' 21784+ 21785+case $host_os in 21786+cygwin* | mingw* | pw32* | cegcc*) 21787+ # two different shell functions defined in ltmain.sh 21788+ # decide which to use based on capabilities of $DLLTOOL 21789+ case `$DLLTOOL --help 2>&1` in 21790+ *--identify-strict*) 21791+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 21792+ ;; 21793+ *) 21794+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 21795+ ;; 21796+ esac 21797+ ;; 21798+*) 21799+ # fallback: assume linklib IS sharedlib 21800+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 21801+ ;; 21802+esac 21803+ 21804+fi 21805+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 21806+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 21807+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 21808+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 21809+ 21810+ 21811+ 21812+ 21813+ 21814+ 21815+ 21816 plugin_option= 21817 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 21818 for plugin in $plugin_names; do 21819@@ -6122,8 +6374,10 @@ for plugin in $plugin_names; do 21820 done 21821 21822 if test -n "$ac_tool_prefix"; then 21823- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 21824-set dummy ${ac_tool_prefix}ar; ac_word=$2 21825+ for ac_prog in ar 21826+ do 21827+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 21828+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 21829 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21830 $as_echo_n "checking for $ac_word... " >&6; } 21831 if ${ac_cv_prog_AR+:} false; then : 21832@@ -6139,7 +6393,7 @@ do 21833 test -z "$as_dir" && as_dir=. 21834 for ac_exec_ext in '' $ac_executable_extensions; do 21835 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21836- ac_cv_prog_AR="${ac_tool_prefix}ar" 21837+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 21838 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21839 break 2 21840 fi 21841@@ -6159,11 +6413,15 @@ $as_echo "no" >&6; } 21842 fi 21843 21844 21845+ test -n "$AR" && break 21846+ done 21847 fi 21848-if test -z "$ac_cv_prog_AR"; then 21849+if test -z "$AR"; then 21850 ac_ct_AR=$AR 21851- # Extract the first word of "ar", so it can be a program name with args. 21852-set dummy ar; ac_word=$2 21853+ for ac_prog in ar 21854+do 21855+ # Extract the first word of "$ac_prog", so it can be a program name with args. 21856+set dummy $ac_prog; ac_word=$2 21857 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 21858 $as_echo_n "checking for $ac_word... " >&6; } 21859 if ${ac_cv_prog_ac_ct_AR+:} false; then : 21860@@ -6179,7 +6437,7 @@ do 21861 test -z "$as_dir" && as_dir=. 21862 for ac_exec_ext in '' $ac_executable_extensions; do 21863 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 21864- ac_cv_prog_ac_ct_AR="ar" 21865+ ac_cv_prog_ac_ct_AR="$ac_prog" 21866 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 21867 break 2 21868 fi 21869@@ -6198,6 +6456,10 @@ else 21870 $as_echo "no" >&6; } 21871 fi 21872 21873+ 21874+ test -n "$ac_ct_AR" && break 21875+done 21876+ 21877 if test "x$ac_ct_AR" = x; then 21878 AR="false" 21879 else 21880@@ -6209,25 +6471,20 @@ ac_tool_warned=yes ;; 21881 esac 21882 AR=$ac_ct_AR 21883 fi 21884-else 21885- AR="$ac_cv_prog_AR" 21886 fi 21887 21888-test -z "$AR" && AR=ar 21889-if test -n "$plugin_option"; then 21890- if $AR --help 2>&1 | grep -q "\--plugin"; then 21891- touch conftest.c 21892- $AR $plugin_option rc conftest.a conftest.c 21893- if test "$?" != 0; then 21894- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 21895+ touch conftest.c 21896+ $AR $plugin_option rc conftest.a conftest.c 21897+ if test "$?" != 0; then 21898+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 21899 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 21900- else 21901- AR="$AR $plugin_option" 21902- fi 21903- rm -f conftest.* 21904+ else 21905+ AR="$AR $plugin_option" 21906 fi 21907-fi 21908-test -z "$AR_FLAGS" && AR_FLAGS=cru 21909+ rm -f conftest.* 21910+: ${AR=ar} 21911+: ${AR_FLAGS=cru} 21912+ 21913 21914 21915 21916@@ -6238,6 +6495,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 21917 21918 21919 21920+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 21921+$as_echo_n "checking for archiver @FILE support... " >&6; } 21922+if ${lt_cv_ar_at_file+:} false; then : 21923+ $as_echo_n "(cached) " >&6 21924+else 21925+ lt_cv_ar_at_file=no 21926+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 21927+/* end confdefs.h. */ 21928+ 21929+int 21930+main () 21931+{ 21932+ 21933+ ; 21934+ return 0; 21935+} 21936+_ACEOF 21937+if ac_fn_c_try_compile "$LINENO"; then : 21938+ echo conftest.$ac_objext > conftest.lst 21939+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 21940+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 21941+ (eval $lt_ar_try) 2>&5 21942+ ac_status=$? 21943+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 21944+ test $ac_status = 0; } 21945+ if test "$ac_status" -eq 0; then 21946+ # Ensure the archiver fails upon bogus file names. 21947+ rm -f conftest.$ac_objext libconftest.a 21948+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 21949+ (eval $lt_ar_try) 2>&5 21950+ ac_status=$? 21951+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 21952+ test $ac_status = 0; } 21953+ if test "$ac_status" -ne 0; then 21954+ lt_cv_ar_at_file=@ 21955+ fi 21956+ fi 21957+ rm -f conftest.* libconftest.a 21958+ 21959+fi 21960+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 21961+ 21962+fi 21963+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 21964+$as_echo "$lt_cv_ar_at_file" >&6; } 21965+ 21966+if test "x$lt_cv_ar_at_file" = xno; then 21967+ archiver_list_spec= 21968+else 21969+ archiver_list_spec=$lt_cv_ar_at_file 21970+fi 21971+ 21972+ 21973+ 21974+ 21975+ 21976+ 21977 21978 if test -n "$ac_tool_prefix"; then 21979 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 21980@@ -6578,8 +6892,8 @@ esac 21981 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 21982 21983 # Transform an extracted symbol line into symbol name and symbol address 21984-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 21985-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'" 21986+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 21987+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'" 21988 21989 # Handle CRLF in mingw tool chain 21990 opt_cr= 21991@@ -6615,6 +6929,7 @@ for ac_symprfx in "" "_"; do 21992 else 21993 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 21994 fi 21995+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 21996 21997 # Check to see that the pipe works correctly. 21998 pipe_works=no 21999@@ -6656,6 +6971,18 @@ _LT_EOF 22000 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 22001 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 22002 cat <<_LT_EOF > conftest.$ac_ext 22003+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 22004+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 22005+/* DATA imports from DLLs on WIN32 con't be const, because runtime 22006+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 22007+# define LT_DLSYM_CONST 22008+#elif defined(__osf__) 22009+/* This system does not cope well with relocations in const data. */ 22010+# define LT_DLSYM_CONST 22011+#else 22012+# define LT_DLSYM_CONST const 22013+#endif 22014+ 22015 #ifdef __cplusplus 22016 extern "C" { 22017 #endif 22018@@ -6667,7 +6994,7 @@ _LT_EOF 22019 cat <<_LT_EOF >> conftest.$ac_ext 22020 22021 /* The mapping between symbol names and symbols. */ 22022-const struct { 22023+LT_DLSYM_CONST struct { 22024 const char *name; 22025 void *address; 22026 } 22027@@ -6693,8 +7020,8 @@ static const void *lt_preloaded_setup() { 22028 _LT_EOF 22029 # Now try linking the two files. 22030 mv conftest.$ac_objext conftstm.$ac_objext 22031- lt_save_LIBS="$LIBS" 22032- lt_save_CFLAGS="$CFLAGS" 22033+ lt_globsym_save_LIBS=$LIBS 22034+ lt_globsym_save_CFLAGS=$CFLAGS 22035 LIBS="conftstm.$ac_objext" 22036 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 22037 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 22038@@ -6704,8 +7031,8 @@ _LT_EOF 22039 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 22040 pipe_works=yes 22041 fi 22042- LIBS="$lt_save_LIBS" 22043- CFLAGS="$lt_save_CFLAGS" 22044+ LIBS=$lt_globsym_save_LIBS 22045+ CFLAGS=$lt_globsym_save_CFLAGS 22046 else 22047 echo "cannot find nm_test_func in $nlist" >&5 22048 fi 22049@@ -6742,6 +7069,14 @@ else 22050 $as_echo "ok" >&6; } 22051 fi 22052 22053+# Response file support. 22054+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 22055+ nm_file_list_spec='@' 22056+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 22057+ nm_file_list_spec='@' 22058+fi 22059+ 22060+ 22061 22062 22063 22064@@ -6760,6 +7095,47 @@ fi 22065 22066 22067 22068+ 22069+ 22070+ 22071+ 22072+ 22073+ 22074+ 22075+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 22076+$as_echo_n "checking for sysroot... " >&6; } 22077+ 22078+# Check whether --with-libtool-sysroot was given. 22079+if test "${with_libtool_sysroot+set}" = set; then : 22080+ withval=$with_libtool_sysroot; 22081+else 22082+ with_libtool_sysroot=no 22083+fi 22084+ 22085+ 22086+lt_sysroot= 22087+case ${with_libtool_sysroot} in #( 22088+ yes) 22089+ if test "$GCC" = yes; then 22090+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 22091+ fi 22092+ ;; #( 22093+ /*) 22094+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 22095+ ;; #( 22096+ no|'') 22097+ ;; #( 22098+ *) 22099+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 22100+$as_echo "${with_libtool_sysroot}" >&6; } 22101+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 22102+ ;; 22103+esac 22104+ 22105+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 22106+$as_echo "${lt_sysroot:-no}" >&6; } 22107+ 22108+ 22109 22110 22111 22112@@ -6969,6 +7345,123 @@ esac 22113 22114 need_locks="$enable_libtool_lock" 22115 22116+if test -n "$ac_tool_prefix"; then 22117+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 22118+set dummy ${ac_tool_prefix}mt; ac_word=$2 22119+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 22120+$as_echo_n "checking for $ac_word... " >&6; } 22121+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 22122+ $as_echo_n "(cached) " >&6 22123+else 22124+ if test -n "$MANIFEST_TOOL"; then 22125+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 22126+else 22127+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 22128+for as_dir in $PATH 22129+do 22130+ IFS=$as_save_IFS 22131+ test -z "$as_dir" && as_dir=. 22132+ for ac_exec_ext in '' $ac_executable_extensions; do 22133+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 22134+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 22135+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 22136+ break 2 22137+ fi 22138+done 22139+ done 22140+IFS=$as_save_IFS 22141+ 22142+fi 22143+fi 22144+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 22145+if test -n "$MANIFEST_TOOL"; then 22146+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 22147+$as_echo "$MANIFEST_TOOL" >&6; } 22148+else 22149+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 22150+$as_echo "no" >&6; } 22151+fi 22152+ 22153+ 22154+fi 22155+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 22156+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 22157+ # Extract the first word of "mt", so it can be a program name with args. 22158+set dummy mt; ac_word=$2 22159+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 22160+$as_echo_n "checking for $ac_word... " >&6; } 22161+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 22162+ $as_echo_n "(cached) " >&6 22163+else 22164+ if test -n "$ac_ct_MANIFEST_TOOL"; then 22165+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 22166+else 22167+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 22168+for as_dir in $PATH 22169+do 22170+ IFS=$as_save_IFS 22171+ test -z "$as_dir" && as_dir=. 22172+ for ac_exec_ext in '' $ac_executable_extensions; do 22173+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 22174+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 22175+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 22176+ break 2 22177+ fi 22178+done 22179+ done 22180+IFS=$as_save_IFS 22181+ 22182+fi 22183+fi 22184+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 22185+if test -n "$ac_ct_MANIFEST_TOOL"; then 22186+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 22187+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 22188+else 22189+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 22190+$as_echo "no" >&6; } 22191+fi 22192+ 22193+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 22194+ MANIFEST_TOOL=":" 22195+ else 22196+ case $cross_compiling:$ac_tool_warned in 22197+yes:) 22198+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 22199+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 22200+ac_tool_warned=yes ;; 22201+esac 22202+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 22203+ fi 22204+else 22205+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 22206+fi 22207+ 22208+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 22209+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 22210+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 22211+if ${lt_cv_path_mainfest_tool+:} false; then : 22212+ $as_echo_n "(cached) " >&6 22213+else 22214+ lt_cv_path_mainfest_tool=no 22215+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 22216+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 22217+ cat conftest.err >&5 22218+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 22219+ lt_cv_path_mainfest_tool=yes 22220+ fi 22221+ rm -f conftest* 22222+fi 22223+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 22224+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 22225+if test "x$lt_cv_path_mainfest_tool" != xyes; then 22226+ MANIFEST_TOOL=: 22227+fi 22228+ 22229+ 22230+ 22231+ 22232+ 22233 22234 case $host_os in 22235 rhapsody* | darwin*) 22236@@ -7532,6 +8025,8 @@ _LT_EOF 22237 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 22238 echo "$AR cru libconftest.a conftest.o" >&5 22239 $AR cru libconftest.a conftest.o 2>&5 22240+ echo "$RANLIB libconftest.a" >&5 22241+ $RANLIB libconftest.a 2>&5 22242 cat > conftest.c << _LT_EOF 22243 int main() { return 0;} 22244 _LT_EOF 22245@@ -8084,8 +8579,6 @@ fi 22246 lt_prog_compiler_pic= 22247 lt_prog_compiler_static= 22248 22249-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 22250-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22251 22252 if test "$GCC" = yes; then 22253 lt_prog_compiler_wl='-Wl,' 22254@@ -8251,6 +8744,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22255 lt_prog_compiler_pic='--shared' 22256 lt_prog_compiler_static='--static' 22257 ;; 22258+ nagfor*) 22259+ # NAG Fortran compiler 22260+ lt_prog_compiler_wl='-Wl,-Wl,,' 22261+ lt_prog_compiler_pic='-PIC' 22262+ lt_prog_compiler_static='-Bstatic' 22263+ ;; 22264 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 22265 # Portland Group compilers (*not* the Pentium gcc compiler, 22266 # which looks to be a dead project) 22267@@ -8313,7 +8812,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22268 lt_prog_compiler_pic='-KPIC' 22269 lt_prog_compiler_static='-Bstatic' 22270 case $cc_basename in 22271- f77* | f90* | f95*) 22272+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 22273 lt_prog_compiler_wl='-Qoption ld ';; 22274 *) 22275 lt_prog_compiler_wl='-Wl,';; 22276@@ -8370,13 +8869,17 @@ case $host_os in 22277 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 22278 ;; 22279 esac 22280-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 22281-$as_echo "$lt_prog_compiler_pic" >&6; } 22282- 22283- 22284- 22285- 22286 22287+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 22288+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 22289+if ${lt_cv_prog_compiler_pic+:} false; then : 22290+ $as_echo_n "(cached) " >&6 22291+else 22292+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 22293+fi 22294+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 22295+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 22296+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 22297 22298 # 22299 # Check to make sure the PIC flag actually works. 22300@@ -8437,6 +8940,11 @@ fi 22301 22302 22303 22304+ 22305+ 22306+ 22307+ 22308+ 22309 # 22310 # Check to make sure the static flag actually works. 22311 # 22312@@ -8787,7 +9295,8 @@ _LT_EOF 22313 allow_undefined_flag=unsupported 22314 always_export_symbols=no 22315 enable_shared_with_static_runtimes=yes 22316- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 22317+ 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' 22318+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 22319 22320 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 22321 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 22322@@ -8886,12 +9395,12 @@ _LT_EOF 22323 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 22324 hardcode_libdir_flag_spec= 22325 hardcode_libdir_flag_spec_ld='-rpath $libdir' 22326- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 22327+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 22328 if test "x$supports_anon_versioning" = xyes; then 22329 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 22330 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 22331 echo "local: *; };" >> $output_objdir/$libname.ver~ 22332- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 22333+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 22334 fi 22335 ;; 22336 esac 22337@@ -8905,8 +9414,8 @@ _LT_EOF 22338 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 22339 wlarc= 22340 else 22341- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 22342- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 22343+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 22344+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 22345 fi 22346 ;; 22347 22348@@ -8924,8 +9433,8 @@ _LT_EOF 22349 22350 _LT_EOF 22351 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22352- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 22353- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 22354+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 22355+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 22356 else 22357 ld_shlibs=no 22358 fi 22359@@ -8971,8 +9480,8 @@ _LT_EOF 22360 22361 *) 22362 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 22363- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 22364- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 22365+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 22366+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 22367 else 22368 ld_shlibs=no 22369 fi 22370@@ -9102,7 +9611,13 @@ _LT_EOF 22371 allow_undefined_flag='-berok' 22372 # Determine the default libpath from the value encoded in an 22373 # empty executable. 22374- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22375+ if test "${lt_cv_aix_libpath+set}" = set; then 22376+ aix_libpath=$lt_cv_aix_libpath 22377+else 22378+ if ${lt_cv_aix_libpath_+:} false; then : 22379+ $as_echo_n "(cached) " >&6 22380+else 22381+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22382 /* end confdefs.h. */ 22383 22384 int 22385@@ -9115,22 +9630,29 @@ main () 22386 _ACEOF 22387 if ac_fn_c_try_link "$LINENO"; then : 22388 22389-lt_aix_libpath_sed=' 22390- /Import File Strings/,/^$/ { 22391- /^0/ { 22392- s/^0 *\(.*\)$/\1/ 22393- p 22394- } 22395- }' 22396-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22397-# Check for a 64-bit object if we didn't find anything. 22398-if test -z "$aix_libpath"; then 22399- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22400-fi 22401+ lt_aix_libpath_sed=' 22402+ /Import File Strings/,/^$/ { 22403+ /^0/ { 22404+ s/^0 *\([^ ]*\) *$/\1/ 22405+ p 22406+ } 22407+ }' 22408+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22409+ # Check for a 64-bit object if we didn't find anything. 22410+ if test -z "$lt_cv_aix_libpath_"; then 22411+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22412+ fi 22413 fi 22414 rm -f core conftest.err conftest.$ac_objext \ 22415 conftest$ac_exeext conftest.$ac_ext 22416-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22417+ if test -z "$lt_cv_aix_libpath_"; then 22418+ lt_cv_aix_libpath_="/usr/lib:/lib" 22419+ fi 22420+ 22421+fi 22422+ 22423+ aix_libpath=$lt_cv_aix_libpath_ 22424+fi 22425 22426 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22427 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" 22428@@ -9142,7 +9664,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22429 else 22430 # Determine the default libpath from the value encoded in an 22431 # empty executable. 22432- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22433+ if test "${lt_cv_aix_libpath+set}" = set; then 22434+ aix_libpath=$lt_cv_aix_libpath 22435+else 22436+ if ${lt_cv_aix_libpath_+:} false; then : 22437+ $as_echo_n "(cached) " >&6 22438+else 22439+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22440 /* end confdefs.h. */ 22441 22442 int 22443@@ -9155,22 +9683,29 @@ main () 22444 _ACEOF 22445 if ac_fn_c_try_link "$LINENO"; then : 22446 22447-lt_aix_libpath_sed=' 22448- /Import File Strings/,/^$/ { 22449- /^0/ { 22450- s/^0 *\(.*\)$/\1/ 22451- p 22452- } 22453- }' 22454-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22455-# Check for a 64-bit object if we didn't find anything. 22456-if test -z "$aix_libpath"; then 22457- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22458-fi 22459+ lt_aix_libpath_sed=' 22460+ /Import File Strings/,/^$/ { 22461+ /^0/ { 22462+ s/^0 *\([^ ]*\) *$/\1/ 22463+ p 22464+ } 22465+ }' 22466+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22467+ # Check for a 64-bit object if we didn't find anything. 22468+ if test -z "$lt_cv_aix_libpath_"; then 22469+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 22470+ fi 22471 fi 22472 rm -f core conftest.err conftest.$ac_objext \ 22473 conftest$ac_exeext conftest.$ac_ext 22474-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22475+ if test -z "$lt_cv_aix_libpath_"; then 22476+ lt_cv_aix_libpath_="/usr/lib:/lib" 22477+ fi 22478+ 22479+fi 22480+ 22481+ aix_libpath=$lt_cv_aix_libpath_ 22482+fi 22483 22484 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 22485 # Warning - without using the other run time loading flags, 22486@@ -9215,20 +9750,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22487 # Microsoft Visual C++. 22488 # hardcode_libdir_flag_spec is actually meaningless, as there is 22489 # no search path for DLLs. 22490- hardcode_libdir_flag_spec=' ' 22491- allow_undefined_flag=unsupported 22492- # Tell ltmain to make .lib files, not .a files. 22493- libext=lib 22494- # Tell ltmain to make .dll files, not .so files. 22495- shrext_cmds=".dll" 22496- # FIXME: Setting linknames here is a bad hack. 22497- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 22498- # The linker will automatically build a .lib file if we build a DLL. 22499- old_archive_from_new_cmds='true' 22500- # FIXME: Should let the user specify the lib program. 22501- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 22502- fix_srcfile_path='`cygpath -w "$srcfile"`' 22503- enable_shared_with_static_runtimes=yes 22504+ case $cc_basename in 22505+ cl*) 22506+ # Native MSVC 22507+ hardcode_libdir_flag_spec=' ' 22508+ allow_undefined_flag=unsupported 22509+ always_export_symbols=yes 22510+ file_list_spec='@' 22511+ # Tell ltmain to make .lib files, not .a files. 22512+ libext=lib 22513+ # Tell ltmain to make .dll files, not .so files. 22514+ shrext_cmds=".dll" 22515+ # FIXME: Setting linknames here is a bad hack. 22516+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 22517+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 22518+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 22519+ else 22520+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 22521+ fi~ 22522+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 22523+ linknames=' 22524+ # The linker will not automatically build a static lib if we build a DLL. 22525+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 22526+ enable_shared_with_static_runtimes=yes 22527+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 22528+ # Don't use ranlib 22529+ old_postinstall_cmds='chmod 644 $oldlib' 22530+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 22531+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 22532+ case $lt_outputfile in 22533+ *.exe|*.EXE) ;; 22534+ *) 22535+ lt_outputfile="$lt_outputfile.exe" 22536+ lt_tool_outputfile="$lt_tool_outputfile.exe" 22537+ ;; 22538+ esac~ 22539+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 22540+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 22541+ $RM "$lt_outputfile.manifest"; 22542+ fi' 22543+ ;; 22544+ *) 22545+ # Assume MSVC wrapper 22546+ hardcode_libdir_flag_spec=' ' 22547+ allow_undefined_flag=unsupported 22548+ # Tell ltmain to make .lib files, not .a files. 22549+ libext=lib 22550+ # Tell ltmain to make .dll files, not .so files. 22551+ shrext_cmds=".dll" 22552+ # FIXME: Setting linknames here is a bad hack. 22553+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 22554+ # The linker will automatically build a .lib file if we build a DLL. 22555+ old_archive_from_new_cmds='true' 22556+ # FIXME: Should let the user specify the lib program. 22557+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 22558+ enable_shared_with_static_runtimes=yes 22559+ ;; 22560+ esac 22561 ;; 22562 22563 darwin* | rhapsody*) 22564@@ -9289,7 +9867,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22565 22566 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 22567 freebsd* | dragonfly*) 22568- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 22569+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 22570 hardcode_libdir_flag_spec='-R$libdir' 22571 hardcode_direct=yes 22572 hardcode_shlibpath_var=no 22573@@ -9297,7 +9875,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22574 22575 hpux9*) 22576 if test "$GCC" = yes; then 22577- 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' 22578+ 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' 22579 else 22580 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' 22581 fi 22582@@ -9313,7 +9891,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22583 22584 hpux10*) 22585 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 22586- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 22587+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 22588 else 22589 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 22590 fi 22591@@ -9337,10 +9915,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 22592 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 22593 ;; 22594 ia64*) 22595- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 22596+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 22597 ;; 22598 *) 22599- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 22600+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 22601 ;; 22602 esac 22603 else 22604@@ -9419,23 +9997,36 @@ fi 22605 22606 irix5* | irix6* | nonstopux*) 22607 if test "$GCC" = yes; then 22608- 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' 22609+ 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' 22610 # Try to use the -exported_symbol ld option, if it does not 22611 # work, assume that -exports_file does not work either and 22612 # implicitly export all symbols. 22613- save_LDFLAGS="$LDFLAGS" 22614- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 22615- cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22616+ # This should be the same for all languages, so no per-tag cache variable. 22617+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 22618+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 22619+if ${lt_cv_irix_exported_symbol+:} false; then : 22620+ $as_echo_n "(cached) " >&6 22621+else 22622+ save_LDFLAGS="$LDFLAGS" 22623+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 22624+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22625 /* end confdefs.h. */ 22626-int foo(void) {} 22627+int foo (void) { return 0; } 22628 _ACEOF 22629 if ac_fn_c_try_link "$LINENO"; then : 22630- 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' 22631- 22632+ lt_cv_irix_exported_symbol=yes 22633+else 22634+ lt_cv_irix_exported_symbol=no 22635 fi 22636 rm -f core conftest.err conftest.$ac_objext \ 22637 conftest$ac_exeext conftest.$ac_ext 22638- LDFLAGS="$save_LDFLAGS" 22639+ LDFLAGS="$save_LDFLAGS" 22640+fi 22641+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 22642+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 22643+ if test "$lt_cv_irix_exported_symbol" = yes; then 22644+ 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' 22645+ fi 22646 else 22647 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' 22648 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' 22649@@ -9520,7 +10111,7 @@ rm -f core conftest.err conftest.$ac_objext \ 22650 osf4* | osf5*) # as osf3* with the addition of -msym flag 22651 if test "$GCC" = yes; then 22652 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 22653- 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' 22654+ 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' 22655 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 22656 else 22657 allow_undefined_flag=' -expect_unresolved \*' 22658@@ -9539,9 +10130,9 @@ rm -f core conftest.err conftest.$ac_objext \ 22659 no_undefined_flag=' -z defs' 22660 if test "$GCC" = yes; then 22661 wlarc='${wl}' 22662- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 22663+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 22664 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 22665- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 22666+ $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' 22667 else 22668 case `$CC -V 2>&1` in 22669 *"Compilers 5.0"*) 22670@@ -10117,8 +10708,9 @@ cygwin* | mingw* | pw32* | cegcc*) 22671 need_version=no 22672 need_lib_prefix=no 22673 22674- case $GCC,$host_os in 22675- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 22676+ case $GCC,$cc_basename in 22677+ yes,*) 22678+ # gcc 22679 library_names_spec='$libname.dll.a' 22680 # DLL is installed to $(libdir)/../bin by postinstall_cmds 22681 postinstall_cmds='base_file=`basename \${file}`~ 22682@@ -10151,13 +10743,71 @@ cygwin* | mingw* | pw32* | cegcc*) 22683 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 22684 ;; 22685 esac 22686+ dynamic_linker='Win32 ld.exe' 22687+ ;; 22688+ 22689+ *,cl*) 22690+ # Native MSVC 22691+ libname_spec='$name' 22692+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 22693+ library_names_spec='${libname}.dll.lib' 22694+ 22695+ case $build_os in 22696+ mingw*) 22697+ sys_lib_search_path_spec= 22698+ lt_save_ifs=$IFS 22699+ IFS=';' 22700+ for lt_path in $LIB 22701+ do 22702+ IFS=$lt_save_ifs 22703+ # Let DOS variable expansion print the short 8.3 style file name. 22704+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 22705+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 22706+ done 22707+ IFS=$lt_save_ifs 22708+ # Convert to MSYS style. 22709+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 22710+ ;; 22711+ cygwin*) 22712+ # Convert to unix form, then to dos form, then back to unix form 22713+ # but this time dos style (no spaces!) so that the unix form looks 22714+ # like /cygdrive/c/PROGRA~1:/cygdr... 22715+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 22716+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 22717+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 22718+ ;; 22719+ *) 22720+ sys_lib_search_path_spec="$LIB" 22721+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 22722+ # It is most probably a Windows format PATH. 22723+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 22724+ else 22725+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 22726+ fi 22727+ # FIXME: find the short name or the path components, as spaces are 22728+ # common. (e.g. "Program Files" -> "PROGRA~1") 22729+ ;; 22730+ esac 22731+ 22732+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 22733+ postinstall_cmds='base_file=`basename \${file}`~ 22734+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 22735+ dldir=$destdir/`dirname \$dlpath`~ 22736+ test -d \$dldir || mkdir -p \$dldir~ 22737+ $install_prog $dir/$dlname \$dldir/$dlname' 22738+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 22739+ dlpath=$dir/\$dldll~ 22740+ $RM \$dlpath' 22741+ shlibpath_overrides_runpath=yes 22742+ dynamic_linker='Win32 link.exe' 22743 ;; 22744 22745 *) 22746+ # Assume MSVC wrapper 22747 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 22748+ dynamic_linker='Win32 ld.exe' 22749 ;; 22750 esac 22751- dynamic_linker='Win32 ld.exe' 22752 # FIXME: first we should search . and the directory the executable is in 22753 shlibpath_var=PATH 22754 ;; 22755@@ -11035,7 +11685,7 @@ else 22756 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22757 lt_status=$lt_dlunknown 22758 cat > conftest.$ac_ext <<_LT_EOF 22759-#line 11038 "configure" 22760+#line $LINENO "configure" 22761 #include "confdefs.h" 22762 22763 #if HAVE_DLFCN_H 22764@@ -11079,10 +11729,10 @@ else 22765 /* When -fvisbility=hidden is used, assume the code has been annotated 22766 correspondingly for the symbols needed. */ 22767 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22768-void fnord () __attribute__((visibility("default"))); 22769+int fnord () __attribute__((visibility("default"))); 22770 #endif 22771 22772-void fnord () { int i=42; } 22773+int fnord () { return 42; } 22774 int main () 22775 { 22776 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22777@@ -11141,7 +11791,7 @@ else 22778 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 22779 lt_status=$lt_dlunknown 22780 cat > conftest.$ac_ext <<_LT_EOF 22781-#line 11144 "configure" 22782+#line $LINENO "configure" 22783 #include "confdefs.h" 22784 22785 #if HAVE_DLFCN_H 22786@@ -11185,10 +11835,10 @@ else 22787 /* When -fvisbility=hidden is used, assume the code has been annotated 22788 correspondingly for the symbols needed. */ 22789 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 22790-void fnord () __attribute__((visibility("default"))); 22791+int fnord () __attribute__((visibility("default"))); 22792 #endif 22793 22794-void fnord () { int i=42; } 22795+int fnord () { return 42; } 22796 int main () 22797 { 22798 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 22799@@ -13390,13 +14040,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 22800 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 22801 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 22802 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 22803+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 22804+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 22805 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 22806 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 22807 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 22808 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 22809 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 22810+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 22811+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 22812+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 22813+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 22814 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 22815 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 22816+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 22817 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 22818 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 22819 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 22820@@ -13411,14 +14068,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 22821 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 22822 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 22823 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"`' 22824+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 22825+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 22826 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 22827 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 22828 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 22829-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 22830 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 22831+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 22832 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 22833 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 22834 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 22835+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 22836 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 22837 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 22838 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 22839@@ -13451,12 +14111,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 22840 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 22841 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 22842 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 22843-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 22844 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 22845 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 22846 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 22847 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 22848 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 22849+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 22850 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 22851 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 22852 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 22853@@ -13511,8 +14171,13 @@ reload_flag \ 22854 OBJDUMP \ 22855 deplibs_check_method \ 22856 file_magic_cmd \ 22857+file_magic_glob \ 22858+want_nocaseglob \ 22859+DLLTOOL \ 22860+sharedlib_from_linklib_cmd \ 22861 AR \ 22862 AR_FLAGS \ 22863+archiver_list_spec \ 22864 STRIP \ 22865 RANLIB \ 22866 CC \ 22867@@ -13522,12 +14187,14 @@ lt_cv_sys_global_symbol_pipe \ 22868 lt_cv_sys_global_symbol_to_cdecl \ 22869 lt_cv_sys_global_symbol_to_c_name_address \ 22870 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 22871+nm_file_list_spec \ 22872 lt_prog_compiler_no_builtin_flag \ 22873-lt_prog_compiler_wl \ 22874 lt_prog_compiler_pic \ 22875+lt_prog_compiler_wl \ 22876 lt_prog_compiler_static \ 22877 lt_cv_prog_compiler_c_o \ 22878 need_locks \ 22879+MANIFEST_TOOL \ 22880 DSYMUTIL \ 22881 NMEDIT \ 22882 LIPO \ 22883@@ -13543,7 +14210,6 @@ no_undefined_flag \ 22884 hardcode_libdir_flag_spec \ 22885 hardcode_libdir_flag_spec_ld \ 22886 hardcode_libdir_separator \ 22887-fix_srcfile_path \ 22888 exclude_expsyms \ 22889 include_expsyms \ 22890 file_list_spec \ 22891@@ -13579,6 +14245,7 @@ module_cmds \ 22892 module_expsym_cmds \ 22893 export_symbols_cmds \ 22894 prelink_cmds \ 22895+postlink_cmds \ 22896 postinstall_cmds \ 22897 postuninstall_cmds \ 22898 finish_cmds \ 22899@@ -14344,7 +15011,8 @@ $as_echo X"$file" | 22900 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 22901 # 22902 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 22903-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 22904+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 22905+# Inc. 22906 # Written by Gordon Matzigkeit, 1996 22907 # 22908 # This file is part of GNU Libtool. 22909@@ -14447,19 +15115,42 @@ SP2NL=$lt_lt_SP2NL 22910 # turn newlines into spaces. 22911 NL2SP=$lt_lt_NL2SP 22912 22913+# convert \$build file names to \$host format. 22914+to_host_file_cmd=$lt_cv_to_host_file_cmd 22915+ 22916+# convert \$build files to toolchain format. 22917+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 22918+ 22919 # An object symbol dumper. 22920 OBJDUMP=$lt_OBJDUMP 22921 22922 # Method to check whether dependent libraries are shared objects. 22923 deplibs_check_method=$lt_deplibs_check_method 22924 22925-# Command to use when deplibs_check_method == "file_magic". 22926+# Command to use when deplibs_check_method = "file_magic". 22927 file_magic_cmd=$lt_file_magic_cmd 22928 22929+# How to find potential files when deplibs_check_method = "file_magic". 22930+file_magic_glob=$lt_file_magic_glob 22931+ 22932+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 22933+want_nocaseglob=$lt_want_nocaseglob 22934+ 22935+# DLL creation program. 22936+DLLTOOL=$lt_DLLTOOL 22937+ 22938+# Command to associate shared and link libraries. 22939+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 22940+ 22941 # The archiver. 22942 AR=$lt_AR 22943+ 22944+# Flags to create an archive. 22945 AR_FLAGS=$lt_AR_FLAGS 22946 22947+# How to feed a file listing to the archiver. 22948+archiver_list_spec=$lt_archiver_list_spec 22949+ 22950 # A symbol stripping program. 22951 STRIP=$lt_STRIP 22952 22953@@ -14489,6 +15180,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 22954 # Transform the output of nm in a C name address pair when lib prefix is needed. 22955 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 22956 22957+# Specify filename containing input files for \$NM. 22958+nm_file_list_spec=$lt_nm_file_list_spec 22959+ 22960+# The root where to search for dependent libraries,and in which our libraries should be installed. 22961+lt_sysroot=$lt_sysroot 22962+ 22963 # The name of the directory that contains temporary libtool files. 22964 objdir=$objdir 22965 22966@@ -14498,6 +15195,9 @@ MAGIC_CMD=$MAGIC_CMD 22967 # Must we lock files when doing compilation? 22968 need_locks=$lt_need_locks 22969 22970+# Manifest tool. 22971+MANIFEST_TOOL=$lt_MANIFEST_TOOL 22972+ 22973 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 22974 DSYMUTIL=$lt_DSYMUTIL 22975 22976@@ -14612,12 +15312,12 @@ with_gcc=$GCC 22977 # Compiler flag to turn off builtin functions. 22978 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 22979 22980-# How to pass a linker flag through the compiler. 22981-wl=$lt_lt_prog_compiler_wl 22982- 22983 # Additional compiler flags for building library objects. 22984 pic_flag=$lt_lt_prog_compiler_pic 22985 22986+# How to pass a linker flag through the compiler. 22987+wl=$lt_lt_prog_compiler_wl 22988+ 22989 # Compiler flag to prevent dynamic linking. 22990 link_static_flag=$lt_lt_prog_compiler_static 22991 22992@@ -14704,9 +15404,6 @@ inherit_rpath=$inherit_rpath 22993 # Whether libtool must link a program against all its dependency libraries. 22994 link_all_deplibs=$link_all_deplibs 22995 22996-# Fix the shell variable \$srcfile for the compiler. 22997-fix_srcfile_path=$lt_fix_srcfile_path 22998- 22999 # Set to "yes" if exported symbols are required. 23000 always_export_symbols=$always_export_symbols 23001 23002@@ -14722,6 +15419,9 @@ include_expsyms=$lt_include_expsyms 23003 # Commands necessary for linking programs (against libraries) with templates. 23004 prelink_cmds=$lt_prelink_cmds 23005 23006+# Commands necessary for finishing linking programs. 23007+postlink_cmds=$lt_postlink_cmds 23008+ 23009 # Specify filename containing input files. 23010 file_list_spec=$lt_file_list_spec 23011 23012@@ -14754,210 +15454,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 23013 # if finds mixed CR/LF and LF-only lines. Since sed operates in 23014 # text mode, it properly converts lines to CR/LF. This bash problem 23015 # is reportedly fixed, but why not run on old versions too? 23016- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 23017- || (rm -f "$cfgfile"; exit 1) 23018- 23019- case $xsi_shell in 23020- yes) 23021- cat << \_LT_EOF >> "$cfgfile" 23022- 23023-# func_dirname file append nondir_replacement 23024-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 23025-# otherwise set result to NONDIR_REPLACEMENT. 23026-func_dirname () 23027-{ 23028- case ${1} in 23029- */*) func_dirname_result="${1%/*}${2}" ;; 23030- * ) func_dirname_result="${3}" ;; 23031- esac 23032-} 23033- 23034-# func_basename file 23035-func_basename () 23036-{ 23037- func_basename_result="${1##*/}" 23038-} 23039- 23040-# func_dirname_and_basename file append nondir_replacement 23041-# perform func_basename and func_dirname in a single function 23042-# call: 23043-# dirname: Compute the dirname of FILE. If nonempty, 23044-# add APPEND to the result, otherwise set result 23045-# to NONDIR_REPLACEMENT. 23046-# value returned in "$func_dirname_result" 23047-# basename: Compute filename of FILE. 23048-# value retuned in "$func_basename_result" 23049-# Implementation must be kept synchronized with func_dirname 23050-# and func_basename. For efficiency, we do not delegate to 23051-# those functions but instead duplicate the functionality here. 23052-func_dirname_and_basename () 23053-{ 23054- case ${1} in 23055- */*) func_dirname_result="${1%/*}${2}" ;; 23056- * ) func_dirname_result="${3}" ;; 23057- esac 23058- func_basename_result="${1##*/}" 23059-} 23060- 23061-# func_stripname prefix suffix name 23062-# strip PREFIX and SUFFIX off of NAME. 23063-# PREFIX and SUFFIX must not contain globbing or regex special 23064-# characters, hashes, percent signs, but SUFFIX may contain a leading 23065-# dot (in which case that matches only a dot). 23066-func_stripname () 23067-{ 23068- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 23069- # positional parameters, so assign one to ordinary parameter first. 23070- func_stripname_result=${3} 23071- func_stripname_result=${func_stripname_result#"${1}"} 23072- func_stripname_result=${func_stripname_result%"${2}"} 23073-} 23074- 23075-# func_opt_split 23076-func_opt_split () 23077-{ 23078- func_opt_split_opt=${1%%=*} 23079- func_opt_split_arg=${1#*=} 23080-} 23081- 23082-# func_lo2o object 23083-func_lo2o () 23084-{ 23085- case ${1} in 23086- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 23087- *) func_lo2o_result=${1} ;; 23088- esac 23089-} 23090- 23091-# func_xform libobj-or-source 23092-func_xform () 23093-{ 23094- func_xform_result=${1%.*}.lo 23095-} 23096- 23097-# func_arith arithmetic-term... 23098-func_arith () 23099-{ 23100- func_arith_result=$(( $* )) 23101-} 23102- 23103-# func_len string 23104-# STRING may not start with a hyphen. 23105-func_len () 23106-{ 23107- func_len_result=${#1} 23108-} 23109- 23110-_LT_EOF 23111- ;; 23112- *) # Bourne compatible functions. 23113- cat << \_LT_EOF >> "$cfgfile" 23114- 23115-# func_dirname file append nondir_replacement 23116-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 23117-# otherwise set result to NONDIR_REPLACEMENT. 23118-func_dirname () 23119-{ 23120- # Extract subdirectory from the argument. 23121- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 23122- if test "X$func_dirname_result" = "X${1}"; then 23123- func_dirname_result="${3}" 23124- else 23125- func_dirname_result="$func_dirname_result${2}" 23126- fi 23127-} 23128- 23129-# func_basename file 23130-func_basename () 23131-{ 23132- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 23133-} 23134- 23135- 23136-# func_stripname prefix suffix name 23137-# strip PREFIX and SUFFIX off of NAME. 23138-# PREFIX and SUFFIX must not contain globbing or regex special 23139-# characters, hashes, percent signs, but SUFFIX may contain a leading 23140-# dot (in which case that matches only a dot). 23141-# func_strip_suffix prefix name 23142-func_stripname () 23143-{ 23144- case ${2} in 23145- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 23146- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 23147- esac 23148-} 23149- 23150-# sed scripts: 23151-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 23152-my_sed_long_arg='1s/^-[^=]*=//' 23153- 23154-# func_opt_split 23155-func_opt_split () 23156-{ 23157- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 23158- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 23159-} 23160- 23161-# func_lo2o object 23162-func_lo2o () 23163-{ 23164- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 23165-} 23166- 23167-# func_xform libobj-or-source 23168-func_xform () 23169-{ 23170- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 23171-} 23172- 23173-# func_arith arithmetic-term... 23174-func_arith () 23175-{ 23176- func_arith_result=`expr "$@"` 23177-} 23178- 23179-# func_len string 23180-# STRING may not start with a hyphen. 23181-func_len () 23182-{ 23183- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 23184-} 23185- 23186-_LT_EOF 23187-esac 23188- 23189-case $lt_shell_append in 23190- yes) 23191- cat << \_LT_EOF >> "$cfgfile" 23192- 23193-# func_append var value 23194-# Append VALUE to the end of shell variable VAR. 23195-func_append () 23196-{ 23197- eval "$1+=\$2" 23198-} 23199-_LT_EOF 23200- ;; 23201- *) 23202- cat << \_LT_EOF >> "$cfgfile" 23203- 23204-# func_append var value 23205-# Append VALUE to the end of shell variable VAR. 23206-func_append () 23207-{ 23208- eval "$1=\$$1\$2" 23209-} 23210- 23211-_LT_EOF 23212- ;; 23213- esac 23214- 23215- 23216- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 23217- || (rm -f "$cfgfile"; exit 1) 23218- 23219- mv -f "$cfgfile" "$ofile" || 23220+ sed '$q' "$ltmain" >> "$cfgfile" \ 23221+ || (rm -f "$cfgfile"; exit 1) 23222+ 23223+ if test x"$xsi_shell" = xyes; then 23224+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 23225+func_dirname ()\ 23226+{\ 23227+\ case ${1} in\ 23228+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 23229+\ * ) func_dirname_result="${3}" ;;\ 23230+\ esac\ 23231+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 23232+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23233+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23234+test 0 -eq $? || _lt_function_replace_fail=: 23235+ 23236+ 23237+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 23238+func_basename ()\ 23239+{\ 23240+\ func_basename_result="${1##*/}"\ 23241+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 23242+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23243+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23244+test 0 -eq $? || _lt_function_replace_fail=: 23245+ 23246+ 23247+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 23248+func_dirname_and_basename ()\ 23249+{\ 23250+\ case ${1} in\ 23251+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 23252+\ * ) func_dirname_result="${3}" ;;\ 23253+\ esac\ 23254+\ func_basename_result="${1##*/}"\ 23255+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 23256+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23257+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23258+test 0 -eq $? || _lt_function_replace_fail=: 23259+ 23260+ 23261+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 23262+func_stripname ()\ 23263+{\ 23264+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 23265+\ # positional parameters, so assign one to ordinary parameter first.\ 23266+\ func_stripname_result=${3}\ 23267+\ func_stripname_result=${func_stripname_result#"${1}"}\ 23268+\ func_stripname_result=${func_stripname_result%"${2}"}\ 23269+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 23270+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23271+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23272+test 0 -eq $? || _lt_function_replace_fail=: 23273+ 23274+ 23275+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 23276+func_split_long_opt ()\ 23277+{\ 23278+\ func_split_long_opt_name=${1%%=*}\ 23279+\ func_split_long_opt_arg=${1#*=}\ 23280+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 23281+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23282+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23283+test 0 -eq $? || _lt_function_replace_fail=: 23284+ 23285+ 23286+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 23287+func_split_short_opt ()\ 23288+{\ 23289+\ func_split_short_opt_arg=${1#??}\ 23290+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 23291+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 23292+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23293+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23294+test 0 -eq $? || _lt_function_replace_fail=: 23295+ 23296+ 23297+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 23298+func_lo2o ()\ 23299+{\ 23300+\ case ${1} in\ 23301+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 23302+\ *) func_lo2o_result=${1} ;;\ 23303+\ esac\ 23304+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 23305+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23306+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23307+test 0 -eq $? || _lt_function_replace_fail=: 23308+ 23309+ 23310+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 23311+func_xform ()\ 23312+{\ 23313+ func_xform_result=${1%.*}.lo\ 23314+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 23315+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23316+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23317+test 0 -eq $? || _lt_function_replace_fail=: 23318+ 23319+ 23320+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 23321+func_arith ()\ 23322+{\ 23323+ func_arith_result=$(( $* ))\ 23324+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 23325+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23326+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23327+test 0 -eq $? || _lt_function_replace_fail=: 23328+ 23329+ 23330+ sed -e '/^func_len ()$/,/^} # func_len /c\ 23331+func_len ()\ 23332+{\ 23333+ func_len_result=${#1}\ 23334+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 23335+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23336+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23337+test 0 -eq $? || _lt_function_replace_fail=: 23338+ 23339+fi 23340+ 23341+if test x"$lt_shell_append" = xyes; then 23342+ sed -e '/^func_append ()$/,/^} # func_append /c\ 23343+func_append ()\ 23344+{\ 23345+ eval "${1}+=\\${2}"\ 23346+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 23347+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23348+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23349+test 0 -eq $? || _lt_function_replace_fail=: 23350+ 23351+ 23352+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 23353+func_append_quoted ()\ 23354+{\ 23355+\ func_quote_for_eval "${2}"\ 23356+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 23357+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 23358+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23359+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23360+test 0 -eq $? || _lt_function_replace_fail=: 23361+ 23362+ 23363+ # Save a `func_append' function call where possible by direct use of '+=' 23364+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 23365+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23366+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23367+ test 0 -eq $? || _lt_function_replace_fail=: 23368+else 23369+ # Save a `func_append' function call even when '+=' is not available 23370+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 23371+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 23372+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 23373+ test 0 -eq $? || _lt_function_replace_fail=: 23374+fi 23375+ 23376+if test x"$_lt_function_replace_fail" = x":"; then 23377+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 23378+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 23379+fi 23380+ 23381+ 23382+ mv -f "$cfgfile" "$ofile" || 23383 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 23384 chmod +x "$ofile" 23385 23386diff --git a/zlib/configure b/zlib/configure 23387index db7845c5d42..cd59daa39b5 100755 23388--- a/zlib/configure 23389+++ b/zlib/configure 23390@@ -646,8 +646,11 @@ OTOOL 23391 LIPO 23392 NMEDIT 23393 DSYMUTIL 23394+MANIFEST_TOOL 23395 RANLIB 23396+ac_ct_AR 23397 AR 23398+DLLTOOL 23399 OBJDUMP 23400 LN_S 23401 NM 23402@@ -774,6 +777,7 @@ enable_static 23403 with_pic 23404 enable_fast_install 23405 with_gnu_ld 23406+with_libtool_sysroot 23407 enable_libtool_lock 23408 enable_host_shared 23409 ' 23410@@ -1428,6 +1432,8 @@ Optional Packages: 23411 --with-pic try to use only PIC/non-PIC objects [default=use 23412 both] 23413 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 23414+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR 23415+ (or the compiler's sysroot if not specified). 23416 23417 Some influential environment variables: 23418 CC C compiler command 23419@@ -4186,8 +4192,8 @@ esac 23420 23421 23422 23423-macro_version='2.2.7a' 23424-macro_revision='1.3134' 23425+macro_version='2.4' 23426+macro_revision='1.3293' 23427 23428 23429 23430@@ -4227,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO 23431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 23432 $as_echo_n "checking how to print strings... " >&6; } 23433 # Test print first, because it will be a builtin if present. 23434-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ 23435+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ 23436 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then 23437 ECHO='print -r --' 23438 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then 23439@@ -5044,8 +5050,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; 23440 # Try some XSI features 23441 xsi_shell=no 23442 ( _lt_dummy="a/b/c" 23443- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ 23444- = c,a/b,, \ 23445+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ 23446+ = c,a/b,b/c, \ 23447 && eval 'test $(( 1 + 1 )) -eq 2 \ 23448 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ 23449 && xsi_shell=yes 23450@@ -5094,6 +5100,80 @@ esac 23451 23452 23453 23454+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 23455+$as_echo_n "checking how to convert $build file names to $host format... " >&6; } 23456+if ${lt_cv_to_host_file_cmd+:} false; then : 23457+ $as_echo_n "(cached) " >&6 23458+else 23459+ case $host in 23460+ *-*-mingw* ) 23461+ case $build in 23462+ *-*-mingw* ) # actually msys 23463+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 23464+ ;; 23465+ *-*-cygwin* ) 23466+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 23467+ ;; 23468+ * ) # otherwise, assume *nix 23469+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 23470+ ;; 23471+ esac 23472+ ;; 23473+ *-*-cygwin* ) 23474+ case $build in 23475+ *-*-mingw* ) # actually msys 23476+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 23477+ ;; 23478+ *-*-cygwin* ) 23479+ lt_cv_to_host_file_cmd=func_convert_file_noop 23480+ ;; 23481+ * ) # otherwise, assume *nix 23482+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin 23483+ ;; 23484+ esac 23485+ ;; 23486+ * ) # unhandled hosts (and "normal" native builds) 23487+ lt_cv_to_host_file_cmd=func_convert_file_noop 23488+ ;; 23489+esac 23490+ 23491+fi 23492+ 23493+to_host_file_cmd=$lt_cv_to_host_file_cmd 23494+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 23495+$as_echo "$lt_cv_to_host_file_cmd" >&6; } 23496+ 23497+ 23498+ 23499+ 23500+ 23501+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 23502+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } 23503+if ${lt_cv_to_tool_file_cmd+:} false; then : 23504+ $as_echo_n "(cached) " >&6 23505+else 23506+ #assume ordinary cross tools, or native build. 23507+lt_cv_to_tool_file_cmd=func_convert_file_noop 23508+case $host in 23509+ *-*-mingw* ) 23510+ case $build in 23511+ *-*-mingw* ) # actually msys 23512+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 23513+ ;; 23514+ esac 23515+ ;; 23516+esac 23517+ 23518+fi 23519+ 23520+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 23521+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 23522+$as_echo "$lt_cv_to_tool_file_cmd" >&6; } 23523+ 23524+ 23525+ 23526+ 23527+ 23528 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 23529 $as_echo_n "checking for $LD option to reload object files... " >&6; } 23530 if ${lt_cv_ld_reload_flag+:} false; then : 23531@@ -5110,6 +5190,11 @@ case $reload_flag in 23532 esac 23533 reload_cmds='$LD$reload_flag -o $output$reload_objs' 23534 case $host_os in 23535+ cygwin* | mingw* | pw32* | cegcc*) 23536+ if test "$GCC" != yes; then 23537+ reload_cmds=false 23538+ fi 23539+ ;; 23540 darwin*) 23541 if test "$GCC" = yes; then 23542 reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' 23543@@ -5278,7 +5363,8 @@ mingw* | pw32*) 23544 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 23545 lt_cv_file_magic_cmd='func_win32_libid' 23546 else 23547- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' 23548+ # Keep this pattern in sync with the one in func_win32_libid. 23549+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' 23550 lt_cv_file_magic_cmd='$OBJDUMP -f' 23551 fi 23552 ;; 23553@@ -5432,6 +5518,21 @@ esac 23554 fi 23555 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 23556 $as_echo "$lt_cv_deplibs_check_method" >&6; } 23557+ 23558+file_magic_glob= 23559+want_nocaseglob=no 23560+if test "$build" = "$host"; then 23561+ case $host_os in 23562+ mingw* | pw32*) 23563+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then 23564+ want_nocaseglob=yes 23565+ else 23566+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` 23567+ fi 23568+ ;; 23569+ esac 23570+fi 23571+ 23572 file_magic_cmd=$lt_cv_file_magic_cmd 23573 deplibs_check_method=$lt_cv_deplibs_check_method 23574 test -z "$deplibs_check_method" && deplibs_check_method=unknown 23575@@ -5447,6 +5548,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 23576 23577 23578 23579+ 23580+ 23581+ 23582+ 23583+ 23584+ 23585+ 23586+ 23587+ 23588+ 23589+if test -n "$ac_tool_prefix"; then 23590+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. 23591+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 23592+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 23593+$as_echo_n "checking for $ac_word... " >&6; } 23594+if ${ac_cv_prog_DLLTOOL+:} false; then : 23595+ $as_echo_n "(cached) " >&6 23596+else 23597+ if test -n "$DLLTOOL"; then 23598+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. 23599+else 23600+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 23601+for as_dir in $PATH 23602+do 23603+ IFS=$as_save_IFS 23604+ test -z "$as_dir" && as_dir=. 23605+ for ac_exec_ext in '' $ac_executable_extensions; do 23606+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 23607+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 23608+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 23609+ break 2 23610+ fi 23611+done 23612+ done 23613+IFS=$as_save_IFS 23614+ 23615+fi 23616+fi 23617+DLLTOOL=$ac_cv_prog_DLLTOOL 23618+if test -n "$DLLTOOL"; then 23619+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 23620+$as_echo "$DLLTOOL" >&6; } 23621+else 23622+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 23623+$as_echo "no" >&6; } 23624+fi 23625+ 23626+ 23627+fi 23628+if test -z "$ac_cv_prog_DLLTOOL"; then 23629+ ac_ct_DLLTOOL=$DLLTOOL 23630+ # Extract the first word of "dlltool", so it can be a program name with args. 23631+set dummy dlltool; ac_word=$2 23632+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 23633+$as_echo_n "checking for $ac_word... " >&6; } 23634+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : 23635+ $as_echo_n "(cached) " >&6 23636+else 23637+ if test -n "$ac_ct_DLLTOOL"; then 23638+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. 23639+else 23640+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 23641+for as_dir in $PATH 23642+do 23643+ IFS=$as_save_IFS 23644+ test -z "$as_dir" && as_dir=. 23645+ for ac_exec_ext in '' $ac_executable_extensions; do 23646+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 23647+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" 23648+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 23649+ break 2 23650+ fi 23651+done 23652+ done 23653+IFS=$as_save_IFS 23654+ 23655+fi 23656+fi 23657+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL 23658+if test -n "$ac_ct_DLLTOOL"; then 23659+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 23660+$as_echo "$ac_ct_DLLTOOL" >&6; } 23661+else 23662+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 23663+$as_echo "no" >&6; } 23664+fi 23665+ 23666+ if test "x$ac_ct_DLLTOOL" = x; then 23667+ DLLTOOL="false" 23668+ else 23669+ case $cross_compiling:$ac_tool_warned in 23670+yes:) 23671+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 23672+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 23673+ac_tool_warned=yes ;; 23674+esac 23675+ DLLTOOL=$ac_ct_DLLTOOL 23676+ fi 23677+else 23678+ DLLTOOL="$ac_cv_prog_DLLTOOL" 23679+fi 23680+ 23681+test -z "$DLLTOOL" && DLLTOOL=dlltool 23682+ 23683+ 23684+ 23685+ 23686+ 23687+ 23688+ 23689+ 23690+ 23691+ 23692+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 23693+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } 23694+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : 23695+ $as_echo_n "(cached) " >&6 23696+else 23697+ lt_cv_sharedlib_from_linklib_cmd='unknown' 23698+ 23699+case $host_os in 23700+cygwin* | mingw* | pw32* | cegcc*) 23701+ # two different shell functions defined in ltmain.sh 23702+ # decide which to use based on capabilities of $DLLTOOL 23703+ case `$DLLTOOL --help 2>&1` in 23704+ *--identify-strict*) 23705+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib 23706+ ;; 23707+ *) 23708+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback 23709+ ;; 23710+ esac 23711+ ;; 23712+*) 23713+ # fallback: assume linklib IS sharedlib 23714+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" 23715+ ;; 23716+esac 23717+ 23718+fi 23719+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 23720+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } 23721+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd 23722+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO 23723+ 23724+ 23725+ 23726+ 23727+ 23728+ 23729+ 23730+ 23731 plugin_option= 23732 plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" 23733 for plugin in $plugin_names; do 23734@@ -5461,8 +5714,10 @@ for plugin in $plugin_names; do 23735 done 23736 23737 if test -n "$ac_tool_prefix"; then 23738- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 23739-set dummy ${ac_tool_prefix}ar; ac_word=$2 23740+ for ac_prog in ar 23741+ do 23742+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 23743+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 23744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 23745 $as_echo_n "checking for $ac_word... " >&6; } 23746 if ${ac_cv_prog_AR+:} false; then : 23747@@ -5478,7 +5733,7 @@ do 23748 test -z "$as_dir" && as_dir=. 23749 for ac_exec_ext in '' $ac_executable_extensions; do 23750 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 23751- ac_cv_prog_AR="${ac_tool_prefix}ar" 23752+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 23753 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 23754 break 2 23755 fi 23756@@ -5498,11 +5753,15 @@ $as_echo "no" >&6; } 23757 fi 23758 23759 23760+ test -n "$AR" && break 23761+ done 23762 fi 23763-if test -z "$ac_cv_prog_AR"; then 23764+if test -z "$AR"; then 23765 ac_ct_AR=$AR 23766- # Extract the first word of "ar", so it can be a program name with args. 23767-set dummy ar; ac_word=$2 23768+ for ac_prog in ar 23769+do 23770+ # Extract the first word of "$ac_prog", so it can be a program name with args. 23771+set dummy $ac_prog; ac_word=$2 23772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 23773 $as_echo_n "checking for $ac_word... " >&6; } 23774 if ${ac_cv_prog_ac_ct_AR+:} false; then : 23775@@ -5518,7 +5777,7 @@ do 23776 test -z "$as_dir" && as_dir=. 23777 for ac_exec_ext in '' $ac_executable_extensions; do 23778 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 23779- ac_cv_prog_ac_ct_AR="ar" 23780+ ac_cv_prog_ac_ct_AR="$ac_prog" 23781 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 23782 break 2 23783 fi 23784@@ -5537,6 +5796,10 @@ else 23785 $as_echo "no" >&6; } 23786 fi 23787 23788+ 23789+ test -n "$ac_ct_AR" && break 23790+done 23791+ 23792 if test "x$ac_ct_AR" = x; then 23793 AR="false" 23794 else 23795@@ -5548,25 +5811,19 @@ ac_tool_warned=yes ;; 23796 esac 23797 AR=$ac_ct_AR 23798 fi 23799-else 23800- AR="$ac_cv_prog_AR" 23801 fi 23802 23803-test -z "$AR" && AR=ar 23804-if test -n "$plugin_option"; then 23805- if $AR --help 2>&1 | grep -q "\--plugin"; then 23806- touch conftest.c 23807- $AR $plugin_option rc conftest.a conftest.c 23808- if test "$?" != 0; then 23809- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 23810+ touch conftest.c 23811+ $AR $plugin_option rc conftest.a conftest.c 23812+ if test "$?" != 0; then 23813+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5 23814 $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;} 23815- else 23816- AR="$AR $plugin_option" 23817- fi 23818- rm -f conftest.* 23819+ else 23820+ AR="$AR $plugin_option" 23821 fi 23822-fi 23823-test -z "$AR_FLAGS" && AR_FLAGS=cru 23824+ rm -f conftest.* 23825+: ${AR=ar} 23826+: ${AR_FLAGS=cru} 23827 23828 23829 23830@@ -5578,6 +5835,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru 23831 23832 23833 23834+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 23835+$as_echo_n "checking for archiver @FILE support... " >&6; } 23836+if ${lt_cv_ar_at_file+:} false; then : 23837+ $as_echo_n "(cached) " >&6 23838+else 23839+ lt_cv_ar_at_file=no 23840+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 23841+/* end confdefs.h. */ 23842+ 23843+int 23844+main () 23845+{ 23846+ 23847+ ; 23848+ return 0; 23849+} 23850+_ACEOF 23851+if ac_fn_c_try_compile "$LINENO"; then : 23852+ echo conftest.$ac_objext > conftest.lst 23853+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' 23854+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 23855+ (eval $lt_ar_try) 2>&5 23856+ ac_status=$? 23857+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 23858+ test $ac_status = 0; } 23859+ if test "$ac_status" -eq 0; then 23860+ # Ensure the archiver fails upon bogus file names. 23861+ rm -f conftest.$ac_objext libconftest.a 23862+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 23863+ (eval $lt_ar_try) 2>&5 23864+ ac_status=$? 23865+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 23866+ test $ac_status = 0; } 23867+ if test "$ac_status" -ne 0; then 23868+ lt_cv_ar_at_file=@ 23869+ fi 23870+ fi 23871+ rm -f conftest.* libconftest.a 23872+ 23873+fi 23874+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 23875+ 23876+fi 23877+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 23878+$as_echo "$lt_cv_ar_at_file" >&6; } 23879+ 23880+if test "x$lt_cv_ar_at_file" = xno; then 23881+ archiver_list_spec= 23882+else 23883+ archiver_list_spec=$lt_cv_ar_at_file 23884+fi 23885+ 23886+ 23887+ 23888+ 23889+ 23890+ 23891+ 23892 if test -n "$ac_tool_prefix"; then 23893 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 23894 set dummy ${ac_tool_prefix}strip; ac_word=$2 23895@@ -5917,8 +6232,8 @@ esac 23896 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 23897 23898 # Transform an extracted symbol line into symbol name and symbol address 23899-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 23900-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'" 23901+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" 23902+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'" 23903 23904 # Handle CRLF in mingw tool chain 23905 opt_cr= 23906@@ -5954,6 +6269,7 @@ for ac_symprfx in "" "_"; do 23907 else 23908 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" 23909 fi 23910+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" 23911 23912 # Check to see that the pipe works correctly. 23913 pipe_works=no 23914@@ -5995,6 +6311,18 @@ _LT_EOF 23915 if $GREP ' nm_test_var$' "$nlist" >/dev/null; then 23916 if $GREP ' nm_test_func$' "$nlist" >/dev/null; then 23917 cat <<_LT_EOF > conftest.$ac_ext 23918+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ 23919+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) 23920+/* DATA imports from DLLs on WIN32 con't be const, because runtime 23921+ relocations are performed -- see ld's documentation on pseudo-relocs. */ 23922+# define LT_DLSYM_CONST 23923+#elif defined(__osf__) 23924+/* This system does not cope well with relocations in const data. */ 23925+# define LT_DLSYM_CONST 23926+#else 23927+# define LT_DLSYM_CONST const 23928+#endif 23929+ 23930 #ifdef __cplusplus 23931 extern "C" { 23932 #endif 23933@@ -6006,7 +6334,7 @@ _LT_EOF 23934 cat <<_LT_EOF >> conftest.$ac_ext 23935 23936 /* The mapping between symbol names and symbols. */ 23937-const struct { 23938+LT_DLSYM_CONST struct { 23939 const char *name; 23940 void *address; 23941 } 23942@@ -6032,8 +6360,8 @@ static const void *lt_preloaded_setup() { 23943 _LT_EOF 23944 # Now try linking the two files. 23945 mv conftest.$ac_objext conftstm.$ac_objext 23946- lt_save_LIBS="$LIBS" 23947- lt_save_CFLAGS="$CFLAGS" 23948+ lt_globsym_save_LIBS=$LIBS 23949+ lt_globsym_save_CFLAGS=$CFLAGS 23950 LIBS="conftstm.$ac_objext" 23951 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 23952 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 23953@@ -6043,8 +6371,8 @@ _LT_EOF 23954 test $ac_status = 0; } && test -s conftest${ac_exeext}; then 23955 pipe_works=yes 23956 fi 23957- LIBS="$lt_save_LIBS" 23958- CFLAGS="$lt_save_CFLAGS" 23959+ LIBS=$lt_globsym_save_LIBS 23960+ CFLAGS=$lt_globsym_save_CFLAGS 23961 else 23962 echo "cannot find nm_test_func in $nlist" >&5 23963 fi 23964@@ -6081,6 +6409,17 @@ else 23965 $as_echo "ok" >&6; } 23966 fi 23967 23968+# Response file support. 23969+if test "$lt_cv_nm_interface" = "MS dumpbin"; then 23970+ nm_file_list_spec='@' 23971+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then 23972+ nm_file_list_spec='@' 23973+fi 23974+ 23975+ 23976+ 23977+ 23978+ 23979 23980 23981 23982@@ -6098,6 +6437,43 @@ fi 23983 23984 23985 23986+ 23987+ 23988+ 23989+ 23990+ 23991+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 23992+$as_echo_n "checking for sysroot... " >&6; } 23993+ 23994+# Check whether --with-libtool-sysroot was given. 23995+if test "${with_libtool_sysroot+set}" = set; then : 23996+ withval=$with_libtool_sysroot; 23997+else 23998+ with_libtool_sysroot=no 23999+fi 24000+ 24001+ 24002+lt_sysroot= 24003+case ${with_libtool_sysroot} in #( 24004+ yes) 24005+ if test "$GCC" = yes; then 24006+ lt_sysroot=`$CC --print-sysroot 2>/dev/null` 24007+ fi 24008+ ;; #( 24009+ /*) 24010+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` 24011+ ;; #( 24012+ no|'') 24013+ ;; #( 24014+ *) 24015+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 24016+$as_echo "${with_libtool_sysroot}" >&6; } 24017+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 24018+ ;; 24019+esac 24020+ 24021+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 24022+$as_echo "${lt_sysroot:-no}" >&6; } 24023 24024 24025 24026@@ -6312,6 +6688,123 @@ esac 24027 24028 need_locks="$enable_libtool_lock" 24029 24030+if test -n "$ac_tool_prefix"; then 24031+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. 24032+set dummy ${ac_tool_prefix}mt; ac_word=$2 24033+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 24034+$as_echo_n "checking for $ac_word... " >&6; } 24035+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : 24036+ $as_echo_n "(cached) " >&6 24037+else 24038+ if test -n "$MANIFEST_TOOL"; then 24039+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. 24040+else 24041+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 24042+for as_dir in $PATH 24043+do 24044+ IFS=$as_save_IFS 24045+ test -z "$as_dir" && as_dir=. 24046+ for ac_exec_ext in '' $ac_executable_extensions; do 24047+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 24048+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 24049+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 24050+ break 2 24051+ fi 24052+done 24053+ done 24054+IFS=$as_save_IFS 24055+ 24056+fi 24057+fi 24058+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL 24059+if test -n "$MANIFEST_TOOL"; then 24060+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 24061+$as_echo "$MANIFEST_TOOL" >&6; } 24062+else 24063+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 24064+$as_echo "no" >&6; } 24065+fi 24066+ 24067+ 24068+fi 24069+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then 24070+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL 24071+ # Extract the first word of "mt", so it can be a program name with args. 24072+set dummy mt; ac_word=$2 24073+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 24074+$as_echo_n "checking for $ac_word... " >&6; } 24075+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : 24076+ $as_echo_n "(cached) " >&6 24077+else 24078+ if test -n "$ac_ct_MANIFEST_TOOL"; then 24079+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. 24080+else 24081+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 24082+for as_dir in $PATH 24083+do 24084+ IFS=$as_save_IFS 24085+ test -z "$as_dir" && as_dir=. 24086+ for ac_exec_ext in '' $ac_executable_extensions; do 24087+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 24088+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 24089+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 24090+ break 2 24091+ fi 24092+done 24093+ done 24094+IFS=$as_save_IFS 24095+ 24096+fi 24097+fi 24098+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL 24099+if test -n "$ac_ct_MANIFEST_TOOL"; then 24100+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 24101+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } 24102+else 24103+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 24104+$as_echo "no" >&6; } 24105+fi 24106+ 24107+ if test "x$ac_ct_MANIFEST_TOOL" = x; then 24108+ MANIFEST_TOOL=":" 24109+ else 24110+ case $cross_compiling:$ac_tool_warned in 24111+yes:) 24112+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 24113+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 24114+ac_tool_warned=yes ;; 24115+esac 24116+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL 24117+ fi 24118+else 24119+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" 24120+fi 24121+ 24122+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt 24123+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 24124+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } 24125+if ${lt_cv_path_mainfest_tool+:} false; then : 24126+ $as_echo_n "(cached) " >&6 24127+else 24128+ lt_cv_path_mainfest_tool=no 24129+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 24130+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out 24131+ cat conftest.err >&5 24132+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then 24133+ lt_cv_path_mainfest_tool=yes 24134+ fi 24135+ rm -f conftest* 24136+fi 24137+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 24138+$as_echo "$lt_cv_path_mainfest_tool" >&6; } 24139+if test "x$lt_cv_path_mainfest_tool" != xyes; then 24140+ MANIFEST_TOOL=: 24141+fi 24142+ 24143+ 24144+ 24145+ 24146+ 24147 24148 case $host_os in 24149 rhapsody* | darwin*) 24150@@ -6878,6 +7371,8 @@ _LT_EOF 24151 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 24152 echo "$AR cru libconftest.a conftest.o" >&5 24153 $AR cru libconftest.a conftest.o 2>&5 24154+ echo "$RANLIB libconftest.a" >&5 24155+ $RANLIB libconftest.a 2>&5 24156 cat > conftest.c << _LT_EOF 24157 int main() { return 0;} 24158 _LT_EOF 24159@@ -7727,8 +8222,6 @@ fi 24160 lt_prog_compiler_pic= 24161 lt_prog_compiler_static= 24162 24163-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 24164-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 24165 24166 if test "$GCC" = yes; then 24167 lt_prog_compiler_wl='-Wl,' 24168@@ -7894,6 +8387,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 24169 lt_prog_compiler_pic='--shared' 24170 lt_prog_compiler_static='--static' 24171 ;; 24172+ nagfor*) 24173+ # NAG Fortran compiler 24174+ lt_prog_compiler_wl='-Wl,-Wl,,' 24175+ lt_prog_compiler_pic='-PIC' 24176+ lt_prog_compiler_static='-Bstatic' 24177+ ;; 24178 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) 24179 # Portland Group compilers (*not* the Pentium gcc compiler, 24180 # which looks to be a dead project) 24181@@ -7956,7 +8455,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } 24182 lt_prog_compiler_pic='-KPIC' 24183 lt_prog_compiler_static='-Bstatic' 24184 case $cc_basename in 24185- f77* | f90* | f95*) 24186+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) 24187 lt_prog_compiler_wl='-Qoption ld ';; 24188 *) 24189 lt_prog_compiler_wl='-Wl,';; 24190@@ -8013,13 +8512,17 @@ case $host_os in 24191 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" 24192 ;; 24193 esac 24194-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 24195-$as_echo "$lt_prog_compiler_pic" >&6; } 24196- 24197- 24198- 24199- 24200 24201+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 24202+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } 24203+if ${lt_cv_prog_compiler_pic+:} false; then : 24204+ $as_echo_n "(cached) " >&6 24205+else 24206+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic 24207+fi 24208+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 24209+$as_echo "$lt_cv_prog_compiler_pic" >&6; } 24210+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic 24211 24212 # 24213 # Check to make sure the PIC flag actually works. 24214@@ -8080,6 +8583,11 @@ fi 24215 24216 24217 24218+ 24219+ 24220+ 24221+ 24222+ 24223 # 24224 # Check to make sure the static flag actually works. 24225 # 24226@@ -8430,7 +8938,8 @@ _LT_EOF 24227 allow_undefined_flag=unsupported 24228 always_export_symbols=no 24229 enable_shared_with_static_runtimes=yes 24230- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 24231+ 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' 24232+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' 24233 24234 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then 24235 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' 24236@@ -8529,12 +9038,12 @@ _LT_EOF 24237 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 24238 hardcode_libdir_flag_spec= 24239 hardcode_libdir_flag_spec_ld='-rpath $libdir' 24240- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' 24241+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 24242 if test "x$supports_anon_versioning" = xyes; then 24243 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 24244 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 24245 echo "local: *; };" >> $output_objdir/$libname.ver~ 24246- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 24247+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 24248 fi 24249 ;; 24250 esac 24251@@ -8548,8 +9057,8 @@ _LT_EOF 24252 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 24253 wlarc= 24254 else 24255- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 24256- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 24257+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 24258+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 24259 fi 24260 ;; 24261 24262@@ -8567,8 +9076,8 @@ _LT_EOF 24263 24264 _LT_EOF 24265 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 24266- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 24267- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 24268+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 24269+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 24270 else 24271 ld_shlibs=no 24272 fi 24273@@ -8614,8 +9123,8 @@ _LT_EOF 24274 24275 *) 24276 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 24277- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 24278- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 24279+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 24280+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 24281 else 24282 ld_shlibs=no 24283 fi 24284@@ -8745,7 +9254,13 @@ _LT_EOF 24285 allow_undefined_flag='-berok' 24286 # Determine the default libpath from the value encoded in an 24287 # empty executable. 24288- if test x$gcc_no_link = xyes; then 24289+ if test "${lt_cv_aix_libpath+set}" = set; then 24290+ aix_libpath=$lt_cv_aix_libpath 24291+else 24292+ if ${lt_cv_aix_libpath_+:} false; then : 24293+ $as_echo_n "(cached) " >&6 24294+else 24295+ if test x$gcc_no_link = xyes; then 24296 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 24297 fi 24298 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 24299@@ -8761,22 +9276,29 @@ main () 24300 _ACEOF 24301 if ac_fn_c_try_link "$LINENO"; then : 24302 24303-lt_aix_libpath_sed=' 24304- /Import File Strings/,/^$/ { 24305- /^0/ { 24306- s/^0 *\(.*\)$/\1/ 24307- p 24308- } 24309- }' 24310-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 24311-# Check for a 64-bit object if we didn't find anything. 24312-if test -z "$aix_libpath"; then 24313- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 24314-fi 24315+ lt_aix_libpath_sed=' 24316+ /Import File Strings/,/^$/ { 24317+ /^0/ { 24318+ s/^0 *\([^ ]*\) *$/\1/ 24319+ p 24320+ } 24321+ }' 24322+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 24323+ # Check for a 64-bit object if we didn't find anything. 24324+ if test -z "$lt_cv_aix_libpath_"; then 24325+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 24326+ fi 24327 fi 24328 rm -f core conftest.err conftest.$ac_objext \ 24329 conftest$ac_exeext conftest.$ac_ext 24330-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24331+ if test -z "$lt_cv_aix_libpath_"; then 24332+ lt_cv_aix_libpath_="/usr/lib:/lib" 24333+ fi 24334+ 24335+fi 24336+ 24337+ aix_libpath=$lt_cv_aix_libpath_ 24338+fi 24339 24340 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 24341 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" 24342@@ -8788,7 +9310,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24343 else 24344 # Determine the default libpath from the value encoded in an 24345 # empty executable. 24346- if test x$gcc_no_link = xyes; then 24347+ if test "${lt_cv_aix_libpath+set}" = set; then 24348+ aix_libpath=$lt_cv_aix_libpath 24349+else 24350+ if ${lt_cv_aix_libpath_+:} false; then : 24351+ $as_echo_n "(cached) " >&6 24352+else 24353+ if test x$gcc_no_link = xyes; then 24354 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 24355 fi 24356 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 24357@@ -8804,22 +9332,29 @@ main () 24358 _ACEOF 24359 if ac_fn_c_try_link "$LINENO"; then : 24360 24361-lt_aix_libpath_sed=' 24362- /Import File Strings/,/^$/ { 24363- /^0/ { 24364- s/^0 *\(.*\)$/\1/ 24365- p 24366- } 24367- }' 24368-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 24369-# Check for a 64-bit object if we didn't find anything. 24370-if test -z "$aix_libpath"; then 24371- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 24372-fi 24373+ lt_aix_libpath_sed=' 24374+ /Import File Strings/,/^$/ { 24375+ /^0/ { 24376+ s/^0 *\([^ ]*\) *$/\1/ 24377+ p 24378+ } 24379+ }' 24380+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 24381+ # Check for a 64-bit object if we didn't find anything. 24382+ if test -z "$lt_cv_aix_libpath_"; then 24383+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` 24384+ fi 24385 fi 24386 rm -f core conftest.err conftest.$ac_objext \ 24387 conftest$ac_exeext conftest.$ac_ext 24388-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24389+ if test -z "$lt_cv_aix_libpath_"; then 24390+ lt_cv_aix_libpath_="/usr/lib:/lib" 24391+ fi 24392+ 24393+fi 24394+ 24395+ aix_libpath=$lt_cv_aix_libpath_ 24396+fi 24397 24398 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" 24399 # Warning - without using the other run time loading flags, 24400@@ -8864,20 +9399,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24401 # Microsoft Visual C++. 24402 # hardcode_libdir_flag_spec is actually meaningless, as there is 24403 # no search path for DLLs. 24404- hardcode_libdir_flag_spec=' ' 24405- allow_undefined_flag=unsupported 24406- # Tell ltmain to make .lib files, not .a files. 24407- libext=lib 24408- # Tell ltmain to make .dll files, not .so files. 24409- shrext_cmds=".dll" 24410- # FIXME: Setting linknames here is a bad hack. 24411- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 24412- # The linker will automatically build a .lib file if we build a DLL. 24413- old_archive_from_new_cmds='true' 24414- # FIXME: Should let the user specify the lib program. 24415- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 24416- fix_srcfile_path='`cygpath -w "$srcfile"`' 24417- enable_shared_with_static_runtimes=yes 24418+ case $cc_basename in 24419+ cl*) 24420+ # Native MSVC 24421+ hardcode_libdir_flag_spec=' ' 24422+ allow_undefined_flag=unsupported 24423+ always_export_symbols=yes 24424+ file_list_spec='@' 24425+ # Tell ltmain to make .lib files, not .a files. 24426+ libext=lib 24427+ # Tell ltmain to make .dll files, not .so files. 24428+ shrext_cmds=".dll" 24429+ # FIXME: Setting linknames here is a bad hack. 24430+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' 24431+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then 24432+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; 24433+ else 24434+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; 24435+ fi~ 24436+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ 24437+ linknames=' 24438+ # The linker will not automatically build a static lib if we build a DLL. 24439+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 24440+ enable_shared_with_static_runtimes=yes 24441+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 24442+ # Don't use ranlib 24443+ old_postinstall_cmds='chmod 644 $oldlib' 24444+ postlink_cmds='lt_outputfile="@OUTPUT@"~ 24445+ lt_tool_outputfile="@TOOL_OUTPUT@"~ 24446+ case $lt_outputfile in 24447+ *.exe|*.EXE) ;; 24448+ *) 24449+ lt_outputfile="$lt_outputfile.exe" 24450+ lt_tool_outputfile="$lt_tool_outputfile.exe" 24451+ ;; 24452+ esac~ 24453+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then 24454+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; 24455+ $RM "$lt_outputfile.manifest"; 24456+ fi' 24457+ ;; 24458+ *) 24459+ # Assume MSVC wrapper 24460+ hardcode_libdir_flag_spec=' ' 24461+ allow_undefined_flag=unsupported 24462+ # Tell ltmain to make .lib files, not .a files. 24463+ libext=lib 24464+ # Tell ltmain to make .dll files, not .so files. 24465+ shrext_cmds=".dll" 24466+ # FIXME: Setting linknames here is a bad hack. 24467+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' 24468+ # The linker will automatically build a .lib file if we build a DLL. 24469+ old_archive_from_new_cmds='true' 24470+ # FIXME: Should let the user specify the lib program. 24471+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' 24472+ enable_shared_with_static_runtimes=yes 24473+ ;; 24474+ esac 24475 ;; 24476 24477 darwin* | rhapsody*) 24478@@ -8938,7 +9516,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24479 24480 # FreeBSD 3 and greater uses gcc -shared to do shared libraries. 24481 freebsd* | dragonfly*) 24482- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' 24483+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 24484 hardcode_libdir_flag_spec='-R$libdir' 24485 hardcode_direct=yes 24486 hardcode_shlibpath_var=no 24487@@ -8946,7 +9524,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24488 24489 hpux9*) 24490 if test "$GCC" = yes; then 24491- 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' 24492+ 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' 24493 else 24494 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' 24495 fi 24496@@ -8962,7 +9540,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24497 24498 hpux10*) 24499 if test "$GCC" = yes && test "$with_gnu_ld" = no; then 24500- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 24501+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 24502 else 24503 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 24504 fi 24505@@ -8986,10 +9564,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi 24506 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 24507 ;; 24508 ia64*) 24509- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 24510+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 24511 ;; 24512 *) 24513- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 24514+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 24515 ;; 24516 esac 24517 else 24518@@ -9068,26 +9646,39 @@ fi 24519 24520 irix5* | irix6* | nonstopux*) 24521 if test "$GCC" = yes; then 24522- 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' 24523+ 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' 24524 # Try to use the -exported_symbol ld option, if it does not 24525 # work, assume that -exports_file does not work either and 24526 # implicitly export all symbols. 24527- save_LDFLAGS="$LDFLAGS" 24528- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 24529- if test x$gcc_no_link = xyes; then 24530+ # This should be the same for all languages, so no per-tag cache variable. 24531+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 24532+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } 24533+if ${lt_cv_irix_exported_symbol+:} false; then : 24534+ $as_echo_n "(cached) " >&6 24535+else 24536+ save_LDFLAGS="$LDFLAGS" 24537+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" 24538+ if test x$gcc_no_link = xyes; then 24539 as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 24540 fi 24541 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 24542 /* end confdefs.h. */ 24543-int foo(void) {} 24544+int foo (void) { return 0; } 24545 _ACEOF 24546 if ac_fn_c_try_link "$LINENO"; then : 24547- 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' 24548- 24549+ lt_cv_irix_exported_symbol=yes 24550+else 24551+ lt_cv_irix_exported_symbol=no 24552 fi 24553 rm -f core conftest.err conftest.$ac_objext \ 24554 conftest$ac_exeext conftest.$ac_ext 24555- LDFLAGS="$save_LDFLAGS" 24556+ LDFLAGS="$save_LDFLAGS" 24557+fi 24558+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 24559+$as_echo "$lt_cv_irix_exported_symbol" >&6; } 24560+ if test "$lt_cv_irix_exported_symbol" = yes; then 24561+ 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' 24562+ fi 24563 else 24564 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' 24565 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' 24566@@ -9172,7 +9763,7 @@ rm -f core conftest.err conftest.$ac_objext \ 24567 osf4* | osf5*) # as osf3* with the addition of -msym flag 24568 if test "$GCC" = yes; then 24569 allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' 24570- 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' 24571+ 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' 24572 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 24573 else 24574 allow_undefined_flag=' -expect_unresolved \*' 24575@@ -9191,9 +9782,9 @@ rm -f core conftest.err conftest.$ac_objext \ 24576 no_undefined_flag=' -z defs' 24577 if test "$GCC" = yes; then 24578 wlarc='${wl}' 24579- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 24580+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 24581 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ 24582- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' 24583+ $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' 24584 else 24585 case `$CC -V 2>&1` in 24586 *"Compilers 5.0"*) 24587@@ -9769,8 +10360,9 @@ cygwin* | mingw* | pw32* | cegcc*) 24588 need_version=no 24589 need_lib_prefix=no 24590 24591- case $GCC,$host_os in 24592- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 24593+ case $GCC,$cc_basename in 24594+ yes,*) 24595+ # gcc 24596 library_names_spec='$libname.dll.a' 24597 # DLL is installed to $(libdir)/../bin by postinstall_cmds 24598 postinstall_cmds='base_file=`basename \${file}`~ 24599@@ -9803,13 +10395,71 @@ cygwin* | mingw* | pw32* | cegcc*) 24600 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 24601 ;; 24602 esac 24603+ dynamic_linker='Win32 ld.exe' 24604+ ;; 24605+ 24606+ *,cl*) 24607+ # Native MSVC 24608+ libname_spec='$name' 24609+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 24610+ library_names_spec='${libname}.dll.lib' 24611+ 24612+ case $build_os in 24613+ mingw*) 24614+ sys_lib_search_path_spec= 24615+ lt_save_ifs=$IFS 24616+ IFS=';' 24617+ for lt_path in $LIB 24618+ do 24619+ IFS=$lt_save_ifs 24620+ # Let DOS variable expansion print the short 8.3 style file name. 24621+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` 24622+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" 24623+ done 24624+ IFS=$lt_save_ifs 24625+ # Convert to MSYS style. 24626+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 24627+ ;; 24628+ cygwin*) 24629+ # Convert to unix form, then to dos form, then back to unix form 24630+ # but this time dos style (no spaces!) so that the unix form looks 24631+ # like /cygdrive/c/PROGRA~1:/cygdr... 24632+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` 24633+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` 24634+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 24635+ ;; 24636+ *) 24637+ sys_lib_search_path_spec="$LIB" 24638+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then 24639+ # It is most probably a Windows format PATH. 24640+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` 24641+ else 24642+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` 24643+ fi 24644+ # FIXME: find the short name or the path components, as spaces are 24645+ # common. (e.g. "Program Files" -> "PROGRA~1") 24646+ ;; 24647+ esac 24648+ 24649+ # DLL is installed to $(libdir)/../bin by postinstall_cmds 24650+ postinstall_cmds='base_file=`basename \${file}`~ 24651+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ 24652+ dldir=$destdir/`dirname \$dlpath`~ 24653+ test -d \$dldir || mkdir -p \$dldir~ 24654+ $install_prog $dir/$dlname \$dldir/$dlname' 24655+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ 24656+ dlpath=$dir/\$dldll~ 24657+ $RM \$dlpath' 24658+ shlibpath_overrides_runpath=yes 24659+ dynamic_linker='Win32 link.exe' 24660 ;; 24661 24662 *) 24663+ # Assume MSVC wrapper 24664 library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' 24665+ dynamic_linker='Win32 ld.exe' 24666 ;; 24667 esac 24668- dynamic_linker='Win32 ld.exe' 24669 # FIXME: first we should search . and the directory the executable is in 24670 shlibpath_var=PATH 24671 ;; 24672@@ -10705,7 +11355,7 @@ else 24673 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 24674 lt_status=$lt_dlunknown 24675 cat > conftest.$ac_ext <<_LT_EOF 24676-#line 10708 "configure" 24677+#line $LINENO "configure" 24678 #include "confdefs.h" 24679 24680 #if HAVE_DLFCN_H 24681@@ -10749,10 +11399,10 @@ else 24682 /* When -fvisbility=hidden is used, assume the code has been annotated 24683 correspondingly for the symbols needed. */ 24684 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 24685-void fnord () __attribute__((visibility("default"))); 24686+int fnord () __attribute__((visibility("default"))); 24687 #endif 24688 24689-void fnord () { int i=42; } 24690+int fnord () { return 42; } 24691 int main () 24692 { 24693 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 24694@@ -10811,7 +11461,7 @@ else 24695 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 24696 lt_status=$lt_dlunknown 24697 cat > conftest.$ac_ext <<_LT_EOF 24698-#line 10814 "configure" 24699+#line $LINENO "configure" 24700 #include "confdefs.h" 24701 24702 #if HAVE_DLFCN_H 24703@@ -10855,10 +11505,10 @@ else 24704 /* When -fvisbility=hidden is used, assume the code has been annotated 24705 correspondingly for the symbols needed. */ 24706 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) 24707-void fnord () __attribute__((visibility("default"))); 24708+int fnord () __attribute__((visibility("default"))); 24709 #endif 24710 24711-void fnord () { int i=42; } 24712+int fnord () { return 42; } 24713 int main () 24714 { 24715 void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); 24716@@ -12328,13 +12978,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 24717 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' 24718 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' 24719 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' 24720+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' 24721+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' 24722 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' 24723 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' 24724 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' 24725 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' 24726 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' 24727+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' 24728+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' 24729+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' 24730+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' 24731 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' 24732 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' 24733+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' 24734 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' 24735 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' 24736 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' 24737@@ -12349,14 +13006,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 24738 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' 24739 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' 24740 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"`' 24741+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' 24742+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' 24743 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' 24744 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' 24745 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' 24746-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 24747 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' 24748+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' 24749 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' 24750 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' 24751 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' 24752+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' 24753 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' 24754 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' 24755 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' 24756@@ -12389,12 +13049,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 24757 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' 24758 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' 24759 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' 24760-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' 24761 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' 24762 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' 24763 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' 24764 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' 24765 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' 24766+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' 24767 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' 24768 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' 24769 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' 24770@@ -12449,8 +13109,13 @@ reload_flag \ 24771 OBJDUMP \ 24772 deplibs_check_method \ 24773 file_magic_cmd \ 24774+file_magic_glob \ 24775+want_nocaseglob \ 24776+DLLTOOL \ 24777+sharedlib_from_linklib_cmd \ 24778 AR \ 24779 AR_FLAGS \ 24780+archiver_list_spec \ 24781 STRIP \ 24782 RANLIB \ 24783 CC \ 24784@@ -12460,12 +13125,14 @@ lt_cv_sys_global_symbol_pipe \ 24785 lt_cv_sys_global_symbol_to_cdecl \ 24786 lt_cv_sys_global_symbol_to_c_name_address \ 24787 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ 24788+nm_file_list_spec \ 24789 lt_prog_compiler_no_builtin_flag \ 24790-lt_prog_compiler_wl \ 24791 lt_prog_compiler_pic \ 24792+lt_prog_compiler_wl \ 24793 lt_prog_compiler_static \ 24794 lt_cv_prog_compiler_c_o \ 24795 need_locks \ 24796+MANIFEST_TOOL \ 24797 DSYMUTIL \ 24798 NMEDIT \ 24799 LIPO \ 24800@@ -12481,7 +13148,6 @@ no_undefined_flag \ 24801 hardcode_libdir_flag_spec \ 24802 hardcode_libdir_flag_spec_ld \ 24803 hardcode_libdir_separator \ 24804-fix_srcfile_path \ 24805 exclude_expsyms \ 24806 include_expsyms \ 24807 file_list_spec \ 24808@@ -12517,6 +13183,7 @@ module_cmds \ 24809 module_expsym_cmds \ 24810 export_symbols_cmds \ 24811 prelink_cmds \ 24812+postlink_cmds \ 24813 postinstall_cmds \ 24814 postuninstall_cmds \ 24815 finish_cmds \ 24816@@ -13115,7 +13782,8 @@ $as_echo X"$file" | 24817 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 24818 # 24819 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 24820-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 24821+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 24822+# Inc. 24823 # Written by Gordon Matzigkeit, 1996 24824 # 24825 # This file is part of GNU Libtool. 24826@@ -13218,19 +13886,42 @@ SP2NL=$lt_lt_SP2NL 24827 # turn newlines into spaces. 24828 NL2SP=$lt_lt_NL2SP 24829 24830+# convert \$build file names to \$host format. 24831+to_host_file_cmd=$lt_cv_to_host_file_cmd 24832+ 24833+# convert \$build files to toolchain format. 24834+to_tool_file_cmd=$lt_cv_to_tool_file_cmd 24835+ 24836 # An object symbol dumper. 24837 OBJDUMP=$lt_OBJDUMP 24838 24839 # Method to check whether dependent libraries are shared objects. 24840 deplibs_check_method=$lt_deplibs_check_method 24841 24842-# Command to use when deplibs_check_method == "file_magic". 24843+# Command to use when deplibs_check_method = "file_magic". 24844 file_magic_cmd=$lt_file_magic_cmd 24845 24846+# How to find potential files when deplibs_check_method = "file_magic". 24847+file_magic_glob=$lt_file_magic_glob 24848+ 24849+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". 24850+want_nocaseglob=$lt_want_nocaseglob 24851+ 24852+# DLL creation program. 24853+DLLTOOL=$lt_DLLTOOL 24854+ 24855+# Command to associate shared and link libraries. 24856+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd 24857+ 24858 # The archiver. 24859 AR=$lt_AR 24860+ 24861+# Flags to create an archive. 24862 AR_FLAGS=$lt_AR_FLAGS 24863 24864+# How to feed a file listing to the archiver. 24865+archiver_list_spec=$lt_archiver_list_spec 24866+ 24867 # A symbol stripping program. 24868 STRIP=$lt_STRIP 24869 24870@@ -13260,6 +13951,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 24871 # Transform the output of nm in a C name address pair when lib prefix is needed. 24872 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix 24873 24874+# Specify filename containing input files for \$NM. 24875+nm_file_list_spec=$lt_nm_file_list_spec 24876+ 24877+# The root where to search for dependent libraries,and in which our libraries should be installed. 24878+lt_sysroot=$lt_sysroot 24879+ 24880 # The name of the directory that contains temporary libtool files. 24881 objdir=$objdir 24882 24883@@ -13269,6 +13966,9 @@ MAGIC_CMD=$MAGIC_CMD 24884 # Must we lock files when doing compilation? 24885 need_locks=$lt_need_locks 24886 24887+# Manifest tool. 24888+MANIFEST_TOOL=$lt_MANIFEST_TOOL 24889+ 24890 # Tool to manipulate archived DWARF debug symbol files on Mac OS X. 24891 DSYMUTIL=$lt_DSYMUTIL 24892 24893@@ -13383,12 +14083,12 @@ with_gcc=$GCC 24894 # Compiler flag to turn off builtin functions. 24895 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag 24896 24897-# How to pass a linker flag through the compiler. 24898-wl=$lt_lt_prog_compiler_wl 24899- 24900 # Additional compiler flags for building library objects. 24901 pic_flag=$lt_lt_prog_compiler_pic 24902 24903+# How to pass a linker flag through the compiler. 24904+wl=$lt_lt_prog_compiler_wl 24905+ 24906 # Compiler flag to prevent dynamic linking. 24907 link_static_flag=$lt_lt_prog_compiler_static 24908 24909@@ -13475,9 +14175,6 @@ inherit_rpath=$inherit_rpath 24910 # Whether libtool must link a program against all its dependency libraries. 24911 link_all_deplibs=$link_all_deplibs 24912 24913-# Fix the shell variable \$srcfile for the compiler. 24914-fix_srcfile_path=$lt_fix_srcfile_path 24915- 24916 # Set to "yes" if exported symbols are required. 24917 always_export_symbols=$always_export_symbols 24918 24919@@ -13493,6 +14190,9 @@ include_expsyms=$lt_include_expsyms 24920 # Commands necessary for linking programs (against libraries) with templates. 24921 prelink_cmds=$lt_prelink_cmds 24922 24923+# Commands necessary for finishing linking programs. 24924+postlink_cmds=$lt_postlink_cmds 24925+ 24926 # Specify filename containing input files. 24927 file_list_spec=$lt_file_list_spec 24928 24929@@ -13525,210 +14225,169 @@ ltmain="$ac_aux_dir/ltmain.sh" 24930 # if finds mixed CR/LF and LF-only lines. Since sed operates in 24931 # text mode, it properly converts lines to CR/LF. This bash problem 24932 # is reportedly fixed, but why not run on old versions too? 24933- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ 24934- || (rm -f "$cfgfile"; exit 1) 24935- 24936- case $xsi_shell in 24937- yes) 24938- cat << \_LT_EOF >> "$cfgfile" 24939- 24940-# func_dirname file append nondir_replacement 24941-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 24942-# otherwise set result to NONDIR_REPLACEMENT. 24943-func_dirname () 24944-{ 24945- case ${1} in 24946- */*) func_dirname_result="${1%/*}${2}" ;; 24947- * ) func_dirname_result="${3}" ;; 24948- esac 24949-} 24950- 24951-# func_basename file 24952-func_basename () 24953-{ 24954- func_basename_result="${1##*/}" 24955-} 24956- 24957-# func_dirname_and_basename file append nondir_replacement 24958-# perform func_basename and func_dirname in a single function 24959-# call: 24960-# dirname: Compute the dirname of FILE. If nonempty, 24961-# add APPEND to the result, otherwise set result 24962-# to NONDIR_REPLACEMENT. 24963-# value returned in "$func_dirname_result" 24964-# basename: Compute filename of FILE. 24965-# value retuned in "$func_basename_result" 24966-# Implementation must be kept synchronized with func_dirname 24967-# and func_basename. For efficiency, we do not delegate to 24968-# those functions but instead duplicate the functionality here. 24969-func_dirname_and_basename () 24970-{ 24971- case ${1} in 24972- */*) func_dirname_result="${1%/*}${2}" ;; 24973- * ) func_dirname_result="${3}" ;; 24974- esac 24975- func_basename_result="${1##*/}" 24976-} 24977- 24978-# func_stripname prefix suffix name 24979-# strip PREFIX and SUFFIX off of NAME. 24980-# PREFIX and SUFFIX must not contain globbing or regex special 24981-# characters, hashes, percent signs, but SUFFIX may contain a leading 24982-# dot (in which case that matches only a dot). 24983-func_stripname () 24984-{ 24985- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are 24986- # positional parameters, so assign one to ordinary parameter first. 24987- func_stripname_result=${3} 24988- func_stripname_result=${func_stripname_result#"${1}"} 24989- func_stripname_result=${func_stripname_result%"${2}"} 24990-} 24991- 24992-# func_opt_split 24993-func_opt_split () 24994-{ 24995- func_opt_split_opt=${1%%=*} 24996- func_opt_split_arg=${1#*=} 24997-} 24998- 24999-# func_lo2o object 25000-func_lo2o () 25001-{ 25002- case ${1} in 25003- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; 25004- *) func_lo2o_result=${1} ;; 25005- esac 25006-} 25007- 25008-# func_xform libobj-or-source 25009-func_xform () 25010-{ 25011- func_xform_result=${1%.*}.lo 25012-} 25013- 25014-# func_arith arithmetic-term... 25015-func_arith () 25016-{ 25017- func_arith_result=$(( $* )) 25018-} 25019- 25020-# func_len string 25021-# STRING may not start with a hyphen. 25022-func_len () 25023-{ 25024- func_len_result=${#1} 25025-} 25026- 25027-_LT_EOF 25028- ;; 25029- *) # Bourne compatible functions. 25030- cat << \_LT_EOF >> "$cfgfile" 25031- 25032-# func_dirname file append nondir_replacement 25033-# Compute the dirname of FILE. If nonempty, add APPEND to the result, 25034-# otherwise set result to NONDIR_REPLACEMENT. 25035-func_dirname () 25036-{ 25037- # Extract subdirectory from the argument. 25038- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` 25039- if test "X$func_dirname_result" = "X${1}"; then 25040- func_dirname_result="${3}" 25041- else 25042- func_dirname_result="$func_dirname_result${2}" 25043- fi 25044-} 25045- 25046-# func_basename file 25047-func_basename () 25048-{ 25049- func_basename_result=`$ECHO "${1}" | $SED "$basename"` 25050-} 25051- 25052- 25053-# func_stripname prefix suffix name 25054-# strip PREFIX and SUFFIX off of NAME. 25055-# PREFIX and SUFFIX must not contain globbing or regex special 25056-# characters, hashes, percent signs, but SUFFIX may contain a leading 25057-# dot (in which case that matches only a dot). 25058-# func_strip_suffix prefix name 25059-func_stripname () 25060-{ 25061- case ${2} in 25062- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; 25063- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; 25064- esac 25065-} 25066- 25067-# sed scripts: 25068-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' 25069-my_sed_long_arg='1s/^-[^=]*=//' 25070- 25071-# func_opt_split 25072-func_opt_split () 25073-{ 25074- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` 25075- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` 25076-} 25077- 25078-# func_lo2o object 25079-func_lo2o () 25080-{ 25081- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` 25082-} 25083- 25084-# func_xform libobj-or-source 25085-func_xform () 25086-{ 25087- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` 25088-} 25089- 25090-# func_arith arithmetic-term... 25091-func_arith () 25092-{ 25093- func_arith_result=`expr "$@"` 25094-} 25095- 25096-# func_len string 25097-# STRING may not start with a hyphen. 25098-func_len () 25099-{ 25100- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` 25101-} 25102- 25103-_LT_EOF 25104-esac 25105- 25106-case $lt_shell_append in 25107- yes) 25108- cat << \_LT_EOF >> "$cfgfile" 25109- 25110-# func_append var value 25111-# Append VALUE to the end of shell variable VAR. 25112-func_append () 25113-{ 25114- eval "$1+=\$2" 25115-} 25116-_LT_EOF 25117- ;; 25118- *) 25119- cat << \_LT_EOF >> "$cfgfile" 25120- 25121-# func_append var value 25122-# Append VALUE to the end of shell variable VAR. 25123-func_append () 25124-{ 25125- eval "$1=\$$1\$2" 25126-} 25127- 25128-_LT_EOF 25129- ;; 25130- esac 25131- 25132- 25133- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ 25134- || (rm -f "$cfgfile"; exit 1) 25135- 25136- mv -f "$cfgfile" "$ofile" || 25137+ sed '$q' "$ltmain" >> "$cfgfile" \ 25138+ || (rm -f "$cfgfile"; exit 1) 25139+ 25140+ if test x"$xsi_shell" = xyes; then 25141+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ 25142+func_dirname ()\ 25143+{\ 25144+\ case ${1} in\ 25145+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 25146+\ * ) func_dirname_result="${3}" ;;\ 25147+\ esac\ 25148+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ 25149+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25150+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25151+test 0 -eq $? || _lt_function_replace_fail=: 25152+ 25153+ 25154+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ 25155+func_basename ()\ 25156+{\ 25157+\ func_basename_result="${1##*/}"\ 25158+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ 25159+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25160+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25161+test 0 -eq $? || _lt_function_replace_fail=: 25162+ 25163+ 25164+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ 25165+func_dirname_and_basename ()\ 25166+{\ 25167+\ case ${1} in\ 25168+\ */*) func_dirname_result="${1%/*}${2}" ;;\ 25169+\ * ) func_dirname_result="${3}" ;;\ 25170+\ esac\ 25171+\ func_basename_result="${1##*/}"\ 25172+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ 25173+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25174+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25175+test 0 -eq $? || _lt_function_replace_fail=: 25176+ 25177+ 25178+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ 25179+func_stripname ()\ 25180+{\ 25181+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ 25182+\ # positional parameters, so assign one to ordinary parameter first.\ 25183+\ func_stripname_result=${3}\ 25184+\ func_stripname_result=${func_stripname_result#"${1}"}\ 25185+\ func_stripname_result=${func_stripname_result%"${2}"}\ 25186+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ 25187+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25188+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25189+test 0 -eq $? || _lt_function_replace_fail=: 25190+ 25191+ 25192+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ 25193+func_split_long_opt ()\ 25194+{\ 25195+\ func_split_long_opt_name=${1%%=*}\ 25196+\ func_split_long_opt_arg=${1#*=}\ 25197+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ 25198+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25199+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25200+test 0 -eq $? || _lt_function_replace_fail=: 25201+ 25202+ 25203+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ 25204+func_split_short_opt ()\ 25205+{\ 25206+\ func_split_short_opt_arg=${1#??}\ 25207+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ 25208+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ 25209+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25210+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25211+test 0 -eq $? || _lt_function_replace_fail=: 25212+ 25213+ 25214+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ 25215+func_lo2o ()\ 25216+{\ 25217+\ case ${1} in\ 25218+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ 25219+\ *) func_lo2o_result=${1} ;;\ 25220+\ esac\ 25221+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ 25222+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25223+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25224+test 0 -eq $? || _lt_function_replace_fail=: 25225+ 25226+ 25227+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ 25228+func_xform ()\ 25229+{\ 25230+ func_xform_result=${1%.*}.lo\ 25231+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ 25232+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25233+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25234+test 0 -eq $? || _lt_function_replace_fail=: 25235+ 25236+ 25237+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ 25238+func_arith ()\ 25239+{\ 25240+ func_arith_result=$(( $* ))\ 25241+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ 25242+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25243+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25244+test 0 -eq $? || _lt_function_replace_fail=: 25245+ 25246+ 25247+ sed -e '/^func_len ()$/,/^} # func_len /c\ 25248+func_len ()\ 25249+{\ 25250+ func_len_result=${#1}\ 25251+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ 25252+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25253+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25254+test 0 -eq $? || _lt_function_replace_fail=: 25255+ 25256+fi 25257+ 25258+if test x"$lt_shell_append" = xyes; then 25259+ sed -e '/^func_append ()$/,/^} # func_append /c\ 25260+func_append ()\ 25261+{\ 25262+ eval "${1}+=\\${2}"\ 25263+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ 25264+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25265+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25266+test 0 -eq $? || _lt_function_replace_fail=: 25267+ 25268+ 25269+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ 25270+func_append_quoted ()\ 25271+{\ 25272+\ func_quote_for_eval "${2}"\ 25273+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ 25274+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ 25275+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25276+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25277+test 0 -eq $? || _lt_function_replace_fail=: 25278+ 25279+ 25280+ # Save a `func_append' function call where possible by direct use of '+=' 25281+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ 25282+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25283+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25284+ test 0 -eq $? || _lt_function_replace_fail=: 25285+else 25286+ # Save a `func_append' function call even when '+=' is not available 25287+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ 25288+ && mv -f "$cfgfile.tmp" "$cfgfile" \ 25289+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") 25290+ test 0 -eq $? || _lt_function_replace_fail=: 25291+fi 25292+ 25293+if test x"$_lt_function_replace_fail" = x":"; then 25294+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 25295+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} 25296+fi 25297+ 25298+ 25299+ mv -f "$cfgfile" "$ofile" || 25300 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") 25301 chmod +x "$ofile" 25302 25303